From 995a36cc6ea6e415a1fb7f5f8cebc0a241cda38b Mon Sep 17 00:00:00 2001
From: martinmine <martin_mine@hotmail.com>
Date: Thu, 20 Oct 2016 15:03:41 +0200
Subject: [PATCH 001/218] MOBILE-1796 core: Updated to NodeJS v6.9.1

---
 .travis.yml       |  2 +-
 gulpfile.js       |  4 ++--
 ionic.config.json | 10 ++++++++++
 ionic.project     |  2 +-
 package.json      | 43 +++++++++++++++++++++++++++----------------
 upgrade.txt       |  7 +++++++
 6 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 ionic.config.json

diff --git a/.travis.yml b/.travis.yml
index 17681a7f198..a74010f874b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
 language: node_js
 
 node_js:
-- '0.12'
+- '6.9.1'
 
 before_install:
 - npm cache clean
diff --git a/gulpfile.js b/gulpfile.js
index a0f1b312697..ac5aa90a167 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,7 +7,7 @@ var stripComments = require('gulp-strip-comments');
 var removeEmptyLines = require('gulp-remove-empty-lines');
 var clipEmptyFiles = require('gulp-clip-empty-files');
 var sass = require('gulp-sass');
-var minifyCss = require('gulp-minify-css');
+var cleanCSS = require('gulp-clean-css');
 var rename = require('gulp-rename');
 var tap = require('gulp-tap');
 var fs = require('fs');
@@ -408,7 +408,7 @@ gulp.task('sass', ['sass-build'], function(done) {
     .pipe(concat('mm.bundle.css'))
     .pipe(sass())
     .pipe(gulp.dest(paths.build))
-    .pipe(minifyCss({
+    .pipe(cleanCSS({
       keepSpecialComments: 0
     }))
     .pipe(rename({ extname: '.min.css' }))
diff --git a/ionic.config.json b/ionic.config.json
new file mode 100644
index 00000000000..12afec3b87e
--- /dev/null
+++ b/ionic.config.json
@@ -0,0 +1,10 @@
+{
+  "name": "moodlemobile2",
+  "app_id": "",
+  "watchPatterns": [
+    "www/**/*.html",
+    "www/build/**/*",
+    "www/index.html",
+    "!www/lib/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/ionic.project b/ionic.project
index 356bb2cdf09..e31d06752ad 100644
--- a/ionic.project
+++ b/ionic.project
@@ -1,5 +1,5 @@
 {
-  "name": "mm2",
+  "name": "moodlemobile2",
   "app_id": "",
   "gulpStartupTasks": [
     "build",
diff --git a/package.json b/package.json
index 6e2fac9163a..d73f965c7cc 100644
--- a/package.json
+++ b/package.json
@@ -1,35 +1,46 @@
 {
   "name": "mm2",
   "version": "1.0.0",
-  "description": "mm2: An Ionic project",
+  "description": "Moodle Mobile 2: The official mobile app for Moodle.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/moodlehq/moodlemobile2.git"
+  },
+  "license": "Apache-2.0",
+  "licenses": [
+    {
+      "type": "Apache-2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0"
+    }
+  ],
   "dependencies": {
-    "gulp": "^3.5.6",
-    "gulp-concat": "^2.2.0",
-    "gulp-minify-css": "^0.3.0",
+    "gulp": "^3.9.1",
+    "gulp-clean-css": "^3.0.3",
+    "gulp-concat": "^2.6.0",
     "gulp-rename": "^1.2.0",
-    "gulp-sass": "^1.3.3"
+    "gulp-sass": "^2.3.2"
   },
   "devDependencies": {
-    "appium": "^1.4.11",
+    "appium": "^1.6.0",
     "bower": "^1.3.3",
     "gulp-clip-empty-files": "^0.1.1",
     "gulp-concat-util": "^0.5.2",
-    "gulp-file": "^0.2.0",
-    "gulp-insert": "^0.4.0",
-    "gulp-ng-annotate": "^1.1.0",
-    "gulp-remove-empty-lines": "0.0.2",
+    "gulp-file": "^0.3.0",
+    "gulp-insert": "^0.5.0",
+    "gulp-ng-annotate": "^2.0.0",
+    "gulp-remove-empty-lines": "0.0.8",
     "gulp-slash": "^1.1.3",
-    "gulp-strip-comments": "^1.0.1",
+    "gulp-strip-comments": "^2.4.3",
     "gulp-tap": "^0.1.3",
-    "gulp-util": "^2.2.14",
+    "gulp-util": "^3.0.7",
     "gulp-zip": "^3.2.0",
     "jasmine": "^2.2.1",
     "jasmine-core": "^2.2.0",
-    "karma": "^0.12.31",
-    "karma-chrome-launcher": "^0.1.7",
-    "karma-jasmine": "^0.3.5",
+    "karma": "^1.3.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-jasmine": "^1.0.2",
     "plist": "^1.1.0",
-    "protractor": "^2.2.0",
+    "protractor": "^4.0.9",
     "shelljs": "^0.3.0",
     "through": "^2.3.6",
     "wd": "^0.4.0",
diff --git a/upgrade.txt b/upgrade.txt
index ad79e14400b..ad400b58018 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -1,6 +1,13 @@
 This files describes API changes in the Moodle Mobile app,
 information provided here is intended especially for developers.
 
+=== 3.3 ===
+
+ * The project now supports Ionic CLI v2 and Node 6.9. We recommend updating node, npm, Ionic CLI and project dependencies:
+    npm install -g npm@latest
+    npm install -g ionic
+    npm install
+
 === 3.2.1 ===
 
  * mmaGrades addon has been moved to core with mmGrades name (and derivatives).

From bab7084f09194665a3454788e9c9b05b2ac1adb3 Mon Sep 17 00:00:00 2001
From: martinmine <martin_mine@hotmail.com>
Date: Thu, 10 Nov 2016 16:36:38 +0100
Subject: [PATCH 002/218] MOBILE-1877 core: Moved dependencies to
 devDependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d73f965c7cc..20eedbb8b44 100644
--- a/package.json
+++ b/package.json
@@ -14,15 +14,15 @@
     }
   ],
   "dependencies": {
-    "gulp": "^3.9.1",
-    "gulp-clean-css": "^3.0.3",
-    "gulp-concat": "^2.6.0",
-    "gulp-rename": "^1.2.0",
-    "gulp-sass": "^2.3.2"
   },
   "devDependencies": {
     "appium": "^1.6.0",
     "bower": "^1.3.3",
+    "gulp": "^3.9.1",
+    "gulp-clean-css": "^3.0.3",
+    "gulp-concat": "^2.6.0",
+    "gulp-rename": "^1.2.0",
+    "gulp-sass": "^2.3.2",
     "gulp-clip-empty-files": "^0.1.1",
     "gulp-concat-util": "^0.5.2",
     "gulp-file": "^0.3.0",

From 85e2233342e65286081607bdac5f48c247c427a6 Mon Sep 17 00:00:00 2001
From: martinmine <martin_mine@hotmail.com>
Date: Tue, 8 Nov 2016 16:19:51 +0100
Subject: [PATCH 003/218] MOBILE-1870 Added npm commands

---
 gulpfile.js     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json    | 30 +++++++++++++++++++++++++++---
 www/build/empty |  0
 3 files changed, 73 insertions(+), 3 deletions(-)
 delete mode 100644 www/build/empty

diff --git a/gulpfile.js b/gulpfile.js
index ac5aa90a167..e91b928d246 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,7 @@ var gulpSlash = require('gulp-slash');
 var ngAnnotate = require('gulp-ng-annotate');
 var yargs = require('yargs');
 var zip = require('gulp-zip');
+var clean = require('gulp-clean');
 
 // Given a list of paths to search and the path to an addon, return the list of paths to search only inside the addon folder.
 function getRemoteAddonPaths(paths, pathToAddon) {
@@ -894,3 +895,48 @@ gulp.task('remoteaddon', ['remoteaddon-build', 'remoteaddon-sass', 'remoteaddon-
       done();
     });
 });
+
+// Cleans the development environment by deleting downloaded files and libraries
+gulp.task('clean-libs', ['clean-www-libs', 'clean-ionic-platforms', 'clean-e2e-build', 'clean-sass-cache', 'clean-ionic-plugins']);
+
+// Removes the contents in the /www/lib/ directory
+gulp.task('clean-www-libs', function() {
+  return gulp.src('www/lib/', {read: false})
+    .pipe(clean());
+});
+
+// Removes the contents in the /platforms directory
+gulp.task('clean-ionic-platforms', function() {
+  return gulp.src('platforms/', {read: false})
+    .pipe(clean());
+});
+
+// Removes the contents in the /plugins directory
+gulp.task('clean-ionic-plugins', function() {
+  return gulp.src('plugins/', {read: false})
+    .pipe(clean());
+});
+
+// Removes the contents in the /www/build directory
+gulp.task('clean-build', function() {
+  return gulp.src('www/build/', {read: false})
+    .pipe(clean());
+});
+
+// Removes the contents in the /e2e/build directory
+gulp.task('clean-e2e-build', function() {
+  return gulp.src('e2e/build/', {read: false})
+    .pipe(clean());
+});
+
+// Removes the contents in the /.sass-cache directory
+gulp.task('clean-sass-cache', function() {
+  return gulp.src('.sass-cache/', {read: false})
+    .pipe(clean());
+});
+
+// Removes the contents in the /node-modules directory
+gulp.task('clean-node-modules', function() {
+  return gulp.src('node_modules/', {read: false})
+    .pipe(clean());
+});
diff --git a/package.json b/package.json
index 20eedbb8b44..553a2c9c0d5 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "gulp-concat": "^2.6.0",
     "gulp-rename": "^1.2.0",
     "gulp-sass": "^2.3.2",
+    "gulp-clean": "^0.3.2",
     "gulp-clip-empty-files": "^0.1.1",
     "gulp-concat-util": "^0.5.2",
     "gulp-file": "^0.3.0",
@@ -96,7 +97,30 @@
     "nl.kingsquare.cordova.background-audio"
   ],
   "cordovaPlatforms": [
-    "ios",
-    "android"
-  ]
+    {
+      "platform": "ios",
+      "version": "4.3.0",
+      "locator": "ios@4.3.0"
+    },
+    {
+      "platform": "android",
+      "version": "6.1.2",
+      "locator": "android@6.1.2"
+    }
+  ],
+  "scripts": {
+    "setup": "npm install && ionic state restore && bower install && gulp",
+    "reinstall": "gulp clean-build && gulp clean-libs && gulp clean-node-modules && npm run-script setup",
+    "start": "ionic serve",
+    "clean": "gulp clean-build",
+    "build.e2e": "gulp e2e-build",
+    "build.dev": "gulp",
+    "build.android": "ionic build android",
+    "build.ios": "ionic build ios",
+    "ios": "ionic run ios",
+    "android": "ionic run android",
+    "serve.e2e": "ionic serve -b -a",
+    "serve.dev": "ionic serve",
+    "e2e": "protractor e2e/build/protractor.conf.js"
+  }
 }
diff --git a/www/build/empty b/www/build/empty
deleted file mode 100644
index e69de29bb2d..00000000000

From 0f4dbc3e5f3b7cc281ffe55a52ec1a0f0cc20b28 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 3 Mar 2017 14:39:32 +0100
Subject: [PATCH 004/218] MOBILE-1704 bower: More coherence in dependencies

---
 bower.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/bower.json b/bower.json
index 184a2fcfe27..8492720bf2a 100644
--- a/bower.json
+++ b/bower.json
@@ -3,25 +3,25 @@
   "private": "true",
   "devDependencies": {
     "ionic": "1.3.2",
-    "ydn.db": ">=1.0.3",
-    "ngCordova": ">=0.1.24-alpha",
+    "ydn.db": "1.0.3",
     "angular-mocks": "1.5.3",
-    "angular-md5": "0.1.8",
-    "angular-translate": "~2.13.0",
-    "angular-translate-loader-partial": "~2.13.0",
     "angular-aria": "1.5.3",
-    "moment": "~2.10.6",
-    "jszip": "~2.5.0",
-    "oclazyload": "~1.0.9",
-    "ckeditor": "=4.5.9",
-    "angular-ckeditor": "=1.0.3",
-    "angular-messages": "1.5.3"
+    "angular-messages": "1.5.3",
+    "ckeditor": "4.5.9",
+    "angular-ckeditor": "1.0.3",
+    "ngCordova": "^0.1.26-alpha",
+    "angular-md5": "^0.1.8",
+    "angular-translate": "^2.13.0",
+    "angular-translate-loader-partial": "^2.13.0",
+    "moment": "^2.10.6",
+    "jszip": "^2.5.0",
+    "oclazyload": "^1.0.9",
+    "chart.js": "^2.4.0",
+    "angular-chart.js": "^1.0.2"
   },
   "resolutions": {
     "angular": "1.5.3"
   },
   "dependencies": {
-    "chart.js": "^2.4.0",
-    "angular-chart.js": "^1.0.2"
   }
 }

From f198d0a956a3740929da30dcd6495955a1b671e3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 7 Mar 2017 15:36:08 +0100
Subject: [PATCH 005/218] MOBILE-1923 styles: Load remote styles in login
 screen

---
 www/addons/remotestyles/main.js               | 33 ++++++++++++++-
 .../remotestyles/services/remotestyles.js     | 41 +++++++++++++++++++
 .../login/controllers/credentials.js          | 25 +++++++++--
 www/core/components/login/main.js             |  2 +
 www/core/lib/sitesmanager.js                  |  2 +
 5 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/www/addons/remotestyles/main.js b/www/addons/remotestyles/main.js
index 794e967e55d..180a0bad3d6 100644
--- a/www/addons/remotestyles/main.js
+++ b/www/addons/remotestyles/main.js
@@ -25,10 +25,23 @@ angular.module('mm.addons.remotestyles', [])
 })
 
 .run(function($mmEvents, mmCoreEventLogin, mmCoreEventLogout, mmCoreEventSiteAdded, mmCoreEventSiteUpdated, $mmaRemoteStyles,
-            $mmSite, mmCoreEventSiteDeleted) {
+            $mmSite, mmCoreEventSiteDeleted, mmCoreLoginSiteCheckedEvent, mmCoreLoginSiteUncheckedEvent) {
+    var addingSite,
+        unloadTmpStyles;
 
     $mmEvents.on(mmCoreEventSiteAdded, function(siteId) {
-        $mmaRemoteStyles.addSite(siteId);
+        addingSite = siteId;
+
+        $mmaRemoteStyles.addSite(siteId).finally(function() {
+            if (addingSite == siteId) {
+                addingSite = false;
+            }
+
+            if (unloadTmpStyles == siteId) {
+                // This site had some tmp styles loaded, unload them.
+                $mmaRemoteStyles.unloadTmpStyles();
+            }
+        });
     });
     $mmEvents.on(mmCoreEventSiteUpdated, function(siteId) {
         // Load only if current site was updated.
@@ -47,4 +60,20 @@ angular.module('mm.addons.remotestyles', [])
     $mmEvents.on(mmCoreEventSiteDeleted, function(site) {
         $mmaRemoteStyles.removeSite(site.id);
     });
+
+    // Load temporary styles when site config is checked in login.
+    $mmEvents.on(mmCoreLoginSiteCheckedEvent, function(data) {
+        $mmaRemoteStyles.loadTmpStyles(data.config.mobilecssurl);
+    });
+
+    // Unload temporary styles when site config is "unchecked" in login.
+    $mmEvents.on(mmCoreLoginSiteUncheckedEvent, function(data) {
+        if (data.siteid && data.siteid == addingSite) {
+            // The tmp styles are from a site that is being added. Wait for the site styles to be loaded before removing
+            // the tmp styles so there is no blink effect.
+            unloadTmpStyles = data.siteid;
+        } else {
+            $mmaRemoteStyles.unloadTmpStyles();
+        }
+    });
 });
diff --git a/www/addons/remotestyles/services/remotestyles.js b/www/addons/remotestyles/services/remotestyles.js
index edc6f43c157..2a61132928c 100644
--- a/www/addons/remotestyles/services/remotestyles.js
+++ b/www/addons/remotestyles/services/remotestyles.js
@@ -193,6 +193,35 @@ angular.module('mm.addons.remotestyles')
         return $q.reject();
     };
 
+    /**
+     * Load styles for a temporary site. These styles aren't prefetched.
+     *
+     * @module mm.addons.remotestyles
+     * @ngdoc method
+     * @name $mmaRemoteStyles#loadTmpStyles
+     * @param  {String} url URL to get the styles from.
+     * @return {Void}
+     */
+    self.loadTmpStyles = function(url) {
+        if (!url) {
+            return;
+        }
+
+        return $http.get(url).then(function(response) {
+            if (typeof response.data == 'string') {
+                var el = angular.element('<style id="mobilecssurl-tmpsite"></style>');
+                el.html(response.data);
+                angular.element(document.head).append(el);
+                remoteStylesEls.tmpsite = {
+                    element: el,
+                    hash: ''
+                };
+            } else {
+                return $q.reject();
+            }
+        });
+    };
+
     /**
      * Preload the styles of the current site (stored in DB). Please do not use.
      *
@@ -292,5 +321,17 @@ angular.module('mm.addons.remotestyles')
         });
     }
 
+    /**
+     * Unload styles for a temporary site.
+     *
+     * @module mm.addons.remotestyles
+     * @ngdoc method
+     * @name $mmaRemoteStyles#unloadTmpStyles
+     * @return {Void}
+     */
+    self.unloadTmpStyles = function() {
+        return self.removeSite('tmpsite');
+    };
+
     return self;
 });
diff --git a/www/core/components/login/controllers/credentials.js b/www/core/components/login/controllers/credentials.js
index 6be5ba09cdf..2597b6537cb 100644
--- a/www/core/components/login/controllers/credentials.js
+++ b/www/core/components/login/controllers/credentials.js
@@ -21,8 +21,9 @@ angular.module('mm.core.login')
  * @ngdoc controller
  * @name mmLoginCredentialsCtrl
  */
-.controller('mmLoginCredentialsCtrl', function($scope, $stateParams, $mmSitesManager, $mmUtil, $ionicHistory, $mmApp,
-            $q, $mmLoginHelper, $mmContentLinksDelegate, $mmContentLinksHelper, $translate) {
+.controller('mmLoginCredentialsCtrl', function($scope, $stateParams, $mmSitesManager, $mmUtil, $ionicHistory, $mmApp, $mmEvents,
+            $q, $mmLoginHelper, $mmContentLinksDelegate, $mmContentLinksHelper, $translate, mmCoreLoginSiteCheckedEvent,
+            mmCoreLoginSiteUncheckedEvent) {
 
     $scope.siteurl = $stateParams.siteurl;
     $scope.credentials = {
@@ -31,7 +32,9 @@ angular.module('mm.core.login')
     $scope.siteChecked = false;
 
     var urlToOpen = $stateParams.urltoopen,
-        siteConfig = $stateParams.siteconfig;
+        siteConfig = $stateParams.siteconfig,
+        eventThrown = false,
+        siteId;
 
     treatSiteConfig(siteConfig);
 
@@ -80,6 +83,13 @@ angular.module('mm.core.login')
             $scope.logourl = siteConfig.logourl || siteConfig.compactlogourl;
             $scope.authInstructions = siteConfig.authinstructions || $translate.instant('mm.login.loginsteps');
             $scope.canSignup = siteConfig.registerauth == 'email' && !$mmLoginHelper.isEmailSignupDisabled(siteConfig);
+
+            if (!eventThrown && !$scope.$$destroyed) {
+                eventThrown = true;
+                $mmEvents.trigger(mmCoreLoginSiteCheckedEvent, {
+                    config: siteConfig
+                });
+            }
         } else {
             $scope.sitename = null;
             $scope.logourl = null;
@@ -130,9 +140,10 @@ angular.module('mm.core.login')
 
         // Start the authentication process.
         return $mmSitesManager.getUserToken(siteurl, username, password).then(function(data) {
-            return $mmSitesManager.newSite(data.siteurl, data.token, data.privatetoken).then(function() {
+            return $mmSitesManager.newSite(data.siteurl, data.token, data.privatetoken).then(function(id) {
                 delete $scope.credentials; // Delete username and password from the scope.
                 $ionicHistory.nextViewOptions({disableBack: true});
+                siteId = id;
 
                 if (urlToOpen) {
                     // There's a content link to open.
@@ -156,4 +167,10 @@ angular.module('mm.core.login')
         });
     };
 
+    $scope.$on('$destroy', function() {
+        $mmEvents.trigger(mmCoreLoginSiteUncheckedEvent, {
+            siteid: siteId,
+            config: siteConfig
+        });
+    });
 });
diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index 1d6f451d2d3..805c2497e0a 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -15,6 +15,8 @@
 angular.module('mm.core.login', [])
 
 .constant('mmCoreLoginTokenChangePassword', '*changepassword*') // Deprecated.
+.constant('mmCoreLoginSiteCheckedEvent', 'mm_login_site_checked')
+.constant('mmCoreLoginSiteUncheckedEvent', 'mm_login_site_unchecked')
 
 .config(function($stateProvider, $urlRouterProvider, $mmInitDelegateProvider, mmInitDelegateMaxAddonPriority) {
 
diff --git a/www/core/lib/sitesmanager.js b/www/core/lib/sitesmanager.js
index ea988a30020..fe6b6e3c2f5 100644
--- a/www/core/lib/sitesmanager.js
+++ b/www/core/lib/sitesmanager.js
@@ -333,6 +333,8 @@ angular.module('mm.core')
                     // Store session.
                     self.login(siteId);
                     $mmEvents.trigger(mmCoreEventSiteAdded, siteId);
+
+                    return siteId;
                 });
             } else {
                 return $mmLang.translateAndReject('mm.login.invalidmoodleversion');

From 085f433f156988dabd1a99e8b9781ff4b37c6993 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 15 Mar 2017 09:34:44 +0100
Subject: [PATCH 006/218] MOBILE-2051 resource: Re-download the file even if
 it's big

---
 www/addons/mod/resource/services/resource.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index 91cd5bafefd..fcba0d29e88 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -238,7 +238,7 @@ angular.module('mm.addons.mod_resource')
 
                 if (status === mmCoreDownloaded) {
                     // Get the local file URL.
-                    return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod);
+                    return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false);
                 } else if (status === mmCoreDownloading) {
                     // Return the online URL.
                     return fixedUrl;
@@ -251,7 +251,7 @@ angular.module('mm.addons.mod_resource')
                     return $mmFilepool.shouldDownloadBeforeOpen(fixedUrl, contents[0].filesize).then(function() {
                         // Download and then return the local URL.
                         return $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod).then(function() {
-                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod);
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false);
                         });
                     }, function() {
                         // Start the download if in wifi, but return the URL right away so the file is opened.
@@ -264,7 +264,7 @@ angular.module('mm.addons.mod_resource')
                             return fixedUrl;
                         } else {
                             // Outdated but offline, so we return the local URL.
-                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod);
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false);
                         }
                     });
                 }

From 5c84b46bc85f545cc9185095d91d047d7c93c328 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 15 Mar 2017 12:01:11 +0100
Subject: [PATCH 007/218] MOBILE-2064 android: Force min and target SDK

---
 config.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config.xml b/config.xml
index f4fa3d6b319..dbb1c9ab999 100644
--- a/config.xml
+++ b/config.xml
@@ -17,6 +17,8 @@
   <preference name="SplashScreen" value="screen"/>
   <preference name="SplashScreenDelay" value="3000"/>
   <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
+  <preference name="android-minSdkVersion" value="14" />
+  <preference name="android-targetSdkVersion" value="19" />
   <feature name="StatusBar">
     <param name="ios-package" value="CDVStatusBar" onload="true"/>
   </feature>

From be39e6543d87e2c5e3d60e6c4ac06342772d4f68 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 21 Feb 2017 13:51:38 +0100
Subject: [PATCH 008/218] MOBILE-2010 lesson: Lesson initial implementation

---
 www/addons/mod/lesson/controllers/index.js | 112 ++++++++++
 www/addons/mod/lesson/main.js              |  41 ++++
 www/addons/mod/lesson/services/handlers.js |  74 +++++++
 www/addons/mod/lesson/services/lesson.js   | 229 +++++++++++++++++++++
 www/addons/mod/lesson/templates/index.html |  20 ++
 www/addons/mod/quiz/main.js                |   1 -
 6 files changed, 476 insertions(+), 1 deletion(-)
 create mode 100644 www/addons/mod/lesson/controllers/index.js
 create mode 100644 www/addons/mod/lesson/main.js
 create mode 100644 www/addons/mod/lesson/services/handlers.js
 create mode 100644 www/addons/mod/lesson/services/lesson.js
 create mode 100644 www/addons/mod/lesson/templates/index.html

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
new file mode 100644
index 00000000000..87b16d777d3
--- /dev/null
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -0,0 +1,112 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Lesson index controller.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc controller
+ * @name mmaModLessonIndexCtrl
+ */
+.controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
+            $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, mmCoreEventOnlineStatusChanged) {
+
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        lesson,
+        scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonIndexScroll'),
+        onlineObserver;
+
+    $scope.title = module.name;
+    $scope.moduleUrl = module.url;
+    $scope.refreshIcon = 'spinner';
+    $scope.component = mmaModLessonComponent;
+    $scope.componentId = module.id;
+
+    // Convenience function to get Lesson data.
+    function fetchLessonData(refresh) {
+        $scope.isOnline = $mmApp.isOnline();
+
+        return $mmaModLesson.getLesson(courseId, module.id).then(function(lessonData) {
+            lesson = lessonData;
+            $scope.lesson = lesson;
+
+            $scope.now = Date.now();
+            $scope.title = lesson.name || $scope.title;
+            $scope.description = lesson.intro; // Show description only if intro is present.
+
+            return $mmaModLesson.getAccessInformation(lesson.id);
+        }).then(function(info) {
+            $scope.preventMessages = info.preventaccessreasons;
+        }).then(function() {
+            // All data obtained, now fill the context menu.
+            $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModLessonComponent);
+        }).catch(function(message) {
+            if (!refresh && !lesson) {
+                // Get lesson failed, retry without using cache since it might be a new activity.
+                return refreshData();
+            }
+            return $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+        });
+    }
+
+    // Refreshes data.
+    function refreshData() {
+        var promises = [];
+
+        promises.push($mmaModLesson.invalidateLessonData(courseId));
+
+        return $q.all(promises).finally(function() {
+            return fetchLessonData(true);
+        });
+    }
+
+    // Fetch the Lesson data.
+    fetchLessonData().then(function() {
+        $mmaModLesson.logViewLesson(lesson.id).then(function() {
+            $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
+        });
+    }).finally(function() {
+        $scope.lessonLoaded = true;
+        $scope.refreshIcon = 'ion-refresh';
+    });
+
+    // Pull to refresh.
+    $scope.refreshLesson = function() {
+        if ($scope.lessonLoaded) {
+            $scope.refreshIcon = 'spinner';
+            return refreshData().finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModLessonComponent, module.id);
+    };
+
+    // Refresh online status when changes.
+    onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
+        $scope.isOnline = online;
+    });
+
+    $scope.$on('$destroy', function() {
+        onlineObserver && onlineObserver.off && onlineObserver.off();
+    });
+
+});
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
new file mode 100644
index 00000000000..6ec6d7b92da
--- /dev/null
+++ b/www/addons/mod/lesson/main.js
@@ -0,0 +1,41 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson', ['mm.core'])
+
+.constant('mmaModLessonComponent', 'mmaModLesson')
+
+.config(function($stateProvider) {
+
+    $stateProvider
+
+    .state('site.mod_lesson', {
+      url: '/mod_lesson',
+      params: {
+        module: null,
+        courseid: null
+      },
+      views: {
+        'site': {
+          controller: 'mmaModLessonIndexCtrl',
+          templateUrl: 'addons/mod/lesson/templates/index.html'
+        }
+      }
+    });
+
+})
+
+.config(function($mmCourseDelegateProvider) {
+    $mmCourseDelegateProvider.registerContentHandler('mmaModLesson', 'lesson', '$mmaModLessonHandlers.courseContentHandler');
+});
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
new file mode 100644
index 00000000000..9633f81c6fb
--- /dev/null
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -0,0 +1,74 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Mod Lesson handlers.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc service
+ * @name $mmaModLessonHandlers
+ */
+.factory('$mmaModLessonHandlers', function($mmCourse, $mmaModLesson, $state) {
+
+    var self = {};
+
+    /**
+     * Course content handler.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHandlers#courseContentHandler
+     */
+    self.courseContentHandler = function() {
+        var self = {};
+
+        /**
+         * Whether or not the module is enabled for the site.
+         *
+         * @return {Boolean}
+         */
+        self.isEnabled = function() {
+            return $mmaModLesson.isPluginEnabled();
+        };
+
+        /**
+         * Get the controller.
+         *
+         * @param {Object} module The module info.
+         * @param {Number} courseId The course ID.
+         * @return {Function}
+         */
+        self.getController = function(module, courseId) {
+            return function($scope) {
+                $scope.icon = $mmCourse.getModuleIconSrc('lesson');
+                $scope.title = module.name;
+                $scope.buttons = [];
+
+                $scope.action = function(e) {
+                    if (e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                    $state.go('site.mod_lesson', {module: module, courseid: courseId});
+                };
+            };
+        };
+
+        return self;
+    };
+
+    return self;
+});
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
new file mode 100644
index 00000000000..e012450dc4d
--- /dev/null
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -0,0 +1,229 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Lesson service.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc service
+ * @name $mmaModLesson
+ */
+.factory('$mmaModLesson', function($log, $mmSitesManager, $q) {
+
+    $log = $log.getInstance('$mmaModLesson');
+
+    var self = {};
+
+    /**
+     * Get cache key for access information WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}          Cache key.
+     */
+    function getAccessInformationCacheKey(lessonId) {
+        return 'mmaModLesson:accessInfo:' + lessonId;
+    }
+
+    /**
+     * Get the access information of a certain lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getAccessInformation
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved with the access information-
+     */
+    self.getAccessInformation = function(lessonId, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId
+                },
+                preSets = {
+                    cacheKey: getAccessInformationCacheKey(lessonId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_lesson_access_information', params, preSets);
+        });
+    };
+
+    /**
+     * Get cache key for Lesson data WS calls.
+     *
+     * @param  {Number} courseId Course ID.
+     * @return {String}          Cache key.
+     */
+    function getLessonDataCacheKey(courseId) {
+        return 'mmaModLesson:lesson:' + courseId;
+    }
+
+    /**
+     * Get a Lesson with key=value. If more than one is found, only the first will be returned.
+     *
+     * @param  {String} siteId        Site ID.
+     * @param  {Number} courseId      Course ID.
+     * @param  {String} key           Name of the property to check.
+     * @param  {Mixed} value          Value to search.
+     * @param  {Boolean} [forceCache] True to always get the value from cache, false otherwise. Default false.
+     * @return {Promise}              Promise resolved when the Lesson is retrieved.
+     */
+    function getLesson(siteId, courseId, key, value, forceCache) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getLessonDataCacheKey(courseId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            }
+
+            return site.read('mod_lesson_get_lessons_by_courses', params, preSets).then(function(response) {
+                if (response && response.lessons) {
+                    for (var i = 0; i < response.lessons.length; i++) {
+                        var lesson = response.lessons[i];
+                        if (lesson[key] == value) {
+                            return lesson;
+                        }
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a Lesson by module ID.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getLesson
+     * @param  {Number} courseId      Course ID.
+     * @param  {Number} cmid          Course module ID.
+     * @param  {String} [siteId]      Site ID. If not defined, current site.
+     * @param  {Boolean} [forceCache] True to always get the value from cache, false otherwise. Default false.
+     * @return {Promise}              Promise resolved when the Lesson is retrieved.
+     */
+    self.getLesson = function(courseId, cmid, siteId, forceCache) {
+        return getLesson(siteId, courseId, 'coursemodule', cmid, forceCache);
+    };
+
+    /**
+     * Get a Lesson by Lesson ID.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getLessonById
+     * @param  {Number} courseId      Course ID.
+     * @param  {Number} id            Lesson ID.
+     * @param  {String} [siteId]      Site ID. If not defined, current site.
+     * @param  {Boolean} [forceCache] True to always get the value from cache, false otherwise. Default false.
+     * @return {Promise}              Promise resolved when the Lesson is retrieved.
+     */
+    self.getLessonById = function(courseId, id, siteId, forceCache) {
+        return getLesson(siteId, courseId, 'id', id, forceCache);
+    };
+
+    /**
+     * Invalidates Lesson data.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateAccessInformation
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateAccessInformation = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getAccessInformationCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates Lesson data.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateLessonData
+     * @param  {Number} courseId Course ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateLessonData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getLessonDataCacheKey(courseId));
+        });
+    };
+
+    /**
+     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the lesson WS are available.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#isPluginEnabled
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     */
+    self.isPluginEnabled = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            // All WS were introduced at the same time so checking one is enough.
+            return site.wsAvailable('mod_lesson_get_lesson_access_information');
+        });
+    };
+
+    /**
+     * Report a lesson as being viewed.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#logViewLesson
+     * @param  {String} id         Module ID.
+     * @param  {String} [password] Lesson password (if any).
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved when the WS call is successful.
+     */
+    self.logViewLesson = function(id, password, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                lessonid: id
+            };
+
+            if (typeof password != 'undefined') {
+                params.password = password;
+            }
+
+            return site.write('mod_lesson_view_lesson', params).then(function(result) {
+                if (!result.status) {
+                    return $q.reject();
+                }
+            });
+        });
+    };
+
+    return self;
+});
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
new file mode 100644
index 00000000000..974bb3cee37
--- /dev/null
+++ b/www/addons/mod/lesson/templates/index.html
@@ -0,0 +1,20 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <mm-context-menu>
+            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
+            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="lessonLoaded && isOnline" content="'mm.core.refresh' | translate" action="refreshLesson(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+        </mm-context-menu>
+    </ion-nav-buttons>
+    <ion-content mm-state-class delegate-handle="mmaModLessonIndexScroll" >
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="lessonLoaded" on-refresh="refreshLesson(false)"></ion-refresher>
+        <mm-loading hide-until="lessonLoaded">
+            <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
+
+            <div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length" ng-repeat="message in preventMessages">
+                <i class="icon ion-information-circled padding"></i> {{ message.message }}
+            </div>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/quiz/main.js b/www/addons/mod/quiz/main.js
index 7dbe787749c..ffcf9a0193d 100644
--- a/www/addons/mod/quiz/main.js
+++ b/www/addons/mod/quiz/main.js
@@ -16,7 +16,6 @@ angular.module('mm.addons.mod_quiz', ['mm.core'])
 
 .constant('mmaModQuizComponent', 'mmaModQuiz')
 .constant('mmaModQuizCheckChangesInterval', 5000)
-.constant('mmaModQuizComponent', 'mmaModQuiz')
 .constant('mmaModQuizEventAttemptFinished', 'mma_mod_quiz_attempt_finished')
 .constant('mmaModQuizEventAutomSynced', 'mma_mod_quiz_autom_synced')
 .constant('mmaModQuizSyncTime', 300000) // In milliseconds.

From bad7d1ebb90896bb9b3daf15d436ee6ee4b1a321 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 6 Mar 2017 09:55:22 +0100
Subject: [PATCH 009/218] MOBILE-2010 lesson: Render lesson first page

---
 www/addons/mod/lesson/controllers/index.js  |  30 ++++-
 www/addons/mod/lesson/controllers/player.js |  96 ++++++++++++++
 www/addons/mod/lesson/lang/en.json          |   4 +
 www/addons/mod/lesson/main.js               |  15 +++
 www/addons/mod/lesson/services/lesson.js    | 138 ++++++++++++++++++++
 www/addons/mod/lesson/templates/index.html  |  17 +++
 www/addons/mod/lesson/templates/player.html |   9 ++
 7 files changed, 306 insertions(+), 3 deletions(-)
 create mode 100644 www/addons/mod/lesson/controllers/player.js
 create mode 100644 www/addons/mod/lesson/lang/en.json
 create mode 100644 www/addons/mod/lesson/templates/player.html

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index 87b16d777d3..67c58669df6 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -22,11 +22,12 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonIndexCtrl
  */
 .controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
-            $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, mmCoreEventOnlineStatusChanged) {
+            $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         lesson,
+        accessInfo,
         scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonIndexScroll'),
         onlineObserver;
 
@@ -44,13 +45,21 @@ angular.module('mm.addons.mod_lesson')
             lesson = lessonData;
             $scope.lesson = lesson;
 
-            $scope.now = Date.now();
             $scope.title = lesson.name || $scope.title;
             $scope.description = lesson.intro; // Show description only if intro is present.
 
             return $mmaModLesson.getAccessInformation(lesson.id);
         }).then(function(info) {
+            accessInfo = info;
             $scope.preventMessages = info.preventaccessreasons;
+            if ($scope.preventMessages && $scope.preventMessages.length) {
+                // Lesson cannot be attempted, stop.
+                return;
+            }
+
+            // Check to see if end of lesson was reached and if the user left.
+            $scope.leftDuringTimed = info.lastpageseen && info.lastpageseen != $mmaModLesson.LESSON_EOL &&
+                    info.leftduringtimedsession;
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModLessonComponent);
@@ -59,7 +68,9 @@ angular.module('mm.addons.mod_lesson')
                 // Get lesson failed, retry without using cache since it might be a new activity.
                 return refreshData();
             }
-            return $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
         });
     }
 
@@ -68,6 +79,9 @@ angular.module('mm.addons.mod_lesson')
         var promises = [];
 
         promises.push($mmaModLesson.invalidateLessonData(courseId));
+        if (lesson) {
+            promises.push($mmaModLesson.invalidateAccessInformation(lesson.id));
+        }
 
         return $q.all(promises).finally(function() {
             return fetchLessonData(true);
@@ -84,6 +98,16 @@ angular.module('mm.addons.mod_lesson')
         $scope.refreshIcon = 'ion-refresh';
     });
 
+    // Start the lesson.
+    $scope.start = function(continueLast) {
+        var pageId = $scope.leftDuringTimed ? (continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid) : false;
+        $state.go('site.mod_lesson-player', {
+            courseid: courseId,
+            lessonid: lesson.id,
+            pageid: pageId
+        });
+    };
+
     // Pull to refresh.
     $scope.refreshLesson = function() {
         if ($scope.lessonLoaded) {
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
new file mode 100644
index 00000000000..6393fb474ac
--- /dev/null
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -0,0 +1,96 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Lesson player controller.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc controller
+ * @name mmaModLessonPlayerCtrl
+ */
+.controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
+            mmaModLessonComponent, $mmSyncBlock) {
+
+    var lessonId = $stateParams.lessonid,
+        courseId = $stateParams.courseid,
+        pageId = $stateParams.pageid,
+        lesson,
+        accessInfo,
+        offline = false,
+        scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonPlayerScroll');
+
+    // Block the lesson so it cannot be synced.
+    $mmSyncBlock.blockOperation(mmaModLessonComponent, lessonId);
+
+    // Block leaving the view, we want to save changes before leaving.
+    blockData = $mmUtil.blockLeaveView($scope, leavePlayer);
+
+    $scope.component = mmaModLessonComponent;
+
+    // Convenience function to get Lesson data.
+    function fetchLessonData() {
+        return $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
+            lesson = lessonData;
+            $scope.lesson = lesson;
+            $scope.title = lesson.name; // Temporary title.
+
+            return $mmaModLesson.getAccessInformation(lesson.id, offline, true);
+        }).then(function(info) {
+            accessInfo = info;
+            if (info.preventaccessreasons && info.preventaccessreasons.length) {
+                // Lesson cannot be attempted, show message and go back.
+                $mmUtil.showErrorModal(info.preventaccessreasons[0]);
+                blockData && blockData.back();
+                return;
+            }
+
+            return launchAttempt(pageId);
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        });
+    }
+
+    // Start or continue an attempt.
+    function launchAttempt(pageId) {
+        return $mmaModLesson.launchAttempt(lesson.id, undefined, pageId).then(function() {
+            pageId = pageId || accessInfo.firstpageid;
+
+            return loadPage(pageId);
+        });
+    }
+
+    // Load a certain page.
+    function loadPage(pageId) {
+        return $mmaModLesson.getPageData(lesson.id, pageId, undefined, false, offline, true).then(function(data) {
+            $scope.title = data.page.title;
+            $scope.pageContent = data.page.contents;
+            $scope.pageLoaded = true;
+        });
+    }
+
+    // Function called when the user wants to leave the player. Save the attempt before leaving.
+    function leavePlayer() {
+        // @todo
+        return $q.when();
+    }
+
+    // Fetch the Lesson data.
+    fetchLessonData().finally(function() {
+        $scope.pageLoaded = true;
+    });
+
+});
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
new file mode 100644
index 00000000000..478d2e7c805
--- /dev/null
+++ b/www/addons/mod/lesson/lang/en.json
@@ -0,0 +1,4 @@
+{
+    "startattempt": "Start attempt",
+    "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
+}
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 6ec6d7b92da..6c2e84d69e0 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -32,6 +32,21 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
           templateUrl: 'addons/mod/lesson/templates/index.html'
         }
       }
+    })
+
+    .state('site.mod_lesson-player', {
+      url: '/mod_lesson-player',
+      params: {
+        courseid: null,
+        lessonid: null,
+        pageid: null
+      },
+      views: {
+        'site': {
+          controller: 'mmaModLessonPlayerCtrl',
+          templateUrl: 'addons/mod/lesson/templates/player.html'
+        }
+      }
     });
 
 })
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index e012450dc4d..aa225c2042c 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -27,6 +27,8 @@ angular.module('mm.addons.mod_lesson')
 
     var self = {};
 
+    self.LESSON_EOL = -9;
+
     /**
      * Get cache key for access information WS calls.
      *
@@ -148,6 +150,70 @@ angular.module('mm.addons.mod_lesson')
         return getLesson(siteId, courseId, 'id', id, forceCache);
     };
 
+    /**
+     * Get cache key for get page data WS calls.
+     *
+     * @param {Number} lessonId Lesson ID.
+     * @param {Number} pageId   Page ID.
+     * @return {String}         Cache key.
+     */
+    function getPageDataCacheKey(lessonId, pageId) {
+        return getPageDataCommonCacheKey(lessonId) + ':' + pageId;
+    }
+
+    /**
+     * Get common cache key for get page data WS calls.
+     *
+     * @param {Number} lessonId Lesson ID.
+     * @return {String}         Cache key.
+     */
+    function getPageDataCommonCacheKey(lessonId) {
+        return 'mmaModLesson:pageData:' + lessonId;
+    }
+
+    /**
+     * Get the access information of a certain lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getAccessInformation
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Number} pageId       Page ID.
+     * @param  {String} [password]   Lesson password (if any).
+     * @param  {Boolean} [review]    If the user wants to review just after finishing (1 hour margin).
+     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved with the access information-
+     */
+    self.getPageData = function(lessonId, pageId, password, review, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId,
+                    pageid: pageId
+                },
+                preSets = {
+                    cacheKey: getPageDataCacheKey(lessonId, pageId)
+                };
+
+            if (typeof password != 'undefined') {
+                params.password = password;
+            }
+            if (review) {
+                params.review = true;
+            }
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_page_data', params, preSets);
+        });
+    };
+
     /**
      * Invalidates Lesson data.
      *
@@ -180,6 +246,39 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates page data for all pages.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidatePageData
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidatePageData = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getPageDataCommonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates page data for a certain page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidatePageDataForPage
+     * @param  {Number} lessonId Attempt ID.
+     * @param  {Number} pageId   Page ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidatePageDataForPage = function(lessonId, pageId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getPageDataCacheKey(lessonId, pageId));
+        });
+    };
+
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the lesson WS are available.
      *
@@ -196,6 +295,44 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Start or continue an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#launchAttempt
+     * @param  {String} id         Lesson ID.
+     * @param  {String} [password] Lesson password (if any).
+     * @param  {Number} [pageId]   Page id to continue from (only when continuing an attempt).
+     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved when the WS call is successful.
+     */
+    self.launchAttempt = function(id, password, pageId, review, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                lessonid: id
+            };
+
+            if (typeof password != 'undefined') {
+                params.password = password;
+            }
+            if (typeof pageId == 'number') {
+                params.pageid = pageId;
+            }
+            if (review) {
+                params.review = true;
+            }
+
+            return site.write('mod_lesson_launch_attempt', params).then(function(result) {
+                if (!result.status) {
+                    return $q.reject();
+                }
+                return result;
+            });
+        });
+    };
+
     /**
      * Report a lesson as being viewed.
      *
@@ -221,6 +358,7 @@ angular.module('mm.addons.mod_lesson')
                 if (!result.status) {
                     return $q.reject();
                 }
+                return result;
             });
         });
     };
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 974bb3cee37..fe484f144a7 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -15,6 +15,23 @@
             <div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length" ng-repeat="message in preventMessages">
                 <i class="icon ion-information-circled padding"></i> {{ message.message }}
             </div>
+
+            <div ng-if="lesson && (!preventMessages || !preventMessages.length)">
+                <div ng-if="leftDuringTimed" class="card">
+                    <!-- User left during the session, ask to continue. -->
+                    <p class="item" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
+                    <div class="item button-bar">
+                        <button class="button" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
+                        <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
+                    </div>
+                </div>
+                <div ng-if="!leftDuringTimed" class="card">
+                    <!-- User hasn't left during the session, show a start button. -->
+                    <div class="item">
+                        <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
+                    </div>
+                </div>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
new file mode 100644
index 00000000000..0c6b1def76f
--- /dev/null
+++ b/www/addons/mod/lesson/templates/player.html
@@ -0,0 +1,9 @@
+<ion-view can-swipe-back="false">
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-content padding="true" mm-state-class delegate-handle="mmaModLessonPlayerScroll">
+        <mm-loading hide-until="pageLoaded">
+            <!-- TODO: Print questions and buttons. -->
+            <mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file

From 5e83b337352a2d271dc67cb961fee576f980cfd0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 7 Mar 2017 12:05:35 +0100
Subject: [PATCH 010/218] MOBILE-2010 lesson: Show buttons and allow navigating

---
 www/addons/mod/lesson/controllers/index.js  | 38 +++++++++-
 www/addons/mod/lesson/controllers/player.js | 54 ++++++++++++--
 www/addons/mod/lesson/lang/en.json          |  2 +
 www/addons/mod/lesson/services/helper.js    | 81 +++++++++++++++++++++
 www/addons/mod/lesson/services/lesson.js    | 65 ++++++++++++-----
 www/addons/mod/lesson/templates/player.html | 16 +++-
 6 files changed, 225 insertions(+), 31 deletions(-)
 create mode 100644 www/addons/mod/lesson/services/helper.js

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index 67c58669df6..fffaa4fb056 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -22,13 +22,14 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonIndexCtrl
  */
 .controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
-            $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged) {
+            $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged,
+            $ionicHistory) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         lesson,
         accessInfo,
-        scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonIndexScroll'),
+        scrollView,
         onlineObserver;
 
     $scope.title = module.name;
@@ -88,6 +89,21 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    function showSpinnerAndRefresh() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonIndexScroll');
+        }
+
+        $scope.lessonLoaded = false;
+        $scope.refreshIcon = 'spinner';
+        scrollView.scrollTop();
+
+        refreshData().finally(function() {
+            $scope.lessonLoaded = true;
+            $scope.refreshIcon = 'ion-refresh';
+        });
+    }
+
     // Fetch the Lesson data.
     fetchLessonData().then(function() {
         $mmaModLesson.logViewLesson(lesson.id).then(function() {
@@ -124,7 +140,23 @@ angular.module('mm.addons.mod_lesson')
         $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModLessonComponent, module.id);
     };
 
-    // Refresh online status when changes.
+    // Update data when we come back from the player since the status could have changed.
+    // We want to skip the first $ionicView.enter event because it's when the view is created.
+    var skip = true;
+    $scope.$on('$ionicView.enter', function() {
+        if (skip) {
+            skip = false;
+            return;
+        }
+
+        var forwardView = $ionicHistory.forwardView();
+        if (forwardView && forwardView.stateName === 'site.mod_lesson-player') {
+            // Refresh data.
+            showSpinnerAndRefresh();
+        }
+    });
+
+    // Update online status when changes.
     onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
         $scope.isOnline = online;
     });
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 6393fb474ac..372893c522a 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -22,15 +22,15 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonPlayerCtrl
  */
 .controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
-            mmaModLessonComponent, $mmSyncBlock) {
+            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper) {
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
-        pageId = $stateParams.pageid,
+        currentPage = $stateParams.pageid,
         lesson,
         accessInfo,
         offline = false,
-        scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonPlayerScroll');
+        scrollView;
 
     // Block the lesson so it cannot be synced.
     $mmSyncBlock.blockOperation(mmaModLessonComponent, lessonId);
@@ -57,7 +57,7 @@ angular.module('mm.addons.mod_lesson')
                 return;
             }
 
-            return launchAttempt(pageId);
+            return launchAttempt(currentPage);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
@@ -67,21 +67,32 @@ angular.module('mm.addons.mod_lesson')
     // Start or continue an attempt.
     function launchAttempt(pageId) {
         return $mmaModLesson.launchAttempt(lesson.id, undefined, pageId).then(function() {
-            pageId = pageId || accessInfo.firstpageid;
+            currentPage = pageId || accessInfo.firstpageid;
 
-            return loadPage(pageId);
+            return loadPage(currentPage);
         });
     }
 
     // Load a certain page.
     function loadPage(pageId) {
-        return $mmaModLesson.getPageData(lesson.id, pageId, undefined, false, offline, true).then(function(data) {
+        return $mmaModLesson.getPageData(lesson.id, pageId, undefined, false, true, offline, true).then(function(data) {
             $scope.title = data.page.title;
             $scope.pageContent = data.page.contents;
             $scope.pageLoaded = true;
+            $scope.pageButtons = $mmaModLessonHelper.getPageButtonsFromHtml(data.pagecontent);
+            currentPage = pageId;
         });
     }
 
+    // Scroll top and show the spinner.
+    function showLoading() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonPlayerScroll');
+        }
+        scrollView.scrollTop();
+        $scope.pageLoaded = false;
+    }
+
     // Function called when the user wants to leave the player. Save the attempt before leaving.
     function leavePlayer() {
         // @todo
@@ -93,4 +104,33 @@ angular.module('mm.addons.mod_lesson')
         $scope.pageLoaded = true;
     });
 
+    // A button was clicked.
+    $scope.buttonClicked = function(button) {
+        showLoading();
+
+        return $mmaModLesson.processPage(lessonId, currentPage, button.data).then(function(result) {
+            if (result.newpageid === 0) {
+                // Not a valid page, return to entry view.
+                // This happens, for example, when the user clicks to go to previous page and there is no previous page.
+                blockData && blockData.back();
+                return;
+            } else if (result.newpageid == $mmaModLesson.LESSON_EOL) {
+                // End of lesson reached.
+                // @todo Show grade, progress bar, min questions, etc. in final page.
+                $scope.endOfLesson = true;
+                $scope.title = lesson.name;
+                return;
+            }
+
+            $scope.endOfLesson = false;
+            // Load new page.
+            return loadPage(result.newpageid);
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'Error processing page');
+            return $q.reject();
+        }).finally(function() {
+            $scope.pageLoaded = true;
+        });
+    };
+
 });
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 478d2e7c805..67353aa7675 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,4 +1,6 @@
 {
+    "congratulations": "Congratulations - end of lesson reached",
     "startattempt": "Start attempt",
+    "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
new file mode 100644
index 00000000000..743e026ac6b
--- /dev/null
+++ b/www/addons/mod/lesson/services/helper.js
@@ -0,0 +1,81 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Helper to gather some common lesson functions.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc service
+ * @name $mmaModLessonHelper
+ */
+.factory('$mmaModLessonHelper', function() {
+
+    var self = {};
+
+    /**
+     * Get the buttons to change pages.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getPageButtonsFromHtml
+     * @param  {String} html Page's HTML.
+     * @return {Object[]}    List of buttons.
+     */
+    self.getPageButtonsFromHtml = function(html) {
+        var buttons = [],
+            rootElement = document.createElement('div'),
+            buttonsContainer,
+            forms;
+
+        // Get the container of the buttons if it exists.
+        rootElement.innerHTML = html;
+        buttonsContainer = rootElement.querySelector('.branchbuttoncontainer');
+
+        if (!buttonsContainer) {
+            // Button container not found, no buttons.
+            return buttons;
+        }
+
+        forms = buttonsContainer.querySelectorAll('form');
+        angular.forEach(forms, function(form) {
+            var buttonEl = form.querySelector('button[type="submit"]'),
+                inputs = form.querySelectorAll('input'),
+                button;
+
+            if (!buttonEl || !inputs || !inputs.length) {
+                // Button not found or no inputs, ignore it.
+                return;
+            }
+
+            button = {
+                id: buttonEl.id,
+                title: buttonEl.title,
+                content: buttonEl.innerHTML,
+                data: {}
+            };
+
+            angular.forEach(inputs, function(input) {
+                button.data[input.name] = input.value;
+            });
+
+            buttons.push(button);
+        });
+
+        return buttons;
+    };
+
+    return self;
+});
\ No newline at end of file
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index aa225c2042c..64d718712e9 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLesson
  */
-.factory('$mmaModLesson', function($log, $mmSitesManager, $q) {
+.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil) {
 
     $log = $log.getInstance('$mmaModLesson');
 
@@ -177,20 +177,23 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getAccessInformation
-     * @param  {Number} lessonId     Lesson ID.
-     * @param  {Number} pageId       Page ID.
-     * @param  {String} [password]   Lesson password (if any).
-     * @param  {Boolean} [review]    If the user wants to review just after finishing (1 hour margin).
-     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}             Promise resolved with the access information-
+     * @param  {Number} lessonId           Lesson ID.
+     * @param  {Number} pageId             Page ID.
+     * @param  {String} [password]         Lesson password (if any).
+     * @param  {Boolean} [review]          If the user wants to review just after finishing (1 hour margin).
+     * @param  {Boolean} [includeContents] Include the page rendered contents.
+     * @param  {Boolean} forceCache        True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache       True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]           Site ID. If not defined, current site.
+     * @return {Promise}                   Promise resolved with the access information-
      */
-    self.getPageData = function(lessonId, pageId, password, review, forceCache, ignoreCache, siteId) {
+    self.getPageData = function(lessonId, pageId, password, review, includeContents, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     lessonid: lessonId,
-                    pageid: pageId
+                    pageid: pageId,
+                    review: review ? 1 : 0,
+                    returncontents: includeContents ? 1 : 0
                 },
                 preSets = {
                     cacheKey: getPageDataCacheKey(lessonId, pageId)
@@ -199,9 +202,6 @@ angular.module('mm.addons.mod_lesson')
             if (typeof password != 'undefined') {
                 params.password = password;
             }
-            if (review) {
-                params.review = true;
-            }
 
             if (forceCache) {
                 preSets.omitExpires = true;
@@ -311,7 +311,8 @@ angular.module('mm.addons.mod_lesson')
     self.launchAttempt = function(id, password, pageId, review, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
-                lessonid: id
+                lessonid: id,
+                review: review ? 1 : 0
             };
 
             if (typeof password != 'undefined') {
@@ -320,9 +321,6 @@ angular.module('mm.addons.mod_lesson')
             if (typeof pageId == 'number') {
                 params.pageid = pageId;
             }
-            if (review) {
-                params.review = true;
-            }
 
             return site.write('mod_lesson_launch_attempt', params).then(function(result) {
                 if (!result.status) {
@@ -363,5 +361,36 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Process a lesson page, saving its data.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#processAttempt
+     * @param  {Number} lessonId   Lesson ID.
+     * @param  {Number} pageId     Page ID.
+     * @param  {Object} data       Data to save.
+     * @param  {String} [password] Lesson password (if any).
+     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved in success, rejected otherwise.
+     */
+    self.processPage = function(lessonId, pageId, data, password, review, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                lessonid: lessonId,
+                pageid: pageId,
+                data: $mmUtil.objectToArrayOfObjects(data, 'name', 'value'),
+                review: review ? 1 : 0
+            };
+
+            if (typeof password != 'undefined') {
+                params.password = password;
+            }
+
+            return site.write('mod_lesson_process_page', params);
+        });
+    };
+
     return self;
 });
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 0c6b1def76f..abcc4a02627 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -1,9 +1,19 @@
 <ion-view can-swipe-back="false">
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
-    <ion-content padding="true" mm-state-class delegate-handle="mmaModLessonPlayerScroll">
+    <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">
-            <!-- TODO: Print questions and buttons. -->
-            <mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
+            <div ng-if="!endOfLesson" class="list">
+                <!-- TODO: Print questions. -->
+                <mm-format-text class="item" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
+                <div ng-if="pageButtons && pageButtons.length" class="item">
+                    <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button)">{{button.content}}</button>
+                </div>
+            </div>
+            <!-- End of lesson reached. -->
+            <div ng-if="endOfLesson" class="padding">
+                <h3>{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
+                <p>{{ 'mma.mod_lesson.welldone' | translate }}</p>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file

From 403176e3858538769fcf95e821f512db3bea8166 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 9 Mar 2017 10:54:23 +0100
Subject: [PATCH 011/218] MOBILE-2010 lesson: Call finish attempt and print EOL
 page

---
 www/addons/mod/lesson/controllers/player.js | 12 ++++--
 www/addons/mod/lesson/lang/en.json          |  1 -
 www/addons/mod/lesson/services/lesson.js    | 45 +++++++++++++++++++++
 www/addons/mod/lesson/templates/player.html | 22 ++++++++--
 4 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 372893c522a..2250ae506e5 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -84,6 +84,13 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    // Finish the attempt.
+    function finishAttempt() {
+        return $mmaModLesson.finishAttempt(lesson.id).then(function(data) {
+            $scope.eolData = data.data;
+        });
+    }
+
     // Scroll top and show the spinner.
     function showLoading() {
         if (!scrollView) {
@@ -117,13 +124,12 @@ angular.module('mm.addons.mod_lesson')
             } else if (result.newpageid == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
                 // @todo Show grade, progress bar, min questions, etc. in final page.
-                $scope.endOfLesson = true;
                 $scope.title = lesson.name;
-                return;
+                return finishAttempt();
             }
 
-            $scope.endOfLesson = false;
             // Load new page.
+            $scope.eolData = false;
             return loadPage(result.newpageid);
         }).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'Error processing page');
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 67353aa7675..10893131120 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,6 +1,5 @@
 {
     "congratulations": "Congratulations - end of lesson reached",
     "startattempt": "Start attempt",
-    "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 64d718712e9..b491ce5403b 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -29,6 +29,51 @@ angular.module('mm.addons.mod_lesson')
 
     self.LESSON_EOL = -9;
 
+    /**
+     * Finishes an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#finishAttempt
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {String} [password]   Lesson password (if any).
+     * @param  {Boolean} [outOfTime] If the user ran out of time.
+     * @param  {Boolean} [review]    If the user wants to review just after finishing (1 hour margin).
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved in success, rejected otherwise.
+     */
+    self.finishAttempt = function(lessonId, password, outOfTime, review, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                lessonid: lessonId,
+                outoftime: outOfTime ? 1 : 0,
+                review: review ? 1 : 0
+            };
+
+            if (typeof password != 'undefined') {
+                params.password = password;
+            }
+
+            return site.write('mod_lesson_finish_attempt', params).then(function(response) {
+                // Convert the data array into an object and decode the values.
+                var map = {};
+                angular.forEach(response.data, function(entry) {
+                    if (entry.value && typeof entry.value == 'string' && entry.value !== '1') {
+                        // It's a JSON encoded object. Try to decode it.
+                        try {
+                            entry.value = JSON.parse(entry.value);
+                        } catch(ex) {
+                            // Error decoding it, leave the value as it is.
+                        }
+                    }
+                    map[entry.name] = entry;
+                });
+                response.data = map;
+                return response;
+            });
+        });
+    };
+
     /**
      * Get cache key for access information WS calls.
      *
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index abcc4a02627..8742d26b2b1 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -2,7 +2,7 @@
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">
-            <div ng-if="!endOfLesson" class="list">
+            <div ng-if="!eolData" class="list">
                 <!-- TODO: Print questions. -->
                 <mm-format-text class="item" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
                 <div ng-if="pageButtons && pageButtons.length" class="item">
@@ -10,9 +10,23 @@
                 </div>
             </div>
             <!-- End of lesson reached. -->
-            <div ng-if="endOfLesson" class="padding">
-                <h3>{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
-                <p>{{ 'mma.mod_lesson.welldone' | translate }}</p>
+            <div ng-if="eolData" class="padding">
+                <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
+                <p ng-if="eolData.notenoughtimespent">{{ eolData.notenoughtimespent.message }}</p>
+                <p ng-if="eolData.numberofpagesviewed">{{ eolData.numberofpagesviewed.message }}</p>
+                <p ng-if="eolData.youshouldview">{{ eolData.youshouldview.message }}</p>
+                <p ng-if="eolData.numberofcorrectanswers">{{ eolData.numberofcorrectanswers.message }}</p>
+                <p ng-if="eolData.displayscorewithessays">{{ eolData.displayscorewithessays.message }}</p>
+                <p ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays">{{ eolData.displayscorewithoutessays.message }}</p>
+                <p ng-if="eolData.yourcurrentgradeisoutof">{{ eolData.yourcurrentgradeisoutof.message }}</p>
+                <p ng-if="eolData.eolstudentoutoftimenoanswers">{{ eolData.eolstudentoutoftimenoanswers.message }}</p>
+                <p ng-if="eolData.welldone">{{ eolData.welldone.message }}</p>
+                <!-- @todo progress bar -->
+                <p ng-if="eolData.displayofgrade">{{ eolData.displayofgrade.message }}</p>
+                <p ng-if="eolData.reviewlesson">{{ eolData.reviewlesson.message }}</p>
+                <p ng-if="eolData.modattemptsnoteacher">{{ eolData.modattemptsnoteacher.message }}</p>
+                <!-- @todo Activity link. -->
+                <!-- @todo Return & grade links. -->
             </div>
         </mm-loading>
     </ion-content>

From 582ecb49761cff26aacf0f7baf29ad9814f9b27e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 9 Mar 2017 17:04:01 +0100
Subject: [PATCH 012/218] MOBILE-2011 lesson: Display lesson menu

---
 www/addons/mod/lesson/controllers/player.js | 63 +++++++++++++++++---
 www/addons/mod/lesson/lang/en.json          |  1 +
 www/addons/mod/lesson/scss/styles.scss      |  4 ++
 www/addons/mod/lesson/services/lesson.js    | 65 ++++++++++++++++++---
 www/addons/mod/lesson/templates/menu.html   | 17 ++++++
 www/addons/mod/lesson/templates/player.html |  3 +
 6 files changed, 138 insertions(+), 15 deletions(-)
 create mode 100644 www/addons/mod/lesson/scss/styles.scss
 create mode 100644 www/addons/mod/lesson/templates/menu.html

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 2250ae506e5..563ab3522b7 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -22,11 +22,10 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonPlayerCtrl
  */
 .controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
-            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper) {
+            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu) {
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
-        currentPage = $stateParams.pageid,
         lesson,
         accessInfo,
         offline = false,
@@ -39,6 +38,7 @@ angular.module('mm.addons.mod_lesson')
     blockData = $mmUtil.blockLeaveView($scope, leavePlayer);
 
     $scope.component = mmaModLessonComponent;
+    $scope.currentPage = $stateParams.pageid;
 
     // Convenience function to get Lesson data.
     function fetchLessonData() {
@@ -57,7 +57,7 @@ angular.module('mm.addons.mod_lesson')
                 return;
             }
 
-            return launchAttempt(currentPage);
+            return launchAttempt($scope.currentPage);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
@@ -67,9 +67,9 @@ angular.module('mm.addons.mod_lesson')
     // Start or continue an attempt.
     function launchAttempt(pageId) {
         return $mmaModLesson.launchAttempt(lesson.id, undefined, pageId).then(function() {
-            currentPage = pageId || accessInfo.firstpageid;
+            $scope.currentPage = pageId || accessInfo.firstpageid;
 
-            return loadPage(currentPage);
+            return loadPage($scope.currentPage);
         });
     }
 
@@ -80,7 +80,13 @@ angular.module('mm.addons.mod_lesson')
             $scope.pageContent = data.page.contents;
             $scope.pageLoaded = true;
             $scope.pageButtons = $mmaModLessonHelper.getPageButtonsFromHtml(data.pagecontent);
-            currentPage = pageId;
+            $scope.currentPage = pageId;
+
+            if (data.displaymenu && !$scope.displayMenu) {
+                // Load the menu.
+                loadMenu();
+            }
+            $scope.displayMenu = !!data.displaymenu;
         });
     }
 
@@ -106,6 +112,26 @@ angular.module('mm.addons.mod_lesson')
         return $q.when();
     }
 
+    // Load the lesson menu.
+    function loadMenu() {
+        if ($scope.loadingMenu) {
+            // Already loading.
+            return;
+        }
+
+        $scope.loadingMenu = true;
+        return $mmaModLesson.getPages(lesson.id).then(function(pages) {
+            $scope.lessonPages = pages.map(function(entry) {
+                return entry.page;
+            });
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'Error loading menu.');
+            return $q.reject();
+        }).finally(function() {
+            $scope.loadingMenu = false;
+        });
+    }
+
     // Fetch the Lesson data.
     fetchLessonData().finally(function() {
         $scope.pageLoaded = true;
@@ -115,7 +141,7 @@ angular.module('mm.addons.mod_lesson')
     $scope.buttonClicked = function(button) {
         showLoading();
 
-        return $mmaModLesson.processPage(lessonId, currentPage, button.data).then(function(result) {
+        return $mmaModLesson.processPage(lessonId, $scope.currentPage, button.data).then(function(result) {
             if (result.newpageid === 0) {
                 // Not a valid page, return to entry view.
                 // This happens, for example, when the user clicks to go to previous page and there is no previous page.
@@ -139,4 +165,27 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    // Menu page was clicked, load the page.
+    $scope.loadPage = function(pageId) {
+        if (!$scope.eolData && $scope.currentPage == pageId) {
+            // Page already loaded, stop.
+            return;
+        }
+
+        showLoading();
+
+        return loadPage(pageId).then(function() {
+            // Page loaded, hide the EOL page if shown.
+            $scope.eolData = false;
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'Error loading page');
+            return $q.reject();
+        }).finally(function() {
+            $scope.pageLoaded = true;
+        });
+    };
+
+    // Setup right side menu.
+    $mmSideMenu.showRightSideMenu('addons/mod/lesson/templates/menu.html', $scope);
+
 });
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 10893131120..332ad628549 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,5 +1,6 @@
 {
     "congratulations": "Congratulations - end of lesson reached",
+    "lessonmenu": "Lesson menu",
     "startattempt": "Start attempt",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
new file mode 100644
index 00000000000..ce2ffa30c90
--- /dev/null
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -0,0 +1,4 @@
+
+.item.mma-mod-lesson-selected {
+  font-weight: bold;
+}
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index b491ce5403b..688bcec0c9f 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -50,7 +50,7 @@ angular.module('mm.addons.mod_lesson')
                 review: review ? 1 : 0
             };
 
-            if (typeof password != 'undefined') {
+            if (typeof password == 'string') {
                 params.password = password;
             }
 
@@ -217,11 +217,11 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Get the access information of a certain lesson.
+     * Get page data.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#getAccessInformation
+     * @name $mmaModLesson#getPageData
      * @param  {Number} lessonId           Lesson ID.
      * @param  {Number} pageId             Page ID.
      * @param  {String} [password]         Lesson password (if any).
@@ -230,7 +230,7 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Boolean} forceCache        True if it should return cached data. Has priority over ignoreCache.
      * @param  {Boolean} ignoreCache       True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]           Site ID. If not defined, current site.
-     * @return {Promise}                   Promise resolved with the access information-
+     * @return {Promise}                   Promise resolved with the page data.
      */
     self.getPageData = function(lessonId, pageId, password, review, includeContents, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -244,7 +244,7 @@ angular.module('mm.addons.mod_lesson')
                     cacheKey: getPageDataCacheKey(lessonId, pageId)
                 };
 
-            if (typeof password != 'undefined') {
+            if (typeof password == 'string') {
                 params.password = password;
             }
 
@@ -259,6 +259,55 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get cache key for get pages WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}          Cache key.
+     */
+    function getPagesCacheKey(lessonId) {
+        return 'mmaModLesson:pages:' + lessonId;
+    }
+
+    /**
+     * Get lesson pages.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getPages
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {String} [password]   Lesson password (if any).
+     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved with the pages.
+     */
+    self.getPages = function(lessonId, password, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId,
+                },
+                preSets = {
+                    cacheKey: getPagesCacheKey(lessonId)
+                };
+
+            if (typeof password == 'string') {
+                params.password = password;
+            }
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_pages', params, preSets).then(function(response) {
+                return response.pages;
+            });
+        });
+    };
+
     /**
      * Invalidates Lesson data.
      *
@@ -360,7 +409,7 @@ angular.module('mm.addons.mod_lesson')
                 review: review ? 1 : 0
             };
 
-            if (typeof password != 'undefined') {
+            if (typeof password == 'string') {
                 params.password = password;
             }
             if (typeof pageId == 'number') {
@@ -393,7 +442,7 @@ angular.module('mm.addons.mod_lesson')
                 lessonid: id
             };
 
-            if (typeof password != 'undefined') {
+            if (typeof password == 'string') {
                 params.password = password;
             }
 
@@ -429,7 +478,7 @@ angular.module('mm.addons.mod_lesson')
                 review: review ? 1 : 0
             };
 
-            if (typeof password != 'undefined') {
+            if (typeof password == 'string') {
                 params.password = password;
             }
 
diff --git a/www/addons/mod/lesson/templates/menu.html b/www/addons/mod/lesson/templates/menu.html
new file mode 100644
index 00000000000..4cf15ab2030
--- /dev/null
+++ b/www/addons/mod/lesson/templates/menu.html
@@ -0,0 +1,17 @@
+<ion-content id="mma-mod-lesson-menu">
+    <nav>
+        <ul class="list">
+            <div ng-if="rsmScope.displayMenu">
+                <li class="item item-divider"><h2>{{ 'mma.mod_lesson.lessonmenu' | translate }}</h2></li>
+                <div class="item text-center" ng-if="rsmScope.loadingMenu">
+                    <ion-spinner></ion-spinner>
+                </div>
+                <div ng-if="!rsmScope.loadingMenu">
+                    <a menu-close class="item item-text-wrap" ng-repeat="page in rsmScope.lessonPages" ng-if="page.display && page.displayinmenublock" ng-click="rsmScope.loadPage(page.id)" ng-class='{"mma-mod-lesson-selected": !rsmScope.eolData && rsmScope.currentPage == page.id}'>
+                        <p><mm-format-text watch="true">{{page.title}}</mm-format-text></p>
+                    </a>
+                </div>
+            </div>
+        </ul>
+    </nav>
+</ion-content>
\ No newline at end of file
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 8742d26b2b1..d4d89c8e110 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -1,5 +1,8 @@
 <ion-view can-swipe-back="false">
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <button menu-toggle="right" ng-if="displayMenu" class="button button-icon icon ion-bookmark" aria-label="{{ 'mma.mod_lesson.lessonmenu' | translate }}"></button>
+    </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">
             <div ng-if="!eolData" class="list">

From 8ccd60188f46285466fbd14fbb4ec6585f1bf222 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Mar 2017 10:14:45 +0100
Subject: [PATCH 013/218] MOBILE-2011 lesson: Display media file

---
 www/addons/mod/lesson/controllers/player.js | 1 +
 www/addons/mod/lesson/lang/en.json          | 1 +
 www/addons/mod/lesson/templates/menu.html   | 6 ++++++
 www/addons/mod/lesson/templates/player.html | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 563ab3522b7..6fc646caff8 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -46,6 +46,7 @@ angular.module('mm.addons.mod_lesson')
             lesson = lessonData;
             $scope.lesson = lesson;
             $scope.title = lesson.name; // Temporary title.
+            $scope.mediaFile = lesson.mediafiles && lesson.mediafiles[0];
 
             return $mmaModLesson.getAccessInformation(lesson.id, offline, true);
         }).then(function(info) {
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 332ad628549..aaa7481553a 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,6 +1,7 @@
 {
     "congratulations": "Congratulations - end of lesson reached",
     "lessonmenu": "Lesson menu",
+    "linkedmedia": "Linked media",
     "startattempt": "Start attempt",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/templates/menu.html b/www/addons/mod/lesson/templates/menu.html
index 4cf15ab2030..2f7ea8a4ac9 100644
--- a/www/addons/mod/lesson/templates/menu.html
+++ b/www/addons/mod/lesson/templates/menu.html
@@ -1,6 +1,12 @@
 <ion-content id="mma-mod-lesson-menu">
     <nav>
         <ul class="list">
+            <!-- Media file. -->
+            <div ng-if="rsmScope.mediaFile">
+                <li class="item item-divider"><h2>{{ 'mma.mod_lesson.linkedmedia' | translate }}</h2></li>
+                <mm-file file="rsmScope.mediaFile" component="{{rsmScope.component}}" component-id="{{rsmScope.lesson.coursemodule}}" timemodified="{{rsmScope.mediaFile.timemodified}}"></mm-file>
+            </div>
+            <!-- Lesson menu. -->
             <div ng-if="rsmScope.displayMenu">
                 <li class="item item-divider"><h2>{{ 'mma.mod_lesson.lessonmenu' | translate }}</h2></li>
                 <div class="item text-center" ng-if="rsmScope.loadingMenu">
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index d4d89c8e110..3c29d09561a 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -1,7 +1,7 @@
 <ion-view can-swipe-back="false">
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-nav-buttons side="secondary">
-        <button menu-toggle="right" ng-if="displayMenu" class="button button-icon icon ion-bookmark" aria-label="{{ 'mma.mod_lesson.lessonmenu' | translate }}"></button>
+        <button menu-toggle="right" ng-if="displayMenu || mediaFile" class="button button-icon icon ion-bookmark" aria-label="{{ 'mma.mod_lesson.lessonmenu' | translate }}"></button>
     </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">

From 41db0c96482638b67c28651baabb3afe8ba17f9a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Mar 2017 10:57:05 +0100
Subject: [PATCH 014/218] MOBILE-2011 lesson: Support slideshow mode

---
 www/addons/mod/lesson/controllers/player.js |  3 ++
 www/addons/mod/lesson/scss/styles.scss      |  5 +++
 www/addons/mod/lesson/templates/player.html | 50 +++++++++++----------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 6fc646caff8..8398b475fda 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -48,6 +48,9 @@ angular.module('mm.addons.mod_lesson')
             $scope.title = lesson.name; // Temporary title.
             $scope.mediaFile = lesson.mediafiles && lesson.mediafiles[0];
 
+            $scope.lessonWidth = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediawidth) : '';
+            $scope.lessonHeight = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediaheight) : '';
+
             return $mmaModLesson.getAccessInformation(lesson.id, offline, true);
         }).then(function(info) {
             accessInfo = info;
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
index ce2ffa30c90..383cde10dbf 100644
--- a/www/addons/mod/lesson/scss/styles.scss
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -2,3 +2,8 @@
 .item.mma-mod-lesson-selected {
   font-weight: bold;
 }
+
+.mma-mod-lesson-slideshow {
+  max-width: 100%;
+  max-height: 100%;
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 3c29d09561a..730a6dfff4a 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -5,31 +5,33 @@
     </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">
-            <div ng-if="!eolData" class="list">
-                <!-- TODO: Print questions. -->
-                <mm-format-text class="item" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
-                <div ng-if="pageButtons && pageButtons.length" class="item">
-                    <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button)">{{button.content}}</button>
+            <div ng-class='{"mma-mod-lesson-slideshow": lesson.slideshow}' ng-style="{'width': lessonWidth, 'height': lessonHeight}">
+                <div ng-if="!eolData" class="list">
+                    <!-- TODO: Print questions. -->
+                    <mm-format-text class="item item-text-wrap" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
+                    <div ng-if="pageButtons && pageButtons.length" class="item">
+                        <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button)">{{button.content}}</button>
+                    </div>
+                </div>
+                <!-- End of lesson reached. -->
+                <div ng-if="eolData" class="padding">
+                    <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
+                    <p ng-if="eolData.notenoughtimespent">{{ eolData.notenoughtimespent.message }}</p>
+                    <p ng-if="eolData.numberofpagesviewed">{{ eolData.numberofpagesviewed.message }}</p>
+                    <p ng-if="eolData.youshouldview">{{ eolData.youshouldview.message }}</p>
+                    <p ng-if="eolData.numberofcorrectanswers">{{ eolData.numberofcorrectanswers.message }}</p>
+                    <p ng-if="eolData.displayscorewithessays">{{ eolData.displayscorewithessays.message }}</p>
+                    <p ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays">{{ eolData.displayscorewithoutessays.message }}</p>
+                    <p ng-if="eolData.yourcurrentgradeisoutof">{{ eolData.yourcurrentgradeisoutof.message }}</p>
+                    <p ng-if="eolData.eolstudentoutoftimenoanswers">{{ eolData.eolstudentoutoftimenoanswers.message }}</p>
+                    <p ng-if="eolData.welldone">{{ eolData.welldone.message }}</p>
+                    <!-- @todo progress bar -->
+                    <p ng-if="eolData.displayofgrade">{{ eolData.displayofgrade.message }}</p>
+                    <p ng-if="eolData.reviewlesson">{{ eolData.reviewlesson.message }}</p>
+                    <p ng-if="eolData.modattemptsnoteacher">{{ eolData.modattemptsnoteacher.message }}</p>
+                    <!-- @todo Activity link. -->
+                    <!-- @todo Return & grade links. -->
                 </div>
-            </div>
-            <!-- End of lesson reached. -->
-            <div ng-if="eolData" class="padding">
-                <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
-                <p ng-if="eolData.notenoughtimespent">{{ eolData.notenoughtimespent.message }}</p>
-                <p ng-if="eolData.numberofpagesviewed">{{ eolData.numberofpagesviewed.message }}</p>
-                <p ng-if="eolData.youshouldview">{{ eolData.youshouldview.message }}</p>
-                <p ng-if="eolData.numberofcorrectanswers">{{ eolData.numberofcorrectanswers.message }}</p>
-                <p ng-if="eolData.displayscorewithessays">{{ eolData.displayscorewithessays.message }}</p>
-                <p ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays">{{ eolData.displayscorewithoutessays.message }}</p>
-                <p ng-if="eolData.yourcurrentgradeisoutof">{{ eolData.yourcurrentgradeisoutof.message }}</p>
-                <p ng-if="eolData.eolstudentoutoftimenoanswers">{{ eolData.eolstudentoutoftimenoanswers.message }}</p>
-                <p ng-if="eolData.welldone">{{ eolData.welldone.message }}</p>
-                <!-- @todo progress bar -->
-                <p ng-if="eolData.displayofgrade">{{ eolData.displayofgrade.message }}</p>
-                <p ng-if="eolData.reviewlesson">{{ eolData.reviewlesson.message }}</p>
-                <p ng-if="eolData.modattemptsnoteacher">{{ eolData.modattemptsnoteacher.message }}</p>
-                <!-- @todo Activity link. -->
-                <!-- @todo Return & grade links. -->
             </div>
         </mm-loading>
     </ion-content>

From 821ef08d967d349c1b974d106970ff7c5c87ff69 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Mar 2017 11:27:37 +0100
Subject: [PATCH 015/218] MOBILE-2011 lesson: Display next activity link

---
 www/addons/mod/lesson/controllers/player.js |  5 ++++
 www/addons/mod/lesson/services/helper.js    | 26 +++++++++++++++++++++
 www/addons/mod/lesson/templates/player.html |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 8398b475fda..7b9873513b1 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -98,6 +98,11 @@ angular.module('mm.addons.mod_lesson')
     function finishAttempt() {
         return $mmaModLesson.finishAttempt(lesson.id).then(function(data) {
             $scope.eolData = data.data;
+
+            // Format activity link if present.
+            if ($scope.eolData && $scope.eolData.activitylink) {
+                $scope.eolData.activitylink.value = $mmaModLessonHelper.formatActivityLink($scope.eolData.activitylink.value);
+            }
         });
     }
 
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 743e026ac6b..e5124ffb5a0 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -25,6 +25,32 @@ angular.module('mm.addons.mod_lesson')
 
     var self = {};
 
+    /**
+     * Given the HTML of next activity link, format it to add some styles.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#formatActivityLink
+     * @param  {String} activityLink HTML of the activity link.
+     * @return {String}              Formatted HTML.
+     */
+    self.formatActivityLink = function(activityLink) {
+        var rootElement = document.createElement('div'),
+            anchor;
+
+        rootElement.innerHTML = activityLink;
+        anchor = rootElement.querySelector('a');
+        if (!anchor) {
+            // Anchor not found, return the original HTML.
+            return activityLink;
+        }
+
+        // Show the anchor as a button.
+        angular.element(anchor).addClass('button button-block');
+
+        return rootElement.innerHTML;
+    };
+
     /**
      * Get the buttons to change pages.
      *
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 730a6dfff4a..79028494233 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -29,7 +29,7 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                     <p ng-if="eolData.displayofgrade">{{ eolData.displayofgrade.message }}</p>
                     <p ng-if="eolData.reviewlesson">{{ eolData.reviewlesson.message }}</p>
                     <p ng-if="eolData.modattemptsnoteacher">{{ eolData.modattemptsnoteacher.message }}</p>
-                    <!-- @todo Activity link. -->
+                    <mm-format-text ng-if="eolData.activitylink" watch="true">{{ eolData.activitylink.value }}</mm-format-text>
                     <!-- @todo Return & grade links. -->
                 </div>
             </div>

From 8719ce29b67b11d80a52033b912535f20fe8acc4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Mar 2017 12:02:05 +0100
Subject: [PATCH 016/218] MOBILE-2011 lesson: Display ongoing score

---
 www/addons/mod/lesson/controllers/player.js |  1 +
 www/addons/mod/lesson/scss/styles.scss      | 11 ++++++++++-
 www/addons/mod/lesson/templates/player.html |  3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 7b9873513b1..b1615e08960 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -80,6 +80,7 @@ angular.module('mm.addons.mod_lesson')
     // Load a certain page.
     function loadPage(pageId) {
         return $mmaModLesson.getPageData(lesson.id, pageId, undefined, false, true, offline, true).then(function(data) {
+            $scope.pageData = data;
             $scope.title = data.page.title;
             $scope.pageContent = data.page.contents;
             $scope.pageLoaded = true;
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
index 383cde10dbf..1aa226a3ebb 100644
--- a/www/addons/mod/lesson/scss/styles.scss
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -6,4 +6,13 @@
 .mma-mod-lesson-slideshow {
   max-width: 100%;
   max-height: 100%;
-}
\ No newline at end of file
+}
+
+.mma-mod-lesson-ongoingscore,
+.item.mma-mod-lesson-ongoingscore,
+.mma-mod-lesson-ongoingscore span,
+.item.mma-mod-lesson-ongoingscore span {
+  // Same styles as .item p.
+  color: #666;
+  font-size: 14px;
+}
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 79028494233..96ce00372ed 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -8,7 +8,8 @@
             <div ng-class='{"mma-mod-lesson-slideshow": lesson.slideshow}' ng-style="{'width': lessonWidth, 'height': lessonHeight}">
                 <div ng-if="!eolData" class="list">
                     <!-- TODO: Print questions. -->
-                    <mm-format-text class="item item-text-wrap" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text>
+                    <mm-format-text ng-if="pageData.ongoingscore" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{pageData.ongoingscore}}</mm-format-text>
+                    <p class="item item-text-wrap"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text></p>
                     <div ng-if="pageButtons && pageButtons.length" class="item">
                         <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button)">{{button.content}}</button>
                     </div>

From 7f87499ba09a68770bc812610ec1065934611557 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Mar 2017 13:41:57 +0100
Subject: [PATCH 017/218] MOBILE-2011 lesson: Display progressbar

---
 www/addons/mod/lesson/controllers/player.js | 1 +
 www/addons/mod/lesson/lang/en.json          | 1 +
 www/addons/mod/lesson/templates/player.html | 9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index b1615e08960..cd52519770b 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -99,6 +99,7 @@ angular.module('mm.addons.mod_lesson')
     function finishAttempt() {
         return $mmaModLesson.finishAttempt(lesson.id).then(function(data) {
             $scope.eolData = data.data;
+            $scope.eolProgress = data.progress;
 
             // Format activity link if present.
             if ($scope.eolData && $scope.eolData.activitylink) {
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index aaa7481553a..86b18ffe422 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -2,6 +2,7 @@
     "congratulations": "Congratulations - end of lesson reached",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
+    "progresscompleted": "You have completed {{$a}}% of the lesson",
     "startattempt": "Start attempt",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 96ce00372ed..a74e3374e80 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -13,6 +13,10 @@
                     <div ng-if="pageButtons && pageButtons.length" class="item">
                         <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button)">{{button.content}}</button>
                     </div>
+                    <div ng-if="lesson.progressbar" class="item">
+                        <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: pageData.progress} }}</p>
+                        <progress max="100" value="{{pageData.progress}}"></progress>
+                    </div>
                 </div>
                 <!-- End of lesson reached. -->
                 <div ng-if="eolData" class="padding">
@@ -26,7 +30,10 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                     <p ng-if="eolData.yourcurrentgradeisoutof">{{ eolData.yourcurrentgradeisoutof.message }}</p>
                     <p ng-if="eolData.eolstudentoutoftimenoanswers">{{ eolData.eolstudentoutoftimenoanswers.message }}</p>
                     <p ng-if="eolData.welldone">{{ eolData.welldone.message }}</p>
-                    <!-- @todo progress bar -->
+                    <div ng-if="lesson.progressbar && eolData.progressbar">
+                        <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: eolProgress} }}</p>
+                        <progress max="100" value="{{eolProgress}}"></progress>
+                    </div>
                     <p ng-if="eolData.displayofgrade">{{ eolData.displayofgrade.message }}</p>
                     <p ng-if="eolData.reviewlesson">{{ eolData.reviewlesson.message }}</p>
                     <p ng-if="eolData.modattemptsnoteacher">{{ eolData.modattemptsnoteacher.message }}</p>

From 2da152327b253d9439335ba8bb5cb75801e927af Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 17 Mar 2017 08:45:02 +0100
Subject: [PATCH 018/218] MOBILE-2012 lesson: Initial implementation to support
 password

---
 www/addons/mod/lesson/controllers/index.js  | 108 ++++++++++++---
 www/addons/mod/lesson/controllers/player.js |  22 +--
 www/addons/mod/lesson/lang/en.json          |   3 +
 www/addons/mod/lesson/main.js               |   3 +-
 www/addons/mod/lesson/services/lesson.js    | 140 +++++++++++++++++++-
 www/addons/mod/lesson/templates/index.html  |  14 +-
 6 files changed, 262 insertions(+), 28 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index fffaa4fb056..bd6d014bbab 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -30,13 +30,17 @@ angular.module('mm.addons.mod_lesson')
         lesson,
         accessInfo,
         scrollView,
-        onlineObserver;
+        onlineObserver,
+        password;
 
     $scope.title = module.name;
     $scope.moduleUrl = module.url;
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModLessonComponent;
     $scope.componentId = module.id;
+    $scope.data = {
+        password: ''
+    };
 
     // Convenience function to get Lesson data.
     function fetchLessonData(refresh) {
@@ -51,16 +55,30 @@ angular.module('mm.addons.mod_lesson')
 
             return $mmaModLesson.getAccessInformation(lesson.id);
         }).then(function(info) {
+            var promise;
+
             accessInfo = info;
             $scope.preventMessages = info.preventaccessreasons;
+
             if ($scope.preventMessages && $scope.preventMessages.length) {
-                // Lesson cannot be attempted, stop.
-                return;
+                $scope.askPassword = $scope.preventMessages.length == 1 && $mmaModLesson.isPasswordProtected(info);
+                if ($scope.askPassword) {
+                    // The lesson requires a password. Check if there is one in memory or DB.
+                    promise = password ? $q.when(password) : $mmaModLesson.getStoredPassword(lesson.id);
+
+                    return promise.then(function(pwd) {
+                        return validatePassword(pwd);
+                    }).catch(function() {
+                        // No password or the validation failed. The password form will be shown.
+                    });
+                } else  {
+                    // Lesson cannot be attempted, stop.
+                    return;
+                }
             }
 
-            // Check to see if end of lesson was reached and if the user left.
-            $scope.leftDuringTimed = info.lastpageseen && info.lastpageseen != $mmaModLesson.LESSON_EOL &&
-                    info.leftduringtimedsession;
+            // Lesson can be attempted, don't ask the password and don't show prevent messages.
+            fetchDataFinished();
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModLessonComponent);
@@ -75,6 +93,34 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    // Function called when all the data has been fetched.
+    function fetchDataFinished(pwd) {
+        password = pwd;
+        $scope.data.password = '';
+        $scope.askPassword = false;
+        $scope.preventMessages = [];
+        $scope.leftDuringTimed = $mmaModLesson.leftDuringTimed(accessInfo);
+
+        if (pwd) {
+            // Store the password in DB.
+            $mmaModLesson.storePassword(lesson.id, password);
+        }
+    }
+
+    // Validate a password and retrieve extra data.
+    function validatePassword(pwd) {
+        return $mmaModLesson.validatePassword(lesson.id, pwd).then(function() {
+            // Password validated, remove the form and the prevent message.
+            fetchDataFinished(pwd);
+
+            // Log view now that we have the password.
+            logView();
+        }).catch(function(error) {
+            password = '';
+            return $q.reject(error);
+        });
+    }
+
     // Refreshes data.
     function refreshData() {
         var promises = [];
@@ -90,13 +136,9 @@ angular.module('mm.addons.mod_lesson')
     }
 
     function showSpinnerAndRefresh() {
-        if (!scrollView) {
-            scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonIndexScroll');
-        }
-
+        scrollTop();
         $scope.lessonLoaded = false;
         $scope.refreshIcon = 'spinner';
-        scrollView.scrollTop();
 
         refreshData().finally(function() {
             $scope.lessonLoaded = true;
@@ -104,11 +146,27 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
-    // Fetch the Lesson data.
-    fetchLessonData().then(function() {
-        $mmaModLesson.logViewLesson(lesson.id).then(function() {
+    function scrollTop() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModLessonIndexScroll');
+        }
+
+        scrollView.scrollTop();
+    }
+
+    // Log viewing the lesson.
+    function logView() {
+        $mmaModLesson.logViewLesson(lesson.id, password).then(function() {
             $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
         });
+    }
+
+    // Fetch the Lesson data.
+    fetchLessonData().then(function() {
+        if (!$scope.preventMessages || !$scope.preventMessages.length) {
+            // Lesson can be attempted, log viewing it.
+            logView();
+        }
     }).finally(function() {
         $scope.lessonLoaded = true;
         $scope.refreshIcon = 'ion-refresh';
@@ -120,7 +178,27 @@ angular.module('mm.addons.mod_lesson')
         $state.go('site.mod_lesson-player', {
             courseid: courseId,
             lessonid: lesson.id,
-            pageid: pageId
+            pageid: pageId,
+            password: password
+        });
+    };
+
+    // Submit password for password protected lessons.
+    $scope.submitPassword = function(pwd) {
+        if (!pwd) {
+            $mmUtil.showErrorModal('mma.mod_lesson.emptypassword');
+            return;
+        }
+
+        scrollTop();
+        $scope.lessonLoaded = false;
+        $scope.refreshIcon = 'spinner';
+
+        validatePassword(pwd).catch(function(error) {
+            $mmUtil.showErrorModal(error);
+        }).finally(function() {
+            $scope.lessonLoaded = true;
+            $scope.refreshIcon = 'ion-refresh';
         });
     };
 
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index cd52519770b..4f7b0b284b6 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -26,6 +26,7 @@ angular.module('mm.addons.mod_lesson')
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
+        password = $stateParams.password,
         lesson,
         accessInfo,
         offline = false,
@@ -55,10 +56,13 @@ angular.module('mm.addons.mod_lesson')
         }).then(function(info) {
             accessInfo = info;
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
-                // Lesson cannot be attempted, show message and go back.
-                $mmUtil.showErrorModal(info.preventaccessreasons[0]);
-                blockData && blockData.back();
-                return;
+                // If it's a password protected lesson and we have the password, allow attempting it.
+                if (!password || info.preventaccessreasons.length > 1 || !$mmaModLesson.isPasswordProtected(info)) {
+                    // Lesson cannot be attempted, show message and go back.
+                    $mmUtil.showErrorModal(info.preventaccessreasons[0]);
+                    blockData && blockData.back();
+                    return;
+                }
             }
 
             return launchAttempt($scope.currentPage);
@@ -70,7 +74,7 @@ angular.module('mm.addons.mod_lesson')
 
     // Start or continue an attempt.
     function launchAttempt(pageId) {
-        return $mmaModLesson.launchAttempt(lesson.id, undefined, pageId).then(function() {
+        return $mmaModLesson.launchAttempt(lesson.id, password, pageId).then(function() {
             $scope.currentPage = pageId || accessInfo.firstpageid;
 
             return loadPage($scope.currentPage);
@@ -79,7 +83,7 @@ angular.module('mm.addons.mod_lesson')
 
     // Load a certain page.
     function loadPage(pageId) {
-        return $mmaModLesson.getPageData(lesson.id, pageId, undefined, false, true, offline, true).then(function(data) {
+        return $mmaModLesson.getPageData(lesson.id, pageId, password, false, true, offline, true).then(function(data) {
             $scope.pageData = data;
             $scope.title = data.page.title;
             $scope.pageContent = data.page.contents;
@@ -97,7 +101,7 @@ angular.module('mm.addons.mod_lesson')
 
     // Finish the attempt.
     function finishAttempt() {
-        return $mmaModLesson.finishAttempt(lesson.id).then(function(data) {
+        return $mmaModLesson.finishAttempt(lesson.id, password).then(function(data) {
             $scope.eolData = data.data;
             $scope.eolProgress = data.progress;
 
@@ -131,7 +135,7 @@ angular.module('mm.addons.mod_lesson')
         }
 
         $scope.loadingMenu = true;
-        return $mmaModLesson.getPages(lesson.id).then(function(pages) {
+        return $mmaModLesson.getPages(lesson.id, password).then(function(pages) {
             $scope.lessonPages = pages.map(function(entry) {
                 return entry.page;
             });
@@ -152,7 +156,7 @@ angular.module('mm.addons.mod_lesson')
     $scope.buttonClicked = function(button) {
         showLoading();
 
-        return $mmaModLesson.processPage(lessonId, $scope.currentPage, button.data).then(function(result) {
+        return $mmaModLesson.processPage(lessonId, $scope.currentPage, button.data, password).then(function(result) {
             if (result.newpageid === 0) {
                 // Not a valid page, return to entry view.
                 // This happens, for example, when the user clicks to go to previous page and there is no previous page.
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 86b18ffe422..346b859f1dd 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,5 +1,8 @@
 {
     "congratulations": "Congratulations - end of lesson reached",
+    "continue": "Continue",
+    "emptypassword": "Password cannot be empty",
+    "enterpassword": "Please enter the password:",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 6c2e84d69e0..003d51442db 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -39,7 +39,8 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
       params: {
         courseid: null,
         lessonid: null,
-        pageid: null
+        pageid: null,
+        password: null
       },
       views: {
         'site': {
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 688bcec0c9f..9d69eb0299a 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -14,6 +14,19 @@
 
 angular.module('mm.addons.mod_lesson')
 
+.constant('mmaModLessonPasswordStore', 'mod_lesson_password')
+
+.config(function($mmSitesFactoryProvider, mmaModLessonPasswordStore) {
+    var stores = [
+        {
+            name: mmaModLessonPasswordStore,
+            keyPath: 'id',
+            indexes: []
+        }
+    ];
+    $mmSitesFactoryProvider.registerStores(stores);
+})
+
 /**
  * Lesson service.
  *
@@ -21,7 +34,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLesson
  */
-.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil) {
+.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $timeout) {
 
     $log = $log.getInstance('$mmaModLesson');
 
@@ -308,6 +321,24 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get a password stored in DB.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getStoredPassword
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with password on success, rejected otherwise.
+     */
+    self.getStoredPassword = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmaModLessonPasswordStore, lessonId).then(function(entry) {
+                return entry.password;
+            });
+        });
+    };
+
     /**
      * Invalidates Lesson data.
      *
@@ -373,6 +404,28 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if a lesson is password protected based in the access info.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#isPasswordProtected
+     * @param  {Object}  info Lesson access info.
+     * @return {Boolean}      True if password protected, false otherwise.
+     */
+    self.isPasswordProtected = function(info) {
+        if (info && info.preventaccessreasons) {
+            for (var i = 0; i < info.preventaccessreasons.length; i++) {
+                var entry = info.preventaccessreasons[i];
+                if (entry.reason == 'passwordprotectedlesson') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    };
+
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the lesson WS are available.
      *
@@ -425,6 +478,19 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if the user left during a timed session.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#leftDuringTimed
+     * @param  {Object} info Lesson access info.
+     * @return {Boolean}     True if left during timed, false otherwise.
+     */
+    self.leftDuringTimed = function(info) {
+        return info && info.lastpageseen && info.lastpageseen != self.LESSON_EOL && info.leftduringtimedsession;
+    };
+
     /**
      * Report a lesson as being viewed.
      *
@@ -486,5 +552,77 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Remove a password stored in DB.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#removeStoredPassword
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when removed.
+     */
+    self.removeStoredPassword = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().remove(mmaModLessonPasswordStore, lessonId);
+        });
+    };
+
+    /**
+     * Store a password in DB.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#storePassword
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} password Password to store.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when stored.
+     */
+    self.storePassword = function(lessonId, password, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var entry = {
+                id: lessonId,
+                password: password,
+                timemodified: new Date().getTime()
+            };
+
+            return site.getDb().insert(mmaModLessonPasswordStore, entry);
+        });
+    };
+
+    /**
+     * Validate a lesson password.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#validatePassword
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} password Lesson password (if any).
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved in success, rejected otherwise.
+     */
+    self.validatePassword = function(lessonId, password, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                lessonid: lessonId,
+                password: password
+            };
+
+            // @todo Use new WebService (not implemented yet).
+            return $timeout(function() {}, 1000).then(function() {
+                if (password != '123') {
+                    return $q.reject();
+                }
+            }).catch(function(error) {
+                if ($mmUtil.isWebServiceError(error)) {
+                    // The WebService returned an error, assume the password is wrong. Remove the stored password if any.
+                    self.removeStoredPassword(lessonId);
+                }
+                return $q.reject(error);
+            });
+        });
+    };
+
     return self;
 });
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index fe484f144a7..cafe8bf8dc0 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -12,10 +12,20 @@
         <mm-loading hide-until="lessonLoaded">
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
-            <div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length" ng-repeat="message in preventMessages">
-                <i class="icon ion-information-circled padding"></i> {{ message.message }}
+            <!-- Prevent access messages. Only show the first one. -->
+            <div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length">
+                <i class="icon ion-information-circled padding"></i> {{ preventMessages[0].message }}
             </div>
 
+            <!-- Input password for protected lessons. -->
+            <form ng-if="askPassword" class="card">
+                <ion-input class="item item-input item-stacked-label">
+                    <ion-label>{{ 'mma.mod_lesson.enterpassword' | translate }}</ion-label>
+                    <input id="mma-mod-lesson-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="data.password" mm-show-password>
+                    <button class="button button-block" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+                </ion-input>
+            </form>
+
             <div ng-if="lesson && (!preventMessages || !preventMessages.length)">
                 <div ng-if="leftDuringTimed" class="card">
                     <!-- User left during the session, ask to continue. -->

From e731798aadd9f17dff58f326758b4dc0640115f0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 20 Mar 2017 09:16:38 +0100
Subject: [PATCH 019/218] MOBILE-2012 lesson: Support time limit

---
 www/addons/mod/lesson/controllers/index.js  |   8 +-
 www/addons/mod/lesson/controllers/player.js |  40 ++++++-
 www/addons/mod/lesson/lang/en.json          |   3 +
 www/addons/mod/lesson/services/lesson.js    | 109 ++++++++++++++++++++
 www/addons/mod/lesson/templates/index.html  |  18 +++-
 www/addons/mod/lesson/templates/player.html |   7 ++
 6 files changed, 176 insertions(+), 9 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index bd6d014bbab..ff64bf44f72 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -128,6 +128,7 @@ angular.module('mm.addons.mod_lesson')
         promises.push($mmaModLesson.invalidateLessonData(courseId));
         if (lesson) {
             promises.push($mmaModLesson.invalidateAccessInformation(lesson.id));
+            promises.push($mmaModLesson.invalidatePages(lesson.id));
         }
 
         return $q.all(promises).finally(function() {
@@ -174,7 +175,12 @@ angular.module('mm.addons.mod_lesson')
 
     // Start the lesson.
     $scope.start = function(continueLast) {
-        var pageId = $scope.leftDuringTimed ? (continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid) : false;
+        // Calculate the pageId to load. If there is timelimit, lesson is always restarted from the start.
+        var pageId = false;
+        if ($scope.leftDuringTimed && !lesson.timelimit) {
+            pageId = continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid;
+        }
+
         $state.go('site.mod_lesson-player', {
             courseid: courseId,
             lessonid: lesson.id,
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 4f7b0b284b6..1ec10d96666 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -40,6 +40,7 @@ angular.module('mm.addons.mod_lesson')
 
     $scope.component = mmaModLessonComponent;
     $scope.currentPage = $stateParams.pageid;
+    $scope.messages = [];
 
     // Convenience function to get Lesson data.
     function fetchLessonData() {
@@ -74,9 +75,20 @@ angular.module('mm.addons.mod_lesson')
 
     // Start or continue an attempt.
     function launchAttempt(pageId) {
-        return $mmaModLesson.launchAttempt(lesson.id, password, pageId).then(function() {
+        return $mmaModLesson.launchAttempt(lesson.id, password, pageId).then(function(data) {
             $scope.currentPage = pageId || accessInfo.firstpageid;
+            $scope.messages = data.messages || [];
+
+            if (lesson.timelimit) {
+                // Get the last lesson timer.
+                return $mmaModLesson.getTimers(lesson.id, false, true).then(function(timers) {
+                    var lastTimer = timers[timers.length - 1];
+                    $scope.endTime = lastTimer.starttime + lesson.timelimit;
+                });
+            }
+
 
+        }).then(function() {
             return loadPage($scope.currentPage);
         });
     }
@@ -90,6 +102,7 @@ angular.module('mm.addons.mod_lesson')
             $scope.pageLoaded = true;
             $scope.pageButtons = $mmaModLessonHelper.getPageButtonsFromHtml(data.pagecontent);
             $scope.currentPage = pageId;
+            $scope.messages = $scope.messages.concat(data.messages);
 
             if (data.displaymenu && !$scope.displayMenu) {
                 // Load the menu.
@@ -100,10 +113,13 @@ angular.module('mm.addons.mod_lesson')
     }
 
     // Finish the attempt.
-    function finishAttempt() {
-        return $mmaModLesson.finishAttempt(lesson.id, password).then(function(data) {
+    function finishAttempt(outOfTime) {
+        $scope.messages = [];
+        return $mmaModLesson.finishAttempt(lesson.id, password, outOfTime).then(function(data) {
+            $scope.title = lesson.name;
             $scope.eolData = data.data;
             $scope.eolProgress = data.progress;
+            $scope.messages = $scope.messages.concat(data.messages);
 
             // Format activity link if present.
             if ($scope.eolData && $scope.eolData.activitylink) {
@@ -164,13 +180,12 @@ angular.module('mm.addons.mod_lesson')
                 return;
             } else if (result.newpageid == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
-                // @todo Show grade, progress bar, min questions, etc. in final page.
-                $scope.title = lesson.name;
                 return finishAttempt();
             }
 
             // Load new page.
             $scope.eolData = false;
+            $scope.messages = [];
             return loadPage(result.newpageid);
         }).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'Error processing page');
@@ -188,6 +203,7 @@ angular.module('mm.addons.mod_lesson')
         }
 
         showLoading();
+        $scope.messages = [];
 
         return loadPage(pageId).then(function() {
             // Page loaded, hide the EOL page if shown.
@@ -200,6 +216,20 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    // Time up.
+    $scope.timeUp = function() {
+        // Time up called, hide the timer.
+        $scope.endTime = false;
+        showLoading();
+
+        return finishAttempt(true).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'Error finishing attempt');
+            return $q.reject();
+        }).finally(function() {
+            $scope.pageLoaded = true;
+        });
+    };
+
     // Setup right side menu.
     $mmSideMenu.showRightSideMenu('addons/mod/lesson/templates/menu.html', $scope);
 
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 346b859f1dd..af18817cbd7 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -3,9 +3,12 @@
     "continue": "Continue",
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
+    "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
+    "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
     "startattempt": "Start attempt",
+    "timeremaining": "Time remaining",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 9d69eb0299a..01ff2c1ab59 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -339,6 +339,65 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get cache key for get timers WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} userId   User ID.
+     * @return {String}          Cache key.
+     */
+    function getTimersCacheKey(lessonId, userId) {
+        return getTimersCommonCacheKey(lessonId) + ':' + userId;
+    }
+
+    /**
+     * Get common cache key for get timers WS calls.
+     *
+     * @param {Number} lessonId Lesson ID.
+     * @return {String}         Cache key.
+     */
+    function getTimersCommonCacheKey(lessonId) {
+        return 'mmaModLesson:timers:' + lessonId;
+    }
+
+    /**
+     * Get lesson timers.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getTimers
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @param  {Number} [userId]     User ID. If not defined, site's current user.
+     * @return {Promise}             Promise resolved with the pages.
+     */
+    self.getTimers = function(lessonId, forceCache, ignoreCache, siteId, userId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+
+            var params = {
+                    lessonid: lessonId,
+                    userid: userId
+                },
+                preSets = {
+                    cacheKey: getTimersCacheKey(lessonId, userId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_user_timers', params, preSets).then(function(response) {
+                return response.timers;
+            });
+        });
+    };
+
     /**
      * Invalidates Lesson data.
      *
@@ -404,6 +463,56 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates pages.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidatePages
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidatePages = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getPagesCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates timers for all users in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateTimers
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateTimers = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getTimersCommonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates timers for a certain user.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateTimersForUser
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @param  {Number} [userId] User ID. If not defined, site's current user.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateTimersForUser = function(lessonId, siteId, userId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.invalidateWsCacheForKey(getTimersCacheKey(lessonId, userId));
+        });
+    };
+
     /**
      * Check if a lesson is password protected based in the access info.
      *
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index cafe8bf8dc0..29e2c42722a 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -14,7 +14,8 @@
 
             <!-- Prevent access messages. Only show the first one. -->
             <div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length">
-                <i class="icon ion-information-circled padding"></i> {{ preventMessages[0].message }}
+                <!-- The messages can have html, use format-text. -->
+                <i class="icon ion-information-circled padding"></i> <mm-format-text watch="true">{{ preventMessages[0].message }}</mm-format-text>
             </div>
 
             <!-- Input password for protected lessons. -->
@@ -27,14 +28,25 @@
             </form>
 
             <div ng-if="lesson && (!preventMessages || !preventMessages.length)">
-                <div ng-if="leftDuringTimed" class="card">
-                    <!-- User left during the session, ask to continue. -->
+                <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
+                    <!-- User left during the session and there is no time limit, ask to continue. -->
                     <p class="item" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
                     <div class="item button-bar">
                         <button class="button" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
                         <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
                     </div>
                 </div>
+                <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="card">
+                    <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
+                    <p class="item" ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
+                    <div class="item">
+                        <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+                    </div>
+                </div>
+                <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="card">
+                    <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
+                    <p class="item" ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
+                </div>
                 <div ng-if="!leftDuringTimed" class="card">
                     <!-- User hasn't left during the session, show a start button. -->
                     <div class="item">
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index a74e3374e80..c80c9bb396f 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -5,7 +5,14 @@
     </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">
+            <!-- Info messages. Only show the first one. -->
+            <div class="mm-info-card" ng-if="lesson && messages && messages.length">
+                <i class="icon ion-information-circled padding"></i> {{ messages[0].message }}
+            </div>
+
             <div ng-class='{"mma-mod-lesson-slideshow": lesson.slideshow}' ng-style="{'width': lessonWidth, 'height': lessonHeight}">
+                <mm-timer ng-if="endTime" end-time="endTime" finished="timeUp()" timer-text="{{ 'mma.mod_lesson.timeremaining' | translate }}"></mm-timer>
+
                 <div ng-if="!eolData" class="list">
                     <!-- TODO: Print questions. -->
                     <mm-format-text ng-if="pageData.ongoingscore" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{pageData.ongoingscore}}</mm-format-text>

From 64e50f9dd3e8f6d9a23b2a1f04a884e5667e3edf Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Mar 2017 08:36:19 +0100
Subject: [PATCH 020/218] MOBILE-2012 lesson: Use the new mod_lesson_get_lesson
 for password

---
 www/addons/mod/lesson/controllers/index.js  |   7 +-
 www/addons/mod/lesson/controllers/player.js |  22 ++--
 www/addons/mod/lesson/lang/en.json          |   1 +
 www/addons/mod/lesson/services/lesson.js    | 120 ++++++++++++++------
 4 files changed, 107 insertions(+), 43 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index ff64bf44f72..cf9a38384ad 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -109,7 +109,9 @@ angular.module('mm.addons.mod_lesson')
 
     // Validate a password and retrieve extra data.
     function validatePassword(pwd) {
-        return $mmaModLesson.validatePassword(lesson.id, pwd).then(function() {
+        return $mmaModLesson.getLessonWithPassword(lesson.id, pwd).then(function(lessonData) {
+            lesson = lessonData;
+
             // Password validated, remove the form and the prevent message.
             fetchDataFinished(pwd);
 
@@ -129,6 +131,7 @@ angular.module('mm.addons.mod_lesson')
         if (lesson) {
             promises.push($mmaModLesson.invalidateAccessInformation(lesson.id));
             promises.push($mmaModLesson.invalidatePages(lesson.id));
+            promises.push($mmaModLesson.invalidateLessonWithPassword(lesson.id));
         }
 
         return $q.all(promises).finally(function() {
@@ -192,7 +195,7 @@ angular.module('mm.addons.mod_lesson')
     // Submit password for password protected lessons.
     $scope.submitPassword = function(pwd) {
         if (!pwd) {
-            $mmUtil.showErrorModal('mma.mod_lesson.emptypassword');
+            $mmUtil.showErrorModal('mma.mod_lesson.emptypassword', true);
             return;
         }
 
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 1ec10d96666..0f6d0dbc4ed 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -48,10 +48,6 @@ angular.module('mm.addons.mod_lesson')
             lesson = lessonData;
             $scope.lesson = lesson;
             $scope.title = lesson.name; // Temporary title.
-            $scope.mediaFile = lesson.mediafiles && lesson.mediafiles[0];
-
-            $scope.lessonWidth = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediawidth) : '';
-            $scope.lessonHeight = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediaheight) : '';
 
             return $mmaModLesson.getAccessInformation(lesson.id, offline, true);
         }).then(function(info) {
@@ -60,15 +56,27 @@ angular.module('mm.addons.mod_lesson')
                 // If it's a password protected lesson and we have the password, allow attempting it.
                 if (!password || info.preventaccessreasons.length > 1 || !$mmaModLesson.isPasswordProtected(info)) {
                     // Lesson cannot be attempted, show message and go back.
-                    $mmUtil.showErrorModal(info.preventaccessreasons[0]);
-                    blockData && blockData.back();
-                    return;
+                    return $q.reject(info.preventaccessreasons[0]);
                 }
             }
 
+            if (password) {
+                // Lesson uses password, get the whole lesson object.
+                return $mmaModLesson.getLessonWithPassword(lesson.id, password, true, offline, true).then(function(lessonData) {
+                    lesson = lessonData;
+                    $scope.lesson = lesson;
+                });
+            }
+        }).then(function() {
+            $scope.mediaFile = lesson.mediafiles && lesson.mediafiles[0];
+
+            $scope.lessonWidth = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediawidth) : '';
+            $scope.lessonHeight = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediaheight) : '';
+
             return launchAttempt($scope.currentPage);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            blockData && blockData.back();
             return $q.reject();
         });
     }
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index af18817cbd7..6cce213e85d 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -7,6 +7,7 @@
     "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
+    "loginfail": "Login failed, please try again...",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
     "startattempt": "Start attempt",
     "timeremaining": "Time remaining",
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 01ff2c1ab59..7d1b2c7f059 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -34,7 +34,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLesson
  */
-.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $timeout) {
+.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $mmLang) {
 
     $log = $log.getInstance('$mmaModLesson');
 
@@ -208,6 +208,75 @@ angular.module('mm.addons.mod_lesson')
         return getLesson(siteId, courseId, 'id', id, forceCache);
     };
 
+    /**
+     * Get cache key for get lesson with password WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}          Cache key.
+     */
+    function getLessonWithPasswordCacheKey(lessonId) {
+        return 'mmaModLesson:lessonWithPswrd:' + lessonId;
+    }
+
+    /**
+     * Get a lesson protected with password.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getLessonWithPassword
+     * @param  {Number} lessonId                 Lesson ID.
+     * @param  {String} [password]               Password.
+     * @param  {Boolean} [validatePassword=true] If true, the function will fail if the password is wrong.
+     *                                           If false, it will return a lesson with the basic data if password is wrong.
+     * @param  {Boolean} forceCache              True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache             True to ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]                 Site ID. If not defined, current site.
+     * @return {Promise}                         Promise resolved with the lesson.
+     */
+    self.getLessonWithPassword = function(lessonId, password, validatePassword, forceCache, ignoreCache, siteId) {
+        if (typeof validatePassword == 'undefined') {
+            validatePassword = true;
+        }
+
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId
+                },
+                preSets = {
+                    cacheKey: getLessonWithPasswordCacheKey(lessonId)
+                };
+
+            if (typeof password == 'string') {
+                params.password = password;
+            }
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_lesson', params, preSets).then(function(response) {
+                if (typeof response.lesson.ongoing == 'undefined') {
+                    // Basic data not received, password is wrong. Remove stored password.
+                    self.removeStoredPassword(lessonId);
+
+                    if (validatePassword) {
+                        // Invalidate the data and reject.
+                        return self.invalidateLessonWithPassword(lessonId).catch(function() {
+                            // Shouldn't happen.
+                        }).then(function() {
+                            return $mmLang.translateAndReject('mma.mod_lesson.loginfail');
+                        });
+                    }
+                }
+
+                return response.lesson;
+            });
+        });
+    };
+
     /**
      * Get cache key for get page data WS calls.
      *
@@ -430,6 +499,22 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates lesson with password.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateLessonWithPassword
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateLessonWithPassword = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getLessonWithPasswordCacheKey(lessonId));
+        });
+    };
+
     /**
      * Invalidates page data for all pages.
      *
@@ -700,38 +785,5 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
-    /**
-     * Validate a lesson password.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLesson#validatePassword
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {String} password Lesson password (if any).
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved in success, rejected otherwise.
-     */
-    self.validatePassword = function(lessonId, password, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            var params = {
-                lessonid: lessonId,
-                password: password
-            };
-
-            // @todo Use new WebService (not implemented yet).
-            return $timeout(function() {}, 1000).then(function() {
-                if (password != '123') {
-                    return $q.reject();
-                }
-            }).catch(function(error) {
-                if ($mmUtil.isWebServiceError(error)) {
-                    // The WebService returned an error, assume the password is wrong. Remove the stored password if any.
-                    self.removeStoredPassword(lessonId);
-                }
-                return $q.reject(error);
-            });
-        });
-    };
-
     return self;
 });

From 2b914748b9aa948a0feac40f4dca48283e4f717b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 21 Mar 2017 11:44:49 +0100
Subject: [PATCH 021/218] MOBILE-2013 lesson: Render and handle truefalse
 questions

---
 www/addons/mod/lesson/controllers/player.js | 113 ++++++++++++++------
 www/addons/mod/lesson/lang/en.json          |   3 +
 www/addons/mod/lesson/services/helper.js    |  65 ++++++++++-
 www/addons/mod/lesson/services/lesson.js    |  28 +++++
 www/addons/mod/lesson/templates/player.html |  32 +++++-
 5 files changed, 205 insertions(+), 36 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 0f6d0dbc4ed..1b6dcc41375 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -94,8 +94,6 @@ angular.module('mm.addons.mod_lesson')
                     $scope.endTime = lastTimer.starttime + lesson.timelimit;
                 });
             }
-
-
         }).then(function() {
             return loadPage($scope.currentPage);
         });
@@ -108,10 +106,20 @@ angular.module('mm.addons.mod_lesson')
             $scope.title = data.page.title;
             $scope.pageContent = data.page.contents;
             $scope.pageLoaded = true;
-            $scope.pageButtons = $mmaModLessonHelper.getPageButtonsFromHtml(data.pagecontent);
             $scope.currentPage = pageId;
             $scope.messages = $scope.messages.concat(data.messages);
 
+            // Page loaded, hide EOL and feedback data if shown.
+            $scope.eolData = $scope.processData = false;
+
+            if ($mmaModLesson.isQuestionPage(data.page.type)) {
+                $scope.pageButtons = [];
+                $scope.question = $mmaModLessonHelper.getQuestionFromPageData(data);
+            } else {
+                $scope.pageButtons = $mmaModLessonHelper.getPageButtonsFromHtml(data.pagecontent);
+                $scope.question = false;
+            }
+
             if (data.displaymenu && !$scope.displayMenu) {
                 // Load the menu.
                 loadMenu();
@@ -128,6 +136,7 @@ angular.module('mm.addons.mod_lesson')
             $scope.eolData = data.data;
             $scope.eolProgress = data.progress;
             $scope.messages = $scope.messages.concat(data.messages);
+            $scope.processData = false;
 
             // Format activity link if present.
             if ($scope.eolData && $scope.eolData.activitylink) {
@@ -171,41 +180,86 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
-    // Fetch the Lesson data.
-    fetchLessonData().finally(function() {
-        $scope.pageLoaded = true;
-    });
-
-    // A button was clicked.
-    $scope.buttonClicked = function(button) {
+    // Process a page, sending some data.
+    function processPage(data) {
         showLoading();
 
-        return $mmaModLesson.processPage(lessonId, $scope.currentPage, button.data, password).then(function(result) {
-            if (result.newpageid === 0) {
-                // Not a valid page, return to entry view.
-                // This happens, for example, when the user clicks to go to previous page and there is no previous page.
-                blockData && blockData.back();
-                return;
-            } else if (result.newpageid == $mmaModLesson.LESSON_EOL) {
-                // End of lesson reached.
-                return finishAttempt();
-            }
+        return $mmaModLesson.processPage(lessonId, $scope.currentPage, data, password).then(function(result) {
+            if (result.nodefaultresponse || result.inmediatejump) {
+                // Don't display feedback or force a redirect to a new page. Load the new page.
+                return jumpToPage(result.newpageid);
+            } else{
+                // Not inmediate jump, show the feedback.
+                $scope.messages = result.messages;
+                $scope.processData = result;
+                $scope.processData.buttons = [];
+
+                if (lesson.review && !result.correctanswer && !result.noanswer && !result.isessayquestion &&
+                       !result.maxattemptsreached && !result.reviewmode) {
+                    // User can try again, show button to do so.
+                    $scope.processData.buttons.push({
+                        label: 'mma.mod_lesson.reviewquestionback',
+                        pageid: $scope.currentPage
+                    });
+                }
 
-            // Load new page.
-            $scope.eolData = false;
-            $scope.messages = [];
-            return loadPage(result.newpageid);
+                // Button to continue.
+                if (lesson.review && !result.correctanswer && !result.noanswer && !result.isessayquestion &&
+                       !result.maxattemptsreached) {
+                    $scope.processData.buttons.push({
+                        label: 'mma.mod_lesson.reviewquestioncontinue',
+                        pageid: result.newpageid
+                    });
+                } else {
+                    $scope.processData.buttons.push({
+                        label: 'mma.mod_lesson.continue',
+                        pageid: result.newpageid
+                    });
+                }
+            }
         }).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'Error processing page');
             return $q.reject();
         }).finally(function() {
             $scope.pageLoaded = true;
         });
+    }
+
+    // Jump to a certain page after performing an action.
+    function jumpToPage(pageId) {
+        if (pageId === 0) {
+            // Not a valid page, return to entry view.
+            // This happens, for example, when the user clicks to go to previous page and there is no previous page.
+            blockData && blockData.back();
+            return;
+        } else if (pageId == $mmaModLesson.LESSON_EOL) {
+            // End of lesson reached.
+            return finishAttempt();
+        }
+
+        // Load new page.
+        $scope.messages = [];
+        return loadPage(pageId);
+    }
+
+    // Fetch the Lesson data.
+    fetchLessonData().finally(function() {
+        $scope.pageLoaded = true;
+    });
+
+    // A button was clicked.
+    $scope.buttonClicked = function(data) {
+        processPage(data);
+    };
+
+    // Submit a question.
+    $scope.submitQuestion = function() {
+        processPage($scope.question.model);
     };
 
-    // Menu page was clicked, load the page.
-    $scope.loadPage = function(pageId) {
-        if (!$scope.eolData && $scope.currentPage == pageId) {
+    // Load a page from menu or when continuing from a feedback page.
+    $scope.loadPage = function(pageId, ignoreCurrent) {
+        if (!ignoreCurrent && !$scope.eolData && $scope.currentPage == pageId) {
             // Page already loaded, stop.
             return;
         }
@@ -213,10 +267,7 @@ angular.module('mm.addons.mod_lesson')
         showLoading();
         $scope.messages = [];
 
-        return loadPage(pageId).then(function() {
-            // Page loaded, hide the EOL page if shown.
-            $scope.eolData = false;
-        }).catch(function(error) {
+        return loadPage(pageId).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'Error loading page');
             return $q.reject();
         }).finally(function() {
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 6cce213e85d..35c4c1cc1d9 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -9,7 +9,10 @@
     "linkedmedia": "Linked media",
     "loginfail": "Login failed, please try again...",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
+    "reviewquestionback": "Yes, I'd like to try again",
+    "reviewquestioncontinue": "No, I just want to go on to the next question",
     "startattempt": "Start attempt",
+    "submit": "Submit",
     "timeremaining": "Time remaining",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
 }
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index e5124ffb5a0..29c69ef629d 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonHelper
  */
-.factory('$mmaModLessonHelper', function() {
+.factory('$mmaModLessonHelper', function($mmaModLesson) {
 
     var self = {};
 
@@ -103,5 +103,68 @@ angular.module('mm.addons.mod_lesson')
         return buttons;
     };
 
+    /**
+     * Get a question and all the data required to render it from the page data (result of $mmaModLesson#getPageData).
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getQuestionFromPageData
+     * @param  {Object} pageData Page data (result of $mmaModLesson#getPageData).
+     * @return {Object}          Question data.
+     */
+    self.getQuestionFromPageData = function(pageData) {
+        var rootElement = document.createElement('div'),
+            fieldContainer,
+            hiddenInputs,
+            question = {
+                model: {}
+            };
+
+        // Get the container of the question answers if it exists.
+        rootElement.innerHTML = pageData.pagecontent;
+        fieldContainer = rootElement.querySelector('.fcontainer');
+
+        // Get hidden inputs and add their data to the model.
+        hiddenInputs = rootElement.querySelectorAll('input[type="hidden"]');
+        angular.forEach(hiddenInputs, function(input) {
+            question.model[input.name] = input.value;
+        });
+
+        if (!fieldContainer) {
+            // Element not found, return.
+            return question;
+        }
+
+        switch (pageData.page.qtype) {
+            case $mmaModLesson.LESSON_PAGE_TRUEFALSE:
+                question.template = 'truefalse';
+                question.options = [];
+
+                // Get all the options to show.
+                var labels = fieldContainer.querySelectorAll('.form-check-inline');
+                angular.forEach(labels, function(label) {
+                    var option = {},
+                        input = label.querySelector('input[type="radio"]');
+
+                    if (!input) {
+                        return;
+                    }
+
+                    option.id = input.id;
+                    option.name = input.name;
+                    option.value = input.value;
+
+                    // Remove the input and use the rest of the contents as the label.
+                    angular.element(input).remove();
+                    option.text = label.innerHTML.trim();
+
+                    question.options.push(option);
+                });
+                break;
+        }
+
+        return question;
+    };
+
     return self;
 });
\ No newline at end of file
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 7d1b2c7f059..adfe9a9b5f8 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -42,6 +42,21 @@ angular.module('mm.addons.mod_lesson')
 
     self.LESSON_EOL = -9;
 
+    // Constants used to identify the type of pages and questions.
+    self.TYPE_QUESTION = 0;
+    self.TYPE_STRUCTURE = 1;
+
+    self.LESSON_PAGE_SHORTANSWER =  1;
+    self.LESSON_PAGE_TRUEFALSE =    2;
+    self.LESSON_PAGE_MULTICHOICE =  3;
+    self.LESSON_PAGE_MATCHING =     5;
+    self.LESSON_PAGE_NUMERICAL =    8;
+    self.LESSON_PAGE_ESSAY =        10;
+    self.LESSON_PAGE_BRANCHTABLE =  20;
+    self.LESSON_PAGE_ENDOFBRANCH =  21;
+    self.LESSON_PAGE_CLUSTER =      30;
+    self.LESSON_PAGE_ENDOFCLUSTER = 31;
+
     /**
      * Finishes an attempt.
      *
@@ -636,6 +651,19 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if a page is a question page or a content page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#isQuestionPage
+     * @param  {Number} type Type of the page.
+     * @return {Boolean}     True if question page, false if content page.
+     */
+    self.isQuestionPage = function(type) {
+        return type == self.TYPE_QUESTION;
+    };
+
     /**
      * Start or continue an attempt.
      *
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index c80c9bb396f..9704987bd9d 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -13,20 +13,28 @@
             <div ng-class='{"mma-mod-lesson-slideshow": lesson.slideshow}' ng-style="{'width': lessonWidth, 'height': lessonHeight}">
                 <mm-timer ng-if="endTime" end-time="endTime" finished="timeUp()" timer-text="{{ 'mma.mod_lesson.timeremaining' | translate }}"></mm-timer>
 
-                <div ng-if="!eolData" class="list">
-                    <!-- TODO: Print questions. -->
+                <!-- Page content, including questions and buttons. -->
+                <div ng-if="!eolData && !processData" class="list">
                     <mm-format-text ng-if="pageData.ongoingscore" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{pageData.ongoingscore}}</mm-format-text>
                     <p class="item item-text-wrap"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text></p>
+                    <form ng-if="question" name="mma-mod_lesson-player-form">
+                        <input ng-repeat="input in question.hiddenInputs" type="hidden" name="{{input.name}}" value="{{input.value}}" />
+                        <div ng-include="question.template"></div>
+                        <div class="item">
+                            <button class="button button-block" ng-click="submitQuestion()">{{ 'mma.mod_lesson.submit' | translate }}</button>
+                        </div>
+                    </form>
                     <div ng-if="pageButtons && pageButtons.length" class="item">
-                        <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button)">{{button.content}}</button>
+                        <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button.data)">{{button.content}}</button>
                     </div>
                     <div ng-if="lesson.progressbar" class="item">
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: pageData.progress} }}</p>
                         <progress max="100" value="{{pageData.progress}}"></progress>
                     </div>
                 </div>
+
                 <!-- End of lesson reached. -->
-                <div ng-if="eolData" class="padding">
+                <div ng-if="eolData && !processData" class="padding">
                     <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
                     <p ng-if="eolData.notenoughtimespent">{{ eolData.notenoughtimespent.message }}</p>
                     <p ng-if="eolData.numberofpagesviewed">{{ eolData.numberofpagesviewed.message }}</p>
@@ -47,7 +55,23 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                     <mm-format-text ng-if="eolData.activitylink" watch="true">{{ eolData.activitylink.value }}</mm-format-text>
                     <!-- @todo Return & grade links. -->
                 </div>
+
+                <!-- Feedback returned when processing an action. -->
+                <div ng-if="processData" class="list">
+                    <mm-format-text ng-if="processData.ongoingscore && !processData.reviewmode" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{processData.ongoingscore}}</mm-format-text>
+                    <p ng-if="!processData.reviewmode" class="item item-text-wrap"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{processData.feedback}}</mm-format-text></p>
+                    <div ng-if="processData.buttons && processData.buttons.length" class="item">
+                        <button ng-repeat="button in processData.buttons track by $index" class="button button-block" ng-click="loadPage(button.pageid, true)">{{ button.label | translate }}</button>
+                    </div>
+                </div>
             </div>
+
+            <!-- List of questions templates. -->
+            <script type="text/ng-template" id="truefalse">
+                <ion-radio ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]">
+                    <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{option.text}}</mm-format-text></p>
+                </ion-radio>
+            </script>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file

From 70fed793a1873dab03f86cf8a176433a277d3f1d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 21 Mar 2017 16:24:59 +0100
Subject: [PATCH 022/218] MOBILE-2013 util: Support multiple levels in
 objectToArrayOfObjects

---
 www/core/lib/util.js | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 6400574616f..1de364128d7 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -1880,18 +1880,35 @@ angular.module('mm.core')
          * @return {Object[]}         Array of objects with the name & value of each property.
          */
         self.objectToArrayOfObjects = function(obj, keyName, valueName, sort) {
-            var keys = Object.keys(obj);
-
+            var entries = getEntries('', obj);
             if (sort) {
-                keys = keys.sort();
+                return entries.sort(function(a, b) {
+                    return a.name > b.name;
+                });
             }
+            return entries;
 
-            return keys.map(function(key) {
-                var entry = {};
-                entry[keyName] = key;
-                entry[valueName] = obj[key];
-                return entry;
-            });
+            // Get the entries from an object or primitive value.
+            function getEntries(elKey, value) {
+                if (typeof value == 'object') {
+                    // It's an object, return at least an entry for each property.
+                    var keys = Object.keys(value),
+                        entries = [];
+
+                    angular.forEach(keys, function(key) {
+                        var newElKey = elKey ? elKey + '[' + key + ']' : key;
+                        entries = entries.concat(getEntries(newElKey, value[key]));
+                    });
+
+                    return entries;
+                } else {
+                    // Not an object, return a single entry.
+                    var entry = {};
+                    entry[keyName] = elKey;
+                    entry[valueName] = value;
+                    return entry;
+                }
+            }
         };
 
         /**

From 7526ae6c43d659d0ffce04985f9e95bdfabbece5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 22 Mar 2017 13:53:07 +0100
Subject: [PATCH 023/218] MOBILE-2013 lesson: Support all types of questions

---
 www/addons/mod/lesson/controllers/player.js |   7 +-
 www/addons/mod/lesson/lang/en.json          |   3 +-
 www/addons/mod/lesson/services/helper.js    | 165 ++++++++++++++++++--
 www/addons/mod/lesson/services/lesson.js    |   2 +-
 www/addons/mod/lesson/templates/player.html |  60 +++++--
 5 files changed, 204 insertions(+), 33 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 1b6dcc41375..7eede9cfffc 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -254,7 +254,12 @@ angular.module('mm.addons.mod_lesson')
 
     // Submit a question.
     $scope.submitQuestion = function() {
-        processPage($scope.question.model);
+        showLoading();
+        $mmaModLessonHelper.prepareQuestionModel($scope.question).then(function(model) {
+            return processPage(model);
+        }).finally(function() {
+            $scope.pageLoaded = true;
+        });
     };
 
     // Load a page from menu or when continuing from a feedback page.
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 35c4c1cc1d9..92c521c543a 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -14,5 +14,6 @@
     "startattempt": "Start attempt",
     "submit": "Submit",
     "timeremaining": "Time remaining",
-    "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?"
+    "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
+    "youranswer": "Your answer"
 }
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 29c69ef629d..08caed9a519 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonHelper
  */
-.factory('$mmaModLessonHelper', function($mmaModLesson) {
+.factory('$mmaModLessonHelper', function($mmaModLesson, $mmText, $q, $mmUtil) {
 
     var self = {};
 
@@ -89,7 +89,7 @@ angular.module('mm.addons.mod_lesson')
             button = {
                 id: buttonEl.id,
                 title: buttonEl.title,
-                content: buttonEl.innerHTML,
+                content: buttonEl.innerHTML.trim(),
                 data: {}
             };
 
@@ -116,6 +116,7 @@ angular.module('mm.addons.mod_lesson')
         var rootElement = document.createElement('div'),
             fieldContainer,
             hiddenInputs,
+            type,
             question = {
                 model: {}
             };
@@ -137,34 +138,168 @@ angular.module('mm.addons.mod_lesson')
 
         switch (pageData.page.qtype) {
             case $mmaModLesson.LESSON_PAGE_TRUEFALSE:
-                question.template = 'truefalse';
+            case $mmaModLesson.LESSON_PAGE_MULTICHOICE:
+                question.template = 'multichoice';
                 question.options = [];
 
-                // Get all the options to show.
-                var labels = fieldContainer.querySelectorAll('.form-check-inline');
-                angular.forEach(labels, function(label) {
-                    var option = {},
-                        input = label.querySelector('input[type="radio"]');
+                // Get all the inputs. Search radio first.
+                var inputs = fieldContainer.querySelectorAll('input[type="radio"]');
+                if (!inputs || !inputs.length) {
+                    // Radio buttons not found, it might be a multi answer. Search for checkbox.
+                    question.multi = true;
+                    inputs = fieldContainer.querySelectorAll('input[type="checkbox"]');
 
-                    if (!input) {
-                        return;
+                    if (!inputs || !inputs.length) {
+                        // No checkbox found either. Stop.
+                        return false;
                     }
+                }
 
-                    option.id = input.id;
-                    option.name = input.name;
-                    option.value = input.value;
+                angular.forEach(inputs, function(input) {
+                    var option = {
+                            id: input.id,
+                            name: input.name,
+                            value: input.value
+                        },
+                        parent = input.parentNode;
 
-                    // Remove the input and use the rest of the contents as the label.
+                    // Remove the input and use the rest of the parent contents as the label.
                     angular.element(input).remove();
-                    option.text = label.innerHTML.trim();
+                    option.text = parent.innerHTML.trim();
 
                     question.options.push(option);
                 });
                 break;
+
+            case $mmaModLesson.LESSON_PAGE_NUMERICAL:
+                type = 'number';
+            case $mmaModLesson.LESSON_PAGE_SHORTANSWER:
+                question.template = 'shortanswer';
+
+                // Get the input.
+                var input = fieldContainer.querySelector('input[type="text"], input[type="number"]');
+                if (!input) {
+                    return false;
+                }
+
+                question.input = {
+                    id: input.id,
+                    name: input.name,
+                    maxlength: input.maxLength,
+                    value: input.value,
+                    type: type || 'text'
+                };
+                break;
+
+            case $mmaModLesson.LESSON_PAGE_ESSAY:
+                question.template = 'essay';
+
+                // Get the textarea.
+                var textarea = fieldContainer.querySelector('textarea'),
+                    nameMatch;
+                if (!textarea) {
+                    return false;
+                }
+
+                // Extract the model name and the property from the textarea's name.
+                textarea.name = textarea.name || 'answer[text]';
+                nameMatch = textarea.name.match(/([^\[]*)\[([^\[]*)\]/);
+
+                question.textarea = {
+                    id: textarea.id,
+                    fullName: textarea.name,
+                    name: nameMatch[1] || 'answer',
+                    property: nameMatch[2] || 'text'
+                };
+
+                // Init the model.
+                question.model[question.textarea.name] = {};
+                break;
+
+            case $mmaModLesson.LESSON_PAGE_MATCHING:
+                question.template = 'matching';
+
+                var rows = fieldContainer.querySelectorAll('.answeroption');
+                question.rows = [];
+
+                angular.forEach(rows, function(row) {
+                    var label = row.querySelector('label'),
+                        select = row.querySelector('select'),
+                        options = row.querySelectorAll('option'),
+                        rowModel = {};
+
+                    if (!label || !select || !options || !options.length) {
+                        return;
+                    }
+
+                    // Get the row's text (label).
+                    rowModel.text = label.innerHTML.trim();
+                    rowModel.id = select.id;
+                    rowModel.name = select.name;
+                    rowModel.options = [];
+
+                    // Treat each option.
+                    angular.forEach(options, function(option) {
+                        if (typeof option.value == 'undefined') {
+                            // Option not valid, ignore it.
+                            return;
+                        }
+
+                        var opt = {
+                            value: option.value,
+                            label: option.innerHTML.trim(),
+                            selected: option.selected
+                        };
+
+                        if (opt.selected) {
+                            question.model[rowModel.name] = opt;
+                        }
+
+                        rowModel.options.push(opt);
+                    });
+
+                    question.rows.push(rowModel);
+                });
+                break;
         }
 
         return question;
     };
 
+    /**
+     * Prepare the question model to be sent to server.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#prepareQuestionModel
+     * @param  {Object} question Question to prepare.
+     * @return {Promise}         Promise resolved with the model when done.
+     */
+    self.prepareQuestionModel = function(question) {
+        // Create a copy of the model so changing it doesn't affect the template.
+        var model = angular.copy(question.model);
+        if (question.template == 'essay') {
+            // The answer might need formatting. Check if rich text editor is enabled or not.
+            return $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
+                if (!enabled) {
+                    // Rich text editor not enabled, add some HTML to the answer if needed.
+                    var answer = model[question.textarea.name],
+                        propertyName = question.textarea.property;
+                    answer[propertyName] = $mmText.formatHtmlLines(answer[propertyName]);
+                }
+
+                return model;
+            });
+        } else if (question.template == 'matching') {
+            angular.forEach(question.rows, function(row) {
+                if (typeof model[row.name] == 'object') {
+                    model[row.name] = model[row.name].value;
+                }
+            });
+        }
+
+        return $q.when(model);
+    };
+
     return self;
 });
\ No newline at end of file
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index adfe9a9b5f8..624665cb6d7 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -762,7 +762,7 @@ angular.module('mm.addons.mod_lesson')
             var params = {
                 lessonid: lessonId,
                 pageid: pageId,
-                data: $mmUtil.objectToArrayOfObjects(data, 'name', 'value'),
+                data: $mmUtil.objectToArrayOfObjects(data, 'name', 'value', true),
                 review: review ? 1 : 0
             };
 
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 9704987bd9d..62af57fd9b3 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -36,22 +36,22 @@
                 <!-- End of lesson reached. -->
                 <div ng-if="eolData && !processData" class="padding">
                     <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
-                    <p ng-if="eolData.notenoughtimespent">{{ eolData.notenoughtimespent.message }}</p>
-                    <p ng-if="eolData.numberofpagesviewed">{{ eolData.numberofpagesviewed.message }}</p>
-                    <p ng-if="eolData.youshouldview">{{ eolData.youshouldview.message }}</p>
-                    <p ng-if="eolData.numberofcorrectanswers">{{ eolData.numberofcorrectanswers.message }}</p>
-                    <p ng-if="eolData.displayscorewithessays">{{ eolData.displayscorewithessays.message }}</p>
-                    <p ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays">{{ eolData.displayscorewithoutessays.message }}</p>
-                    <p ng-if="eolData.yourcurrentgradeisoutof">{{ eolData.yourcurrentgradeisoutof.message }}</p>
-                    <p ng-if="eolData.eolstudentoutoftimenoanswers">{{ eolData.eolstudentoutoftimenoanswers.message }}</p>
-                    <p ng-if="eolData.welldone">{{ eolData.welldone.message }}</p>
+                    <p ng-if="eolData.notenoughtimespent"><mm-format-text>{{ eolData.notenoughtimespent.message }}</mm-format-text></p>
+                    <p ng-if="eolData.numberofpagesviewed"><mm-format-text>{{ eolData.numberofpagesviewed.message }}</mm-format-text></p>
+                    <p ng-if="eolData.youshouldview"><mm-format-text>{{ eolData.youshouldview.message }}</mm-format-text></p>
+                    <p ng-if="eolData.numberofcorrectanswers"><mm-format-text>{{ eolData.numberofcorrectanswers.message }}</mm-format-text></p>
+                    <p ng-if="eolData.displayscorewithessays"><mm-format-text>{{ eolData.displayscorewithessays.message }}</mm-format-text></p>
+                    <p ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays"><mm-format-text>{{ eolData.displayscorewithoutessays.message }}</mm-format-text></p>
+                    <p ng-if="eolData.yourcurrentgradeisoutof"><mm-format-text>{{ eolData.yourcurrentgradeisoutof.message }}</mm-format-text></p>
+                    <p ng-if="eolData.eolstudentoutoftimenoanswers"><mm-format-text>{{ eolData.eolstudentoutoftimenoanswers.message }}</mm-format-text></p>
+                    <p ng-if="eolData.welldone"><mm-format-text>{{ eolData.welldone.message }}</mm-format-text></p>
                     <div ng-if="lesson.progressbar && eolData.progressbar">
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: eolProgress} }}</p>
                         <progress max="100" value="{{eolProgress}}"></progress>
                     </div>
-                    <p ng-if="eolData.displayofgrade">{{ eolData.displayofgrade.message }}</p>
-                    <p ng-if="eolData.reviewlesson">{{ eolData.reviewlesson.message }}</p>
-                    <p ng-if="eolData.modattemptsnoteacher">{{ eolData.modattemptsnoteacher.message }}</p>
+                    <p ng-if="eolData.displayofgrade"><mm-format-text>{{ eolData.displayofgrade.message }}</mm-format-text></p>
+                    <p ng-if="eolData.reviewlesson"><mm-format-text>{{ eolData.reviewlesson.message }}</mm-format-text></p>
+                    <p ng-if="eolData.modattemptsnoteacher"><mm-format-text>{{ eolData.modattemptsnoteacher.message }}</mm-format-text></p>
                     <mm-format-text ng-if="eolData.activitylink" watch="true">{{ eolData.activitylink.value }}</mm-format-text>
                     <!-- @todo Return & grade links. -->
                 </div>
@@ -67,10 +67,40 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
             </div>
 
             <!-- List of questions templates. -->
-            <script type="text/ng-template" id="truefalse">
-                <ion-radio ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]">
-                    <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{option.text}}</mm-format-text></p>
+            <script type="text/ng-template" id="multichoice">
+                <ion-radio ng-if="!question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]">
+                    <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{option.text}}</mm-format-text></p>
                 </ion-radio>
+                <ion-checkbox ng-if="question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" class="item-text-wrap item-checkbox-right">
+                    <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{option.text}}</mm-format-text></p>
+                </ion-checkbox>
+            </script>
+
+            <script type="text/ng-template" id="shortanswer">
+                <ion-input class="item item-input">
+                    <input type="{{question.input.type}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" id="{{question.input.id}}" name="{{question.input.name}}" autocorrect="off" ng-model="question.model[question.input.name]"  ng-value="question.input.value" maxlength="{{question.input.maxlength}}">
+                </ion-input>
+            </script>
+
+            <script type="text/ng-template" id="essay">
+                <ion-input class="item item-input mm-item-has-rich-text-editor">
+                    <mm-rich-text-editor model="question.model[question.textarea.name]" property="{{question.textarea.property}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" name="{{question.textarea.name}}" scroll-handle="mmaModLessonPlayerScroll" component="{{component}}" component-id="{{lesson.coursemodule}}"></mm-rich-text-editor>
+                </ion-input>
+            </script>
+
+            <script type="text/ng-template" id="matching">
+                <div class="item item-text-wrap row mm-item-padding" ng-repeat="row in question.rows">
+                    <div class="col">
+                        <p><mm-format-text id="mma-mod_lesson-{{row.id}}" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{ row.text }}</mm-format-text></p>
+                    </div>
+                    <div class="col item-select">
+                        <select id="{{row.id}}" name="{{row.name}}" aria-labelledby="mma-mod_lesson-{{row.id}}" ng-options="option.label for option in row.options" ng-model="question.model[row.name]" mm-ios-select-fix>
+                        </select>
+                        <p class="mm-select-fix" ng-if="question.model[row.name] && question.model[row.name].label">
+                            {{question.model[row.name].label}}
+                        </p>
+                    </div>
+                </div>
             </script>
         </mm-loading>
     </ion-content>

From 736a90b11b0b86d0b7d3b5b47043f9d25f689f0c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Mar 2017 16:29:16 +0100
Subject: [PATCH 024/218] MOBILE-2075 lang: Always use English as fallback
 language

---
 www/core/lib/lang.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/core/lib/lang.js b/www/core/lib/lang.js
index 870337b5a98..ea801063ed7 100644
--- a/www/core/lib/lang.js
+++ b/www/core/lib/lang.js
@@ -249,7 +249,7 @@ angular.module('mm.core')
 
     // Set fallback language and language to use until the app determines the right language to use.
     var lang = mmCoreConfigConstants.default_lang || 'en';
-    $translateProvider.fallbackLanguage(lang);
+    $translateProvider.fallbackLanguage('en'); // Always use English as fallback language.
     $translateProvider.preferredLanguage(lang);
 })
 

From f01a89e62bb5cd646ec5d367a0c976e44195ec1b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Mar 2017 15:24:35 +0100
Subject: [PATCH 025/218] MOBILE-2013 lesson: Check for changes before leaving

---
 www/addons/mod/lesson/controllers/player.js | 20 +++++++++++++++++---
 www/addons/mod/lesson/templates/player.html |  2 +-
 www/core/lib/util.js                        |  5 +++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 7eede9cfffc..7874dae7c77 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonPlayerCtrl
  */
 .controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
-            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu) {
+            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate) {
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
@@ -30,7 +30,9 @@ angular.module('mm.addons.mod_lesson')
         lesson,
         accessInfo,
         offline = false,
-        scrollView;
+        scrollView,
+        originalData,
+        blockData;
 
     // Block the lesson so it cannot be synced.
     $mmSyncBlock.blockOperation(mmaModLessonComponent, lessonId);
@@ -115,9 +117,11 @@ angular.module('mm.addons.mod_lesson')
             if ($mmaModLesson.isQuestionPage(data.page.type)) {
                 $scope.pageButtons = [];
                 $scope.question = $mmaModLessonHelper.getQuestionFromPageData(data);
+                originalData = angular.copy($scope.question.model);
             } else {
                 $scope.pageButtons = $mmaModLessonHelper.getPageButtonsFromHtml(data.pagecontent);
                 $scope.question = false;
+                originalData = false;
             }
 
             if (data.displaymenu && !$scope.displayMenu) {
@@ -156,7 +160,12 @@ angular.module('mm.addons.mod_lesson')
 
     // Function called when the user wants to leave the player. Save the attempt before leaving.
     function leavePlayer() {
-        // @todo
+        if ($scope.question && !$scope.eolData && !$scope.processData && originalData) {
+            // Question shown. Check if there is any change.
+            if (!$mmUtil.basicLeftCompare($scope.question.model, originalData, 3)) {
+                 return $mmUtil.showConfirm($translate('mm.core.confirmcanceledit'));
+            }
+        }
         return $q.when();
     }
 
@@ -294,6 +303,11 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    // First render of rich text editor.
+    $scope.firstRender = function() {
+        originalData = angular.copy($scope.question.model);
+    };
+
     // Setup right side menu.
     $mmSideMenu.showRightSideMenu('addons/mod/lesson/templates/menu.html', $scope);
 
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 62af57fd9b3..713e7a7b5ef 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -84,7 +84,7 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
 
             <script type="text/ng-template" id="essay">
                 <ion-input class="item item-input mm-item-has-rich-text-editor">
-                    <mm-rich-text-editor model="question.model[question.textarea.name]" property="{{question.textarea.property}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" name="{{question.textarea.name}}" scroll-handle="mmaModLessonPlayerScroll" component="{{component}}" component-id="{{lesson.coursemodule}}"></mm-rich-text-editor>
+                    <mm-rich-text-editor model="question.model[question.textarea.name]" property="{{question.textarea.property}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" name="{{question.textarea.name}}" scroll-handle="mmaModLessonPlayerScroll" component="{{component}}" component-id="{{lesson.coursemodule}}" first-render="firstRender()"></mm-rich-text-editor>
                 </ion-input>
             </script>
 
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 1de364128d7..4e11e39f4ae 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -1264,6 +1264,11 @@ angular.module('mm.core')
 
                 var equal = true;
                 angular.forEach(itemA, function(value, name) {
+                    if (name == '$$hashKey') {
+                        // Ignore $$hashKey property since it's a "calculated" property.
+                        return;
+                    }
+
                     if (!self.basicLeftCompare(value, itemB[name], maxLevels, level + 1)) {
                         equal = false;
                     }

From fabde24d5e1c757aee489a99f0e5a6725d97e3c1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 23 Mar 2017 15:47:03 +0100
Subject: [PATCH 026/218] MOBILE-2068 gulp: Fix remote addon packaging for
 Windows

---
 gulpfile.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index a0f1b312697..d50f17f3042 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -758,7 +758,7 @@ gulp.task('remoteaddon-build', ['remoteaddon-copy'], function(done) {
   pathToReplace = newYargs.argv.jspath;
   if (typeof pathToReplace == 'undefined') {
     if (path.indexOf('www') === 0) {
-      pathToReplace = path.replace('www/', '');
+      pathToReplace = path.replace(/www[\/\\]/, '');
     } else {
       pathToReplace = path;
     }
@@ -766,6 +766,9 @@ gulp.task('remoteaddon-build', ['remoteaddon-copy'], function(done) {
 
   jsPaths = getRemoteAddonPaths(remoteAddonPaths.js, path);
 
+  // Convert all backslash (\) to slash (/) to make it work in Windows.
+  pathToReplace = pathToReplace.replace(/\\/g, '/');
+
   if (pathToReplace.slice(-1) == '/') {
     wildcard = wildcard + '/';
   }

From e5334160f0536327fd7cba5f9f890f524d2825b3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 24 Mar 2017 09:54:46 +0100
Subject: [PATCH 027/218] MOBILE-2072 login: Handle hash at the end of launch
 URL

---
 www/core/components/login/main.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index 1d6f451d2d3..cf960599794 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -358,11 +358,14 @@ angular.module('mm.core.login', [])
         $mmApp.startSSOAuthentication();
         $log.debug('App launched by URL');
 
-        var modal = $mmUtil.showModalLoading('mm.login.authenticating', true),
-            siteData;
-
         // Delete the sso scheme from the URL.
         url = url.replace(ssoScheme, '');
+
+        // Some sites add a # at the end of the URL. If it's there, remove it.
+        if (url.slice(-1) == '#') {
+            url = url.substring(0, url.length - 1);
+        }
+
         // Decode from base64.
         try {
             url = atob(url);
@@ -372,6 +375,9 @@ angular.module('mm.core.login', [])
             return false;
         }
 
+        var modal = $mmUtil.showModalLoading('mm.login.authenticating', true),
+            siteData;
+
         // Wait for app to be ready.
         $mmApp.ready().then(function() {
             return $mmLoginHelper.validateBrowserSSOLogin(url);

From c95a3bb0d124954689a5aea917dd454e1247c9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 2 Mar 2017 17:21:52 +0100
Subject: [PATCH 028/218] MOBILE-2039 ux: Add message box styles

---
 upgrade.txt                                   |   1 +
 www/addons/mod/assign/scss/style.scss         |   7 +-
 www/addons/mod/assign/templates/index.html    |   4 +-
 .../mod/assign/templates/submission.html      |   2 +-
 .../mod/assign/templates/submissionlist.html  |   2 +-
 www/addons/mod/chat/templates/index.html      |   6 +-
 www/addons/mod/choice/templates/index.html    |  12 +-
 .../mod/forum/templates/discussion.html       |   4 +-
 .../mod/forum/templates/discussions.html      |   2 +-
 www/addons/mod/glossary/templates/index.html  |   6 +-
 www/addons/mod/lti/templates/index.html       |   2 +-
 www/addons/mod/quiz/scss/styles.scss          |   1 +
 www/addons/mod/quiz/templates/attempt.html    |   4 +-
 www/addons/mod/quiz/templates/index.html      |  28 ++--
 www/addons/mod/scorm/templates/index.html     |   6 +-
 www/addons/mod/survey/templates/index.html    |   2 +-
 www/addons/mod/wiki/templates/page.html       |   2 +-
 www/addons/notes/templates/list.html          |   2 +-
 .../notifications/templates/preferences.html  |   2 +-
 www/addons/qtype/ddimageortext/template.html  |   2 +-
 www/addons/qtype/ddmarker/template.html       |   2 +-
 www/addons/qtype/ddwtos/template.html         |   2 +-
 .../question/templates/question.html          |   4 +-
 www/core/scss/styles.scss                     | 146 +++++++++++++-----
 24 files changed, 167 insertions(+), 84 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index ad400b58018..445676506a1 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -7,6 +7,7 @@ information provided here is intended especially for developers.
     npm install -g npm@latest
     npm install -g ionic
     npm install
+ * mm-error CSS class has been deprecated. Use mm-error-card or similar instead.
 
 === 3.2.1 ===
 
diff --git a/www/addons/mod/assign/scss/style.scss b/www/addons/mod/assign/scss/style.scss
index c12ef92ae59..50175a6eeb5 100644
--- a/www/addons/mod/assign/scss/style.scss
+++ b/www/addons/mod/assign/scss/style.scss
@@ -4,12 +4,13 @@ $mma-mod-assign-warning-color:      #c00 !default;
 .mm-site_mod_assign,
 .mm-site_mod_assign-submission {
 
-  div.latesubmission {
-    background-color: #efcfcf;
+  div.latesubmission,
+  div.overdue {
+    @extend .mm-error-item;
   }
 
   div.earlysubmission {
-    background-color: #cfefcf;
+    @extend .mm-success-item;
   }
 
   div.submissioneditable {
diff --git a/www/addons/mod/assign/templates/index.html b/www/addons/mod/assign/templates/index.html
index 6e872b68b29..98ec0e59302 100644
--- a/www/addons/mod/assign/templates/index.html
+++ b/www/addons/mod/assign/templates/index.html
@@ -23,7 +23,7 @@
             </div>
 
             <!-- Assign has something offline. -->
-            <div class="mm-warning" ng-if="hasOffline">
+            <div class="mm-warning-card-icon" ng-if="hasOffline">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
             </div>
 
@@ -57,7 +57,7 @@ <h2>{{ 'mma.mod_assign.numberofsubmissionsneedgrading' | translate }}</h2>
                     <span class="badge badge-positive">{{summary.submissionsneedgradingcount}}</span>
                     <i class="icon icon-accessory ion-chevron-right" ng-if="needsGradingAvalaible"></i>
                 </div>
-                <p class="mm-warning" ng-if="assign.teamsubmission && summary.warnofungroupedusers">{{ 'mma.mod_assign.ungroupedusers' | translate }}</p>
+                <p class="mm-info-card" ng-if="assign.teamsubmission && summary.warnofungroupedusers">{{ 'mma.mod_assign.ungroupedusers' | translate }}</p>
             </div>
 
             <mma-mod-assign-submission ng-if="!canviewsubmissions" courseid="{{courseid}}" moduleid="{{moduleid}}" scroll-handle="mmaModAssignIndexScroll"></mma-mod-assign-submission>
diff --git a/www/addons/mod/assign/templates/submission.html b/www/addons/mod/assign/templates/submission.html
index 3525e0a3fb8..0d6a06d8c57 100644
--- a/www/addons/mod/assign/templates/submission.html
+++ b/www/addons/mod/assign/templates/submission.html
@@ -211,7 +211,7 @@ <h2>{{ grader.fullname }}</h2>
             </a>
         </div>
 
-        <div class="mm-warning" ng-if="isGrading && !canSaveGrades">
+        <div class="mm-warning-card-icon" ng-if="isGrading && !canSaveGrades">
             <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_assign.cannotgradefromapp' | translate:{$a: moduleName} }}
             <a ng-if="gradeUrl" href="{{ gradeUrl }}" mm-link class="button button-block icon-right ion-share">{{ 'mm.core.openinbrowser' | translate }}</a>
         </div>
diff --git a/www/addons/mod/assign/templates/submissionlist.html b/www/addons/mod/assign/templates/submissionlist.html
index 35988a853ec..e9ad58f0cd1 100644
--- a/www/addons/mod/assign/templates/submissionlist.html
+++ b/www/addons/mod/assign/templates/submissionlist.html
@@ -20,7 +20,7 @@ <h2 ng-if="!submission.userfullname">{{ 'mma.mod_assign.hiddenuser' | translate
                             <i class="icon icon-accessory ion-chevron-right"></i>
                         </a>
                     </li>
-                    <li class="mm-warning item item-text-wrap" ng-if="!haveAllParticipants">
+                    <li class="mm-warning-card-icon item item-text-wrap" ng-if="!haveAllParticipants">
                         <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_assign.notallparticipantsareshown' | translate }}
                     </li>
                     <li class="padding" ng-if="!submissions || submissions.length == 0">
diff --git a/www/addons/mod/chat/templates/index.html b/www/addons/mod/chat/templates/index.html
index 529c09b06dc..101cb9e6bf5 100644
--- a/www/addons/mod/chat/templates/index.html
+++ b/www/addons/mod/chat/templates/index.html
@@ -13,11 +13,11 @@
         <mm-loading hide-until="chatLoaded">
             <mm-course-mod-description watch="true" description="description" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
-            <div class="card padding" ng-if="chatScheduled != ''">
-                <p>{{ 'mma.mod_chat.sessionstart' | translate:{$a: chatScheduled} }}</p>
+            <div class="mm-info-card-icon" ng-if="chatScheduled != ''">
+                <i class="icon ion-clock padding"></i> {{ 'mma.mod_chat.sessionstart' | translate:{$a: chatScheduled} }}
             </div>
 
-            <a class="button button-block" ui-sref="site.mod_chat-chat({chatid: chatId, title: title, courseid: courseid})">{{ 'mma.mod_chat.enterchat' | translate }}</a>
+            <a class="button button-block button-positive" ui-sref="site.mod_chat-chat({chatid: chatId, title: title, courseid: courseid})">{{ 'mma.mod_chat.enterchat' | translate }}</a>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/choice/templates/index.html b/www/addons/mod/choice/templates/index.html
index 0eaf22ca714..44364c3de32 100644
--- a/www/addons/mod/choice/templates/index.html
+++ b/www/addons/mod/choice/templates/index.html
@@ -16,17 +16,19 @@
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
             <!-- Activity availability messages -->
-            <section class="card padding" ng-if="choice.timeopen != 0 && choice.timeopen > now">
+            <section class="mm-info-card-icon" ng-if="choice.timeopen != 0 && choice.timeopen > now">
+                <i class="icon ion-information-circled padding"></i>
                 <p ng-if="options && options.length">{{ 'mma.mod_choice.previewonly' | translate:{$a: choice.openTimeReadable} }}</p>
                 <p ng-if="!options || !options.length">{{ 'mma.mod_choice.notopenyet' | translate:{$a: choice.openTimeReadable} }}</p>
             </section>
-            <section class="card padding" ng-if="choice.timeclose != 0 && choice.timeclose <= now">
+            <section class="mm-info-card-icon" ng-if="choice.timeclose != 0 && choice.timeclose <= now">
+                <i class="icon ion-information-circled padding"></i>
                 <p ng-if="options && options.length">{{ 'mma.mod_choice.yourselection' | translate }} <mm-format-text watch="true">{{options[0].text}}</mm-format-text></p>
                 <p>{{ 'mma.mod_choice.expired' | translate:{$a: choice.closeTimeReadable} }}</p>
             </section>
 
             <!-- Choice done in offline but not synchronized -->
-            <div class="mm-warning" ng-if="hasOffline">
+            <div class="mm-warning-card-icon" ng-if="hasOffline">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
             </div>
 
@@ -57,7 +59,7 @@ <h3>{{ 'mma.mod_choice.responses' | translate }}</h3>
                 </div>
                 <div class="row row-no-padding responsive-md">
                     <div class="col col-33">
-                        <div class="mm-warning" ng-if="hasOffline">
+                        <div class="mm-warning-card-icon" ng-if="hasOffline">
                             <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_choice.resultsnotsynced' | translate }}
                         </div>
                         <div class="item chart-item">
@@ -76,7 +78,7 @@ <h2><mm-format-text watch="true">{{ result.text }}</mm-format-text></h2>
                     </div>
                 </div>
             </section>
-            <section class="card padding" ng-if="!canSeeResults">
+            <section class="mm-info-card" ng-if="!canSeeResults">
                 <p>{{ 'mma.mod_choice.noresultsviewable' | translate }}</p>
             </section>
         </mm-loading>
diff --git a/www/addons/mod/forum/templates/discussion.html b/www/addons/mod/forum/templates/discussion.html
index f32f7d314ac..46278e6a84f 100644
--- a/www/addons/mod/forum/templates/discussion.html
+++ b/www/addons/mod/forum/templates/discussion.html
@@ -15,11 +15,11 @@
         </ion-refresher>
         <mm-loading hide-until="discussionLoaded">
             <!-- Discussion replies found to be synchronized -->
-            <div class="mm-warning" ng-if="postHasOffline">
+            <div class="mm-warning-card-icon" ng-if="postHasOffline">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: discussionStr} }}
             </div>
 
-            <div class="mm-warning" ng-if="locked">
+            <div class="mm-warning-card-icon" ng-if="locked">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_forum.discussionlocked' | translate }}
             </div>
 
diff --git a/www/addons/mod/forum/templates/discussions.html b/www/addons/mod/forum/templates/discussions.html
index 9c35dd17e6c..869f03ec5dc 100644
--- a/www/addons/mod/forum/templates/discussions.html
+++ b/www/addons/mod/forum/templates/discussions.html
@@ -18,7 +18,7 @@
                 <mm-course-mod-description watch="true" description="description" note="'mma.mod_forum.numdiscussions' | translate:{numdiscussions: forum.numdiscussions}" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
                 <!-- Forum discussions found to be synchronized -->
-                <div class="mm-warning" ng-if="hasOffline">
+                <div class="mm-warning-card-icon" ng-if="hasOffline">
                     <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
                 </div>
 
diff --git a/www/addons/mod/glossary/templates/index.html b/www/addons/mod/glossary/templates/index.html
index 2592f19cb49..0087707ab6a 100644
--- a/www/addons/mod/glossary/templates/index.html
+++ b/www/addons/mod/glossary/templates/index.html
@@ -22,7 +22,7 @@
             <mm-course-mod-description watch="true" description="description" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
             <!-- Glossary entries found to be synchronized -->
-            <div class="mm-warning" ng-if="hasOffline">
+            <div class="mm-warning-card-icon" ng-if="hasOffline">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
             </div>
 
@@ -51,8 +51,8 @@ <h2>{{getDivider(entries[$index])}}</h2>
                     </div>
                 </div>
 
-                <div ng-if="showNoEntries" class="padding">
-                    <p>{{ 'mma.mod_glossary.noentriesfound' | translate }}</p>
+                <div ng-if="showNoEntries" class="mm-info-card">
+                    {{ 'mma.mod_glossary.noentriesfound' | translate }}
                 </div>
 
                 <ion-infinite-scroll ng-if="canLoadMore" immediate-check="false" on-infinite="loadMoreEntries()"></ion-infinite-scroll>
diff --git a/www/addons/mod/lti/templates/index.html b/www/addons/mod/lti/templates/index.html
index 2e83afb993e..4b915b65853 100644
--- a/www/addons/mod/lti/templates/index.html
+++ b/www/addons/mod/lti/templates/index.html
@@ -12,7 +12,7 @@
         <mm-loading hide-until="ltiLoaded">
             <mm-course-mod-description watch="true" description="description" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
             <a ng-if="isValidUrl" ng-click="launch()" class="button button-block icon-left ion-link">{{ 'mma.mod_lti.launchactivity' | translate }}</a>
-            <p ng-if="!isValidUrl">{{ 'mma.mod_lti.errorinvalidlaunchurl' | translate }}</p>
+            <div class="mm-info-card" ng-if="!isValidUrl">{{ 'mma.mod_lti.errorinvalidlaunchurl' | translate }}</div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/quiz/scss/styles.scss b/www/addons/mod/quiz/scss/styles.scss
index 951d8fd011a..dcd40cda431 100644
--- a/www/addons/mod/quiz/scss/styles.scss
+++ b/www/addons/mod/quiz/scss/styles.scss
@@ -5,6 +5,7 @@ $mma-mod-quiz-alternate-color:    #fbfbfb !default;
 $mma-mod-quiz-conecterr-color:    #fcc !default;
 $mma-mod-quiz-selected-color:     #666 !default;
 
+// Deprecated use mm-error-item instead.
 p.mma-mod-quiz-warning {
   color: $mma-mod-quiz-warning-color;
 }
diff --git a/www/addons/mod/quiz/templates/attempt.html b/www/addons/mod/quiz/templates/attempt.html
index 56793574e98..5ccaddcda35 100644
--- a/www/addons/mod/quiz/templates/attempt.html
+++ b/www/addons/mod/quiz/templates/attempt.html
@@ -28,8 +28,8 @@
                 <div class="item" ng-if="quiz.showReviewColumn && attempt.finished">
                     <button class="button button-block" ui-sref="site.mod_quiz-review({courseid: courseId, quizid: quiz.id, attemptid: attempt.id})">{{ 'mma.mod_quiz.review' | translate }}</button>
                 </div>
-                <div class="item item-text-wrap mma-mod-quiz-warning" ng-if="!quiz.showReviewColumn">
-                    <p class="mma-mod-quiz-warning">{{ 'mma.mod_quiz.noreviewattempt' | translate }}</p>
+                <div class="item item-text-wrap mm-error-item" ng-if="!quiz.showReviewColumn">
+                    <p>{{ 'mma.mod_quiz.noreviewattempt' | translate }}</p>
                 </div>
             </div>
         </mm-loading>
diff --git a/www/addons/mod/quiz/templates/index.html b/www/addons/mod/quiz/templates/index.html
index d89fd364b80..556947ba1e0 100644
--- a/www/addons/mod/quiz/templates/index.html
+++ b/www/addons/mod/quiz/templates/index.html
@@ -71,26 +71,26 @@ <h2>{{ 'mma.mod_quiz.summaryofattempts' | translate }}</h2>
             </div>
 
             <div class="card" ng-if="quiz">
-                <div class="item item-text-wrap" ng-repeat="message in preventMessages">
-                    <p class="mma-mod-quiz-warning">{{ message }}</p>
+                <div class="item item-text-wrap mm-error-item" ng-repeat="message in preventMessages">
+                    <p>{{ message }}</p>
                 </div>
-                <div class="item item-text-wrap mma-mod-quiz-warning" ng-if="quiz.hasquestions === 0">
-                    <p class="mma-mod-quiz-warning">{{ 'mma.mod_quiz.noquestions' | translate }}</p>
+                <div class="item item-text-wrap mm-error-item" ng-if="quiz.hasquestions === 0">
+                    <p>{{ 'mma.mod_quiz.noquestions' | translate }}</p>
                 </div>
-                <div class="item item-text-wrap mma-mod-quiz-warning" ng-if="unsupportedQuestions && unsupportedQuestions.length">
-                    <p class="mma-mod-quiz-warning">{{ 'mma.mod_quiz.errorquestionsnotsupported' | translate }}</p>
-                    <p class="mma-mod-quiz-warning" ng-repeat="type in unsupportedQuestions">{{ type }}</p>
+                <div class="item item-text-wrap mm-error-item" ng-if="unsupportedQuestions && unsupportedQuestions.length">
+                    <p>{{ 'mma.mod_quiz.errorquestionsnotsupported' | translate }}</p>
+                    <p ng-repeat="type in unsupportedQuestions">{{ type }}</p>
                 </div>
-                <div class="item item-text-wrap mma-mod-quiz-warning" ng-if="unsupportedRules && unsupportedRules.length">
-                    <p class="mma-mod-quiz-warning">{{ 'mma.mod_quiz.errorrulesnotsupported' | translate }}</p>
-                    <p class="mma-mod-quiz-warning" ng-repeat="name in unsupportedRules">{{ name }}</p>
+                <div class="item item-text-wrap mm-error-item" ng-if="unsupportedRules && unsupportedRules.length">
+                    <p>{{ 'mma.mod_quiz.errorrulesnotsupported' | translate }}</p>
+                    <p ng-repeat="name in unsupportedRules">{{ name }}</p>
                 </div>
-                <div class="item item-text-wrap mma-mod-quiz-warning" ng-if="behaviourSupported === false">
-                    <p class="mma-mod-quiz-warning">{{ 'mma.mod_quiz.errorbehaviournotsupported' | translate }}</p>
-                    <p class="mma-mod-quiz-warning">{{ quiz.preferredbehaviour }}</p>
+                <div class="item item-text-wrap mm-error-item" ng-if="behaviourSupported === false">
+                    <p>{{ 'mma.mod_quiz.errorbehaviournotsupported' | translate }}</p>
+                    <p>{{ quiz.preferredbehaviour }}</p>
                 </div>
                 <!-- Synchronize button -->
-                <div class="mm-warning" ng-if="buttonText && hasOffline && !showSpinner">
+                <div class="mm-warning-card-icon" ng-if="buttonText && hasOffline && !showSpinner">
                     <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
                 </div>
                 <div class="item" ng-if="buttonText && !showSpinner">
diff --git a/www/addons/mod/scorm/templates/index.html b/www/addons/mod/scorm/templates/index.html
index 80c6a77bdee..ce3e4fa12d5 100644
--- a/www/addons/mod/scorm/templates/index.html
+++ b/www/addons/mod/scorm/templates/index.html
@@ -15,7 +15,9 @@
         </ion-refresher>
         <mm-loading hide-until="scormLoaded">
 	        <mm-course-mod-description watch="true" description="description" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
-	        <p ng-if="scorm.warningmessage">{{ scorm.warningmessage }}</p>
+            <div class="mm-info-card-icon" ng-if="scorm.warningmessage">
+                <i class="icon ion-information-circled padding"></i> {{ scorm.warningmessage }}
+            </div>
 	        <div ng-if="allDataLoaded && !scorm.warningmessage">
 	        	<!-- Attempts status -->
 	        	<div class="card" ng-if="scorm.displayattemptstatus || Object.keys(scorm.offlineAttempts).length">
@@ -56,7 +58,7 @@
 	                </div>
 	            </div>
                 <!-- Synchronize button -->
-                <div class="mm-warning" ng-if="!errorMessage && hasOffline">
+                <div class="mm-warning-card-icon" ng-if="!errorMessage && hasOffline">
                     <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
                 </div>
 	            <!-- TOC -->
diff --git a/www/addons/mod/survey/templates/index.html b/www/addons/mod/survey/templates/index.html
index e862bdc81ba..9ce14067d44 100644
--- a/www/addons/mod/survey/templates/index.html
+++ b/www/addons/mod/survey/templates/index.html
@@ -22,7 +22,7 @@
             </section>
 
             <!-- Survey done in offline but not synchronized -->
-            <div class="mm-warning" ng-if="hasOffline">
+            <div class="mm-warning-card-icon" ng-if="hasOffline">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
             </div>
 
diff --git a/www/addons/mod/wiki/templates/page.html b/www/addons/mod/wiki/templates/page.html
index 89b4773797b..6929dfeaeeb 100644
--- a/www/addons/mod/wiki/templates/page.html
+++ b/www/addons/mod/wiki/templates/page.html
@@ -4,7 +4,7 @@
         <mm-course-mod-description description="description" watch="true" ng-if="mainpage" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
         <!-- Wiki has something offline. -->
-        <div class="mm-warning" ng-if="pageIsOffline || wikiHasOffline">
+        <div class="mm-warning-card-icon" ng-if="pageIsOffline || wikiHasOffline">
             <i class="icon ion-alert-circled padding"></i>
             <span ng-if="pageIsOffline">{{ 'mm.core.hasdatatosync' | translate:{$a: pageStr} }}</span>
             <span ng-if="!pageIsOffline && wikiHasOffline">{{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}</span>
diff --git a/www/addons/notes/templates/list.html b/www/addons/notes/templates/list.html
index 60f8c76e543..3657defb6f3 100644
--- a/www/addons/notes/templates/list.html
+++ b/www/addons/notes/templates/list.html
@@ -12,7 +12,7 @@
         </ion-refresher>
         <mm-loading hide-until="notesLoaded">
             <!-- There are notes pending to be synchronized. -->
-            <div class="mm-warning" ng-if="hasOffline">
+            <div class="mm-warning-card-icon" ng-if="hasOffline">
                 <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.thereisdatatosync' | translate:{$a: notesStr} }}
             </div>
 
diff --git a/www/addons/notifications/templates/preferences.html b/www/addons/notifications/templates/preferences.html
index a409ac68659..80ba9fb90ed 100644
--- a/www/addons/notifications/templates/preferences.html
+++ b/www/addons/notifications/templates/preferences.html
@@ -18,7 +18,7 @@
 
             <!-- Show current processor. -->
             <div class="card" ng-if="currentProcessor">
-                <p class="item item-icon-left item-howto item-text-wrap" ng-class="{'item-icon-right': currentProcessor.hassettings && currentProcessor.supported}" ng-click="openProcessorPreferences()">
+                <p class="item item-icon-left mm-info-item item-text-wrap" ng-class="{'item-icon-right': currentProcessor.hassettings && currentProcessor.supported}" ng-click="openProcessorPreferences()">
                     <i class="icon ion-information"></i>
                     {{ 'mm.settings.configuringnotifications' | translate:{$a: currentProcessor.displayname} }}
                     <i ng-if="currentProcessor.hassettings && currentProcessor.supported" class="icon ion-gear-b"></i>
diff --git a/www/addons/qtype/ddimageortext/template.html b/www/addons/qtype/ddimageortext/template.html
index 783212bf8f0..11abe4ead28 100644
--- a/www/addons/qtype/ddimageortext/template.html
+++ b/www/addons/qtype/ddimageortext/template.html
@@ -2,7 +2,7 @@
     <mm-loading hide-until="question.loaded"></mm-loading>
     <!-- Content is outside the mm-loading to let the script calculate drag items position -->
     <div ng-class="{invisible: !question.loaded}" class="item item-text-wrap">
-        <p ng-if="!question.readonly" class="item-howto item item-icon-left"><i class="icon ion-information"></i> {{ 'mm.question.howtodraganddrop' | translate }}</p>
+        <p ng-if="!question.readonly" class="mm-info-card-icon"><i class="icon ion-information"></i> {{ 'mm.question.howtodraganddrop' | translate }}</p>
         <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ question.text }}</mm-format-text></p>
         <mm-format-text watch="true" not-adapt-img="true" ng-if="question.ddarea" component="{{component}}" component-id="{{componentId}}">
             {{ question.ddarea }}
diff --git a/www/addons/qtype/ddmarker/template.html b/www/addons/qtype/ddmarker/template.html
index d2518751c0d..e1a107e66a2 100644
--- a/www/addons/qtype/ddmarker/template.html
+++ b/www/addons/qtype/ddmarker/template.html
@@ -2,7 +2,7 @@
     <mm-loading hide-until="question.loaded"></mm-loading>
     <!-- Content is outside the mm-loading to let the script calculate drag items position -->
     <div ng-class="{invisible: !question.loaded}" class="item item-text-wrap">
-        <p ng-if="!question.readonly" class="item-howto item item-icon-left"><i class="icon ion-information"></i> {{ 'mm.question.howtodraganddrop' | translate }}</p>
+        <p ng-if="!question.readonly" class="mm-info-card-icon"><i class="icon ion-information"></i> {{ 'mm.question.howtodraganddrop' | translate }}</p>
         <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ question.text }}</mm-format-text></p>
         <mm-format-text watch="true" not-adapt-img="true" ng-if="question.ddarea" component="{{component}}" component-id="{{componentId}}">
             {{ question.ddarea }}
diff --git a/www/addons/qtype/ddwtos/template.html b/www/addons/qtype/ddwtos/template.html
index 169069f6a05..05626ee1319 100644
--- a/www/addons/qtype/ddwtos/template.html
+++ b/www/addons/qtype/ddwtos/template.html
@@ -1,6 +1,6 @@
 <section class="list mma-qtype-ddwtos-container" ng-if="question.text || question.text === ''">
     <div class="item item-text-wrap">
-        <p ng-if="!question.readonly" class="item-howto item item-icon-left"><i class="icon ion-information"></i> {{ 'mm.question.howtodraganddrop' | translate }}</p>
+        <p ng-if="!question.readonly" class="mm-info-card-icon"><i class="icon ion-information"></i> {{ 'mm.question.howtodraganddrop' | translate }}</p>
         <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ question.text }}</mm-format-text></p>
         <mm-format-text watch="true" ng-if="question.answers" component="{{component}}" component-id="{{componentId}}">
             {{ question.answers }}
diff --git a/www/core/components/question/templates/question.html b/www/core/components/question/templates/question.html
index 914433a277d..f24394a6907 100644
--- a/www/core/components/question/templates/question.html
+++ b/www/core/components/question/templates/question.html
@@ -8,8 +8,8 @@
 <!-- Question behaviour directives -->
 <div class="item item-complex" mm-question-behaviour ng-repeat="directive in behaviourDirectives"></div>
 <!-- Question validation error. -->
-<div class="item item-text-wrap" ng-if="question.validationError">
-    <p class="mm-error">{{ question.validationError }}</p>
+<div class="item item-text-wrap mm-error-item" ng-if="question.validationError">
+    <p>{{ question.validationError }}</p>
 </div>
 <!-- Question behaviour buttons. -->
 <div class="item item-text-wrap" ng-repeat="bButton in question.behaviourButtons">
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 94a29b84070..fd01147187c 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -24,9 +24,6 @@ $bar-content-text: #fff !default;
 $item-media-width: 32px !default;
 $item-media-height: 32px !default;
 
-// Howto tips.
-$item-howto-color: #d9edf7 !default;
-
 // Messages.
 $item-message-bg: $stable !default;
 $item-message-note-text: #999 !default;
@@ -36,11 +33,11 @@ $item-message-mine-bg: rgba(17, 193, 243, .1) !default;
 // Disabled items.
 $item-disabled-color: #999 !default;
 
-// Warnings (energized).
-$mm-warning-color: $energized !default;
-
-// Errors (red).
-$mm-error-color: #c00 !default;
+// Messages boxes.
+$mm-warning-color: $energized !default; // Energized / yellow.
+$mm-success-color: $balanced !default; // Balanced / green.
+$mm-info-color: $positive !default; // Positive / blue.
+$mm-error-color: #c00 !default; // Red.
 
 // Timer variables.
 $mm-timer-warn-color:     #f00 !default;
@@ -193,28 +190,6 @@ p.item-text-wrap {
   }
 }
 
-// Howto tips.
-.item.item-howto {
-  padding-bottom: 12px;
-  padding: 9px;
-  margin-bottom: 12px;
-  background-color: $item-howto-color;
-  border-color: $item-howto-color;
-  color: #666;
-
-  &.item-icon-left {
-    padding-left: 35px;
-
-    .icon:first-child {
-      left: 4px;
-    }
-  }
-
-  &.item-icon-right {
-    @extend .item-icon-right;
-  }
-}
-
 // Message item.
 .item-message {
   clear: both;
@@ -587,12 +562,46 @@ mm-navigation-bar {
   padding: $item-padding / 2;
 }
 
-p.mm-error {
-  color: $mm-error-color;
+
+/* Message cards */
+// Mixin to create message "cards" with a colored border-bottom and, optionally, an icon. For examples, for mm-warning.
+@mixin mm-message-card($color) {
+  border-bottom: 3px solid $color;
+  padding: $card-padding;
+  box-shadow: $card-box-shadow;
+  margin: 20px 10px;
+  background-color: #fff;
+  position: relative;
+  text-align: left;
+
+  i.icon:before {
+    color: $color;
+    font-size: 125%;
+  }
+
+  p:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.mm-error-card {
+  @include mm-message-card($mm-error-color);
+}
+
+.mm-warning-card {
+  @include mm-message-card($mm-warning-color);
+}
+
+.mm-info-card {
+  @include mm-message-card($mm-info-color);
+}
+
+.mm-success-card {
+  @include mm-message-card($mm-success-color);
 }
 
-.mm-warning {
-  border-bottom: 3px solid $mm-warning-color;
+@mixin mm-message-card-icon($color) {
+  border-bottom: 3px solid $color;
   padding: $card-padding;
   box-shadow: $card-box-shadow;
   margin: 20px 10px;
@@ -609,14 +618,81 @@ p.mm-error {
     height: 100%;
     font-size: ceil(($item-icon-font-size / 4) * 3);
     left: ceil($item-padding / 4);
-    color: $mm-warning-color;
 
     &:before {
+      color: $color;
       display: block;
       width: ceil(($item-icon-font-size / 4) * 3);
       text-align: center;
     }
   }
+
+  p:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.mm-error-card-icon {
+  @include mm-message-card-icon($mm-error-color);
+}
+
+.mm-warning, // mm-warning is deprecated, use mm-warning-card-icon instead.
+.mm-warning-card-icon {
+  @include mm-message-card-icon($mm-warning-color);
+}
+
+.mm-info-card-icon {
+  @include mm-message-card-icon($mm-info-color);
+}
+
+.mm-success-card-icon {
+  @include mm-message-card-icon($mm-success-color);
+}
+
+.padding {
+  .mm-error-card, .mm-warning-card, .mm-info-card, .mm-success-card,
+  .mm-error-card-icon, .mm-warning-card-icon, .mm-info-card-icon, .mm-success-card-icon {
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
+
+// These will need item-icon-left as well.
+@mixin mm-message-item($color) {
+  border-bottom: 3px solid $color !important;
+  padding-top: 12px;
+  padding-bottom: 9px;
+  i.icon:before {
+    color: $color;
+  }
+  &.item-icon-left {
+    @extend .item-icon-left;
+  }
+
+  &.item-icon-right {
+    @extend .item-icon-right;
+  }
+}
+
+.mm-error-item {
+  @include mm-message-item($mm-error-color);
+}
+
+.mm-warning-item {
+  @include mm-message-item($mm-warning-color);
+}
+
+.item.item-howto, // item-howto is deprecated, use mm-info-item instead.
+.mm-info-item {
+  @include mm-message-item($mm-info-color);
+}
+
+.mm-success-item {
+  @include mm-message-item($mm-success-color);
+}
+
+p.mm-error { // Deprecated, use one of the above mm-error classes.
+  color: $mm-error-color;
 }
 
 // Extra attributes to ionic classes to force frames via directive 100% height.

From 5885f1bdf1a862ee9d6c50e6ced8852aecd9a72a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 27 Mar 2017 10:07:28 +0200
Subject: [PATCH 029/218] MOBILE-2014 lesson: Support review mode

---
 www/addons/mod/lesson/controllers/player.js | 35 +++++++++++-
 www/addons/mod/lesson/lang/en.json          |  5 ++
 www/addons/mod/lesson/services/helper.js    | 62 ++++++++++++++-------
 www/addons/mod/lesson/services/lesson.js    |  7 +--
 www/addons/mod/lesson/templates/player.html | 38 ++++++++-----
 5 files changed, 106 insertions(+), 41 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 7874dae7c77..26d50144f45 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -40,6 +40,8 @@ angular.module('mm.addons.mod_lesson')
     // Block leaving the view, we want to save changes before leaving.
     blockData = $mmUtil.blockLeaveView($scope, leavePlayer);
 
+    $scope.review = false;
+    $scope.LESSON_EOL = $mmaModLesson.LESSON_EOL;
     $scope.component = mmaModLessonComponent;
     $scope.currentPage = $stateParams.pageid;
     $scope.messages = [];
@@ -103,7 +105,12 @@ angular.module('mm.addons.mod_lesson')
 
     // Load a certain page.
     function loadPage(pageId) {
-        return $mmaModLesson.getPageData(lesson.id, pageId, password, false, true, offline, true).then(function(data) {
+        return $mmaModLesson.getPageData(lesson.id, pageId, password, $scope.review, true, offline, true).then(function(data) {
+            if (data.newpageid == $mmaModLesson.LESSON_EOL) {
+                // End of lesson reached.
+                return finishAttempt();
+            }
+
             $scope.pageData = data;
             $scope.title = data.page.title;
             $scope.pageContent = data.page.contents;
@@ -135,7 +142,7 @@ angular.module('mm.addons.mod_lesson')
     // Finish the attempt.
     function finishAttempt(outOfTime) {
         $scope.messages = [];
-        return $mmaModLesson.finishAttempt(lesson.id, password, outOfTime).then(function(data) {
+        return $mmaModLesson.finishAttempt(lesson.id, password, outOfTime, $scope.review).then(function(data) {
             $scope.title = lesson.name;
             $scope.eolData = data.data;
             $scope.eolProgress = data.progress;
@@ -146,6 +153,17 @@ angular.module('mm.addons.mod_lesson')
             if ($scope.eolData && $scope.eolData.activitylink) {
                 $scope.eolData.activitylink.value = $mmaModLessonHelper.formatActivityLink($scope.eolData.activitylink.value);
             }
+
+            // Format review lesson if present.
+            if ($scope.eolData && $scope.eolData.reviewlesson) {
+                var params = $mmUtil.extractUrlParams($scope.eolData.reviewlesson.value);
+                if (!params || !params.pageid) {
+                    // No pageid in the URL, the user cannot review (probably didn't answer any question).
+                    delete $scope.eolData.reviewlesson;
+                } else {
+                    $scope.eolData.reviewlesson.pageid = params.pageid;
+                }
+            }
         });
     }
 
@@ -193,7 +211,7 @@ angular.module('mm.addons.mod_lesson')
     function processPage(data) {
         showLoading();
 
-        return $mmaModLesson.processPage(lessonId, $scope.currentPage, data, password).then(function(result) {
+        return $mmaModLesson.processPage(lessonId, $scope.currentPage, data, password, $scope.review).then(function(result) {
             if (result.nodefaultresponse || result.inmediatejump) {
                 // Don't display feedback or force a redirect to a new page. Load the new page.
                 return jumpToPage(result.newpageid);
@@ -308,6 +326,17 @@ angular.module('mm.addons.mod_lesson')
         originalData = angular.copy($scope.question.model);
     };
 
+    // Review the lesson.
+    $scope.reviewLesson = function(pageId) {
+        showLoading();
+        $scope.review = true;
+
+        loadPage(pageId).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'Error loading page');
+            $scope.pageLoaded = true;
+        });
+    };
+
     // Setup right side menu.
     $mmSideMenu.showRightSideMenu('addons/mod/lesson/templates/menu.html', $scope);
 
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 92c521c543a..86f491f8975 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,14 +1,19 @@
 {
     "congratulations": "Congratulations - end of lesson reached",
     "continue": "Continue",
+    "continuetonextpage": "Continue to next page.",
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
+    "finish": "Finish",
+    "gotoendoflesson": "Go to the end of the lesson",
     "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
     "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
     "loginfail": "Login failed, please try again...",
+    "or": "OR",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
+    "reviewlesson": "Review lesson",
     "reviewquestionback": "Yes, I'd like to try again",
     "reviewquestioncontinue": "No, I just want to go on to the next question",
     "startattempt": "Start attempt",
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 08caed9a519..7dd2c890ee4 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonHelper
  */
-.factory('$mmaModLessonHelper', function($mmaModLesson, $mmText, $q, $mmUtil) {
+.factory('$mmaModLessonHelper', function($mmaModLesson, $mmText, $q, $mmUtil, $translate) {
 
     var self = {};
 
@@ -116,6 +116,7 @@ angular.module('mm.addons.mod_lesson')
         var rootElement = document.createElement('div'),
             fieldContainer,
             hiddenInputs,
+            submitButton,
             type,
             question = {
                 model: {}
@@ -131,6 +132,10 @@ angular.module('mm.addons.mod_lesson')
             question.model[input.name] = input.value;
         });
 
+        // Get the submit button and extract its value.
+        submitButton = rootElement.querySelector('input[type="submit"]');
+        question.submitLabel = submitButton ? submitButton.value : $translate.instant('mma.mod_lesson.submit');
+
         if (!fieldContainer) {
             // Element not found, return.
             return question;
@@ -159,10 +164,16 @@ angular.module('mm.addons.mod_lesson')
                     var option = {
                             id: input.id,
                             name: input.name,
-                            value: input.value
+                            value: input.value,
+                            checked: input.checked,
+                            disabled: input.disabled
                         },
                         parent = input.parentNode;
 
+                    if (option.checked) {
+                        question.model[option.name] = question.multi ? true : option.value;
+                    }
+
                     // Remove the input and use the rest of the parent contents as the label.
                     angular.element(input).remove();
                     option.text = parent.innerHTML.trim();
@@ -186,9 +197,13 @@ angular.module('mm.addons.mod_lesson')
                     id: input.id,
                     name: input.name,
                     maxlength: input.maxLength,
-                    value: input.value,
-                    type: type || 'text'
+                    type: type || 'text',
+                    readonly: input.readOnly
                 };
+
+                if (input.value) {
+                    question.model[input.name] =  type == 'number' ? parseInt(input.value, 10) : input.value;
+                }
                 break;
 
             case $mmaModLesson.LESSON_PAGE_ESSAY:
@@ -197,23 +212,31 @@ angular.module('mm.addons.mod_lesson')
                 // Get the textarea.
                 var textarea = fieldContainer.querySelector('textarea'),
                     nameMatch;
+
                 if (!textarea) {
-                    return false;
+                    // Textarea not found, probably review mode.
+                    var answerEl = fieldContainer.querySelector('.reviewessay');
+                    if (!answerEl) {
+                        // Answer not found, stop.
+                        return false;
+                    }
+                    question.useranswer = answerEl.innerHTML;
+                } else {
+                    // Extract the model name and the property from the textarea's name.
+                    textarea.name = textarea.name || 'answer[text]';
+                    nameMatch = textarea.name.match(/([^\[]*)\[([^\[]*)\]/);
+
+                    question.textarea = {
+                        id: textarea.id,
+                        fullName: textarea.name,
+                        name: nameMatch[1] || 'answer',
+                        property: nameMatch[2] || 'text'
+                    };
+
+                    // Init the model.
+                    question.model[question.textarea.name] = {};
                 }
 
-                // Extract the model name and the property from the textarea's name.
-                textarea.name = textarea.name || 'answer[text]';
-                nameMatch = textarea.name.match(/([^\[]*)\[([^\[]*)\]/);
-
-                question.textarea = {
-                    id: textarea.id,
-                    fullName: textarea.name,
-                    name: nameMatch[1] || 'answer',
-                    property: nameMatch[2] || 'text'
-                };
-
-                // Init the model.
-                question.model[question.textarea.name] = {};
                 break;
 
             case $mmaModLesson.LESSON_PAGE_MATCHING:
@@ -236,6 +259,7 @@ angular.module('mm.addons.mod_lesson')
                     rowModel.text = label.innerHTML.trim();
                     rowModel.id = select.id;
                     rowModel.name = select.name;
+                    rowModel.disabled = select.disabled;
                     rowModel.options = [];
 
                     // Treat each option.
@@ -278,7 +302,7 @@ angular.module('mm.addons.mod_lesson')
     self.prepareQuestionModel = function(question) {
         // Create a copy of the model so changing it doesn't affect the template.
         var model = angular.copy(question.model);
-        if (question.template == 'essay') {
+        if (question.template == 'essay' && question.textarea) {
             // The answer might need formatting. Check if rich text editor is enabled or not.
             return $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
                 if (!enabled) {
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 624665cb6d7..6129cf6b99e 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -691,12 +691,7 @@ angular.module('mm.addons.mod_lesson')
                 params.pageid = pageId;
             }
 
-            return site.write('mod_lesson_launch_attempt', params).then(function(result) {
-                if (!result.status) {
-                    return $q.reject();
-                }
-                return result;
-            });
+            return site.write('mod_lesson_launch_attempt', params);
         });
     };
 
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 713e7a7b5ef..d5fd8cf92da 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -21,7 +21,7 @@
                         <input ng-repeat="input in question.hiddenInputs" type="hidden" name="{{input.name}}" value="{{input.value}}" />
                         <div ng-include="question.template"></div>
                         <div class="item">
-                            <button class="button button-block" ng-click="submitQuestion()">{{ 'mma.mod_lesson.submit' | translate }}</button>
+                            <button class="button button-block" ng-click="submitQuestion()">{{ question.submitLabel }}</button>
                         </div>
                     </form>
                     <div ng-if="pageButtons && pageButtons.length" class="item">
@@ -45,12 +45,12 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                     <p ng-if="eolData.yourcurrentgradeisoutof"><mm-format-text>{{ eolData.yourcurrentgradeisoutof.message }}</mm-format-text></p>
                     <p ng-if="eolData.eolstudentoutoftimenoanswers"><mm-format-text>{{ eolData.eolstudentoutoftimenoanswers.message }}</mm-format-text></p>
                     <p ng-if="eolData.welldone"><mm-format-text>{{ eolData.welldone.message }}</mm-format-text></p>
-                    <div ng-if="lesson.progressbar && eolData.progressbar">
-                        <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: eolProgress} }}</p>
-                        <progress max="100" value="{{eolProgress}}"></progress>
+                    <div ng-if="lesson.progressbar && eolData.progresscompleted">
+                        <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: eolData.progresscompleted.value} }}</p>
+                        <progress max="100" value="{{eolData.progresscompleted.value}}"></progress>
                     </div>
                     <p ng-if="eolData.displayofgrade"><mm-format-text>{{ eolData.displayofgrade.message }}</mm-format-text></p>
-                    <p ng-if="eolData.reviewlesson"><mm-format-text>{{ eolData.reviewlesson.message }}</mm-format-text></p>
+                    <button ng-if="eolData.reviewlesson" class="button button-block" ng-click="reviewLesson(eolData.reviewlesson.pageid)"><mm-format-text>{{ 'mma.mod_lesson.reviewlesson' | translate }}</mm-format-text></button>
                     <p ng-if="eolData.modattemptsnoteacher"><mm-format-text>{{ eolData.modattemptsnoteacher.message }}</mm-format-text></p>
                     <mm-format-text ng-if="eolData.activitylink" watch="true">{{ eolData.activitylink.value }}</mm-format-text>
                     <!-- @todo Return & grade links. -->
@@ -59,8 +59,16 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                 <!-- Feedback returned when processing an action. -->
                 <div ng-if="processData" class="list">
                     <mm-format-text ng-if="processData.ongoingscore && !processData.reviewmode" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{processData.ongoingscore}}</mm-format-text>
-                    <p ng-if="!processData.reviewmode" class="item item-text-wrap"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{processData.feedback}}</mm-format-text></p>
-                    <div ng-if="processData.buttons && processData.buttons.length" class="item">
+                    <div ng-if="!processData.reviewmode || review" class="item item-text-wrap">
+                        <p ng-if="!processData.reviewmode"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{processData.feedback}}</mm-format-text></p>
+                        <div ng-if="review">
+                            <p>{{ 'mma.mod_lesson.gotoendoflesson' | translate }}</p>
+                            <p>{{ 'mma.mod_lesson.or' | translate }}</p>
+                            <p>{{ 'mma.mod_lesson.continuetonextpage' | translate }}</p>
+                        </div>
+                    </div>
+                    <div ng-if="review || (processData.buttons && processData.buttons.length)" class="item">
+                        <button ng-if="review" class="button button-block" ng-click="loadPage(LESSON_EOL)">{{ 'mma.mod_lesson.finish' | translate }}</button>
                         <button ng-repeat="button in processData.buttons track by $index" class="button button-block" ng-click="loadPage(button.pageid, true)">{{ button.label | translate }}</button>
                     </div>
                 </div>
@@ -68,24 +76,28 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
 
             <!-- List of questions templates. -->
             <script type="text/ng-template" id="multichoice">
-                <ion-radio ng-if="!question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]">
+                <ion-radio ng-if="!question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" ng-disabled="option.disabled">
                     <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{option.text}}</mm-format-text></p>
                 </ion-radio>
-                <ion-checkbox ng-if="question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" class="item-text-wrap item-checkbox-right">
+                <ion-checkbox ng-if="question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" ng-disabled="option.disabled" class="item-text-wrap item-checkbox-right">
                     <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{option.text}}</mm-format-text></p>
                 </ion-checkbox>
             </script>
 
             <script type="text/ng-template" id="shortanswer">
                 <ion-input class="item item-input">
-                    <input type="{{question.input.type}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" id="{{question.input.id}}" name="{{question.input.name}}" autocorrect="off" ng-model="question.model[question.input.name]"  ng-value="question.input.value" maxlength="{{question.input.maxlength}}">
+                    <input type="{{question.input.type}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" id="{{question.input.id}}" name="{{question.input.name}}" autocorrect="off" ng-model="question.model[question.input.name]" maxlength="{{question.input.maxlength}}" ng-disabled="question.input.readonly">
                 </ion-input>
             </script>
 
             <script type="text/ng-template" id="essay">
-                <ion-input class="item item-input mm-item-has-rich-text-editor">
+                <ion-input ng-if="question.textarea" class="item item-input mm-item-has-rich-text-editor">
                     <mm-rich-text-editor model="question.model[question.textarea.name]" property="{{question.textarea.property}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" name="{{question.textarea.name}}" scroll-handle="mmaModLessonPlayerScroll" component="{{component}}" component-id="{{lesson.coursemodule}}" first-render="firstRender()"></mm-rich-text-editor>
                 </ion-input>
+                <div ng-if="!question.textarea && question.useranswer" class="item item-text-wrap">
+                    <p class="item-heading">{{ 'mma.mod_lesson.youranswer' | translate }}</p>
+                    <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{question.useranswer}}</mm-format-text></p>
+                </div>
             </script>
 
             <script type="text/ng-template" id="matching">
@@ -93,8 +105,8 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                     <div class="col">
                         <p><mm-format-text id="mma-mod_lesson-{{row.id}}" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{ row.text }}</mm-format-text></p>
                     </div>
-                    <div class="col item-select">
-                        <select id="{{row.id}}" name="{{row.name}}" aria-labelledby="mma-mod_lesson-{{row.id}}" ng-options="option.label for option in row.options" ng-model="question.model[row.name]" mm-ios-select-fix>
+                    <div class="col" ng-class='{"item-select": !row.disabled}'>
+                        <select ng-if="!row.disabled" id="{{row.id}}" name="{{row.name}}" aria-labelledby="mma-mod_lesson-{{row.id}}" ng-options="option.label for option in row.options" ng-model="question.model[row.name]" mm-ios-select-fix>
                         </select>
                         <p class="mm-select-fix" ng-if="question.model[row.name] && question.model[row.name].label">
                             {{question.model[row.name].label}}

From d4c03d875693e893bbf196c43e7f9e996dcae397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 6 Mar 2017 15:20:47 +0100
Subject: [PATCH 030/218] MOBILE-2042 messages: Mark all messages as read

---
 www/addons/messages/controllers/discussion.js | 64 +++++++++++++++----
 www/addons/messages/services/messages.js      | 33 +++++++++-
 2 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/www/addons/messages/controllers/discussion.js b/www/addons/messages/controllers/discussion.js
index 6a9d579cb08..d65927f458a 100644
--- a/www/addons/messages/controllers/discussion.js
+++ b/www/addons/messages/controllers/discussion.js
@@ -324,20 +324,64 @@ angular.module('mm.addons.messages')
     // Mark messages as read.
     function markMessagesAsRead() {
         var readChanged = false,
-            previousMessageRead = false,
             promises = [];
 
-        angular.forEach($scope.messages, function(message) {
-
-            if (message.useridfrom != $scope.currentUserId) {
+        if ($mmaMessages.isMarkAllMessagesReadEnabled()) {
+            var messageUnreadFound = false;
+            // Mark all messages at a time if one messages is unread.
+            for (var x in $scope.messages) {
+                var message = $scope.messages[x];
+                // If an unread message is found, mark all messages as read.
+                if (message.useridfrom != $scope.currentUserId && message.read == 0) {
+                    messageUnreadFound = true;
+                    break;
+                }
+            }
+            if (messageUnreadFound) {
+                setUnreadLabelPosition();
+                promises.push($mmaMessages.markAllMessagesRead(userId).then(function() {
+                    readChanged = true;
+                    // Mark all messages as read.
+                    angular.forEach($scope.messages, function(message) {
+                        message.read = 1;
+                    });
+                }));
+            }
+        } else {
+            setUnreadLabelPosition();
+            // Mark each message as read one by one.
+            angular.forEach($scope.messages, function(message) {
                 // If the message is unread, call $mmaMessages.markMessageRead.
-                if (message.read == 0) {
+                if (message.useridfrom != $scope.currentUserId && message.read == 0) {
                     promises.push($mmaMessages.markMessageRead(message.id).then(function() {
                         readChanged = true;
                         message.read = 1;
                     }));
                 }
+            });
+        }
+
+        $q.all(promises).finally(function() {
+            if (readChanged) {
+                $mmEvents.trigger(mmaMessagesReadChangedEvent, {
+                    siteid: $mmSite.getId(),
+                    userid: userId
+                });
+            }
+        });
+    }
+
+    // Set the place where the unread label position has to be.
+    function setUnreadLabelPosition() {
+        if (unreadMessageFrom) {
+            return;
+        }
 
+        var previousMessageRead = false;
+
+        // Check all messages again and mark it as read.
+        angular.forEach($scope.messages, function(message) {
+            if (message.useridfrom != $scope.currentUserId) {
                 // Place unread from message label only once.
                 if (!unreadMessageFrom) {
                     message.unreadFrom = message.read == 0 && previousMessageRead;
@@ -347,20 +391,12 @@ angular.module('mm.addons.messages')
                 }
             }
         });
+
         // Do not update the message unread from label on next refresh.
         if (!unreadMessageFrom) {
             // Using true to indicate the label is not placed but should not be placed.
             unreadMessageFrom = true;
         }
-
-        $q.all(promises).finally(function() {
-            if (readChanged) {
-                $mmEvents.trigger(mmaMessagesReadChangedEvent, {
-                    siteid: $mmSite.getId(),
-                    userid: userId
-                });
-            }
-        });
     }
 
     // Get a discussion. Can load several "pages".
diff --git a/www/addons/messages/services/messages.js b/www/addons/messages/services/messages.js
index 50610a57f18..9aef2adca5e 100644
--- a/www/addons/messages/services/messages.js
+++ b/www/addons/messages/services/messages.js
@@ -444,7 +444,8 @@ angular.module('mm.addons.messages')
      *
      * @module mm.addons.messages
      * @ngdoc method
-     * @param messageId   ID of message to mark as read
+     * @name $mmaMessages#markMessageRead
+     * @param   {Number}  messageId   ID of message to mark as read
      * @returns {Promise} Promise resolved with boolean marking success or not.
      */
     self.markMessageRead = function(messageId) {
@@ -456,6 +457,36 @@ angular.module('mm.addons.messages')
 
     };
 
+    /**
+     * Mark all messages of a discussion as read.
+     *
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessages#markAllMessagesRead
+     * @param   {Number}  userIdFrom  User Id for the sender.
+     * @returns {Promise} Promise resolved with boolean marking success or not.
+     */
+    self.markAllMessagesRead = function(userIdFrom) {
+        var params = {
+                'useridto': $mmSite.getUserId(),
+                'useridfrom': userIdFrom
+            };
+        return $mmSite.write('core_message_mark_all_messages_as_read', params);
+
+    };
+
+    /**
+     * Returns whether or not we can mark all messages as read.
+     *
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessages#isMarkAllMessagesReadEnabled
+     * @return {Boolean}
+     */
+    self.isMarkAllMessagesReadEnabled = function() {
+        return $mmSite.wsAvailable('core_message_mark_all_messages_as_read');
+    };
+
     /**
      * Get user images for all the discussions that don't have one already.
      *

From 4d8914f71d2b764bb7a28678bff7ce7a1ebd3d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 7 Mar 2017 09:56:23 +0100
Subject: [PATCH 031/218] MOBILE-2036 assign: Do not load mm-file directive
 twice

---
 www/addons/mod/assign/directives/feedbackplugin.js    | 1 +
 www/addons/mod/assign/directives/submissionplugin.js  | 1 +
 www/addons/mod/assign/templates/feedbackplugin.html   | 6 +++---
 www/addons/mod/assign/templates/submissionplugin.html | 8 ++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/assign/directives/feedbackplugin.js b/www/addons/mod/assign/directives/feedbackplugin.js
index 1b5034f1012..beba02a327b 100644
--- a/www/addons/mod/assign/directives/feedbackplugin.js
+++ b/www/addons/mod/assign/directives/feedbackplugin.js
@@ -100,6 +100,7 @@ angular.module('mm.addons.mod_assign')
                 scope.text = $mmaModAssign.getSubmissionPluginText(plugin);
                 scope.files = $mmaModAssign.getSubmissionPluginAttachments(plugin);
                 scope.notSupported = $mmaModAssignFeedbackDelegate.isPluginSupported(plugin.type);
+                scope.pluginLoaded = true;
             }
         }
     };
diff --git a/www/addons/mod/assign/directives/submissionplugin.js b/www/addons/mod/assign/directives/submissionplugin.js
index 4861e2f6c31..37b45f02fe8 100644
--- a/www/addons/mod/assign/directives/submissionplugin.js
+++ b/www/addons/mod/assign/directives/submissionplugin.js
@@ -86,6 +86,7 @@ angular.module('mm.addons.mod_assign')
                 scope.text = $mmaModAssign.getSubmissionPluginText(plugin);
                 scope.files = $mmaModAssign.getSubmissionPluginAttachments(plugin);
                 scope.notSupported = $mmaModAssignSubmissionDelegate.isPluginSupported(plugin.type);
+                scope.pluginLoaded = true;
             }
         }
     };
diff --git a/www/addons/mod/assign/templates/feedbackplugin.html b/www/addons/mod/assign/templates/feedbackplugin.html
index 27513fd9e68..b5193a329c4 100644
--- a/www/addons/mod/assign/templates/feedbackplugin.html
+++ b/www/addons/mod/assign/templates/feedbackplugin.html
@@ -1,14 +1,14 @@
 <!-- Feedback container. We'll inject the directive here. -->
 <span class="mma-mod-assign-feedback-container">
-    <span>
+    <mm-loading hide-until="pluginLoaded">
         <!-- This content will be replaced by the directive if any is applied. -->
         <div class="item item-text-wrap" ng-if="text.length > 0 || files.length > 0">
             <h2>{{plugin.name}}</h2>
             <p ng-if="notsupported" class="badge badge-inline badge-positive">{{ 'mma.mod_assign.feedbacknotsupported' | translate }}</p>
-            <p><mm-format-text ng-if="text" expand-title="{{plugin.name}}" max-height="80" fullview-on-click="true" newlines-on-fullview="true" watch="true" component="{{assignComponent}}" component-id="{{assign.cmid}}">
+            <p ng-if="text"><mm-format-text expand-title="{{plugin.name}}" max-height="80" fullview-on-click="true" newlines-on-fullview="true" watch="true" component="{{assignComponent}}" component-id="{{assign.cmid}}">
                 {{text}}
             </mm-format-text></p>
             <mm-file ng-repeat="file in files" file="file" component="{{assignComponent}}" component-id="{{assign.cmid}}" always-download="true" no-border="true"></mm-file>
         </div>
-    </span>
+    </mm-loading>
 </span>
\ No newline at end of file
diff --git a/www/addons/mod/assign/templates/submissionplugin.html b/www/addons/mod/assign/templates/submissionplugin.html
index 96d945c00de..5760cf1204c 100644
--- a/www/addons/mod/assign/templates/submissionplugin.html
+++ b/www/addons/mod/assign/templates/submissionplugin.html
@@ -1,14 +1,14 @@
 <!-- Submission container. We'll inject the directive here. -->
 <span class="mma-mod-assign-submission-container">
-    <span>
+    <mm-loading hide-until="pluginLoaded">
         <!-- This content will be replaced by the directive if any is applied. -->
         <div class="item item-text-wrap" ng-if="text.length > 0 || files.length > 0">
             <h2>{{plugin.name}}</h2>
             <p ng-if="notSupported" class="badge badge-inline badge-positive">{{ 'mma.mod_assign.submissionnotsupported' | translate }}</p>
-            <p><mm-format-text ng-if="text" expand-title="{{plugin.name}}" max-height="80" fullview-on-click="true" newlines-on-fullview="true" watch="true" component="{{assignComponent}}" component-id="{{assign.cmid}}">
+            <p ng-if="text"><mm-format-text expand-title="{{plugin.name}}" max-height="80" fullview-on-click="true" newlines-on-fullview="true" watch="true" component="{{assignComponent}}" component-id="{{assign.cmid}}">
                 {{text}}
             </mm-format-text></p>
             <mm-file ng-repeat="file in files" file="file" component="{{assignComponent}}" component-id="{{assign.cmid}}" always-download="true" no-border="true"></mm-file>
         </div>
-    </span>
-</span>
\ No newline at end of file
+    </mm-loading>
+</span>

From cec78c603324cfc5871891598f25bb0f8d826e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Mar 2017 16:38:40 +0100
Subject: [PATCH 032/218] MOBILE-2034 survey: Make radio buttons bigger

---
 www/addons/mod/survey/lang/ar.json         |  1 -
 www/addons/mod/survey/lang/bg.json         |  1 -
 www/addons/mod/survey/lang/ca.json         |  1 -
 www/addons/mod/survey/lang/cs.json         |  1 -
 www/addons/mod/survey/lang/da.json         |  1 -
 www/addons/mod/survey/lang/de.json         |  1 -
 www/addons/mod/survey/lang/en.json         |  1 -
 www/addons/mod/survey/lang/es-mx.json      |  1 -
 www/addons/mod/survey/lang/es.json         |  1 -
 www/addons/mod/survey/lang/eu.json         |  1 -
 www/addons/mod/survey/lang/fa.json         |  1 -
 www/addons/mod/survey/lang/fr.json         |  1 -
 www/addons/mod/survey/lang/he.json         |  1 -
 www/addons/mod/survey/lang/hu.json         |  1 -
 www/addons/mod/survey/lang/it.json         |  1 -
 www/addons/mod/survey/lang/ja.json         |  1 -
 www/addons/mod/survey/lang/nl.json         |  1 -
 www/addons/mod/survey/lang/pl.json         |  1 -
 www/addons/mod/survey/lang/pt-br.json      |  1 -
 www/addons/mod/survey/lang/pt.json         |  1 -
 www/addons/mod/survey/lang/ro.json         |  1 -
 www/addons/mod/survey/lang/ru.json         |  1 -
 www/addons/mod/survey/lang/sv.json         |  1 -
 www/addons/mod/survey/lang/tr.json         |  1 -
 www/addons/mod/survey/lang/zh-cn.json      |  1 -
 www/addons/mod/survey/lang/zh-tw.json      |  1 -
 www/addons/mod/survey/scss/styles.scss     | 40 ++++++++------
 www/addons/mod/survey/templates/index.html | 61 ++++++++++++----------
 www/core/lang/en.json                      |  1 +
 www/core/scss/styles.scss                  | 53 +++++++++++++++++++
 30 files changed, 109 insertions(+), 72 deletions(-)

diff --git a/www/addons/mod/survey/lang/ar.json b/www/addons/mod/survey/lang/ar.json
index 1f0c824cde5..dd271b759c7 100644
--- a/www/addons/mod/survey/lang/ar.json
+++ b/www/addons/mod/survey/lang/ar.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "اضغط هنا للاستمرار",
     "ifoundthat": "وجدت أن",
     "ipreferthat": "أفضل أن",
     "responses": "إجابات",
diff --git a/www/addons/mod/survey/lang/bg.json b/www/addons/mod/survey/lang/bg.json
index 58ab3a180f6..37ae9873d4e 100644
--- a/www/addons/mod/survey/lang/bg.json
+++ b/www/addons/mod/survey/lang/bg.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "Щракнете тук за да продължите",
     "ifoundthat": "Аз открих, че",
     "ipreferthat": "Аз предпочинтам",
     "responses": "Отговори",
diff --git a/www/addons/mod/survey/lang/ca.json b/www/addons/mod/survey/lang/ca.json
index c9e17115530..289d7848150 100644
--- a/www/addons/mod/survey/lang/ca.json
+++ b/www/addons/mod/survey/lang/ca.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Hi ha un problema enviant l'enquesta. Si us plau, torneu-ho a intentar.",
-    "clicktocontinue": "Fes clic aquí per a continuar",
     "errorgetsurvey": "S'ha produït un error recuperant les dades de l'enquesta.",
     "ifoundthat": "Trobat:",
     "ipreferthat": "Prefereixo això",
diff --git a/www/addons/mod/survey/lang/cs.json b/www/addons/mod/survey/lang/cs.json
index 277eb5602bf..d0dbe2b561b 100644
--- a/www/addons/mod/survey/lang/cs.json
+++ b/www/addons/mod/survey/lang/cs.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Je nám líto, došlo k chybě odeslání průzkumu. Prosím zkuste to znovu.",
-    "clicktocontinue": "Stiskněte pro pokračování",
     "errorgetsurvey": "Chyba při načítání dat průzkumu.",
     "ifoundthat": "Zjistil jsem, že",
     "ipreferthat": "Představoval bych si, že",
diff --git a/www/addons/mod/survey/lang/da.json b/www/addons/mod/survey/lang/da.json
index 76c7930406d..0538d16ca6a 100644
--- a/www/addons/mod/survey/lang/da.json
+++ b/www/addons/mod/survey/lang/da.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Beklager, kunne ikke sende din undersøgelse. Prøv igen.",
-    "clicktocontinue": "Klik her for at fortsætte",
     "errorgetsurvey": "Fejl ved hentning af undersøgelsesdata.",
     "ifoundthat": "Jeg finder at",
     "ipreferthat": "Jeg foretrækker at",
diff --git a/www/addons/mod/survey/lang/de.json b/www/addons/mod/survey/lang/de.json
index 627dab3f1f9..28c0d5d47da 100644
--- a/www/addons/mod/survey/lang/de.json
+++ b/www/addons/mod/survey/lang/de.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Fehler beim Übermitteln der Umfragedaten. Versuchen Sie es noch einmal.",
-    "clicktocontinue": "Klicken Sie hier, um weiterzumachen",
     "errorgetsurvey": "Fehler beim Empfangen der Umfragedaten",
     "ifoundthat": "Dies findet statt:",
     "ipreferthat": "Ich bevorzuge es so:",
diff --git a/www/addons/mod/survey/lang/en.json b/www/addons/mod/survey/lang/en.json
index b8a8e6749b7..2a6f338f363 100644
--- a/www/addons/mod/survey/lang/en.json
+++ b/www/addons/mod/survey/lang/en.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Sorry, there was a problem submitting your survey. Please try again.",
-    "clicktocontinue": "Click here to continue",
     "errorgetsurvey": "Error getting survey data.",
     "ifoundthat": "I found that",
     "ipreferthat": "I prefer that",
diff --git a/www/addons/mod/survey/lang/es-mx.json b/www/addons/mod/survey/lang/es-mx.json
index ba446bef30a..1057c59be73 100644
--- a/www/addons/mod/survey/lang/es-mx.json
+++ b/www/addons/mod/survey/lang/es-mx.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Lo sentimos, hubo un error al enviar su encuesta. Por favor, inténtelo nuevamente.",
-    "clicktocontinue": "Haz clic aquí para continuar",
     "errorgetsurvey": "Error al obtener datos de la encuesta.",
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
diff --git a/www/addons/mod/survey/lang/es.json b/www/addons/mod/survey/lang/es.json
index 793955a6822..d843246d67c 100644
--- a/www/addons/mod/survey/lang/es.json
+++ b/www/addons/mod/survey/lang/es.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Lo sentimos, hay un problema enviando la encuesta. Por favor inténtelo otra vez.",
-    "clicktocontinue": "Haz clic aquí para continuar",
     "errorgetsurvey": "Se ha producido un error recuperando los datos de la encuesta.",
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
diff --git a/www/addons/mod/survey/lang/eu.json b/www/addons/mod/survey/lang/eu.json
index 8d6a65015f9..a1f8ef5c146 100644
--- a/www/addons/mod/survey/lang/eu.json
+++ b/www/addons/mod/survey/lang/eu.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Barkatu, baina arazo bat egon da zure hausnarketa bidaltzean. Mesedez saiatu berriz.",
-    "clicktocontinue": "Klik egin hemen jarraitzeko",
     "errorgetsurvey": "Errorea hausnarketaren datuak eskuratzean.",
     "ifoundthat": "Hau aurkitu dut",
     "ipreferthat": "Nahiago dut",
diff --git a/www/addons/mod/survey/lang/fa.json b/www/addons/mod/survey/lang/fa.json
index a5bdcd871cc..7d03eac0e6e 100644
--- a/www/addons/mod/survey/lang/fa.json
+++ b/www/addons/mod/survey/lang/fa.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "برای ادامه کلیک کنید",
     "ifoundthat": "متوجه شدم که:",
     "ipreferthat": "ترجیح می‌دهم که:",
     "responses": "پاسخ‌ها",
diff --git a/www/addons/mod/survey/lang/fr.json b/www/addons/mod/survey/lang/fr.json
index 6459a17a41c..9cd6773b6fe 100644
--- a/www/addons/mod/survey/lang/fr.json
+++ b/www/addons/mod/survey/lang/fr.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Un problème est survenu lors de l'envoi de votre consultation. Veuillez essayer à nouveau.",
-    "clicktocontinue": "Cliquer ici pour continuer",
     "errorgetsurvey": "Erreur lors de l'obtention des données de la consultation.",
     "ifoundthat": "J'ai trouvé que",
     "ipreferthat": "J'aime mieux quand",
diff --git a/www/addons/mod/survey/lang/he.json b/www/addons/mod/survey/lang/he.json
index 9a9af2963f2..0bde4bd77de 100644
--- a/www/addons/mod/survey/lang/he.json
+++ b/www/addons/mod/survey/lang/he.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "מתנצלים, היתה בעיה בהגשת הסקר שלך. אנא נסה שוב.",
-    "clicktocontinue": "הקליקו כאן כדי להמשיך",
     "errorgetsurvey": "שגיאה בטעינת מידע אודות הסקר.",
     "ifoundthat": "מצאתי ש-",
     "ipreferthat": "אני מעדיף ש-",
diff --git a/www/addons/mod/survey/lang/hu.json b/www/addons/mod/survey/lang/hu.json
index b9ce38fa6ba..46363dbb602 100644
--- a/www/addons/mod/survey/lang/hu.json
+++ b/www/addons/mod/survey/lang/hu.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "A folytatáshoz kattintson ide",
     "ifoundthat": "Azt találtam",
     "ipreferthat": "Inkább ezt szeretném",
     "responses": "Tanuló által adott válaszok",
diff --git a/www/addons/mod/survey/lang/it.json b/www/addons/mod/survey/lang/it.json
index 6155fd6f937..cb9f71b951c 100644
--- a/www/addons/mod/survey/lang/it.json
+++ b/www/addons/mod/survey/lang/it.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Si è verificato un errore durante l'invio del sondaggio. Per favore riprova.",
-    "clicktocontinue": "Clicca qui per continuare",
     "errorgetsurvey": "Si è verificato un errore durante la ricezione di dati del sondaggio.",
     "ifoundthat": "Realmente",
     "ipreferthat": "Idealmente",
diff --git a/www/addons/mod/survey/lang/ja.json b/www/addons/mod/survey/lang/ja.json
index ec4d2d6a42e..9880b35045a 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "続ける",
     "ifoundthat": "私は次のことを発見しました:",
     "ipreferthat": "私は次のことが好きです:",
     "responses": "回答",
diff --git a/www/addons/mod/survey/lang/nl.json b/www/addons/mod/survey/lang/nl.json
index f4efe1756ba..fbe668d10e9 100644
--- a/www/addons/mod/survey/lang/nl.json
+++ b/www/addons/mod/survey/lang/nl.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Sorry, er was een probleem bij het insturen van je onderzoek. Probeer opnieuw.",
-    "clicktocontinue": "Klik hier om door te gaan",
     "errorgetsurvey": "Fout bij het ophalen van onderzoeksdata.",
     "ifoundthat": "Ik vond dat",
     "ipreferthat": "Mijn voorkeur zou zijn",
diff --git a/www/addons/mod/survey/lang/pl.json b/www/addons/mod/survey/lang/pl.json
index 52aba52aa30..3b9a9921b72 100644
--- a/www/addons/mod/survey/lang/pl.json
+++ b/www/addons/mod/survey/lang/pl.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "Kliknij tutaj aby kontynuować",
     "ifoundthat": "Stwierdziłem, że",
     "ipreferthat": "Wolę to",
     "responses": "Odpowiedzi",
diff --git a/www/addons/mod/survey/lang/pt-br.json b/www/addons/mod/survey/lang/pt-br.json
index 6f352342ddc..69108bea909 100644
--- a/www/addons/mod/survey/lang/pt-br.json
+++ b/www/addons/mod/survey/lang/pt-br.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Desculpe, houve um problema enviar a sua pesquisa. Por favor, tente novamente.",
-    "clicktocontinue": "Continuar",
     "errorgetsurvey": "Erro ao obter dados da pesquisa.",
     "ifoundthat": "Freqüência atual",
     "ipreferthat": "Freqüência desejada",
diff --git a/www/addons/mod/survey/lang/pt.json b/www/addons/mod/survey/lang/pt.json
index 927c2dd09a9..ce8f21d5c38 100644
--- a/www/addons/mod/survey/lang/pt.json
+++ b/www/addons/mod/survey/lang/pt.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Ocorreu um problema durante a submissão do seu inquérito. Por favor, tente novamente.",
-    "clicktocontinue": "Clique aqui para continuar",
     "errorgetsurvey": "Erro ao obter os dados do inquérito.",
     "ifoundthat": "Achei isso",
     "ipreferthat": "Prefiro isso",
diff --git a/www/addons/mod/survey/lang/ro.json b/www/addons/mod/survey/lang/ro.json
index 96dcbe3799d..d5797c741e7 100644
--- a/www/addons/mod/survey/lang/ro.json
+++ b/www/addons/mod/survey/lang/ro.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "A apărut o eroare la trimiterea sondajului. Vă rugăm să reîncercați.",
-    "clicktocontinue": "Apasă aici pentru a continua",
     "errorgetsurvey": "A apărut o eroare la primirea datelor sondajului.",
     "ifoundthat": "Am descoperit că",
     "ipreferthat": "Prefer ca",
diff --git a/www/addons/mod/survey/lang/ru.json b/www/addons/mod/survey/lang/ru.json
index dcb081abdc6..9930cff9c3d 100644
--- a/www/addons/mod/survey/lang/ru.json
+++ b/www/addons/mod/survey/lang/ru.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "К сожалению, возникла проблема отправки вашего опроса. Пожалуйста, попробуйте еще раз",
-    "clicktocontinue": "Для продолжения нажмите сюда …",
     "errorgetsurvey": "Ошибка при получении данных опроса",
     "ifoundthat": "Я узнал, что",
     "ipreferthat": "Я предпочитаю",
diff --git a/www/addons/mod/survey/lang/sv.json b/www/addons/mod/survey/lang/sv.json
index f47ec44bc02..6a82d257471 100644
--- a/www/addons/mod/survey/lang/sv.json
+++ b/www/addons/mod/survey/lang/sv.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "Tyvärr fanns det ett problem att skicka din enkät . Var god försök igen.",
-    "clicktocontinue": "Klicka här för att fortsätta",
     "errorgetsurvey": "Fel vid hämtning av enkätdata",
     "ifoundthat": "Jag har funnit att",
     "ipreferthat": "Jag föredrar att",
diff --git a/www/addons/mod/survey/lang/tr.json b/www/addons/mod/survey/lang/tr.json
index ade8967e777..471798df02c 100644
--- a/www/addons/mod/survey/lang/tr.json
+++ b/www/addons/mod/survey/lang/tr.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "Devam etmek için buraya tıklayın",
     "ifoundthat": "Gerçekte olan",
     "ipreferthat": "İstediğim",
     "responses": "Yanıtlar",
diff --git a/www/addons/mod/survey/lang/zh-cn.json b/www/addons/mod/survey/lang/zh-cn.json
index b6007cd6ee9..7ef142e9e7a 100644
--- a/www/addons/mod/survey/lang/zh-cn.json
+++ b/www/addons/mod/survey/lang/zh-cn.json
@@ -1,5 +1,4 @@
 {
-    "clicktocontinue": "点击这里继续",
     "ifoundthat": "我发现",
     "ipreferthat": "我希望的是",
     "responses": "回复",
diff --git a/www/addons/mod/survey/lang/zh-tw.json b/www/addons/mod/survey/lang/zh-tw.json
index 4a8bec13e68..e6ad7be4230 100644
--- a/www/addons/mod/survey/lang/zh-tw.json
+++ b/www/addons/mod/survey/lang/zh-tw.json
@@ -1,6 +1,5 @@
 {
     "cannotsubmitsurvey": "很抱歉, 提交您的問卷調查時發生問題.  請再試一次.",
-    "clicktocontinue": "按此處繼續",
     "errorgetsurvey": "取得調查資料時出錯",
     "ifoundthat": "我發現",
     "ipreferthat": "我希望的是",
diff --git a/www/addons/mod/survey/scss/styles.scss b/www/addons/mod/survey/scss/styles.scss
index bb98a1361a2..9141384251d 100644
--- a/www/addons/mod/survey/scss/styles.scss
+++ b/www/addons/mod/survey/scss/styles.scss
@@ -1,23 +1,29 @@
-.mma-mod_survey-darkbg {
-  background-color: $item-divider-bg;
-}
+.mm-site_mod_survey {
+  .row, .input-label {
+    font-size: $font-size-base;
+  }
 
-.mma-mod_survey-padding-top {
-  padding-top: 20px;
-}
+  .mma-mod_survey-darkbg {
+    background-color: $item-divider-bg;
+  }
 
-textarea.mma-mod_survey-textarea {
-  height: 100px;
-  border:1px solid $item-default-border;
-}
+  .mma-mod_survey-padding-top {
+    padding-top: 20px;
+  }
+
+  textarea.mma-mod_survey-textarea {
+    height: 100px;
+    border: 1px solid $item-default-border;
+  }
 
-select.mma-mod_survey-select {
-  background-color: transparent;
-  padding-left: 0px;
-  padding-right: $item-padding * 2;
-  max-width: 100%;
+  select.mma-mod_survey-select {
+    background-color: transparent;
+    padding-left: 0px;
+    padding-right: $item-padding * 2;
+    max-width: 100%;
 
-  .mma-mod_survey-defaultoption {
-    display: none;
+    .mma-mod_survey-defaultoption {
+      display: none;
+    }
   }
 }
diff --git a/www/addons/mod/survey/templates/index.html b/www/addons/mod/survey/templates/index.html
index 9ce14067d44..e3f4ac67837 100644
--- a/www/addons/mod/survey/templates/index.html
+++ b/www/addons/mod/survey/templates/index.html
@@ -32,26 +32,30 @@
                     <!-- Parent question (Category header) -->
                     <div ng-if="question.multi && question.multi.length" ng-class="{'mma-mod_survey-padding-top': !$first}">
                         <h3 class="padding-horizontal">{{ question.text }}</h3>
-                        <div class="row" ng-if="isTablet">
-                            <div class="col col-50">{{ 'mma.mod_survey.responses' | translate }}</div>
-                            <div class="col text-center" ng-repeat="option in question.options">
-                                {{ option }}
+                        <div class="item item-text-wrap" ng-if="isTablet">
+                            <div class="row row-no-padding row-center">
+                                <div class="col col-50">{{ 'mma.mod_survey.responses' | translate }}</div>
+                                <div class="col text-center" ng-repeat="option in question.options">
+                                    {{ option }}
+                                </div>
                             </div>
                         </div>
-                        <div class="row" ng-class="{'mma-mod_survey-darkbg': $even}">
-                            <div class="col">{{ question.intro }}</div>
+                        <div class="item item-text-wrap" ng-class="{'mma-mod_survey-darkbg': $even}">
+                            <p>{{ question.intro }}</p>
                         </div>
                     </div>
                     <!-- Subquestion -->
-                    <div ng-if="question.parent !== 0" ng-class="{'mma-mod_survey-darkbg': $even}">
-                        <div class="row">
-                            <div id="mma-mod_survey-{{question.name}}" class="col" ng-class="{'col-50': isTablet, 'col-60': !isTablet}"><strong>{{question.num}}</strong> {{ question.text }}</div>
+                    <div ng-if="question.parent !== 0" class="item item-text-wrap mm-item-padding" ng-class="{'mma-mod_survey-darkbg': $even}">
+                        <div class="row row-no-padding">
+                            <div class="col col-center" ng-class="{'col-50': isTablet, 'col-60': !isTablet}">
+                                <label id="mma-mod_survey-{{question.name}}"><strong>{{question.num}}.</strong> {{ question.text }}</label>
+                            </div>
                             <!-- Tablet view: radio buttons -->
-                            <div ng-if="isTablet" class="col text-center" ng-repeat="option in question.options track by $index">
-                                <input type="radio" name="{{question.name}}" ng-model="answers[question.name]" ng-value="$index + 1" aria-labelledby="mma-mod_survey-{{question.name}}">
+                            <div ng-if="isTablet" class="col col-center" ng-repeat="option in question.options track by $index">
+                                <input type="radio" class="mm-radio" name="{{question.name}}" ng-model="answers[question.name]" ng-value="$index + 1" aria-labelledby="mma-mod_survey-{{question.name}}">
                             </div>
                             <!-- Phone view: select -->
-                            <div ng-if="!isTablet" class="col-40 item-select">
+                            <div ng-if="!isTablet" class="col col-40 item-select">
                                 <select class="mma-mod_survey-select" ng-model="answers[question.name]" ng-options="question.options.indexOf(o)+1 as o for o in question.options" aria-labelledby="mma-mod_survey-{{question.name}}" mm-ios-select-fix>
                                     <option class="mma-mod_survey-defaultoption" value="" disabled selected>{{ 'mm.core.choose' | translate }}</option>
                                 </select>
@@ -59,27 +63,26 @@ <h3 class="padding-horizontal">{{ question.text }}</h3>
                         </div>
                     </div>
                     <!-- Single question (don't belong to a category) -->
-                    <div ng-if="question.multi && question.multi.length == 0 && question.parent === 0" class="mma-mod_survey-padding-top">
-                        <div ng-if="isTablet || question.type > 0" class="row">
-                            <div id="mma-mod_survey-{{question.name}}" class="col" ng-class="{'col-50': isTablet, 'col-60': !isTablet}"><strong>{{question.num}}</strong> {{ question.text }}</div>
-                            <div class="text-center" ng-class="{'item-select': question.type > 0, 'col-50': isTablet, 'col-40': !isTablet, 'item-input item-stacked-label': question.type == 0}">
-                                <textarea ng-if="question.type === 0" ng-model="answers[question.name]" class="mma-mod_survey-textarea no-resize" aria-labelledby="mma-mod_survey-{{question.name}}" aria-multiline="true"></textarea>
-                                <select class="mma-mod_survey-select" ng-if="question.type > 0" ng-model="answers[question.name]" ng-options="i as o for (i,o) in question.options" aria-labelledby="mma-mod_survey-{{question.name}}" mm-ios-select-fix>
-                                </select>
-                            </div>
-                        </div>
-                        <div ng-if="!isTablet && question.type === 0">
-                            <div class="row">
-                                <div id="mma-mod_survey-{{question.name}}" class="col"><strong>{{question.num}}</strong> {{ question.text }}</div>
-                            </div>
-                            <div class="row text-center item-input item-stacked-label">
-                                <textarea ng-model="answers[question.name]" class="mma-mod_survey-textarea no-resize" aria-labelledby="mma-mod_survey-{{question.name}}" aria-multiline="true"></textarea>
+                    <div ng-if="question.multi && question.multi.length == 0 && question.parent === 0">
+                        <div ng-if="question.type > 0" class="item item-text-wrap mm-item-padding" ng-class="{'mma-mod_survey-darkbg': $even}">
+                            <div class="row row-no-padding">
+                                <div class="col col-60">
+                                    <label id="mma-mod_survey-{{question.name}}"><strong>{{question.num}}.</strong> {{ question.text }}</label>
+                                </div>
+                                <div class="col col-40 item-select">
+                                    <select class="mma-mod_survey-select" ng-if="question.type > 0" ng-model="answers[question.name]" ng-options="i as o for (i,o) in question.options" aria-labelledby="mma-mod_survey-{{question.name}}" mm-ios-select-fix>
+                                    </select>
+                                </div>
                             </div>
                         </div>
+                        <label ng-if="question.type === 0" class="item item-input item-stacked-label item-text-wrap mm-item-padding" ng-class="{'mma-mod_survey-darkbg': $even}">
+                            <span class="input-label" id="mma-mod_survey-{{question.name}}"><strong>{{question.num}}.</strong> {{ question.text }}</span>
+                            <textarea ng-model="answers[question.name]" class="mma-mod_survey-textarea no-resize" aria-labelledby="mma-mod_survey-{{question.name}}" aria-multiline="true"></textarea>
+                        </label>
                     </div>
                 </div>
-                <div class="padding">
-                    <button class="button button-block" ng-click="submit()" ng-disabled="!isValidResponse()">{{ 'mma.mod_survey.clicktocontinue' | translate }}</button>
+                <div class="item">
+                    <button class="button button-block button-positive" ng-click="submit()" ng-disabled="!isValidResponse()">{{ 'mm.core.submit' | translate }}</button>
                 </div>
             </section>
 
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 15976ffa3bb..a4d0a85a662 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -171,6 +171,7 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry...",
+    "submit": "Submit",
     "success": "Success!",
     "tablet": "Tablet",
     "teachers": "Teachers",
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index fd01147187c..c7d9469eff9 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -930,6 +930,59 @@ mm-timer {
   border-radius: 0;
 }
 
+input[type="radio"].mm-radio {
+  position: relative;
+  width: $checkbox-width;
+  height: $checkbox-height;
+  display: block;
+  border: 0;
+  background: transparent;
+  cursor: pointer;
+  margin: 0 auto;
+  -webkit-appearance: none;
+
+  &:before {
+    // what the checkbox looks like when its not checked
+    display: table;
+    width: 100%;
+    height: 100%;
+    border-width: $checkbox-border-width;
+    border-style: solid;
+    border-radius: $checkbox-border-radius;
+    border-color: $checkbox-off-border-light;
+    background: $checkbox-off-bg-color;
+    content: ' ';
+    @include transition(background-color 20ms ease-in-out);
+  }
+  &:checked:before {
+    background: $checkbox-on-bg-positive;
+    border-color: $checkbox-off-border-positive;
+  }
+  &:disabled:before {
+    border-color: $checkbox-off-border-light;
+    background: $checkbox-on-bg-light;
+  }
+
+  &:after {
+    @include transition(opacity .05s ease-in-out);
+    @include rotate(-45deg);
+    position: absolute;
+    top: 33%;
+    left: 25%;
+    display: table;
+    width: ($checkbox-width / 2);
+    height: ($checkbox-width / 4) - 1;
+    border: $checkbox-check-width solid $checkbox-check-color;
+    border-top: 0;
+    border-right: 0;
+    content: ' ';
+    opacity: 0;
+  }
+  &:checked:after {
+    opacity: 1;
+  }
+}
+
 .item-title {
   border: 0;
   border-bottom: 1px solid #ddd;

From 4ce8213808396f7e96bf67e6ccf416097c856670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 6 Mar 2017 10:27:25 +0100
Subject: [PATCH 033/218] MOBILE-2022 files: Add missing file icons

---
 www/img/files/archive-64.png     | Bin 5080 -> 3914 bytes
 www/img/files/audio-64.png       | Bin 5750 -> 4609 bytes
 www/img/files/avi-64.png         | Bin 5813 -> 4698 bytes
 www/img/files/base-64.png        | Bin 5217 -> 4069 bytes
 www/img/files/bmp-64.png         | Bin 5433 -> 4270 bytes
 www/img/files/calc-64.png        | Bin 4596 -> 3438 bytes
 www/img/files/chart-64.png       | Bin 4527 -> 3359 bytes
 www/img/files/database-64.png    | Bin 6157 -> 4949 bytes
 www/img/files/document-64.png    | Bin 6049 -> 4876 bytes
 www/img/files/draw-64.png        | Bin 4600 -> 3441 bytes
 www/img/files/eps-64.png         | Bin 4854 -> 3679 bytes
 www/img/files/epub-64.png        | Bin 0 -> 3839 bytes
 www/img/files/flash-64.png       | Bin 4933 -> 3752 bytes
 www/img/files/folder-64.png      | Bin 2059 -> 1102 bytes
 www/img/files/folder-open-64.png | Bin 2231 -> 1255 bytes
 www/img/files/gif-64.png         | Bin 5721 -> 4540 bytes
 www/img/files/html-64.png        | Bin 3161 -> 2150 bytes
 www/img/files/image-64.png       | Bin 7203 -> 5800 bytes
 www/img/files/impress-64.png     | Bin 4478 -> 3321 bytes
 www/img/files/isf-64.png         | Bin 4590 -> 3509 bytes
 www/img/files/jpeg-64.png        | Bin 5580 -> 4459 bytes
 www/img/files/markup-64.png      | Bin 5344 -> 4171 bytes
 www/img/files/math-64.png        | Bin 4297 -> 3170 bytes
 www/img/files/moodle-64.png      | Bin 4778 -> 3578 bytes
 www/img/files/mp3-64.png         | Bin 5417 -> 4301 bytes
 www/img/files/mpeg-64.png        | Bin 6443 -> 5308 bytes
 www/img/files/oth-64.png         | Bin 4825 -> 3724 bytes
 www/img/files/pdf-64.png         | Bin 5408 -> 4231 bytes
 www/img/files/png-64.png         | Bin 5622 -> 4528 bytes
 www/img/files/powerpoint-64.png  | Bin 5872 -> 4634 bytes
 www/img/files/psd-64.png         | Bin 6022 -> 3944 bytes
 www/img/files/publisher-64.png   | Bin 0 -> 4973 bytes
 www/img/files/quicktime-64.png   | Bin 5875 -> 4664 bytes
 www/img/files/sourcecode-64.png  | Bin 5368 -> 4297 bytes
 www/img/files/spreadsheet-64.png | Bin 6476 -> 5317 bytes
 www/img/files/text-64.png        | Bin 4820 -> 3692 bytes
 www/img/files/tiff-64.png        | Bin 5798 -> 4684 bytes
 www/img/files/unknown-64.png     | Bin 3161 -> 2150 bytes
 www/img/files/video-64.png       | Bin 5415 -> 4211 bytes
 www/img/files/wav-64.png         | Bin 6644 -> 5410 bytes
 www/img/files/wmv-64.png         | Bin 5415 -> 4211 bytes
 www/img/files/writer-64.png      | Bin 3995 -> 2836 bytes
 42 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 www/img/files/epub-64.png
 create mode 100644 www/img/files/publisher-64.png

diff --git a/www/img/files/archive-64.png b/www/img/files/archive-64.png
index 5c0d5ba8545d701dbdd67e29f5418f369b2fc82d..ba7111a024e281a4b889c45b587d5021832cc2d7 100644
GIT binary patch
literal 3914
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
Y3qk`2_p{c^J^%m!07*qoM6N<$f|Pb}X8-^I

literal 5080
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
I+b#Nk09yzm{r~^~

diff --git a/www/img/files/audio-64.png b/www/img/files/audio-64.png
index 7b0b14d1d4f3182c1dfa6a2dc98be291c985c5b3..e98c78dd7ab95c2234044611a139c2b592866c30 100644
GIT binary patch
literal 4609
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

literal 5750
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
C(`69=

diff --git a/www/img/files/avi-64.png b/www/img/files/avi-64.png
index 741e017e4db56ec81820aa62ab23cb9531d7a275..ec1a942cd13bfa3441aa2d3914f05442a3c862a0 100644
GIT binary patch
literal 4698
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

literal 5813
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
I-sbuL04<HqWdHyG

diff --git a/www/img/files/base-64.png b/www/img/files/base-64.png
index 1bf7277867e4f91ab93ba14719af3344567a01ca..cf698f52540fe055284eb8319e0a2c8b208604d0 100644
GIT binary patch
literal 4069
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
XEl0?dh4B%@00000NkvXXu0mjfu9NHs

literal 5217
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
FzW}n>Wsd*=

diff --git a/www/img/files/bmp-64.png b/www/img/files/bmp-64.png
index cbed5fb965836555d117f789190902f5be992f5e..562e7bbab340de7772e77982737834c637a3c19a 100644
GIT binary patch
literal 4270
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
QPXGV_07*qoM6N<$f~HtPF8}}l

literal 5433
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

diff --git a/www/img/files/calc-64.png b/www/img/files/calc-64.png
index 472700fc5d3da3a59598f4a2fc3de8a07d0fafdc..b813dd2cbfad8bbc5a8682bd1112e1e485fe94aa 100644
GIT binary patch
delta 3436
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
O0000<MNUMnLSTYY^63Hq

literal 4596
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
BMR))J

diff --git a/www/img/files/chart-64.png b/www/img/files/chart-64.png
index ac985203246cf0a820ecbe19bdeb4cb9f4665884..4b8f85bd679568e00265f2f4fe7752e7eb43e5ba 100644
GIT binary patch
delta 3357
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

literal 4527
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

diff --git a/www/img/files/database-64.png b/www/img/files/database-64.png
index 8ca7b46fd135c334b3cec40a1341b583a0a750ff..33d5043c19bd08fc8d9baf32d068c844aad05de0 100644
GIT binary patch
literal 4949
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
TXzIVq00000NkvXXu0mjf?gV21

literal 6157
zcmaJ_c{r5q+a6<(87lkEWGTxqMz$I2*moIZ4THhhhB3D6VX~!AL_!o15lNQp$(AKv
zB74>pBV~_I@9%xz-}lG&e$R0{&wbz5ah>P2oyYM!$CG%)M3)iF4F&)JjQV<7nA27L
z_kD);^jU`YpE+H)NZQsUbAlTw7)!(f(5?h$98}*2>yE?Vu&$y0Jve0mfLa)DVNJ3&
zHbS`&e5A0yeWXHs{7%sTfU;VMAJ)YSM}j)z-0{9Df}4#kf>6AxilCL8v9z(DCe8z|
zcb$kcziwjTa^1@X=_;tE3RMn4of7!qNLXlykGF3CDnv!_PhQmN{<j$}2>sKA<fS6`
zpQNmfuRt{kL>yF3N?OuIS{?zFmz6@uN+V^FFsO_)LK=>cflDh$BBW7r3Mgp=^sh_s
zG#b&>4TaIt`774xNk!0uMDjzy;laVdQo)y{2t;={0*OSzrDfnUGLokrk^!N<By5PJ
zZ-CI>3|hDV7b4z|geUkye=}m834tUP!P89tQ-Y7*KeWC9f3@kfVek;F9~>bi{kx>U
z9gU6ue^(!$f4l=o7~FsJ{XdBVEJFQoa11Vh5J+@69h{rc?@)dyO(G6UA`mSI1n<AQ
zc*TQ2A_RC4{GgiVa#9GWG1dj|``hv-!q^z4?;AkE`nurswNwO8Ii&D-SCqDvjI@rn
zA{wcvpnyPVBNS!jk(vsMiW=Hz^krFu%->iof=i$e&X@Ez*7d(wjeo`d7K4x9X=E)N
z5g&we)gcmmpnn#P!vA|NivP;@7uNOPb3y(q7Jixx{P$@8*QozCo$BZJ_8;M%9{!O&
z&i7RB#8YAC2LlxV0M;mdEwn|*WWOD~-?gQ{<KwVRJ7JY?&v1qgOEliC@?L!MR9w8{
zU0vk6ZW3=9jWhJKg{4QhGz>KDCh5sNac&-(9wq&(lP`@quGa7{bgFy1_NC(bGGP;w
zd1H06OPl*AVVhyQ73uy;_f%Ro!-B(3f(P~o_Xm(ITr0e9Py7}g+>OwRyj@ADXN^pZ
z_M)!;dNcd6!EJ<XxJOLI!jXoLososCY`a$E%jFcQrjxo`GkP3(3^zZ_n?7FDtc+T_
z9n?{6@P0o0n9|=e^$;FgSXF3R<qRy?eprmZrmLG7%D0LG7jAL#M;z(ueB#l3RwsXL
zM?{EQa|l3kyP$n1Lly%<>EAe?&r*C=#3I#9IQkWLdAWUpPL#*Xt-k!j>{l-@v;~^?
z&|nAW+d-`&kzK!3zwt4*^8~O1s7`!gnMY>m`8%>1Albch0z$_}RKlit+WRj}qUm9m
zsvd8GVp4|@;$$W|LfKnuwt|^v{s%#`iDP3|Ma#gKa{w{AI-OjA?<F)qe<$T%(=HFz
zHrGmCudok{<Xd8F0|WPiBUF6`?Lk*`=5DVxys)@$DjyQx$}^N7&eIhjASA6EJER2`
zlObFi@97UL4ZINdnpGVrX3MVmQ~bxZthpSu*DMfE9<a5YKTA*nJLo~Z!Y*<ng0~p=
zsJuU_tQhq&lhW1HQei_vSOG}pwUURtl*cxoOM}}^iXd!Ee3oR|qFl70So_CL?gGb=
zc>6UtotH<Ox=_T-3)=DU2oCnqQOENktf2fxziR%h{I{d9kurJX%X%$YlF>*>NxG)}
z?O$_nUbOb8y4)^H2%7=s<`+3J|3-Y9=hJsiLU%q6$1pn1ZnXgOI6#8|fNfr6y<se}
zrtejV&%oTtafCHI=+m4H;ObCZdT-Q)%gF2qn(Q};YkU$_J2O5W6~22>wD~)*(Cr~N
zn!&hb`XfV-s&lMv>y34O*3EAq)d}WKr(3BMpS~BKyX>%Bj=5=fu(f(#QGi@2m_TSh
zYTR{t6VA$Z8N{!u7q$YvKS(`AC4i@Y)FK!&FDX&AuuFJbnA5fYDAZJ|yCzx#=u{@?
zQn#-_FnoVgwBPa>)hCDhLi)z~QLJ97A1q?bk3|P&8dwcmg8Gz!=k6A=*t)yBUp(fa
z^;}=4befx9*z4DoKK^w+#`KXb{S7*!cV8{vZSY;Vv+TmSv})-t9b%}Id9-2N8JM#y
zuqRk<5VrkZp~hrXUhe4&ftKREojje1dM=CM9EHAwE^#h+K08o*$htPa)%0_}G33SG
z0MGDMrIXgI!b97l7MWinzQvUH%j?Z%5l)YFkaFZZ3EQ3iJsfUGC8i~;OlO%aPyp@d
zF2TOp!0!`itlf=gqSQ0oMrJGxxbHe-YLf5ks`sZ+U~{2qiUn_8{4#wr`>c$cdsA)(
znfj%a^#|Z)j<d~x$-u~YH%D@Y0qB=Pt<%=P`kC+m9rYXo6U>G0=;84yUY{4hIP#OC
zL?z>{Y%A5XA#QegMWM^h$sR~E8|xb;`6bIEz$-see334;p5Z9#QoHn-15D@!6E{_o
z{LP_cJa9HiM5*$fpzd~iXmxbb-kNmr%(o}XSk|Qbv7WIDohT$OlKoPlu<C<i<s@v<
z;0<+~dR^{;2>Tg{a&jt2iYpI&IN(*au<-z^^;x?uz~Mf%9@U;W^^83SI=QElOmEPK
zv}e;N>(05`O8Dn6g%CpwgQxG%R)S<#(?B|Ts(@d6qMlMdnj=0u=byr}1~AR<^nG2e
ziN+&xp$b2jmBXf2D7IE3w%X@Q9F(KmI!bWeQjDq@_Dj8JiD#wVy+6wF22P^S%spBc
z@pUDutSg_&hF6lE<{*7lKav&PTIuAp4%<0H7kow?K9FhDrp{K#oYB%xXh7#IW5S5+
z?545zGHRye`el+)lB|Qo?!>ViwP<3mOg6DAa@>0^xe9H3$$UHKwMY%}`+@9Yj<EZ?
zZjgEM7r$ayYQQH{Rf@*6;JZ%}sxtcl=9~xX3PU?eRt3!gY|<uT6zkEv`xI(dJ_Bj!
z2N^p6X(mOaEu%q2vac50mjMyV>YC{F%gxIHyV_t7l>N<arpHfbSeXG(-e}V<R8c9F
zyM#IC#0#)Q^T9qt&xP8ATIBbP2#@LOiJ(E<B4*(_?+S@X#><DP&R=S!tRvZIV~j)=
zJf^CdYO|h4>-TlN0!chePxCpZF%TfHF{YeO=Wb+HaYrvRpq{69iP5HiK|}GDG3S#`
zH|KHB@}{r=_70X}wF3<f;3H^GWY{(CrX`PwV@oo{)DgY+b9c>0^?F?*7qK9XBI=pn
zbS}KTdxz#j?(~!NiX#}6BCsZlS(PP34A3D2U~-7lK0}o-nR?Z9PAn_&n|*xp#za!Q
z9HY(I5xv!frU>S~jTw-ZcL~0JJ@=w$p+;FS=km>1QC+?_5Bi?qm`d^{gLxCv{1+C)
z@gsia(S|KTm%Q1qgy+wODr5&w%IAD$m)Rv%gnUJ?@)qW*mCl|k+OI=)UwKnx#v~H*
zIAe4WEzY4VA@+501k^IDoqhl2Vl%&J+8OjtpR$1vD6%?kbXD=9YM~cepqw>3AbrDh
z2%$Zgv?=(CXTWSXvgB~Jp^1(r*O7|S6bEJPD4lB1v>@D@6i<;qxbv}|eLZ+n-OD)A
z0P?}N+MN{#@p>%%dVLNi@tGP!iwV2U>}ToOd{q6GQul|UsnF43_j=34b}g<<kQBg{
z`7!PzFS;qC<d=R|W%oAu9-pdVv~G_`tBPT?B4Ff*^Jj+sMiZ;mw`OWdZE<9ZMln)0
z)``UokC=Zc^!Wp#_s*mM*}vd+>w(8vGmB||k-ZpxqdYEX8tD8?FlWzNHp~|~{_1=&
z){FN!n<6l+{mHCL>D?4=<x0#|hVV4ef~S$UF_yW8XFKX}lFysG?93=@9Lz2BvR26X
z_u094Y9}f+%;v*5RXP2Got^|tb18L?2g5R4vYu1Woy?><mE5%>zba&2wEz-F58q6^
z$oKQ^*^VLoOz_bURpXJzx6>Y{>?J=e*s^JJ@4iY!W%N+-LHz00Ia#8mhDDOmSiZ`p
z8Wpecz~_LA<(@+Na$%*wBd6Xc?q->z9d%Fn+t?~dU6(p4^jB`q9LRkkRO(g-C&>CV
zE{4P>X-Ogsd)t}mdzIQV5_VDxQF_l`)^c^kx<A?-{vap_vV6!FUh2BKCqbw33*b^*
z^d!&^t?BZR^1TTZqQr{y?S4{~3e`Gzn$M-XXr+>F#>r|WUTF&(uh(f(7kP#t>po`7
z4XcAl1P1~2soQFk3n~bg?$lyF_h<0GD;BD5`X*Fkr=uZ&9KM~kqkOAtOhjh(K4bW>
zh+qD`<ILtk#vhK&Ek=w@te<o54Xk8$OnIaFDpJllE&eJJ_yI+66|d2{);-<&va~2W
zsPD;ZKbG)f9(~>D?cSEEQQW(s<FIi}pGpb)yrLE~^VLmiwT}Kr=4UFd-FR|tI-W1;
zyD@Lr?s<mk?o9#LpJ0Q#oemR?3cs`!D}O#4<CiWwVtKju#ZAJko8kSlh+Vz2UPrfL
z_1ZU>DAh6`CH7X{>@+8FC3eA|$M4c(i@Q;@s;liEDyJ|q4*B7WHVkh_fWF`<kdTS~
z_~2}3`_0WbeWV_ds6#f-`oIcugmE1ly;oRalP*jPF`0s4di-VcE+S+>`}%qGE_)rb
z-6<NB-m*Z$xo6_Kg;BiVYv&|=FXroIK6)o2hI+HBX|HKw3OPttK-jG#Mls~2A9jUm
zYco7yw>0n*mRFRz>#jItK$=@SYiOKut`5r!J$RCWTUmCPgm8_#+u?5??G!~r^qv^)
zoLy)YI0os!s50oEV|!D~??~N<P0KS^Jj8NLR?b>m03@0Nc`iz@F$A6~dQ-&rhuya@
zMy3m%5<b3H0Lm**67O7nefcYG7;EKxD42Icb2)?ohMk`})_lBsmt?)*8Sc%{^%05x
zE<exA6pif97<q%>J=qL40IOSMKY#76gw!x6YuDvWzy9fIw6!qjE&-7U@Kof0IZb9m
z>l$xMcOd+FPd*p1a4M6GmeYf>6wy7V7D34_i);(B&LlZ;ZQ=6P0mjsprhLu<q!+!R
z9~(i;@rgS|m#$T`ffeW|4(y-g%Bi^Sg=BX!5f%=So9m#=^T%BxCvMU`@s*g&84jB8
zT%G4?WYy7(yR13x|6NZ3BX;d-_8`A%YMW`paL`i2_9T;&8OmqpRy2!1f#QR6dG1-9
z%P_zOyNDqPuRU#o(wH{bj+xn2V>0$HwS2VlN3cWktvZt6&I78jhnPs{nRCpvUF{v5
zn`+vx9;aJs4gG4jTak?JF1geuaYNRsk9ri6S7gE2Z3j$Q+Px1M`*uxmaSwpaeDQ)l
z_xPnDMYUeH73%apt3u<3?Bh$KqFvoz@xoojbB<Hda=X4oG--G4(P3$(;mrY&leaG-
z4CwDgbr6+`V8FaAYoNgz&6Nf`_IgP4^7j0Xwhl$5u}hLp<l}=Zxq|0UxDH7Dkvgn~
z-L8G(wMAdN#+@6Y43fmq2OK@$)=bYj&t(V&u&d9W%hMLONNvrL|5TO~19xDR`UWx#
z_P!6ZD={|%Dts8fol_kD6z`bOdvFo<Yf5L&CCJ9EO3UmRd~G_WtT7T&8MQ7p`tqgI
zbn1H#`+5e*_;YlG9nU}zUp~uTj9M5!9e)`2XP!@s?40oV9-2Y3Dez0du#T^^T4Y9!
zsf^De{5@JgtIa9$Gr}jq@%noP-EpG+*FT!vDiX7pZ8|&2)>pL|Hs~~8%YprA<=c91
zjH70IpIL-AZwT@8D#rnTXkPh}IfIXFVi2*l{O)qVt04*!iOzc)2j2O@8C+V`aZ=A$
z2wOo9E6Gm-Y3U!k_0d}Q@oWtjog}3y$zz9ay{d6ZO1InS*o%rxXucFlfAZlX$jfUr
z6kJJNbYD4y*`?$Fv9a>>wZG)^k4^L$D%iRY4(FTf<Q7&0Xl>SXL^O+EZBCerCbOEX
z=&;Lr1l4}3jGnQMVL91j9}EAfGkR^*t&+R<&{XZaDaFzXO4?$+Yt}4%)bF(#`2%UB
zU{#RB>FOz-bQew1?|+$2O#0bZg|fIMA~6m{8;XW|%Tm_>_ENT2RwSZ<jWxt3?=HHk
zuhkW2L<&VUUetft`8gyJ&Uw8C!WVok`FrN1(HEpl%*@J+#tn?4Dod<EDh$C#(-Ka9
z^$$6rPRrgN2L1ZC5|;Ncc&^QQ_j*=v=>Gai6D)d#5`9C`b8VNGO1g4bT1iZNx2Sqs
z@ctu!;54<zN&6Bd{)SCU25*jfXoO_ubH`gDvO4<KcURHi_jfft8bt8$j0$bHU8u02
zgpe!w^i3wB6<^&}cs#oXVc#5dH!$w^0ytyH@pH7_2OyqzxO22R$hhiQ+1eA)>l=r5
zAY0G#9%c7{Lwbj*8Je}68pp(8SK&;L_VjC(A~h8^5j}ERuhxRd5T#Xb%7$_%6TOE>
zQ0_njGNw^k{YuD)RO00l=e`8?WU)*ItC9)JA0NejXcvp#6fsl`0V?NpF5ELr(7A+7
zFZx_+M8#_IlOr!8r5$VQ+s)!rs|?RSH&bDjP^gazd&tA)Hoz>}d|C4f)<2`6nyKxe
zAh(<Xfu6VZGIp@4A$}v;AFniu#Xrkb)lls1WwlA(ut={k;!=L-yv^Iv|8*JfhvuWb
zsr&WHSK4-sIc*-5?DTQD>h`Hy6O%BzR6}pWd5V?goK@5og!k}mq|zmd$>`j~iq-|8
z)thCd*{`y^0f`Ci;Gif2n-bAJ)4+W6dqxiTNmu0D68{Y?uzvM(8VGlTtR>&z<R4-R
zVT+FoWV0I9)<SMSUk{x5#uFMwj4LXU&MbhLj(v?0ywwXdyt$&om1o{GuMNpv+s>TU
z-yM%H$eeiSynH>pkG3*n0@8v&AcA(b-W`9>OiWDl<<hQ}jOJjBDIX;Z=S1(#UkNL4
z3aB2s=tgksO8!Yv97I`FwO&XPyK7>_41WrPXNd)-hu=^Hx3<Z&FyxzOFy(Hn^MuYF
z69{U=*UuWAI2W}mQr<W77?!Km{1`|<%1I_!5W&NCW)`<}iiY$8jRPTfpe&|Ldrw8{
z(i}_6VOi|bI$SIBLeoX(RQBF{3Nzi|RXp*&vpv|v_U#1R#B-L8ZcyDkp6&kqi$FP+
z+BPf8dn{(ooc#2k&%~Ux?TYN}8U)>}X)ki`H>KQ>4I>gUIbm_p$rl6@0Pth4eo7S}
ziuB_GFzUP3U}Mb&a|cYzX(oE`f)l;Wp`LIgdd}SjxD5%<=|c{lfk?y8H?c;4oP+9^
zNlBZwuHZ<EkhqS<^ArpK-f{#!E1)VE4|V9;KLTyywid48ZdjCZ&^myfwwLW*U^}jV
zov6|6x`Jm6KaLq}`dD1&?7l|n-lK^LeiiZQ-a{+Lh<ojQP<g_Pz1#hxPYu{i1UZy?
zM#Rl|`rKKDg2F=PH*X?}W}_%d`CQ@XvFV8ko5LfulTZF5i;Oa#9$cE6b`fT#c^lL#
z7G892>f~MH>b8=0HC?1CQ12wGOdZ;)x;NK4WBClek(-_Pct22{P4WntHMre$2nO`w
zu^eTqlg6CM$}KT#Yxvx?&4(d-^K_fY$%sX{H2;!q@shm_tZe3Gqe1u0zzv`kuL(44
zfJedCzHwzsKyB>R(_hTfLzig^k2=Xq>BUW{_A`;w-jtf>p}KxAg|XZh*VmBp6sz0E
zl%9=^joWJ&X}XtdR4{IuhRf;ImUw}T0i^%*cW~><nF6C+Aw$thhIm^%Ci0T|mHD$$
z>xiV9P|Ypt^L=9HtG&Hk;&;NAxrGN?<_u!D^jzI8X5VGhmelQY@L2(?N8eTwTKh^p
zc8#i42t>nGkhIeDrGA6YfvOs42!0!%76=10%pv<4?IHJ3a6twur~^bF9#fCflZTv<
se;3@pbS^(u^K;D^g4AZ~$r)(?Pbs}k;&y@1?;rH~+9q1hHJonz4;9oEQ2+n{

diff --git a/www/img/files/document-64.png b/www/img/files/document-64.png
index 5d6d415255daf81976c68d4d100d7d105711e0d8..0888ebbbd8c668aa57328aa9ff7d347186f45f80 100644
GIT binary patch
literal 4876
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

literal 6049
zcmaJ_WmuHmx*kwcQh|}iA*F_)L2~FAO1fbfdKhBp76haQL6MLU>F#a`=@JA%7}}r&
zrICZ*{=R+AkG;=(UGKZrdanDvpZu||_nD5C3MnxiF#rG{RZ~^eyIJM_yoC5S-%=-!
z<(q{Ttz?XTjIu}j+IS)W@^&a&1dAHd#sQ&+u(9*^7(z$^0Jqqj^o`NRFilA~3dwKt
z2gC1&biZK(08+Ak?ly221e(Pb;o#&Z4cc$(0<k#RNrQ|;U;;3A1%#uMYJex=ae$US
zJirAmVF!|xVUhBayb(Ym&^9c7NLM#6Nk3`OU%HYv`#)wdh~+N`+C>`lub_-!IxGq(
zPXvnyzW^UxKor6vD$EZN7LX8@;AIgMfCzvgf?xqLK8S#%h?t}RgyruCbmPs_&R$Ya
zQTcCQHz#S3BO2{42?qQ6`tth<@uNH)zz_)u39x`5SWuAf2Epg$?}oPV<8$+3{YOC&
z;RW|}az{I%+*tl7+SsDJ(bAxsNdJ`r(*57EZeD+v>84;{KO1*2gkRuKO8)?1u>T*5
zME)D?h1Ns-Z@m9e*h}Bv9Rb!uc%i&K;Wv%5XZ_>KT~fglVS`3_>Z4Gu|5Q=O5rsy1
zIilQI6dsH4Ls(!oa3{AvmcJM<n53GU7uv=Rj!;vS2Hj}zJ2}}&3W+L;LWCsbCB(%f
zAP^;pxUi^%f|$5CR7qZ5NEjmc4_6Td_eLVz(Eo7l{+A2=uiQVwfONm{tcdV*@<G@s
zd!mpme<dyH^dDjogeXHHV)8=&Rqt=E-G7MXZ?5ov<$`a50sm?3|7rC<rknZsv;Ftr
z-W>it`Utn1dH1{-?3Sy*F#v$-o|>Y(zTc-&Gyiz{kN(%B4t`$X<hHWUv%|@TsfN)A
z##H!VH7gQ1@4T*<y89C&Dw9I@aFVUqrHE@MUp1UV3CXT%dkdCwoO8b-6XcYf=WRD%
zOU-;>G16M@!oJJC$A5x_kvUj)o!Cb)BnxeDJ5MrVcayw4LRQW$I!_F3<9mYP#j;>E
zCbkqc^A0!0Eg(%0Yv}P67}>hIXOWIp-u*@_Z!4KQHThNM^Lcs1OK(*sB8Lgie6i&m
zTOpLpNs2@E`I1KH`BT}#nX%<nPf^3Gk@Az5*f%TQi)>;zlRqe7GpIKm`oRoeY?wB@
zB!W&#P_M|@+oA&-_b=W;O91a>Zq*m!AYg!3^@723Z^{s-9mGGEgz<YHMy{1%<Iod9
zArrC86$ux_r2|sGSmJ$~1#twzt!!ngJkuf%4wLcZx|zo|W3?r+)_Z?`;r{(qmG=5P
z1Rt0Z$JMPdsEG|K4zh|;>~4S(P2~dRku(=#z=Q72?^7#XcWZa#8+8gbXur)4@E$PW
ztf-YAezwnix&N{)ZTIc~cMd|&R7K^BZk3TlH5JZnqDzPYU)Aase8mn5etF05yun}U
zM4oaeFN)+y-k$FM$98+*lUUE1_`R@rEwT{txai|us8Rb$&!;8WeB?L6#sK71@My>*
z+P8_;lVYD1C>Nl9UdJnj=)EFu+}t=xl7&a%R^43;x)7DQtjExU<Ow0cD>~T+Js$l&
z(U&pKL_74u>#N%P&~54`(X6KdgC#8%L0bVIL^>2^>H$}l6@b(=6PnW^ORK&km60?9
z_KkKMF7u<-BHU#Gqh#@`XAKWyN?%o@koe^LpU*;Zvn8H5c!!x}z2^OxR4&$sAd(CF
zD1J(neXZJ05<U^AfPTy0opN;aUdLY;6H${C@8}fU4PIMaY<gRFaZMk@UMt)lT}w4~
zedQ8&`qg7PXdxm`Of};psgt_$fqfx`_^D%eMCBUWo@qx|wA*5<X1CdixUpPtZrPKf
zk%m0L_5SUULasM*8LyNak0}UQs}#f{bqZA(k8Wk15iK=1laXI7)8NWhO9`V!2uW$M
zY=BCC3-*I9lWuKHiRufs7pg~|>|ol+_jjQtN4bkdZ>7baUPY)$3DnYNNsr)3O~z|+
zv9hwh1S8a~YK(y)r=#Qt<jjs6M@pJ^4x+ZwyTP-B^6YK<$B=r5p&g@fY`AphWCKG_
zTQ&FQ<QoMMf`B!P!xPJ_AD7>3?>}o#%mcFpW#5Ck@%lU{ZjE#UD@1nhTS+8b_=2?$
z#=dl}p)f|Y)(<h^&s92q8rIf%*+LR<H~rI({K(lU551M+)d|DR?u76E_(te3=rJ*@
z(Y*hdKC9=QEmb*PG*7l2LyD{Q8RatrxX+k(p+I{2hj~Pp1HZpq%ZV95Sv`d#YCl%`
zaNtb%kfwt=ECJ2=l>*8VfUy+3aQDGIArXFZ!p(GQr#87H2##V~|5~mL;)pMe)Ev{O
zCNtuyU^8goOBahV=6x3UL9on5Mq?^S31BMW3JgmgqPnGNNLcRNuG7ESLLtr)WhqM_
ztA@QNf~8hx451a5N$;(~XswT;6Iby1;pd4G;$9oKIO3>gZ4p+1@uATT4s*c+Y1-7)
zCtKd9?;eRhP!Wly_ZxUE5$3n8YTS4Spf5>z%J8x(Ke%Ns-XI`)4?r=lxw_nQTLyJ>
zma9GB+8VasB^)ax<iAwknQ7Y#SVM-e78u4aY&FFjTrC`WEw<GTV0F%z3UR;pf7Du?
zFL}sao=<}<>o@3NcyW9z2P=5>1~*z)gj3h%t<h~(q62ApBBb5%No5AdK_(AY;r8#-
zK2Y}Mrqj;yhd7n}cKnbW=!7koQxu1{5RiTtLG3O{fNUgB^CyK@Xc|BHxUSI716oR0
zIBe(f1Bw<C!pw?VlA9+|N0gNuEJu1yqNE*1U|6rRlxCDRb$gB_Ruh!ab$K>;`i=43
z>4!olHa$9;lDkwKBRF1Zqqm3nOqx3Dh9L@aqicL*V5_#5>e(5ttN5LX#F9ETfg;9~
zfTkycRWEziHGCE21G9rd#-#RE>I$HqQdF<i(Ys>TN5Y-W4vcOK^AQ>)wZ$Y<x>OLz
zPvX;3{PLt+UCkOvXtL9T(MI5<;tbDrMOPli8WYTqrFE^`<OSI8`##ICTpNo|o+^*=
z4VW@{-TPS~&JR0h>c;%j|6u(caFRI=OWt_0e)&2UnoiW?fwf}*(SNa@TsP&PI@6p&
z-?<y|o+r~#dGM&z&p*px{Z<zzgTA8K2pM!1{Q>f91RteilZi)YT29ZOORW*(tz4WB
zv%a2nlJZ+@q&qObco?wyN;dnQRq!!gJ~4@xKk3P}U^s{<5kr4|<#(Lu#wJwi=Q{bl
zM|(ND2NRMa7dh=5m3L~jZ<S!yG~nSZ7*{2I@nE_n56g6kpB03G68%2Q6jOLb6~Nb#
zEZE@5+SO%#fEz7vmLdO%^*Z7Chqvd#$K(YE*xg0CQc0#DnfB(e<6QExz)wj9*aaA(
z8k2}Y(Avj!N7r!+N`(omPqE`3j2mkaa;HCpCk_zwNwnLsv$wj1-xhhrZ6gDVIG!1j
z%0tSay-$@c;@hAtqeq=?jng}O8)Vrcl#v95^%Xr4wt?Mo{A?a4Q6x;4SB#156`C~e
zo`MM?pDE>4g=-fDoLnAbFgc20ORQ@8=X%Qb%)`2RcySoAc%Cl=Dt<eh5#i*l#ihdF
zDH#Ce#B;C_nb(zLkSS|jjoX%pUgFbVy>!NmAAN9E%IQie0hsaj?>s<<>QFcn`SQ@B
zad6^NcHl^mVZV;H@oB@$Ez!Yt<+%7xhc5*xz>ycVr{oZvkc@i%Or$edY52~Je{Ezk
zmNL|H+jOa!U286v_Cp+hn~wqs@SZ;#FjkfAPFe<^b@E<|Vqlhp_wZ78n;nitsZYLi
zt!9Wsc*i?DTcaFzJn}_y@2BndmJWHeQcDFa){0;V&^<~Hg;7i6DHiuE2?H_Sc}GF9
z4fe9zgA3tNlAxCEzZ<H%)0^RE7wd~Zsf{b+@qmw4v0AV0?yrC$rI+WH7$Lubr3yLP
zwrcBJDs(Nv2~|PAO#6m*8YBm8NT=(c)6*%{Mj9Xm*EaCH@P;|;bUE)Sxh^yI&j(Q!
zS;Fr2*ed^mQ{1K+QrFT(RP!?p;N9(8_z|BwzC_$e>Mf_I`mm)o<{k~-c2|L?udXv~
z9?z+L|708ixzPnqY3iQ2kTB&wV+`@TNz+&LAY{0~eM`=>U)&%Vk)R1U>k({g#450w
zCu|6hy4G5nPRRonw3T}B!;fYWf3Zd`9F^#RbH0m9g#Gl(;%A3uezb83$Y9w0H@}o4
zNQcOSucxiGd+iZsv8yb?rSl?fjr6yev97bpM4jo@z)?Wha!7DdyqL-eVe%Y@+EJYe
zDQ#_x?p=IftR|~ErI1>CkIE+*p;VkUwIaVHsAy3vdZ%EUr0Q$mZEAg~bF+nv9C$Bo
zJ^qOg-by+9@mi0w#3+vIeEU@vS(m6brP!y^^qw?Jn8K6!q^Tr-^2aPMp6UG1tVx@O
zG|Gi&$@3`n@GG9l(meOrAHPp_Imi{nw&j&VOVWq?Wltxm2n}R$`!MrW<%MmxS}BB$
zo~4XgSHD61ZAy3p{=Ol}=YT~dsos#?p|}4`LCRaB5i<+1rLgVo*<H&>RdGp!Vs?-Q
zCx<8KGepKrk*v-cL2=>p3ro-?t__g~+UJ<__PnK4=b93V5>s-r%1aYg=}#qplba(R
z#mgIZooZ^^P`Hb`yxRZ$94BK>a*Rs^30G6jZ!&WK$q9>muThj|$@1KA^?_CB`Ul)`
zi{Ty>=tEu6`Dx}pZz}A$s?Pc=b?cvG;Ev4hK+bJEZ+@N0_1~c@y9&lLz#bQ7%iiZg
zM`@Zagy&Z=kxw>g!qrnUMQ~8wNlPv`gXuOr3-3Cj9jdlrzq3KIR-;Z&4#@^PHo8m%
z{i76A?3LI~QUJ~Sd*+K;LAU0`DS9P_q4LD;va-TaR0WDm_lD7XDIa~}a+>{Js_rkT
zFH4FhyxZ4)E|C1*PKZ!Vrfgw@xYNL_d2>`}=9zk3>$-Bi9Kb6-SnKgcp3IKrN+NJs
zgGG@{`uY23juT*4*3}&roCD;x&Z7{IFQ6B>@g?aDQsznM(AUNL;|Wt4Cozo|H75h|
zkiuk%_Fq%Nmi~bsun!8UABCe*aZHJGHx&yOrqwB%z{Sc56RgLv{LGbBi}+wvlnz5u
z#cOSmfmt4?@kfXH)k?FKhf7a0F|K=Y`cEyjf6LC(`vg~Y8WUdlR1G+|wGhXBmGWG8
zZJl>_k}!L=btoCndVj99p)$Q6Fh)jBu4O5>%5;b{A!fa~ttnG4ghj05{Kzn{(d9fq
zj(qd!TWqI7Ybc*2$i~?Ykeao<s%Loe>OIm%)*y*iKcIjVOPf)EqpeV<=KLD&g9|oj
zr7@%sE)|yH+2Iu0k2|js-2&!*jpVBFt_}OH_I*xtp1xNnl#qQ{S}-%aeYo9ear$<5
zlX;~ahF=VCBBMF1sO46(wy8i0f$^B~On;3aP4Q1;V`Z!yH7?6E)HTtZv5l*Bu?eY=
z^<sK>?Lpo;1F7vr)R*LLuQQBRzU$as;K3ej)gD)FhL-+;#|Z9iKjlKcH<-(nPd++H
z@H>iOG)|+N6zoK<=AR9Z=s)UK&y<vEPQ4!mR<D-&l*bUfVhf9V{ILCSPpMYC<)I(G
zFOQD-TvWO}zerAHZNRU><MXx{z*(u_)lbfggLkMP=!f6!Ay$;6xn*NUM`pfD!eOD8
zi<wVpB)V1typ7n4+Q!Vy7R^)!JUoJEVr#XG)81}<Po1o0$CJm8rlpTYJd8KcfYC*4
zoQO<i2%q&&kcr?;X+Y0<EsVqtDEQ-fTgWjy@?FrL@#p~m%ZX=-h)<)WQgzxx7TI@H
z`8c`xfY>&j?ucx%eFUH5x?vBFXr<EaOPTchIYuw~QOsEbm{1=E&hasWN;Q5O4_mb5
zBz)fNn>V(sC&z-H+}$|KKvu)$xYGZ?Y-;u1Rkt$tXT|oPoH?Ah20Hz}p642cHEOP?
zbV@hpCD=mm>w;9?SQ~UlujD9Z=#_(_8T2gQUe}F0fR-l`h->Q#y``h-BtE=0UD^7y
zX~7Vp^`PfHS(%9cN|p55y-(SkrH>?^(^PoK?21e>LgP#2b?IiV9*NEs4ggme1{+DG
z(VZWtf?)C+`lPLN#S5oiIXO*pSV;Y2G)Cz~RAmj@*Z23NEk~)I3W)3MjaU}U9i9H5
z{y`BCvpS|bATE~LJA%@V5f_-eH!#p(f#&Bj{Sov?s8N+2O?R?G+nw%}0_!njc-o>W
z=Ty5^zqxk1jAW~`>isyK+Z}%jGOk{8hwUQ}>S&H$?CV}-uG8Uci`p{52K-{6xjN>g
z7!a`e*<<NC-KN}P;X&oaY}q!Xt$3<K=AM8T9_r<H1PE@p@A*vMSkR&yfrzTfH~jg{
zP*IBSp$kE}B(u~PnBMBUOjc)!xR)K2kfX<49y}(Y2GRFhpe+N=a~0qEJ~GAha&9IZ
z`w1Ng$Mz?SSLtY$Sfy3e8+-1w@;(JJGa^HzE|$zrtBhnSM^{8pP<qqUv6mbJpPWBG
zkgID|G8<qBpA95@u5=dTmLs0o_scAxUxM@C(yvA*4_8CU%IcC;DRrCWBi?!~(q~>%
zeoCJ^)YM>>YllbZ+uVk#9TQ&Z_4W*&Zld6a#*wU|vNU*u;p67H0;a9z%YJh;Tm>SW
zHKNhZoq^ZU`e(PnHfcFIS(oE8E3L?okl)R`Bfn_6%^&A}u#>;b8ICjECnvB*(rgpb
zN#r-k#N=XrW?{nIX96ceA|ELB+Pqn{)m1976V|^apTm_z0~8bwUG4q3jtTZ(sd>xH
z=&KnqI*XTISXNWcQMzo4P%fj*w9jJTj2i55sH0V{pb~)JvU|#2%3)wv!o9KA_q3PK
z+Q)}d1;dzgc789k=6Y#iX5TzS<o!IVgKF0oZ`t%*8Uo>{B|}veOiSd~;h!EKClx=s
zJEO+Hda&ZB7Z%!awj)r+O0+XPw|eE)L(hKN+xtY|gal_h!VE+(Q3nI{^yH+SNruY?
zZvAxOGkW$0kJ4Ba>+;ErDr{)S|KhiLcawYgCSGUn=4fCuo}&?=C869K=U8$h{%Xx`
zF?}@E9l!3jy9ZDJxc$I|K{`N_u*aE?PvyXeW+I20<TO6a7Z3XsaJ<)X>yeM^VE8Qp
zMKXiY^MID{CfIe%wo``kRLEXz_nlOy&7%kca=n1`?&Xfa2t-1#37?C+3#8W*Fu`4R
ziq?$Burj#4Yw-fwX9ulKgt{EKe=~`Xk4H;iqhuc`ZMvBAI+}A}D}p&v@HTzk$NFyl
z80_>U50=@P4m6qWvfvh#Ck*cTef~Xe9S+2}-d~nV)^gb431WPRBrR^e-h`8WlmK|;
zwrYt0n)H@swx@EMyDw9;rH%>1ufv+CD}KM2Ep33%eP+nmt-F${3k%e=iD?`k&wA9v
za5{dH&1Bx<TsHj5-h>o1r$ej$E5F1>dE9BJEEtL6$*Iz8jWJ-K{yM`sc)hn6dNlfD
zeQ+hBM!Ap7v<_!0g|t*6R+xCJ(~)U?+q(_WUI_4eY<YNb^`=oZKgV*|VU9$w+=dr>
znD)I`TJ%mWCIFaHnk6Tu@zNQ{BEmcQ+?XRp3+Vp~&J{oFG>2;i29U|1$oRvO{mq-Y
ziU%2JbTGTku8&a6J~(r?s(?>6C<61N42%+zYnW$t_r6(w8&$fWDz`(U=Mi3juUdjf
t==5yD*!g3-fgGGKvgw5bHWcqZ0I<^(EAoSO;LlHUH6<;@N~rad{{iXe2L}KE

diff --git a/www/img/files/draw-64.png b/www/img/files/draw-64.png
index 41286d574661d842cfaebb947014873130a974f8..1b827c7c63d7fd2b88f7516b4aa9a143a95c487a 100644
GIT binary patch
delta 3439
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
REHwZC002ovPDHLkV1gZIoCg2^

literal 4600
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
DbH5yC

diff --git a/www/img/files/eps-64.png b/www/img/files/eps-64.png
index c9dc3c36f7ac13746dbd2d87ec1519c1e7cba543..c42492441422918841a03f87313b53a5e27382fb 100644
GIT binary patch
literal 3679
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

literal 4854
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

diff --git a/www/img/files/epub-64.png b/www/img/files/epub-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..298d5dcd9bd5947e92c05fbabeea0b66c5d59163
GIT binary patch
literal 3839
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
Bg_QsR

literal 0
HcmV?d00001

diff --git a/www/img/files/flash-64.png b/www/img/files/flash-64.png
index 315a4e3239ab60271b95e78cb81177617b2b4962..01d28e03e1518599aacbca5885c7bfebade1c47d 100644
GIT binary patch
literal 3752
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
S;F)g#0000<MNUMnLSTY=FD^;|

literal 4933
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
Pk1a#J%ZPFv*QoyiEScgU

diff --git a/www/img/files/folder-64.png b/www/img/files/folder-64.png
index fcffba67763506ad4df3717c0c3fdfee24151f2d..2508ab25219f830d7eef6397d2b74e7d2cdfed46 100644
GIT binary patch
delta 1082
zcmV-A1jYM{5Y7mYBYy-HNkl<ZcmeI$HIOsQ5y0_(caKho#*Zm7GuyEvGgIow%#oRy
zneFr?kC`EP%*@PmsNIva)9<!!OE(`g&8J`0=GFh|nNdmHonzTBz%altz%altz=~mj
zVSr(PVSr(PVSrzrHvOr|QNCyDuVfEIXQAx+nbT$U;~#x^^?waVeSp87H+{?c7wp;a
zsmEq`__3Mz!5@9(#aDBb(4Ay?Wfh&h{Z>!;#x+xV^7l@7`prjmfU0u(`}n<hGHzTo
zAt!&Uj&QUdfj^x6w6B_U_Q!M~^ec`C?sVq5{Qr9&c<~q6Mqmf3==7trKPKDG5oFwv
zPXl`vAV#PvvVY?4;{baWz?ZimC;cdUb_d80f2iMm&1b8rQ70#}h47P`*P4Hyxa$qL
z`Bie)s%geYoSbyJ0yke0;Nx8q@_}F7{I7SsZ0b|(plOUT@>I}R?8p9Pcg!6Z*1Vwo
zfu|QJs~BmZl4pSE%+oN1diL<-T<pztD<jb|AxFK+`+p?L#aIPZD@|>JgbG<QC537%
zgQ*s#x^)00OUBmf*@KyNmcDIE<w;0k7CS+gH-MCilO+{W_3WXgRt7Utl4$^SA=T3Q
z4hZ!I7%9QYk&BSBP!%CaeFrF8i{wd3)w2gPEw|kOT*#6rDYL2!YFd~IDbF;3h>)sh
z52jL>l7GUTEQye!o;`$m158N8NS0KER6To8A=!YuZ9At5^#)j>dvFKjxdB!LQ=c^z
z0X+9Rz?78Kvj+?MgbE^(1c><ua7XIdL(BY0Q%zq8i7MnM-E?=PMSL=743BGwszS9A
zAlnTX1c;7mKRh11EsvWZsxnv&)oh=^!KO=e>3=QFF7D3nFIaqJC4h%szgkU(TEU(W
zkqRJ2=WFk5ZwLTEr4W^|W&@}s+dH5}O`!k?0Hze8i~+=~j{u@V4JQp?QZ{9fh*++#
zfCz)5E|f_CI>Ism$@pL4!FD@z1_6RnkQA^;medeamU(gn)TD&LD<C4-K7;i~qg>el
zp?`2mej+MaQt`q4Cg}zQlTI9LfQaV%Q+N<Sx48q#D)}?Sge<A7Y`3LHKursr8kKTv
zY=Fqh5ojqzpJf^`Rk9@NY6i{V=_^1-qR>zgAx|=xP1Of?K&>pB6)1XWzjAWacQ=$8
zt&!voh#nV;p5gA&DJzQ}!O4q&ikpkd5`Uj)#RV_|z|1qx-rWl?7%94aEz7RCJ2@5*
z5v%a_*hq*o&rIJ9s}MkdRlhyy#*@chyyZ>NX#-gXsHw16JpI5m-}umLKLk8E2mrhr
zcsVc*i~vSnDxe1}0Jj5YQ3r5$M5GOD1YQcP2VMw_0ZJYsPyo*Yj{<iA54rnd6Ei>r
zux99XvjGYSdGIDexA_X7?@PqpX*417=gH8|0mwoSYkc;Fvj6}907*qoM6N<$g5KHt
AUH||9

literal 2059
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
S*70)NBM*epVnGc*G55cvODfR-

diff --git a/www/img/files/folder-open-64.png b/www/img/files/folder-open-64.png
index bdcc19325a16a6cfa418b793d29b11af28fa5185..27f7271bd09b40b0a4fc158818b820393d9ee75f 100644
GIT binary patch
delta 1236
zcmV;_1S|Wu5$6ezBYy<0Nkl<ZcmeFtfdBwN2n4Wye~?hZx(Fg@L)cI9E)yU?fB*pt
z0RjXF5FkK+009C72oO*`)tUv2W62SQzrVWsjb}N`%qR#m2*S)HW(b2Q%$$f7ahOpQ
zF<e9u9bcGcCcNmmoIUQYP|K37-kG=3Qh!pZs?7D-ethod8-G!ch4E~kTCja`!DUDK
z=_g)uhv!~20U!Jz_K4^0=4gy&=Tzpu0<ILp&9@Kle?Nr-h>YPrzaQYvn2jI)FJ}tD
zj4MR_%=f+R;t06Qu>lE59K@eb7yfb<ECj9`^)tgo5|Gny^G>0Sa2y=KaX^TA1Ixb{
zj@QRflP_y$Nq?0r1fo{;_KGBGfl0I|ISl|8MZjhWLk{eN*7B7nlyLC`41*0BrzZls
zcmh(=5Q@_iW*1Qarj$(dL`LbN377;8lIRI{4HvW_^tvzJ^cCP?GzfviM<&BV>4@oV
z^ILLemo_(l<1G(=)5<U4`ahgGE{PT!Dd_e`7WBl)>3>YKy-W*tKTai5k=ZS{-<<{$
zlIRKv(WK70E`Xw6Ab&PZWD=brqe-20U4WbaLQWIw@E2f0w5YSL3t%?Pe=(UQ+8}p&
zL$s)~QZXvO`q<O{4mwF2<pTZ0egbszzq2;C113ZGg*#7TjTEDT8QoAn^G0DEBz^(V
z6tIy}Q-8paqRaw4F(k=d7bqZvUludgi9u!|&=aw^`H)!0O8Mn^1st9nx@GQ}b%LqG
zzkp=stTQOwa^7Qt0=@Wizr6-*V@<$aCEbILaQE$8{4cCfW<P%W{h#XK&0m0nzh)S=
z-TnS6mSnNNogt6W3#)U)Z3o|XZ*YidORNegkbl7Fi;|46Dg|vFxI4T#q^+V=bGazu
z^o2qUYs&z0J6J#nVJn4IbBhJByZIr;$O<KMuz*7ww&hwCAQ6i@Jz-KDA}c87g9W6J
zwtVd`FwdTXL{B)LQqZaZPa~EAH%)eCkG{2l3;;X?ljsg91Oh16Im*U$lbuoL2H*FS
ze}DZLxH~|}+Sr}@Bk7RCgKn_kv)b-_=tY|^9(7Q3Fx&DfVBwyEi5>|?ie@ta!4?f-
z`-%DsasUd7W^{=KVhpu${bjU(6!X;U)C(tuUIiF2CIC>$)6oKAv?&OHx#;&7AY!tm
zjSCPEG*uN~B87ehq!a+aVZ4A4d?^5t%zx+;k-}1dj~9>>rr6TlW-z+MVKau>lrUbv
zAfJ{P@Ir9P#7vzE@JTQWGP3RE@dEP1r-Q?-3l0Yp{UR2H!-pbg=Mx_<AeLboQz6ed
zENP5t9Is8Son~LV+OHuHwOIDGu1Jl3A9CSHjGQfdLsNj!;F|Az2_uJj=0q^DZ+}Qw
z<F;C3?S8~-wO`w`Pv3}n;kc2*e`gwfo#5^7a*wBc@&~{8{&aEp&d@(c;_lzx^RkD$
z{N!J^e>O^hq}u~`0FD7ifTJ}Z1_r=@0I1eh>zbEAqi$v2C$H2s3d_8#bFJsVE-(eo
z)qEECr@NmVD?mU5LJfmuoq&xRLru-gzD8O;XEnD1pwN!ImiK^pjoC6*`#m79JvRdj
yclWk{u~a#YZ@!fQG&1|hTmWz8TK^Zu!@mL5x>nG`i7~$b0000<MNUMnLSTaCxImx)

literal 2231
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

diff --git a/www/img/files/gif-64.png b/www/img/files/gif-64.png
index fbd398fb56d5b740329319b332189d89e06cee95..2373292b7a5315048e15038a4ee440f6fee833b6 100644
GIT binary patch
literal 4540
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
aIrx9rA)E+<6hcn`0000<MNUMnLSTX^iQOUq

literal 5721
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
YoG16nh8}A6&(B^xEn`@<hJDz70qmY$YXATM

diff --git a/www/img/files/html-64.png b/www/img/files/html-64.png
index 48066a89923c6b2f271c436f1b07c7c7fac77d3b..7f703bb834a1ce3c26bfd722fbe515c9d8e562f1 100644
GIT binary patch
delta 2138
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
QF#rGn07*qoM6N<$g6T*w7XSbN

literal 3161
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

diff --git a/www/img/files/image-64.png b/www/img/files/image-64.png
index c181eaac6dc68eb2c332c93f5354138001d9a8a4..2d8f9e4fadb98d0e982887883c89503ed8f9df08 100644
GIT binary patch
literal 5800
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

literal 7203
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

diff --git a/www/img/files/impress-64.png b/www/img/files/impress-64.png
index 859da1e3c7a213fd563b429b236af8ce3f618d92..c279c62ef3785f8761e16f53f02e3f2d2e359caa 100644
GIT binary patch
delta 3318
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
ASpWb4

literal 4478
zcmbVQc{G&!|7R@8E@WrSND^koZW@XiW8Y=TZe}o+8FyxcBwLatM3(Hblr1TxWEo4@
zk|tzlT8S*BEGhGy?!DdL?~i-FzjJ=iInQT%-mlktf6jBBWLs+!K5j{F78VvhGgFj3
zb3XO!=Hg_IwfH~gnUe&?*oERi^rM9PkZ>%9SfVcuXcpq*kF&@5U?cw+z#&*z*aGm5
zE)*9lOE`uYqUQ5UMlB*Fl!<0xL7a>T^}z(;C_rDFKc1iuT7TRL0^+gyAZINrs8uKu
z7l1cCN5VOrvv$Os3&QAOK_?A>hzK~7AOuJ80Y-!b6UgugebAr0aOV2gF$4tsQ-l(v
z5Bkd}7b{yJl1Rb<wbY=h7^pT3sI936(}e12>Zt(Lp)e=}rVfGXsKTIdEgd)%2K@U1
zF}0DfesFsf`fpv#ojxdlLJ5UKAmQQRYT+7cM3O%Qrl+R|fvQ8))m51is^mxl#V10Q
zKnDM2K;g(35<ZlIClY|a7=3(+VHAB3)6&0O2nn^a`iGc6{yR|2kU=7RLLo3UC?q80
zmtTKMlPUJN|1slVrOA$wp*V;=j!X<AVVL>w1OEmyWB1<`{Ssta1GgdJnMv^pMiDV#
zAvglX45bfZK2gKsv2du4E))jS(S+)#L$!5bFkKxO8pRxRwYBsNHPtnLbNm}t8>wz+
zWN3`iGen|cFk_ezS_7%a<S;a1j(RZd-&ivOnc_ph;C}1HGxh$BMgCVT97)3YP>3W)
zA~E=P1=t1<DMWGrF%*b&&{Bf|t$Z+e!mpEG3Hr-l6pn;Hi^HNx#1P=05r*Uc#e)Ca
z^S`jz|4-B)Ok*Iw%Hw~P%kLv*4gOmGQ~b=$Kkb7fFnfl?Yz`xDZWOa&>&;MxjuF#i
zZjqTH;}VSawUVjgsRWO$Se&7^vtZm8x@i@lmperqEG{~RvasNbacQzgAAjm%Cw~(y
z>`*iK*~C64LBYvBaI7+`Ho(Xn2E2iCUrY43o%nuUFY0^5uBXk2<#uqmjX)VcA8~Q%
z!rafj=L_5IvQPDrCj1Jd)4C+ruDsr9!sLhTO25lGdd4%tn}*@Jd3Km~&&(sGkBTp;
zVY}4T752GgG^(Ilf=*N7U;pF}E^OI|yVkmuoA;{W%E-RvdBSTIomRrfkdL=jRVt{b
z4(ighS_x{+f+wtx3>~`h?T`9a#?ZNu7b|(sR_Z&!*^+)?6h)2eAgZF}739RyJ-_a<
z?drf6ZA$#u*w+J_G>w>Je!XC4CCt(1gV*~{O&l3HLC@*>&K>K<;K0fzD-q4Jz7|YK
z<mYjSU)r@*tk}==9HQ71Du9QMXfoC#QQG_bHNDW~_eJ?^NF6R{d#&QvB34z4c+-{4
z98T#M7+uYE?Pu<fxP>40rH-Dm!F}{?4J({|wxD&7P<XL#Zil-}C4|e-7Z9ErN2RKC
z+$2v%Va>YpVSEDFzzZU1mMb5dTa8D*&XclzC=>YX4!3QK-UUw!ooqvuti&$9mu;M*
zf{m9rJjIOqmoGL5?cL}6)cNDAd+QsEB|?yDxkMFy4d8a$ZbC;I*Vk%QdV(KnDct1J
z+=;X7$)Pk{9O6Lm0?|fznIp%f5N_K+z1lyoQ#CYEAgGz?p&?eGKX~t9E=|@UlOK4W
z3h9j-a`Jw9WjiuqTist^I4b%>j^aiZqmYwW_0Z8qP8bJ^jnd1-OSQ2f+Hbq1?o^9)
zSsvsQd7+yfJV94rFF^SfGtgjRB05GfJ#MOno;5O;l)S1sPmgZsYWVoFe3tJznP@>@
zBfH4HW_79&@iV70P8Gzk9*WB_G0U`UDYNL`D;CTX1myK+<cNPC4Vw%f7=9S>v0V-l
z(SkXh!@<?&Td0rUFV5p?v!vs>HBt=iik$9RqPY^(S%SJdg4utHEnF@MT6<cVA%zey
z6*pq>d_?2k;wWWo69s2}h`DVF&1hhq{RG9bKbmt&HbI8()P+k_yGI{Y3~N3Y_1%Pj
z{$#0gho24mrG`DxxELW)*QW+yjVRrV)Wi?CPZrlFr}kVeJ%1!lv#vkm_XM~+IR6OD
z$mW+S+;JHBDT0~b6TY$j<Eo~BRGVFy5kda)>`?!LgXGz-?lyGiH#gFo?z45=$sk8e
zwSJj!_6p06&21VCfAur%$#;esMHfk5QJP-adUwl>3)GzT;ehGpjM=8c;RT}tVx8GW
z(XI=X&Ei~YM-lLiI@xHb)+}iuV3d4QY1}T&zh3-PzQZL7I@=uwtiiag-)G;iE@1b{
z0w5C05K$}cH@90PFV8p1%q8U4XVFaRC)M;o9bx>hH|?)!HVW+=Vc*}>;_0xLc1-KB
z_U#p^cy!x9Qr;R8P>;1^9GXyz&$#-5%)Z~sBYEC{M^opad4g%$a;BzLb*$1<V$!ju
zHc=N^iM@wCxU{ppdU&3%WRJvZ9Ehig4!c(^UkePkwZjbiapamfbrqzt5(BSrB5XF=
zHhh}dMI1ET0e2+D9bd+ChaDF6l6c3>Ztya`OQeS%q~{>EfTs6(LJI`mvEGP!TNyS>
zcLF0dVJdLTDz#g+QkKe-`m2fn#*=A~UJiBBTfOo!fBFyyO2<UhL;5buXl%W$Sz)aS
zBTaP4_55PuK?5qg0<DqE{~F+=0amrFh<g|<9aSy7b0pj&lb$f+e?#8)p$9dE)s@y0
z)LVweylTjQ@U`UpX)%_Pk7f#IiR|j&8(H1E3rj{Mk#E_Mq{FLRd?hn;@?NsulC!ET
zUt*G%ce{9dUQe~WeJQnO9G;k!Ta^L&{6#pxS|%1WS<(AkBf_uB+j{$~p934n`6O@q
z=AbP-)s;E|C;|xPG@)kq%WCQLq8ZqxBJF9d`^e&hwu@U|fnNtSpcI->KB<T>g~(_X
zQ<$Yrf(vPS8?x5zdx)Jd=Su*untSyq=?}`Zy`N^HNsF^-u0!ia+moTgX|1Dd3LK=k
zgQ+xl^i<M^&8ceqt(6$DZv)5|wJalg+r-OhpQMzdUxs~r_HlGD?Qv(4njy&&>`29&
zkv#WBq2Pof@~0r1Y|vU<c`ddoFk*vWjedj;x4yDsu`@o~pO5!o%ZAU~hKlpZtVXI?
zElZR)Uq8NP(easAy(ikyW2`h`RaoX|c%aMo;A8anhaQj<*}Z`A7hv@DM**LaXydKv
zh?NSm=q}MLR4=$TAy=Ne_>QV#j3Z@VKi6A9vDjkv=I%3@RdUVUC@xO9G2SNjjhzqr
zw}oFBzhn62OdcdG6{`f7OlWP?<Asvrr%aZo%f{{(ZzD#?*V~-xSOggMEanbT{*T5g
z&ZvWv@8)S7PI(vVA!fmP_Rg`*-S)=v3*DC3<<>7XKl;(;{>pTm1jVW$$`Cq0ySsL}
zQji|a7MsIqwH9<iMWsh$)efEW?yEd+Fhk&}u@duJ&^0RkQ)HoUNP+!r#Bz$_!Mo({
zczV{WcNOkH+s&Laz8!UUj~sNYY$;i}f5S?)F!r`Z9&nz<Hm?0OJylF_YVf_Y9YTAz
zpVK!-@77%E`5$fYjdXXevex&X-&{<Yo%i=}doKO7OQx}0Lo!jlya&D$!Eh5%f9bR`
zxA}-&{SW;@s_tRdRs)It)t=Zz{}y$}Xdku=MB{`Fbw^?XIBy{8x_4)5-sWn}BKl;c
zPoF?V(1pw0oaJ2yXx@xOp|iR4p_kQJ`e{fGo~7kG&;RJ20HEZIOimmG=D*uf$vzOf
zIO}#f4i-yJ0(M_(mMt=@TUS1F>Z!rY2>>^YzJxx`i9M>q+Z_Lbo<Q=>AAcQ4t@zY^
z^^+iH2v6qY=>~jXKY(`#P-!Q+a7!GzFT9^<6|f<C#&?moWKphKS<|Li?3L1Xs)`_(
z$8<&*9wkNv@@X`xcpnlF*J*L-iHZxCwAS4~*m9+m9(pt`fGy{ia`njsy_sSe5G8|L
z->|xQJ<-KWRIZ&3>f3l8v)jkwdrj=V70P_=t5ukgu>sEp>p1Yo5nIc`oLYDyJ8<;+
z7>NALOVh-)Y~}m<V`dn;53rrktKsIg$;I`joxT~lX2V%E2rDC*1)=-<YL<qA-7TE5
z;ft~*ay#D}IunadaL5MT0w4sQxePvv7mKmB{K>0Wa$Yzj%8Pp4t3IiwH~#VG`AU_C
z$Ize4uezH{NcGT4>T22K#tsX#^<@t8hP;xQRI6Ju4K}irshOqUC8X_E8+At3m_pK@
z+)UV>&+Gi0Nl)DxK_2KjB*Zm3fVaH?tzJm&66V=FmfmECxPAiM64BqZaZ%#9MG&h*
zGHq46c?+mkpmI8PajSDV-a99xzB+*Y%3J?p=hBmPjyl|k`o+BaMI|w<&B|gsT!&Q+
zxHnw2j#4eM`py|ch1<NTQ6|yZm(1y8J-%$k^qCt<Uy?Tfp-*Ea*}Nu+1%&SIPg?9j
z>Ekt{$rVbbH#625U84&>%`Jw+J@<o~-)#3sHUyT;T;aRYJUu3YB$L6KfPx9i{>O2b
zHhy^1;8mgYxVX5U41+K9;q}hWsz!5V_rT=wtf^G38;;7x1yyJ8vkKUIwYWDm*8=rL
z=VwJ);^&gH!8`PX5M-SkV|sAzaX29zT`^zR^IT-0_)O#J(wnRFayDBm`iwR-%T)eq
z|GO@oK6%=<Nk&QU0k^$NPA5NKW?|&2>_xS*+Z-GNMwEETi^Q!m-)`71l34@1SL(lc
zkjZQc#{@cvGh5~3HW#AbuX&t!bvz|}#R?&!d<h~%+Cl{xZzeitTe|O@2fb&{I22JH
z$<t>4YW^)&3tkjwThlucbZlI7ko>teYk`OFjNdv>N2p9Tpo+Dz^uV!r>3ly4<ePd<
zv-D^;1hF)pz%yJ}y~g87mrQIxa4KXU918Dk?3z`xP2g>O@uB);lZ(t8d0=rum&)^^
zd+c~z3p<oJkEr)-=j`d}Q;|1K=WaOMwP<ENpO=(mQ{G6Nc~Njw&h=3$l_!XwXLc^R
zvZ1EtV9><A>`)#g=wukY30ycno!^e~JU%<0GS5yJosoj#%mvbU<>bD9zz8$|hdaX_
z9Dngd`s&d8jlts(OhACrg8<rT0aMGA!lI18Q@IfM7iA~BJAiv>CXz=!=6sf^E$DhB
zz(nTz(+aQlu#vUm6}#`O2@Xy5$~<>wFp4lme9xsTjC`%Vlp{B7jw($)d|XQ~)YbCh
zzjOD)P+Yn}HKiW9Qlz*P0ywa>uD{iwmC?AoGNXKfZ+fZUtvX>iKi%hAJ4C%CzLI_C
zvi{EOBeMU=?YE@}ji#tCxB{p1%LzGo1y1f;0oaSQA4^Y$?s`S$xF&3bNCuCTcqG`I
z{I*)U{q0-3#pAaI-aN>AN#@`nf$@E75&r7U1E)aYT-_>?=WaDNX6WeXgbC;0YPV_1
z$d)E6B(d<+u~~0o3|>7IY*QK-;&xC|x$2u0`Qe$Vk*JDNOk*{2#hP^~{p!6q|4-%9
z3wRFJYi>q{;#pv8({$$nsfUZP8PGO^P44*6R~_|fZH2PAbj_dfP|LpK2hPh$-MXdU
u7_HJ9*?r~|eK{&N^O>MgSO`PRn<aiOCgq;A&CahsB4)<csM|)~@&5tEOY#N)

diff --git a/www/img/files/isf-64.png b/www/img/files/isf-64.png
index 23476354bd362f99e3b67750395e26855ff98fc7..ad5a1886787a768fda32c34c4322bc524eec9007 100644
GIT binary patch
delta 3508
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

literal 4590
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

diff --git a/www/img/files/jpeg-64.png b/www/img/files/jpeg-64.png
index cf341072b400f1f4f32e8d7d54f70188dc3f9365..b4fc0c998aa8ef15d851bcd931a1ae61268c9838 100644
GIT binary patch
literal 4459
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

literal 5580
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

diff --git a/www/img/files/markup-64.png b/www/img/files/markup-64.png
index a251c7c6c073fd2be5aa9f156be0dd6365f7bded..b890727137a1602606e0fedf002fd7ac75972a0e 100644
GIT binary patch
literal 4171
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
V0h`I3Xk7pR002ovPDHLkV1geJ`tbk&

literal 5344
zcmaJ_XHZjHyC#5ikR}}rgeENsEuljQRgf+!(g{UMViHII=}jq0lcErc1w^G-0I2~)
z5D+{RL5c*WDF~4+Ah~$HbIx~v+;jKL-fOLQp67Y%%$nIZY|oi-vWc+K(a~{Qm?Q0v
zSHs^g3)AtpD&Xp;<3$*6aslsv_QexCu_!ttAG8+=Xc6q`hq6a``h;J7i_)c|V~`GT
zynw%8ZKdsv4p#B}jZq;6V~*K$bh-vajHh=X3J>%``2~dNNv$`xO92CX^rW0MtRdDI
zW0Ze@c?1^a5OL1YJ0j3q%SXyUAE-;zJ{AZ@;XQ%G;GhtkHc?ONPhIWf{ckf^3iu}k
zAE+nwpP(*S+X9WzSQJo01)}T?(S!mu)m5PC5G{2rC7>z<3IRh^!4Q}-6r!yG(}qBS
ze?3yi-mpHt+V)7(zkD5^^rZapc#Jj}Odt?c2x=;5tREPvrKJUisDf2hm5&k1xbP6X
zCs8>B2l`t9iNbkf12FgibO`XbqNf)+6t5?B9O-{j2*&&)8-n|*OveQS6Fo6ts0!qF
zN`C{bt^a>$aPU899Nr%F-+2E|VVq+)1_ic9;n1O2@8ib#f_}TgXd7cuo_I9Y5seP|
zyNb5{XgnI{kH!Fv9W+#+Kx<F$fRNvoKN;56+7=-=yl03v$^xk;b*!Nh5a6S&frP57
zBTUqcU`QwwY668LOkqeZxTZQ(4GMw6VSjUxXz$QqR0#fWuFrqD>i^39Jq*E^W6www
zHXsb;V~Rxw1OH4~JK*1Af&Q!BUtFJmk45!gx!~hqz`tAjzgqpb>3DvAZ~qzG<HJ9r
zj|w@SckJ<C=T1#G)6wzRTOf@biIbx)?3l|7p+`pt)2^*gQe@iQFGNpycq4dOm<qYr
z0ElUOj;|c}JMe-Rh4m@{cO~DxC=5f$!ll&<2XX^cS+CxyKXbpVqs(F;mQ%Asvp28K
z`%8uN*}U!P-KbxBv{nLP-R--jYPMRM?s#+L`llYk5w2~sc$3x-Uy`Tw@aPW~B*w)7
zl!9H8=gN$}>y%uXJd!*8q*YSOs{orJeGVWN@xy&)=yL+6c~xT88oZxm{v#$Fw7F{5
zwo&YEK&6Jk2Z=)%nV1%;!H^y}LAvglUoDoY^jC2G_i04U6O0zUq=osz;k|F;CH0Ft
z`psS|O@G+Pj)+wmt^nJAOh?iWDr-vsB8GXkG(IKEYzlgW6%W_UQYmUJAy=8|Ws;1@
z4O5OBWY@#=z^V;4;W=22CLLfl%M#V@HVmH!Tr`W@_&|tDu<=^9=dJoqt}A305SW?R
ziJO`?x@h>=w{h8j`O-`Ae*L3>fx9F077xD^atQa8Gowtp@^B)8aYRpDnil2m&!L~s
zi4?`6rP+RU|IpAn@v5rTqI5txW7~-O)9%iw)VluO_Z~94`hcHQ2goo-)xs+njDf67
z8^e@3Sv2-)6uJMDKR>-$Q2@i4vZ58&JM~AiJ=kYCOL`J2y28Ye_a+O4L&pMH&<aF!
z_thdOQz>{Xy#6%1{`Nkf?M+^ywzc!JDZe{CBwPfTPCm4|my)X9yIhvl{=P|EaZQ$L
z?Z9v=o6;5MfNwf*OTXu>6Ivf^wjABfRAA);#Yz(9cVjre)m3<Cb2Kexz@KAxy|#v!
zjqX1jw^*(VEkZ{z_OBO7P+O#l67&PcVSP!-LIMKyi?5le<bHE;BK<cVn+_@JC1fMK
zf3`@{gOR?*gr((CGpN1g*W8)rU!xsMg{T3X{1<4|(hmLMcxlU~wO~ti8jr6&HIrvK
z<5KtgoCjI$$t>$PEdeDu6^YD=H>%-_DDdJfJ|dQ2z3XbBa9IJ(_?c0e4PSvTa<QVI
zYf7_D`XoXnZ2Ra`h*B>`_2+hG6D_Q2%r3;uy%tcXk8{4qF~iEaB%q&)3O?!ShI<gp
z{3eIb(#6F^lI9}tO;q&9XakLNxNIG<2CSFM=A$G{H9yR@4Pq3DFv)+fS2ee)OW*zo
z(UEWG)JM{bObr`_Y4rclqbX?=A4m>c%<T+#M_$#@@?o5;kVg_3j|MK&(|G7-?ZYWO
zIR};w)<#JWId2Yq@(C)LX%2j|T+8Y7W7KsGKh6?8%HHnmBP{quVQ@f}3Uk&Zy2+lD
z2OH???7gag1>Goo{Ysku?!hZHIWt^$5+Tw_CW~(z(}arbPB^`8Q`pTeZN8oxG@agy
zXYIj;KJ#M~FbC!?ja6bIPgN|n7?5#pmlztEYNfg_8s=#Q__+_^X20VK5wW*^LTwTo
zioBvjHV**T${N|GjIyfenYas8`e#xHGomCgk!1|m!4dLf#jZ#StaXT-Z<oLp<Q7EN
zo=0F8`*<s=DgOLfiUVUbt5ax0TMRknz6a}>0b_(Y-Y>|_BL?8cuPMx{b(Zzem)>B8
z?H0m{KWDBfMw`5O&F?V>>xPHMs+#z2GrW@}qSbk#2rWa6!Gw}^xNuWm@faC+rqDra
z?5-a0h1~cXRYqcRT7B|nKkK3R$VoSRz7i<ylY0~w&+{n_#4l?a<D+npp7CN;!Y&8*
z4qea6+H!eD_oMr+rj&JQs&g4BU;5Oe4!-L<G+yfnw#&h>m!~)qE@xVUi264r?@Qfy
z-KtL#V2CJKds(NyL(L_pby^Nrky(STu2|+yv8m?Y1b)8WCNEy&!Y-#ee&XcQJLVTi
z0@N=~#@TSK#xn|Io5{)SkM+}T6WR$>FFdN1sW3=jCMEiM+0Aw1?CtXPNhH~KUD6*x
zv>WRdsRoTd?xen*^&qaF^D$#4zZ8L(5JvtOCFj4TPpvwI<i34khC#OJd`MSn7@%#9
zt%DCEgRr|VrH>Klk|U)=Ey`6|teX95vgydG&w2yFRs%qM%quaX&-|-$_PsJhr%iJ-
zhLe^b$FQ#~?`FDQJ2^kLYgF<wIbEUgjBDerbVu{7V*ZJNYOA9JlYLm>lg?+#E|5sy
zgxSSnp_T%rtWkNZ{x_7LUDr>~o_MfyV)Tc^YrM#|d=g#S{6fK!B-=CNin2FDELx^6
z;>0e6{8(X!uSAV4$J46`HeJLOX7d4b!ix~at-z3n8_mf?1(|QV<$en6(Jfxfl*exo
z^pJtQ@|SfX!#kW@-rbDn>02<kInvir`Q&qlCx_)oCivx3>WZxXSwa@6mnO<9`_d7r
zsx0-i!Y5KQ<E(l*$W<HNKU#!ZA|!4=L~jO=Eo3OK?<~t|yjNnM{ITRI5efLZ$Vq;=
zYwR+@75YXDqG)_ZM@Mq+nIvZX(;UTb)4<tDul|yQTlyx#y+ufO;R^k`!uZ!7f`Ax_
zJj|vevxqv^837qX#%V}EuIbk)w)y?g%*9WZ8p*d~xUj^6nG{<^IzO@A3}mcoI2)kq
zPP@dFm7Z93biABdFU!2%6A`w$d&5zgYr9P8dN!cvi*A*o4Ti<dohY12`YN@K(i3>&
zd-PWtn*;?u(HORXer`X*{S#*_)Z&3p2@q<0ANL0zjqA~hUnNc@^DbXTw^xXmOF#t6
zR3d-z36x~_dbTn}`E;_fbB<BV-l@+$<tYn-v+)B?lW3zWA1Qgj=>ecNLAiEY&T!VQ
z_MSlsZc7joVUvAT-b~R>%7OKdISF`s1n-;2vu0SWq@EOs*!tCk%v0U1Ojzp(3G*Hq
zFOPu%?wNAQ+vX)Nlq$*^jjhfoLa(pow;P5>!oKCg)%)^`9JGv7*y(%bh2{%If#4(f
zM0^<BDb3$-8SvyqZHVL%$|zefYwwe||K|iBZt=-3Fj<O=TOzYv5ydGla$!Ri^X(Ko
zg_MB11}@^+SNa30Js31+6rf6C@;+ihO6)Pqr}f?)2#VfHB&Q-rI|{A0pC%G&dl`bJ
z&gi`Bjjsc7KqeEKj!Me(W%)d_@22sTp&z|`TAlVhiI4!RmUF%telJ+sa&V&Y$84mS
z2;d9b7{Hp{oIy!?P$PBZE`%xgrj=yvj)cd%naoHV!{`GO>dkx)LP;V>S|>ao0lYn!
zUlvN}Y)mG0_Re<^bS3ZSl7x3?-T-fwxlW{@x+&S322h62e=8h|VSajB;@s^U)a#kg
zKr#<2+0OKrsg5*agw*6^wDTB)7q3icKbW>Ew<0xsZL+WtQog_*I2R$ES1;MTa<;(e
znxW;{%eij%q#JX+8cGaVtl?^}6LQ!bwXQ~(H(d6$+rRaUY<_Yzzut3;EK>Wxr4$^T
z@~Lqm@c#88>qqLk&VKBaB`!M|Qzo?=TuW|X%hF*=p-oe2=DU2z{v<dv{CmZF8wtY<
z7Uhe$$IdF|FcQ|dv!tj9!eHeeTiSbdRjHgatu$u2pS&K;v2{A786W#Z<$mr5o7HI?
z-N#?Eh7m`;@{f<W_sd0ZJipRml~u)2^FYDj==53&vU)&F%24XOreE>Ok;ygW0ZN&z
zOC7ou!pvJk6NB%ySGH}bR2s^l)0#;0_eU5%#STAXnJk{7JefgC6mZq>H9q5(Z;bk3
z$&(b4x*fyWwjl}kbB`bS37S~i?c#ymZ_Mu%%36gGm!3mz9WwLgPEPbimesVeU-_ad
zBA(Fe_?mXcAJob}m8<DDAp5EDjfSmJ_AuddmyqOef7_1OmP5@wsAx*H2^r+Xuc<lU
z)2B=tlUXU94l}@fafMh2Uiiv5(=$+`CBIDX_7KERI_2dlFb_Cu&mwd+g3L0p@zgdi
znw~eKY2*j!f?Qaa@b_I@7^mYi(&Us8Qv_e3y8-LL&Jd{nE00&$MywjT>`wY(X1$Zk
z`D{vAV$QbjQ{gx<_@U}&+P-t8=o*6Ifv&Tg*_AV)ytM-?Gv!QK8Q(Ku1}uK>lp$MJ
zsz`5vH$2-P*m02B8@T14ZtDr$gM*A&pb4)|C#$df`ol;-<3qtG4KZxZ>-^#AtHP=E
z=GW*%9_i10(Cn@Z-RE|Mc3iRjc(%MJEBD$!8a{BBWHPd#=E(h_`OE<Jh6ekCt6Zb?
zHi)KB#ntX{DG-}9{muExv%}pXLuq=kHdzdoyVTd^*K>EHnRsS{ZyEn0S4f_Y<k^XH
zt+mO?24#?40hO;-($cd4wbke5TDY-ydG6tyN0zo92Qr#1ry+;OPWHv$wuQ|whmFX2
zyt~X|OhhOw@CL`O_r)*Cub;3ieCa9Sd160_PZN?PQNgKjy9TDqxG;GDESY4Fq^T63
zb(u*5x{{!%EVj~q*H0V{@2osNsHO&h3|dt}z6#;R6>e>3G#H0Oa$o!Py|(I`E6mJG
z-QcW~ZB@%*Z%W>Kszo>**dCFy`f2h0{RIJowYU8+W4AhC-tIR3_EmlJ#Q`3qgT=%=
z=Ox9snqpQ{B~m*RYr#bJ%gUo38WYGAc0*l!n9e+%U)FDLz5_>tw_~|H9Q<7mM5fIn
zW?eDjV?XhFY|NVkv^{{)h6a|}bq<BK;RLyFdjx%qxPZ))Du$9&T7g%xDeUt@HARd)
zN{EPCQIVM{g#1Zv+oM51@0LQJPr%zyY1!|F30-O}EUcbS>V8BmP{PUV)v*kzq2w1<
zm$>hqMTWiGU5{01s+RUTzDW<cPRdp<&4Tu%*z@j)DE8CZIEveZMS1Occ<mbw>-vvE
zvZSyE4@Muek`Bf{=bS<m$TomKlKEwzJR&En*;@N3GtOl)*KyNt1qbC6lL}AMI|o*;
z?J|<;gFZYq=C3;6#s2&@t2*UHLP>38WD=!kT8GX}-TRp^!$sb6&;4NHc0S?U8}~yE
zJzNcC;t5Mv(@va?mPz{(2YdS+Wg<I9TK#y`TcW3}u8zE9#U&b>Zyomp(UIn4DSP|v
z*qGhu2gj}#N?6>;?Ov~s?$T9u5icRCMdXjTC6%b7x}lk=@U7muVKw724m*m)`8rC@
zTj}m+aTk>{)^161(3e=D%>4@Zmr~D0<b!Wfs8eS9w9i8g!IIQ=WgU(4Zp=SY)5Ejw
zG&h3{vyucSgfc3)ZG2y&#cW+fL4tnE&FZm(gWkW~k3P=^Y5iJz8};SXHQv5PLsY!r
z>{W=a?rKwHd~BNai_H_nInJmk`a_*x?o!lslJ+Y?r;}HKA&Vo&UippyVMZ^@+=lg#
zQPTDzW%JUYff+GY&xGpMP%@l2(RU?|4PfxF9HdhDs8EDBPS;GJ@tWNVYck~){L-S@
z!R*x1cwW6cJP~$+S`E<O|067DqE<qOu!hG~u5h+&kU{TN`NsKLyW7qtIMA0Y(Mc+V
ztxm)RPu0I#m$_ICr@nIL*+mRh*k8=7FXY{WO79J*4VAXG7U!g5r7f!9RKzFQoHIx%
zo-KEYWm@MfZQ=A!%EcSO_A!>Fv<1trQ3pF2cvtvr-L>v-^+a8sJtuC<+&W3yvNg`r
zo2|TLgu}!_s(99#Ro8}g=d|$t=P$RSl97X++7rAND9&36uKdycSMDtno}TFD+xwmp
z$U*3Mzdi2W?z;qQ+nzrRXa7)`_m*Mv-rVQwNhS`pu@X8PlH>y9z(F!!KRT%2SI$Oa
zJ>v6Y_n$j;-aTByW#%j|#OajsL<^2&@7xroX{@aC^%R!^9B1k5>TJfhFIb0ei$%!4
zbG2h@$lTK8y0H)q>r9PC@`V|lpGKjCR!F+j*B9icv^;dPuJ=4IZ`)={PchYG)(@fs
z=zm9d(j~Xgvg%jPqqR!yJ=(?K64UWa91JH#<1zxYm}9W;4<ZkCv^p@#bKhFhp;#u?
z2y=bLH|uGFF%l;k@6Kz;ZuZFSUG6h%LAn#l11Yo<LUd2g1MW_A@?HM@&(Xr<9I_hW
G5&u6IFO{qS

diff --git a/www/img/files/math-64.png b/www/img/files/math-64.png
index 085ded411a04b07c7a80317ad90119a22e742259..d98beea61e6a686896a0bcd9dcb687e20f32b628 100644
GIT binary patch
delta 3166
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
Ef>RMVasU7T

literal 4297
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
T<%ah5&jqxly~PbP-^Bj_GMAVv

diff --git a/www/img/files/moodle-64.png b/www/img/files/moodle-64.png
index 2280a8b8714e75c9df496b32eb091ce5d5ef96da..44ad3a37d35797cb18baad5437af81077663efeb 100644
GIT binary patch
delta 3577
zcmV<V4F>Y6CHfnXBYzFSNkl<Zcmds+1#~01mWDs6%8niGbcV5Mnuq$$G7d8{J!WQR
zW@ct)X2zz0W=wM@X$Tm~u9EILb?Wrd#x8I2GH=$qf6k30JF57*b#?1XRw6>WgvswK
zr8#`~F!SdxU}WTI_ES&%=O^EN-kBE!g<|OSbt6Ww(S(6Da(~Puw21Z?*|}RCS$)5J
z<bm<eUHpL${QQo`JsE3-hene8KGsDkh1QBRr8+=FE;Ppen}{etNTju<SSs_zx4$b|
zF!;+wcP{C?D=;BBKY@)bHWZ9wwqnqJmVJR{uzvw_j_>2dj?8e!C3k;Jjz2RXiu7a%
z0FjwFKw^F+*?)}x8?DtZrtE+k_;X98%G(+`M`<cn(e=QW@&EieisOUiz3RjqOk^;j
z#Z(MY)e;6mREqF2o$QJ7>|1dgOKy1_r<{Bu+5;&Eh=~vshzpRw3n)O8Bx46PA#`Us
zFM-IhzNa-kJ?+oUWc+tb#R2&m{Q5AA<|w7WmDU6X_<!{$$gTW5N=me6Dj12dCd5XD
z*a=ljG~t9G0yP2O$?kJ*W6=$d<<$OJ4WcbQgcH<ySa&Rw=ZQNVV=ei7c4u!-=Q0r~
z;mEhv);T~#dLRw{Gvrr(4K38*eXIh7LVF4bK`E3nC@fyKmtEB^_MUSSi>{e~@0}4m
z4dLC{PJiF|Q>DNf+hdH$iSXYYKoix&f1dVL-$aY9!DkVr0F72)73gDOWl{Mac9uKX
zwd_XDy8JOShj+q0{cbxWnY=U<#3s1%rw;$c8vM8Lj3(dK21I~D0|IetwL*(UGC2lH
z?d)811M@C<6sI2dzYU-C5hlx@8vGZ?PrzGMgMZHg794*jEgFl}T{ZX&+ZSBNoD1*e
zw3dJegvJq|l%kPT46oo<wKc!y+xQdk*{nO&bpoCUhE4{`nyvG$=FI=Ri_?yu)f#tR
z1Q$Eq0S<gQ6x6RjQG=fddus4G=YDH&ogfyg+SysMY?*sGXZ+{wEd&ojy8H_-ybuzZ
zD1Tzs?Ag5Y{U4)y&6mlp{&Ec8er(MHXvb7cWmT>QAF+AvB{le4YVdun2cJ?^`M><-
zFLBk|f1GE2{UM#(_G84BV|XD#p(dpb4FXnq3=|_a&6~LMH?$;tvvS`*uDcBqm8yp4
z{o9F8K5hT6d#lx>bYwj&+D&$e{Fo|+FMk;}&YQUN*Vo`@w=BFk=E`6F%FA)o-P_gm
z#LDotxV*Las0812LJY673=~5)#$kV5OTz<ABA^`Mjze9{WqgY%M`#446&m0eyv6E#
z48LLSWt`di@JT-<2iVTMGgM@AV9SCv5g=$3R)bEmy-}SE6rx(#U&Wa%9`<fuQh(Nf
zue&=Oeub?Dn9x9EkCA9Vl)<PT28vQkcvsZmZ*mh}>%*s1gT4u^>wp;CR4r09_!$k#
z5a0PsFT0D1&2f=)%l{d8k|uo#80QTI5=p$5mx=`h9}8_g>@N6hU2r{f;v(mvfe))?
z#>U1cPL?>h{{U#sKmOCdGIRL)d4Fm7(3i+{0N4mjRj?I{vKH-4-1$7)7v992zp}iI
zqJZt&x3hWUCN^*0%)r1-4(!{{kt0Vqdh{rxqoZ7X?X|r2^{;za;gblUJ_0HhTMF@e
zdKd^g7+87}^De%3TD!X4ySDL%Km3u^D_5~~>lTKGhbfoJh*(exPbtblKz~PPCvSVz
zE4lv0+a7NC!~qd?5fB9i&+B4W*u|b@x3J*SscmUTMh^4SpZ|hi{pvUD+`bj5Rw!30
zD5c0|v-rM`HHN5W<6~niKj$1?|Asek#+(IzQ+P@GQ_2B0G<cbI_Ea?cm*2|5D<Azo
z9%k&=HNX#l@B<!P`A5Q$VSjpk!v(Vx<8-lpNMoW1V<G^=3W)HyCq9v<KjS$F{LSHM
zwghC71GMtk8~E%!?>3fP_ZUu@oesZm-!6XhgKx3pzQ3R<<IM3jW8HZU2Zr56OEIXR
zCQZ!dazs(c@X!#&;t1^>y$#{}M^-`<fYOlbVK~2JhVUs*0j)JSr+=q=M=BgxaRZC5
zxhECAbaX$fe)x4ZtXaue5E7_14y!&2m587c5`|T)4e_)>tU^z;qVaQis+9^s5b%w!
zeU0D!?)QB7U9V@}IdSHvcg?#oTYruehNze-N&&HX^t9#Cv(CU<a0x?m@0u38NO~0b
z#U1+~k+PQ2(GeEi^M3|T?4J!{a1~Sn1~;x^=U;vmA9FMR@6ka>E+}(cP@=O~B#a`W
zFpNV!ief|J>y9!sI7k?VXr;+_bTV2fQT@&f=?|`=dT<Nj-qonK4)A>N+CeE$5X&0u
z@Mi3R`{`TvH8PjJj)QGWn!rzOGo(H@Cl85CHOwqrbi(STUw>S=+~oVfM0H{B?_Nc8
z`ii<o-GTkPdC?1B6hGHRBw6={*b!mPOo%lWV{JSx7@t>N(#sPU7bum=;7>refszC|
zX*8gm7Zeaxz|U~xmS0Z^-inZG%N*(N?_D4wM{wldy|av?@bk;NpMQbx{cv1RjS^ma
zM+c(~ik#W~{eLJFh>*|c$Ye4YW2poIK~Sb#hR}vos}-t|;d%er&l46E2|^&-p3n+O
zCPu}OZD0*xA=B=B>KsHR`hWfyhA;YfQ+R>qM`Azv$<H8>wU!l27p|<dbsr^+`Wimx
zMH*IkT6=W$_0xaiNo2DbisR$)qb>|XK*dX;P#EXbxqoNz?CV!>WB6Ty2rL>m3CHmH
zZZiM)B!*AFp5sgFFzdd7+5CNCa1<zFhuEQYQ-@F63|)4~MYs~6SSUN-4m<#=4j#bs
z+IYmAe)biG!-WckNKrB#6|2#{$HGO6`Hu_#lUr`R6M*U;EN1OjQEi>zhMF~GuXr6p
z-H(Vt27mKQ;ew^iu8w1O{0g!ixE|}<{Y?(n9F+#|3}__Z7)v7wpc<98D!sOUZ0-*X
z7LPF0*~@6oC+s(L)Y{YUc?Z2GorU|T^Ul73=>BiG7X=%kX3vS?CqL@^CD&2e{tJ|g
z@3$dGw!>-Z@FFxXgc`z2@=Mh_Fxv7*dd}}-B!6>U-LB5Va9S?lO#d)ifsznroyMU_
z@B$p_SWK6nOa71JfR6q;cz}aF|3sgcaUB-7VyaEyp?M*sNmV_3zC1|uz|XP6yHd8a
zicmCx^(fb@WHe>*Q!6}_qE6bcgKy5Dn!+ceX*;0tmNu*)V~4Sa_cnlcRL?byvwBH^
z7k_B@KbpfQ^P4Y$)EqE5+h_97mPf`8)xoC_rNXCAnEtM=IlR#9F`$_wrGS*fjB>6Y
zebNG?JXQyv4wM4l1n8lLm%nZaNW*NOS@LgSOdWi4o_cthCcHGC(HvfY=`I1F;iGPB
z(G_%6gXZvVqK28nH<~0<hEMoq8jr!`M}LWGnC-{TzM&pIoof1DTBO6LC>=hQyCIs=
z5|A03-qw*%7oK|f=5w0D3zFbWI|ry4!8@83JSq)7g+iLcBP1r%PJ+{ePn!CaRS%!;
zh&1?gc4!VS$4I7A3MZzf`=y07U<@b?O2y;Y(%`KDv4DVrc&@eS8=Lt0QF47i41X#r
zrNBG$n(YSDV^%<^sly|f6?Y<)B4`Z|!>RV()HA&5d5;1tpg<ABslL-wYx`jNqrvkK
zlE1f>sCQmdcuB4$DIQQ!WN@VvedFWhtzj7Tp_Bvv@SWa@$n=VwbojV6#*)qYM@~KE
z`1%teQY0wU{{wgtp;D<L2!6)HT7Q{Z4oH5tJiGv;z}pG<ph~40a?(lt5Bi>W1aB%i
zK#~h7)w=Ky1G;6W0z?5eh9?XoJl~@_UfloWCq4El6W>F6o;TS6l3H1*7KK+R!Z4(>
zGf#I{Ct(y(sf1LkAxbH7`7BWsF*;IUVArmp7d-zN*RNmq;078<3(&|wwSO#pu~@{~
zDkq*W8?6=9N=UI35Y$>f<0Do$bZC^d_dhuN^rt=H#v1&}>F)+bS~KA(#lC%e@I6Hs
z8pg&;j2DAA(|32b<9Uj~p~I|SzhU^5FMr;RJGO8AJx!!Z34zvx2NBE2$VeRSg<=q!
zwK04g4TFOd@EeC;QG?&UZGY?UXs(nb*oyGD$6FGId!bOC5q$a*Xwm1qIP)hWz|0UH
zK>NPOgiTVb!PoETl%lI^X7B*|M?d;8>(;H0ouIWsTDZb<|9?K0#q(wc51_BO;&RSE
z|2*FDj(4DxiXDNpW_gQK-Wp>V96B-scqa#hVaRiz`&^#zgeSy(?SFZ#yRoqrYlTv&
zLanx$5qw<|{Mg4n#^sk^E>RR&t#!-6TM>%I61iNC;X{XqU-IH--JHOydYhVj0B4f?
z{`bEh-MeS^0}B@|y>NWIfC2>f!>9M-)&Z8fziR;I^qXyVthI#ID9-*O_UOxB_WUQ-
zik!8;2@uNy;<Rx;F@NLq-S;H{M<>q60<2iEV%a<1`JT6*cIxS8hf#QJ$01U;GgOU^
z#e|eQKN*-Qtog)oVPr6oQCqie+WY1=z4rYZHf&f8<R(EI2RH)4#411lR1yo5_pR%I
zOyYn%pxWBn+PgYCPZlH#_yQgzCTIm3P^hG>H=H)<tGG=);BrR+NZQFiC@B=i$19a;
z2>1@XYo^`-F?>0(3Q$d6x9$hki6x-Nz_c@V%>{S+)c2jX{<V7O^w+GrT<b!;-XX@Z
z$c+$p38YEYjhjQLDPChLlC-fSY395sUW5Mv-i;Ssux4!B00000NkvXXu0mjf<vsR&

literal 4778
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

diff --git a/www/img/files/mp3-64.png b/www/img/files/mp3-64.png
index 5209090c54b8ebe9251a812d9d8b7371a7c03460..13b8da0b8d9397a6fb627b1fe799cacec5b47930 100644
GIT binary patch
literal 4301
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

literal 5417
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
bd>1fVg}HUOnxy~x=cSI8f#xgqyJ7zWaX#kL

diff --git a/www/img/files/mpeg-64.png b/www/img/files/mpeg-64.png
index 4d81ac5e3741329e7546454d1f59a3d11f70bdce..05d77fa7bd6ed5d2a249629e634b89cf99892bc7 100644
GIT binary patch
literal 5308
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
O0000<MNUMnLSTZ7lxwH}

literal 6443
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
Q^5^+NOI;UQu4*0fKgJH%ng9R*

diff --git a/www/img/files/oth-64.png b/www/img/files/oth-64.png
index b58ac463adaebc127b2883fc0df6101cb9bcbe18..8ffa8b4661301bcce9d14beedab5bdcbbfc21a46 100644
GIT binary patch
literal 3724
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

literal 4825
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

diff --git a/www/img/files/pdf-64.png b/www/img/files/pdf-64.png
index e3b312332e66bbf46ec068c45ba831d9b4b7ac66..b7cdae7e95534abf0ea8e6146f1d6c548aa27545 100644
GIT binary patch
literal 4231
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

literal 5408
zcmaJ_XH-*Lw+#dW0VztAW(<gcKoSTdk=~RNq)Cxx2%(ce5+U?Z6-5z&OO+;~pn^#6
z&4?&cq$nUEhyscf1&Q>B_q+Fg@5j6EjB(E1dyO^cYIBS;&PlSgILE^!#svTXcudY4
zS|6;szi&>^!L!^ah<>mfB^x=AZ3v#^5DXCq(DNX;;~*vh7%!YP4&xCT)Qi&u0Dv++
zwhm+mv^fe(2vElS_EDw;1RkIP08JfAAO`D)BSYMAUOsp&=t^@t6yoEd1+`a0!_k2T
zIB%cxVMLrwn1wAi%nz&K0oBolXi`uI1OYfQ20{t&$CFSLE$E-TsDu4)GYks((}nD(
z1^rJ_4roh=0fC5vs42shu<+9e$Z4c90tweZYA8Zf;0QPjp#p=eD<R-0HFXpm0r~5K
z9z-L0c%rNgjsJ>uaMFT$lgWW77%U_tL^(uNnLzY{Av82JU~m<fii*;KhY~3iPsUJ`
z@FeNK84PhGEYT;B>_fmqelud+30KHk(1T3>Q$j%CKeTw#Uu`;Q7>t4mgdvpSzf1bt
z5sm);T>}FC@g|Y2asSQt|0E{ah6dtb);JR33K4rSI8W){p#o6`L>z`pAlecL{(pDT
z(wjggkh}?j5Ca=EWdsC`!TR8TTmD3#(I^u<iHyNxaVCaZ&;t%-A0H2t%4q`x+`tH-
zr*4QuAdC=a^o`XGHO`zyB2*D@#2NL!v4#Zfl>i)`{5RI)zgU%j#r_sUK;S`SLmbg3
z80TS3Bm_YIEE?tWuelf+|0~~LSdV|t1^%yC*g-O|-=qCsqyF1;pr7B{e}sE*_(%FU
z{DIzy2f~Jq0;K?e!*@&!^=v5<eNNoz7e_<)`e)nbc4NVuyou)mjnWEFq21Y_uyf*W
zoMJbjE;ZVha>+tyr`da>wrNP3ubr9Q{UX^HS?^0~#WF05uCUu%SBZwcSBV9x7+|Q`
znC0!f>X7|N*N_6zKw}7KV)W>H(y|7#r7e0tWo4hK!!<AQT}NVOMaYQOn|2ZrzU-XL
z%XhM%jkxKe-k-bQyYup4DxLtkH;lf~S<L62wLGSx2+4Sn1l)a96+KOBkKS5PwI_V|
zHGvMHgJ1Zzb{j@fKC3h7_A%uORrYd0tc9~?iZ_&spIA3aE_f;s6Ii7tR~s}|p1Ae5
z2W{2B#6Gi%Wtm)-Ty+<fz1r#R7nE)W8Znm!6<x0J0(pi67oE)z^KHb8%0?|W8lfC{
z;sWV2-`F|=cDOFcuD>(koP41KU~SVbfJL6NK2ySS;*Rgy>wV6p`y!So?Q6!>pZbt2
zuv~WsIq^eAIX~Tp00dte;LTpysmhL?cNH{^dGo8~EQ(HS>gd3x0?mLAKp6kEn_at+
zChEJ9`wGf;yBhZ$@0s`o1UM9&Ul4yGO+6Gd?I$`HsvpU!L%vr`d6|-L{PnX)(foyb
zy>k3Vjw1zxW9k!hJIwSs+34QhG!EqUIoJv<!H>|bu_SqTLb$R^dF1@l3{v;IpiQER
zUZT0|W|WiPFnhc@OvlM<9p?ZbTR)QChEtj**9IW9pM@6KT1<-k1WaP2a-bDY{c{B}
z74r0!zII(MKWt!@In(9D_G_b>HRb#&rW@>xj~1?ct~loFXqS^OBG}Pj{`zjH<~~rS
z9v{>>9Anr8S}E{c6x{U^c5vbVrSY6;qJZb7$&3436e)22RlwTqJk4QChM1tNEa2!)
zyT4v>y1_l!Tg{Bx!7n9No}{z9C*PiF2?Tpi|1#=ZSojqUS_%K7oH^LTvsYUntw(RO
zT4>T;3O&Isbex~^s7h$}(h&|=>!E79>E!G*)|L=-Jjhl9H9ams`99M#eU3P3w?NAS
zx*le@v==qK%m&i^y*u?z#4xp+MYT?~!%aHYbPXTArOL5zuClY1Xfly+cI;%XJ0icD
z;>v|ajh49dr~~|zisBVj?jh3D&8%?^#|~iaLVTM??;X>f2U#EJ<4Ha3Yl4?tx8z5Z
zU;@ALfccBc-lIW}>i8GNVgb0Epxfp}D@RzP-<0=)wG%IXnXD)9Nq85i7-4nZKQ4{>
z2}-XzjFfd=g*un}T5@`D$tGxU?A%{y+zMlz*7(x#u6TQE#C&49Hx2YbwRygRL=SC#
zgSsMd6WXu(W8=C|U^4&l+fb?=V_PYqBU)I?{z={lBh*}CFofP>N+<X%Wf8BAGnI3$
z(e;Pf8Y_jxX`#|n=8TwK<XW|Mw4^8h7x1>j_W1P>!!pipt+|q;6{JM7kQsjYf*E=I
zAtu{QAa*{C78K~EvepL3c~<&uk8F0-!b`3WZ2G8aT(D2K7+?^ODsJ7c^_K5Hky~J_
zI*?wNeRsESjsMYX(d`$zOe=pCVZQt|Z{Ew?x&i%cyfOj`Q)yDNp83i(36PzF6LIqk
zPEjXN=LII(w{U`Qzwl>ejikkwiQ*h+P{AXrHHI1PM3Xm-CCz;TvF#TM)<Qk(=u|cz
z$m@9ns(~y&78q81-zv)Bse6({GyAA}+t>2z(zrNLR~;LlIg#0xMZE4Bb5HnK*tWf8
zPEMTqtzzNWl+0J6{&%k@o_Ia<eQvRX0ceep8W9UA4S2J`a@I*!vbz33PoZ-YCp-EP
zpLQb8*HRiQ>r*VMtX|<xIMdW9zG=*2-6n6k{kAAw?NRScEhgQSUW~Ly-(Q@_G3L{z
zk&zKgu)(e6N-O6eA?txC5oZ~jBbVbl*5KYgudQ)Jn<hRuSHw$vIa>E&v!>YxWlw&J
zRp;>zXjRojQ{XjGdJN5Mh_u8Ll~-`SH8u@YB|qi8l+U%;`2e%gXRMH2eEwDBHXqfH
zEl~IfVCm5Z6OzLr3h#KQF__BE4#8h~#tyj?A<%M<8yLp5dm|HLcc@kJ9p9AwaknB%
zkfTMZRq?Lz+tY+UVt!=@kF;On?E4YhksVWiuj$L!(#~;H2N|k+)gkHO>v8FCr5gM-
z`kf+&v*Vb>xr405{U8lp+}PECfVECIp7dlvDTI1sV6SmGC~A%|t5)c*FHMM+8@@Jc
zmWj<j?<4(VGYPDlaOtH0r%Kg^{Q1-McdAeD+&gc1e_0W^m}fsi-=zx}X6&A$&I=$|
zZa}GT2a}~sHo8xReILs86I7LDu*KgmZ$xAXR+y5sV-wjl2A{Fyk74iL1)lZ?<x^$e
zJOs9lg_n1M!{UZ4*JVKRkMkOeMMNGus#cg<pcxg_?t&O3%iep0Or|UE6NjhWN@<>|
zni3fy74<E%!c4Q}J~gloafI#IZbiBA@jh|zvp3kpm{g(H-@i}dyVvV3F?v`u3!4PF
zlGu)NYz^-9-snh?N+@)sC#!({AHzM`85Uyt2yHIS`R|ts`BtLcevBNtm(Jq)t0y{s
zxnDVV?H$_Rz2h8>j4l~$j^?pRf5rE6k{7`k?RL#SOT`U8{AQ0V{K(<n@y;}HZ^><X
zHN@OAInsYDnZ?u}WnPujB@3eSnLI<A>05FJR<s}ENnj0SbH58cl*kU5Y=H4E=U%Tw
z1na+=is;p-7yjh{UB{hPToIoR@M#H2Ds5Mpd*D07XqCADeiP<z{s4Pl|L|M__ib-N
zOw}ssa`QCH$%5IqbR@M=jA6v492&W@Lj@kHJjOQ0<(vMz&VNe55zuY4HV|Ds@*Zg(
z(Qq%yZoV(ROCj4qBH^M>cn)Wf=Q!7=kXB$oDC|970n31uw_qtG;mpy;5@3gyY>Mwr
zde5lE%B=?V4qnH-F1LF}9M^w2{{3YF=ZX>Jk@lnKF5@gj>+NrOn^{qNn{rcCymQ?t
zdhK|%$16KLXHM8$td^*Yei6q?lq_Y!cq2YNX74Vn&il+WCwoq!b}dwAStVXGlxE|!
zY}a!Bv^{le)31>4knVQMT{*2aEk=Em__q&^mp#P#c)B-gm%Wrj!_9bO=#77@Ik)Q`
zVWF>?1r3?qT>GdpoOH^QaxiJ4RPq<s1t|XJOdW5{&fG<~>t=SO-_L}CV)6q2$hK5q
z|4F+A7q1}svB@r+P|6B8`?YOWPi&>Vuw73rL!#dDOIgu_oX5p=ZP(wPz7QH7>H`xK
z6Tj>~r7uqg`BugMDA<+%^*{&s;fi`+RbFd@??Cw@u+W{vS9VZCbN8emMyO<0X+DC&
z49RL)<&Qb6MoUZIt$pmsUALt6G;T#;|D9as1%s(t?u4ty5`&p5z{RmnvDc<K9T67>
zb{Ym0n8CFrV|^TIYO-7-td%2<_cIKvY}=IUXv2<znLmre`z6wkMO_=oEw1~VZ_q28
zA1QqQmPJYX7T_6L3BLc;q*;u1@#4oL<%=Cc;ji_1hfhkSGBkV>SX!I#C(R&j)GtCF
zG{uLCqFtH-{M`3X3i7;JjN;h2Dfu*bneC2=yLh6Dl&ZIr@Gjf*FWC{|QOW2ADcYKL
za_Y%^s^0WjAu)`BV1~Dxpvq{(P=%d*nQcPQk84MoB(i<8sM@JfxxS?d*I#jTWvt<X
z$cGYenX?834gk`Uk{n+OWcov_eu(<}mQc(2z69+|V|$VH7qWpWG3(FnFF4fjCwDw^
z=GDxtJ$qh}2!N&`Q}{aHSBt#5;3`9!Skbg8!{6bgR;D(7on^8dU&WWXQthGcNSeLG
zg_6NwW~Sx)HlCghW=!OaY>9|-@>sux4DE`vG~+5qNAPm&6<^Utfs^tw!nX^}kq58k
ztn{S(sLvO(bS7B?D1u4yHmUh%Ic{bu#s4h3fF+MU2`+mgMY%;$8pMWmJFD5dFK%2%
zZa)KjYm*w*4gQ3DRbOFr>dlXZ7dO50wSixx;~0d)?~BspaMczl#cxy90pZ`{@9n(4
z`*MFZRHm|344nxx2>lNI<hIXFti-cNFZam#)00cDF2^a<$l7i`$=Mtf10Kr+1&(u!
zxK<D&sAm^Hb)HLF74+&etRpEjMX%sRb;5YJxcANT+^!ynCI;fW%1+p9l#8dl{ME3~
zG`=sDe6EexKZ0v3_5x(BY+5&rCwoXqUD`@nFFc&jv~jkrIypEZ<0rdz(6Pc1Ha=U;
zs=I2|&N@)nL|fO%R`Fh1fdLRKv%f?T7>sw>a*wI0Yx*euaQlYedi;{eb)9LDvZvc<
zQC+Pb`T-{Ij9$tpR?>|z<@a2#)-%oHNrGvm`3cXIj$;-wMFh%`DPWwaxLDW7qJ7b?
zg?mpy`{I4<E2>&%b6l$?H@l_v*{!Za^8hz)_sYj+d7wZV`jgI<y~x=Pk_opg0~o6b
zA!dxt(mi_4VIWmAV6s5f7wL?Zuz<6xd^&oYw9JLis%@2=f~Siqad|91xQ1f$d{33&
z%Gp|Ye*w_RuRz${b{8MZugX?lCPrq=2=?liUnF<N)KkZInBKB0`O)hLc<Lgl;jyxm
z_XtXtk+p7Wb*inlW7~0&lEmLdRtL3wOuudE?PD;BGaK5UPl0?Nku|@2_SmLcednt=
z|8qT#54)r@YL}uFo1n?pCiI_BTxvC!x%)AXN-=g%q(_RnuKTfme*<<OZPA0*iR^)w
zm^#<Y%i?z?YM;uzuD<A2@~%iF)1Q?wdIcCgCR(XbP4n?ZuOdy?Z+*O$KUgkS{Szet
zZ&Ni08rx<wy10*5P0y@{ME@vhZBi803@x&)%{pAWF7z~rtt_Bs@lIww4{DmL0${?R
zk<4f+ra0hm>6N81wI$nz$|?{a!$N>$?!<L6XQJ^(n2d7c^JN7A^guDz+_}4Zvmvi!
zHBg$p(rM_4XDP1<Cf#g7OBHjwanps`Z(7Dfht$3!^L(!Qz;Fqv*q)l1!FcBg3j<QX
zF;U8bQ)ve37dF<Z1KCRzt6}q`_KU_dGf;&}GPOCxTBhLRMM|rU5Zi9dM}kmTOHAn;
z2>IX+oXg0XWct{<)JVV>WiVrX`&p{u7M~<)FC)C2yhPV(W*Q~xN%^swE+xtoNrJ|s
z8^7HMY%v@8=}T!bwmaG3WwLGPX2h(q2tRDUqosfAnW5ENKiQ&dV2vPm!SIb`@vzms
za62i@LFU|ZZfIUX(5Z=iAxh=X@XHL~f|ySXW@g<%3ah~pVP*y_Yly}6TyTfQL@%(2
z@7&6n>WEpDyV(nN&FhBiYZ^QZ|ATttI3*DP+e6O1N3iTo6>)%fVwhV|R`q6wu3YOV
zVL7JoT-ao(dc4aqrV`7V#@#aT`Ga3P$iWLt7p7WZ^phQw557+9apaFHf8-4CwkT2U
z-KJu-!Z#-L`PFA5h_RWDEe-avcgYfTM`}HLAWf*XVWF7){ZmYwq(MLcBaN@61%$8U
zKEkaPyffk$!;GXp?5}WZm#UwRYTk7mtuf)CPhMJ{(A9Qh4a%)%b^FYw9xxG4r@Ok>
z$_hk7G{!r)i!)w-PPKS|Ab<Qc7#aP8<B{{K>2uL{Dats})59OCussW@e7x;zshh`K
zRE!(j%$@EvL}txj&AcD_Fy4+`u_j*f;!rKObaC@z{|S0QL&qwRIUUZCn&+~Pt3PKr
z#eql~f`>S~_1X+yX0dm{ypMb&;ui6pU0f>q2h6Mg3={jjG4$HRYeN%oT4}jZV|mmR
z<X6+_6|R1`(okpV`p@0@R6@jVYCFB2FzvK{5yduf2ap@ww2*w~;iaa@JK^RL10F0g
z&Men9f=*<Zsv*_Y&>_Ax!Tp7u;u6I%FYq!VQv@|zOK`2JagDY8700!&Fijsh&0I<G
zQ%O5x*>I^GN4^LL0Bc02q&@)0Jd@^Td*v#JZN@FXx6B{6*+oH8!m&qEM@}7oY84Go
zIEH=JX#5bBayaoMzoP-=es!Upi)Moxcf3k}cyeXsvyG^9D#g&Hp02g3!+Hqt2XM^F
UmZsbO`=6zWk%eJ}{^i*J0n+cjlmGw#

diff --git a/www/img/files/png-64.png b/www/img/files/png-64.png
index aec5a2dbc4a991ff63bcb87753e65b1e66390159..3ecf3e5df737baf94f6f17c40f6c0124f379fa6d 100644
GIT binary patch
literal 4528
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
O0000<MNUMnLSTZH_s6^d

literal 5622
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
R<llc{jr7g*s&rjr{s;9E9%29h

diff --git a/www/img/files/powerpoint-64.png b/www/img/files/powerpoint-64.png
index f3d25abe0484efd7c7aea2908ba277a063412b4a..4d44c7d2b29c63e2cc4f4d3e0b7c4dd69727ffb9 100644
GIT binary patch
literal 4634
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
QPXGV_07*qoM6N<$g2kr6o&W#<

literal 5872
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
P|3T|(8zZVToumE-BJzWC

diff --git a/www/img/files/psd-64.png b/www/img/files/psd-64.png
index fb4809905c1e4700ce1bbceda562484b959fd210..0b800dffae3bec55fe65569b931b3f91ed063a1f 100644
GIT binary patch
literal 3944
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
C%7upj

literal 6022
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
AVE_OC

diff --git a/www/img/files/publisher-64.png b/www/img/files/publisher-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..9633ef3dd0caaedaf10a26f18f3c3802e67128cf
GIT binary patch
literal 4973
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

literal 0
HcmV?d00001

diff --git a/www/img/files/quicktime-64.png b/www/img/files/quicktime-64.png
index 6fa08f9e749f50aba0d94caf73109cd3de6008e4..90f2fbc0d1be90723eb5d6142b59ffa971f3e54f 100644
GIT binary patch
literal 4664
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

literal 5875
zcmaJ_c|4R|`yXTMWM3a?j4jy)!=SNGMfN?Eee5&C%-DCbMPwI>Qbcw|*|JNPk?h2v
zkR>F$c=f!`^Sr-5-uHKZ?)yIHT%YUvy}swVuJg}{H`KquK+8i5000=YwUEZ=quTF}
zn)3W#>gGLrK5!GR-6EJ^oe6&SI21tL3G09YYoqO5P{t^GrvUF>6aoMs7j!edMYyG>
ztK^79OWObTk@QD<oudH&gsQ)ny`u+;0CqsRxM7qbn~m=vU^gdah=rUURL@Hj<?5yt
zh(nnK>YF+SdN?XNK~z=12!Ew>0yK(X5B5iUV(?1-%8);KmConC%~BBXpDqLsWyrrp
z-O@7zYhrOIu$&}R!VxMj4VH&VO2eRvFhy~&3{)B_B`qTbg-b|7mE_<`P-*aA59B-=
z&dFKH7<v7#Sm!Hch%15Mr6eWg=jSKsCo74?xkyPXDk@4rWu#<eB+fk~@BtWty}two
zFYq@55`}lfxp@)Xuo&=fMtcXW4?!7nuJqqqKzsc|i^2burt^eJ`P+L*NlQY1Z|QGG
zJ-z?m6^;JK8&5Ds{YUSACB~Zuc%h_>QFyEm&hfl(&H}$fc`0e)Q1%2Y&J>IF{5y+=
zu2=#V?~3&TYnsSON`v+69o;a$Eq@~P^pvzQc!E8~5v7e(hMaRqy16+iDatD<YA8Y#
z)ZwzS($d$YHPq#i*Uw)$X-zp85(@tti^MwmpivmY-&m*rU={x-_IER&z0M;eQ8+hW
zl+$$_77hM$(@JjtMT>$o5-z7ME%!h9{=z!_7cGBb<^LyE>RgP}@6!ICQvYo_@1Nh(
ze;W6E@lWfcFz5Y_J8$geBhm9y#(JJTbyNSTerp=9ysrVFr;eK$uNs7c9XuyV<m2);
zsH2pVXax1Bpcbry0A}*EsIez*N_wBPizrejbZ@2!v*o~^^d_1l`4*A;0?50Hs=cf4
zOXPm2bI{HdcYB_(H+yz;6nb{H`TgBKPk>eV^8WX*Fye7@&rZvxNQ89Ehf6UFJCR@q
z9F9d<C(FS-aH@IXDp9%SAm(aic3jbj+K^`b&~6ObO3W_$*0ItCysx!&vTDm{j_H%l
zuR}W3qfgee{y$r!hQ7HwD&#Zvoe^sm*}?ZTx~|^62`pI5bsHN0SpOi5cf}rJ+zSdl
z7)hJztB4lkQT6G$Q*FxQJxP~BKE_M(d9>%_N+_F@XjfIfCo~1p;FO4*nNi#(p$3Q&
zbT{3)>>Q-2J?Lv$0kYe4{Tr!s{QOOp^#JOFIwzT(DBSXa)-{PJm*Sa&(YT~fCela>
zMnPa7wYX`JY?#LoJHtg4X1!{onJI<nSooc!gr$Ml%kf&5l}6UrYc&8%FBO5OLRB*@
znsEH_+s5ogmTufTp`2Gm!e{bXI<rQ}fMC#RcBwlje%CuxaEd)0779&otL&yo6s4Di
z3?RtlO(g*xKui=BnWs0M>-}WXUMnaNUatNEZ^Mm#S=KH;Qe(F>&N0`MSD&WAvvoK_
z{-lU>r9GF>VlDrsl!GQ*(!IvX7NnBay~j*(Re(jfw<48H3IV!ZFE_!ozHj|0#=Mel
zW82;nosHb|sijJ;Atf*rlYDpJ`8PD-IfOg=!^gA~hRG;Y+a{OEcBK)wy`|cR<=9wf
zt5{HR71ysN2%165HTi=5OF!P`@v;Um$<lJGj2bGIYBC19yWUS~0zEJbVm(Prq^bFw
z2nWC?o7DLt9(wJl=sqvM4;ta%?ld3299Y@H_N3wryQN4pmbvg&a%<VNi7Uf(N$Bz^
z!0E@2#Fx$K6xfio(ZV#gr$V}<=gdECs)2fUc9sGD3g}uxKvz;l=luN_{zAg`w^LJS
zKw$69D^`pw7fHPoPt%%wb|#=0j+pJC7(SQ}G5-(Q%{Xcy9z%Tq3mI(KEjUc8O$WB)
z_-wCq+<+C+CA7m4%LD_?_QGIEj0?h!OpF!QF++J|jHZRGKb8h^@mF~!eXQ}ap-26)
z2eI04-<Sw#VCmtn%&F;>c>1NgcBRcv1QgUsqp}AJQ_qovCGY`l+0EHn7lXElq)g{;
zC28K?S+g<Bqv0$+)r+uEyt&_21;u8)`CSF0eKj@hPUtb(jHFpPJZrFAgOtv|#@mYm
zkM6DwRx1Cf7-Hv1EPfyuyIf@GB5fw!1A5B@Q*w?}y+L9v_9m|C3?X9MYH7XIT245R
z^FU9%?LGQBV%tSK<7PiN=W(Lt+oY=Q7JSmr(kJyO9GJXu86DmM5=%<H27-1VQSy(t
z$L!9MomE5tpGVV|yI!egjx>pW)a$%a7@;i$e-U{%;LFy@mo1F;qY65N-z$tIWwnDV
z^2O8Y%M08T+)oE3wIk;iH42I3$$jL}*He~GyPaQf0uhd16~jdV$vR%NfQCK_{*vsb
zSy8n%K}BH0x3IYhCQL6q>9Jg2Y2<S4`o4dG(VqXx7ts@6XyX1;N_|<WBCQU#kEobw
zCebks%MSMYGIazBFO&r}gUY3aV0uc;2)<zPt-~*+w=UF3k$k@#sa=1PRcdbRShQCc
zY`U<wgJfvKcf2uEjS7;gq<_pfrWr~2M(g|Qdk7)~k?8kD-*uo*)Cu;0K`SYN8v??G
zJD+T%M{Zmas@fY-;Cr;$jZUy8c{iqf=^gcKv#^Vj`E<YCttf)pmyc1bnEzNXS7dMk
z8p=`c$h2R+rjGX$+9Es}kD8z74_>^lIUy<u;J|`rBm;|bDp{+V0JwLkr(-w)m7zbj
zpGOFu26(c}+0OS&?OjKj6$(#_QMJU;W@>NxG=|U5<OL|BFCqgp)1uyV6e!qIAkJWi
zGya=H_MWG3;M}1$DRmU_t!PA{!$hXhq4UQmWN8A|&hI<#z4%#I0CS+$H8^KbXw=;U
z%$F^oJvEFmDkU=)x*<z7v6L~y%iX?F!Hn>__O&yHs4p;Z^2agb!XUXl(mZU6^6_Bu
zUGgz>)yym?Q?>iuwI1D)u{Td6Ic*UYVCT;5)&;OL%(ty|8fYg3v@4~&ZdCAG`}%Z0
z6J{rAzU`&t%hXY6(EG`YDxpBX%}Y0&1~`<SSxu#zVKeBoS~D+j%BPN7FHitM3fD*m
zLJUo;AFG0HYr@dk-@2BUf(lqJ&dFUzAk()dycx<Lvz@+})>#TSZoNbv9KcXO#_a?w
zw_!$C*S?Y9>ed`DE6XA3d>L6t(MJ3jqe-+44B<muq8#Ab|H*h~z1wj|P~69I+eWtR
zfM|PIa-Ga}l`uczz)hqt<<fOO*tJrP)*-Jic9?)mJS^KWNOG=%Ty}ht&mtQ&%JA5X
z85D3)MdwgYWEZ=wwW5_o@;y`FYw$%4I9w0U8&85W+J!AE8QRqc$0@E+T8SQ<IhQl4
zT0-nv3hZN&yyf&C6qx+{074rLCvjc0o?Pi3Ej+uwLIMmT7hLxnx7!;iZ%+eF3YJ$E
zHiOfJBWi#cTe{%ao?2hL<r}?G)GXPp{nQu+{e>q=A8ui2{Y3N`Nj)adK5cvkS-qAl
z;NpWMZ7+PanHhQJDB}q3_>f-BJGhgDJrM~^zA_;u(K&F&e$7@eDj^p!p|Hz8d9(c)
zNs1A*WuE;ePB2g8fEM|}Y><^d<>ikRD8@aGbm}q2a**IYY|S{iEp_41^=EkY;(!36
z{+w#lNbDMrQkXqc>RQz>Z$V1yyOTYYpL{pfH{PZ`E)4%6{gY37u{M5xyWWNRFcPe6
zBKvynFoIsbu3?pO^Vx(DP(hAmKtvPPKcU5C5Q-79qG_@rM{F|d#&q~gYmhfRn`8;!
zXsaK@FVdma1RX~Jn{8oD$9#MW&?o|NbWD~|o1VaMQT?*XXS<&gE2W~QgF1VOMIZCG
z9IJ`qh;d3=32vo^<6VTBS;FhGTi$iggF+L)Q%_26IxMC*onTgY^#er<oszf=thPrf
zB=0>7JbnJP^;mi0*KFv_*{ooyaz1$I-d6<8XtNkkbx6jg4##r;(|)e*P9~84@XD;e
zagT~j)Z=RyCr^k4UGOzlyLTrz^$OORz4gVKp8YGY?iz}{Oml-#b!$bPB;cDOrcWu2
ziMwP>(dD4WPue!StUI~Chb;3t^m%U0(4=$+w-l2R%eDnF`wMDC!|%7z`*y<;M4&oX
z_Y9o8&L9RMq?Z|;p^ZTnvmjSM-+0+orbrh4;u&MHeE56w;|17G`kU-8H0E5*@`7zT
z?b=z|Zikfs=AvdQ#`y|3m2`9B#8dkcxSj~cdMf-<B?FVUX#gl%&C1s-A@LEbXkhaA
zo;2lAJpD7e;bk6@n2@G*#Tg;qbYa`nXhz(mpHw0-aAcWL)FowA>tZs+9@>_;O>yy$
z<Jf7TMS*)f`|B#vz0b$3k_PeuF2e5&hv!!?rZSo;Vrve7+`kqmZ%&x<r1f~@kcDBg
zM-n`;Z`cj-w%%*YDrsjMB_|X*<Qly&?wxmedtanhjy%&Pq>0XxtIShnGXr^Y{82s8
zx2*2UhuipJC6z|OxMesjT(PyonW#=%40#xrvMb%xtZ6Cc(ub*5IuO^Z)V=$`H|7xy
zAwz}(tDGAm(vd=9dRPjW1tEdh&6TQ79rwZF?ZAZt)pw=6{T%G(w|n_R+jF6Lw-r+_
ze_YS2$su`UM0@zgTp8cua#~<u$h)ys^ulgZc%N)Jjz|Zo%z64OJEZ`zIA%t-&7ZI^
z3iZ0<!Zg>|M8*<fu-3KV?M&;Rsyi&M>!e6YQymfaAa?NKJqwE9*VKk4fY%MLQpJtL
zg;}*q5Q1MQ{Vr=9vr)di#|gi3XeWg8G${9ItJhl+1()Mu&1qGp3lwEo`0t=!ud?ke
zBuKtPvfWmLn2<LW&KTCyjNEBv7c9FFP@WF=$bUw&ndAc1rp&R<HcIbUBcSi8X~9Cg
z?;Towq^>1V9A)WtZjXVZttwS*4Z!!UC)b4^{^1ku_hWOo90`atoN}x%Z7^R!uQl@U
zdswo+mTCROOi_8?nd!mZQk3{3GbzWzCd~TPBh?9mGRB!_>v_?Q$p*dw@$9t?t+iK#
z!RGMrRi7Z6(dIINy9|6?rF`7toW*{;$pRXWtvFO|7z`FR-XPhg=e|*C(0N|*%-(!B
z_oX}IB3})nP-QD4p?wq-o})+ST+y_(kj%-<e6v`03s@pQ{?u`v{`6=I_9lVJ?ZY4y
zLaGq{Mrhq1#kl9bQ^sZu$E}9-)d;_8lrSl!LTI8Sn8eB$#Ci)YqcgZ^WJuOQQ`IvW
zG6|R7PVp%pPO@qT@7rbTMhrX4P?=NtKjif&ywN`Q?iHQEZdx*CBc{MoR9=eI@NMR^
zviiM(oQ}6<4-cOT!Mbv9T{~WLxA2CHjxn{u&5av!w5{dcg(b|5e|Dw_2JX}Ivm^*0
zqx|}ex7}g*?mIP!!Z(wQWz!ChRGTBQd{5Fo_t7+^CZ9Q@&3X)GFZn1`t&%oM%JS$;
z<pEDxY%cz~mm)D+-9(N}y093nPJ4<GbI#Q$czBjYMvl$Dczv@==G04@m7@;EB;+fw
zww93?Igc-#2>Bv-y1fO`e|!1uYEe~>i6hmcuQ8n#iNDsj65k%I5-YzWb?qsF-*E+p
zHuNQ^4Z)ffXkT?MehW1lwaTNr;=a3jJ5uW>Eb6MwrLGp5z$Bf^mjh%U$-bkH)LM|i
z#vG6rvT5ANnIN?ictoBCcUj7QeUFBkc;C^S&v_fX*aqX~+25D1Tde5I8EAJG+UnQ;
z5v)Qq^|M%$Y49s80yxwGKzRm*!wZM3@$}!PWRrd^n@Y0lB;RVOv#V(A-{Y&{7GxF}
zY6jNg$#1MX-(z2+(7ue&KP{34FYXehu0KfAH|GnkJ6zq#<P5*{@ofB7kj2z<ehn?Y
zhJnp)Y#m|2*=Aoj2sOC%eju_&wIwN0ferNIXJr4?t{C>EgR<%N^Yg;}l?E=3?Y5AI
z<!ZCw<&9R#n=IU3e;11)))<&aQ1_ad=RNjIm|_DCV8V@O^U<sAnE^(K?Kaq;K1w_b
zLTj!jzVw2k6rC;f+AxjEc6ub@hD9t1V(aDWKq<8==6jSSf-a-<-^m4)8jU~`hhGzM
zs0-li!-2!SWr|#WT+{w8Y$1k%?BvLa_v&%sO0HJNd$!Uya*Kzvq*VD!b&`zp-*s}U
z;;2cwSIDD5`|#YQdH(|#x*-G1RTrSJ7_7MU3iZDChk(p>{6h33Dnt#I`Qb2pa&H+G
zSdiS=zjhj8a^*rQlS+;;G?PTZK+Xpozv)?0JQ=n7$fnHQM*ul4@?P;uV5svi*g=%0
ziT{#o>g^cMDW4&U#p!(4=wvqzG6^8DviBJ~?iDSE)M{ws%UYDl9V0N$SD>LaE}kqm
zB<!(jyho*WoU4J$;nReGyA>wygNJkEwtzdebHq)b+;X3_hfR&?rms!{?|RPEH|oRU
zg?r+V?E(hau!SQn!C?_?<7%2J+S^0UKu!R{Q^H^e^Pv0YDs5SR`?7J1deOCgXV_>z
z3%i-R=1}tB9><HE>+bqInn|hTdq*?QZ!ykFNpty%vZpS|VY^F?H&oZf=D17Mn9Fys
za#9AneV(=K*7z(cQHx+@i3bhT+^ZNg-$~~8CzDIj&CSygrs|gi^FD5)idD@!_>dJ;
z&vHP%oX@bN(GyK+Ys>u-()^rTCCHar=3&%Let8}pNTyb9dQ<gB1IuUO)!W*<SI6Mn
z8`zMLwQnZBf?l5Ajzn)M+-TeJpw~4p$X(?VAq6k$CPyt#LFK#KF6AGH0mD|E&Kl(`
z;-645XUmcjKDgih9B>#aPx8oaodM=A;`WqplmE1ggj2NcU@bGRthCOM*`|KneyZKE
z-kJ;a-*|mTA@FCmDCiX0y(H}KqEGDq(v4PZvJ8h)Y&|5-#QCh90<QY5Lmgj~FnE5C
z@GI&(2?!SIn>ZLLYh4ZoRI7MS*D*9VH!opZ3>_*Wh@tq#<zSVE{o!v0%38A&+Lj*&
zU4YN}3kYzawz?Sc42a_TcqEHWB`52AZ~VK1CCB<nQnZZqolBEOXEG%}XPbjuVqz(i
z#ciu`cySKm_FANkb@W_USyIMr3(8wYbd9&KjjuBf_rL5sX0MgBL$>T@C9CQRE|V)w
zKC~t|aE9|Hc2~haZ%+q2MnxplLHnaS*2XJsUoU=pH{D`)+AddG<SfO(CDuzH?J#UQ
zoFZmfX-(ZyG%y`$ayT5K$9Z&YK(D&{#V>4ReBAGWen5iS+J#o0GF6AgKWrP*>fXuj
zNr%pQ(YB)KT6>ZM5PV^pP=98I59kWP>QnR1sqD#JmW}Tjx2{n{w_kY~ZoKQ%6@AM*
z5R$c7?T_FnJh6E#lE^;b$q`%)P&i0$_9nZ$=iQ+=w4NXB6mc(UF?F#CkEgBT@~>vP
zo0^J0ZKPkR>7g%vn`z`@uFho{p&%#d0vugih&~=wqxMlLe9ZW=+E!n!4ChjaOFjvs
a-~yPsuhq!0<sbjPhSt8OkF3zJi~JWgg1_(p

diff --git a/www/img/files/sourcecode-64.png b/www/img/files/sourcecode-64.png
index f88b24e2e4bae7b66e250c277bc694e2a57d368b..ad25537e4703a0d66166a861a56f7f5d9dd3356b 100644
GIT binary patch
literal 4297
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

literal 5368
zcmaJ_XH-+$x(&SuM5Rbigd<2zLhrpOy$aG>2mwMcw9q6VsG!mW3q_1b?;s#8G&u-L
z6A%app{hVAg7nD4bI-Z&{kZq-G4@_%d~<$nj<MF*i56yttjxU3004mX`ZYbPvr+5!
z%SeCrEk)j%JsWs}_3eYL(cZyf?ie^g+Y9Xh2VY0IBj8qWcdzhUeQ-4ZfaVXRjeW4a
zsfmgw8YS)i+eR9T3Oqvt0BV}pKzC0+cre%ljz9*e3vITv3xSbd>Oyw%rcl#BUAPbO
zS_B4e9bsnU8R6%t>?NeB0anARoDrbl!R}xz%0D1T1*<Of7q80M{P#9Q2>h2xu%Ein
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

diff --git a/www/img/files/spreadsheet-64.png b/www/img/files/spreadsheet-64.png
index 53aabbf54b86ca03d1c257d8cc9e5ebd4262e7ae..00427c0e7807817bf9a1901361ab6313ac5ff119 100644
GIT binary patch
literal 5317
zcmV;$6gumPP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000z>Nkl<Zcmd6t
z1(e*z(x|_dG`!>`+iS-$+d;>SA%~L-;p8$i-@wnzbeWl%A<Ud>W@cP3dSO7&_2fP}
z*4a58W#5mkIpr?F$oo}ScU8AWi3qhtsJ^b0MNdx;Gp5g=ufH$-y1%;OeV1H4XW{U0
zpVv^I0s*ZR5`-$DYRs_?1SNIsKhmil-n~~2J-GIJU;5am9)HhU-;375e~$<N5}PQc
zuq;I_sp$X_Ss4WSvanV0<G`{kip3J2_}5SRyVdivr>>avhKf6gm99jfq57v<3u9|V
z;0r0co=Tsh#cHL#qn+HCT-PlZ-t@HzbrZ_I_N{6NW66Kb0b=--q*Kl_mZhE;wF5%%
zdy2)%zmL2YM}YY7!tr17_`Zke>N|*Ul?Z$b-&X{on%1+7?YTlB-2y`?R*YTDoh$ET
z;)Ds<wqn>V6T$-ugcu-#Hw1tviH?a;4Pg~_d<sNP+qPxV*qFa3m2y5Y8VBS;_${92
zPf<z{3s}k`aN*HC-{Pr54^j4eaIGS~XW@F_`$i)NoPvj((}GjXvb=R!2!97HV_T^f
zk=h{~p`H;ozPI{&F+2i+*5q>OeNByZ7m7%cSa7t~R69UK8sW_FPaXI+FCTvt+vy{l
zEn~S3Zqz;Mbd(67DP&r)hO#VaU&`%Q+!?~R{FmT4BRo{!B2~941v=1;K@em`80i2K
zq#FL&L*Hgq=c72O9-K@C*K<%JpfC!?MhIwdT2TX87B(;8)=TgDufxY-pVZs&kyH;2
z1xAJ14oHB1{_wY1ec~}v=^k=f7uUB@0-#4i;ghynkp3JC8kceNvb)a$cw<M(=pA6-
zJ$NpJUvuK|5Wbg8-XjQX#Eu?_1?bZ~@6dwRn`3VMa$db8gdcY{zyrdWBS0y2W_ZiM
z^UQ&7h44?{q`S!#TtsYat9ryKPyv>1q1cmUL4G+mF1nl6vjN^1QiYx500VF1S9~7d
z`z=<Vf=_jk&U<KWV<|u>Y>QY_fCQ~n`Z8RSUB-3u?>dX%L8vXx%9Sf25<l>18PmcS
zKKE6gKmH3|IQ%Gfs)tO*!}Dz%OTYq4sn`iBK$lx_d(vE(TE<m#@1$+~*#w_lRXI;S
z`6LiaYfGE``)%K}HVv)9(_Q5AF0St&M4?XX1gul=Efi0rm~AcRiaB@Ceip(fmHSR%
zOa>zHDn9dXoA|z6?v|#LrK6+^Ws~X<9l=}Cco$Fsf!oT^35OXh=dwAs*ML`mRKZ8*
zh~X6qi9Sk*uEu8pbA&|qM9<M^fLDZ<8hOC^=(k=&EYi@>FyTG>x_05I61X->bOa7y
zYz(~D#!#ojG#$cUG!oviQlzXjUf`h#P6G&_B(53alSGZ2PAqYSr(%C0h*ELMVJR#u
zJl}@|_#|-xt3WKu8LphnVps4=cJu%hg9BPT#BZn6?J!e9_=`jM4g-&E*&%p_eZ4z*
z@xbF88QhEG*eGnYfYy<U5JYwmK%mVrrVTi4>k-#LN4A(}K=)8Tx6Zwqw=KJw;YzU<
zd}P;{19I7_6RCh;@RV1h4v5D-T6~la;d^b)x0iGIC2`NEoh*Z;etx|1lN=n}$=q`m
z^O|XQ)0At$Qg&513dW3WB)(46obg;_Q^@3bVC^$(-n-j4J{caQ#u#ww3pNn1oy)E!
z@G&Y8yHbMSW7E!1cZxabOS$rrc*4ts@CSSM^2I;=9hXd6$e%9#4^no9VQ<*1_5>Y+
z8b=Beodt<o73FLdJ1T~k7z)A4q-beqL9G2C^2+cvszE0R)CdRYK%HLN+9D`GOF)Cw
zMyV^!g50HCJ?~ViYX%5G({v6T;j=IOCAZIe3yUYOq^H<L;0<9!K%*mY9cqLwVl;9M
zB2{f{6Um4Pvf{fy3|Ip`=B+gZL@S6rfY#BP-cyKJXnY!+Hr$>Ji|a1qx`lVqHm*5#
znAUuK^}lib1-Gzd%2k{!_mFl{h?vxg8+Zgk5QVb=H;zDoowBeb0*&tV0v}WaATfTm
zBYX*nMQXy!>Fd;T0I?_#t<b)O+0f7)P3cyoKg+_#72LG=E?OgafQ+5vv7Nsro6B&`
ztXtU8wTlBiM=%aR6Nt|_O&v7k8mRc?(>;z70v)jX;L)%(F<>%AeXhXx);7w1IUXFR
zSw;XxLyI^9Mh~AH0iwa|<Wz))hE~+cEQ^|#@fx$LYaTINT))DLhaU|?|IKE+E8vfR
z^{*W0I}}1^33P=^r!C?Ocl|phzl27c-p^+;{PfAE_|^lzC6h`aB2;{je|yJ$*yC(m
z*8?Puni%giuqR%0{GW#hu(Vc;&_LmPLO$JsGn8XV({gTJF#<kHc@Fz~c465txn&lE
z?f@N)?fk_}AE1zN$fXsn^##@+eVL!H|2ZxB7Ch~dO4)2XxR0Ma@hB<BF%{)-rNo`f
zZ{VWyrgCDa%S4W^PpOA5k!>`<sQ4y=Mhh<qj<7^4Vl}(BWK&I~N;#G{FXz_F?lSPz
zVyhH;`?k|wKMvb6y~to?n3c1Z@rFgO0ac+cYcsZ?o}X>}Hb?pnP)OHN^2&Vc_rIZ3
zDU-5o)AKXNPv(u+-^77|gNSGY8HkQ2&FG`e=hQXhgb0pg`1s^#<^VyF$3N+^qHQU+
zue_b+_G);LsB|6l`e@9xoGwQNF@SGh`UZA&ZJ@7o%nSuBC4R8>bNtD*|G|$Rcz}(2
zc2UUY3>*R<x%o{L?Lpj<2Vi>J6Av#4^^~nW6AghF$C%z92%6DShk{YSCu9L7O(XUI
z27CHh(zcM-TzYc|UwdJr5Xyd$sm;^TI*9s5@O__#Y-3oRy^SwF_s`_hkW1HbyttX~
zJpUOUd~Pq<bQ%Q=mW#aMvR8BNv^F-L*ld7Hewj*8!94}6eM}S>C_xcrD$!={$V(lO
zB*Kf-jsj<Q=kXEg<>;|q-twCF(Kfc-<p1PVog$y9M;rV&uMfM!%;{Lbm9ws4?cs+h
zWb4T|d3FvwjLNk@IZfHCFsoxKuU>gMPaS?PJT6DTf)Is%3_oJ^r$t9YKtK#&GJMiv
z=*LfNCK6oFADl6x^~l)qZOuvnk^~Q;i3*zd4>pQ6v;J!@2(yE`kN)xj@|i5zbe0A4
zDm?Y1g9H|Dz3wJnIQDzG%S8&=CX})W2=Jqxk2G>X45iUj0+&ce0iQ4gir-yLEO_-F
zyXHP8lX{Q<l>i_01W|b#JHaU06gAVEX7c8__wxNse}ttpX~$;L#DM9u2AEZMJFi`Q
z4bSg)SbuCS2Re7*0=awxnM@v~Fa=bgV+TZnmcUekajC45;FGt+9)0A|_`zB;`{MIg
z<yE226TdkDKDs}u@8e!No$DRTp^(lpHh(cggB`TDA0Tbgp2gfbF0Y+7mz2tK#grSk
zJk+BDhgg0153D-8iUTM1plwB6T|N119xR29908c;d%7wDlHe1@fOGXVS5qxRL!}73
zHatoQB;MB0Q4}bk=$9y@3RqZt`pF;h@4wy7pWfZT<TiyDC{ihS>G(I8(KeT~okal?
z8qQ(D`RDNJ^KM~Z&t9I}{{k-^T*dC=d$H0sjg1Wya(R?eW{9|f`^sS--%xW1SV5qv
zRsczYj|?4v)<p0E3I@F)jt_S-zHTh*5AEh3ANnTf48M9wQ}#8!7L=sf-Lt`Lx&jov
zVpP~*B4k?Ybl$Sy&3yLePxALy|1~Q+uEg!pY}vVo-G>j-UmU>40|f$!@FK~DkOQ1K
z)kQ!_dw7Aw=}FM^S5DGf>ZOp*leY`p^Q%9n6bxe*3T)jU@aX!0%P+90xE2;U9@+H+
zrj1!b+G(M`)JGvxpf%S_W3~xPDKm`bbX;WgJ>J{HjIxnOwm;4D2UfA_#4c!P#?~5?
zstM046+$FQ0z4>m03wP&G`;0MhW%lao+dX=;@dC%oOMV3z_>B>6kW}L=kwZG_v6{W
zqO-UYkqm?7VZO8WlYDH&Cn>ta?Csmf#?DP-?F<v@JGgM{1;z;g*;IyQQx+NxzsH(G
zn|OHb^RzTH5(Gg__~<Cn0i%bnIyT!@BJ{icChds`StmzlUl-q9{S79L$>aJ^4zGP^
z<!!uU+0AS`-pq!>_aow?b(Zx<*72JyKj3W(Kgfi}4i5AmWXp-I47s~#uWRSgU5_)X
zZ3Y*#pHF?J9)S96fh%S#F<N$Ay1P!Iqe!fVj{+cJ2qeI(TJVv?`+Gium`KRlS$?+q
zn>h9$ErlEd<$$S~F}(KTOWAyEcL=kbMH6r4w_ATi%Blm&^PN@SX3qGf%$qo$i^pEb
z?ADq1Ixx=I*0r6-_B=t_PIG?yY?hz9jEl!zL_U>^<{`oJg9LaXDGgXuiBiC5_U(x_
zD&q+#gif>Wz+)U8SkL%|9Q9df%vvF6h4=mBkGbsAZ(>L1KHf6#<Fw?a&@)t|>?%%{
zD*W?f|IWewL*WqEOwlVD!1LN>@fTPADeqeNb|yAX;DH?v^M;?im5)DgKap^t^C(IZ
z;Z0jhtmFZZ{L&)Of@pINWjXW=?&DDRleE@3)MWz-X-z)Vl;e}K1F|V)^0%eZykp@#
z3|9!@Jp!HK*}bdz&dWdH*w8UvKD;V);xS%4_%bNrvdJs>o2&kUZ{7Y?-oN-g<{02e
zUnh@je2z>ilMHWA{;P996?}CBxPFm?T@NuP7Z{)+7X<LN!VMsw7RsJNOJH=~#Ko+b
zaxK5!_yD$*rH~rKSDybdb0%KQ)w7rL=+4La^|s%UOXZl^I)i1C7Bgqu#oV*vBSgaU
z+t;x3*nU#BW7ZNi;3Iw+y#wMmG%E2oIXZ}Uc-^4FHM2g*w5DlhUoQ~Q67TD4F&i#S
zXc~v5Y<f%G+&S+~=1p2)3Y*4EBV)47OldxsoSoyUX)Dbn`1HPKd3?`Pd~f{^Y05V8
zzQyn6mh)c&!1@E*@pOQKTJZ7MsI?eMh<;E>@9Hp+Vn74ZPL5fv3#d!go%wO1O>P&A
zFs^Q_0UB4|ZYH~<gU8rC&_&0XR=SHlq^uN6&RJwMyv8G8Hu%w|pWs+FfLTp$3wwWj
z-MB<}L8`$=I|Nh$yu@>WKp>hinWh@>f*<&1onQ2dA#@WJzhWxBx=ev{8YY^Ye{86e
z9o;)<NH_As^*?4`-+pGc%?vZfd@c$z!&~RQk=M<+6I)pTJiX^7x=Vdb48M;^O?ZSz
zM>zzlMtss++9(Zzh|p2!sNqIM%1&WhHfcL$dho!|ar(<AjT0KPjizj#P(R+Nh_HO}
zGDN|1`=95hn|@AnzBzQn0^V@R-E@Ta0AcO$2=k_#4<(fdFL4x%J_`uEB0M5!ZPZk5
z?fEvUMT<VYt))<8ovf+s&TX1xKs@c4%J0|Pf5&e^Jy||!=7V`1m+;}G@8>^m{1@K6
z=pE)eUt9AndWyXO?C(9yy5pOf-7y7U>qK}YhB$-PihyWvD^&v?!~kLnmgZcuS^b?!
zeDNu{Wdf}klWR1989T!{jT4#JFoCXOH`}{*&^dg<<o~a(`X)``ee);G<HGjyx$C0a
zx$T0R+0(n1sm)UXcy!0J4A4t1mqtVq;RWJ*PHXZI81;`6L<1-~^5bj%$SUXLP^f4L
z>lqO9ZXlhfE#E?0p_TSR8-mbR>Z2*!z?vg#`Q7#hDWnTrH0}acPQ8MK6X&B)0Q_*>
zFQMQWFdz}$v|8{zKia>L(U!srl>iTzC9I=ttmJaSgg!tZ0h7l}GR~+374rrt>u1PD
zP6{K5cZOBp&BbnZ_3Sp2=3r%ro>C94?~-vcX4m=7g*VaO-hg)^OAz=-5`3tYifgVr
zDI2Xv;Q*=rw;Dd0_!{%|{KId)!4F@2#5f~aFpx?`3XxNE)%$xz%5rdQ2NiuZ!q>e=
zO{-8Qd)U})I=Yj~rp`y?%<%dYeA%VqdW;|6y2-KaUTj8)^8KKCEzmqLP}=2rUNcIa
z86M1~Ql&!A@W~i{l&`2qyOR^!YUDGcXDDDyp@Cc~8}CbCLf*i8o^PDp*VldYlmGEg
z*Yx%EZMAK?Is&9-3RE@VLC_j<nJkmCIgsi<y!v}pAzEci3>gDsYy=gxGQ#<u=TTpm
zr%=dI3GGV7!*x9aoXw^2eV>#4L+n3r;Kcp+efZ`rn>TIc4B|-5A)so)$D5)7IzCK%
zMLqhSPhQn26vM;AI1aS5j;CC9aYOjwVwoV&)Ys=t1ax<wWb>A-U4QxK_ujg9&#qPf
z|EocfTJW*`zX~6B|B)kyaBPL=1q=)p85}n7G&JO~ZAIsa9=3$=fAtpz{&^C_s#PGI
zo$w%{>F@71;XX86HmbFO$Ff5B&QtK)y8beR-?Mwyb0kPY8axZ(M{I8i<%(yv@Bb_C
z$wS~QgBRke4lofA{1@Q?EXT14m1;TL;3N7G`MSRTzXlIrJ@nASY~H-ZIKi?MB4;PO
zF!KM;Wz*R9e+?eMy5WZFnKy4PpZLTlP)Zp`AZH&uA`q9i1VKROiQfMbJb(qJsNkM^
z?&00<ez&nL+dk{yqt=Xjt%YK-LRj039)2{F;MczPHLkz@dhvZ<Tb6a!!Rt_mhl^yh
zS-QG=y8iS}K6-luud0<%iW9XeQhEOQ=T9C!ba3OW*%z!F92`Pb|7116Hf;=yP<>xD
zSR_*0A#v%g@m$}`{vx{XFaG?#_k=~xI$$hD(165kWE&-j?Ge`{0>_G+kp`GQfBuD^
z_~d8)<D7|;F7|vcx)~)>y)s0_HpEShp05UG6k|SeoaYAwexP>k+J5+7{`v1dzjf=@
zH9)osI*5Vs0WZ=DPzEZIdeL<qI{;FV19E`MWHR~sy1EWQ(tsmi6DfkFzycHsD<K3;
z8{4Y-T<o>@cB#G)dqc_4(BNRD;(CA+!;jFQ+5r)KDbfnyM(1_>hk|7^2DRez(Q&m#
zuvIoyb`595Z8dblISuh}JwvEV4QE6Si6bN)0<}d|A16bgM)i!*i6kEzk!0tM>KXh$
XMC)c5GEFf!00000NkvXXu0mjfP=s4o

literal 6476
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

diff --git a/www/img/files/text-64.png b/www/img/files/text-64.png
index f8ff43d38cac6f335534a63cb82a4dbd908e1bbd..7b397cea5abac6b8885b260057958e84e714307f 100644
GIT binary patch
literal 3692
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
KMNUMnLSTXt^*Fi!

literal 4820
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

diff --git a/www/img/files/tiff-64.png b/www/img/files/tiff-64.png
index 3df7bed2150931de10cf411ea70887a54ba51640..c11a85e28b7daad21656e3bfc25707816db5d998 100644
GIT binary patch
literal 4684
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
O0000<MNUMnLSTZb>mASl

literal 5798
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

diff --git a/www/img/files/unknown-64.png b/www/img/files/unknown-64.png
index 48066a89923c6b2f271c436f1b07c7c7fac77d3b..7f703bb834a1ce3c26bfd722fbe515c9d8e562f1 100644
GIT binary patch
delta 2138
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
QF#rGn07*qoM6N<$g6T*w7XSbN

literal 3161
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

diff --git a/www/img/files/video-64.png b/www/img/files/video-64.png
index f03af8c10b88be9cbf326399b8c530ebb4ec1a60..570c4b2b319ff8aae875897308c42d1bb69d0984 100644
GIT binary patch
literal 4211
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
JPDHLkV1igq4wwJ{

literal 5415
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
XTt+%9Xt2lcUzbMuC}f4MbM*fJs!rgu

diff --git a/www/img/files/wav-64.png b/www/img/files/wav-64.png
index 57754ba3cc2863d45369b685a3f9e03221da24c3..819781a9b564c188089b5796a99b661a94cd07da 100644
GIT binary patch
literal 5410
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
M07*qoM6N<$g78l@)Bpeg

literal 6644
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
Mp`xQ)sc0SgKV(!!&Hw-a

diff --git a/www/img/files/wmv-64.png b/www/img/files/wmv-64.png
index f03af8c10b88be9cbf326399b8c530ebb4ec1a60..570c4b2b319ff8aae875897308c42d1bb69d0984 100644
GIT binary patch
literal 4211
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
JPDHLkV1igq4wwJ{

literal 5415
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
XTt+%9Xt2lcUzbMuC}f4MbM*fJs!rgu

diff --git a/www/img/files/writer-64.png b/www/img/files/writer-64.png
index 248d5cb122b91e29b65583708cf8d5b34036e881..6285b6ffafd8b1c30b20ec68df6aaaaac378d21d 100644
GIT binary patch
delta 2830
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

literal 3995
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
aet_-!diDY)V(!Pk%N8a!h<YQx)PDm}<^8?@


From f1dff33a3db7220e3c5d4ae2f753e9064e3f8559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 6 Mar 2017 12:58:56 +0100
Subject: [PATCH 034/218] MOBILE-2022 file: Add more recognizable icons

---
 www/core/assets/mimetypes.json | 78 +++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/www/core/assets/mimetypes.json b/www/core/assets/mimetypes.json
index d230b77fb53..060a6500420 100644
--- a/www/core/assets/mimetypes.json
+++ b/www/core/assets/mimetypes.json
@@ -6,7 +6,7 @@
 "3ds": {"type":"image/x-3ds"},
 "3g2": {"type":"video/3gpp2"},
 "3gp": {"type":"video/quicktime","icon":"quicktime","string":"video","groups":["video"]},
-"7z": {"type":"application/x-7z-compressed"},
+"7z": {"type":"application/x-7z-compressed","icon":"archive"},
 "a": {"type":"application/octet-stream"},
 "aab": {"type":"application/x-authorware-bin"},
 "aac": {"type":"audio/aac","icon":"audio","string":"audio","groups":["audio"]},
@@ -16,8 +16,8 @@
 "abw": {"type":"application/x-abiword"},
 "ac": {"type":"application/pkix-attr-cert"},
 "acc": {"type":"application/vnd.americandynamics.acc"},
-"accdb": {"type":"application/msaccess","icon":"base"},
-"ace": {"type":"application/x-ace-compressed"},
+"accdb": {"type":"application/msaccess","icon":"database"},
+"ace": {"type":"application/x-ace-compressed","icon":"archive"},
 "acgi": {"type":"text/html"},
 "acu": {"type":"application/vnd.acucobol"},
 "acutc": {"type":"application/vnd.acucorp"},
@@ -61,17 +61,17 @@
 "aspx": {"type":"text/plain"},
 "asx": {"type":"video/x-ms-asf"},
 "atc": {"type":"application/vnd.acucorp"},
-"atom": {"type":"application/atom+xml"},
-"atomcat": {"type":"application/atomcat+xml"},
-"atomsvc": {"type":"application/atomsvc+xml"},
+"atom": {"type":"application/atom+xml","icon":"markup"},
+"atomcat": {"type":"application/atomcat+xml","icon":"markup"},
+"atomsvc": {"type":"application/atomsvc+xml","icon":"markup"},
 "atx": {"type":"application/vnd.antix.game-component"},
 "au": {"type":"audio/au","icon":"audio","string":"audio","groups":["audio"]},
 "avi": {"type":"video/x-ms-wm","icon":"avi","string":"video","groups":["video","web_video"]},
 "avs": {"type":"video/avs-video"},
 "aw": {"type":"application/applixware"},
 "axd": {"type":"text/plain"},
-"azf": {"type":"application/vnd.airzip.filesecure.azf"},
-"azs": {"type":"application/vnd.airzip.filesecure.azs"},
+"azf": {"type":"application/vnd.airzip.filesecure.azf","icon":"archive"},
+"azs": {"type":"application/vnd.airzip.filesecure.azs","icon":"archive"},
 "azw": {"type":"application/vnd.amazon.ebook"},
 "bat": {"type":"application/x-msdownload"},
 "bcpio": {"type":"application/x-bcpio"},
@@ -88,12 +88,12 @@
 "boo": {"type":"application/book"},
 "book": {"type":"application/vnd.framemaker"},
 "box": {"type":"application/vnd.previewsystems.box"},
-"boz": {"type":"application/x-bzip2"},
+"boz": {"type":"application/x-bzip2","icon":"archive"},
 "bpk": {"type":"application/octet-stream"},
 "bsh": {"type":"application/x-bsh"},
 "btif": {"type":"image/prs.btif"},
-"bz": {"type":"application/x-bzip"},
-"bz2": {"type":"application/x-bzip2"},
+"bz": {"type":"application/x-bzip","icon":"archive"},
+"bz2": {"type":"application/x-bzip2","icon":"archive"},
 "c": {"type":"text/plain","icon":"sourcecode"},
 "c++": {"type":"text/plain"},
 "c11amc": {"type":"application/vnd.cluetrust.cartomobile-config"},
@@ -103,7 +103,7 @@
 "c4g": {"type":"application/vnd.clonk.c4group"},
 "c4p": {"type":"application/vnd.clonk.c4group"},
 "c4u": {"type":"application/vnd.clonk.c4group"},
-"cab": {"type":"application/vnd.ms-cab-compressed"},
+"cab": {"type":"application/vnd.ms-cab-compressed","icon":"archive"},
 "caf": {"type":"audio/x-caf"},
 "cap": {"type":"application/vnd.tcpdump.pcap"},
 "car": {"type":"application/vnd.curl.car"},
@@ -137,7 +137,7 @@
 "cha": {"type":"application/x-chat"},
 "chat": {"type":"application/x-chat"},
 "chm": {"type":"application/vnd.ms-htmlhelp"},
-"chrt": {"type":"application/vnd.kde.kchart"},
+"chrt": {"type":"application/vnd.kde.kchart","icon":"chart"},
 "cif": {"type":"chemical/x-cif"},
 "cii": {"type":"application/vnd.anser-web-certificate-issue-initiation"},
 "cil": {"type":"application/vnd.ms-artgalry"},
@@ -328,7 +328,7 @@
 "gl": {"type":"video/gl"},
 "gml": {"type":"application/gml+xml"},
 "gmx": {"type":"application/vnd.gmx"},
-"gnumeric": {"type":"application/x-gnumeric"},
+"gnumeric": {"type":"application/x-gnumeric","icon":"calc"},
 "gph": {"type":"application/vnd.flographit"},
 "gpx": {"type":"application/gpx+xml"},
 "gqf": {"type":"application/vnd.grafeq"},
@@ -502,7 +502,7 @@
 "ltx": {"type":"application/x-latex"},
 "lvp": {"type":"audio/vnd.lucent.voice"},
 "lwp": {"type":"application/vnd.lotus-wordpro"},
-"lz": {"type":"application/x-lzip"},
+"lz": {"type":"application/x-lzip","icon":"archive"},
 "lzh": {"type":"application/x-lzh-compressed"},
 "lzma": {"type":"application/x-lzma"},
 "lzo": {"type":"application/x-lzop"},
@@ -520,15 +520,15 @@
 "m4a": {"type":"audio/mp4","icon":"mp3","string":"audio","groups":["audio"]},
 "m4u": {"type":"video/vnd.mpegurl"},
 "m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
-"ma": {"type":"application/mathematica"},
+"ma": {"type":"application/mathematica","string":"math"},
 "mads": {"type":"application/mads+xml"},
 "mag": {"type":"application/vnd.ecowin.chart"},
 "maker": {"type":"application/vnd.framemaker"},
 "man": {"type":"text/troff"},
 "map": {"type":"application/x-navimap"},
 "mar": {"type":"application/octet-stream"},
-"mathml": {"type":"application/mathml+xml"},
-"mb": {"type":"application/mathematica"},
+"mathml": {"type":"application/mathml+xml","string":"math"},
+"mb": {"type":"application/mathematica","string":"math"},
 "mbd": {"type":"application/mbedlet"},
 "mbk": {"type":"application/vnd.mobius.mbk"},
 "mbox": {"type":"application/mbox"},
@@ -539,7 +539,7 @@
 "mcf": {"type":"image/vasa"},
 "mcp": {"type":"application/netmc"},
 "mcurl": {"type":"text/vnd.curl.mcurl"},
-"mdb": {"type":"application/x-msaccess","icon":"base"},
+"mdb": {"type":"application/x-msaccess","icon":"database"},
 "mdi": {"type":"image/vnd.ms-modi"},
 "me": {"type":"text/troff"},
 "mesh": {"type":"model/mesh"},
@@ -631,7 +631,7 @@
 "n3": {"type":"text/n3"},
 "nap": {"type":"image/naplps"},
 "naplps": {"type":"image/naplps"},
-"nb": {"type":"application/mathematica"},
+"nb": {"type":"application/mathematica","string":"math"},
 "nbp": {"type":"application/vnd.wolfram.player"},
 "nc": {"type":"application/x-netcdf"},
 "ncm": {"type":"application/vnd.nokia.configuration-message"},
@@ -663,7 +663,7 @@
 "odb": {"type":"application/vnd.oasis.opendocument.database","icon":"base"},
 "odc": {"type":"application/vnd.oasis.opendocument.chart","icon":"chart"},
 "odf": {"type":"application/vnd.oasis.opendocument.formula","icon":"math"},
-"odft": {"type":"application/vnd.oasis.opendocument.formula-template"},
+"odft": {"type":"application/vnd.oasis.opendocument.formula-template","icon":"math"},
 "odg": {"type":"application/vnd.oasis.opendocument.graphics","icon":"draw"},
 "odi": {"type":"application/vnd.oasis.opendocument.image","icon":"draw"},
 "odm": {"type":"application/vnd.oasis.opendocument.text-master","icon":"writer"},
@@ -688,7 +688,7 @@
 "org": {"type":"application/vnd.lotus-organizer"},
 "osf": {"type":"application/vnd.yamaha.openscoreformat"},
 "osfpvg": {"type":"application/vnd.yamaha.openscoreformat.osfpvg+xml"},
-"otc": {"type":"application/vnd.oasis.opendocument.chart-template"},
+"otc": {"type":"application/vnd.oasis.opendocument.chart-template","icon":"chart"},
 "otf": {"type":"application/x-font-otf"},
 "otg": {"type":"application/vnd.oasis.opendocument.graphics-template","icon":"draw"},
 "oth": {"type":"application/vnd.oasis.opendocument.text-web","icon":"oth","groups":["document"]},
@@ -755,11 +755,11 @@
 "png": {"type":"image/png","icon":"png","string":"image","groups":["image","web_image"]},
 "pnm": {"type":"image/x-portable-anymap"},
 "portpkg": {"type":"application/vnd.macports.portpkg"},
-"pot": {"type":"application/vnd.ms-powerpoint"},
+"pot": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"},
 "potm": {"type":"application/vnd.ms-powerpoint.template.macroenabled.12","icon":"powerpoint"},
 "potx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.template","icon":"powerpoint"},
 "pov": {"type":"model/x-pov"},
-"ppa": {"type":"application/vnd.ms-powerpoint"},
+"ppa": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"},
 "ppam": {"type":"application/vnd.ms-powerpoint.addin.macroenabled.12","icon":"powerpoint"},
 "ppd": {"type":"application/vnd.cups-ppd"},
 "ppm": {"type":"image/x-portable-pixmap"},
@@ -777,15 +777,15 @@
 "prt": {"type":"application/pro_eng"},
 "ps": {"type":"application/postscript","icon":"pdf"},
 "psb": {"type":"application/vnd.3gpp.pic-bw-small"},
-"psd": {"type":"image/vnd.adobe.photoshop"},
+"psd": {"type":"image/vnd.adobe.photoshop","icon":"psd"},
 "psf": {"type":"application/x-font-linux-psf"},
 "pskcxml": {"type":"application/pskc+xml"},
 "ptid": {"type":"application/vnd.pvi.ptid1"},
-"pub": {"type":"application/x-mspublisher"},
+"pub": {"type":"application/x-mspublisher","icon":"publisher"},
 "pvb": {"type":"application/vnd.3gpp.pic-bw-var"},
 "pvu": {"type":"paleovu/x-pv"},
 "pwn": {"type":"application/vnd.3m.post-it-notes"},
-"pwz": {"type":"application/vnd.ms-powerpoint"},
+"pwz": {"type":"application/vnd.ms-powerpoint","icon":"powerpoint"},
 "py": {"type":"text/x-script.phyton"},
 "pya": {"type":"audio/vnd.ms-playready.media.pya"},
 "pyc": {"type":"application/x-bytecode.python"},
@@ -869,15 +869,15 @@
 "scs": {"type":"application/scvp-cv-response"},
 "scss": {"type":"text/x-scss"},
 "scurl": {"type":"text/vnd.curl.scurl"},
-"sda": {"type":"application/vnd.stardivision.draw"},
-"sdc": {"type":"application/vnd.stardivision.calc"},
-"sdd": {"type":"application/vnd.stardivision.impress"},
+"sda": {"type":"application/vnd.stardivision.draw","icon":"draw"},
+"sdc": {"type":"application/vnd.stardivision.calc","icon":"calc"},
+"sdd": {"type":"application/vnd.stardivision.impress","icon":"impress"},
 "sdkd": {"type":"application/vnd.solent.sdkm+xml"},
 "sdkm": {"type":"application/vnd.solent.sdkm+xml"},
 "sdml": {"type":"text/plain"},
 "sdp": {"type":"application/sdp"},
 "sdr": {"type":"application/sounder"},
-"sdw": {"type":"application/vnd.stardivision.writer"},
+"sdw": {"type":"application/vnd.stardivision.writer","icon":"writer"},
 "sea": {"type":"application/sea"},
 "see": {"type":"application/vnd.seemail"},
 "seed": {"type":"application/vnd.fdsn.seed"},
@@ -912,11 +912,11 @@
 "skp": {"type":"application/vnd.koan"},
 "skt": {"type":"application/vnd.koan"},
 "sl": {"type":"application/x-seelogo"},
-"sldm": {"type":"application/vnd.ms-powerpoint.slide.macroenabled.12"},
+"sldm": {"type":"application/vnd.ms-powerpoint.slide.macroenabled.12","icon":"powerpoint"},
 "sldx": {"type":"application/vnd.openxmlformats-officedocument.presentationml.slide"},
 "slt": {"type":"application/vnd.epson.salt"},
 "sm": {"type":"application/vnd.stepmania.stepchart"},
-"smf": {"type":"application/vnd.stardivision.math"},
+"smf": {"type":"application/vnd.stardivision.math","icon":"math"},
 "smi": {"type":"application/smil","icon":"text"},
 "smil": {"type":"application/smil","icon":"text"},
 "smv": {"type":"video/x-smv"},
@@ -1086,7 +1086,7 @@
 "vmf": {"type":"application/vocaltec-media-file"},
 "vob": {"type":"video/x-ms-vob"},
 "voc": {"type":"audio/voc"},
-"vor": {"type":"application/vnd.stardivision.writer"},
+"vor": {"type":"application/vnd.stardivision.writer","icon":"writer"},
 "vos": {"type":"video/vosaic"},
 "vox": {"type":"audio/voxware"},
 "vqe": {"type":"audio/x-twinvq-plugin"},
@@ -1186,24 +1186,24 @@
 "xhvml": {"type":"application/xv+xml"},
 "xif": {"type":"image/vnd.xiff"},
 "xl": {"type":"application/excel"},
-"xla": {"type":"application/vnd.ms-excel"},
+"xla": {"type":"application/vnd.ms-excel","icon":"spreadsheet"},
 "xlam": {"type":"application/vnd.ms-excel.addin.macroenabled.12","icon":"spreadsheet"},
 "xlb": {"type":"application/excel"},
-"xlc": {"type":"application/vnd.ms-excel"},
+"xlc": {"type":"application/vnd.ms-excel","icon":"spreadsheet"},
 "xld": {"type":"application/excel"},
 "xlf": {"type":"application/x-xliff+xml"},
 "xlk": {"type":"application/excel"},
 "xll": {"type":"application/excel"},
-"xlm": {"type":"application/vnd.ms-excel"},
+"xlm": {"type":"application/vnd.ms-excel","icon":"spreadsheet"},
 "xls": {"type":"application/vnd.ms-excel","icon":"spreadsheet","groups":["spreadsheet"]},
 "xlsb": {"type":"application/vnd.ms-excel.sheet.binary.macroenabled.12","icon":"spreadsheet"},
 "xlsm": {"type":"application/vnd.ms-excel.sheet.macroenabled.12","icon":"spreadsheet","groups":["spreadsheet"]},
 "xlsx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","icon":"spreadsheet"},
-"xlt": {"type":"application/vnd.ms-excel"},
+"xlt": {"type":"application/vnd.ms-excel","icon":"spreadsheet"},
 "xltm": {"type":"application/vnd.ms-excel.template.macroenabled.12","icon":"spreadsheet"},
 "xltx": {"type":"application/vnd.openxmlformats-officedocument.spreadsheetml.template","icon":"spreadsheet"},
 "xlv": {"type":"application/excel"},
-"xlw": {"type":"application/vnd.ms-excel"},
+"xlw": {"type":"application/vnd.ms-excel","icon":"spreadsheet"},
 "xm": {"type":"audio/xm"},
 "xml": {"type":"application/xml","icon":"markup"},
 "xmz": {"type":"xgl/movie"},

From 52b5485dd35ccbc9ea6b02b06cae1f34f4ac1c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 6 Mar 2017 11:49:50 +0100
Subject: [PATCH 035/218] MOBILE-1954 forum: Check forum istracked to treat
 unread posts

---
 .../mod/forum/controllers/discussion.js       | 25 +++++++++++++------
 .../mod/forum/controllers/discussions.js      | 14 +++++++++++
 .../mod/forum/templates/discussions.html      |  2 +-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/www/addons/mod/forum/controllers/discussion.js b/www/addons/mod/forum/controllers/discussion.js
index 1f2fdc034e3..43287d1a84c 100644
--- a/www/addons/mod/forum/controllers/discussion.js
+++ b/www/addons/mod/forum/controllers/discussion.js
@@ -77,10 +77,11 @@ angular.module('mm.addons.mod_forum')
     }
 
     // Convenience function to get forum discussions.
-    function fetchPosts(sync, showErrors) {
+    function fetchPosts(sync, showErrors, forceMarkAsRead) {
         var syncPromise,
             onlinePosts = [],
-            offlineReplies = [];
+            offlineReplies = [],
+            hasUnreadPosts = false;
 
         $scope.isOnline = $mmApp.isOnline();
         $scope.isTablet = $ionicPlatform.isTablet();
@@ -104,10 +105,11 @@ angular.module('mm.addons.mod_forum')
 
                     var convertPromises = [];
 
-                    // Index posts to allow quick access.
+                    // Index posts to allow quick access. Also check unread field.
                     var posts = {};
                     angular.forEach(onlinePosts, function(post) {
-                        posts[post.id] = post;
+                        posts[post.id] = post
+                        hasUnreadPosts = hasUnreadPosts || !post.postread;
                     });
 
                     angular.forEach(replies, function(offlineReply) {
@@ -158,6 +160,11 @@ angular.module('mm.addons.mod_forum')
                     $scope.discussion.userfullname = null;
                 }
 
+                // forum.istracked is more reliable than $stateParams.trackposts.
+                if (typeof forum.istracked != "undefined") {
+                    $scope.trackPosts = forum.istracked;
+                }
+
                 forumId = forum.id;
                 cmid = forum.cmid;
                 $scope.componentId = cmid;
@@ -172,6 +179,11 @@ angular.module('mm.addons.mod_forum')
             $scope.discussionLoaded = true;
             $scope.refreshPostsIcon = 'ion-refresh';
             $scope.syncIcon = 'ion-loop';
+
+            if (forceMarkAsRead || (hasUnreadPosts && $scope.trackPosts)) {
+                // // Add log in Moodle and mark unread posts as readed.
+                $mmaModForum.logDiscussionView(discussionId);
+            }
         });
     }
 
@@ -234,10 +246,7 @@ angular.module('mm.addons.mod_forum')
         $mmEvents.trigger(mmaModForumReplyDiscussionEvent, data);
     }
 
-    fetchPosts(true).then(function() {
-        // Add log in Moodle.
-        $mmaModForum.logDiscussionView(discussionId);
-    });
+    fetchPosts(true, false, true);
 
     // Pull to refresh.
     $scope.refreshPosts = function(showErrors) {
diff --git a/www/addons/mod/forum/controllers/discussions.js b/www/addons/mod/forum/controllers/discussions.js
index 0615ff28257..739eae4cc20 100644
--- a/www/addons/mod/forum/controllers/discussions.js
+++ b/www/addons/mod/forum/controllers/discussions.js
@@ -45,6 +45,7 @@ angular.module('mm.addons.mod_forum')
     $scope.syncIcon = 'spinner';
     $scope.component = mmaModForumComponent;
     $scope.componentId = module.id;
+    $scope.trackPosts = false;
 
     // Convenience function to get forum data and discussions.
     function fetchForumDataAndDiscussions(refresh, sync, showErrors) {
@@ -55,6 +56,9 @@ angular.module('mm.addons.mod_forum')
             $scope.title = forum.name || $scope.title;
             $scope.description = forum.intro || $scope.description;
             $scope.forum = forum;
+            if (typeof forum.istracked != "undefined") {
+                $scope.trackPosts = forum.istracked;
+            }
 
             // In tablet, load first discussion skipping "Add new discussion" button.
             if (!$scope.linkToLoad) {
@@ -150,6 +154,16 @@ angular.module('mm.addons.mod_forum')
                     }
                 }
 
+                if (typeof forum.istracked == "undefined" && !$scope.trackPosts) {
+                    // If any discussion has unread posts, the whole forum is being tracked.
+                    for (var y in discussions) {
+                        if (discussions[y].numunread > 0) {
+                            $scope.trackPosts = true;
+                            break;
+                        }
+                    }
+                }
+
                 if (page == 0) {
                     $scope.discussions = discussions;
                 } else {
diff --git a/www/addons/mod/forum/templates/discussions.html b/www/addons/mod/forum/templates/discussions.html
index 869f03ec5dc..905e1237349 100644
--- a/www/addons/mod/forum/templates/discussions.html
+++ b/www/addons/mod/forum/templates/discussions.html
@@ -51,7 +51,7 @@ <h2><summary>{{discussion.subject}}</summary></h2>
                         </a>
                     </li>
                     <li class="card" ng-repeat="discussion in discussions track by $index">
-                        <a class="mma-forum-discussion-link" mm-split-view-link="site.mod_forum-discussion({cid: courseid, discussionid: discussion.discussion, forumid: forum.id, cmid: forum.cmid, trackposts: discussion.numunread > 0,locked: discussion.locked && !discussion.canreply})">
+                        <a class="mma-forum-discussion-link" mm-split-view-link="site.mod_forum-discussion({cid: courseid, discussionid: discussion.discussion, forumid: forum.id, cmid: forum.cmid, trackposts: trackPosts, locked: discussion.locked && !discussion.canreply})">
                             <article>
                                 <div class="item item-text-wrap item-heading clearfix" ng-class="{'item-avatar': discussion.userfullname}">
                                     <img ng-if="discussion.userpictureurl && discussion.userfullname" ng-src="{{discussion.userpictureurl}}" mm-external-content mm-split-view-link="{{userStateName}}({courseid: courseid, userid: discussion.userid})" alt="{{ 'mm.core.pictureof' | translate:{$a: discussion.userfullname} }}" role="presentation">

From 57c20568a8a6bdfa233f919e8a2f65620c9850c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 17 Feb 2017 10:12:47 +0100
Subject: [PATCH 036/218] MOBILE-2002 feedback: Add feedback basic structure

---
 www/addons/mod/feedback/controllers/index.js  | 192 +++++++++++
 www/addons/mod/feedback/lang/en.json          |  19 ++
 www/addons/mod/feedback/main.js               |  43 +++
 www/addons/mod/feedback/services/feedback.js  | 319 ++++++++++++++++++
 www/addons/mod/feedback/services/handlers.js  | 159 +++++++++
 .../mod/feedback/services/prefetch_handler.js | 221 ++++++++++++
 www/addons/mod/feedback/templates/index.html  |  81 +++++
 www/core/lang/en.json                         |   2 +
 www/core/lib/util.js                          |  24 ++
 9 files changed, 1060 insertions(+)
 create mode 100644 www/addons/mod/feedback/controllers/index.js
 create mode 100644 www/addons/mod/feedback/lang/en.json
 create mode 100644 www/addons/mod/feedback/main.js
 create mode 100644 www/addons/mod/feedback/services/feedback.js
 create mode 100644 www/addons/mod/feedback/services/handlers.js
 create mode 100644 www/addons/mod/feedback/services/prefetch_handler.js
 create mode 100644 www/addons/mod/feedback/templates/index.html

diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
new file mode 100644
index 00000000000..8ebabd8145e
--- /dev/null
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -0,0 +1,192 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback index controller.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc controller
+ * @name mmaModFeedbackIndexCtrl
+ */
+.controller('mmaModFeedbackIndexCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $mmCourseHelper, $q, $mmCourse,
+            $mmText, mmaModFeedbackComponent, $mmEvents, $ionicScrollDelegate, $mmApp, $translate, $mmGroups, $mmSite,
+            mmCoreEventOnlineStatusChanged) {
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        feedback,
+        scrollView,
+        onlineObserver;
+
+    $scope.title = module.name;
+    $scope.description = module.description;
+    $scope.moduleUrl = module.url;
+    $scope.moduleName = $mmCourse.translateModuleName('feedback');
+    $scope.courseId = courseId;
+    $scope.refreshIcon = 'spinner';
+    $scope.syncIcon = 'spinner';
+    $scope.component = mmaModFeedbackComponent;
+    $scope.componentId = module.id;
+    $scope.selectedGroup = 0;
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackData(refresh, sync, showErrors) {
+        $scope.isOnline = $mmApp.isOnline();
+        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
+            feedback = feedbackData;
+
+            $scope.title = feedback.name || $scope.title;
+            $scope.description = feedback.intro || $scope.description;
+
+            $scope.feedback = feedback;
+
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
+        }).then(function(accessData) {
+            $scope.feedback.canSubmit = accessData.cansubmit;
+            $scope.feedback.canComplete = accessData.cancomplete;
+            $scope.feedback.isOpen = accessData.isopen;
+            $scope.feedback.hasQuestions = !accessData.isempty;
+            $scope.feedback.canViewAnalysis = accessData.canviewanalysis;
+            $scope.feedback.isAlreadySubmitted = accessData.isalreadysubmitted;
+            $scope.feedback.isAnonymous = accessData.isanonymous;
+            $scope.capabilities = accessData.capabilities;
+
+            if ($scope.capabilities.edititems) {
+                feedback.timeopen = parseInt(feedback.timeopen) * 1000 || false;
+                feedback.openTimeReadable = feedback.timeopen ? moment(feedback.timeopen).format('LLL') : false;
+                feedback.timeclose = parseInt(feedback.timeclose) * 1000 || false;
+                feedback.closeTimeReadable = feedback.timeclose ? moment(feedback.timeclose).format('LLL') : false;
+
+                // Get groups (only for teachers).
+                return $mmGroups.getActivityGroupMode(feedback.coursemodule).then(function(groupMode) {
+                    if (groupMode === $mmGroups.SEPARATEGROUPS || groupMode === $mmGroups.VISIBLEGROUPS) {
+                        $scope.separateGroups = groupMode === $mmGroups.SEPARATEGROUPS;
+                        $scope.visibleGroups = groupMode === $mmGroups.VISIBLEGROUPS;
+                        return $mmGroups.getActivityAllowedGroups(feedback.coursemodule);
+                    }
+                    return [];
+                }).then(function (groups) {
+                    if (groups.length <= 0) {
+                        $scope.separateGroups = false;
+                        $scope.visibleGroups = false;
+                    } else {
+                        $scope.groups = [
+                            {'id': 0, 'name': $translate.instant('mm.core.allparticipants')}
+                        ];
+                        $scope.groups = $scope.groups.concat(groups);
+                    }
+                    return $scope.setGroup($scope.selectedGroup);
+                });
+            }
+        }).then(function() {
+            // All data obtained, now fill the context menu.
+            $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModFeedbackComponent);
+        }).catch(function(message) {
+            if (!refresh) {
+                // Some call failed, retry without using cache since it might be a new activity.
+                return refreshAllData();
+            }
+
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        }).finally(function(){
+            $scope.feedbackLoaded = true;
+        });
+    }
+
+    // Set group to see the analysis.
+    $scope.setGroup = function(groupId) {
+        $scope.selectedGroup = groupId;
+
+        return $mmaModFeedback.getAnalysis(feedback.id, groupId).then(function(analysis) {
+            $scope.feedback.completedCount = analysis.completedcount;
+            $scope.feedback.itemsCount = analysis.itemscount;
+        });
+    };
+
+    // Convenience function to refresh all the data.
+    function refreshAllData(sync, showErrors) {
+        var promises = [];
+        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
+        if (feedback) {
+            promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
+            promises.push($mmaModFeedback.invalidateAnalysisData(feedback.id));
+            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
+            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+        }
+
+        return $q.all(promises).finally(function() {
+            return fetchFeedbackData(true, sync, showErrors);
+        });
+    }
+
+    fetchFeedbackData(false, true).then(function() {
+        $mmaModFeedback.logView(feedback.id).then(function() {
+            $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
+        });
+    }).finally(function() {
+        $scope.refreshIcon = 'ion-refresh';
+        $scope.syncIcon = 'ion-loop';
+    });
+
+    // Confirm and Remove action.
+    $scope.removeFiles = function() {
+        $mmCourseHelper.confirmAndRemove(module, courseId);
+    };
+
+    // Context Menu Prefetch action.
+    $scope.prefetch = function() {
+        $mmCourseHelper.contextMenuPrefetch($scope, module, courseId);
+    };
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshFeedback = function(showErrors) {
+        if ($scope.feedbackLoaded) {
+            $scope.refreshIcon = 'spinner';
+            $scope.syncIcon = 'spinner';
+            return refreshAllData(true, showErrors).finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.syncIcon = 'ion-loop';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+    // Temporary function to link non implemented features.
+    $scope.openFeatureUrl = function(feature) {
+        var url = $mmSite.getURL() + '/mod/feedback/' + feature + '.php?id=' + feedback.coursemodule;
+        $mmUtil.openInApp(url);
+    };
+
+    function scrollTop() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModFeedbackScroll');
+        }
+        scrollView && scrollView.scrollTop && scrollView.scrollTop();
+    }
+
+    // Refresh online status when changes.
+    onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
+        $scope.isOnline = online;
+    });
+
+    $scope.$on('$destroy', function() {
+        onlineObserver && onlineObserver.off && onlineObserver.off();
+    });
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
new file mode 100644
index 00000000000..9402749f98e
--- /dev/null
+++ b/www/addons/mod/feedback/lang/en.json
@@ -0,0 +1,19 @@
+{
+    "analysis": "Analysis",
+    "anonymous": "Anonymous",
+    "complete_the_form": "Answer the questions...",
+    "completed_feedbacks": "Submitted answers",
+    "continue_the_form": "Continue the form",
+    "feedback_is_not_open": "The feedback is not open",
+    "feedbackclose": "Allow answers to",
+    "feedbackopen": "Allow answers from",
+    "mapcourses": "Map feedback to courses",
+    "mode": "Mode",
+    "non_anonymous": "User's name will be logged and shown with answers",
+    "overview": "Overview",
+    "preview": "Preview",
+    "questions": "Questions",
+    "show_entries": "Show responses",
+    "show_nonrespondents": "Show non-respondents",
+    "this_feedback_is_already_submitted": "You've already completed this activity."
+}
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
new file mode 100644
index 00000000000..b2a797f38b5
--- /dev/null
+++ b/www/addons/mod/feedback/main.js
@@ -0,0 +1,43 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback', [])
+
+.constant('mmaModFeedbackComponent', 'mmaModFeedback')
+
+.config(function($stateProvider) {
+
+    $stateProvider
+
+    .state('site.mod_feedback', {
+        url: '/mod_feedback',
+        params: {
+            module: null,
+            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            courseid: null
+        },
+        views: {
+            'site': {
+                controller: 'mmaModFeedbackIndexCtrl',
+                templateUrl: 'addons/mod/feedback/templates/index.html'
+            }
+        }
+    });
+})
+
+.config(function($mmCourseDelegateProvider, $mmContentLinksDelegateProvider, $mmCoursePrefetchDelegateProvider) {
+    $mmCourseDelegateProvider.registerContentHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackHandlers.courseContent');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:index', '$mmaModFeedbackHandlers.indexLinksHandler');
+    $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackPrefetchHandler');
+});
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
new file mode 100644
index 00000000000..06baf1d040f
--- /dev/null
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -0,0 +1,319 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback service.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc service
+ * @name $mmaModFeedback
+ */
+.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil) {
+    var self = {};
+
+    /**
+     * Get cache key for feedback data WS calls.
+     *
+     * @param {Number} courseId Course ID.
+     * @return {String}         Cache key.
+     */
+    function getFeedbackDataCacheKey(courseId) {
+        return 'mmaModFeedback:feedback:' + courseId;
+    }
+
+    /**
+     * Get cache key for feedback access information data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getFeedbackAccessInformationDataCacheKey(feedbackId) {
+        return 'mmaModFeedback:access:' + feedbackId;
+    }
+
+    /**
+     * Get prefix cache key for feedback analysis data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getAnalysisDataPrefixCacheKey(feedbackId) {
+        return 'mmaModFeedback:analysis:' + feedbackId;
+    }
+
+    /**
+     * Get cache key for feedback analysis data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @param {Number} [groupId]  Group ID.
+     * @return {String}         Cache key.
+     */
+    function getAnalysisDataCacheKey(feedbackId, groupId) {
+        groupId = groupId || 0;
+        return getAnalysisDataPrefixCacheKey(feedbackId) + ":" + groupId;
+    }
+
+
+    /**
+     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#isPluginEnabled
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     */
+    self.isPluginEnabled = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return  site.wsAvailable('mod_feedback_get_feedbacks_by_courses') &&
+                    site.wsAvailable('mod_feedback_get_access_information');
+        });
+    };
+
+    /**
+     * Get a feedback with key=value. If more than one is found, only the first will be returned.
+     *
+     * @param  {Number}     courseId        Course ID.
+     * @param  {String}     key             Name of the property to check.
+     * @param  {Mixed}      value           Value to search.
+     * @param  {String}     [siteId]        Site ID. If not defined, current site.
+     * @param  {Boolean}    [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @return {Promise}                    Promise resolved when the feedback is retrieved.
+     */
+    function getFeedback(courseId, key, value, siteId, forceCache) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getFeedbackDataCacheKey(courseId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            }
+
+            return site.read('mod_feedback_get_feedbacks_by_courses', params, preSets).then(function(response) {
+                if (response && response.feedbacks) {
+                    var current;
+                    angular.forEach(response.feedbacks, function(feedback) {
+                        if (!current && feedback[key] == value) {
+                            current = feedback;
+                        }
+                    });
+                    if (current) {
+                        return current;
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a feedback by course module ID.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getFeedback
+     * @param   {Number}    courseId        Course ID.
+     * @param   {Number}    cmId            Course module ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @return  {Promise}                   Promise resolved when the feedback is retrieved.
+     */
+    self.getFeedback = function(courseId, cmId, siteId, forceCache) {
+        return getFeedback(courseId, 'coursemodule', cmId, siteId, forceCache);
+    };
+
+    /**
+     * Get a feedback by ID.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getFeedbackById
+     * @param   {Number}    courseId        Course ID.
+     * @param   {Number}    id              Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @return  {Promise}                   Promise resolved when the feedback is retrieved.
+     */
+    self.getFeedbackById = function(courseId, id, siteId, forceCache) {
+        return getFeedback(courseId, 'id', id, siteId, forceCache);
+    };
+
+    /**
+     * Invalidates feedback data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateFeedbackData
+     * @param {Number} courseId Course ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateFeedbackData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getFeedbackDataCacheKey(courseId));
+        });
+    };
+
+    /**
+     * Get  access information for a given feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getFeedbackAccessInformation
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the feedback is retrieved.
+     */
+    self.getFeedbackAccessInformation = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getFeedbackAccessInformationDataCacheKey(feedbackId)
+                };
+
+            return site.read('mod_feedback_get_access_information', params, preSets).then(function(accessData) {
+                accessData.capabilities = $mmUtil.objectToKeyValueMap(accessData.capabilities, 'name', 'enabled', 'mod/feedback:');
+                return accessData;
+            });
+        });
+    };
+
+    /**
+     * Invalidates feedback access information data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateFeedbackAccessInformationData
+     * @param {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateFeedbackAccessInformationData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getFeedbackAccessInformationDataCacheKey(feedbackId));
+        });
+    };
+
+    /**
+     * Get analysis information for a given feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getAnalysis
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    [groupId]       Group ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the feedback is retrieved.
+     */
+    self.getAnalysis = function(feedbackId, groupId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getAnalysisDataCacheKey(feedbackId, groupId)
+                };
+
+            if (groupId) {
+                params.groupid = groupId;
+            }
+
+            return site.read('mod_feedback_get_analysis', params, preSets);
+        });
+    };
+
+    /**
+     * Invalidates feedback analysis data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateAnalysisData
+     * @param {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateAnalysisData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getAnalysisDataPrefixCacheKey(feedbackId));
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content except files.
+     * To invalidate files, use $mmaModFeedback#invalidateFiles.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateContent
+     * @param {Number} moduleId The module ID.
+     * @param {Number} courseId Course ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+        return self.getFeedback(courseId, moduleId, siteId, true).then(function(feedback) {
+            var ps = [];
+            // Do not invalidate feedback data before getting feedback info, we need it!
+            ps.push(self.invalidateFeedbackData(courseId, siteId));
+            ps.push(self.invalidateFeedbackAccessInformationData(feedback.id, siteId));
+            ps.push(self.invalidateAnalysisData(feedback.id, siteId));
+
+            return $q.all(ps);
+        });
+    };
+
+    /**
+     * Invalidate the prefetched files.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateFiles
+     * @param {Number} moduleId  The module ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the files are invalidated.
+     */
+    self.invalidateFiles = function(moduleId, siteId) {
+        return $mmFilepool.invalidateFilesByComponent(siteId, mmaModFeedbackComponent, moduleId);
+    };
+
+    /**
+     * Report the feedback as being viewed.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#logView
+     * @param {String}  id       Feedback ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}  Promise resolved when the WS call is successful.
+     */
+    self.logView = function(id, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                feedbackid: id
+            };
+            return site.write('mod_feedback_view_feedback', params);
+        });
+    };
+
+    return self;
+});
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
new file mode 100644
index 00000000000..a56ce1cebf2
--- /dev/null
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -0,0 +1,159 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Mod feedback handlers.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc service
+ * @name $mmaModFeedbackHandlers
+ */
+.factory('$mmaModFeedbackHandlers', function($mmCourse, $mmaModFeedback, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
+        mmaModFeedbackComponent, $mmaModFeedbackPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded,
+        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate) {
+    var self = {};
+
+    /**
+     * Course content handler.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#courseContent
+     */
+    self.courseContent = function() {
+
+        var self = {};
+
+        /**
+         * Whether or not the module is enabled for the site.
+         *
+         * @return {Boolean}
+         */
+        self.isEnabled = function() {
+            return $mmaModFeedback.isPluginEnabled();
+        };
+
+        /**
+         * Get the controller.
+         *
+         * @param {Object} module The module info.
+         * @param {Number} courseId The course ID.
+         * @return {Function}
+         */
+        self.getController = function(module, courseId) {
+            return function($scope) {
+                var downloadBtn = {
+                        hidden: true,
+                        icon: 'ion-ios-cloud-download-outline',
+                        label: 'mm.core.download',
+                        action: function(e) {
+                            if (e) {
+                                e.preventDefault();
+                                e.stopPropagation();
+                            }
+                            download();
+                        }
+                    },
+                    refreshBtn = {
+                        hidden: true,
+                        icon: 'ion-android-refresh',
+                        label: 'mm.core.refresh',
+                        action: function(e) {
+                            if (e) {
+                                e.preventDefault();
+                                e.stopPropagation();
+                            }
+                            $mmaModFeedback.invalidateContent(module.id, courseId).finally(function() {
+                                download();
+                            });
+                        }
+                    };
+
+                $scope.title = module.name;
+                $scope.icon = $mmCourse.getModuleIconSrc('feedback');
+                $scope.class = 'mma-mod_feedback-handler';
+                $scope.buttons = [downloadBtn, refreshBtn];
+                $scope.spinner = true; // Show spinner while calculating status.
+
+                $scope.action = function(e) {
+                    if (e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                    $state.go('site.mod_feedback', {module: module, moduleid: module.id, courseid: courseId});
+                };
+
+                function download() {
+
+                    $scope.spinner = true; // Show spinner since this operation might take a while.
+                    // We need to call getDownloadSize, the package might have been updated.
+                    $mmaModFeedbackPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
+                        $mmUtil.confirmDownloadSize(size).then(function() {
+                            $mmaModFeedbackPrefetchHandler.prefetch(module, courseId).catch(function() {
+                                if (!$scope.$$destroyed) {
+                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                }
+                            });
+                        }).catch(function() {
+                            // User hasn't confirmed, stop spinner.
+                            $scope.spinner = false;
+                        });
+                    }).catch(function(error) {
+                        $scope.spinner = false;
+                        $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                    });
+                }
+
+                // Show buttons according to module status.
+                function showStatus(status) {
+                    if (status) {
+                        $scope.spinner = status === mmCoreDownloading;
+                        downloadBtn.hidden = status !== mmCoreNotDownloaded;
+                        refreshBtn.hidden = status !== mmCoreOutdated;
+                    }
+                }
+
+                // Listen for changes on this module status.
+                var statusObserver = $mmEvents.on(mmCoreEventPackageStatusChanged, function(data) {
+                    if (data.siteid === $mmSite.getId() && data.componentId === module.id &&
+                            data.component === mmaModFeedbackComponent) {
+                        showStatus(data.status);
+                    }
+                });
+
+                // Get current status to decide which icon should be shown.
+                $mmCoursePrefetchDelegate.getModuleStatus(module, courseId).then(showStatus);
+
+                $scope.$on('$destroy', function() {
+                    statusObserver && statusObserver.off && statusObserver.off();
+                });
+            };
+        };
+
+        return self;
+    };
+
+    /**
+     * Content links handler for module index page.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#indexLinksHandler
+     */
+    self.indexLinksHandler = $mmContentLinksHelper.createModuleIndexLinkHandler('mmaModFeedback', 'feedback', $mmaModFeedback);
+
+    return self;
+});
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
new file mode 100644
index 00000000000..34cd063b476
--- /dev/null
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -0,0 +1,221 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Mod feedback prefetch handler.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc service
+ * @name $mmaModFeedbackPrefetchHandler
+ */
+.factory('$mmaModFeedbackPrefetchHandler', function($mmaModFeedback, mmaModFeedbackComponent, $mmFilepool, $q, $mmUtil, $mmGroups,
+            $mmPrefetchFactory) {
+
+    var self = $mmPrefetchFactory.createPrefetchHandler(mmaModFeedbackComponent);
+
+    // RegExp to check if a module has updates based on the result of $mmCoursePrefetchDelegate#getCourseUpdates.
+    // check_updates_since not available yet on module lib.
+    // self.updatesNames = /^configuration$|^.*files$|^answers$/;
+
+    /**
+     * Download the module.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#download
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @return {Promise}         Promise resolved when all files have been downloaded. Data returned is not reliable.
+     */
+    self.download = function(module, courseId) {
+        // Feedback cannot be downloaded right away, only prefetched.
+        return self.prefetch(module, courseId);
+    };
+
+    /**
+     * Get the list of downloadable files.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#getFiles
+     * @param {Object} module   Module to get the files.
+     * @param {Number} courseId Course ID the module belongs to.
+     * @return {Promise}        Promise resolved with the list of files.
+     */
+    self.getFiles = function(module, courseId) {
+        return self.getIntroFiles(module, courseId);
+    };
+
+    /**
+     * Returns feedback intro files.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#getIntroFiles
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID.
+     * @return {Promise}         Promise resolved with list of intro files.
+     */
+    self.getIntroFiles = function(module, courseId) {
+        return $mmaModFeedback.getFeedback(courseId, module.id).catch(function() {
+            // Not found, return undefined so module description is used.
+        }).then(function(feedback) {
+            return self.getIntroFilesFromInstance(module, feedback);
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId) {
+        return $mmaModFeedback.invalidateContent(moduleId, courseId);
+    };
+
+    /**
+     * Invalidates WS calls needed to determine module status.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#invalidateModule
+     * @param  {Object} module   Module to invalidate.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.invalidateModule = function(module, courseId) {
+        return $mmaModFeedback.invalidateFeedbackData(courseId);
+    };
+
+    /**
+     * Check if a feedback is downloadable.
+     * A feedback isn't downloadable if it's not open yet.
+     * Closed feedback are downloadable because teachers can always see the results.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#isDownloadable
+     * @param {Object} module    Module to check.
+     * @param {Number} courseId  Course ID the module belongs to.
+     * @return {Promise}         Promise resolved with true if downloadable, resolved with false otherwise.
+     */
+    self.isDownloadable = function(module, courseId) {
+        return $mmaModFeedback.getFeedback(courseId, module.id, false, true).then(function(feedback) {
+            var now = $mmUtil.timestamp();
+
+            // Check time first if available.
+            if (feedback.timeopen && feedback.timeopen > now) {
+                return false;
+            }
+            if (feedback.timeclose && feedback.timeclose < now) {
+                return false;
+            }
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id).then(function(accessData) {
+                return accessData.isopen;
+            });
+        });
+    };
+
+    /**
+     * Whether or not the module is enabled for the site.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#isEnabled
+     * @return {Boolean}
+     */
+    self.isEnabled = function() {
+        return $mmaModFeedback.isPluginEnabled();
+    };
+
+    /**
+     * Prefetch the module.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackPrefetchHandler#prefetch
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @param  {Boolean} single  True if we're downloading a single module, false if we're downloading a whole section.
+     * @return {Promise}         Promise resolved when all files have been downloaded. Data returned is not reliable.
+     */
+    self.prefetch = function(module, courseId, single) {
+        return self.prefetchPackage(module, courseId, single, prefetchFeedback);
+    };
+
+    /**
+     * Prefetch a feedback.
+     *
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @param  {Boolean} single  True if we're downloading a single module, false if we're downloading a whole section.
+     * @param  {String} siteId   Site ID.
+     * @return {Promise}         Promise resolved with an object with 'revision' and 'timemod'.
+     */
+    function prefetchFeedback(module, courseId, single, siteId) {
+        // Prefetch the feedback data.
+        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedback) {
+            var p1 = [],
+                files = self.getIntroFilesFromInstance(module, feedback);
+
+            // Prefetch files.
+            angular.forEach(files, function(file) {
+                p1.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl, self.component, module.id, file.timemodified));
+            });
+
+            p1.push($mmaModFeedback.getFeedbackAccessInformation(feedback.id).then(function(accessData) {
+                var p2 = [];
+                if (accessData.capabilities && accessData.capabilities.edititems) {
+                    // Get all groups analysis.
+                    p2.push($mmaModFeedback.getAnalysis(feedback.id));
+                    p2.push($mmGroups.getActivityAllowedGroupsIfEnabled(feedback.coursemodule).then(function(groups) {
+                        var p3 = [];
+                        angular.forEach(groups, function(group) {
+                            p3.push($mmaModFeedback.getAnalysis(feedback.id, group.id));
+                        });
+
+                        return $q.all(p3);
+                    }));
+                }
+
+                return $q.all(p2);
+            }));
+
+            return $q.all(p1);
+        }).then(function() {
+            // Get revision and timemodified.
+
+            var p4 = [];
+            p4.push(self.getRevision(module, courseId));
+            p4.push(self.getTimemodified(module, courseId));
+
+            // Return revision and timemodified.
+            return $q.all(p4).then(function(list) {
+                return {
+                    revision: list[0],
+                    timemod: list[1]
+                };
+            });
+        });
+    }
+
+    return self;
+});
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
new file mode 100644
index 00000000000..5b3cd5b60f8
--- /dev/null
+++ b/www/addons/mod/feedback/templates/index.html
@@ -0,0 +1,81 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <mm-context-menu>
+            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
+            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="600" ng-if="feedbackLoaded && hasOffline && isOnline" content="'mm.settings.synchronizenow' | translate" action="refreshFeedback(true)" icon-action="syncIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="500" ng-if="prefetchStatusIcon" content="timemodified" icon-action="prefetchStatusIcon" action="prefetch()" close-on-click="false"></mm-context-menu-item>
+            <mm-context-menu-item priority="400" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
+        </mm-context-menu>
+    </ion-nav-buttons>
+    <ion-content mm-state-class>
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
+        <mm-loading hide-until="feedbackLoaded">
+            <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
+
+            <div class="mm-warning-card-icon" ng-if="feedback.canComplete && !feedback.isOpen">
+                <i class="icon ion-close-circled padding"></i> {{ 'mma.mod_feedback.feedback_is_not_open' | translate }}
+            </div>
+
+            <div class="mm-success-card-icon" ng-if="feedback.canComplete && feedback.isOpen && !feedback.canSubmit">
+                <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
+            </div>
+
+            <section class="list" ng-if="capabilities.edititems || feedback.hasQuestions">
+                <div ng-if="capabilities.edititems">
+                    <div class="item item-text-wrap item-input item-select" ng-if="separateGroups || visibleGroups">
+                        <ion-label id="mma-feedback-groupslabel" ng-if="separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                        <ion-label id="mma-feedback-groupslabel" ng-if="visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groups" mm-ios-select-fix>
+                        </select>
+                    </div>
+                    <div class="item item-text-wrap item-icon-right">
+                        <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
+                        <span class="badge">{{feedback.completedCount}}</span>
+                    </div>
+                    <div class="item item-text-wrap item-icon-right">
+                        <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
+                        <span class="badge">{{feedback.itemsCount}}</span>
+                    </div>
+                    <div class="item item-text-wrap" ng-if="feedback.timeopen">
+                        <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
+                        <p>{{feedback.openTimeReadable}}</p>
+                    </div>
+                    <div class="item item-text-wrap" ng-if="feedback.timeclose">
+                        <p class="item-heading">{{ 'mma.mod_feedback.feedbackclose' | translate }}</p>
+                        <p>{{feedback.closeTimeReadable}}</p>
+                    </div>
+                </div>
+                <div ng-if="feedback.hasQuestions">
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
+                        <p ng-if="feedback.isAnonymous">{{ 'mma.mod_feedback.anonymous' | translate }}</p>
+                        <p ng-if="!feedback.isAnonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
+                    </div>
+                    <div class="item item-text-wrap">
+                        <button class="button button-block button icon-left ion-search" ng-click="openFeatureUrl('print')">{{ 'mma.mod_feedback.preview' | translate }}</button>
+                        <button ng-if="feedback.canComplete && feedback.canSubmit" class="button button-block button-positive icon-right ion-chevron-right" ng-click="openFeatureUrl('complete')">
+                            {{ 'mma.mod_feedback.complete_the_form' | translate }}
+                        </button>
+                    </div>
+                </div>
+            </section>
+            <div class="tabs tabs-icon-top" ng-if="capabilities.viewreports">
+                <a class="tab-item active">
+                    <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
+                </a>
+                <a class="tab-item" ng-click="openFeatureUrl('analysis')">
+                    <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
+                </a>
+                <a class="tab-item" ng-click="openFeatureUrl('show_entries')">
+                    <i class="icon ion-checkmark-round"></i>{{ 'mma.mod_feedback.show_entries' | translate }}
+                </a>
+                <a class="tab-item" ng-if="!feedback.isAnonymous" ng-click="openFeatureUrl('show_nonrespondents')">
+                    <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
+                </a>
+            </div>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 15976ffa3bb..e0221cba1a3 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -74,6 +74,8 @@
     "forcepasswordchangenotice": "You must change your password to proceed.",
     "fulllistofcourses": "All courses",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Separate groups",
+    "groupsvisible": "Visible groups",
     "hasdatatosync": "This {{$a}} has offline data to be synchronized.",
     "help" : "Help",
     "hide": "Hide",
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 6400574616f..d7cfa296574 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -1909,6 +1909,30 @@ angular.module('mm.core')
             });
         };
 
+        /**
+         * Converts an array of objects into an object with key and value.
+         * The contrary of objectToArrayOfObjects
+         * For example, it can convert [{name: 'size', value: 2}] into {size: 2}.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#objectToKeyValueMap
+         * @param  {Object} obj         Object to convert.
+         * @param  {String} keyName     Name of the properties where the keys are stored.
+         * @param  {String} valueName   Name of the properties where the keys are stored.
+         * @param  {String} [keyPrefix] Key prefix if needed to delete it.
+         * @return {Object[]}         Array of objects mapped.
+         */
+        self.objectToKeyValueMap = function(obj, keyName, valueName, keyPrefix) {
+            var prefixSubstr = keyPrefix ? keyPrefix.length : 0,
+                mapped = {};
+            angular.forEach(obj, function(item) {
+                var key = prefixSubstr > 0 ? item[keyName].substr(prefixSubstr) : item[keyName];
+                mapped[key] = item[valueName];
+            });
+            return mapped;
+        };
+
 
         /**
          * Tests to see whether two arrays or objects have the same value at a particular key.

From 931f9344e501519548fff6a5244af3d8a744c98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 8 Mar 2017 14:47:44 +0100
Subject: [PATCH 037/218] MOBILE-2002 feedback: Show page after submit

---
 www/addons/mod/feedback/controllers/index.js  |  41 ++----
 www/addons/mod/feedback/lang/en.json          |   1 +
 www/addons/mod/feedback/services/feedback.js  |  24 ++--
 www/addons/mod/feedback/services/helper.js    | 129 ++++++++++++++++++
 .../mod/feedback/services/prefetch_handler.js |  40 +++---
 www/addons/mod/feedback/templates/index.html  |  64 +++++----
 www/core/lib/filepool.js                      |  22 +++
 www/core/scss/styles.scss                     |   9 ++
 8 files changed, 243 insertions(+), 87 deletions(-)
 create mode 100644 www/addons/mod/feedback/services/helper.js

diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 8ebabd8145e..6abd567c510 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_feedback')
  * @name mmaModFeedbackIndexCtrl
  */
 .controller('mmaModFeedbackIndexCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $mmCourseHelper, $q, $mmCourse,
-            $mmText, mmaModFeedbackComponent, $mmEvents, $ionicScrollDelegate, $mmApp, $translate, $mmGroups, $mmSite,
+            $mmText, mmaModFeedbackComponent, $mmEvents, $ionicScrollDelegate, $mmApp, $translate, $mmGroups, $mmaModFeedbackHelper,
             mmCoreEventOnlineStatusChanged) {
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -54,39 +54,17 @@ angular.module('mm.addons.mod_feedback')
 
             return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
         }).then(function(accessData) {
-            $scope.feedback.canSubmit = accessData.cansubmit;
-            $scope.feedback.canComplete = accessData.cancomplete;
-            $scope.feedback.isOpen = accessData.isopen;
-            $scope.feedback.hasQuestions = !accessData.isempty;
-            $scope.feedback.canViewAnalysis = accessData.canviewanalysis;
-            $scope.feedback.isAlreadySubmitted = accessData.isalreadysubmitted;
-            $scope.feedback.isAnonymous = accessData.isanonymous;
-            $scope.capabilities = accessData.capabilities;
-
-            if ($scope.capabilities.edititems) {
+            $scope.access = accessData;
+
+            if (accessData.canedititems) {
                 feedback.timeopen = parseInt(feedback.timeopen) * 1000 || false;
                 feedback.openTimeReadable = feedback.timeopen ? moment(feedback.timeopen).format('LLL') : false;
                 feedback.timeclose = parseInt(feedback.timeclose) * 1000 || false;
                 feedback.closeTimeReadable = feedback.timeclose ? moment(feedback.timeclose).format('LLL') : false;
 
                 // Get groups (only for teachers).
-                return $mmGroups.getActivityGroupMode(feedback.coursemodule).then(function(groupMode) {
-                    if (groupMode === $mmGroups.SEPARATEGROUPS || groupMode === $mmGroups.VISIBLEGROUPS) {
-                        $scope.separateGroups = groupMode === $mmGroups.SEPARATEGROUPS;
-                        $scope.visibleGroups = groupMode === $mmGroups.VISIBLEGROUPS;
-                        return $mmGroups.getActivityAllowedGroups(feedback.coursemodule);
-                    }
-                    return [];
-                }).then(function (groups) {
-                    if (groups.length <= 0) {
-                        $scope.separateGroups = false;
-                        $scope.visibleGroups = false;
-                    } else {
-                        $scope.groups = [
-                            {'id': 0, 'name': $translate.instant('mm.core.allparticipants')}
-                        ];
-                        $scope.groups = $scope.groups.concat(groups);
-                    }
+                return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+                    $scope.groupInfo = groupInfo;
                     return $scope.setGroup($scope.selectedGroup);
                 });
             }
@@ -168,10 +146,9 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
-    // Temporary function to link non implemented features.
-    $scope.openFeatureUrl = function(feature) {
-        var url = $mmSite.getURL() + '/mod/feedback/' + feature + '.php?id=' + feedback.coursemodule;
-        $mmUtil.openInApp(url);
+    // Function to link implemented features.
+    $scope.openFeature = function(feature, notImplemented) {
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId, notImplemented);
     };
 
     function scrollTop() {
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 9402749f98e..92b4738e1a0 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -11,6 +11,7 @@
     "mode": "Mode",
     "non_anonymous": "User's name will be logged and shown with answers",
     "overview": "Overview",
+    "page_after_submit": "Completion message",
     "preview": "Preview",
     "questions": "Questions",
     "show_entries": "Show responses",
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 06baf1d040f..d7ae893dee3 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -34,6 +34,16 @@ angular.module('mm.addons.mod_feedback')
         return 'mmaModFeedback:feedback:' + courseId;
     }
 
+    /**
+     * Get prefix cache key for all feedback activity data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getFeedbackDataPrefixCacheKey(feedbackId) {
+        return 'mmaModFeedback:' + feedbackId;
+    }
+
     /**
      * Get cache key for feedback access information data WS calls.
      *
@@ -41,7 +51,7 @@ angular.module('mm.addons.mod_feedback')
      * @return {String}         Cache key.
      */
     function getFeedbackAccessInformationDataCacheKey(feedbackId) {
-        return 'mmaModFeedback:access:' + feedbackId;
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':access';
     }
 
     /**
@@ -51,7 +61,7 @@ angular.module('mm.addons.mod_feedback')
      * @return {String}         Cache key.
      */
     function getAnalysisDataPrefixCacheKey(feedbackId) {
-        return 'mmaModFeedback:analysis:' + feedbackId;
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':analysis';
     }
 
     /**
@@ -79,7 +89,7 @@ angular.module('mm.addons.mod_feedback')
     self.isPluginEnabled = function(siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return  site.wsAvailable('mod_feedback_get_feedbacks_by_courses') &&
-                    site.wsAvailable('mod_feedback_get_access_information');
+                    site.wsAvailable('mod_feedback_get_feedback_access_information');
         });
     };
 
@@ -190,10 +200,7 @@ angular.module('mm.addons.mod_feedback')
                     cacheKey: getFeedbackAccessInformationDataCacheKey(feedbackId)
                 };
 
-            return site.read('mod_feedback_get_access_information', params, preSets).then(function(accessData) {
-                accessData.capabilities = $mmUtil.objectToKeyValueMap(accessData.capabilities, 'name', 'enabled', 'mod/feedback:');
-                return accessData;
-            });
+            return site.read('mod_feedback_get_feedback_access_information', params, preSets);
         });
     };
 
@@ -275,8 +282,7 @@ angular.module('mm.addons.mod_feedback')
             var ps = [];
             // Do not invalidate feedback data before getting feedback info, we need it!
             ps.push(self.invalidateFeedbackData(courseId, siteId));
-            ps.push(self.invalidateFeedbackAccessInformationData(feedback.id, siteId));
-            ps.push(self.invalidateAnalysisData(feedback.id, siteId));
+            ps.push(self.invalidateWsCacheForKeyStartingWith(getFeedbackDataPrefixCacheKey(feedback.id), siteId));
 
             return $q.all(ps);
         });
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
new file mode 100644
index 00000000000..5b362cd1be0
--- /dev/null
+++ b/www/addons/mod/feedback/services/helper.js
@@ -0,0 +1,129 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Helper to gather some common functions for feedback.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc service
+ * @name $mmaModFeedbackHelper
+ */
+.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state) {
+
+    var self = {};
+
+    /**
+     * Get activity feedback group info to be shown on templates.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#getFeedbackGroupInfo
+     * @param  {Number} cmId        Course Module Id of the feedback.
+     * @return {Object}             Containing the group info related to the activity.
+     */
+    self.getFeedbackGroupInfo = function(cmId) {
+        var groupInfo = {};
+
+        return $mmGroups.getActivityGroupMode(cmId).then(function(groupMode) {
+            if (groupMode === $mmGroups.SEPARATEGROUPS || groupMode === $mmGroups.VISIBLEGROUPS) {
+                groupInfo.separateGroups = groupMode === $mmGroups.SEPARATEGROUPS;
+                groupInfo.visibleGroups = groupMode === $mmGroups.VISIBLEGROUPS;
+                return $mmGroups.getActivityAllowedGroups(cmId);
+            }
+            return [];
+        }).then(function (groups) {
+            if (groups.length <= 0) {
+                groupInfo.separateGroups = false;
+                groupInfo.visibleGroups = false;
+            } else {
+                groupInfo.groups = [
+                    {'id': 0, 'name': $translate.instant('mm.core.allparticipants')}
+                ];
+                groupInfo.groups = groupInfo.groups.concat(groups);
+            }
+            return groupInfo;
+        });
+    };
+
+    /**
+     * Helper function to open a feature in the app.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#openFeature
+     * @param {String}  feature          Name of the feature to open.
+     * @param {Object}  module           Course module activity object.
+     * @param {Number}  courseId         Course Id.
+     * @param {Boolean} [notImplemented] If not implemented the browser will be opened. Temporary.
+     */
+    self.openFeature = function(feature, module, courseId, notImplemented) {
+        if (notImplemented) {
+            $mmUtil.openInApp($mmSite.getURL() + '/mod/feedback/' + feature + '.php?id=' + module.id);
+            return;
+        }
+
+        var pageName = feature ? 'site.mod_feedback-' + feature : 'site.mod_feedback',
+            backTimes = getHistoryBackCounter(pageName, module.instance);
+
+        if (backTimes < 0) {
+            // Go back X times until the the page we want to reach.
+            $ionicHistory.goBack(backTimes);
+        } else {
+            // Not found, open new state.
+            var stateParams = {
+                module: module,
+                moduleid: module.id,
+                courseid: courseId,
+                feedbackid: module.instance
+            };
+            $state.go(pageName, stateParams);
+        }
+
+        // Check if the page we are going to open is in the history and returns the number of states to go back.
+        function getHistoryBackCounter(pageName, feedbackId) {
+            var view, historyInstance, backTimes = 0,
+                backViewId = $ionicHistory.currentView().backViewId;
+
+            while (backViewId) {
+                view = $ionicHistory.viewHistory().views[backViewId];
+
+                if (!view.stateName.startsWith('site.mod_feedback')) {
+                    break;
+                }
+
+                historyInstance = view.stateParams.feedbackid ? view.stateParams.feedbackid : view.stateParams.module.instance;
+
+                // Check we are not changing to another feedback.
+                if (historyInstance && historyInstance == feedbackId) {
+                    backTimes--;
+                } else {
+                    break;
+                }
+
+                backViewId = view.backViewId;
+
+                // Page found.
+                if (view.stateName == pageName) {
+                    break;
+                }
+            }
+
+            return backTimes;
+        }
+    };
+
+    return self;
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 34cd063b476..19f463f1c4b 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -51,12 +51,20 @@ angular.module('mm.addons.mod_feedback')
      * @module mm.addons.mod_feedback
      * @ngdoc method
      * @name $mmaModFeedbackPrefetchHandler#getFiles
-     * @param {Object} module   Module to get the files.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @return {Promise}        Promise resolved with the list of files.
+     * @param  {Object} module    Module to get the files.
+     * @param  {Number} courseId  Course ID the module belongs to.
+     * @param  {String} [siteId]  Site ID. If not defined, current site.
+     * @return {Promise}          Promise resolved with the list of files.
      */
-    self.getFiles = function(module, courseId) {
-        return self.getIntroFiles(module, courseId);
+    self.getFiles = function(module, courseId, siteId) {
+        return $mmaModFeedback.getFeedback(courseId, module.id, siteId).then(function(feedback) {
+            // Get intro files and page after submit files.
+            var files = feedback.pageaftersubmitfiles || [];
+            return files.concat(self.getIntroFilesFromInstance(module, feedback));
+        }).catch(function() {
+            // Feedback not found, return empty list.
+            return [];
+        });
     };
 
     /**
@@ -172,24 +180,22 @@ angular.module('mm.addons.mod_feedback')
      */
     function prefetchFeedback(module, courseId, single, siteId) {
         // Prefetch the feedback data.
-        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedback) {
-            var p1 = [],
-                files = self.getIntroFilesFromInstance(module, feedback);
+        return $mmaModFeedback.getFeedback(courseId, module.id, siteId).then(function(feedback) {
+            var p1 = [];
 
-            // Prefetch files.
-            angular.forEach(files, function(file) {
-                p1.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl, self.component, module.id, file.timemodified));
-            });
+            p1.push(self.getFiles(module, courseId, siteId).then(function(files) {
+                return $mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id);
+            }));
 
-            p1.push($mmaModFeedback.getFeedbackAccessInformation(feedback.id).then(function(accessData) {
+            p1.push($mmaModFeedback.getFeedbackAccessInformation(feedback.id, siteId).then(function(accessData) {
                 var p2 = [];
-                if (accessData.capabilities && accessData.capabilities.edititems) {
+                if (accessData.canedititems || accessData.canviewreports) {
                     // Get all groups analysis.
-                    p2.push($mmaModFeedback.getAnalysis(feedback.id));
-                    p2.push($mmGroups.getActivityAllowedGroupsIfEnabled(feedback.coursemodule).then(function(groups) {
+                    p2.push($mmaModFeedback.getAnalysis(feedback.id, undefined, siteId));
+                    p2.push($mmGroups.getActivityAllowedGroupsIfEnabled(feedback.coursemodule, undefined, siteId).then(function(groups) {
                         var p3 = [];
                         angular.forEach(groups, function(group) {
-                            p3.push($mmaModFeedback.getAnalysis(feedback.id, group.id));
+                            p3.push($mmaModFeedback.getAnalysis(feedback.id, group.id, siteId));
                         });
 
                         return $q.all(p3);
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 5b3cd5b60f8..e49481034ba 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -10,25 +10,25 @@
             <mm-context-menu-item priority="400" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
-    <ion-content mm-state-class>
+    <ion-content mm-state-class ng-class="{'has-footer': feedbackLoaded && access.canviewreports}">
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
-            <div class="mm-warning-card-icon" ng-if="feedback.canComplete && !feedback.isOpen">
+            <div class="mm-warning-card-icon" ng-if="access.cancomplete && !access.isopen">
                 <i class="icon ion-close-circled padding"></i> {{ 'mma.mod_feedback.feedback_is_not_open' | translate }}
             </div>
 
-            <div class="mm-success-card-icon" ng-if="feedback.canComplete && feedback.isOpen && !feedback.canSubmit">
+            <div class="mm-success-card-icon" ng-if="access.cancomplete && access.isopen && !access.cansubmit">
                 <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
             </div>
 
-            <section class="list" ng-if="capabilities.edititems || feedback.hasQuestions">
-                <div ng-if="capabilities.edititems">
-                    <div class="item item-text-wrap item-input item-select" ng-if="separateGroups || visibleGroups">
-                        <ion-label id="mma-feedback-groupslabel" ng-if="separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
-                        <ion-label id="mma-feedback-groupslabel" ng-if="visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
-                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groups" mm-ios-select-fix>
+            <section class="list" ng-if="access.canedititems || !access.isempty">
+                <div ng-if="access.canedititems">
+                    <div class="item item-text-wrap item-input item-select" ng-if="groupInfo.separateGroups || groupInfo.visibleGroups">
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
                         </select>
                     </div>
                     <div class="item item-text-wrap item-icon-right">
@@ -47,35 +47,41 @@
                         <p class="item-heading">{{ 'mma.mod_feedback.feedbackclose' | translate }}</p>
                         <p>{{feedback.closeTimeReadable}}</p>
                     </div>
+                    <div class="item item-text-wrap" ng-if="feedback.page_after_submit">
+                        <p class="item-heading">{{ 'mma.mod_feedback.page_after_submit' | translate }}</p>
+                        <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ feedback.page_after_submit }}</mm-format-text>
+                    </div>
                 </div>
-                <div ng-if="feedback.hasQuestions">
+                <div ng-if="!access.isempty">
                     <div class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
-                        <p ng-if="feedback.isAnonymous">{{ 'mma.mod_feedback.anonymous' | translate }}</p>
-                        <p ng-if="!feedback.isAnonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
+                        <p ng-if="access.isanonymous">{{ 'mma.mod_feedback.anonymous' | translate }}</p>
+                        <p ng-if="!access.isanonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
                     </div>
-                    <div class="item item-text-wrap">
-                        <button class="button button-block button icon-left ion-search" ng-click="openFeatureUrl('print')">{{ 'mma.mod_feedback.preview' | translate }}</button>
-                        <button ng-if="feedback.canComplete && feedback.canSubmit" class="button button-block button-positive icon-right ion-chevron-right" ng-click="openFeatureUrl('complete')">
+                    <div class="item item-text-wrap row-buttons responsive-sm">
+                        <button class="button button-block icon-left ion-search" ng-click="openFeature('print', true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
+                        <button ng-if="access.cancomplete && access.cansubmit" class="button button-block button-positive icon-right ion-chevron-right" ng-click="openFeature('complete', true)">
                             {{ 'mma.mod_feedback.complete_the_form' | translate }}
                         </button>
                     </div>
                 </div>
             </section>
-            <div class="tabs tabs-icon-top" ng-if="capabilities.viewreports">
-                <a class="tab-item active">
-                    <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
-                </a>
-                <a class="tab-item" ng-click="openFeatureUrl('analysis')">
-                    <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
-                </a>
-                <a class="tab-item" ng-click="openFeatureUrl('show_entries')">
-                    <i class="icon ion-checkmark-round"></i>{{ 'mma.mod_feedback.show_entries' | translate }}
-                </a>
-                <a class="tab-item" ng-if="!feedback.isAnonymous" ng-click="openFeatureUrl('show_nonrespondents')">
-                    <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
-                </a>
-            </div>
         </mm-loading>
     </ion-content>
+    <ion-footer ng-if="feedbackLoaded && access.canviewreports">
+        <div class="tabs tabs-icon-top">
+            <a class="tab-item active">
+                <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
+            </a>
+            <a class="tab-item" ng-click="openFeature('analysis', true)">
+                <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
+            </a>
+            <a class="tab-item" ng-click="openFeature('show_entries', true)">
+                <i class="icon ion-checkmark-round"></i>{{ 'mma.mod_feedback.show_entries' | translate }}
+            </a>
+            <a class="tab-item" ng-if="!access.isanonymous" ng-click="openFeature('show_nonrespondents', true)">
+                <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
+            </a>
+        </div>
+    </ion-footer>
 </ion-view>
\ No newline at end of file
diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index 15ddbe0ab33..b9d77100ca3 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -305,6 +305,28 @@ angular.module('mm.core')
         });
     };
 
+    /**
+     * Add files to queue using a URL.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFilepool#addFilesToQueueByUrl
+     * @param {String} siteId        The site ID.
+     * @param {Array}  files         Array of files to add.
+     * @param {String} [component]   The component to link the file to.
+     * @param {Mixed}  [componentId] An ID to use in conjunction with the component (optional).
+     * @return {Promise} Resolved on success. The returned value can be inconsistent, do not use.
+     */
+    self.addFilesToQueueByUrl = function(siteId, files, component, componentId) {
+        var promises = [];
+        // Prefetch files.
+        angular.forEach(files, function(file) {
+            promises.push(self.addToQueueByUrl(siteId, file.fileurl, component, componentId, file.timemodified));
+        });
+
+        return $q.all(promises);
+    };
+
     /**
      * Add an entry to queue using a URL.
      *
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index fd01147187c..6708fd1f882 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -562,6 +562,15 @@ mm-navigation-bar {
   padding: $item-padding / 2;
 }
 
+.row-buttons {
+  @include display-flex();
+  padding: $item-padding - ($button-block-margin / 2);
+
+  .button.button-block {
+    @include flex(1);
+    margin: ($button-block-margin / 2);
+  }
+}
 
 /* Message cards */
 // Mixin to create message "cards" with a colored border-bottom and, optionally, an icon. For examples, for mm-warning.

From f028409e4a4e3c16bdf21557da202a7ec13639fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 8 Mar 2017 13:46:52 +0100
Subject: [PATCH 038/218] MOBILE-2005 feedback: Add analysis page

---
 .../mod/feedback/controllers/analysis.js      | 247 ++++++++++++++++++
 www/addons/mod/feedback/lang/en.json          |   1 +
 www/addons/mod/feedback/main.js               |  19 +-
 www/addons/mod/feedback/scss/styles.scss      |   9 +
 www/addons/mod/feedback/services/handlers.js  |  38 ++-
 www/addons/mod/feedback/services/helper.js    |   2 +-
 .../mod/feedback/templates/analysis.html      |  81 ++++++
 www/addons/mod/feedback/templates/index.html  |   4 +-
 www/core/lib/text.js                          |  18 ++
 9 files changed, 414 insertions(+), 5 deletions(-)
 create mode 100644 www/addons/mod/feedback/controllers/analysis.js
 create mode 100644 www/addons/mod/feedback/scss/styles.scss
 create mode 100644 www/addons/mod/feedback/templates/analysis.html

diff --git a/www/addons/mod/feedback/controllers/analysis.js b/www/addons/mod/feedback/controllers/analysis.js
new file mode 100644
index 00000000000..db295b12097
--- /dev/null
+++ b/www/addons/mod/feedback/controllers/analysis.js
@@ -0,0 +1,247 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback analysis controller.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc controller
+ * @name mmaModFeedbackAnalysisCtrl
+ */
+.controller('mmaModFeedbackAnalysisCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $mmApp,
+            mmaModFeedbackComponent, $mmEvents, $translate, $mmGroups, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper) {
+    var feedbackId = $stateParams.feedbackid,
+        module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        feedback;
+
+    $scope.title = $stateParams.title;
+    $scope.moduleUrl = module.url;
+    $scope.moduleName = $mmCourse.translateModuleName('feedback');
+    $scope.courseId = courseId;
+    $scope.refreshIcon = 'spinner';
+    $scope.component = mmaModFeedbackComponent;
+    $scope.componentId = module.id;
+    $scope.selectedGroup = 0;
+    $scope.chartOptions = {
+        'legend': {
+            'display': true,
+            'position': 'bottom',
+            'labels': {
+                'generateLabels': function(chart) {
+                    var data = chart.data;
+                    if (data.labels.length && data.labels.length) {
+                        var datasets = data.datasets[0];
+                        return data.labels.map(function(label, i) {
+                            return {
+                                text: label + ': ' + datasets.data[i],
+                                fillStyle: datasets.backgroundColor[i],
+                                // Below is extra data used for toggling the datasets
+                                datasetIndex: i
+                            };
+                        });
+                    } else {
+                        return [];
+                    }
+                }
+            }
+        }
+    };
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackAnalysisData(refresh, showErrors) {
+        $scope.isOnline = $mmApp.isOnline();
+        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
+            feedback = feedbackData;
+
+            $scope.title = feedback.name || $scope.title;
+            $scope.description = feedback.intro;
+
+            $scope.feedback = feedback;
+
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
+        }).then(function(accessData) {
+            $scope.access = accessData;
+
+            if (accessData.canviewanalysis) {
+                // Get groups (only for teachers).
+                return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+                    $scope.groupInfo = groupInfo;
+                    return $scope.setGroup($scope.selectedGroup);
+                });
+            }
+        }).catch(function(message) {
+            if (!refresh) {
+                // Some call failed, retry without using cache since it might be a new activity.
+                return refreshAllData();
+            }
+
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        }).finally(function(){
+            $scope.feedbackLoaded = true;
+        });
+    }
+
+    // Set group to see the analysis.
+    $scope.setGroup = function(groupId) {
+        $scope.selectedGroup = groupId;
+
+        return $mmaModFeedback.getAnalysis(feedback.id, groupId).then(function(analysis) {
+            var number = 1;
+            $scope.items = analysis.itemsdata.map(function(item) {
+                // Move data inside item.
+                item.item.data = item.data;
+                item = item.item;
+                item.number = number++;
+                if (item.data && item.data.length) {
+                    return parseAnalysisInfo(item);
+                }
+                return false;
+            }).filter(function(item) {
+                return item;
+            });
+
+            $scope.warning = "";
+            if (analysis.warnings.length) {
+                for (var x in analysis.warnings) {
+                    var warning = analysis.warnings[x];
+                    if (warning.warningcode == 'insufficientresponsesforthisgroup') {
+                        $scope.warning = warning.message;
+                    }
+                }
+            }
+
+            $scope.feedback.completedCount = analysis.completedcount;
+            $scope.feedback.itemsCount = analysis.itemscount;
+        });
+    };
+
+    // Parse the analysis info to show the info correctly formatted.
+    function parseAnalysisInfo(item) {
+        switch (item.typ) {
+            case 'numeric':
+                item.average = item.data.reduce(function (prev, current) {
+                    return prev + current;
+                }) / item.data.length;
+                item.template = 'numeric';
+                break;
+
+            case 'info':
+                item.data = item.data.map(function(dataItem) {
+                    dataItem = $mmText.parseJSON(dataItem);
+                    return typeof dataItem.show != "undefined" ? dataItem.show : false;
+                }).filter(function(dataItem) {
+                    // Filter false entries.
+                    return dataItem;
+                });
+            case 'textfield':
+            case 'textarea':
+                item.template = 'list';
+                break;
+
+            case 'multichoicerated':
+            case 'multichoice':
+                item.data = item.data.map(function(dataItem) {
+                    dataItem = $mmText.parseJSON(dataItem);
+                    return typeof dataItem.answertext != "undefined" ? dataItem : false;
+                }).filter(function(dataItem) {
+                    // Filter false entries.
+                    return dataItem;
+                });
+
+                // Format labels.
+                item.labels = item.data.map(function(dataItem) {
+                    dataItem.quotient = parseFloat(dataItem.quotient * 100).toFixed(2);
+                    var label = "";
+
+                    if (typeof dataItem.value != "undefined") {
+                        label = '(' + dataItem.value + ') ';
+                    }
+                    label += dataItem.answertext;
+                    label += dataItem.quotient > 0 ? ' (' + dataItem.quotient + '%)' : "";
+                    return label;
+                });
+                item.chartData = item.data.map(function(dataItem) {
+                    return dataItem.answercount;
+                });
+
+                if (item.typ == 'multichoicerated') {
+                    item.average = item.data.reduce(function (prev, current) {
+                        return prev + current.avg;
+                    }, 0.0);
+                }
+
+                var subtype = item.presentation.charAt(0);
+                item.single = subtype != 'c';
+
+                item.template = 'chart';
+                break;
+        }
+
+        return item;
+    }
+
+    // Convenience function to refresh all the data.
+    function refreshAllData(showErrors) {
+        var promises = [];
+        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
+        if (feedback) {
+            promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
+            promises.push($mmaModFeedback.invalidateAnalysisData(feedback.id));
+            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
+            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+        }
+
+        return $q.all(promises).finally(function() {
+            return fetchFeedbackAnalysisData(true, showErrors);
+        });
+    }
+
+    fetchFeedbackAnalysisData().finally(function() {
+        $scope.refreshIcon = 'ion-refresh';
+    });
+
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshFeedback = function(showErrors) {
+        if ($scope.feedbackLoaded) {
+            $scope.refreshIcon = 'spinner';
+            return refreshAllData(showErrors).finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+    // Function to link implemented features.
+    $scope.openFeature = function(feature, notImplemented) {
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId, notImplemented);
+    };
+
+    // Refresh online status when changes.
+    onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
+        $scope.isOnline = online;
+    });
+
+    $scope.$on('$destroy', function() {
+        onlineObserver && onlineObserver.off && onlineObserver.off();
+    });
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 92b4738e1a0..fd02db0ee25 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -1,6 +1,7 @@
 {
     "analysis": "Analysis",
     "anonymous": "Anonymous",
+    "average": "Average",
     "complete_the_form": "Answer the questions...",
     "completed_feedbacks": "Submitted answers",
     "continue_the_form": "Continue the form",
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index b2a797f38b5..cd8e34b5ee0 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-angular.module('mm.addons.mod_feedback', [])
+angular.module('mm.addons.mod_feedback', ["chart.js"])
 
 .constant('mmaModFeedbackComponent', 'mmaModFeedback')
 
@@ -33,11 +33,28 @@ angular.module('mm.addons.mod_feedback', [])
                 templateUrl: 'addons/mod/feedback/templates/index.html'
             }
         }
+    })
+
+    .state('site.mod_feedback-analysis', {
+        url: '/mod_feedback-analysis',
+        params: {
+            feedbackid: null,
+            courseid: null,
+            module: null,
+            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+        },
+        views: {
+            'site': {
+                controller: 'mmaModFeedbackAnalysisCtrl',
+                templateUrl: 'addons/mod/feedback/templates/analysis.html'
+            }
+        }
     });
 })
 
 .config(function($mmCourseDelegateProvider, $mmContentLinksDelegateProvider, $mmCoursePrefetchDelegateProvider) {
     $mmCourseDelegateProvider.registerContentHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackHandlers.courseContent');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:index', '$mmaModFeedbackHandlers.indexLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:analysis', '$mmaModFeedbackHandlers.analysisLinksHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackPrefetchHandler');
 });
diff --git a/www/addons/mod/feedback/scss/styles.scss b/www/addons/mod/feedback/scss/styles.scss
new file mode 100644
index 00000000000..1da40ceab79
--- /dev/null
+++ b/www/addons/mod/feedback/scss/styles.scss
@@ -0,0 +1,9 @@
+.mm-site_mod_feedback-analysis {
+  ul {
+    font-size: $font-size-base;
+  }
+  .item .chart {
+    max-width: 500px;
+    margin: 0 auto;
+  }
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index a56ce1cebf2..d861ede2160 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .factory('$mmaModFeedbackHandlers', function($mmCourse, $mmaModFeedback, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
         mmaModFeedbackComponent, $mmaModFeedbackPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded,
-        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate) {
+        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, $mmContentLinkHandlerFactory) {
     var self = {};
 
     /**
@@ -155,5 +155,41 @@ angular.module('mm.addons.mod_feedback')
      */
     self.indexLinksHandler = $mmContentLinksHelper.createModuleIndexLinkHandler('mmaModFeedback', 'feedback', $mmaModFeedback);
 
+    /**
+     * Content links handler for a feedback analysis.
+     * Match mod/feedback/analysis.php with a valid feedback id.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#analysisLinksHandler
+     */
+    self.analysisLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/feedback\/analysis\.php.*([\&\?]id=\d+)/, '$mmCourseDelegate_mmaModFeedback');
+
+    // Check if the handler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.analysisLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.analysisLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        return [{
+            action: function(siteId) {
+                var modal = $mmUtil.showModalLoading(),
+                    moduleId = parseInt(params.id, 10);
+
+                return $mmCourse.getModuleBasicInfo(moduleId).then(function(module) {
+                    var stateParams = {
+                        module: module,
+                        moduleid: module.id,
+                        feedbackid: module.instance,
+                        courseid: module.course
+                    };
+                    return $mmContentLinksHelper.goInSite('site.mod_feedback-analysis', stateParams, siteId);
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 5b362cd1be0..52996c7c02a 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -126,4 +126,4 @@ angular.module('mm.addons.mod_feedback')
     };
 
     return self;
-});
\ No newline at end of file
+});
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
new file mode 100644
index 00000000000..33957021bbe
--- /dev/null
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -0,0 +1,81 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <mm-context-menu>
+            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
+            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+        </mm-context-menu>
+    </ion-nav-buttons>
+    <ion-content mm-state-class ng-class="{'has-footer': feedbackLoaded && access.canviewreports}">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
+        <mm-loading hide-until="feedbackLoaded">
+            <section class="list" ng-if="access.canedititems || !access.isempty">
+                <div ng-if="access.canedititems">
+                    <div class="item item-text-wrap item-input item-select" ng-if="groupInfo.separateGroups || groupInfo.visibleGroups">
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                        </select>
+                    </div>
+                    <div class="item item-text-wrap item-icon-right">
+                        <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
+                        <span class="badge">{{feedback.completedCount}}</span>
+                    </div>
+                    <div class="item item-text-wrap item-icon-right">
+                        <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
+                        <span class="badge">{{feedback.itemsCount}}</span>
+                    </div>
+                </div>
+                <div class="mm-warning-card-icon" ng-if="warning">
+                    <i class="icon ion-close-circled padding"></i> {{ warning }}
+                </div>
+                <div class="list" ng-if="items && items.length">
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap">
+                        <p class="item-heading">{{item.number}}. {{ item.name }}</p>
+                        <p>{{ item.label }}</p>
+                        <div ng-if="item.template" ng-include="item.template"></div>
+                    </div>
+
+
+                    <script type="text/ng-template" id="numeric">
+                        <ul>
+                            <li ng-repeat="data in item.data track by $index"><i class="icon ion-minus-round"></i> {{ data }}</li>
+                        </ul>
+                        <p>{{ 'mma.mod_feedback.average' | translate }}: {{item.average | number : 2}}</p>
+                    </script>
+                    <script type="text/ng-template" id="list">
+                        <ul>
+                            <li ng-repeat="data in item.data track by $index" ng-if="data">
+                                <i class="icon ion-minus-round"></i> <mm-format-text watch="true">{{ data }}</mm-format-text>
+                            </li>
+                        </ul>
+                    </script>
+                    <script type="text/ng-template" id="chart">
+                        <canvas ng-if="item.labels.length <= 5 && !item.single" class="chart chart-bar" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
+                        <canvas ng-if="item.labels.length > 5 && !item.single" class="chart chart-horizontal-bar" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
+                        <canvas ng-if="item.single" class="chart chart-doughnut" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
+                        <p ng-if="item.average">{{ 'mma.mod_feedback.average' | translate }}: {{item.average | number : 2}}</p>
+                    </script>
+                </div>
+                </div>
+            </section>
+        </mm-loading>
+    </ion-content>
+    <ion-footer ng-if="feedbackLoaded && access.canviewreports">
+        <div class="tabs tabs-icon-top">
+            <a class="tab-item" ng-click="openFeature()">
+                <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
+            </a>
+            <a class="tab-item active">
+                <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
+            </a>
+            <a class="tab-item" ng-click="openFeature('show_entries', true)">
+                <i class="icon ion-checkmark-round"></i>{{ 'mma.mod_feedback.show_entries' | translate }}
+            </a>
+            <a class="tab-item" ng-if="!access.isanonymous" ng-click="openFeature('show_nonrespondents', true)">
+                <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
+            </a>
+        </div>
+    </ion-footer>
+</ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index e49481034ba..2712045dbcf 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -73,7 +73,7 @@
             <a class="tab-item active">
                 <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
             </a>
-            <a class="tab-item" ng-click="openFeature('analysis', true)">
+            <a class="tab-item" ng-click="openFeature('analysis')">
                 <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
             </a>
             <a class="tab-item" ng-click="openFeature('show_entries', true)">
@@ -84,4 +84,4 @@
             </a>
         </div>
     </ion-footer>
-</ion-view>
\ No newline at end of file
+</ion-view>
diff --git a/www/core/lib/text.js b/www/core/lib/text.js
index 58376884cf7..b097cf34199 100644
--- a/www/core/lib/text.js
+++ b/www/core/lib/text.js
@@ -683,5 +683,23 @@ angular.module('mm.core')
         return uri;
     };
 
+    /**
+     * Same as Javascript's JSON.parse, but if an exception is thrown it will return the original text.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmText#parseJSON
+     * @param  {String} json JSON text.
+     * @return {Mixed}       JSON parsed as object or what it gets.
+     */
+    self.parseJSON = function(json) {
+        try {
+            return JSON.parse(json);
+        } catch(ex) {
+            // Error, use the json text.
+        }
+        return json;
+    };
+
     return self;
 });

From c17e9780771ae2633497dd40046dfc8368aace65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 10 Mar 2017 14:01:07 +0100
Subject: [PATCH 039/218] MOBILE-2003 feedback: Add question answer structure

---
 .../mod/feedback/controllers/analysis.js      |   2 +
 www/addons/mod/feedback/controllers/form.js   | 151 +++++++++++++
 www/addons/mod/feedback/controllers/index.js  |  32 ++-
 www/addons/mod/feedback/lang/en.json          |   3 +
 www/addons/mod/feedback/main.js               |  17 ++
 www/addons/mod/feedback/services/feedback.js  | 201 +++++++++++++++++-
 www/addons/mod/feedback/services/handlers.js  |  49 +++++
 www/addons/mod/feedback/services/helper.js    |  16 +-
 .../mod/feedback/services/prefetch_handler.js |   6 +
 www/addons/mod/feedback/templates/form.html   |  46 ++++
 www/addons/mod/feedback/templates/index.html  |   5 +-
 www/core/directives/markrequired.js           |   2 +-
 12 files changed, 522 insertions(+), 8 deletions(-)
 create mode 100644 www/addons/mod/feedback/controllers/form.js
 create mode 100644 www/addons/mod/feedback/templates/form.html

diff --git a/www/addons/mod/feedback/controllers/analysis.js b/www/addons/mod/feedback/controllers/analysis.js
index db295b12097..f0d962b4393 100644
--- a/www/addons/mod/feedback/controllers/analysis.js
+++ b/www/addons/mod/feedback/controllers/analysis.js
@@ -82,6 +82,8 @@ angular.module('mm.addons.mod_feedback')
                     $scope.groupInfo = groupInfo;
                     return $scope.setGroup($scope.selectedGroup);
                 });
+            } else {
+                // @todo: go back
             }
         }).catch(function(message) {
             if (!refresh) {
diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
new file mode 100644
index 00000000000..0e908bf7c65
--- /dev/null
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -0,0 +1,151 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback form controller.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc controller
+ * @name mmaModFeedbackFormCtrl
+ */
+.controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText,
+            mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper) {
+    var feedbackId = $stateParams.feedbackid,
+        module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        currentPage = $stateParams.page,
+        feedback;
+
+    $scope.title = $stateParams.title;
+    $scope.moduleUrl = module.url;
+    $scope.moduleName = $mmCourse.translateModuleName('feedback');
+    $scope.courseId = courseId;
+    $scope.refreshIcon = 'spinner';
+    $scope.component = mmaModFeedbackComponent;
+    $scope.componentId = module.id;
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackFormData(refresh, showErrors) {
+        $scope.isOnline = $mmApp.isOnline();
+        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
+            feedback = feedbackData;
+
+            $scope.title = feedback.name || $scope.title;
+            $scope.description = feedback.intro;
+
+            $scope.feedback = feedback;
+
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
+        }).then(function(accessData) {
+            $scope.access = accessData;
+
+            if (accessData.cansubmit && !accessData.isempty) {
+
+                return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id) : $q.when(currentPage);
+            } else {
+                // @todo: go back
+            }
+        }).then(function(page) {
+            return fetchFeedbackPageData(page);
+        }).catch(function(message) {
+            if (!refresh) {
+                // Some call failed, retry without using cache since it might be a new activity.
+                return refreshAllData();
+            }
+
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        }).finally(function(){
+            $scope.feedbackLoaded = true;
+        });
+    }
+
+    function fetchFeedbackPageData(page) {
+        currentPage = page;
+        return $mmaModFeedback.getPageItems(feedback.id, page).then(function(response) {
+            $scope.items = response.items.map(function(itemData) {
+                return $mmaModFeedbackHelper.getItemForm(itemData);
+            });
+
+            $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
+            $scope.hasNextPage = response.hasnextpage ? page + 1 : false;
+        });
+    }
+
+
+    // Convenience function to refresh all the data.
+    function refreshAllData(showErrors) {
+        var promises = [];
+        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
+        if (feedback) {
+            promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
+            promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
+            promises.push($mmaModFeedback.invalidateAllPagesData(feedback.id));
+        }
+
+        return $q.all(promises).finally(function() {
+            return fetchFeedbackFormData(true, showErrors);
+        });
+    }
+
+    // Function to go to move through the questions form.
+    $scope.gotoPage = function(page) {
+        $scope.feedbackLoaded = false;
+        // @todo: send data and process it. Control required as well.
+        return fetchFeedbackPageData(page).finally(function(){
+            $scope.feedbackLoaded = true;
+        });
+    };
+
+    // Function to send and save answers.
+    $scope.save = function() {
+        // @todo
+    };
+
+    // Function to discard and go back.
+    $scope.cancel = function() {
+        // @todo
+    };
+
+    fetchFeedbackFormData().finally(function() {
+        $scope.refreshIcon = 'ion-refresh';
+    });
+
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshFeedback = function(showErrors) {
+        if ($scope.feedbackLoaded) {
+            $scope.refreshIcon = 'spinner';
+            return refreshAllData(showErrors).finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+    // Refresh online status when changes.
+    onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
+        $scope.isOnline = online;
+    });
+
+    $scope.$on('$destroy', function() {
+        onlineObserver && onlineObserver.off && onlineObserver.off();
+    });
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 6abd567c510..29e85b0ef5e 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackIndexCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $mmCourseHelper, $q, $mmCourse,
             $mmText, mmaModFeedbackComponent, $mmEvents, $ionicScrollDelegate, $mmApp, $translate, $mmGroups, $mmaModFeedbackHelper,
-            mmCoreEventOnlineStatusChanged) {
+            mmCoreEventOnlineStatusChanged, $state) {
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         feedback,
@@ -54,8 +54,16 @@ angular.module('mm.addons.mod_feedback')
 
             return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
         }).then(function(accessData) {
+            var promises = [];
+
             $scope.access = accessData;
 
+            if (accessData.cancomplete && accessData.cansubmit && accessData.isopen) {
+                promises.push($mmaModFeedback.getResumePage(feedback.id).then(function(goPage) {
+                    $scope.goPage = goPage;
+                }));
+            }
+
             if (accessData.canedititems) {
                 feedback.timeopen = parseInt(feedback.timeopen) * 1000 || false;
                 feedback.openTimeReadable = feedback.timeopen ? moment(feedback.timeopen).format('LLL') : false;
@@ -63,11 +71,13 @@ angular.module('mm.addons.mod_feedback')
                 feedback.closeTimeReadable = feedback.timeclose ? moment(feedback.timeclose).format('LLL') : false;
 
                 // Get groups (only for teachers).
-                return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+                promises.push($mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
                     $scope.groupInfo = groupInfo;
                     return $scope.setGroup($scope.selectedGroup);
-                });
+                }));
             }
+
+            return $q.all(promises);
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModFeedbackComponent);
@@ -101,6 +111,7 @@ angular.module('mm.addons.mod_feedback')
         if (feedback) {
             promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
             promises.push($mmaModFeedback.invalidateAnalysisData(feedback.id));
+            promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
             promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
             promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
         }
@@ -151,6 +162,19 @@ angular.module('mm.addons.mod_feedback')
         $mmaModFeedbackHelper.openFeature(feature, module, courseId, notImplemented);
     };
 
+    // Function to go to the questions form.
+    $scope.gotoAnswerQuestions = function(page) {
+        var stateParams = {
+            module: module,
+            moduleid: module.id,
+            courseid: courseId,
+            feedbackid: module.instance,
+            page: page || 0
+        };
+        $state.go('site.mod_feedback-form', stateParams);
+    };
+
+
     function scrollTop() {
         if (!scrollView) {
             scrollView = $ionicScrollDelegate.$getByHandle('mmaModFeedbackScroll');
@@ -166,4 +190,4 @@ angular.module('mm.addons.mod_feedback')
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
     });
-});
\ No newline at end of file
+});
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index fd02db0ee25..d529943ef08 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -10,11 +10,14 @@
     "feedbackopen": "Allow answers from",
     "mapcourses": "Map feedback to courses",
     "mode": "Mode",
+    "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
+    "previous_page": "Previous page",
     "questions": "Questions",
+    "save_entries": "Submit your answers",
     "show_entries": "Show responses",
     "show_nonrespondents": "Show non-respondents",
     "this_feedback_is_already_submitted": "You've already completed this activity."
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index cd8e34b5ee0..2390cfaab6e 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -35,6 +35,23 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
         }
     })
 
+    .state('site.mod_feedback-form', {
+        url: '/mod_feedback-form',
+        params: {
+            feedbackid: null,
+            page: null,
+            courseid: null,
+            module: null,
+            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+        },
+        views: {
+            'site': {
+                controller: 'mmaModFeedbackFormCtrl',
+                templateUrl: 'addons/mod/feedback/templates/form.html'
+            }
+        }
+    })
+
     .state('site.mod_feedback-analysis', {
         url: '/mod_feedback-analysis',
         params: {
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index d7ae893dee3..c02f5a2b816 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -76,6 +76,46 @@ angular.module('mm.addons.mod_feedback')
         return getAnalysisDataPrefixCacheKey(feedbackId) + ":" + groupId;
     }
 
+    /**
+     * Get prefix cache key for resume feedback page data WS calls.
+     *
+     * @param {Number} feedbackId   Feedback ID.
+     * @return {String}             Cache key.
+     */
+    function getResumePageDataCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':launch';
+    }
+
+    /**
+     * Get prefix cache key for all pages data WS calls.
+     *
+     * @param  {Number} feedbackId  Feedback ID.
+     * @return {String}             Cache key.
+     */
+    function getPagesDataPrefixCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':page:';
+    }
+
+    /**
+     * Get cache key for get page items feedback data WS calls.
+     *
+     * @param  {Number} feedbackId  Feedback ID.
+     * @param  {Number} page        The page to get.
+     * @return {String}             Cache key.
+     */
+    function getPageItemsDataCacheKey(feedbackId, page) {
+        return getPagesDataPrefixCacheKey(feedbackId) + page;
+    }
+
+    /**
+     * Get cache key for get items feedback data WS calls.
+     *
+     * @param  {Number} feedbackId  Feedback ID.
+     * @return {String}             Cache key.
+     */
+    function getItemsDataCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':items';
+    }
 
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
@@ -89,7 +129,9 @@ angular.module('mm.addons.mod_feedback')
     self.isPluginEnabled = function(siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return  site.wsAvailable('mod_feedback_get_feedbacks_by_courses') &&
-                    site.wsAvailable('mod_feedback_get_feedback_access_information');
+                    site.wsAvailable('mod_feedback_get_feedback_access_information') &&
+                    site.wsAvailable('mod_feedback_get_page_items') &&
+                    site.wsAvailable('mod_feedback_get_items');
         });
     };
 
@@ -264,6 +306,163 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Gets the resume page information.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getResumePage
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getResumePage = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getResumePageDataCacheKey(feedbackId)
+                };
+
+            return site.read('mod_feedback_launch_feedback', params, preSets).then(function(response) {
+                if (response && typeof response.gopage != "undefined") {
+                    return response.gopage;
+                }
+                return $q.reject();
+            });
+        });
+    };
+
+    /**
+     * Invalidates launch feedback data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateLaunchFeedbackData
+     * @param {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateResumePageData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getResumePageDataCacheKey(feedbackId));
+        });
+    };
+
+    /**
+     * Get a single feedback page items.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getPageItems
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    page            The page to get.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getPageItems = function(feedbackId, page, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId,
+                    page: page
+                },
+                preSets = {
+                    cacheKey: getPageItemsDataCacheKey(feedbackId, page)
+                };
+
+            return site.read('mod_feedback_get_page_items', params, preSets);
+        });
+    };
+
+    /**
+     * Invalidates get page items data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidatePageItemsData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {Number} page         The page to get.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidatePageItemsData = function(feedbackId, page, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getPageItemsDataCacheKey(feedbackId, page));
+        });
+    };
+
+    /**
+     * Invalidates all pages data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateAllPagesData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateAllPagesData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getPagesDataPrefixCacheKey(feedbackId));
+        });
+    };
+
+    /**
+     * Returns the items (questions) in the given feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getItems
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getItems = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getItemsDataCacheKey(feedbackId)
+                };
+
+            return site.read('mod_feedback_get_items', params, preSets);
+        });
+    };
+
+    /**
+     * Invalidates get items data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateItemsData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateItemsData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getItemsDataCacheKey(feedbackId));
+        });
+    };
+
+    /**
+     * Invalidates all pages data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateAllPagesData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateAllPagesData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getPagesDataPrefixCacheKey(feedbackId));
+        });
+    };
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModFeedback#invalidateFiles.
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index d861ede2160..4eb26c75454 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -173,6 +173,11 @@ angular.module('mm.addons.mod_feedback')
     self.analysisLinksHandler.getActions = function(siteIds, url, params, courseId) {
         return [{
             action: function(siteId) {
+                if (typeof params.id == 'undefined') {
+                    // Id not defined. Cannot treat the URL.
+                    return false;
+                }
+
                 var modal = $mmUtil.showModalLoading(),
                     moduleId = parseInt(params.id, 10);
 
@@ -191,5 +196,49 @@ angular.module('mm.addons.mod_feedback')
         }];
     };
 
+    /**
+     * Content links handler for feedback complete questions.
+     * Match mod/feedback/complete.php with a valid feedback id and optional page.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#completeLinksHandler
+     */
+    self.completeLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/feedback\/complete\.php.*([\?\&](id|gopage)=\d+)/, '$mmCourseDelegate_mmaModFeedback');
+
+    // Check if the handler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.completeLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.completeLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        return [{
+            action: function(siteId) {
+                if (typeof params.id == 'undefined') {
+                    // Id not defined. Cannot treat the URL.
+                    return false;
+                }
+
+                var modal = $mmUtil.showModalLoading(),
+                    moduleId = parseInt(params.id, 10);
+
+                return $mmCourse.getModuleBasicInfo(moduleId).then(function(module) {
+                    var stateParams = {
+                        module: module,
+                        moduleid: module.id,
+                        feedbackid: module.instance,
+                        courseid: module.course,
+                    };
+                    if (typeof params.gopage == 'undefined') {
+                        stateParams.page = parseInt(params.gopage, 10);
+                    }
+                    return $mmContentLinksHelper.goInSite('site.mod_feedback-form', stateParams, siteId);
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 52996c7c02a..406c78ba4b2 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedbackHelper
  */
-.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state) {
+.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText) {
 
     var self = {};
 
@@ -125,5 +125,19 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
+    /**
+     * Process and returns item to print form.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#getItemForm
+     * @param {Object}  item           Item to process
+     * @return {Object}       Item processed to show form.
+     */
+    self.getItemForm = function(item) {
+        // @todo: work on itemData.
+        return item;
+    };
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 19f463f1c4b..4d1a51b36a1 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -201,6 +201,12 @@ angular.module('mm.addons.mod_feedback')
                         return $q.all(p3);
                     }));
                 }
+                if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
+                    p2.push($mmaModFeedback.getResumePage(feedback.id, siteId).then(function(page) {
+                        // @todo: Get all pages.
+                        return $mmaModFeedback.getPageItems(feedback.id, page, siteId);
+                    }));
+                }
 
                 return $q.all(p2);
             }));
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
new file mode 100644
index 00000000000..f1ff9192e69
--- /dev/null
+++ b/www/addons/mod/feedback/templates/form.html
@@ -0,0 +1,46 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <mm-context-menu>
+            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
+            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+        </mm-context-menu>
+    </ion-nav-buttons>
+    <ion-content mm-state-class>
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
+        <mm-loading hide-until="feedbackLoaded">
+            <section ng-if="access.cansubmit && !access.isempty">
+                <div class="list">
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
+                        <p ng-if="access.isanonymous">{{ 'mma.mod_feedback.anonymous' | translate }}</p>
+                        <p ng-if="!access.isanonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
+                    </div>
+                </div>
+                <div class="list" ng-if="items && items.length">
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap">
+                        <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name">{{item.itemnumber}}. {{ item.name }}</p>
+                        <p class="item-text-wrap" ng-if="!item.template && item.presentation">{{ item.presentation }}</p>
+                        <div class="item-text-wrap" ng-if="item.template" ng-include="item.template"></div>
+                    </div>
+                </div>
+
+                <div class="item item-text-wrap row-buttons responsive-sm">
+                    <button class="button button-block" ng-click="cancel()">
+                        {{ 'mm.core.cancel' | translate }}
+                    </button>
+                    <button ng-if="hasPrevPage !== false" class="button button-block icon-left ion-chevron-left" ng-click="gotoPage(hasPrevPage)">
+                        {{ 'mma.mod_feedback.previous_page' | translate }}
+                    </button>
+                    <button ng-if="hasNextPage !== false" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoPage(hasNextPage)">
+                        {{ 'mma.mod_feedback.next_page' | translate }}
+                    </button>
+                    <button ng-if="hasNextPage === false" class="button button-block button-positive" ng-click="save()">
+                        {{ 'mma.mod_feedback.save_entries' | translate }}
+                    </button>
+                </div>
+            </section>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 2712045dbcf..66106d45fca 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -60,9 +60,12 @@
                     </div>
                     <div class="item item-text-wrap row-buttons responsive-sm">
                         <button class="button button-block icon-left ion-search" ng-click="openFeature('print', true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
-                        <button ng-if="access.cancomplete && access.cansubmit" class="button button-block button-positive icon-right ion-chevron-right" ng-click="openFeature('complete', true)">
+                        <button ng-if="access.cancomplete && access.cansubmit && !goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
                             {{ 'mma.mod_feedback.complete_the_form' | translate }}
                         </button>
+                        <button ng-if="access.cancomplete && access.cansubmit && goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions(goPage)">
+                            {{ 'mma.mod_feedback.continue_the_form' | translate }}
+                        </button>
                     </div>
                 </div>
             </section>
diff --git a/www/core/directives/markrequired.js b/www/core/directives/markrequired.js
index 53cd093b882..d1b303deec7 100644
--- a/www/core/directives/markrequired.js
+++ b/www/core/directives/markrequired.js
@@ -27,7 +27,7 @@ angular.module('mm.core')
  *
  * <ion-label mm-mark-required="{{field.required}}">{{ 'mm.login.username' | translate }}</ion-label>
  */
-.directive('mmMarkRequired', function($translate, $timeout) {
+.directive('mmMarkRequired', function($translate, $timeout, $mmText) {
     return {
         restrict: 'A',
         link: function(scope, element, attrs) {

From 26eec19f87dc97d5e34a7c30ae86b0367415ad82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 15 Mar 2017 15:23:46 +0100
Subject: [PATCH 040/218] MOBILE-2003 feedback: Support question templates

---
 www/addons/mod/feedback/controllers/form.js   | 26 +++++-
 www/addons/mod/feedback/lang/en.json          |  1 +
 www/addons/mod/feedback/scss/styles.scss      | 12 ++-
 www/addons/mod/feedback/services/feedback.js  | 16 ----
 www/addons/mod/feedback/services/helper.js    | 91 ++++++++++++++++++-
 .../mod/feedback/services/prefetch_handler.js | 25 ++++-
 www/addons/mod/feedback/templates/form.html   | 41 +++++++--
 www/core/lang/en.json                         |  1 +
 www/core/lib/text.js                          |  8 +-
 9 files changed, 179 insertions(+), 42 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index 0e908bf7c65..ccddd071f9b 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -21,13 +21,15 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc controller
  * @name mmaModFeedbackFormCtrl
  */
-.controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText,
-            mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper) {
+.controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $timeout,
+            mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper,
+            $ionicScrollDelegate) {
     var feedbackId = $stateParams.feedbackid,
         module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         currentPage = $stateParams.page,
-        feedback;
+        feedback,
+        scrollView;
 
     $scope.title = $stateParams.title;
     $scope.moduleUrl = module.url;
@@ -52,7 +54,7 @@ angular.module('mm.addons.mod_feedback')
         }).then(function(accessData) {
             $scope.access = accessData;
 
-            if (accessData.cansubmit && !accessData.isempty) {
+            if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
 
                 return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id) : $q.when(currentPage);
             } else {
@@ -75,9 +77,13 @@ angular.module('mm.addons.mod_feedback')
 
     function fetchFeedbackPageData(page) {
         currentPage = page;
+
         return $mmaModFeedback.getPageItems(feedback.id, page).then(function(response) {
             $scope.items = response.items.map(function(itemData) {
                 return $mmaModFeedbackHelper.getItemForm(itemData);
+            }).filter(function(itemData) {
+                // Filter items with errors.
+                return itemData;
             });
 
             $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
@@ -106,6 +112,7 @@ angular.module('mm.addons.mod_feedback')
         $scope.feedbackLoaded = false;
         // @todo: send data and process it. Control required as well.
         return fetchFeedbackPageData(page).finally(function(){
+            scrollTop();
             $scope.feedbackLoaded = true;
         });
     };
@@ -140,6 +147,15 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
+    function scrollTop() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModFeedbackFormScroll');
+        }
+        $timeout(function() {
+            scrollView && scrollView.scrollTop && scrollView.scrollTop();
+        });
+    }
+
     // Refresh online status when changes.
     onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
         $scope.isOnline = online;
@@ -148,4 +164,4 @@ angular.module('mm.addons.mod_feedback')
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
     });
-});
\ No newline at end of file
+});
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index d529943ef08..745f7f75816 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -12,6 +12,7 @@
     "mode": "Mode",
     "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
+    "not_selected": "Not selected",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
diff --git a/www/addons/mod/feedback/scss/styles.scss b/www/addons/mod/feedback/scss/styles.scss
index 1da40ceab79..fe7bb332588 100644
--- a/www/addons/mod/feedback/scss/styles.scss
+++ b/www/addons/mod/feedback/scss/styles.scss
@@ -6,4 +6,14 @@
     max-width: 500px;
     margin: 0 auto;
   }
-}
\ No newline at end of file
+}
+
+.mm-site_mod_feedback-form {
+  .item-select select {
+      position: relative;
+      padding: $item-padding / 2;
+      max-width: 100%;
+      width: 100%;
+      direction: ltr;
+  }
+}
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index c02f5a2b816..6a9279d8ef5 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -447,22 +447,6 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
-    /**
-     * Invalidates all pages data.
-     *
-     * @module mm.addons.mod_feedback
-     * @ngdoc method
-     * @name $mmaModFeedback#invalidateAllPagesData
-     * @param  {Number} feedbackId   Feedback ID.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}        Promise resolved when the data is invalidated.
-     */
-    self.invalidateAllPagesData = function(feedbackId, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKeyStartingWith(getPagesDataPrefixCacheKey(feedbackId));
-        });
-    };
-
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModFeedback#invalidateFiles.
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 406c78ba4b2..b5fea8b97e6 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -21,9 +21,17 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedbackHelper
  */
-.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText) {
-
-    var self = {};
+.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText, $translate) {
+
+    var self = {},
+        MODE_RESPONSETIME = 1,
+        MODE_COURSE = 2,
+        MODE_CATEGORY = 3,
+        FEEDBACK_LINE_SEP = '|',
+        FEEDBACK_MULTICHOICE_TYPE_SEP = '>>>>>',
+        FEEDBACK_MULTICHOICE_ADJUST_SEP = '<<<<<',
+        FEEDBACK_MULTICHOICE_HIDENOSELECT = 'h',
+        FEEDBACK_MULTICHOICERATED_VALUE_SEP = '####';
 
     /**
      * Get activity feedback group info to be shown on templates.
@@ -132,10 +140,83 @@ angular.module('mm.addons.mod_feedback')
      * @ngdoc method
      * @name $mmaModFeedbackHelper#getItemForm
      * @param {Object}  item           Item to process
+     * @param {Boolean} preview        Previewing options.
      * @return {Object}       Item processed to show form.
      */
-    self.getItemForm = function(item) {
-        // @todo: work on itemData.
+    self.getItemForm = function(item, preview) {
+        switch (item.typ) {
+            case 'label':
+                item.name = "";
+                item.template = 'label';
+                item.presentation = $mmText.replacePluginfileUrls(item.presentation, item.itemfiles);
+                break;
+            case 'info':
+                var type = parseInt(item.presentation, 10);
+                if (type == MODE_COURSE || type == MODE_CATEGORY) {
+                    item.presentation = item.otherdata;
+                } else if (type == MODE_RESPONSETIME) {
+                    item.presentation = moment(new Date().getTime()).format($translate.instant('mm.core.dffulldate'));
+                } else {
+                    // Errors on item, return false.
+                    return false;
+                }
+                item.template = 'label';
+                break;
+            case 'numeric':
+                var range = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+                item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '',
+                item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '',
+                item.template = 'numeric';
+                break;
+            case 'textfield':
+                var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+                item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30,
+                item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
+                item.template = 'textfield';
+                break;
+            case 'textarea':
+                var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+                item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30,
+                item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
+                item.template = 'textarea';
+                break;
+            case 'multichoice':
+            case 'multichoicerated':
+                var parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [];
+                item.subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
+                item.presentation = parts.length > 1 ? parts[1] : '';
+                if (item.subtype != 'd') {
+                    parts = item.presentation.split(FEEDBACK_MULTICHOICE_ADJUST_SEP) || [];
+                    item.presentation = parts.length > 0 ? parts[0] : '';
+                    // Horizontal are not supported right now.
+                    //item.horizontal = parts.length > 1 && !!parts[1];
+                } else {
+                    item.class = "item-select";
+                }
+
+                item.choices = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+                item.choices = item.choices.map(function(choice, index) {
+                    var weightValue = choice.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''],
+                    choice = weightValue.length == 1 ? weightValue[0] : '(' + weightValue[0] + ') ' + weightValue[1];
+                    return {value: index + 1, label: choice};
+                });
+                if (item.subtype === 'r' && item.options.search(FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
+                    item.choices.unshift({value: 0, label: $translate.instant('mma.mod_feedback.not_selected')});
+                }
+                item.template = 'multichoice-' + item.subtype;
+                break;
+            case 'pagebreak':
+            case 'captcha':
+                if (!preview) {
+                    // Captcha is not supported right now because it doesn't make sense (app cannot be used as guest).
+                    // Otherwise label will be shown on preview.
+                    // Pagebreaks are only used on preview.
+                    return false;
+                }
+                break;
+            default:
+                return false;
+        }
         return item;
     };
 
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 4d1a51b36a1..cc1f30dc0a1 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -57,13 +57,25 @@ angular.module('mm.addons.mod_feedback')
      * @return {Promise}          Promise resolved with the list of files.
      */
     self.getFiles = function(module, courseId, siteId) {
-        return $mmaModFeedback.getFeedback(courseId, module.id, siteId).then(function(feedback) {
+        var files = [],
+            feedback;
+        return $mmaModFeedback.getFeedback(courseId, module.id, siteId).then(function(response) {
+            feedback = response;
+
             // Get intro files and page after submit files.
-            var files = feedback.pageaftersubmitfiles || [];
-            return files.concat(self.getIntroFilesFromInstance(module, feedback));
+            files = feedback.pageaftersubmitfiles || [];
+            files = files.concat(self.getIntroFilesFromInstance(module, feedback));
+
+            return $mmaModFeedback.getItems(feedback.id, siteId);
+        }).then(function(response) {
+            angular.forEach(response.items, function(item) {
+                files = files.concat(item.itemfiles);
+            });
+
+            return files;
         }).catch(function() {
-            // Feedback not found, return empty list.
-            return [];
+            // Any error, return the list we have.
+            return files;
         });
     };
 
@@ -201,6 +213,9 @@ angular.module('mm.addons.mod_feedback')
                         return $q.all(p3);
                     }));
                 }
+
+                p2.push($mmaModFeedback.getItems(feedback.id, siteId));
+
                 if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
                     p2.push($mmaModFeedback.getResumePage(feedback.id, siteId).then(function(page) {
                         // @todo: Get all pages.
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index f1ff9192e69..4a9f799e057 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -7,10 +7,10 @@
             <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
-    <ion-content mm-state-class>
+    <ion-content delegate-handle="mmaModFeedbackFormScroll" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
-            <section ng-if="access.cansubmit && !access.isempty">
+            <section ng-if="access.cancomplete && access.cansubmit && !access.isempty">
                 <div class="list">
                     <div class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
@@ -19,13 +19,42 @@
                     </div>
                 </div>
                 <div class="list" ng-if="items && items.length">
-                    <div ng-repeat="item in items track by $index" class="item item-text-wrap">
-                        <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name">{{item.itemnumber}}. {{ item.name }}</p>
-                        <p class="item-text-wrap" ng-if="!item.template && item.presentation">{{ item.presentation }}</p>
-                        <div class="item-text-wrap" ng-if="item.template" ng-include="item.template"></div>
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak'}">
+                        <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
+                        <div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
                     </div>
                 </div>
 
+                <script type="text/ng-template" id="label">
+                    <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ item.presentation }}</mm-format-text></p>
+                </script>
+
+                <script type="text/ng-template" id="textfield">
+                    <input type="text" value="{{item.value}}" autocorrect="off" size="{{item.size}}" size="{{item.length}}"/>
+                </script>
+
+                <script type="text/ng-template" id="numeric">
+                    <input type="number" value="{{item.value}}" min="{{item.rangefrom}}" max="{{item.rangeto}}"/>
+                </script>
+
+                <script type="text/ng-template" id="textarea">
+                    <textarea aria-multiline="true" rows="{{item.height}}" cols="{{item.width}}"></textarea>
+                </script>
+
+                <script type="text/ng-template" id="multichoice-r">
+                    <ion-radio ng-if="item.subtype == 'r'" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
+                </script>
+
+                <script type="text/ng-template" id="multichoice-c">
+                    <ion-checkbox ng-if="item.subtype == 'c'" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
+                </script>
+
+                <script type="text/ng-template" id="multichoice-d">
+                    <select ng-if="item.subtype == 'd'" mm-ios-select-fix>
+                        <option ng-repeat="option in item.choices" ng-value="option.value">{{option.label}}</option>
+                    </select>
+                </script>
+
                 <div class="item item-text-wrap row-buttons responsive-sm">
                     <button class="button button-block" ng-click="cancel()">
                         {{ 'mm.core.cancel' | translate }}
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index e0221cba1a3..a8bb3053206 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -42,6 +42,7 @@
     "delete": "Delete",
     "deleting": "Deleting",
     "description": "Description",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
diff --git a/www/core/lib/text.js b/www/core/lib/text.js
index b097cf34199..645dbfbabbf 100644
--- a/www/core/lib/text.js
+++ b/www/core/lib/text.js
@@ -478,12 +478,12 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmText#getTextPluginfileUrl
-     * @param  {Object[]} files Files to extract the URL from. They need to have the URL in a 'fileurl' attribute.
+     * @param  {Object[]} files Files to extract the URL from. They need to have the URL in a 'url' or 'fileurl' attribute.
      * @return {String}         Pluginfile URL, false if no files found.
      */
     self.getTextPluginfileUrl = function(files) {
         if (files && files.length) {
-            var fileURL = files[0].fileurl;
+            var fileURL = files[0].url || files[0].fileurl;
             // Remove text after last slash (encoded or not).
             return fileURL.substr(0, Math.max(fileURL.lastIndexOf('/'), fileURL.lastIndexOf('%2F')));
         }
@@ -498,7 +498,7 @@ angular.module('mm.core')
      * @ngdoc method
      * @name $mmText#replacePluginfileUrls
      * @param  {String} text    Text to treat.
-     * @param  {Object[]} files Files to extract the pluginfile URL from. They need to have the URL in a 'fileurl' attribute.
+     * @param  {Object[]} files Files to extract the pluginfile URL from. They need to have the URL in a 'url'/'fileurl' attribute.
      * @return {String}         Treated text.
      */
     self.replacePluginfileUrls = function(text, files) {
@@ -518,7 +518,7 @@ angular.module('mm.core')
      * @ngdoc method
      * @name $mmText#restorePluginfileUrls
      * @param  {String} text    Text to treat.
-     * @param  {Object[]} files Files to extract the pluginfile URL from.  They need to have the URL in a 'fileurl' attribute.
+     * @param  {Object[]} files Files to extract the pluginfile URL from.  They need to have the URL in a 'url'/'fileurl' attribute.
      * @return {String}         Treated text.
      */
     self.restorePluginfileUrls = function(text, files) {

From 96b8cddbff17c3bcd8fc7f57ea21ae20c376c92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 17 Mar 2017 11:02:15 +0100
Subject: [PATCH 041/218] MOBILE-2003 file: Use url field to fetch files

---
 .../components/course/services/prefetchdelegate.js  |  8 +++++---
 .../components/course/services/prefetchfactory.js   |  9 +++++----
 www/core/lib/filepool.js                            | 13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/www/core/components/course/services/prefetchdelegate.js b/www/core/components/course/services/prefetchdelegate.js
index 182193e23ff..49bc7e73102 100644
--- a/www/core/components/course/services/prefetchdelegate.js
+++ b/www/core/components/course/services/prefetchdelegate.js
@@ -648,9 +648,10 @@ angular.module('mm.core')
 
                             // Retrieve file size if it's downloaded.
                             angular.forEach(files, function(file) {
-                                promises.push($mmFilepool.getFilePathByUrl(siteId, file.fileurl).then(function(path) {
+                                var fileUrl = file.url || file.fileurl;
+                                promises.push($mmFilepool.getFilePathByUrl(siteId, fileUrl).then(function(path) {
                                     return $mmFS.getFileSize(path).catch(function () {
-                                        return $mmFilepool.isFileDownloadingByUrl(siteId, file.fileurl).then(function() {
+                                        return $mmFilepool.isFileDownloadingByUrl(siteId, fileUrl).then(function() {
                                             // If downloading, count as downloaded.
                                             return file.filesize;
                                         }).catch(function() {
@@ -813,7 +814,8 @@ angular.module('mm.core')
                 promise = self.getModuleFiles(module, courseid).then(function(files) {
                     var promises = [];
                     angular.forEach(files, function(file) {
-                        promises.push($mmFilepool.removeFileByUrl(siteId, file.fileurl).catch(function() {
+                        var fileUrl = file.url || file.fileurl;
+                        promises.push($mmFilepool.removeFileByUrl(siteId, fileUrl).catch(function() {
                             // Ignore errors.
                         }));
                     });
diff --git a/www/core/components/course/services/prefetchfactory.js b/www/core/components/course/services/prefetchfactory.js
index c8892119579..50d64490f8a 100644
--- a/www/core/components/course/services/prefetchfactory.js
+++ b/www/core/components/course/services/prefetchfactory.js
@@ -104,11 +104,12 @@ angular.module('mm.core.course')
                         if (dirPath) {
                             // Download intro files in filepool root folder.
                             angular.forEach(introFiles, function(file) {
+                                var fileUrl = file.url || file.fileurl;
                                 if (prefetch) {
-                                    promises.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl,
+                                    promises.push($mmFilepool.addToQueueByUrl(siteId, fileUrl,
                                             that.component, module.id, file.timemodified));
                                 } else {
-                                    promises.push($mmFilepool.downloadUrl(siteId, file.fileurl, false,
+                                    promises.push($mmFilepool.downloadUrl(siteId, fileUrl, false,
                                             that.component, module.id, file.timemodified));
                                 }
                             });
@@ -190,7 +191,7 @@ angular.module('mm.core.course')
                         eventNames = [];
 
                     angular.forEach(module.contents, function(content) {
-                        var url = content.fileurl;
+                        var url = content.url || content.fileurl;
                         if (!that.isFileDownloadable(content)) {
                             return;
                         }
@@ -226,7 +227,7 @@ angular.module('mm.core.course')
                     var promises = [];
 
                     angular.forEach(module.contents, function(content) {
-                        var url = content.fileurl;
+                        var url = content.url || content.fileurl;
                         if (!that.isFileDownloadable(content)) {
                             return;
                         }
diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index b9d77100ca3..f32d1e639ab 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -321,7 +321,7 @@ angular.module('mm.core')
         var promises = [];
         // Prefetch files.
         angular.forEach(files, function(file) {
-            promises.push(self.addToQueueByUrl(siteId, file.fileurl, component, componentId, file.timemodified));
+            promises.push(self.addToQueueByUrl(siteId, file.url || file.fileurl, component, componentId, file.timemodified));
         });
 
         return $q.all(promises);
@@ -643,7 +643,8 @@ angular.module('mm.core')
             angular.forEach(fileList, function(file) {
                 var path,
                     promise,
-                    fileLoaded = 0;
+                    fileLoaded = 0,
+                    fileUrl = file.url || file.fileurl;
 
                 if (dirPath) {
                     // Calculate the path to the file.
@@ -655,9 +656,9 @@ angular.module('mm.core')
                 }
 
                 if (prefetch) {
-                    promise = self.addToQueueByUrl(siteId, file.fileurl, component, componentId, file.timemodified, path);
+                    promise = self.addToQueueByUrl(siteId, fileUrl, component, componentId, file.timemodified, path);
                 } else {
-                    promise = self.downloadUrl(siteId, file.fileurl, false, component, componentId, file.timemodified, path);
+                    promise = self.downloadUrl(siteId, fileUrl, false, component, componentId, file.timemodified, path);
                 }
 
                 // Using undefined for success & fail will pass the success/failure to the parent promise.
@@ -1842,8 +1843,8 @@ angular.module('mm.core')
         var revision = 0;
 
         angular.forEach(files, function(file) {
-            if (file.fileurl) {
-                var r = self.getRevisionFromUrl(file.fileurl);
+            if (file.url || file.fileurl) {
+                var r = self.getRevisionFromUrl(file.url || file.fileurl);
                 if (r > revision) {
                     revision = r;
                 }

From 4df3c635631074301d11fd3b71f19767ba1cd111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 16 Mar 2017 15:34:58 +0100
Subject: [PATCH 042/218] MOBILE-2003 feedback: Add preview

---
 www/addons/mod/feedback/controllers/form.js  | 36 +++++++++++-----
 www/addons/mod/feedback/controllers/index.js |  5 ++-
 www/addons/mod/feedback/main.js              |  1 +
 www/addons/mod/feedback/scss/styles.scss     |  3 ++
 www/addons/mod/feedback/services/handlers.js | 44 ++++++++++++++++++++
 www/addons/mod/feedback/templates/form.html  |  9 ++--
 www/addons/mod/feedback/templates/index.html |  2 +-
 7 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index ccddd071f9b..ceca12d7b8b 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $timeout,
             mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper,
-            $ionicScrollDelegate) {
+            $ionicScrollDelegate, $ionicHistory) {
     var feedbackId = $stateParams.feedbackid,
         module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -38,6 +38,7 @@ angular.module('mm.addons.mod_feedback')
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
+    $scope.preview = !!$stateParams.preview;
 
     // Convenience function to get feedback data.
     function fetchFeedbackFormData(refresh, showErrors) {
@@ -54,11 +55,11 @@ angular.module('mm.addons.mod_feedback')
         }).then(function(accessData) {
             $scope.access = accessData;
 
-            if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
-
+            if (!$scope.preview && accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
                 return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id) : $q.when(currentPage);
             } else {
-                // @todo: go back
+                $scope.preview = true;
+                return $q.when(0);
             }
         }).then(function(page) {
             return fetchFeedbackPageData(page);
@@ -76,18 +77,26 @@ angular.module('mm.addons.mod_feedback')
     }
 
     function fetchFeedbackPageData(page) {
-        currentPage = page;
+        var promise;
+
+        if ($scope.preview) {
+            promise = $mmaModFeedback.getItems(feedback.id);
+        } else {
+            currentPage = page;
 
-        return $mmaModFeedback.getPageItems(feedback.id, page).then(function(response) {
+            promise = $mmaModFeedback.getPageItems(feedback.id, page).then(function(response) {
+                $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
+                $scope.hasNextPage = response.hasnextpage ? page + 1 : false;
+                return response;
+            });
+        }
+        return promise.then(function(response) {
             $scope.items = response.items.map(function(itemData) {
-                return $mmaModFeedbackHelper.getItemForm(itemData);
+                return $mmaModFeedbackHelper.getItemForm(itemData, $scope.preview);
             }).filter(function(itemData) {
                 // Filter items with errors.
                 return itemData;
             });
-
-            $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
-            $scope.hasNextPage = response.hasnextpage ? page + 1 : false;
         });
     }
 
@@ -99,7 +108,11 @@ angular.module('mm.addons.mod_feedback')
         if (feedback) {
             promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
             promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
-            promises.push($mmaModFeedback.invalidateAllPagesData(feedback.id));
+            if ($scope.preview) {
+                promises.push($mmaModFeedback.invalidateItemsData(feedback.id));
+            } else {
+                promises.push($mmaModFeedback.invalidateAllPagesData(feedback.id));
+            }
         }
 
         return $q.all(promises).finally(function() {
@@ -125,6 +138,7 @@ angular.module('mm.addons.mod_feedback')
     // Function to discard and go back.
     $scope.cancel = function() {
         // @todo
+        $ionicHistory.goBack();
     };
 
     fetchFeedbackFormData().finally(function() {
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 29e85b0ef5e..051c4c6c754 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -163,13 +163,14 @@ angular.module('mm.addons.mod_feedback')
     };
 
     // Function to go to the questions form.
-    $scope.gotoAnswerQuestions = function(page) {
+    $scope.gotoAnswerQuestions = function(page, preview) {
         var stateParams = {
             module: module,
             moduleid: module.id,
             courseid: courseId,
             feedbackid: module.instance,
-            page: page || 0
+            page: page || 0,
+            preview: !!preview
         };
         $state.go('site.mod_feedback-form', stateParams);
     };
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 2390cfaab6e..65c0b459dff 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -40,6 +40,7 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
         params: {
             feedbackid: null,
             page: null,
+            preview: null,
             courseid: null,
             module: null,
             moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
diff --git a/www/addons/mod/feedback/scss/styles.scss b/www/addons/mod/feedback/scss/styles.scss
index fe7bb332588..3bd49d60a88 100644
--- a/www/addons/mod/feedback/scss/styles.scss
+++ b/www/addons/mod/feedback/scss/styles.scss
@@ -16,4 +16,7 @@
       width: 100%;
       direction: ltr;
   }
+  input, textarea {
+    background: transparent;
+  }
 }
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index 4eb26c75454..6b61ad44a49 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -228,6 +228,7 @@ angular.module('mm.addons.mod_feedback')
                         moduleid: module.id,
                         feedbackid: module.instance,
                         courseid: module.course,
+                        preview: false
                     };
                     if (typeof params.gopage == 'undefined') {
                         stateParams.page = parseInt(params.gopage, 10);
@@ -240,5 +241,48 @@ angular.module('mm.addons.mod_feedback')
         }];
     };
 
+    /**
+     * Content links handler for feedback print questions.
+     * Match mod/feedback/print.php with a valid feedback id.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#printLinksHandler
+     */
+    self.printLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/feedback\/print\.php.*([\?\&](id)=\d+)/, '$mmCourseDelegate_mmaModFeedback');
+
+    // Check if the printLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.completeLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.printLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        return [{
+            action: function(siteId) {
+                if (typeof params.id == 'undefined') {
+                    // Id not defined. Cannot treat the URL.
+                    return false;
+                }
+
+                var modal = $mmUtil.showModalLoading(),
+                    moduleId = parseInt(params.id, 10);
+
+                return $mmCourse.getModuleBasicInfo(moduleId).then(function(module) {
+                    var stateParams = {
+                        module: module,
+                        moduleid: module.id,
+                        feedbackid: module.instance,
+                        courseid: module.course,
+                        preview: true
+                    };
+                    return $mmContentLinksHelper.goInSite('site.mod_feedback-form', stateParams, siteId);
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
+
     return self;
 });
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 4a9f799e057..586e7e13e78 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -10,7 +10,7 @@
     <ion-content delegate-handle="mmaModFeedbackFormScroll" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
-            <section ng-if="access.cancomplete && access.cansubmit && !access.isempty">
+            <section ng-if="items">
                 <div class="list">
                     <div class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
@@ -19,7 +19,7 @@
                     </div>
                 </div>
                 <div class="list" ng-if="items && items.length">
-                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak'}">
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0 && preview }">
                         <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
                         <div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
                     </div>
@@ -55,10 +55,7 @@
                     </select>
                 </script>
 
-                <div class="item item-text-wrap row-buttons responsive-sm">
-                    <button class="button button-block" ng-click="cancel()">
-                        {{ 'mm.core.cancel' | translate }}
-                    </button>
+                <div ng-if="!preview" class="item item-text-wrap row-buttons responsive-sm">
                     <button ng-if="hasPrevPage !== false" class="button button-block icon-left ion-chevron-left" ng-click="gotoPage(hasPrevPage)">
                         {{ 'mma.mod_feedback.previous_page' | translate }}
                     </button>
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 66106d45fca..f567b688ad1 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -59,7 +59,7 @@
                         <p ng-if="!access.isanonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
                     </div>
                     <div class="item item-text-wrap row-buttons responsive-sm">
-                        <button class="button button-block icon-left ion-search" ng-click="openFeature('print', true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
+                        <button class="button button-block icon-left ion-search" ng-click="gotoAnswerQuestions(0, true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
                         <button ng-if="access.cancomplete && access.cansubmit && !goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
                             {{ 'mma.mod_feedback.complete_the_form' | translate }}
                         </button>

From 0249afcc3f068bdda7e7c8e455304bcfc4fa190a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 17 Mar 2017 13:29:41 +0100
Subject: [PATCH 043/218] MOBILE-2003 feedback: Process pages

---
 www/addons/mod/feedback/controllers/form.js  | 58 ++++++++++++++++++--
 www/addons/mod/feedback/services/feedback.js | 26 +++++++++
 www/addons/mod/feedback/services/helper.js   | 12 +++-
 www/addons/mod/feedback/templates/form.html  | 13 ++---
 4 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index ceca12d7b8b..70bdc0b6624 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -122,11 +122,61 @@ angular.module('mm.addons.mod_feedback')
 
     // Function to go to move through the questions form.
     $scope.gotoPage = function(page) {
+        var responses = {};
         $scope.feedbackLoaded = false;
-        // @todo: send data and process it. Control required as well.
-        return fetchFeedbackPageData(page).finally(function(){
-            scrollTop();
-            $scope.feedbackLoaded = true;
+
+        angular.forEach($scope.items, function(itemData) {
+            if (itemData.hasvalue) {
+                var name, value,
+                    nameTemp = itemData.typ + '_' + itemData.id,
+                    answered = false;
+                if (itemData.typ == "multichoice" && itemData.subtype == 'c') {
+                    name = nameTemp + '[0]';
+                    responses[name] = 0;
+                    angular.forEach(itemData.choices, function(choice, index) {
+                        name = nameTemp + '[' + (index + 1) + ']';
+                        value = choice.checked ? choice.value : 0;
+                        if (!answered && value) {
+                            answered = true;
+                        }
+                        responses[name] = value;
+                    });
+                } else {
+                    if (itemData.typ == "multichoice") {
+                        name = nameTemp + '[0]';
+                        value = itemData.value || 0;
+                    } else if (itemData.typ == "multichoicerated") {
+                        name = nameTemp;
+                        value = itemData.value || 0;
+                    } else {
+                        name = nameTemp;
+                        value = itemData.value || "";
+                    }
+
+                    answered = !!value;
+                    responses[name] = value;
+                }
+
+                if (itemData.required && !answered) {
+                    // Check if it has any value.
+                }
+
+            }
+        });
+
+        return $mmaModFeedback.processPage(feedback.id, currentPage, responses, page < currentPage).then(function(response) {
+            var promise;
+
+            if (isNaN(parseInt(response.jumpto, 10)) || response.jumpto == currentPage) {
+                promise = $q.when();
+            } else {
+                promise = fetchFeedbackPageData(page);
+            }
+
+            return promise.finally(function(){
+                scrollTop();
+                $scope.feedbackLoaded = true;
+            });
         });
     };
 
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 6a9279d8ef5..d98ea2de501 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -447,6 +447,32 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Process a jump between pages.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#processPage
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    page            The page being processed.
+     * @param   {Object}    responses       The data to be processed the key is the field name (usually type[index]_id).
+     * @param   {Boolean}   goprevious      Whether we want to jump to previous page.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.processPage = function(feedbackId, page, responses, goprevious, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId,
+                    page: page,
+                    responses: $mmUtil.objectToArrayOfObjects(responses, 'name', 'value'),
+                    goprevious: goprevious ? 1 : 0
+                };
+
+            return site.write('mod_feedback_process_page', params);
+        });
+    };
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModFeedback#invalidateFiles.
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index b5fea8b97e6..49daa97b79f 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -154,8 +154,10 @@ angular.module('mm.addons.mod_feedback')
                 var type = parseInt(item.presentation, 10);
                 if (type == MODE_COURSE || type == MODE_CATEGORY) {
                     item.presentation = item.otherdata;
+                    item.value = item.otherdata;
                 } else if (type == MODE_RESPONSETIME) {
-                    item.presentation = moment(new Date().getTime()).format($translate.instant('mm.core.dffulldate'));
+                    item.value = new Date().getTime();
+                    item.presentation = moment(item.value).format($translate.instant('mm.core.dffulldate'));
                 } else {
                     // Errors on item, return false.
                     return false;
@@ -167,17 +169,20 @@ angular.module('mm.addons.mod_feedback')
                 item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '',
                 item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '',
                 item.template = 'numeric';
+                item.value = "";
                 break;
             case 'textfield':
                 var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
                 item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30,
                 item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
+                item.value = "";
                 item.template = 'textfield';
                 break;
             case 'textarea':
                 var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
                 item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30,
                 item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
+                item.value = "";
                 item.template = 'textarea';
                 break;
             case 'multichoice':
@@ -200,8 +205,13 @@ angular.module('mm.addons.mod_feedback')
                     choice = weightValue.length == 1 ? weightValue[0] : '(' + weightValue[0] + ') ' + weightValue[1];
                     return {value: index + 1, label: choice};
                 });
+
                 if (item.subtype === 'r' && item.options.search(FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
                     item.choices.unshift({value: 0, label: $translate.instant('mma.mod_feedback.not_selected')});
+                    item.value = 0;
+                } else if (item.subtype === 'd') {
+                    item.choices.unshift({value: 0, label: ''});
+                    item.value = 0;
                 }
                 item.template = 'multichoice-' + item.subtype;
                 break;
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 586e7e13e78..7c1a60d6963 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -30,28 +30,27 @@
                 </script>
 
                 <script type="text/ng-template" id="textfield">
-                    <input type="text" value="{{item.value}}" autocorrect="off" size="{{item.size}}" size="{{item.length}}"/>
+                    <input name="{{item.typ}}_{{item.id}}" type="text" ng-model="item.value" autocorrect="off" size="{{item.size}}" size="{{item.length}}"/>
                 </script>
 
                 <script type="text/ng-template" id="numeric">
-                    <input type="number" value="{{item.value}}" min="{{item.rangefrom}}" max="{{item.rangeto}}"/>
+                    <input name="{{item.typ}}_{{item.id}}" type="number" ng-model="item.value" min="{{item.rangefrom}}" max="{{item.rangeto}}"/>
                 </script>
 
                 <script type="text/ng-template" id="textarea">
-                    <textarea aria-multiline="true" rows="{{item.height}}" cols="{{item.width}}"></textarea>
+                    <textarea name="{{item.typ}}_{{item.id}}" aria-multiline="true" rows="{{item.height}}" cols="{{item.width}}" ng-model="item.value"></textarea>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-r">
-                    <ion-radio ng-if="item.subtype == 'r'" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
+                    <ion-radio name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-c">
-                    <ion-checkbox ng-if="item.subtype == 'c'" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
+                    <ion-checkbox name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-d">
-                    <select ng-if="item.subtype == 'd'" mm-ios-select-fix>
-                        <option ng-repeat="option in item.choices" ng-value="option.value">{{option.label}}</option>
+                    <select name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-options="option.value as option.label for option in item.choices" mm-ios-select-fix>
                     </select>
                 </script>
 

From 1092a1d199bfead486e2800068c4a1c3e51a4f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 20 Mar 2017 15:15:13 +0100
Subject: [PATCH 044/218] MOBILE-2003 feedback: Populate form with submitted
 values

---
 www/addons/mod/feedback/controllers/form.js   |  17 +-
 www/addons/mod/feedback/services/feedback.js  |  61 +++++-
 www/addons/mod/feedback/services/helper.js    | 174 +++++++++++-------
 .../mod/feedback/services/prefetch_handler.js |  15 +-
 www/addons/mod/feedback/templates/form.html   |   2 +-
 5 files changed, 199 insertions(+), 70 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index 70bdc0b6624..0f44ae245b8 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -87,7 +87,21 @@ angular.module('mm.addons.mod_feedback')
             promise = $mmaModFeedback.getPageItems(feedback.id, page).then(function(response) {
                 $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
                 $scope.hasNextPage = response.hasnextpage ? page + 1 : false;
-                return response;
+
+                return $mmaModFeedback.getCurrentValues(feedback.id).then(function(values) {
+                    angular.forEach(response.items, function(itemData) {
+                        if (!itemData.hasvalue) {
+                            return;
+                        }
+                        for (var x in values) {
+                            if (values[x].item == itemData.id) {
+                                itemData.value = values[x].value;
+                                return;
+                            }
+                        }
+                    });
+                    return response;
+                });
             });
         }
         return promise.then(function(response) {
@@ -112,6 +126,7 @@ angular.module('mm.addons.mod_feedback')
                 promises.push($mmaModFeedback.invalidateItemsData(feedback.id));
             } else {
                 promises.push($mmaModFeedback.invalidateAllPagesData(feedback.id));
+                promises.push($mmaModFeedback.invalidateCurrentValuesData(feedback.id));
             }
         }
 
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index d98ea2de501..a9962a8c996 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -117,6 +117,16 @@ angular.module('mm.addons.mod_feedback')
         return getFeedbackDataPrefixCacheKey(feedbackId) + ':items';
     }
 
+    /**
+     * Get cache key for get current values feedback data WS calls.
+     *
+     * @param  {Number} feedbackId  Feedback ID.
+     * @return {String}             Cache key.
+     */
+    function getCurrentValuesDataCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':currentvalues';
+    }
+
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
      *
@@ -469,7 +479,56 @@ angular.module('mm.addons.mod_feedback')
                     goprevious: goprevious ? 1 : 0
                 };
 
-            return site.write('mod_feedback_process_page', params);
+            return site.write('mod_feedback_process_page', params).then(function(response) {
+                // Invalidate corrent values because they will change.
+                return self.invalidateCurrentValuesData(feedbackId, site.getId()).then(function() {
+                    return response;
+                });
+            });
+        });
+    };
+
+    /**
+     * Returns the temporary completion record for the current user.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getCurrentValues
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getCurrentValues = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getCurrentValuesDataCacheKey(feedbackId)
+                };
+
+            return site.read('mod_feedback_get_unfinished_responses', params, preSets).then(function(response) {
+                if (response && typeof response.responses != "undefined") {
+                    return response.responses;
+                }
+                return $q.reject();
+            });
+        });
+    };
+
+    /**
+     * Invalidates temporary completion record data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateCurrentVlauesData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateCurrentValuesData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getCurrentValuesDataCacheKey(feedbackId));
         });
     };
 
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 49daa97b79f..13c364a45c6 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -146,75 +146,19 @@ angular.module('mm.addons.mod_feedback')
     self.getItemForm = function(item, preview) {
         switch (item.typ) {
             case 'label':
-                item.name = "";
-                item.template = 'label';
-                item.presentation = $mmText.replacePluginfileUrls(item.presentation, item.itemfiles);
-                break;
+                return getItemFormLabel(item);
             case 'info':
-                var type = parseInt(item.presentation, 10);
-                if (type == MODE_COURSE || type == MODE_CATEGORY) {
-                    item.presentation = item.otherdata;
-                    item.value = item.otherdata;
-                } else if (type == MODE_RESPONSETIME) {
-                    item.value = new Date().getTime();
-                    item.presentation = moment(item.value).format($translate.instant('mm.core.dffulldate'));
-                } else {
-                    // Errors on item, return false.
-                    return false;
-                }
-                item.template = 'label';
-                break;
+                return getItemFormInfo(item);
             case 'numeric':
-                var range = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-                item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '',
-                item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '',
-                item.template = 'numeric';
-                item.value = "";
-                break;
+                return getItemFormNumeric(item);
             case 'textfield':
-                var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-                item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30,
-                item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
-                item.value = "";
-                item.template = 'textfield';
-                break;
+                return getItemFormTextfield(item);
             case 'textarea':
-                var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-                item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30,
-                item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
-                item.value = "";
-                item.template = 'textarea';
-                break;
+                return getItemFormTextarea(item);
             case 'multichoice':
+                return getItemFormMultichoice(item);
             case 'multichoicerated':
-                var parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [];
-                item.subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
-                item.presentation = parts.length > 1 ? parts[1] : '';
-                if (item.subtype != 'd') {
-                    parts = item.presentation.split(FEEDBACK_MULTICHOICE_ADJUST_SEP) || [];
-                    item.presentation = parts.length > 0 ? parts[0] : '';
-                    // Horizontal are not supported right now.
-                    //item.horizontal = parts.length > 1 && !!parts[1];
-                } else {
-                    item.class = "item-select";
-                }
-
-                item.choices = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-                item.choices = item.choices.map(function(choice, index) {
-                    var weightValue = choice.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''],
-                    choice = weightValue.length == 1 ? weightValue[0] : '(' + weightValue[0] + ') ' + weightValue[1];
-                    return {value: index + 1, label: choice};
-                });
-
-                if (item.subtype === 'r' && item.options.search(FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
-                    item.choices.unshift({value: 0, label: $translate.instant('mma.mod_feedback.not_selected')});
-                    item.value = 0;
-                } else if (item.subtype === 'd') {
-                    item.choices.unshift({value: 0, label: ''});
-                    item.value = 0;
-                }
-                item.template = 'multichoice-' + item.subtype;
-                break;
+                return getItemFormMultichoice(item);
             case 'pagebreak':
             case 'captcha':
                 if (!preview) {
@@ -228,6 +172,110 @@ angular.module('mm.addons.mod_feedback')
                 return false;
         }
         return item;
+
+        function getItemFormLabel(item) {
+            item.name = "";
+            item.template = 'label';
+            item.presentation = $mmText.replacePluginfileUrls(item.presentation, item.itemfiles);
+            return item;
+        }
+
+        function getItemFormInfo(item) {
+            var type = parseInt(item.presentation, 10);
+
+            if (type == MODE_COURSE || type == MODE_CATEGORY) {
+                item.presentation = item.otherdata;
+                item.value = typeof item.value != "undefined" ? item.value : item.otherdata;
+            } else if (type == MODE_RESPONSETIME) {
+                item.value = typeof item.value != "undefined" ? item.value : new Date().getTime();
+                item.presentation = moment(item.value).format($translate.instant('mm.core.dffulldate'));
+            } else {
+                // Errors on item, return false.
+                return false;
+            }
+
+            item.template = 'label';
+
+            return item;
+        }
+
+        function getItemFormNumeric(item) {
+            var range = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+            item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '',
+            item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '',
+            item.template = 'numeric';
+            item.value = typeof item.value != "undefined" ? item.value : "";
+
+            return item;
+        }
+
+        function getItemFormTextfield(item) {
+            var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+            item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30,
+            item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
+            item.value = typeof item.value != "undefined" ? item.value : "";
+            item.template = 'textfield';
+
+            return item;
+        }
+
+        function getItemFormTextarea(item) {
+            var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+            item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30,
+            item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
+            item.value = typeof item.value != "undefined" ? item.value : "";
+            item.template = 'textarea';
+
+            return item;
+        }
+
+        function getItemFormMultichoice(item) {
+            var parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [];
+            item.subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
+            item.presentation = parts.length > 1 ? parts[1] : '';
+            if (item.subtype != 'd') {
+                parts = item.presentation.split(FEEDBACK_MULTICHOICE_ADJUST_SEP) || [];
+                item.presentation = parts.length > 0 ? parts[0] : '';
+                // Horizontal are not supported right now.
+                //item.horizontal = parts.length > 1 && !!parts[1];
+            } else {
+                item.class = "item-select";
+            }
+
+            item.choices = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+            item.choices = item.choices.map(function(choice, index) {
+                var weightValue = choice.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''],
+                choice = weightValue.length == 1 ? weightValue[0] : '(' + weightValue[0] + ') ' + weightValue[1];
+                return {value: index + 1, label: choice};
+            });
+
+            if (item.subtype === 'r' && item.options.search(FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
+                item.choices.unshift({value: 0, label: $translate.instant('mma.mod_feedback.not_selected')});
+                item.value = typeof item.value != "undefined" ? parseInt(item.value, 10) : 0;
+            } else if (item.subtype === 'd') {
+                item.choices.unshift({value: 0, label: ''});
+                item.value = typeof item.value != "undefined" ? parseInt(item.value, 10) : 0;
+            } else if (item.subtype === 'c') {
+                if (typeof item.value == "undefined") {
+                    item.value = "";
+                } else {
+                    var values = item.value.split(FEEDBACK_LINE_SEP);
+                    angular.forEach(item.choices, function(choice) {
+                        for (var x in values) {
+                            if (choice.value == values[x]) {
+                                choice.checked = true;
+                                return;
+                            }
+                        }
+                    });
+                }
+            } else {
+                item.value = typeof item.value != "undefined" ? parseInt(item.value, 10) : "";
+            }
+            item.template = 'multichoice-' + item.subtype;
+
+            return item;
+        }
     };
 
     return self;
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index cc1f30dc0a1..bb79787df1f 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -217,10 +217,9 @@ angular.module('mm.addons.mod_feedback')
                 p2.push($mmaModFeedback.getItems(feedback.id, siteId));
 
                 if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
-                    p2.push($mmaModFeedback.getResumePage(feedback.id, siteId).then(function(page) {
-                        // @todo: Get all pages.
-                        return $mmaModFeedback.getPageItems(feedback.id, page, siteId);
-                    }));
+                    p2.push($mmaModFeedback.getCurrentValues(feedback.id, siteId));
+                    p2.push($mmaModFeedback.getResumePage(feedback.id, siteId));
+                    p2.push(getPageItemsAndNext(feedback.id, 0));
                 }
 
                 return $q.all(p2);
@@ -242,6 +241,14 @@ angular.module('mm.addons.mod_feedback')
                 };
             });
         });
+
+        function getPageItemsAndNext(feedbackId, page) {
+            return $mmaModFeedback.getPageItems(feedbackId, page, siteId).then(function(response) {
+                if (response.hasnextpage) {
+                    return getPageItemsAndNext(feedbackId, page + 1);
+                }
+            });
+        }
     }
 
     return self;
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 7c1a60d6963..9eb5d4b1f5c 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -19,7 +19,7 @@
                     </div>
                 </div>
                 <div class="list" ng-if="items && items.length">
-                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0 && preview }">
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0}">
                         <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
                         <div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
                     </div>

From 60ed5fe5c93ac07222eab17a16ed1c3134a141e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 20 Mar 2017 17:21:55 +0100
Subject: [PATCH 045/218] MOBILE-2003 feedback: Add dependency questions

---
 www/addons/mod/feedback/controllers/form.js   |  26 +--
 www/addons/mod/feedback/controllers/index.js  |   2 +-
 www/addons/mod/feedback/services/feedback.js  |  64 +------
 www/addons/mod/feedback/services/helper.js    | 178 +++++++++++++++++-
 .../mod/feedback/services/prefetch_handler.js |   9 -
 5 files changed, 182 insertions(+), 97 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index 0f44ae245b8..63db5023ca3 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -84,37 +84,23 @@ angular.module('mm.addons.mod_feedback')
         } else {
             currentPage = page;
 
-            promise = $mmaModFeedback.getPageItems(feedback.id, page).then(function(response) {
+            promise = $mmaModFeedbackHelper.getPageItems(feedback.id, page).then(function(response) {
                 $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
                 $scope.hasNextPage = response.hasnextpage ? page + 1 : false;
 
-                return $mmaModFeedback.getCurrentValues(feedback.id).then(function(values) {
-                    angular.forEach(response.items, function(itemData) {
-                        if (!itemData.hasvalue) {
-                            return;
-                        }
-                        for (var x in values) {
-                            if (values[x].item == itemData.id) {
-                                itemData.value = values[x].value;
-                                return;
-                            }
-                        }
-                    });
-                    return response;
-                });
+                return response;
             });
         }
         return promise.then(function(response) {
             $scope.items = response.items.map(function(itemData) {
                 return $mmaModFeedbackHelper.getItemForm(itemData, $scope.preview);
-            }).filter(function(itemData) {
+            }).filter(function(itemData, index, items) {
                 // Filter items with errors.
                 return itemData;
             });
         });
     }
 
-
     // Convenience function to refresh all the data.
     function refreshAllData(showErrors) {
         var promises = [];
@@ -122,12 +108,10 @@ angular.module('mm.addons.mod_feedback')
         if (feedback) {
             promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
             promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
-            if ($scope.preview) {
-                promises.push($mmaModFeedback.invalidateItemsData(feedback.id));
-            } else {
-                promises.push($mmaModFeedback.invalidateAllPagesData(feedback.id));
+            if (!$scope.preview) {
                 promises.push($mmaModFeedback.invalidateCurrentValuesData(feedback.id));
             }
+            promises.push($mmaModFeedback.invalidateItemsData(feedback.id));
         }
 
         return $q.all(promises).finally(function() {
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 051c4c6c754..a7e15dc59e9 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -60,7 +60,7 @@ angular.module('mm.addons.mod_feedback')
 
             if (accessData.cancomplete && accessData.cansubmit && accessData.isopen) {
                 promises.push($mmaModFeedback.getResumePage(feedback.id).then(function(goPage) {
-                    $scope.goPage = goPage;
+                    $scope.goPage = goPage > 0 ? goPage : false;
                 }));
             }
 
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index a9962a8c996..ce1960cd4c2 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -86,27 +86,6 @@ angular.module('mm.addons.mod_feedback')
         return getFeedbackDataPrefixCacheKey(feedbackId) + ':launch';
     }
 
-    /**
-     * Get prefix cache key for all pages data WS calls.
-     *
-     * @param  {Number} feedbackId  Feedback ID.
-     * @return {String}             Cache key.
-     */
-    function getPagesDataPrefixCacheKey(feedbackId) {
-        return getFeedbackDataPrefixCacheKey(feedbackId) + ':page:';
-    }
-
-    /**
-     * Get cache key for get page items feedback data WS calls.
-     *
-     * @param  {Number} feedbackId  Feedback ID.
-     * @param  {Number} page        The page to get.
-     * @return {String}             Cache key.
-     */
-    function getPageItemsDataCacheKey(feedbackId, page) {
-        return getPagesDataPrefixCacheKey(feedbackId) + page;
-    }
-
     /**
      * Get cache key for get items feedback data WS calls.
      *
@@ -337,7 +316,8 @@ angular.module('mm.addons.mod_feedback')
 
             return site.read('mod_feedback_launch_feedback', params, preSets).then(function(response) {
                 if (response && typeof response.gopage != "undefined") {
-                    return response.gopage;
+                    // WS will return -1 for last page but the user need to start again.
+                    return response.gopage > 0 ? response.gopage : 0;
                 }
                 return $q.reject();
             });
@@ -361,7 +341,7 @@ angular.module('mm.addons.mod_feedback')
     };
 
     /**
-     * Get a single feedback page items.
+     * Get a single feedback page items. This function is not cached, use $mmaModFeedbackHelper.getPageItems instead.
      *
      * @module mm.addons.mod_feedback
      * @ngdoc method
@@ -376,45 +356,9 @@ angular.module('mm.addons.mod_feedback')
             var params = {
                     feedbackid: feedbackId,
                     page: page
-                },
-                preSets = {
-                    cacheKey: getPageItemsDataCacheKey(feedbackId, page)
                 };
 
-            return site.read('mod_feedback_get_page_items', params, preSets);
-        });
-    };
-
-    /**
-     * Invalidates get page items data.
-     *
-     * @module mm.addons.mod_feedback
-     * @ngdoc method
-     * @name $mmaModFeedback#invalidatePageItemsData
-     * @param  {Number} feedbackId   Feedback ID.
-     * @param  {Number} page         The page to get.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}        Promise resolved when the data is invalidated.
-     */
-    self.invalidatePageItemsData = function(feedbackId, page, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKey(getPageItemsDataCacheKey(feedbackId, page));
-        });
-    };
-
-    /**
-     * Invalidates all pages data.
-     *
-     * @module mm.addons.mod_feedback
-     * @ngdoc method
-     * @name $mmaModFeedback#invalidateAllPagesData
-     * @param  {Number} feedbackId   Feedback ID.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}        Promise resolved when the data is invalidated.
-     */
-    self.invalidateAllPagesData = function(feedbackId, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKeyStartingWith(getPagesDataPrefixCacheKey(feedbackId));
+            return site.write('mod_feedback_get_page_items', params);
         });
     };
 
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 13c364a45c6..e99ce7f9f3b 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -21,7 +21,8 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedbackHelper
  */
-.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText, $translate) {
+.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText,
+        $mmaModFeedback) {
 
     var self = {},
         MODE_RESPONSETIME = 1,
@@ -173,6 +174,7 @@ angular.module('mm.addons.mod_feedback')
         }
         return item;
 
+        // Helper functions by type:
         function getItemFormLabel(item) {
             item.name = "";
             item.template = 'label';
@@ -201,8 +203,8 @@ angular.module('mm.addons.mod_feedback')
 
         function getItemFormNumeric(item) {
             var range = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-            item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '',
-            item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '',
+            item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '';
+            item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '';
             item.template = 'numeric';
             item.value = typeof item.value != "undefined" ? item.value : "";
 
@@ -211,7 +213,7 @@ angular.module('mm.addons.mod_feedback')
 
         function getItemFormTextfield(item) {
             var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-            item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30,
+            item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30;
             item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
             item.value = typeof item.value != "undefined" ? item.value : "";
             item.template = 'textfield';
@@ -221,7 +223,7 @@ angular.module('mm.addons.mod_feedback')
 
         function getItemFormTextarea(item) {
             var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-            item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30,
+            item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30;
             item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
             item.value = typeof item.value != "undefined" ? item.value : "";
             item.template = 'textarea';
@@ -244,7 +246,7 @@ angular.module('mm.addons.mod_feedback')
 
             item.choices = item.presentation.split(FEEDBACK_LINE_SEP) || [];
             item.choices = item.choices.map(function(choice, index) {
-                var weightValue = choice.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''],
+                var weightValue = choice.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''];
                 choice = weightValue.length == 1 ? weightValue[0] : '(' + weightValue[0] + ') ' + weightValue[1];
                 return {value: index + 1, label: choice};
             });
@@ -278,5 +280,169 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
+    /**
+     * Get a single feedback page items. If offline or server down it will use getItems to calculate dependencies.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#getPageItems
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    page            The page to get.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getPageItems = function(feedbackId, page) {
+        return $mmaModFeedback.getPageItems(feedbackId, page).then(function(response) {
+            return fillValues(feedbackId, response.items).then(function(items) {
+                response.items = items;
+                return response;
+            });
+        }).catch(function() {
+            // If getPageItems fail we should calculate it using getItems.
+            return $mmaModFeedback.getItems(feedbackId).then(function(response) {
+                return fillValues(feedbackId, response.items).then(function(items) {
+                    // Separate items by pages.
+                    var pageItems = [],
+                        currentPage = 0,
+                        previousPageItems = [],
+
+                    pageItems = items.filter(function(item) {
+                        // Greater page, discard all entries.
+                        if (currentPage > page) {
+                            return false;
+                        }
+
+                        if (item.typ == "pagebreak") {
+                            currentPage++;
+                            return false;
+                        }
+
+                        // Save items on previous page to check dependencies and discard entry.
+                        if (currentPage < page) {
+                            previousPageItems.push(item);
+                            return false;
+                        }
+
+                        // Filter depending items.
+                        if (item && item.dependitem > 0 && previousPageItems.length > 0) {
+                            return checkDependencyItem(previousPageItems, item);
+                        }
+
+                        // Filter items with errors.
+                        return item;
+                    });
+
+                    // Check if there are more pages.
+                    response.hasprevpage = page > 0;
+                    response.hasnextpage = currentPage > page;
+                    response.items = pageItems;
+
+                    return response;
+                });
+            });
+        });
+    };
+
+    /**
+     * Check dependency of a question item.
+     *
+     * @param   {Number}   feedbackId Feedback ID.
+     * @param   {Array}    items      Item to fill the value.
+     * @return  {Promise}             Resolved with values when done.
+     */
+    function fillValues(feedbackId, items) {
+        return $mmaModFeedback.getCurrentValues(feedbackId).then(function(values) {
+            angular.forEach(items, function(itemData) {
+                if (!itemData.hasvalue) {
+                    return;
+                }
+
+                for (var x in values) {
+                    if (values[x].item == itemData.id) {
+                        itemData.value = values[x].value;
+                        return;
+                    }
+                }
+            });
+            return items;
+        }).catch(function() {
+            // Ignore errors.
+            return items;
+        });
+    }
+
+    /**
+     * Check dependency of a question item.
+     *
+     * @param   {Array}     tems       All question items to check dependency.
+     * @param   {Number}    item       Item to check.
+     * @return  {Boolean}              Return true if dependency is acomplished and it can be shown. False, otherwise.
+     */
+    function checkDependencyItem(items, item) {
+        var depend;
+        for (var x in items) {
+            if (items[x].id == item.dependitem) {
+                depend = items[x];
+                break;
+            }
+        }
+
+        // Item not found, looks like dependent item has been removed or is in the same or following pages.
+        if (!depend) {
+            return true;
+        }
+
+        var value;
+        switch (depend.typ) {
+            case 'label':
+                return false;
+            case 'multichoice':
+            case 'multichoicerated':
+                return compareDependItemMultichoice(depend, item.dependvalue);
+        }
+
+        return item.dependvalue == depend.value;
+
+        // Helper functions by type:
+        function compareDependItemMultichoice(item, dependValue) {
+            var values, choices,
+                parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [],
+                subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
+
+            choices = parts[1] || '';
+            choices = choices.split(FEEDBACK_MULTICHOICE_ADJUST_SEP)[0] || '';
+            choices = choices.split(FEEDBACK_LINE_SEP) || [];
+
+
+            if (subtype === 'c') {
+                if (typeof item.value == "undefined") {
+                    values = [''];
+                } else {
+                    values = item.value.split(FEEDBACK_LINE_SEP);
+                }
+            } else {
+                values = [item.value];
+            }
+
+            for (var index = 0; index < choices.length; index++) {
+                for (var x in values) {
+                    if (values[x] == index + 1) {
+                        var value = choices[index];
+                        if (item.typ == 'multichoicerated') {
+                            value = value.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP)[1] || '';
+                        }
+                        if (value.trim() == dependValue) {
+                            return true;
+                        }
+                        // We can finish checking if only searching on one value and we found it.
+                        if (values.length == 1) {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    }
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index bb79787df1f..797f6f71108 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -219,7 +219,6 @@ angular.module('mm.addons.mod_feedback')
                 if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
                     p2.push($mmaModFeedback.getCurrentValues(feedback.id, siteId));
                     p2.push($mmaModFeedback.getResumePage(feedback.id, siteId));
-                    p2.push(getPageItemsAndNext(feedback.id, 0));
                 }
 
                 return $q.all(p2);
@@ -241,14 +240,6 @@ angular.module('mm.addons.mod_feedback')
                 };
             });
         });
-
-        function getPageItemsAndNext(feedbackId, page) {
-            return $mmaModFeedback.getPageItems(feedbackId, page, siteId).then(function(response) {
-                if (response.hasnextpage) {
-                    return getPageItemsAndNext(feedbackId, page + 1);
-                }
-            });
-        }
     }
 
     return self;

From 75f30f0282902b4bfecf22445f3e25cb6502423a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 21 Mar 2017 16:42:03 +0100
Subject: [PATCH 046/218] MOBILE-2003 feedback: Submit the questions

---
 www/addons/mod/feedback/controllers/form.js  | 89 +++++++++++++++-----
 www/addons/mod/feedback/lang/en.json         |  1 +
 www/addons/mod/feedback/services/helper.js   | 63 ++++++++------
 www/addons/mod/feedback/templates/form.html  | 38 ++++++---
 www/addons/mod/feedback/templates/index.html |  3 +
 www/core/lang/en.json                        |  1 +
 www/core/scss/styles.scss                    |  2 +-
 7 files changed, 136 insertions(+), 61 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index 63db5023ca3..da97125870d 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -23,12 +23,13 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $timeout,
             mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper,
-            $ionicScrollDelegate, $ionicHistory) {
+            $ionicScrollDelegate, $ionicHistory, $mmContentLinksHelper, $mmSite, $state) {
     var feedbackId = $stateParams.feedbackid,
         module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         currentPage = $stateParams.page,
         feedback,
+        siteAfterSubmit,
         scrollView;
 
     $scope.title = $stateParams.title;
@@ -71,13 +72,14 @@ angular.module('mm.addons.mod_feedback')
 
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
-        }).finally(function(){
+        }).finally(function() {
             $scope.feedbackLoaded = true;
         });
     }
 
     function fetchFeedbackPageData(page) {
         var promise;
+        $scope.items = [];
 
         if ($scope.preview) {
             promise = $mmaModFeedback.getItems(feedback.id);
@@ -85,8 +87,8 @@ angular.module('mm.addons.mod_feedback')
             currentPage = page;
 
             promise = $mmaModFeedbackHelper.getPageItems(feedback.id, page).then(function(response) {
-                $scope.hasPrevPage = response.hasprevpage ? page - 1 : false;
-                $scope.hasNextPage = response.hasnextpage ? page + 1 : false;
+                $scope.hasPrevPage = !!response.hasprevpage;
+                $scope.hasNextPage = !!response.hasnextpage;
 
                 return response;
             });
@@ -94,7 +96,7 @@ angular.module('mm.addons.mod_feedback')
         return promise.then(function(response) {
             $scope.items = response.items.map(function(itemData) {
                 return $mmaModFeedbackHelper.getItemForm(itemData, $scope.preview);
-            }).filter(function(itemData, index, items) {
+            }).filter(function(itemData) {
                 // Filter items with errors.
                 return itemData;
             });
@@ -120,12 +122,15 @@ angular.module('mm.addons.mod_feedback')
     }
 
     // Function to go to move through the questions form.
-    $scope.gotoPage = function(page) {
-        var responses = {};
-        $scope.feedbackLoaded = false;
+    $scope.gotoPage = function(goPrevious) {
+        var responses = {},
+            promise;
+
+        var modal = $mmUtil.showModalLoading();
+        scrollTop();
 
         angular.forEach($scope.items, function(itemData) {
-            if (itemData.hasvalue) {
+            if (itemData.hasvalue || itemData.typ == "captcha") {
                 var name, value,
                     nameTemp = itemData.typ + '_' + itemData.id,
                     answered = false;
@@ -158,30 +163,63 @@ angular.module('mm.addons.mod_feedback')
 
                 if (itemData.required && !answered) {
                     // Check if it has any value.
+                    itemData.isEmpty = true;
+                } else {
+                    itemData.isEmpty = false;
                 }
-
             }
         });
 
-        return $mmaModFeedback.processPage(feedback.id, currentPage, responses, page < currentPage).then(function(response) {
-            var promise;
+        return $mmaModFeedback.processPage(feedback.id, currentPage, responses, goPrevious).then(function(response) {
+            var jumpTo = parseInt(response.jumpto, 10);
 
-            if (isNaN(parseInt(response.jumpto, 10)) || response.jumpto == currentPage) {
-                promise = $q.when();
+            if (response.completed) {
+                // Form is completed, show completion message and buttons.
+                $scope.items = [];
+                $scope.completed = true;
+                $scope.completionPageContents = response.completionpagecontents;
+                siteAfterSubmit = response.siteaftersubmit;
+
+                // Invalidate access information so user will see home page updated (continue form or completion messages).
+                // No need to wait the promises to finish.
+                $mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id);
+                $mmaModFeedback.invalidateResumePageData(feedback.id);
+            } else if (isNaN(jumpTo) || jumpTo == currentPage) {
+                // Errors on questions, stay in page.
+                return $q.when();
             } else {
-                promise = fetchFeedbackPageData(page);
+                // Invalidate access information so user will see home page updated (continue form).
+                $mmaModFeedback.invalidateResumePageData(feedback.id);
+                // Fetch the new page.
+                return fetchFeedbackPageData(jumpTo);
             }
-
-            return promise.finally(function(){
-                scrollTop();
-                $scope.feedbackLoaded = true;
-            });
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        }).finally(function() {
+            modal.dismiss();
         });
     };
 
-    // Function to send and save answers.
-    $scope.save = function() {
-        // @todo
+    // Function to go to the page after submit.
+    $scope.continue = function() {
+        if (siteAfterSubmit) {
+            var modal = $mmUtil.showModalLoading();
+            $mmContentLinksHelper.handleLink(siteAfterSubmit).then(function(treated) {
+                if (!treated) {
+                    return $mmSite.openInBrowserWithAutoLoginIfSameSite(siteAfterSubmit);
+                }
+            }).finally(function() {
+                modal.dismiss();
+            });
+        } else {
+            $state.go('redirect', {
+                state: 'site.mm_course',
+                params: {
+                    courseid: courseId
+                }
+            });
+        }
     };
 
     // Function to discard and go back.
@@ -190,6 +228,11 @@ angular.module('mm.addons.mod_feedback')
         $ionicHistory.goBack();
     };
 
+    // Function to link implemented features.
+    $scope.openFeature = function(feature) {
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId);
+    };
+
     fetchFeedbackFormData().finally(function() {
         $scope.refreshIcon = 'ion-refresh';
     });
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 745f7f75816..1fc5473f514 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -13,6 +13,7 @@
     "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
     "not_selected": "Not selected",
+    "no_items_available_yet": "No questions have been set up yet",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index e99ce7f9f3b..d685e7d537f 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -161,14 +161,14 @@ angular.module('mm.addons.mod_feedback')
             case 'multichoicerated':
                 return getItemFormMultichoice(item);
             case 'pagebreak':
-            case 'captcha':
                 if (!preview) {
-                    // Captcha is not supported right now because it doesn't make sense (app cannot be used as guest).
-                    // Otherwise label will be shown on preview.
                     // Pagebreaks are only used on preview.
                     return false;
                 }
                 break;
+            case 'captcha':
+                // Captcha is not supported right now. However label will be shown.
+                return getItemFormCaptcha(item);
             default:
                 return false;
         }
@@ -176,57 +176,61 @@ angular.module('mm.addons.mod_feedback')
 
         // Helper functions by type:
         function getItemFormLabel(item) {
-            item.name = "";
             item.template = 'label';
+            item.name = "";
             item.presentation = $mmText.replacePluginfileUrls(item.presentation, item.itemfiles);
             return item;
         }
 
         function getItemFormInfo(item) {
+            item.template = 'label';
+
             var type = parseInt(item.presentation, 10);
 
             if (type == MODE_COURSE || type == MODE_CATEGORY) {
                 item.presentation = item.otherdata;
-                item.value = typeof item.value != "undefined" ? item.value : item.otherdata;
+                item.value = typeof item.rawValue != "undefined" ? item.rawValue : item.otherdata;
             } else if (type == MODE_RESPONSETIME) {
-                item.value = typeof item.value != "undefined" ? item.value : new Date().getTime();
-                item.presentation = moment(item.value).format($translate.instant('mm.core.dffulldate'));
+                item.value = '__CURRENT__TIMESTAMP__';
+                var tempValue = typeof item.rawValue != "undefined" ? item.rawValue * 1000 : new Date().getTime();
+                item.presentation = moment(tempValue).format($translate.instant('mm.core.dffulldate'));
             } else {
                 // Errors on item, return false.
                 return false;
             }
 
-            item.template = 'label';
-
             return item;
         }
 
         function getItemFormNumeric(item) {
+            item.template = 'numeric';
+
             var range = item.presentation.split(FEEDBACK_LINE_SEP) || [];
             item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '';
             item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '';
-            item.template = 'numeric';
-            item.value = typeof item.value != "undefined" ? item.value : "";
+            item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
 
             return item;
         }
 
         function getItemFormTextfield(item) {
+            item.template = 'textfield';
+
             var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
             item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30;
             item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
-            item.value = typeof item.value != "undefined" ? item.value : "";
-            item.template = 'textfield';
+            item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
 
             return item;
         }
 
         function getItemFormTextarea(item) {
+            item.template = 'textarea';
+
             var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
             item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30;
             item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
-            item.value = typeof item.value != "undefined" ? item.value : "";
-            item.template = 'textarea';
+            item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
 
             return item;
         }
@@ -234,6 +238,8 @@ angular.module('mm.addons.mod_feedback')
         function getItemFormMultichoice(item) {
             var parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [];
             item.subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
+            item.template = 'multichoice-' + item.subtype;
+
             item.presentation = parts.length > 1 ? parts[1] : '';
             if (item.subtype != 'd') {
                 parts = item.presentation.split(FEEDBACK_MULTICHOICE_ADJUST_SEP) || [];
@@ -253,15 +259,15 @@ angular.module('mm.addons.mod_feedback')
 
             if (item.subtype === 'r' && item.options.search(FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
                 item.choices.unshift({value: 0, label: $translate.instant('mma.mod_feedback.not_selected')});
-                item.value = typeof item.value != "undefined" ? parseInt(item.value, 10) : 0;
+                item.value = typeof item.rawValue != "undefined" ? parseInt(item.rawValue, 10) : 0;
             } else if (item.subtype === 'd') {
                 item.choices.unshift({value: 0, label: ''});
-                item.value = typeof item.value != "undefined" ? parseInt(item.value, 10) : 0;
+                item.value = typeof item.rawValue != "undefined" ? parseInt(item.rawValue, 10) : 0;
             } else if (item.subtype === 'c') {
-                if (typeof item.value == "undefined") {
+                if (typeof item.rawValue == "undefined") {
                     item.value = "";
                 } else {
-                    var values = item.value.split(FEEDBACK_LINE_SEP);
+                    var values = item.rawValue.split(FEEDBACK_LINE_SEP);
                     angular.forEach(item.choices, function(choice) {
                         for (var x in values) {
                             if (choice.value == values[x]) {
@@ -272,12 +278,17 @@ angular.module('mm.addons.mod_feedback')
                     });
                 }
             } else {
-                item.value = typeof item.value != "undefined" ? parseInt(item.value, 10) : "";
+                item.value = typeof item.rawValue != "undefined" ? parseInt(item.rawValue, 10) : "";
             }
-            item.template = 'multichoice-' + item.subtype;
 
             return item;
         }
+
+        function getItemFormCaptcha(item) {
+            item.template = 'captcha';
+            item.value = "";
+            return item;
+        }
     };
 
     /**
@@ -358,7 +369,7 @@ angular.module('mm.addons.mod_feedback')
 
                 for (var x in values) {
                     if (values[x].item == itemData.id) {
-                        itemData.value = values[x].value;
+                        itemData.rawValue = values[x].value;
                         return;
                     }
                 }
@@ -400,7 +411,7 @@ angular.module('mm.addons.mod_feedback')
                 return compareDependItemMultichoice(depend, item.dependvalue);
         }
 
-        return item.dependvalue == depend.value;
+        return item.dependvalue == depend.rawValue;
 
         // Helper functions by type:
         function compareDependItemMultichoice(item, dependValue) {
@@ -414,13 +425,13 @@ angular.module('mm.addons.mod_feedback')
 
 
             if (subtype === 'c') {
-                if (typeof item.value == "undefined") {
+                if (typeof item.rawValue == "undefined") {
                     values = [''];
                 } else {
-                    values = item.value.split(FEEDBACK_LINE_SEP);
+                    values = item.rawValue.split(FEEDBACK_LINE_SEP);
                 }
             } else {
-                values = [item.value];
+                values = [item.rawValue];
             }
 
             for (var index = 0; index < choices.length; index++) {
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 9eb5d4b1f5c..e976a54c452 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -10,7 +10,7 @@
     <ion-content delegate-handle="mmaModFeedbackFormScroll" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
-            <section ng-if="items">
+            <section ng-if="items && items.length">
                 <div class="list">
                     <div class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
@@ -19,7 +19,7 @@
                     </div>
                 </div>
                 <div class="list" ng-if="items && items.length">
-                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0}">
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0, 'mm-error-item': item.isEmpty}">
                         <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
                         <div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
                     </div>
@@ -30,42 +30,58 @@
                 </script>
 
                 <script type="text/ng-template" id="textfield">
-                    <input name="{{item.typ}}_{{item.id}}" type="text" ng-model="item.value" autocorrect="off" size="{{item.size}}" size="{{item.length}}"/>
+                    <input ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" type="text" ng-model="item.value" autocorrect="off" size="{{item.size}}" size="{{item.length}}"/>
                 </script>
 
                 <script type="text/ng-template" id="numeric">
-                    <input name="{{item.typ}}_{{item.id}}" type="number" ng-model="item.value" min="{{item.rangefrom}}" max="{{item.rangeto}}"/>
+                    <input ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" type="number" ng-model="item.value" min="{{item.rangefrom}}" max="{{item.rangeto}}"/>
                 </script>
 
                 <script type="text/ng-template" id="textarea">
-                    <textarea name="{{item.typ}}_{{item.id}}" aria-multiline="true" rows="{{item.height}}" cols="{{item.width}}" ng-model="item.value"></textarea>
+                    <textarea ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" aria-multiline="true" rows="{{item.height}}" cols="{{item.width}}" ng-model="item.value"></textarea>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-r">
-                    <ion-radio name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
+                    <ion-radio ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-c">
-                    <ion-checkbox name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
+                    <ion-checkbox ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-d">
-                    <select name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-options="option.value as option.label for option in item.choices" mm-ios-select-fix>
+                    <select ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-options="option.value as option.label for option in item.choices" mm-ios-select-fix>
                     </select>
                 </script>
 
+                <script type="text/ng-template" id="captcha">
+                    <p ng-if="!preview">Captcha is not supported right now, feedback cannot be submitted.</p>
+                </script>
+
                 <div ng-if="!preview" class="item item-text-wrap row-buttons responsive-sm">
-                    <button ng-if="hasPrevPage !== false" class="button button-block icon-left ion-chevron-left" ng-click="gotoPage(hasPrevPage)">
+                    <button ng-if="hasPrevPage" class="button button-block icon-left ion-chevron-left" ng-click="gotoPage(true)">
                         {{ 'mma.mod_feedback.previous_page' | translate }}
                     </button>
-                    <button ng-if="hasNextPage !== false" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoPage(hasNextPage)">
+                    <button ng-if="hasNextPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoPage(false)">
                         {{ 'mma.mod_feedback.next_page' | translate }}
                     </button>
-                    <button ng-if="hasNextPage === false" class="button button-block button-positive" ng-click="save()">
+                    <button ng-if="!hasNextPage" class="button button-block button-positive" ng-click="gotoPage(false)">
                         {{ 'mma.mod_feedback.save_entries' | translate }}
                     </button>
                 </div>
             </section>
+            <div class="mm-success-card-icon" ng-if="completed">
+                <i class="icon ion-checkmark-round padding"></i> <p ng-if="!completionPageContents">{{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}</p>
+                <p ng-if="completionPageContents"><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ completionPageContents }}</mm-format-text></p>
+            </div>
+            <div class="item item-text-wrap row-buttons responsive-sm" ng-if="completed">
+                <button ng-if="access.canviewanalysis" class="button button-block icon-left ion-stats-bars" ng-click="openFeature('analysis')">
+                    {{ 'mma.mod_feedback.completed_feedbacks' | translate }}
+                </button>
+                <button class="button button-block button-positive icon-right ion-chevron-right" ng-click="continue()">
+                    {{ 'mm.core.continue' | translate }}
+                </button>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index f567b688ad1..783fb4b7c9a 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -60,6 +60,9 @@
                     </div>
                     <div class="item item-text-wrap row-buttons responsive-sm">
                         <button class="button button-block icon-left ion-search" ng-click="gotoAnswerQuestions(0, true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
+                        <button ng-if="!access.canviewreports && access.canviewanalysis" class="button button-block icon-left ion-stats-bars" ng-click="openFeature('analysis')">
+                            {{ 'mma.mod_feedback.completed_feedbacks' | translate }}
+                        </button>
                         <button ng-if="access.cancomplete && access.cansubmit && !goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
                             {{ 'mma.mod_feedback.complete_the_form' | translate }}
                         </button>
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index a8bb3053206..d719cd8102e 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -28,6 +28,7 @@
     "confirmloss": "Are you sure? All changes will be lost.",
     "confirmopeninbrowser": "Do you want to open it in browser?",
     "content": "Content",
+    "continue": "Continue",
     "contenteditingsynced": "The content you are editing has been synced.",
     "copiedtoclipboard": "Text copied to clipboard",
     "course": "Course",
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 6708fd1f882..e995f2a123c 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -671,7 +671,7 @@ mm-navigation-bar {
   border-bottom: 3px solid $color !important;
   padding-top: 12px;
   padding-bottom: 9px;
-  i.icon:before {
+  i.icon:before:not(.radio-icon) {
     color: $color;
   }
   &.item-icon-left {

From fa45c8104eaeaf0c278e8560a20fe4d1f5914dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 23 Mar 2017 15:33:32 +0100
Subject: [PATCH 047/218] MOBILE-2003 feedback: Ignore cache on question form

---
 www/addons/mod/feedback/controllers/form.js   | 135 ++++--------------
 www/addons/mod/feedback/controllers/index.js  |  18 ++-
 www/addons/mod/feedback/lang/en.json          |   1 -
 www/addons/mod/feedback/main.js               |   2 +-
 www/addons/mod/feedback/services/feedback.js  |  37 ++++-
 www/addons/mod/feedback/services/handlers.js  |   1 -
 www/addons/mod/feedback/services/helper.js    |  81 ++++++++---
 .../mod/feedback/services/prefetch_handler.js |  12 +-
 www/addons/mod/feedback/templates/form.html   |  11 +-
 www/addons/mod/feedback/templates/index.html  |   4 +-
 10 files changed, 148 insertions(+), 154 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index da97125870d..a836ce47aca 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -21,57 +21,52 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc controller
  * @name mmaModFeedbackFormCtrl
  */
-.controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $timeout,
-            mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper,
-            $ionicScrollDelegate, $ionicHistory, $mmContentLinksHelper, $mmSite, $state) {
-    var feedbackId = $stateParams.feedbackid,
-        module = $stateParams.module || {},
+.controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $timeout, $mmSite, $state,
+            mmaModFeedbackComponent, $mmEvents, $mmApp, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper, $ionicScrollDelegate,
+            $ionicHistory, $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted) {
+
+    var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         currentPage = $stateParams.page,
         feedback,
         siteAfterSubmit,
-        scrollView;
+        scrollView,
+        onlineObserver,
+        offline = false,
+        submitted = false;
 
     $scope.title = $stateParams.title;
-    $scope.moduleUrl = module.url;
-    $scope.moduleName = $mmCourse.translateModuleName('feedback');
     $scope.courseId = courseId;
-    $scope.refreshIcon = 'spinner';
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
     $scope.preview = !!$stateParams.preview;
 
     // Convenience function to get feedback data.
-    function fetchFeedbackFormData(refresh, showErrors) {
-        $scope.isOnline = $mmApp.isOnline();
+    function fetchFeedbackFormData() {
+        offline = !$mmApp.isOnline();
+
         return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
             feedback = feedbackData;
 
             $scope.title = feedback.name || $scope.title;
-            $scope.description = feedback.intro;
-
             $scope.feedback = feedback;
 
-            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, offline, true);
         }).then(function(accessData) {
             $scope.access = accessData;
 
             if (!$scope.preview && accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
-                return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id) : $q.when(currentPage);
+                return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id, offline, true) : $q.when(currentPage);
             } else {
                 $scope.preview = true;
                 return $q.when(0);
             }
         }).then(function(page) {
+            page = page || 0;
             return fetchFeedbackPageData(page);
         }).catch(function(message) {
-            if (!refresh) {
-                // Some call failed, retry without using cache since it might be a new activity.
-                return refreshAllData();
-            }
-
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
-            return $q.reject();
+            return $ionicHistory.goBack();
         }).finally(function() {
             $scope.feedbackLoaded = true;
         });
@@ -86,7 +81,7 @@ angular.module('mm.addons.mod_feedback')
         } else {
             currentPage = page;
 
-            promise = $mmaModFeedbackHelper.getPageItems(feedback.id, page).then(function(response) {
+            promise = $mmaModFeedbackHelper.getPageItems(feedback.id, page, offline, true).then(function(response) {
                 $scope.hasPrevPage = !!response.hasprevpage;
                 $scope.hasNextPage = !!response.hasnextpage;
 
@@ -103,72 +98,12 @@ angular.module('mm.addons.mod_feedback')
         });
     }
 
-    // Convenience function to refresh all the data.
-    function refreshAllData(showErrors) {
-        var promises = [];
-        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
-        if (feedback) {
-            promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
-            promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
-            if (!$scope.preview) {
-                promises.push($mmaModFeedback.invalidateCurrentValuesData(feedback.id));
-            }
-            promises.push($mmaModFeedback.invalidateItemsData(feedback.id));
-        }
-
-        return $q.all(promises).finally(function() {
-            return fetchFeedbackFormData(true, showErrors);
-        });
-    }
-
-    // Function to go to move through the questions form.
+    // Function to allow page navigation through the questions form.
     $scope.gotoPage = function(goPrevious) {
-        var responses = {},
-            promise;
-
-        var modal = $mmUtil.showModalLoading();
         scrollTop();
+        $scope.feedbackLoaded = false;
 
-        angular.forEach($scope.items, function(itemData) {
-            if (itemData.hasvalue || itemData.typ == "captcha") {
-                var name, value,
-                    nameTemp = itemData.typ + '_' + itemData.id,
-                    answered = false;
-                if (itemData.typ == "multichoice" && itemData.subtype == 'c') {
-                    name = nameTemp + '[0]';
-                    responses[name] = 0;
-                    angular.forEach(itemData.choices, function(choice, index) {
-                        name = nameTemp + '[' + (index + 1) + ']';
-                        value = choice.checked ? choice.value : 0;
-                        if (!answered && value) {
-                            answered = true;
-                        }
-                        responses[name] = value;
-                    });
-                } else {
-                    if (itemData.typ == "multichoice") {
-                        name = nameTemp + '[0]';
-                        value = itemData.value || 0;
-                    } else if (itemData.typ == "multichoicerated") {
-                        name = nameTemp;
-                        value = itemData.value || 0;
-                    } else {
-                        name = nameTemp;
-                        value = itemData.value || "";
-                    }
-
-                    answered = !!value;
-                    responses[name] = value;
-                }
-
-                if (itemData.required && !answered) {
-                    // Check if it has any value.
-                    itemData.isEmpty = true;
-                } else {
-                    itemData.isEmpty = false;
-                }
-            }
-        });
+        var responses = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
 
         return $mmaModFeedback.processPage(feedback.id, currentPage, responses, goPrevious).then(function(response) {
             var jumpTo = parseInt(response.jumpto, 10);
@@ -179,6 +114,7 @@ angular.module('mm.addons.mod_feedback')
                 $scope.completed = true;
                 $scope.completionPageContents = response.completionpagecontents;
                 siteAfterSubmit = response.siteaftersubmit;
+                submitted = true;
 
                 // Invalidate access information so user will see home page updated (continue form or completion messages).
                 // No need to wait the promises to finish.
@@ -188,6 +124,7 @@ angular.module('mm.addons.mod_feedback')
                 // Errors on questions, stay in page.
                 return $q.when();
             } else {
+                submitted = true;
                 // Invalidate access information so user will see home page updated (continue form).
                 $mmaModFeedback.invalidateResumePageData(feedback.id);
                 // Fetch the new page.
@@ -197,7 +134,7 @@ angular.module('mm.addons.mod_feedback')
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
         }).finally(function() {
-            modal.dismiss();
+            $scope.feedbackLoaded = true;
         });
     };
 
@@ -233,25 +170,7 @@ angular.module('mm.addons.mod_feedback')
         $mmaModFeedbackHelper.openFeature(feature, module, courseId);
     };
 
-    fetchFeedbackFormData().finally(function() {
-        $scope.refreshIcon = 'ion-refresh';
-    });
-
-    // Context Menu Description action.
-    $scope.expandDescription = function() {
-        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
-    };
-
-    // Pull to refresh.
-    $scope.refreshFeedback = function(showErrors) {
-        if ($scope.feedbackLoaded) {
-            $scope.refreshIcon = 'spinner';
-            return refreshAllData(showErrors).finally(function() {
-                $scope.refreshIcon = 'ion-refresh';
-                $scope.$broadcast('scroll.refreshComplete');
-            });
-        }
-    };
+    fetchFeedbackFormData();
 
     function scrollTop() {
         if (!scrollView) {
@@ -264,10 +183,14 @@ angular.module('mm.addons.mod_feedback')
 
     // Refresh online status when changes.
     onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
-        $scope.isOnline = online;
+        offline = !online;
     });
 
     $scope.$on('$destroy', function() {
+        if (submitted) {
+            // If form has been submitted, the info has been already invalidated but we should update index view.
+            $mmEvents.trigger(mmaModFeedbackEventFormSubmitted, {feedbackId: feedback.id});
+        }
         onlineObserver && onlineObserver.off && onlineObserver.off();
     });
 });
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index a7e15dc59e9..e8b0e2df05e 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -23,12 +23,13 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackIndexCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $mmCourseHelper, $q, $mmCourse,
             $mmText, mmaModFeedbackComponent, $mmEvents, $ionicScrollDelegate, $mmApp, $translate, $mmGroups, $mmaModFeedbackHelper,
-            mmCoreEventOnlineStatusChanged, $state) {
+            mmCoreEventOnlineStatusChanged, $state, mmaModFeedbackEventFormSubmitted) {
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         feedback,
         scrollView,
-        onlineObserver;
+        onlineObserver,
+        obsSubmitted;
 
     $scope.title = module.name;
     $scope.description = module.description;
@@ -163,13 +164,11 @@ angular.module('mm.addons.mod_feedback')
     };
 
     // Function to go to the questions form.
-    $scope.gotoAnswerQuestions = function(page, preview) {
+    $scope.gotoAnswerQuestions = function(preview) {
         var stateParams = {
             module: module,
             moduleid: module.id,
             courseid: courseId,
-            feedbackid: module.instance,
-            page: page || 0,
             preview: !!preview
         };
         $state.go('site.mod_feedback-form', stateParams);
@@ -183,6 +182,14 @@ angular.module('mm.addons.mod_feedback')
         scrollView && scrollView.scrollTop && scrollView.scrollTop();
     }
 
+    // Listen for form submit events.
+    obsSubmitted = $mmEvents.on(mmaModFeedbackEventFormSubmitted, function(data) {
+        // Go to review attempt if an attempt in this quiz was finished and synced.
+        if (data.feedbackId === feedback.id) {
+            fetchFeedbackData(true);
+        }
+    });
+
     // Refresh online status when changes.
     onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
         $scope.isOnline = online;
@@ -190,5 +197,6 @@ angular.module('mm.addons.mod_feedback')
 
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
+        obsSubmitted && obsSubmitted.off && obsSubmitted.off();
     });
 });
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 1fc5473f514..745f7f75816 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -13,7 +13,6 @@
     "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
     "not_selected": "Not selected",
-    "no_items_available_yet": "No questions have been set up yet",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 65c0b459dff..96ab506ef6d 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -15,6 +15,7 @@
 angular.module('mm.addons.mod_feedback', ["chart.js"])
 
 .constant('mmaModFeedbackComponent', 'mmaModFeedback')
+.constant('mmaModFeedbackEventFormSubmitted', 'mma_mod_feedback_form_submitted')
 
 .config(function($stateProvider) {
 
@@ -38,7 +39,6 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
     .state('site.mod_feedback-form', {
         url: '/mod_feedback-form',
         params: {
-            feedbackid: null,
             page: null,
             preview: null,
             courseid: null,
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index ce1960cd4c2..d3b4840a0d4 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -118,9 +118,7 @@ angular.module('mm.addons.mod_feedback')
     self.isPluginEnabled = function(siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return  site.wsAvailable('mod_feedback_get_feedbacks_by_courses') &&
-                    site.wsAvailable('mod_feedback_get_feedback_access_information') &&
-                    site.wsAvailable('mod_feedback_get_page_items') &&
-                    site.wsAvailable('mod_feedback_get_items');
+                    site.wsAvailable('mod_feedback_get_feedback_access_information');
         });
     };
 
@@ -219,10 +217,12 @@ angular.module('mm.addons.mod_feedback')
      * @ngdoc method
      * @name $mmaModFeedback#getFeedbackAccessInformation
      * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Boolean}   offline         True if it should return cached data. Has priority over ignoreCache.
+     * @param   {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @return  {Promise}                   Promise resolved when the feedback is retrieved.
      */
-    self.getFeedbackAccessInformation = function(feedbackId, siteId) {
+    self.getFeedbackAccessInformation = function(feedbackId, offline, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     feedbackid: feedbackId
@@ -231,6 +231,13 @@ angular.module('mm.addons.mod_feedback')
                     cacheKey: getFeedbackAccessInformationDataCacheKey(feedbackId)
                 };
 
+            if (offline) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
             return site.read('mod_feedback_get_feedback_access_information', params, preSets);
         });
     };
@@ -302,10 +309,12 @@ angular.module('mm.addons.mod_feedback')
      * @ngdoc method
      * @name $mmaModFeedback#getResumePage
      * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Boolean}   offline         True if it should return cached data. Has priority over ignoreCache.
+     * @param   {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @return  {Promise}                   Promise resolved when the info is retrieved.
      */
-    self.getResumePage = function(feedbackId, siteId) {
+    self.getResumePage = function(feedbackId, offline, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     feedbackid: feedbackId
@@ -314,6 +323,13 @@ angular.module('mm.addons.mod_feedback')
                     cacheKey: getResumePageDataCacheKey(feedbackId)
                 };
 
+            if (offline) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
             return site.read('mod_feedback_launch_feedback', params, preSets).then(function(response) {
                 if (response && typeof response.gopage != "undefined") {
                     // WS will return -1 for last page but the user need to start again.
@@ -439,10 +455,12 @@ angular.module('mm.addons.mod_feedback')
      * @ngdoc method
      * @name $mmaModFeedback#getCurrentValues
      * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Boolean}   offline         True if it should return cached data. Has priority over ignoreCache.
+     * @param   {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @return  {Promise}                   Promise resolved when the info is retrieved.
      */
-    self.getCurrentValues = function(feedbackId, siteId) {
+    self.getCurrentValues = function(feedbackId, offline, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     feedbackid: feedbackId
@@ -451,6 +469,13 @@ angular.module('mm.addons.mod_feedback')
                     cacheKey: getCurrentValuesDataCacheKey(feedbackId)
                 };
 
+            if (offline) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
             return site.read('mod_feedback_get_unfinished_responses', params, preSets).then(function(response) {
                 if (response && typeof response.responses != "undefined") {
                     return response.responses;
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index 6b61ad44a49..8acfcee8d2d 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -271,7 +271,6 @@ angular.module('mm.addons.mod_feedback')
                     var stateParams = {
                         module: module,
                         moduleid: module.id,
-                        feedbackid: module.instance,
                         courseid: module.course,
                         preview: true
                     };
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index d685e7d537f..f6df37922e4 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -215,23 +215,14 @@ angular.module('mm.addons.mod_feedback')
 
         function getItemFormTextfield(item) {
             item.template = 'textfield';
-
-            var sizeAndLength = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-            item.size = sizeAndLength.length > 0 && sizeAndLength[0] >= 5 ? sizeAndLength[0] : 30;
-            item.length = sizeAndLength.length > 1 ? sizeAndLength[1] : 255;
+            item.length = item.presentation.split(FEEDBACK_LINE_SEP)[1] || 255;
             item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
-
             return item;
         }
 
         function getItemFormTextarea(item) {
             item.template = 'textarea';
-
-            var widthAndHeight = item.presentation.split(FEEDBACK_LINE_SEP) || [];
-            item.width = widthAndHeight.length > 0 && widthAndHeight[0] >= 5 ? widthAndHeight[0] : 30;
-            item.height = widthAndHeight.length > 1 ? widthAndHeight[1] : 5;
             item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
-
             return item;
         }
 
@@ -299,18 +290,20 @@ angular.module('mm.addons.mod_feedback')
      * @name $mmaModFeedbackHelper#getPageItems
      * @param   {Number}    feedbackId      Feedback ID.
      * @param   {Number}    page            The page to get.
+     * @param   {Boolean}   offline         True if it should return cached data. Has priority over ignoreCache.
+     * @param   {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
      * @return  {Promise}                   Promise resolved when the info is retrieved.
      */
-    self.getPageItems = function(feedbackId, page) {
+    self.getPageItems = function(feedbackId, page, offline, ignoreCache) {
         return $mmaModFeedback.getPageItems(feedbackId, page).then(function(response) {
-            return fillValues(feedbackId, response.items).then(function(items) {
+            return fillValues(feedbackId, response.items, offline, ignoreCache).then(function(items) {
                 response.items = items;
                 return response;
             });
         }).catch(function() {
             // If getPageItems fail we should calculate it using getItems.
             return $mmaModFeedback.getItems(feedbackId).then(function(response) {
-                return fillValues(feedbackId, response.items).then(function(items) {
+                return fillValues(feedbackId, response.items, offline, ignoreCache).then(function(items) {
                     // Separate items by pages.
                     var pageItems = [],
                         currentPage = 0,
@@ -354,14 +347,14 @@ angular.module('mm.addons.mod_feedback')
     };
 
     /**
-     * Check dependency of a question item.
+     * Fill values of item questions.
      *
      * @param   {Number}   feedbackId Feedback ID.
      * @param   {Array}    items      Item to fill the value.
      * @return  {Promise}             Resolved with values when done.
      */
-    function fillValues(feedbackId, items) {
-        return $mmaModFeedback.getCurrentValues(feedbackId).then(function(values) {
+    function fillValues(feedbackId, items, offline, ignoreCache) {
+        return $mmaModFeedback.getCurrentValues(feedbackId, offline, ignoreCache).then(function(values) {
             angular.forEach(items, function(itemData) {
                 if (!itemData.hasvalue) {
                     return;
@@ -455,5 +448,61 @@ angular.module('mm.addons.mod_feedback')
         }
     }
 
+    /**
+     * Get page items responses to be sent.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#getPageItemsResponses
+     * @param   {Array}    items      Items where the values are.
+     * @return  {Object}              Responses object to be sent.
+     */
+    self.getPageItemsResponses = function(items) {
+        var responses = {};
+
+        angular.forEach(items, function(itemData) {
+            if (itemData.hasvalue || itemData.typ == "captcha") {
+                var name, value,
+                    nameTemp = itemData.typ + '_' + itemData.id,
+                    answered = false;
+                if (itemData.typ == "multichoice" && itemData.subtype == 'c') {
+                    name = nameTemp + '[0]';
+                    responses[name] = 0;
+                    angular.forEach(itemData.choices, function(choice, index) {
+                        name = nameTemp + '[' + (index + 1) + ']';
+                        value = choice.checked ? choice.value : 0;
+                        if (!answered && value) {
+                            answered = true;
+                        }
+                        responses[name] = value;
+                    });
+                } else {
+                    if (itemData.typ == "multichoice") {
+                        name = nameTemp + '[0]';
+                        value = itemData.value || 0;
+                    } else if (itemData.typ == "multichoicerated") {
+                        name = nameTemp;
+                        value = itemData.value || 0;
+                    } else {
+                        name = nameTemp;
+                        value = itemData.value || "";
+                    }
+
+                    answered = !!value;
+                    responses[name] = value;
+                }
+
+                if (itemData.required && !answered) {
+                    // Check if it has any value.
+                    itemData.isEmpty = true;
+                } else {
+                    itemData.isEmpty = false;
+                }
+            }
+        });
+
+        return responses;
+    };
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 797f6f71108..95109a65e9e 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -57,10 +57,8 @@ angular.module('mm.addons.mod_feedback')
      * @return {Promise}          Promise resolved with the list of files.
      */
     self.getFiles = function(module, courseId, siteId) {
-        var files = [],
-            feedback;
-        return $mmaModFeedback.getFeedback(courseId, module.id, siteId).then(function(response) {
-            feedback = response;
+        var files = [];
+        return $mmaModFeedback.getFeedback(courseId, module.id, siteId).then(function(feedback) {
 
             // Get intro files and page after submit files.
             files = feedback.pageaftersubmitfiles || [];
@@ -199,7 +197,7 @@ angular.module('mm.addons.mod_feedback')
                 return $mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id);
             }));
 
-            p1.push($mmaModFeedback.getFeedbackAccessInformation(feedback.id, siteId).then(function(accessData) {
+            p1.push($mmaModFeedback.getFeedbackAccessInformation(feedback.id, false, true, siteId).then(function(accessData) {
                 var p2 = [];
                 if (accessData.canedititems || accessData.canviewreports) {
                     // Get all groups analysis.
@@ -217,8 +215,8 @@ angular.module('mm.addons.mod_feedback')
                 p2.push($mmaModFeedback.getItems(feedback.id, siteId));
 
                 if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
-                    p2.push($mmaModFeedback.getCurrentValues(feedback.id, siteId));
-                    p2.push($mmaModFeedback.getResumePage(feedback.id, siteId));
+                    p2.push($mmaModFeedback.getCurrentValues(feedback.id, false, true, siteId));
+                    p2.push($mmaModFeedback.getResumePage(feedback.id, false, true, siteId));
                 }
 
                 return $q.all(p2);
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index e976a54c452..dd5bbb2bf99 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -1,12 +1,5 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
-    <ion-nav-buttons side="secondary">
-        <mm-context-menu>
-            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
-            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
-            <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
-        </mm-context-menu>
-    </ion-nav-buttons>
     <ion-content delegate-handle="mmaModFeedbackFormScroll" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
@@ -30,7 +23,7 @@
                 </script>
 
                 <script type="text/ng-template" id="textfield">
-                    <input ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" type="text" ng-model="item.value" autocorrect="off" size="{{item.size}}" size="{{item.length}}"/>
+                    <input ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" type="text" ng-model="item.value" autocorrect="off" maxlength="{{item.length}}"/>
                 </script>
 
                 <script type="text/ng-template" id="numeric">
@@ -38,7 +31,7 @@
                 </script>
 
                 <script type="text/ng-template" id="textarea">
-                    <textarea ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" aria-multiline="true" rows="{{item.height}}" cols="{{item.width}}" ng-model="item.value"></textarea>
+                    <textarea ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" aria-multiline="true" ng-model="item.value"></textarea>
                 </script>
 
                 <script type="text/ng-template" id="multichoice-r">
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 783fb4b7c9a..175444cc25f 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -59,14 +59,14 @@
                         <p ng-if="!access.isanonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
                     </div>
                     <div class="item item-text-wrap row-buttons responsive-sm">
-                        <button class="button button-block icon-left ion-search" ng-click="gotoAnswerQuestions(0, true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
+                        <button class="button button-block icon-left ion-search" ng-click="gotoAnswerQuestions(true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
                         <button ng-if="!access.canviewreports && access.canviewanalysis" class="button button-block icon-left ion-stats-bars" ng-click="openFeature('analysis')">
                             {{ 'mma.mod_feedback.completed_feedbacks' | translate }}
                         </button>
                         <button ng-if="access.cancomplete && access.cansubmit && !goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
                             {{ 'mma.mod_feedback.complete_the_form' | translate }}
                         </button>
-                        <button ng-if="access.cancomplete && access.cansubmit && goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions(goPage)">
+                        <button ng-if="access.cancomplete && access.cansubmit && goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
                             {{ 'mma.mod_feedback.continue_the_form' | translate }}
                         </button>
                     </div>

From 236f4bac154bd5f40a42c99089bb14fd972acfb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 23 Mar 2017 16:44:50 +0100
Subject: [PATCH 048/218] MOBILE-2003 feedback: Check for changes before
 leaving

---
 www/addons/mod/feedback/controllers/form.js | 32 +++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index a836ce47aca..a773c83aa01 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $timeout, $mmSite, $state,
             mmaModFeedbackComponent, $mmEvents, $mmApp, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper, $ionicScrollDelegate,
-            $ionicHistory, $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted) {
+            $ionicHistory, $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted, $translate) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -33,7 +33,8 @@ angular.module('mm.addons.mod_feedback')
         scrollView,
         onlineObserver,
         offline = false,
-        submitted = false;
+        submitted = false,
+        originalData;
 
     $scope.title = $stateParams.title;
     $scope.courseId = courseId;
@@ -41,6 +42,9 @@ angular.module('mm.addons.mod_feedback')
     $scope.componentId = module.id;
     $scope.preview = !!$stateParams.preview;
 
+    // Block leaving the view, we want to save changes before leaving.
+    blockData = $mmUtil.blockLeaveView($scope, leavePlayer);
+
     // Convenience function to get feedback data.
     function fetchFeedbackFormData() {
         offline = !$mmApp.isOnline();
@@ -66,7 +70,8 @@ angular.module('mm.addons.mod_feedback')
             return fetchFeedbackPageData(page);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
-            return $ionicHistory.goBack();
+            blockData && blockData.back();
+            return $q.reject();
         }).finally(function() {
             $scope.feedbackLoaded = true;
         });
@@ -95,6 +100,10 @@ angular.module('mm.addons.mod_feedback')
                 // Filter items with errors.
                 return itemData;
             });
+
+            if (!$scope.preview) {
+                originalData = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
+            }
         });
     }
 
@@ -138,6 +147,17 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    function leavePlayer() {
+        var responses = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
+        if ($scope.items && !$scope.completed && originalData) {
+            // Form submitted. Check if there is any change.
+            if (!$mmUtil.basicLeftCompare(responses, originalData, 3)) {
+                 return $mmUtil.showConfirm($translate('mm.core.confirmcanceledit'));
+            }
+        }
+        return $q.when();
+    }
+
     // Function to go to the page after submit.
     $scope.continue = function() {
         if (siteAfterSubmit) {
@@ -159,12 +179,6 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
-    // Function to discard and go back.
-    $scope.cancel = function() {
-        // @todo
-        $ionicHistory.goBack();
-    };
-
     // Function to link implemented features.
     $scope.openFeature = function(feature) {
         $mmaModFeedbackHelper.openFeature(feature, module, courseId);

From ba56c49985afae27fa9c573bbae80add8401e9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 27 Mar 2017 10:12:37 +0200
Subject: [PATCH 049/218] MOBILE-2003 feedback: Register complete and print
 link handlers

---
 www/addons/mod/feedback/controllers/analysis.js | 5 +++--
 www/addons/mod/feedback/controllers/form.js     | 3 ++-
 www/addons/mod/feedback/main.js                 | 2 ++
 www/addons/mod/feedback/services/handlers.js    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/analysis.js b/www/addons/mod/feedback/controllers/analysis.js
index f0d962b4393..7fb9e729cfe 100644
--- a/www/addons/mod/feedback/controllers/analysis.js
+++ b/www/addons/mod/feedback/controllers/analysis.js
@@ -22,7 +22,8 @@ angular.module('mm.addons.mod_feedback')
  * @name mmaModFeedbackAnalysisCtrl
  */
 .controller('mmaModFeedbackAnalysisCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $mmApp,
-            mmaModFeedbackComponent, $mmEvents, $translate, $mmGroups, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper) {
+            mmaModFeedbackComponent, $mmEvents, $translate, $mmGroups, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper,
+            $ionicHistory) {
     var feedbackId = $stateParams.feedbackid,
         module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -83,7 +84,7 @@ angular.module('mm.addons.mod_feedback')
                     return $scope.setGroup($scope.selectedGroup);
                 });
             } else {
-                // @todo: go back
+                $ionicHistory.goBack();
             }
         }).catch(function(message) {
             if (!refresh) {
diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index a773c83aa01..3d704c6efbf 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -34,7 +34,8 @@ angular.module('mm.addons.mod_feedback')
         onlineObserver,
         offline = false,
         submitted = false,
-        originalData;
+        originalData,
+        blockData;
 
     $scope.title = $stateParams.title;
     $scope.courseId = courseId;
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 96ab506ef6d..f6e86235a5f 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -74,5 +74,7 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
     $mmCourseDelegateProvider.registerContentHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackHandlers.courseContent');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:index', '$mmaModFeedbackHandlers.indexLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:analysis', '$mmaModFeedbackHandlers.analysisLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:complete', '$mmaModFeedbackHandlers.completeLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:print', '$mmaModFeedbackHandlers.printLinksHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackPrefetchHandler');
 });
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index 8acfcee8d2d..385d5a06e81 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -253,7 +253,7 @@ angular.module('mm.addons.mod_feedback')
                 /\/mod\/feedback\/print\.php.*([\?\&](id)=\d+)/, '$mmCourseDelegate_mmaModFeedback');
 
     // Check if the printLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
-    self.completeLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
+    self.printLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
 
     // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
     self.printLinksHandler.getActions = function(siteIds, url, params, courseId) {

From c373d03bc8c08438bf7407aeed04bc527d9a6a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 27 Mar 2017 15:29:29 +0200
Subject: [PATCH 050/218] MOBILE-2006 feedback: Add respondents attempts list

---
 .../mod/feedback/controllers/respondents.js   | 156 ++++++++++++++++++
 www/addons/mod/feedback/lang/en.json          |   4 +
 www/addons/mod/feedback/main.js               |  15 ++
 www/addons/mod/feedback/services/feedback.js  | 115 ++++++++++++-
 www/addons/mod/feedback/services/helper.js    |  35 +++-
 .../mod/feedback/services/prefetch_handler.js |  13 +-
 .../mod/feedback/templates/analysis.html      |  10 +-
 www/addons/mod/feedback/templates/index.html  |  10 +-
 .../mod/feedback/templates/respondents.html   |  54 ++++++
 www/core/lang/en.json                         |   1 +
 10 files changed, 392 insertions(+), 21 deletions(-)
 create mode 100644 www/addons/mod/feedback/controllers/respondents.js
 create mode 100644 www/addons/mod/feedback/templates/respondents.html

diff --git a/www/addons/mod/feedback/controllers/respondents.js b/www/addons/mod/feedback/controllers/respondents.js
new file mode 100644
index 00000000000..4ae5619319e
--- /dev/null
+++ b/www/addons/mod/feedback/controllers/respondents.js
@@ -0,0 +1,156 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback respondents controller.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc controller
+ * @name mmaModFeedbackRespondentsCtrl
+ */
+.controller('mmaModFeedbackRespondentsCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmText, $translate,
+        mmaModFeedbackComponent, $mmGroups, $mmaModFeedbackHelper, $ionicHistory) {
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        page = 0,
+        feedback;
+
+    $scope.moduleUrl = module.url;
+    $scope.refreshIcon = 'spinner';
+    $scope.component = mmaModFeedbackComponent;
+    $scope.componentId = module.id;
+    $scope.selectedGroup = 0;
+    $scope.canLoadMore = false;
+    $scope.responses = {
+        attempts: [],
+        anonattempts: [],
+        totalattempts: 0,
+        totalanonattempts: 0
+    };
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackRespondentsData(refresh) {
+        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
+            feedback = feedbackData;
+
+            $scope.description = feedback.intro;
+
+            $scope.feedbackId = feedback.id;
+            page = 0;
+            $scope.responses.totalattempts = 0;
+            $scope.responses.totalanonattempts = 0;
+            $scope.responses.attempts = [];
+            $scope.responses.anonattempts = [];
+
+            // Get groups (only for teachers).
+            return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+                $scope.groupInfo = groupInfo;
+                return loadGroupAttempts($scope.selectedGroup);
+            });
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+
+            if (!refresh) {
+                // Some call failed on first fetch, go back.
+                $ionicHistory.goBack();
+            }
+            return $q.reject();
+        });
+    }
+
+    /**
+     * Load Group responses.
+     *
+     * @param  {Number} [groupId]   If defined it will change group if not, it will load more attempts for the same group.
+     * @return {Promise}            Resolved with the attempts loaded.
+     */
+    function loadGroupAttempts(groupId) {
+        if (typeof groupId == "undefined") {
+            page++;
+            $scope.loadingMore = true;
+        } else {
+            $scope.selectedGroup = groupId;
+            page = 0;
+            $scope.responses.totalattempts = 0;
+            $scope.responses.totalanonattempts = 0;
+            $scope.responses.attempts = [];
+            $scope.responses.anonattempts = [];
+            $scope.feedbackLoaded = false;
+        }
+
+        return $mmaModFeedbackHelper.getResponsesAnalysis(feedback.id, $scope.selectedGroup, page).then(function(responses) {
+            $scope.responses.totalattempts = responses.totalattempts;
+            $scope.responses.totalanonattempts = responses.totalanonattempts;
+
+            if ($scope.responses.anonattempts.length < responses.totalanonattempts) {
+                $scope.responses.anonattempts = $scope.responses.anonattempts.concat(responses.anonattempts);
+            }
+            if ($scope.responses.attempts.length < responses.totalattempts) {
+                $scope.responses.attempts = $scope.responses.attempts.concat(responses.attempts);
+            }
+
+            $scope.canLoadMoreAnon = $scope.responses.anonattempts.length < responses.totalanonattempts;
+            $scope.canLoadMoreNonAnon = $scope.responses.attempts.length < responses.totalattempts;
+
+            return responses;
+        }).finally(function() {
+            $scope.loadingMore = false;
+            $scope.feedbackLoaded = true;
+        });
+    }
+
+    // Load group attempts.
+    $scope.loadGroupAttempts = function(groupId) {
+        loadGroupAttempts(groupId).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+        });
+    };
+
+    // Convenience function to refresh all the data.
+    function refreshAllData() {
+        var promises = [];
+        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
+        if (feedback) {
+            promises.push($mmaModFeedback.invalidateResponsesAnalysisData(feedback.id));
+            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
+            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+        }
+        return $q.all(promises).finally(function() {
+            return fetchFeedbackRespondentsData(true);
+        });
+    }
+
+    fetchFeedbackRespondentsData().finally(function() {
+        $scope.refreshIcon = 'ion-refresh';
+    });
+
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshFeedback = function() {
+        if ($scope.feedbackLoaded) {
+            $scope.refreshIcon = 'spinner';
+            return refreshAllData().finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 745f7f75816..991cb3c0b1c 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -1,6 +1,7 @@
 {
     "analysis": "Analysis",
     "anonymous": "Anonymous",
+    "anonymous_entries": "Anonymous entries ({{$a}})",
     "average": "Average",
     "complete_the_form": "Answer the questions...",
     "completed_feedbacks": "Submitted answers",
@@ -12,12 +13,15 @@
     "mode": "Mode",
     "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
+    "non_anonymous_entries": "Non anonymous entries ({{$a}})",
     "not_selected": "Not selected",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
     "previous_page": "Previous page",
     "questions": "Questions",
+    "responses": "Responses",
+    "response_nr": "Response number",
     "save_entries": "Submit your answers",
     "show_entries": "Show responses",
     "show_nonrespondents": "Show non-respondents",
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index f6e86235a5f..2d131acc8ad 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -67,6 +67,21 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
                 templateUrl: 'addons/mod/feedback/templates/analysis.html'
             }
         }
+    })
+
+    .state('site.mod_feedback-respondents', {
+        url: '/mod_feedback-respondents',
+        params: {
+            courseid: null,
+            module: null,
+            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+        },
+        views: {
+            'site': {
+                controller: 'mmaModFeedbackRespondentsCtrl',
+                templateUrl: 'addons/mod/feedback/templates/respondents.html'
+            }
+        }
     });
 })
 
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index d3b4840a0d4..b7e4779c060 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedback
  */
-.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil) {
+.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil, $mmUser) {
     var self = {};
 
     /**
@@ -61,7 +61,7 @@ angular.module('mm.addons.mod_feedback')
      * @return {String}         Cache key.
      */
     function getAnalysisDataPrefixCacheKey(feedbackId) {
-        return getFeedbackDataPrefixCacheKey(feedbackId) + ':analysis';
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':analysis:';
     }
 
     /**
@@ -73,7 +73,7 @@ angular.module('mm.addons.mod_feedback')
      */
     function getAnalysisDataCacheKey(feedbackId, groupId) {
         groupId = groupId || 0;
-        return getAnalysisDataPrefixCacheKey(feedbackId) + ":" + groupId;
+        return getAnalysisDataPrefixCacheKey(feedbackId) + groupId;
     }
 
     /**
@@ -106,6 +106,28 @@ angular.module('mm.addons.mod_feedback')
         return getFeedbackDataPrefixCacheKey(feedbackId) + ':currentvalues';
     }
 
+    /**
+     * Get prefix cache key for feedback responses analysis data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getResponsesAnalysisDataPrefixCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':responsesanalysis:';
+    }
+
+    /**
+     * Get cache key for responses analysis feedback data WS calls.
+     *
+     * @param  {Number} feedbackId  Feedback ID.
+     * @param  {Number} groupId     Group id, 0 means that the function will determine the user group.
+     * @return {String}             Cache key.
+     */
+    function getResponsesAnalysisDataCacheKey(feedbackId, groupId) {
+        groupId = groupId || 0;
+        return getResponsesAnalysisDataPrefixCacheKey(feedbackId) + groupId;
+    }
+
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
      *
@@ -501,6 +523,93 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Returns the feedback user responses.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getResponsesAnalysis
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    groupId         Group id, 0 means that the function will determine the user group.
+     * @param   {Number}    page            The page of records to return.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getResponsesAnalysis = function(feedbackId, groupId, page, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId,
+                    groupid: groupId || 0,
+                    page: page || 0
+                },
+                preSets = {
+                    cacheKey: getResponsesAnalysisDataCacheKey(feedbackId, groupId)
+                };
+
+            return site.read('mod_feedback_get_responses_analysis', params, preSets);
+        });
+    };
+
+    /**
+     * Returns all the feedback user responses.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getAllResponsesAnalysis
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    groupId         Group id, 0 means that the function will determine the user group.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Object}    [previous]      Only for recurrent use. Object with the previous fetched info.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getAllResponsesAnalysis = function(feedbackId, groupId, siteId, previous) {
+        siteId = siteId || $mmSite.getId();
+        if (typeof previous == "undefined") {
+            previous = {
+                page: 0,
+                attempts: [],
+                anonattempts: []
+            };
+        }
+
+        return self.getResponsesAnalysis(feedbackId, groupId, previous.page, siteId).then(function(responses) {
+            if (previous.anonattempts.length < responses.totalanonattempts) {
+                previous.anonattempts = previous.anonattempts.concat(responses.anonattempts);
+            }
+
+            if (previous.attempts.length < responses.totalattempts) {
+                previous.attempts = previous.attempts.concat(responses.attempts);
+            }
+
+            if (previous.anonattempts.length < responses.totalanonattempts || previous.attempts.length < responses.totalattempts) {
+                // Can load more.
+                previous.page++;
+                return self.getAllResponsesAnalysis(feedbackId, groupId, siteId, previous);
+            }
+
+            previous.totalattempts = responses.totalattempts;
+            previous.totalanonattempts = responses.totalanonattempts;
+            return previous;
+        });
+    };
+
+    /**
+     * Invalidates feedback user responses record data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateResponsesAnalysisData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateResponsesAnalysisData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getResponsesAnalysisDataPrefixCacheKey(feedbackId));
+
+        });
+    };
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModFeedback#invalidateFiles.
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index f6df37922e4..9303d4d5cac 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedbackHelper
  */
-.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText,
+.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText, $mmUser, $q,
         $mmaModFeedback) {
 
     var self = {},
@@ -126,11 +126,11 @@ angular.module('mm.addons.mod_feedback')
 
                 // Page found.
                 if (view.stateName == pageName) {
-                    break;
+                    return backTimes;
                 }
             }
 
-            return backTimes;
+            return 0;
         }
     };
 
@@ -504,5 +504,34 @@ angular.module('mm.addons.mod_feedback')
         return responses;
     };
 
+    /**
+     * Returns the feedback user responses with extra info.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#getResponsesAnalysis
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    groupId         Group id, 0 means that the function will determine the user group.
+     * @param   {Number}    page            The page of records to return.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getResponsesAnalysis = function(feedbackId, groupId, page) {
+        return $mmaModFeedback.getResponsesAnalysis(feedbackId, groupId, page).then(function(responses) {
+            var promises = [];
+
+            angular.forEach(responses.attempts, function(attempt) {
+                promises.push($mmUser.getProfile(attempt.userid, attempt.courseid, true).then(function(user) {
+                    attempt.profileimageurl = user.profileimageurl;
+                }).catch(function() {
+                    // Error getting profile, resolve promise without adding any extra data.
+                }));
+            });
+
+            return $q.all(promises).then(function() {
+                return responses;
+            });
+        });
+    };
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 95109a65e9e..22eef6aa153 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_feedback')
  * @name $mmaModFeedbackPrefetchHandler
  */
 .factory('$mmaModFeedbackPrefetchHandler', function($mmaModFeedback, mmaModFeedbackComponent, $mmFilepool, $q, $mmUtil, $mmGroups,
-            $mmPrefetchFactory) {
+            $mmPrefetchFactory, $mmUser) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModFeedbackComponent);
 
@@ -203,12 +203,19 @@ angular.module('mm.addons.mod_feedback')
                     // Get all groups analysis.
                     p2.push($mmaModFeedback.getAnalysis(feedback.id, undefined, siteId));
                     p2.push($mmGroups.getActivityAllowedGroupsIfEnabled(feedback.coursemodule, undefined, siteId).then(function(groups) {
-                        var p3 = [];
+                        var p3 = [],
+                            userIds = [];
                         angular.forEach(groups, function(group) {
                             p3.push($mmaModFeedback.getAnalysis(feedback.id, group.id, siteId));
+                            p3.push($mmaModFeedback.getAllResponsesAnalysis(feedback.id, group.id, siteId).then(function(responses) {
+                                userIds.push(responses.userid);
+                            }));
                         });
 
-                        return $q.all(p3);
+                        return $q.all(p3).then(function() {
+                            // Prefetch user profiles.
+                            return $mmUser.prefetchProfiles(userIds, courseId, siteId);
+                        });
                     }));
                 }
 
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
index 33957021bbe..06430f5f9a9 100644
--- a/www/addons/mod/feedback/templates/analysis.html
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -18,13 +18,14 @@
                         <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
                         </select>
                     </div>
-                    <div class="item item-text-wrap item-icon-right">
+                    <div class="item item-text-wrap item-icon-right"  ng-click="openFeature('respondents')">
                         <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
-                        <span class="badge">{{feedback.completedCount}}</span>
+                        <span class="badge badge-positive">{{feedback.completedCount}}</span>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
                     </div>
                     <div class="item item-text-wrap item-icon-right">
                         <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
-                        <span class="badge">{{feedback.itemsCount}}</span>
+                        <span class="badge badge-positive">{{feedback.itemsCount}}</span>
                     </div>
                 </div>
                 <div class="mm-warning-card-icon" ng-if="warning">
@@ -70,9 +71,6 @@
             <a class="tab-item active">
                 <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
             </a>
-            <a class="tab-item" ng-click="openFeature('show_entries', true)">
-                <i class="icon ion-checkmark-round"></i>{{ 'mma.mod_feedback.show_entries' | translate }}
-            </a>
             <a class="tab-item" ng-if="!access.isanonymous" ng-click="openFeature('show_nonrespondents', true)">
                 <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
             </a>
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 175444cc25f..2e2a267f79d 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -31,13 +31,14 @@
                         <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
                         </select>
                     </div>
-                    <div class="item item-text-wrap item-icon-right">
+                    <div class="item item-text-wrap item-icon-right" ng-click="openFeature('respondents')">
                         <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
-                        <span class="badge">{{feedback.completedCount}}</span>
+                        <span class="badge badge-positive">{{feedback.completedCount}}</span>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
                     </div>
                     <div class="item item-text-wrap item-icon-right">
                         <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
-                        <span class="badge">{{feedback.itemsCount}}</span>
+                        <span class="badge badge-positive">{{feedback.itemsCount}}</span>
                     </div>
                     <div class="item item-text-wrap" ng-if="feedback.timeopen">
                         <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
@@ -82,9 +83,6 @@
             <a class="tab-item" ng-click="openFeature('analysis')">
                 <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
             </a>
-            <a class="tab-item" ng-click="openFeature('show_entries', true)">
-                <i class="icon ion-checkmark-round"></i>{{ 'mma.mod_feedback.show_entries' | translate }}
-            </a>
             <a class="tab-item" ng-if="!access.isanonymous" ng-click="openFeature('show_nonrespondents', true)">
                 <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
             </a>
diff --git a/www/addons/mod/feedback/templates/respondents.html b/www/addons/mod/feedback/templates/respondents.html
new file mode 100644
index 00000000000..7dfd30b953b
--- /dev/null
+++ b/www/addons/mod/feedback/templates/respondents.html
@@ -0,0 +1,54 @@
+<ion-view view-title="{{ 'mma.mod_feedback.responses' |translate }}">
+    <ion-nav-buttons side="secondary">
+        <mm-context-menu>
+            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
+            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="feedbackLoaded" content="'mm.core.refresh' | translate" action="refreshFeedback()" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+        </mm-context-menu>
+    </ion-nav-buttons>
+    <mm-split-view load-when="feedbackLoaded" component="{{component}}">
+        <ion-content mm-state-class>
+            <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback()"></ion-refresher>
+            <mm-loading hide-until="feedbackLoaded">
+                <section class="list">
+                    <div class="item item-text-wrap item-input item-select" ng-if="groupInfo.separateGroups || groupInfo.visibleGroups">
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                        <select ng-model="selectedGroup" ng-change="loadGroupAttempts(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                        </select>
+                    </div>
+                    <div class="item item-divider" ng-if="responses.totalattempts > 0">
+                        {{ 'mma.mod_feedback.non_anonymous_entries' |translate : {$a: responses.totalattempts } }}
+                    </div>
+                    <div ng-repeat="attempt in responses.attempts" ng-if="responses.totalattempts > 0">
+                        <a ng-class="{'item-avatar': attempt.profileimageurl}" class="item item-text-wrap item-icon-right" mm-split-view-link="site.mod_feedback-attempt({'attemptid': attempt.id, 'attempt': attempt, 'feedbackid': feedbackId})">
+                            <img ng-if="attempt.profileimageurl" ng-src="{{attempt.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: attempt.fullname} }}" role="presentation">
+                            <h2>{{attempt.fullname}}</h2>
+                            <p ng-if="attempt.timemodified">{{attempt.timemodified * 1000 | mmFormatDate:"dffulldate"}}</p>
+                            <i class="icon icon-accessory ion-chevron-right"></i>
+                        </a>
+                    </div>
+                    <div class="item padding text-center" ng-if="canLoadMoreNonAnon">
+                        <!-- Button and spinner to show more attempts. -->
+                        <button ng-if="!loadingMore" class="button button-block" ng-click="loadGroupAttempts()">{{ 'mm.core.loadmore' | translate }}</button>
+                        <ion-spinner ng-if="loadingMore"></ion-spinner>
+                    </div>
+                    <div class="item item-divider" ng-if="responses.totalanonattempts > 0">
+                        {{ 'mma.mod_feedback.anonymous_entries' |translate : {$a: responses.totalanonattempts } }}
+                    </div>
+                    <div ng-repeat="attempt in responses.anonattempts" ng-if="responses.totalanonattempts > 0">
+                        <a class="item item-text-wrap item-icon-right" mm-split-view-link="site.mod_feedback-attempt({'id': attempt.id})">
+                            <h2>{{ 'mma.mod_feedback.response_nr' |translate }}: {{attempt.number}}</h2>
+                            <i class="icon icon-accessory ion-chevron-right"></i>
+                        </a>
+                    </div>
+                    <div class="item padding text-center" ng-if="canLoadMoreAnon">
+                        <!-- Button and spinner to show more attempts. -->
+                        <button ng-if="!loadingMore" class="button button-block" ng-click="loadGroupAttempts()">{{ 'mm.core.loadmore' | translate }}</button>
+                        <ion-spinner ng-if="loadingMore"></ion-spinner>
+                    </div>
+                </section>
+            </mm-loading>
+        </ion-content>
+    </mm-split-view>
+</ion-view>
\ No newline at end of file
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index d719cd8102e..90bf9718483 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -93,6 +93,7 @@
     "lastsync": "Last synchronization",
     "listsep": ",",
     "loading": "Loading",
+    "loadmore": "Load more",
     "lostconnection": "Your authentication token is invalid or has expired, you will have to reconnect to the site.",
     "maxsizeandattachments": "Maximum size for new files: {{$a.size}}, maximum attachments: {{$a.attachments}}",
     "min" : "min",

From 93dfcab656aec69c29e07ab24de1f4a77596f7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 30 Mar 2017 08:31:16 +0200
Subject: [PATCH 051/218] MOBILE-2006 splitview: Fix split view object watching

---
 www/core/directives/splitviewlink.js | 101 ++++++++++++++-------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/www/core/directives/splitviewlink.js b/www/core/directives/splitviewlink.js
index b09efc287f2..2202bba58da 100644
--- a/www/core/directives/splitviewlink.js
+++ b/www/core/directives/splitviewlink.js
@@ -39,8 +39,6 @@ angular.module('mm.core')
 .directive('mmSplitViewLink', function($log, $ionicPlatform, $state, $mmApp) {
     $log = $log.getInstance('mmSplitViewLink');
 
-    var srefRegex = new RegExp(/([^\(]*)(\((.*)\))?$/);
-
     /**
      * Create a new state for tablet view (split-view). The state created will be exactly the same as the target state
      * (stateName), but changing the name and the view name.
@@ -82,13 +80,22 @@ angular.module('mm.core')
     function scopeEval(scope, value) {
         if (typeof value == 'string') {
             try {
-                return scope.$eval(value);
+                return angular.copy(scope.$eval(value));
             } catch(ex) {
                 $log.error('Error evaluating string: ' + param);
             }
         }
     }
 
+    // Function taken from uiSref directive.
+    function parseStateRef(ref, current) {
+      var preparsed = ref.match(/^\s*({[^}]*})\s*$/), parsed;
+      if (preparsed) ref = current + '(' + preparsed[1] + ')';
+      parsed = ref.replace(/\n/g, " ").match(/^([^(]+?)\s*(\((.*)\))?$/);
+      if (!parsed || parsed.length !== 4) return false;
+      return { state: parsed[1], paramExpr: parsed[3] || null };
+    }
+
     /**
      * Fill state params to prevent problems with missing params. For each param not defined, applies the default value.
      * Example: If there are 2 states, one with params {timecreated: 1} and the other with params {},
@@ -114,9 +121,8 @@ angular.module('mm.core')
         restrict: 'A',
         require: '^mmSplitView',
         link: function(scope, element, attrs, splitViewController) {
-            var sref = attrs.mmSplitViewLink,
+            var sref = attrs.mmSplitViewLink ? parseStateRef(attrs.mmSplitViewLink, $state.current.name) : false,
                 menuState = splitViewController.getMenuState(),
-                matches,
                 stateName,
                 stateParams,
                 stateParamsString,
@@ -124,58 +130,53 @@ angular.module('mm.core')
                 stateParamsFilled = false;
 
             if (sref) {
-                matches = sref.match(srefRegex);
-                if (matches && matches.length) {
-                    stateName = matches[1]; // E.g. site.mm_user-profile
-                    tabletStateName = menuState + '.' + stateName.substr(stateName.lastIndexOf('.') + 1);
+                stateName = sref.state; // E.g. site.mm_user-profile
+                tabletStateName = menuState + '.' + stateName.substr(stateName.lastIndexOf('.') + 1);
+
+                stateParamsString = sref.paramExpr; // E.g. {courseid: courseid, userid: userid}
+                stateParams = scopeEval(scope, stateParamsString);
+
+                // Watch for changes on stateParams.
+                scope.$watch(stateParamsString, function(newVal) {
+                    stateParams = angular.copy(newVal);
+                    // Fill state params to prevent problems with missing params.
+                    fillStateParams(stateParams, $state.get(tabletStateName));
+                }, true);
 
-                    stateParamsString = matches[3]; // E.g. {courseid: courseid, userid: userid}
-                    stateParams = scopeEval(scope, stateParamsString);
+                element.on('click', function(event) {
+                    event.stopPropagation();
+                    event.preventDefault();
 
-                    // Watch for changes on stateParams.
-                    scope.$watch(stateParamsString, function(newVal) {
-                        stateParams = newVal;
+                    if (!stateParamsFilled) {
                         // Fill state params to prevent problems with missing params.
                         fillStateParams(stateParams, $state.get(tabletStateName));
-                    });
-
-                    element.on('click', function(event) {
-                        event.stopPropagation();
-                        event.preventDefault();
-
-                        if ($ionicPlatform.isTablet()) {
-                            if (!$state.get(tabletStateName)) {
-                                // State doesn't exists. Let's create it.
-                                if (!createTabletState(stateName, tabletStateName, splitViewController.getComponent())) {
-                                    return;
-                                }
+                        stateParamsFilled = true;
+                    }
+
+                    if ($ionicPlatform.isTablet()) {
+                        if (!$state.get(tabletStateName)) {
+                            // State doesn't exists. Let's create it.
+                            if (!createTabletState(stateName, tabletStateName, splitViewController.getComponent())) {
+                                return;
                             }
-
-                            if (!stateParamsFilled) {
-                                // Fill state params to prevent problems with missing params.
-                                fillStateParams(stateParams, $state.get(tabletStateName));
-                                stateParamsFilled = true;
-                            }
-
-                            // Set this link as candidate to load. This is used when the split view blocks view changes.
-                            splitViewController.setCandidateLink(element);
-
-                            // Load the state.
-                            $state.go(tabletStateName, stateParams, {location:'replace'}).then(function() {
-                                // State change success, now mark the link as loaded.
-                                splitViewController.setLink(element);
-                                splitViewController.clearMarkedLinks();
-                                element.addClass('mm-split-item-selected');
-                            });
-                        } else {
-                            $state.go(stateName, stateParams);
                         }
-                    });
-                } else {
-                    $log.error('Invalid sref.');
-                }
+
+                        // Set this link as candidate to load. This is used when the split view blocks view changes.
+                        splitViewController.setCandidateLink(element);
+
+                        // Load the state.
+                        $state.go(tabletStateName, stateParams, {location:'replace'}).then(function() {
+                            // State change success, now mark the link as loaded.
+                            splitViewController.setLink(element);
+                            splitViewController.clearMarkedLinks();
+                            element.addClass('mm-split-item-selected');
+                        });
+                    } else {
+                        $state.go(stateName, stateParams);
+                    }
+                });
             } else {
-                $log.error('Invalid sref.');
+                $log.error('Invalid sref ' + attrs.mmSplitViewLink + '.');
             }
         }
     };

From 0c892e03564652bffb4ff41759c2a514b775ebf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 28 Mar 2017 14:38:03 +0200
Subject: [PATCH 052/218] MOBILE-2006 feedback: Fix form refresh and leave

---
 www/addons/mod/feedback/controllers/form.js | 12 +++++++-----
 www/addons/mod/feedback/templates/form.html |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index 3d704c6efbf..98282c8ecde 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -149,11 +149,13 @@ angular.module('mm.addons.mod_feedback')
     };
 
     function leavePlayer() {
-        var responses = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
-        if ($scope.items && !$scope.completed && originalData) {
-            // Form submitted. Check if there is any change.
-            if (!$mmUtil.basicLeftCompare(responses, originalData, 3)) {
-                 return $mmUtil.showConfirm($translate('mm.core.confirmcanceledit'));
+        if (!$stateParams.preview) {
+            var responses = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
+            if ($scope.items && !$scope.completed && originalData) {
+                // Form submitted. Check if there is any change.
+                if (!$mmUtil.basicLeftCompare(responses, originalData, 3)) {
+                     return $mmUtil.showConfirm($translate('mm.core.confirmcanceledit'));
+                }
             }
         }
         return $q.when();
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index dd5bbb2bf99..4df53d74900 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -1,7 +1,6 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-content delegate-handle="mmaModFeedbackFormScroll" mm-state-class>
-        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
             <section ng-if="items && items.length">
                 <div class="list">

From fe42a9dbc274cf3c6d8b774d4d2bcb960e042659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 28 Mar 2017 14:38:32 +0200
Subject: [PATCH 053/218] MOBILE-2006 feedback: Show responses

---
 .../mod/feedback/controllers/attempt.js       | 63 +++++++++++++++++++
 www/addons/mod/feedback/main.js               | 16 +++++
 .../mod/feedback/templates/attempt.html       | 22 +++++++
 .../mod/feedback/templates/respondents.html   |  4 +-
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 www/addons/mod/feedback/controllers/attempt.js
 create mode 100644 www/addons/mod/feedback/templates/attempt.html

diff --git a/www/addons/mod/feedback/controllers/attempt.js b/www/addons/mod/feedback/controllers/attempt.js
new file mode 100644
index 00000000000..6292945155d
--- /dev/null
+++ b/www/addons/mod/feedback/controllers/attempt.js
@@ -0,0 +1,63 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback attempt review controller.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc controller
+ * @name mmaModFeedbackAttemptCtrl
+ */
+.controller('mmaModFeedbackAttemptCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmText, $ionicHistory,
+            $mmaModFeedbackHelper, mmaModFeedbackComponent) {
+
+    var feedbackId = $stateParams.feedbackid || 0;
+
+    $scope.attempt = $stateParams.attempt || false;
+    $scope.component = mmaModFeedbackComponent;
+    $scope.componentId = $stateParams.moduleid;
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackAttemptData() {
+        return $mmaModFeedback.getItems(feedbackId).then(function(items) {
+            // Add responses and format items.
+            $scope.items = items.items.map(function(item) {
+                if (item.typ == 'label') {
+                    item.submittedValue = $mmText.replacePluginfileUrls(item.presentation, item.itemfiles);
+                } else {
+                    for (var x in $scope.attempt.responses) {
+                        if ($scope.attempt.responses[x].id == item.id) {
+                            item.submittedValue = $scope.attempt.responses[x].printval;
+                            delete $scope.attempt.responses[x];
+                            break;
+                        }
+                    }
+                }
+                return $mmaModFeedbackHelper.getItemForm(item, true);
+            });
+
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            // Some call failed on first fetch, go back.
+            $ionicHistory.goBack();
+            return $q.reject();
+        }).finally(function(){
+            $scope.feedbackLoaded = true;
+        });
+    }
+
+    fetchFeedbackAttemptData();
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 2d131acc8ad..08f917495d1 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -82,6 +82,22 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
                 templateUrl: 'addons/mod/feedback/templates/respondents.html'
             }
         }
+    })
+
+    .state('site.mod_feedback-attempt', {
+        url: '/mod_feedback-attempt',
+        params: {
+            attempt: null,
+            attemptid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            feedbackid: null,
+            moduleid: null
+        },
+        views: {
+            'site': {
+                controller: 'mmaModFeedbackAttemptCtrl',
+                templateUrl: 'addons/mod/feedback/templates/attempt.html'
+            }
+        }
     });
 })
 
diff --git a/www/addons/mod/feedback/templates/attempt.html b/www/addons/mod/feedback/templates/attempt.html
new file mode 100644
index 00000000000..db0b33fa6dc
--- /dev/null
+++ b/www/addons/mod/feedback/templates/attempt.html
@@ -0,0 +1,22 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ attempt.fullname }}</mm-format-text></ion-nav-title>
+    <ion-content mm-state-class>
+        <mm-loading hide-until="feedbackLoaded">
+            <div class="list">
+                <a ng-if="attempt.fullname" ng-class="{'item-avatar': attempt.profileimageurl}" class="item item-text-wrap" mm-user-link userid="{{attempt.userid}}" courseid="{{attempt.courseid}}" title="{{attempt.fullname}}">
+                    <img ng-src="{{attempt.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: attempt.fullname} }}" role="presentation">
+                    <h2>{{attempt.fullname}}</h2>
+                    <p ng-if="attempt.timemodified">{{attempt.timemodified * 1000 | mmFormatDate:"dffulldate"}}</p>
+                </a>
+                <div ng-if="!attempt.fullname" class="item item-text-wrap">
+                    <h2>{{ 'mma.mod_feedback.response_nr' |translate }}: {{attempt.number}} ({{ 'mma.mod_feedback.anonymous' |translate }})</h2>
+                    <p ng-if="attempt.timemodified">{{attempt.timemodified * 1000 | mmFormatDate:"dffulldate"}}</p>
+                </div>
+                <div ng-if="items && items.length" ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0}">
+                    <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
+                    <p ng-if="item.submittedValue"><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ item.submittedValue }}</mm-format-text></p>
+                </div>
+            </div>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/respondents.html b/www/addons/mod/feedback/templates/respondents.html
index 7dfd30b953b..590f45e1c68 100644
--- a/www/addons/mod/feedback/templates/respondents.html
+++ b/www/addons/mod/feedback/templates/respondents.html
@@ -21,7 +21,7 @@
                         {{ 'mma.mod_feedback.non_anonymous_entries' |translate : {$a: responses.totalattempts } }}
                     </div>
                     <div ng-repeat="attempt in responses.attempts" ng-if="responses.totalattempts > 0">
-                        <a ng-class="{'item-avatar': attempt.profileimageurl}" class="item item-text-wrap item-icon-right" mm-split-view-link="site.mod_feedback-attempt({'attemptid': attempt.id, 'attempt': attempt, 'feedbackid': feedbackId})">
+                        <a ng-class="{'item-avatar': attempt.profileimageurl}" class="item item-text-wrap item-icon-right" mm-split-view-link="site.mod_feedback-attempt({'attemptid': attempt.id, 'attempt': attempt, 'feedbackid': feedbackId, 'moduleid': componentId})">
                             <img ng-if="attempt.profileimageurl" ng-src="{{attempt.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: attempt.fullname} }}" role="presentation">
                             <h2>{{attempt.fullname}}</h2>
                             <p ng-if="attempt.timemodified">{{attempt.timemodified * 1000 | mmFormatDate:"dffulldate"}}</p>
@@ -37,7 +37,7 @@ <h2>{{attempt.fullname}}</h2>
                         {{ 'mma.mod_feedback.anonymous_entries' |translate : {$a: responses.totalanonattempts } }}
                     </div>
                     <div ng-repeat="attempt in responses.anonattempts" ng-if="responses.totalanonattempts > 0">
-                        <a class="item item-text-wrap item-icon-right" mm-split-view-link="site.mod_feedback-attempt({'id': attempt.id})">
+                        <a class="item item-text-wrap item-icon-right" mm-split-view-link="site.mod_feedback-attempt({'attemptid': attempt.id, 'attempt': attempt, 'feedbackid': feedbackId, 'moduleid': componentId})">
                             <h2>{{ 'mma.mod_feedback.response_nr' |translate }}: {{attempt.number}}</h2>
                             <i class="icon icon-accessory ion-chevron-right"></i>
                         </a>

From e68fe6040bea6119c0dc2d5d5e640b05907fd80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 29 Mar 2017 17:36:44 +0200
Subject: [PATCH 054/218] MOBILE-2006 feedback: Add links handler for show
 entries

---
 www/addons/mod/feedback/controllers/form.js  |  2 +-
 www/addons/mod/feedback/main.js              |  1 +
 www/addons/mod/feedback/services/feedback.js | 58 +++++++++++++++++-
 www/addons/mod/feedback/services/handlers.js | 63 ++++++++++++++++++--
 4 files changed, 117 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index 98282c8ecde..dc0e4b1b4d3 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -60,7 +60,7 @@ angular.module('mm.addons.mod_feedback')
         }).then(function(accessData) {
             $scope.access = accessData;
 
-            if (!$scope.preview && accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
+            if (!$scope.preview && accessData.cansubmit && !accessData.isempty) {
                 return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id, offline, true) : $q.when(currentPage);
             } else {
                 $scope.preview = true;
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 08f917495d1..41cfd3b2036 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -107,5 +107,6 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:analysis', '$mmaModFeedbackHandlers.analysisLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:complete', '$mmaModFeedbackHandlers.completeLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:print', '$mmaModFeedbackHandlers.printLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:showEntries', '$mmaModFeedbackHandlers.showEntriesLinksHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackPrefetchHandler');
 });
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index b7e4779c060..57ec9608ce0 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedback
  */
-.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil, $mmUser) {
+.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil) {
     var self = {};
 
     /**
@@ -593,6 +593,62 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Find an attemp in all responses analysis.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getAttempt
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    attemptId       Attempt id to find.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Object}    [previous]      Only for recurrent use. Object with the previous fetched info.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getAttempt = function(feedbackId, attemptId, siteId, previous) {
+        siteId = siteId || $mmSite.getId();
+        if (typeof previous == "undefined") {
+            previous = {
+                page: 0,
+                attemptsLoaded: 0,
+                anonAttemptsLoaded: 0
+            };
+        }
+
+        return self.getResponsesAnalysis(feedbackId, 0, previous.page, siteId).then(function(responses) {
+            for (var x in responses.attempts) {
+                if (responses.attempts[x].id == attemptId) {
+                    // Found, return.
+                    return responses.attempts[x];
+                }
+            }
+
+            for (var y in responses.anonattempts) {
+                if (responses.anonattempts[y].id == attemptId) {
+                    // Found, return.
+                    return responses.anonattempts[y];
+                }
+            }
+
+            if (previous.anonAttemptsLoaded < responses.totalanonattempts) {
+                previous.anonAttemptsLoaded += responses.anonattempts.length;
+            }
+
+            if (previous.attemptsLoaded < responses.totalattempts) {
+                previous.attemptsLoaded += responses.attempts.length;
+            }
+
+            if (previous.anonAttemptsLoaded < responses.totalanonattempts || previous.attemptsLoaded < responses.totalattempts) {
+                // Can load more. Check there.
+                previous.page++;
+                return self.getAttempt(feedbackId, attemptId, siteId, previous);
+            }
+
+            // Not found and all loaded. Reject.
+            return $q.reject();
+        });
+    };
+
     /**
      * Invalidates feedback user responses record data.
      *
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index 385d5a06e81..c310ab9c667 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -181,7 +181,7 @@ angular.module('mm.addons.mod_feedback')
                 var modal = $mmUtil.showModalLoading(),
                     moduleId = parseInt(params.id, 10);
 
-                return $mmCourse.getModuleBasicInfo(moduleId).then(function(module) {
+                return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
                     var stateParams = {
                         module: module,
                         moduleid: module.id,
@@ -222,13 +222,12 @@ angular.module('mm.addons.mod_feedback')
                 var modal = $mmUtil.showModalLoading(),
                     moduleId = parseInt(params.id, 10);
 
-                return $mmCourse.getModuleBasicInfo(moduleId).then(function(module) {
+                return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
                     var stateParams = {
                         module: module,
                         moduleid: module.id,
                         feedbackid: module.instance,
-                        courseid: module.course,
-                        preview: false
+                        courseid: module.course
                     };
                     if (typeof params.gopage == 'undefined') {
                         stateParams.page = parseInt(params.gopage, 10);
@@ -267,7 +266,7 @@ angular.module('mm.addons.mod_feedback')
                 var modal = $mmUtil.showModalLoading(),
                     moduleId = parseInt(params.id, 10);
 
-                return $mmCourse.getModuleBasicInfo(moduleId).then(function(module) {
+                return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
                     var stateParams = {
                         module: module,
                         moduleid: module.id,
@@ -282,6 +281,60 @@ angular.module('mm.addons.mod_feedback')
         }];
     };
 
+    /**
+     * Content links handler for feedback show entries questions.
+     * Match mod/feedback/show_entries.php with a valid feedback id.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#showEntriesLinksHandler
+     */
+    self.showEntriesLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/feedback\/show_entries\.php.*([\?\&](id|showcompleted)=\d+)/, '$mmCourseDelegate_mmaModFeedback');
+
+    // Check if the printLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.showEntriesLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.showEntriesLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        return [{
+            action: function(siteId) {
+                if (typeof params.id == 'undefined') {
+                    // Id not defined. Cannot treat the URL.
+                    return false;
+                }
+
+                var modal = $mmUtil.showModalLoading(),
+                    moduleId = parseInt(params.id, 10);
+
+                return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
+                    var stateParams;
+
+                    if (typeof params.showcompleted == 'undefined') {
+                        // showcompleted not defined. Show entry list.
+                        stateParams = {
+                            moduleid: module.id,
+                            module: module,
+                            courseid: module.course
+                        };
+                        return $mmContentLinksHelper.goInSite('site.mod_feedback-respondents', stateParams, siteId);
+                    }
+
+                    return $mmaModFeedback.getAttempt(module.instance, parseInt(params.showcompleted, 10), siteId).then(function(attempt) {
+                        stateParams = {
+                            moduleid: module.id,
+                            attempt: attempt,
+                            attemptid: attempt.id,
+                            feedbackid: module.instance
+                        };
+                        return $mmContentLinksHelper.goInSite('site.mod_feedback-attempt', stateParams, siteId);
+                    });
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
 
     return self;
 });

From f853bf63b853943bba3c083253e7aac8f0b0c969 Mon Sep 17 00:00:00 2001
From: magician03 <diwakar03121997@gmail.com>
Date: Thu, 2 Feb 2017 19:37:19 +0530
Subject: [PATCH 055/218] MOBILE-1789 messages: search messages feature added

Issue resolved.
Help needed to config translate for strings.
---
 www/addons/messages/controllers/contacts.js   |  2 +-
 .../messages/controllers/discussions.js       | 39 +++++++++++++++++-
 www/addons/messages/lang/en.json              |  3 ++
 www/addons/messages/main.js                   |  1 +
 www/addons/messages/services/messages.js      | 41 ++++++++++++++++++-
 www/addons/messages/templates/contacts.html   |  2 +-
 .../messages/templates/discussions.html       | 35 ++++++++++++++--
 7 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/www/addons/messages/controllers/contacts.js b/www/addons/messages/controllers/contacts.js
index 82f55bbdb95..85d70a2c341 100644
--- a/www/addons/messages/controllers/contacts.js
+++ b/www/addons/messages/controllers/contacts.js
@@ -33,7 +33,6 @@ angular.module('mm.addons.messages')
     $scope.contactTypes = ['online', 'offline', 'blocked', 'strangers', 'search'];
     $scope.searchType = 'search';
     $scope.hasContacts = false;
-    $scope.canSearch = $mmaMessages.isSearchEnabled;
     $scope.formData = {
         searchString: ''
     };
@@ -91,6 +90,7 @@ angular.module('mm.addons.messages')
     // Fetch contacts.
     function fetchContacts() {
         $scope.loadingMessage = loadingMessage;
+        $scope.canSearch = $mmaMessages.isSearchContactsEnabled();
         return $mmaMessages.getAllContacts().then(function(contacts) {
             $scope.contacts = contacts;
             searchedString = false; // Reset searched string.
diff --git a/www/addons/messages/controllers/discussions.js b/www/addons/messages/controllers/discussions.js
index 6cd5e4cf8ec..74a5521ce80 100644
--- a/www/addons/messages/controllers/discussions.js
+++ b/www/addons/messages/controllers/discussions.js
@@ -23,16 +23,26 @@ angular.module('mm.addons.messages')
  */
 .controller('mmaMessagesDiscussionsCtrl', function($scope, $mmUtil, $mmaMessages, $rootScope, $mmEvents, $mmSite, $ionicPlatform,
             mmCoreSplitViewLoad, mmaMessagesNewMessageEvent, $mmAddonManager, mmaMessagesReadChangedEvent,
-            mmaMessagesReadCronEvent) {
+            mmaMessagesReadCronEvent, $translate, $q, $mmApp, mmaMessagesLimitSearchMessages) {
     var newMessagesObserver, readChangedObserver, cronObserver,
         siteId = $mmSite.getId(),
+        userId = $mmSite.getUserId(),
         discussions,
         $mmPushNotificationsDelegate = $mmAddonManager.get('$mmPushNotificationsDelegate'),
-        unregisterResume;
+        unregisterResume,
+        searchingMessage = $translate.instant('mm.core.searching'),
+        loadingMessage = $translate.instant('mm.core.loading');
 
     $scope.loaded = false;
+    $scope.formData = {
+        searchString: ''
+    }
+    $scope.showSearchResults = false;   // to switch the view template. discussions or searchResults
+    $scope.results = null;
 
     function fetchDiscussions() {
+        $scope.loadingMessage = loadingMessage;
+        $scope.canSearch = $mmaMessages.isSearchMessagesEnabled();
         return $mmaMessages.getDiscussions().then(function(discs) {
             discussions = discs;
 
@@ -64,6 +74,31 @@ angular.module('mm.addons.messages')
         });
     };
 
+    $scope.searchMessage = function(query) {
+        $mmApp.closeKeyboard();
+        $scope.loaded = false;
+        $scope.loadingMessage = searchingMessage;
+
+        return $mmaMessages.searchMessages(userId, query, 0, mmaMessagesLimitSearchMessages).then(function(searchResults) {
+            $scope.showSearchResults = true;    
+            $scope.results = searchResults;
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'mma.messages.errorwhileretrievingmessages', true);
+            return $q.reject();
+        }).finally(function() {
+            $scope.loaded = true;
+        });
+    };
+
+    $scope.clearSearch = function() {
+        $scope.loaded = false;
+        $scope.showSearchResults = false;
+        fetchDiscussions().finally(function() {
+            $scope.loaded = true;
+        });
+    };
+    
+
     fetchDiscussions().finally(function() {
         // Tell mm-split-view that it can load the first link now in tablets. We need to do it
         // like this because the directive doesn't have access to $scope.loaded variable (because of tabs).
diff --git a/www/addons/messages/lang/en.json b/www/addons/messages/lang/en.json
index 104c8fc26c7..6b8cba5adb5 100644
--- a/www/addons/messages/lang/en.json
+++ b/www/addons/messages/lang/en.json
@@ -21,9 +21,12 @@
     "newmessage": "New message...",
     "newmessages": "New messages",
     "nomessages": "No messages.",
+    "noresultsfound": "No results found",
     "nousersfound": "No users found",
     "removecontact": "Remove contact",
     "removecontactconfirm": "Contact will be removed from your contacts list.",
+    "searchformessage": "Search for a message",
+    "searchresults": "Message search results",
     "send": "Send",
     "sendmessage": "Send message",
     "type_blocked": "Blocked",
diff --git a/www/addons/messages/main.js b/www/addons/messages/main.js
index b1b368aeb08..740671284eb 100644
--- a/www/addons/messages/main.js
+++ b/www/addons/messages/main.js
@@ -28,6 +28,7 @@ angular.module('mm.addons.messages', ['mm.core'])
 .constant('mmaMessagesReadChangedEvent', 'mma-messages_read_changed')
 .constant('mmaMessagesReadCronEvent', 'mma-messages_read_cron')
 .constant('mmaMessagesAutomSyncedEvent', 'mma_messages_autom_synced')
+.constant('mmaMessagesLimitSearchMessages', 50)
 
 .config(function($stateProvider, $mmUserDelegateProvider, $mmSideMenuDelegateProvider, mmaMessagesSendMessagePriority,
             mmaMessagesAddContactPriority, mmaMessagesBlockContactPriority, mmaMessagesPriority, $mmContentLinksDelegateProvider,
diff --git a/www/addons/messages/services/messages.js b/www/addons/messages/services/messages.js
index 50610a57f18..a7b404b183b 100644
--- a/www/addons/messages/services/messages.js
+++ b/www/addons/messages/services/messages.js
@@ -954,13 +954,25 @@ angular.module('mm.addons.messages')
      *
      * @module mm.addons.messages
      * @ngdoc method
-     * @name $mmaMessages#isSearchEnabled
+     * @name $mmaMessages#isSearchContactsEnabled
      * @return {Boolean}
      */
-    self.isSearchEnabled = function() {
+    self.isSearchContactsEnabled = function() {
         return $mmSite.wsAvailable('core_message_search_contacts');
     };
 
+    /**
+     * Returns whether or not we can search messages.
+     *
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessages#isSearchMessagesEnabled
+     * @return {Boolean}
+     */
+    self.isSearchMessagesEnabled = function() {
+        return $mmSite.wsAvailable('core_message_data_for_messagearea_search_messages');
+    }
+
     /**
      * Remove a contact.
      *
@@ -1014,6 +1026,31 @@ angular.module('mm.addons.messages')
         });
     };
 
+    /**
+     * Search for all the messges with a specific text.
+     * 
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessages#searchMessages
+     * @param {String}  query   The query string
+     * @return {Promise}
+     */
+    self.searchMessages = function(userId, query, limitFrom, limitNum) {
+        var param = {
+            userid: userId,
+            search: query,
+            limitfrom: limitFrom,
+            limitnum: limitNum
+        },
+        preSets = {
+            getFromCache: 0 // Always try to get updated data. If it fails, it will get it from cache.
+        };
+
+        return $mmSite.read('core_message_data_for_messagearea_search_messages', param, preSets).then(function(searchResults) {
+            return searchResults.contacts;
+        });
+    };
+
     /**
      * Send a message to someone.
      *
diff --git a/www/addons/messages/templates/contacts.html b/www/addons/messages/templates/contacts.html
index fd01c52e0ed..2072aaa575a 100644
--- a/www/addons/messages/templates/contacts.html
+++ b/www/addons/messages/templates/contacts.html
@@ -1,7 +1,7 @@
 <ion-content class="has-tabs" mm-state-class>
     <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="loaded" on-refresh="refresh()"></ion-refresher>
 
-    <mm-searchbox ng-if="canSearch()" submit-action="search" placeholder="{{ 'mma.messages.contactname' | translate }}" initial-value="{{formData.searchString}}" autocorrect="off" spellcheck="false" length-check="2"></mm-searchbox>
+    <mm-searchbox ng-if="canSearch" submit-action="search" placeholder="{{ 'mma.messages.contactname' | translate }}" initial-value="{{formData.searchString}}" autocorrect="off" spellcheck="false" length-check="2"></mm-searchbox>
 
     <mm-loading hide-until="loaded" dyn-message="loadingMessage">
         <ul class="list">
diff --git a/www/addons/messages/templates/discussions.html b/www/addons/messages/templates/discussions.html
index 076fc04b39d..d27c3c9383b 100644
--- a/www/addons/messages/templates/discussions.html
+++ b/www/addons/messages/templates/discussions.html
@@ -1,7 +1,33 @@
 <ion-content class="has-tabs" mm-state-class>
     <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="loaded" on-refresh="refresh()"></ion-refresher>
-    <mm-loading hide-until="loaded">
-        <ul class="list">
+
+    <mm-searchbox ng-if="canSearch" submit-action="searchMessage" placeholder="{{ 'mma.messages.searchformessage' | translate }}" initial-value="{{formData.searchString}}" autocorrect="off" spellcheck="false" length-check="2"></mm-searchbox>
+
+    <mm-loading hide-until="loaded" dyn-message="loadingMessage">
+
+        <ul class="list" ng-if="showSearchResults">
+            <li>
+                <ion-item class="item-divider item-button-right" >
+                    <span class="item-note">{{ results.length }}</span>
+                    <h2>{{ 'mma.messages.searchresults' | translate }}</h2>
+                    <button class="button button-clear mma-messages-clear-search" ng-click="clearSearch()" aria-label="{{ 'mm.core.clearsearch' | translate }}">
+                        <i class="icon ion-close-round"></i>
+                    </button>
+                </ion-item>
+            </li>
+            <li ng-repeat="result in results">
+                <a class="item item-avatar" mm-split-view-link="site.messages-discussion({userId: result.userid})" title="{{result.fullname}}">
+
+                    <img ng-src="{{result.profileimageurl}}" alt="{{ 'mm.core.pictureof' | translate:{$a: result.fullname} }}" role="presentation" mm-external-content ng-if="result.profileimageurl">
+                    <img src="img/user-avatar.png" alt="{{ 'mm.core.pictureof' | translate:{$a: result.fullname} }}" role="presentation" ng-if="!result.profileimageurl">
+
+                    <p class="item-heading">{{result.fullname}}</p>
+                    <p><mm-format-text watch="true" clean="true" singleline="true">{{result.lastmessage}}</mm-format-text></p>
+                </a>
+            </li>
+        </ul>
+
+        <ul class="list" ng-if="!showSearchResults">
             <li>
                 <a class="item item-avatar" ng-repeat="disc in discussions | orderBy:'message.timecreated':true track by $index" mm-split-view-link="site.messages-discussion({userId: disc.message.user})" title="{{disc.fullname}}">
 
@@ -18,8 +44,11 @@
             </li>
         </ul>
 
-        <div ng-if="!discussions || discussions.length <= 0" class="padding">
+        <div ng-if="(!discussions || discussions.length <= 0) && !showSearchResults" class="padding">
             <p>{{ 'mma.messages.nomessages' | translate}}</p>
         </div>
+        <div ng-if="(!results || results.length <= 0) && showSearchResults" class="padding">
+            <p>{{ 'mma.messages.noresultsfound' | translate}}</p>
+        </div>
     </mm-loading>
 </ion-content>

From ff834370cedcc66a60c21909ab1f8096dd80d5b1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 10 Mar 2017 12:17:49 +0100
Subject: [PATCH 056/218] MOBILE-1789 messages: Deprecate isSearchEnabled and
 fix strings

---
 upgrade.txt                                   |  1 +
 .../messages/controllers/discussions.js       | 12 +++--
 www/addons/messages/lang/en.json              |  3 --
 www/addons/messages/services/messages.js      | 45 +++++++++++++------
 .../messages/templates/discussions.html       |  6 +--
 www/core/lang/en.json                         |  2 +
 6 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index 445676506a1..c493eafeb78 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -8,6 +8,7 @@ information provided here is intended especially for developers.
     npm install -g ionic
     npm install
  * mm-error CSS class has been deprecated. Use mm-error-card or similar instead.
+ * The function $mmaMessages#isSearchEnabled has been deprecated. Please use $mmaMessages#isSearchContactsEnabled instead.
 
 === 3.2.1 ===
 
diff --git a/www/addons/messages/controllers/discussions.js b/www/addons/messages/controllers/discussions.js
index 74a5521ce80..b96e967aaef 100644
--- a/www/addons/messages/controllers/discussions.js
+++ b/www/addons/messages/controllers/discussions.js
@@ -23,10 +23,9 @@ angular.module('mm.addons.messages')
  */
 .controller('mmaMessagesDiscussionsCtrl', function($scope, $mmUtil, $mmaMessages, $rootScope, $mmEvents, $mmSite, $ionicPlatform,
             mmCoreSplitViewLoad, mmaMessagesNewMessageEvent, $mmAddonManager, mmaMessagesReadChangedEvent,
-            mmaMessagesReadCronEvent, $translate, $q, $mmApp, mmaMessagesLimitSearchMessages) {
+            mmaMessagesReadCronEvent, $translate, $q, $mmApp) {
     var newMessagesObserver, readChangedObserver, cronObserver,
         siteId = $mmSite.getId(),
-        userId = $mmSite.getUserId(),
         discussions,
         $mmPushNotificationsDelegate = $mmAddonManager.get('$mmPushNotificationsDelegate'),
         unregisterResume,
@@ -36,8 +35,8 @@ angular.module('mm.addons.messages')
     $scope.loaded = false;
     $scope.formData = {
         searchString: ''
-    }
-    $scope.showSearchResults = false;   // to switch the view template. discussions or searchResults
+    };
+    $scope.showSearchResults = false; // To switch the view template: discussions or searchResults.
     $scope.results = null;
 
     function fetchDiscussions() {
@@ -79,8 +78,8 @@ angular.module('mm.addons.messages')
         $scope.loaded = false;
         $scope.loadingMessage = searchingMessage;
 
-        return $mmaMessages.searchMessages(userId, query, 0, mmaMessagesLimitSearchMessages).then(function(searchResults) {
-            $scope.showSearchResults = true;    
+        return $mmaMessages.searchMessages(query).then(function(searchResults) {
+            $scope.showSearchResults = true;
             $scope.results = searchResults;
         }).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'mma.messages.errorwhileretrievingmessages', true);
@@ -97,7 +96,6 @@ angular.module('mm.addons.messages')
             $scope.loaded = true;
         });
     };
-    
 
     fetchDiscussions().finally(function() {
         // Tell mm-split-view that it can load the first link now in tablets. We need to do it
diff --git a/www/addons/messages/lang/en.json b/www/addons/messages/lang/en.json
index 6b8cba5adb5..104c8fc26c7 100644
--- a/www/addons/messages/lang/en.json
+++ b/www/addons/messages/lang/en.json
@@ -21,12 +21,9 @@
     "newmessage": "New message...",
     "newmessages": "New messages",
     "nomessages": "No messages.",
-    "noresultsfound": "No results found",
     "nousersfound": "No users found",
     "removecontact": "Remove contact",
     "removecontactconfirm": "Contact will be removed from your contacts list.",
-    "searchformessage": "Search for a message",
-    "searchresults": "Message search results",
     "send": "Send",
     "sendmessage": "Send message",
     "type_blocked": "Blocked",
diff --git a/www/addons/messages/services/messages.js b/www/addons/messages/services/messages.js
index a7b404b183b..0671f2ced04 100644
--- a/www/addons/messages/services/messages.js
+++ b/www/addons/messages/services/messages.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.messages')
  * @name $mmaMessages
  */
 .factory('$mmaMessages', function($mmSite, $mmSitesManager, $log, $q, $mmUser, $mmaMessagesOffline, $mmApp, $mmUtil,
-            mmaMessagesNewMessageEvent, mmaMessagesLimitMessages) {
+            mmaMessagesNewMessageEvent, mmaMessagesLimitMessages, mmaMessagesLimitSearchMessages) {
     $log = $log.getInstance('$mmaMessages');
 
     var self = {};
@@ -949,6 +949,20 @@ angular.module('mm.addons.messages')
         });
     };
 
+    /**
+     * Returns whether or not we can search contacts.
+     *
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessages#isSearchEnabled
+     * @return {Boolean}
+     * @deprecated since v3.3. Please use $mmaMessages#isSearchContactsEnabled instead. MOBILE-1789.
+     */
+    self.isSearchEnabled = function() {
+        $log.debug('$mmaMessages#isSearchEnabled has been deprecated, please use $mmaMessages#isSearchContactsEnabled instead');
+        return self.isSearchContactsEnabled();
+    };
+
     /**
      * Returns whether or not we can search contacts.
      *
@@ -971,7 +985,7 @@ angular.module('mm.addons.messages')
      */
     self.isSearchMessagesEnabled = function() {
         return $mmSite.wsAvailable('core_message_data_for_messagearea_search_messages');
-    }
+    };
 
     /**
      * Remove a contact.
@@ -1028,23 +1042,26 @@ angular.module('mm.addons.messages')
 
     /**
      * Search for all the messges with a specific text.
-     * 
+     *
      * @module mm.addons.messages
      * @ngdoc method
      * @name $mmaMessages#searchMessages
-     * @param {String}  query   The query string
-     * @return {Promise}
+     * @param  {String} query         The query string
+     * @param  {Number} [userId]      The user ID. If not defined, current user.
+     * @param  {Number} [limitFrom]   Position of the first result to get. Defaults to 0.
+     * @param  {Number} [limitNumber] Number of results to get. Defaults to mmaMessagesLimitSearchMessages.
+     * @return {Promise}              Promise resolved with the results.
      */
-    self.searchMessages = function(userId, query, limitFrom, limitNum) {
+    self.searchMessages = function(query, userId, limitFrom, limitNum) {
         var param = {
-            userid: userId,
-            search: query,
-            limitfrom: limitFrom,
-            limitnum: limitNum
-        },
-        preSets = {
-            getFromCache: 0 // Always try to get updated data. If it fails, it will get it from cache.
-        };
+                userid: userId || $mmSite.getUserId(),
+                search: query,
+                limitfrom: limitFrom || 0,
+                limitnum: limitNum || mmaMessagesLimitSearchMessages
+            },
+            preSets = {
+                getFromCache: 0 // Always try to get updated data. If it fails, it will get it from cache.
+            };
 
         return $mmSite.read('core_message_data_for_messagearea_search_messages', param, preSets).then(function(searchResults) {
             return searchResults.contacts;
diff --git a/www/addons/messages/templates/discussions.html b/www/addons/messages/templates/discussions.html
index d27c3c9383b..20e5608eb7f 100644
--- a/www/addons/messages/templates/discussions.html
+++ b/www/addons/messages/templates/discussions.html
@@ -1,7 +1,7 @@
 <ion-content class="has-tabs" mm-state-class>
     <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="loaded" on-refresh="refresh()"></ion-refresher>
 
-    <mm-searchbox ng-if="canSearch" submit-action="searchMessage" placeholder="{{ 'mma.messages.searchformessage' | translate }}" initial-value="{{formData.searchString}}" autocorrect="off" spellcheck="false" length-check="2"></mm-searchbox>
+    <mm-searchbox ng-if="canSearch" submit-action="searchMessage" placeholder="{{ 'mma.messages.message' | translate }}" initial-value="{{formData.searchString}}" autocorrect="off" spellcheck="false" length-check="2"></mm-searchbox>
 
     <mm-loading hide-until="loaded" dyn-message="loadingMessage">
 
@@ -9,7 +9,7 @@
             <li>
                 <ion-item class="item-divider item-button-right" >
                     <span class="item-note">{{ results.length }}</span>
-                    <h2>{{ 'mma.messages.searchresults' | translate }}</h2>
+                    <h2>{{ 'mm.core.searchresults' | translate }}</h2>
                     <button class="button button-clear mma-messages-clear-search" ng-click="clearSearch()" aria-label="{{ 'mm.core.clearsearch' | translate }}">
                         <i class="icon ion-close-round"></i>
                     </button>
@@ -48,7 +48,7 @@ <h2>{{ 'mma.messages.searchresults' | translate }}</h2>
             <p>{{ 'mma.messages.nomessages' | translate}}</p>
         </div>
         <div ng-if="(!results || results.length <= 0) && showSearchResults" class="padding">
-            <p>{{ 'mma.messages.noresultsfound' | translate}}</p>
+            <p>{{ 'mm.core.noresults' | translate}}</p>
         </div>
     </mm-loading>
 </ion-content>
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 15976ffa3bb..7e00e0a9241 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -131,6 +131,7 @@
     "none": "None",
     "nopasswordchangeforced": "You cannot proceed without changing your password.",
     "nopermissions": "Sorry, but you do not currently have permissions to do that ({{$a}})",
+    "noresults": "No results",
     "notapplicable": "n/a",
     "notice": "Notice",
     "notsent": "Not sent",
@@ -155,6 +156,7 @@
     "save": "Save",
     "search": "Search",
     "searching": "Searching",
+    "searchresults": "Search results",
     "sec" : "sec",
     "secs" : "secs",
     "seemoredetail": "Click here to see more detail",

From 8cbe043a62de6e958b5caa7e93701b210d9e2490 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 5 Apr 2017 08:46:32 +0200
Subject: [PATCH 057/218] MOBILE-2014 lesson: Mark optional parameters in JSDoc

---
 www/addons/mod/lesson/services/lesson.js | 42 ++++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 6129cf6b99e..17592fef89c 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -118,11 +118,11 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getAccessInformation
-     * @param  {Number} lessonId     Lesson ID.
-     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}             Promise resolved with the access information-
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the access information-
      */
     self.getAccessInformation = function(lessonId, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -243,8 +243,8 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [password]               Password.
      * @param  {Boolean} [validatePassword=true] If true, the function will fail if the password is wrong.
      *                                           If false, it will return a lesson with the basic data if password is wrong.
-     * @param  {Boolean} forceCache              True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} ignoreCache             True to ignore cached data (it will always fail in offline or server down).
+     * @param  {Boolean} [forceCache]            True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache]           True to ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]                 Site ID. If not defined, current site.
      * @return {Promise}                         Promise resolved with the lesson.
      */
@@ -324,8 +324,8 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [password]         Lesson password (if any).
      * @param  {Boolean} [review]          If the user wants to review just after finishing (1 hour margin).
      * @param  {Boolean} [includeContents] Include the page rendered contents.
-     * @param  {Boolean} forceCache        True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} ignoreCache       True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {Boolean} [forceCache]      True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache]     True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]           Site ID. If not defined, current site.
      * @return {Promise}                   Promise resolved with the page data.
      */
@@ -372,12 +372,12 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getPages
-     * @param  {Number} lessonId     Lesson ID.
-     * @param  {String} [password]   Lesson password (if any).
-     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}             Promise resolved with the pages.
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {String} [password]     Lesson password (if any).
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the pages.
      */
     self.getPages = function(lessonId, password, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -450,12 +450,12 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getTimers
-     * @param  {Number} lessonId     Lesson ID.
-     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @param  {Number} [userId]     User ID. If not defined, site's current user.
-     * @return {Promise}             Promise resolved with the pages.
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @param  {Number} [userId]       User ID. If not defined, site's current user.
+     * @return {Promise}               Promise resolved with the pages.
      */
     self.getTimers = function(lessonId, forceCache, ignoreCache, siteId, userId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {

From a6523daf7e53b0a7621f5a25878cf877692cfd76 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 13 Mar 2017 10:22:14 +0100
Subject: [PATCH 058/218] MOBILE-2032 question: Implement and use prepare
 answers function

---
 upgrade.txt                                   |  1 +
 www/addons/mod/quiz/controllers/player.js     | 13 ++++-
 www/addons/qtype/essay/handlers.js            | 57 ++++++++++++++++++-
 .../components/question/services/delegate.js  | 25 ++++++++
 .../components/question/services/helper.js    | 36 +++++++++++-
 5 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index c493eafeb78..a8e261f023a 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -9,6 +9,7 @@ information provided here is intended especially for developers.
     npm install
  * mm-error CSS class has been deprecated. Use mm-error-card or similar instead.
  * The function $mmaMessages#isSearchEnabled has been deprecated. Please use $mmaMessages#isSearchContactsEnabled instead.
+ * Question type addons can now implement an optional prepareAnswers function. If provided, this function will be called before sending the quiz data to the server, and allows the addon to perform changes in the data to send.
 
 === 3.2.1 ===
 
diff --git a/www/addons/mod/quiz/controllers/player.js b/www/addons/mod/quiz/controllers/player.js
index ea9fdd26c7e..2b55c2faaba 100644
--- a/www/addons/mod/quiz/controllers/player.js
+++ b/www/addons/mod/quiz/controllers/player.js
@@ -234,10 +234,19 @@ angular.module('mm.addons.mod_quiz')
         return $mmQuestionHelper.getAnswersFromForm(document.forms['mma-mod_quiz-player-form']);
     }
 
+    // Prepare the answers to be sent for the attempt.
+    function prepareAnswers() {
+        var answers = getAnswers();
+        return $mmQuestionHelper.prepareAnswers($scope.questions, answers, offline).then(function() {
+            return answers;
+        });
+    }
+
     // Process attempt.
     function processAttempt(finish, timeup) {
-        return $mmaModQuiz.processAttempt(quiz, attempt, getAnswers(), $scope.preflightData, finish, timeup, offline)
-                .then(function() {
+        return prepareAnswers().then(function(answers) {
+             return $mmaModQuiz.processAttempt(quiz, attempt, answers, $scope.preflightData, finish, timeup, offline);
+        }).then(function() {
             // Answers saved, cancel auto save.
             $mmaModQuizAutoSave.cancelAutoSave();
             $mmaModQuizAutoSave.hideAutoSaveError($scope);
diff --git a/www/addons/qtype/essay/handlers.js b/www/addons/qtype/essay/handlers.js
index 51ad0a779c8..47f12133451 100644
--- a/www/addons/qtype/essay/handlers.js
+++ b/www/addons/qtype/essay/handlers.js
@@ -21,13 +21,16 @@ angular.module('mm.addons.qtype_essay')
  * @ngdoc service
  * @name $mmaQtypeEssayHandler
  */
-.factory('$mmaQtypeEssayHandler', function($mmUtil, $mmQuestionHelper) {
+.factory('$mmaQtypeEssayHandler', function($mmUtil, $mmQuestionHelper, $mmText, $q) {
 
     var self = {};
 
     /**
      * Get the behaviour for this question.
      *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#getBehaviour
      * @param  {Object} question  Question to get the directive for.
      * @param  {String} behaviour Default behaviour.
      * @return {String}           Behaviour name.
@@ -40,9 +43,9 @@ angular.module('mm.addons.qtype_essay')
      * Check if a question can be submitted.
      * If a question cannot be submitted it should return a message explaining why (translated or not).
      *
-     * @module mm.core.question
+     * @module mm.addons.qtype_essay
      * @ngdoc method
-     * @name $mmQuestionDelegate#getPreventSubmitMessage
+     * @name $mmaQtypeEssayHandler#getPreventSubmitMessage
      * @param  {Object} question Question.
      * @return {String}          Prevent submit message. Undefined or empty if cannot be submitted.
      */
@@ -62,6 +65,9 @@ angular.module('mm.addons.qtype_essay')
     /**
      * Check if a response is complete.
      *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#isCompleteResponse
      * @param  {Object} question Question.
      * @param  {Object} answers  Question answers (without prefix).
      * @return {Mixed}           True if complete, false if not complete, -1 if cannot determine.
@@ -82,6 +88,9 @@ angular.module('mm.addons.qtype_essay')
     /**
      * Whether or not the module is enabled for the site.
      *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#isEnabled
      * @return {Boolean}
      */
     self.isEnabled = function() {
@@ -92,6 +101,9 @@ angular.module('mm.addons.qtype_essay')
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#isGradableResponse
      * @param  {Object} question Question.
      * @param  {Object} answers  Question answers (without prefix).
      * @return {Mixed}           True if gradable, false if not gradable, -1 if cannot determine.
@@ -103,6 +115,9 @@ angular.module('mm.addons.qtype_essay')
     /**
      * Check if two responses are the same.
      *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#isSameResponse
      * @param  {Object} question    Question.
      * @param  {Object} prevAnswers Previous answers.
      * @param  {Object} newAnswers  New answers.
@@ -116,6 +131,9 @@ angular.module('mm.addons.qtype_essay')
     /**
      * Get the directive.
      *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#getDirectiveName
      * @param {Object} question The question.
      * @return {String}         Directive's name.
      */
@@ -123,5 +141,38 @@ angular.module('mm.addons.qtype_essay')
         return 'mma-qtype-essay';
     };
 
+    /**
+     * Prepare the answers for a certain question.
+     * This function should only be implemented if the answers must be processed before being sent.
+     *
+     * @module mm.addons.qtype_essay
+     * @ngdoc method
+     * @name $mmaQtypeEssayHandler#prepareAnswers
+     * @param  {Object} question The question.
+     * @param  {Object} answers  The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param  {Boolean} offline True if data should be saved in offline.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise|Void}    Promise resolved when data has been prepared.
+     */
+    self.prepareAnswers = function(question, answers, offline, siteId) {
+        // First get the name of the question from the HTML.
+        var div = document.createElement('div'),
+            textarea,
+            promises = [];
+
+        div.innerHTML = question.html;
+        textarea = div.querySelector('textarea[name*=_answer]');
+        if (textarea && typeof answers[textarea.name] != 'undefined') {
+            promises.push($mmUtil.isRichTextEditorEnabled().then(function(enabled) {
+                if (!enabled) {
+                    // Rich text editor not enabled, add some HTML to the text if needed.
+                    answers[textarea.name] = $mmText.formatHtmlLines(answers[textarea.name]);
+                }
+            }));
+        }
+
+        return $q.all(promises);
+    };
+
     return self;
 });
diff --git a/www/core/components/question/services/delegate.js b/www/core/components/question/services/delegate.js
index 59df0c85c44..e194a6b8bc0 100644
--- a/www/core/components/question/services/delegate.js
+++ b/www/core/components/question/services/delegate.js
@@ -70,6 +70,8 @@ angular.module('mm.core.question')
      *                                              Return true if gradable, false if not gradable, -1 if cannot determine.
      *                             - isSameResponse(question, prevAnswers, newAnswers) (Boolean) Optional. Check if two responses
      *                                              are equal. Always return boolean.
+     *                             - prepareAnswers(question, answers, offline, siteId) (Promise|Void) Optional. Prepare and add to
+     *                                              answers the data to send to server based in the input. Return promise if async.
      */
     self.registerHandler = function(name, questionType, handler) {
         if (typeof handlers[questionType] !== 'undefined') {
@@ -239,6 +241,29 @@ angular.module('mm.core.question')
             return typeof enabledHandlers['qtype_' + type] != 'undefined';
         };
 
+        /**
+         * Prepare the answers for a certain question.
+         *
+         * @module mm.core.question
+         * @ngdoc method
+         * @name $mmQuestionDelegate#prepareAnswersForQuestion
+         * @param  {Object} question The question.
+         * @param  {Object} answers  The answers retrieved from the form. Prepared answers must be stored in this object.
+         * @param  {Boolean} offline True if data should be saved in offline.
+         * @param  {String} [siteId] Site ID. If not defined, current site.
+         * @return {Promise}         Promise resolved when data has been prepared.
+         */
+        self.prepareAnswersForQuestion = function(question, answers, offline, siteId) {
+            var type = 'qtype_' + question.type,
+                handler = enabledHandlers[type];
+
+            // Check if there's a handler and it implements the required method.
+            if (typeof handler != 'undefined' && handler.prepareAnswers) {
+                return $q.when(handler.prepareAnswers(question, answers, offline, siteId));
+            }
+            return $q.when();
+        };
+
         /**
          * Check if a handler is enabled for a certain site and add/remove it to enabledHandlers.
          *
diff --git a/www/core/components/question/services/helper.js b/www/core/components/question/services/helper.js
index beb11c82bda..1a01341ac61 100644
--- a/www/core/components/question/services/helper.js
+++ b/www/core/components/question/services/helper.js
@@ -22,7 +22,7 @@ angular.module('mm.core.question')
  * @name $mmQuestionHelper
  */
 .factory('$mmQuestionHelper', function($mmUtil, $mmText, $ionicModal, mmQuestionComponent, $mmSitesManager, $mmFilepool, $q,
-            $mmQuestion, $mmSite) {
+            $mmQuestion, $mmSite, $mmQuestionDelegate) {
 
     var self = {},
         lastErrorShown = 0;
@@ -591,8 +591,6 @@ angular.module('mm.core.question')
      * @module mm.core.question
      * @ngdoc method
      * @name $mmQuestionHelper#loadLocalAnswersInHtml
-     * @param  {String} component Component the answers belong to.
-     * @param  {Number} attemptId Attempt ID.
      * @param  {Object} question  Question.
      * @return {Void}
      */
@@ -860,6 +858,38 @@ angular.module('mm.core.question')
         });
     };
 
+    /**
+     * Prepare and return the answers.
+     *
+     * @module mm.core.question
+     * @ngdoc method
+     * @name $mmQuestionHelper#prepareAnswers
+     * @param  {Object[]} questions The list of questions.
+     * @param  {Object} answers     The input data.
+     * @param  {Boolean} offline    True if data should be saved in offline.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with answers to send to server.
+     */
+    self.prepareAnswers = function(questions, answers, offline, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var promises = [],
+            error;
+
+        angular.forEach(questions, function(question) {
+            promises.push($mmQuestionDelegate.prepareAnswersForQuestion(question, answers, offline, siteId).catch(function(e) {
+                error = e;
+                return $q.reject();
+            }));
+        });
+
+        return $mmUtil.allPromises(promises).then(function() {
+            return answers;
+        }).catch(function() {
+            return $q.reject(error);
+        });
+    };
+
     /**
      * Replace Moodle's correct/incorrect classes with the Mobile ones.
      *

From abba198afc8b27474a252f3b016b976be7a23cc9 Mon Sep 17 00:00:00 2001
From: magician03 <diwakar03121997@gmail.com>
Date: Fri, 27 Jan 2017 21:46:28 +0530
Subject: [PATCH 059/218] MOBILE-1157 Modules: Enable mod desc in folder,
 resource, page, url

---
 www/addons/mod/folder/controllers/index.js    |  34 +++--
 www/addons/mod/folder/services/folder.js      | 110 +++++++++++++++-
 www/addons/mod/page/controllers/index.js      |  16 ++-
 www/addons/mod/page/services/page.js          | 118 +++++++++++++++++-
 .../mod/page/services/prefetch_handler.js     |  36 +++++-
 www/addons/mod/resource/controllers/index.js  |  19 ++-
 .../mod/resource/services/prefetch_handler.js |  35 +++++-
 www/addons/mod/resource/services/resource.js  | 118 +++++++++++++++++-
 www/addons/mod/url/controllers/index.js       |  27 ++--
 www/addons/mod/url/services/url.js            | 110 +++++++++++++++-
 10 files changed, 586 insertions(+), 37 deletions(-)

diff --git a/www/addons/mod/folder/controllers/index.js b/www/addons/mod/folder/controllers/index.js
index 2c43b014906..74464a63c8e 100644
--- a/www/addons/mod/folder/controllers/index.js
+++ b/www/addons/mod/folder/controllers/index.js
@@ -34,11 +34,12 @@ angular.module('mm.addons.mod_folder')
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModFolderComponent;
     $scope.componentId = module.id;
+    $scope.canGetFolder = $mmaModFolder.isGetFolderWSAvailable();
 
     // Convenience function to set scope data using module.
     function showModuleData(module) {
         $scope.title = module.name;
-        $scope.description = module.description;
+        $scope.description = module.intro || module.description;
         if (path) {
             // Subfolder.
             $scope.contents = module.contents;
@@ -49,15 +50,27 @@ angular.module('mm.addons.mod_folder')
 
     // Convenience function to fetch folder data from Moodle.
     function fetchFolder(refresh) {
-        return $mmCourse.getModule(module.id, courseId, sectionId).then(function(mod) {
-            if (!mod.contents.length && module.contents.length && !$mmApp.isOnline()) {
-                // The contents might be empty due to a cached data. Use the old ones.
-                mod.contents = module.contents;
-            }
-
-            module = mod;
+        var promise;
+        if ($scope.canGetFolder) {
+            promise = $mmaModFolder.getFolder(courseId, module.id).then(function(folder) {
+                return $mmCourse.loadModuleContents(module, courseId).then(function() {
+                    folder.contents = module.contents;
+                    return folder;
+                });
+            });
+        } else {
+            promise = $mmCourse.getModule(module.id, courseId, sectionId).then(function(mod) {
+                if (!mod.contents.length && module.contents.length && !$mmApp.isOnline()) {
+                    // The contents might be empty due to a cached data. Use the old ones.
+                    mod.contents = module.contents;
+                }
+                module = mod;
+                return mod;
+            });
+        }
 
-            showModuleData(module);
+        return promise.then(function(folder) {
+            showModuleData(folder);
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModFolderComponent);
         }).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'mma.mod_folder.errorwhilegettingfolder', true);
@@ -102,7 +115,8 @@ angular.module('mm.addons.mod_folder')
     $scope.refreshFolder = function() {
         if ($scope.canReload) {
             $scope.refreshIcon = 'spinner';
-            return $mmCourse.invalidateModule(module.id).finally(function() {
+
+            return $mmaModFolder.invalidateContent(module.id, courseId).finally(function() {
                 return fetchFolder(true).finally(function() {
                     $scope.refreshIcon = 'ion-refresh';
                     $scope.$broadcast('scroll.refreshComplete');
diff --git a/www/addons/mod/folder/services/folder.js b/www/addons/mod/folder/services/folder.js
index 4b44eb2cbe2..a523a166793 100644
--- a/www/addons/mod/folder/services/folder.js
+++ b/www/addons/mod/folder/services/folder.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_folder')
  * @todo Adding a new file in a folder updates the revision of all the files, so they're all shown as outdated.
  *       To ignore revision in folders we'll have to modify $mmCoursePrefetchDelegate, mm-file and $mmFilepool.
  */
-.factory('$mmaModFolder', function($mmSite, $mmCourse, $q) {
+.factory('$mmaModFolder', function($mmSite, $mmCourse, $q, $mmSitesManager, $mmUtil) {
     var self = {};
 
     /**
@@ -96,6 +96,114 @@ angular.module('mm.addons.mod_folder')
         return folders.concat(files);
     };
 
+    /**
+     * Returns whether or not getFolder WS available or not.
+     *
+     * @module mm.addons.mod_folder
+     * @ngdoc method
+     * @name $mmaModFolder#isGetFolderWSAvailable
+     * @return {Boolean}
+     */
+    self.isGetFolderWSAvailable = function() {
+        return $mmSite.wsAvailable('mod_folder_get_folders_by_courses');
+    };
+
+    /**
+     * Get a folder.
+     *
+     * @param  {String} siteId    Site ID.
+     * @param  {Number} courseId  Course ID.
+     * @param  {String} key       Name of the property to check.
+     * @param  {Mixed}  value     Value to search.
+     * @return {Promise}          Promise resolved when the book is retrieved.
+     */
+    function getFolder(siteId, courseId, key, value) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getFolderCacheKey(courseId)
+                };
+
+            return site.read('mod_folder_get_folders_by_courses', params, preSets).then(function(response) {
+                if (response && response.folders) {
+                    var currentFolder;
+                    angular.forEach(response.folders, function(folder) {
+                        if (!currentFolder && folder[key] == value) {
+                            currentFolder = folder;
+                        }
+                    });
+                    if (currentFolder) {
+                        return currentFolder;
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a folder by course module ID.
+     *
+     * @module mm.addons.mod_folder
+     * @ngdoc method
+     * @name $mmaModFolder#getFolder
+     * @param {Number} courseId Course ID.
+     * @param {Number} cmId     Course module ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the book is retrieved.
+     */
+    self.getFolder = function(courseId, cmId, siteId) {
+        return getFolder(siteId, courseId, 'coursemodule', cmId);
+    };
+
+    /**
+     * Get cache key for folder data WS calls.
+     *
+     * @param {Number} courseId Course ID.
+     * @return {String}         Cache key.
+     */
+    function getFolderCacheKey(courseId) {
+        return 'mmaModFolder:folder:' + courseId;
+    }
+
+    /**
+     * Invalidates folder data.
+     *
+     * @module mm.addons.mod_folder
+     * @ngdoc method
+     * @name $mmaModFolder#invalidateFolderData
+     * @param {Number} courseId Course ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateFolderData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getFolderCacheKey(courseId));
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_folder
+     * @ngdoc method
+     * @name $mmaModFolder#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId, siteId) {
+        var promises = [];
+
+        promises.push(self.invalidateFolderData(courseId, siteId));
+        promises.push($mmCourse.invalidateModule(moduleId, siteId));
+
+        return $mmUtil.allPromises(promises);
+    };
+
     /**
      * Report a folder as being viewed.
      *
diff --git a/www/addons/mod/page/controllers/index.js b/www/addons/mod/page/controllers/index.js
index 8daf1b6b585..a34c2f2dd81 100644
--- a/www/addons/mod/page/controllers/index.js
+++ b/www/addons/mod/page/controllers/index.js
@@ -35,6 +35,7 @@ angular.module('mm.addons.mod_page')
     $scope.externalUrl = module.url;
     $scope.loaded = false;
     $scope.refreshIcon = 'spinner';
+    $scope.canGetPage = $mmaModPage.isGetPageWSAvailable();
 
     function fetchContent(refresh) {
         var downloadFailed = false;
@@ -51,11 +52,18 @@ angular.module('mm.addons.mod_page')
         }).then(function() {
             var promises = [];
 
+            var getPagePromise;
             // Get the module to get the latest title and description. Data should've been updated in download.
-            promises.push($mmCourse.getModule(module.id, courseId).then(function(mod) {
+            if ($scope.canGetPage) {
+                getPagePromise = $mmaModPage.getPageData(courseId, module.id);
+            } else {
+                getPagePromise = $mmCourse.getModule(module.id, courseId);
+            }
+
+            promises.push(getPagePromise.then(function(mod){
                 $scope.title = mod.name;
-                $scope.description = mod.description;
-            }).catch(function() {
+                $scope.description = mod.intro || mod.description;
+            }).catch(function(){
                 // Ignore errors.
             }));
 
@@ -100,7 +108,7 @@ angular.module('mm.addons.mod_page')
     $scope.doRefresh = function() {
         if ($scope.loaded) {
             $scope.refreshIcon = 'spinner';
-            return $mmaModPagePrefetchHandler.invalidateContent(module.id).then(function() {
+            return $mmaModPage.invalidateContent(module.id, courseId).then(function() {
                 return fetchContent(true);
             }).finally(function() {
                 $scope.$broadcast('scroll.refreshComplete');
diff --git a/www/addons/mod/page/services/page.js b/www/addons/mod/page/services/page.js
index a62778d9f78..ac8b4bb5eb8 100644
--- a/www/addons/mod/page/services/page.js
+++ b/www/addons/mod/page/services/page.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_page')
  * @ngdoc service
  * @name $mmaModPage
  */
-.factory('$mmaModPage', function($mmFilepool, $mmSite, $mmFS, $http, $log, $q, $mmSitesManager, $mmUtil, $mmText,
+.factory('$mmaModPage', function($mmFilepool, $mmSite, $mmFS, $http, $log, $q, $mmSitesManager, $mmUtil, $mmText, $mmCourse,
             mmaModPageComponent) {
     $log = $log.getInstance('$mmaModPage');
 
@@ -118,13 +118,125 @@ angular.module('mm.addons.mod_page')
      * @return {Promise}         Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     self.isPluginEnabled = function(siteId) {
-        siteId = siteId || $mmSite.getId();
-
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return site.canDownloadFiles();
         });
     };
 
+    /**
+     * Returns whether or not getPage WS available or not.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPage#isGetPageWSAvailable
+     * @return {Boolean}
+     */
+    self.isGetPageWSAvailable = function() {
+        return $mmSite.wsAvailable('mod_page_get_pages_by_courses');
+    };
+
+    /**
+     * Get a page data.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPage#getPageData
+     * @param {Number} courseid Course ID.
+     * @param {Number} cmid     Course module ID.
+     * @param  {String} key     Name of the property to check.
+     * @param  {Mixed}  value   Value to search.
+     * @return {Promise}        Promise resolved when the page is retrieved.
+     */
+    function getPageData(siteId, courseId, key, value) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getPageCacheKey(courseId)
+                };
+
+            return site.read('mod_page_get_pages_by_courses', params, preSets).then(function(response) {
+                if (response && response.pages) {
+                    var currentPage;
+                    angular.forEach(response.pages, function(page) {
+                        if (!currentPage && page[key] == value) {
+                            currentPage = page;
+                        }
+                    });
+                    if (currentPage) {
+                        return currentPage;
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a page by course module ID.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPage#getPageData
+     * @param {Number} courseId Course ID.
+     * @param {Number} cmId     Course module ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the book is retrieved.
+     */
+    self.getPageData = function(courseId, cmId, siteId) {
+        return getPageData(siteId, courseId, 'coursemodule', cmId);
+    };
+
+    /**
+     * Get cache key for page data WS calls.
+     *
+     * @param {Number} courseid Course ID.
+     * @return {String}         Cache key.
+     */
+    function getPageCacheKey(courseid) {
+        return 'mmaModPage:page:' + courseid;
+    }
+
+    /**
+     * Invalidates page data.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPage#invalidateBookData
+     * @param {Number} courseId Course ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidatePageData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getPageCacheKey(courseId));
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPage#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var promises = [];
+
+        promises.push(self.invalidatePageData(courseId, siteId));
+        promises.push($mmFilepool.invalidateFilesByComponent(siteId, mmaModPageComponent, moduleId));
+        promises.push($mmCourse.invalidateModule(moduleId, siteId));
+
+        return $mmUtil.allPromises(promises);
+    };
+
     /**
      * Report a page as being viewed.
      *
diff --git a/www/addons/mod/page/services/prefetch_handler.js b/www/addons/mod/page/services/prefetch_handler.js
index c5058761978..70a48961626 100644
--- a/www/addons/mod/page/services/prefetch_handler.js
+++ b/www/addons/mod/page/services/prefetch_handler.js
@@ -21,12 +21,46 @@ angular.module('mm.addons.mod_page')
  * @ngdoc service
  * @name $mmaModPagePrefetchHandler
  */
-.factory('$mmaModPagePrefetchHandler', function($mmPrefetchFactory, mmaModPageComponent) {
+.factory('$mmaModPagePrefetchHandler', function($mmPrefetchFactory, mmaModPageComponent, $mmaModPage, $mmCourse) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModPageComponent, true);
 
     // RegExp to check if a module has updates based on the result of $mmCoursePrefetchDelegate#getCourseUpdates.
     self.updatesNames = /^configuration$|^.*files$/;
 
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPagePrefetchHandler#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId) {
+        return $mmaModPage.invalidateContent(moduleId, courseId);
+    };
+
+    /**
+     * Invalidates WS calls needed to determine module status.
+     *
+     * @module mm.addons.mod_page
+     * @ngdoc method
+     * @name $mmaModPagePrefetchHandler#invalidateModule
+     * @param  {Object} module   Module to invalidate.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.invalidateModule = function(module, courseId) {
+        var promises = [];
+
+        promises.push($mmaModPage.invalidatePageData(courseId));
+        promises.push($mmCourse.invalidateModule(module.id));
+
+        return $q.all(promises);
+    };
+
+
     return self;
 });
diff --git a/www/addons/mod/resource/controllers/index.js b/www/addons/mod/resource/controllers/index.js
index 46a6137cbb1..13cda8fb1c2 100644
--- a/www/addons/mod/resource/controllers/index.js
+++ b/www/addons/mod/resource/controllers/index.js
@@ -36,6 +36,7 @@ angular.module('mm.addons.mod_resource')
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModResourceComponent;
     $scope.componentId = module.id;
+    $scope.canGetResource = $mmaModResource.isGetResourceWSAvailable();
 
     function fetchContent(refresh) {
         // Load module contents if needed. Passing refresh is needed to force reloading contents.
@@ -78,13 +79,22 @@ angular.module('mm.addons.mod_resource')
                 };
             }
         }).then(function() {
-            // Get the module to get the latest title and description. Data should've been updated in loadModuleContents if needed.
-            return $mmCourse.getModule(module.id, courseId).then(function(mod) {
+
+            var promise;
+            // Get the module to get the latest title and description.
+            if ($scope.canGetResource) {
+                promise = $mmaModResource.getResourceData(courseId, module.id);
+            } else {
+                promise = $mmCourse.getModule(module.id, courseId);
+            }
+
+            return promise.then(function(mod) {
                 $scope.title = mod.name;
-                $scope.description = mod.description;
+                $scope.description = mod.intro || mod.description;
             }).catch(function() {
                 // Ignore errors.
             });
+
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModResourceComponent);
@@ -116,9 +126,10 @@ angular.module('mm.addons.mod_resource')
     $scope.doRefresh = function() {
         if ($scope.loaded) {
             $scope.refreshIcon = 'spinner';
-            return $mmaModResourcePrefetchHandler.invalidateContent(module.id).then(function() {
+            return $mmaModResource.invalidateContent(module.id, courseId).then(function() {
                 return fetchContent(true);
             }).finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
                 $scope.$broadcast('scroll.refreshComplete');
             });
         }
diff --git a/www/addons/mod/resource/services/prefetch_handler.js b/www/addons/mod/resource/services/prefetch_handler.js
index 3b4a88de1d8..8ccc5fed5cc 100644
--- a/www/addons/mod/resource/services/prefetch_handler.js
+++ b/www/addons/mod/resource/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_resource')
  * @name $mmaModResourcePrefetchHandler
  */
 .factory('$mmaModResourcePrefetchHandler', function($mmaModResource, $mmSite, $mmFilepool, $mmPrefetchFactory, $q,
-            mmaModResourceComponent) {
+            mmaModResourceComponent, $mmCourse) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModResourceComponent, true);
 
@@ -78,5 +78,38 @@ angular.module('mm.addons.mod_resource')
         return downloadOrPrefetch(module, courseId, true);
     };
 
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResourcePrefetchHandler#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId) {
+        return $mmaModResource.invalidateContent(moduleId, courseId);
+    };
+
+    /**
+     * Invalidates WS calls needed to determine module status.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResourcePrefetchHandler#invalidateModule
+     * @param  {Object} module   Module to invalidate.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.invalidateModule = function(module, courseId) {
+        var promises = [];
+
+        promises.push($mmaModResource.invalidateResourceData(courseId));
+        promises.push($mmCourse.invalidateModule(module.id));
+
+        return $q.all(promises);
+    };
+
     return self;
 });
diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index 91cd5bafefd..ad5eb0f589e 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_resource')
  * @name $mmaModResource
  */
 .factory('$mmaModResource', function($mmFilepool, $mmSite, $mmUtil, $mmFS, $http, $log, $q, $sce, $mmApp, $mmSitesManager,
-            $mmText, mmaModResourceComponent, mmCoreNotDownloaded, mmCoreDownloading, mmCoreDownloaded) {
+            $mmText, mmaModResourceComponent, mmCoreNotDownloaded, mmCoreDownloading, mmCoreDownloaded, $mmCourse) {
     $log = $log.getInstance('$mmaModResource');
 
     var self = {};
@@ -180,8 +180,6 @@ angular.module('mm.addons.mod_resource')
      * @return {Promise}         Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     self.isPluginEnabled = function(siteId) {
-        siteId = siteId || $mmSite.getId();
-
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return site.canDownloadFiles();
         });
@@ -283,5 +281,119 @@ angular.module('mm.addons.mod_resource')
         });
     };
 
+    /**
+     * Returns whether or not getResource WS available or not.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#isGetResourceWSAvailable
+     * @return {Boolean}
+     */
+    self.isGetResourceWSAvailable = function() {
+        return $mmSite.wsAvailable('mod_resource_get_resources_by_courses');
+    };
+
+    /**
+     * Get a resource data.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#getResourceData
+     * @param {Number} courseid Course ID.
+     * @param {Number} cmid     Course module ID.
+     * @param  {String} key     Name of the property to check.
+     * @param  {Mixed}  value   Value to search.
+     * @return {Promise}        Promise resolved when the resource is retrieved.
+     */
+    function getResourceData(siteId, courseId, key, value) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getResourceCacheKey(courseId)
+                };
+
+            return site.read('mod_resource_get_resources_by_courses', params, preSets).then(function(response) {
+                if (response && response.resources) {
+                    var currentResource;
+                    angular.forEach(response.resources, function(resource) {
+                        if (!currentResource && resource[key] == value) {
+                            currentResource = resource;
+                        }
+                    });
+                    if (currentResource) {
+                        return currentResource;
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a resource by course module ID.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#getResource
+     * @param {Number} courseId Course ID.
+     * @param {Number} cmId     Course module ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the book is retrieved.
+     */
+    self.getResourceData = function(courseId, cmId, siteId) {
+        return getResourceData(siteId, courseId, 'coursemodule', cmId);
+    };
+
+    /**
+     * Get cache key for resource data WS calls.
+     *
+     * @param {Number} courseid Course ID.
+     * @return {String}         Cache key.
+     */
+    function getResourceCacheKey(courseid) {
+        return 'mmaModResource:resource:' + courseid;
+    }
+
+     /**
+     * Invalidates resource data.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#invalidateResourceData
+     * @param {Number} courseid Course ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateResourceData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getResourceCacheKey(courseId));
+        });
+    };
+
+     /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var promises = [];
+
+        promises.push(self.invalidateResourceData(courseId, siteId));
+        promises.push($mmFilepool.invalidateFilesByComponent(siteId, mmaModResourceComponent, moduleId));
+        promises.push($mmCourse.invalidateModule(moduleId, siteId));
+
+        return $mmUtil.allPromises(promises);
+    };
+
     return self;
 });
diff --git a/www/addons/mod/url/controllers/index.js b/www/addons/mod/url/controllers/index.js
index 1a407580ed6..923e7d5abfe 100644
--- a/www/addons/mod/url/controllers/index.js
+++ b/www/addons/mod/url/controllers/index.js
@@ -30,20 +30,29 @@ angular.module('mm.addons.mod_url')
     $scope.moduleUrl = module.url;
     $scope.component = mmaModUrlComponent;
     $scope.componentId = module.id;
+    $scope.canGetUrl = $mmaModUrl.isGetUrlWSAvailable();
 
     function fetchContent() {
         // Fetch the module data.
-        return $mmCourse.getModule(module.id, courseId).then(function(mod) {
-            if (!mod.contents.length) {
-                // If the data was cached maybe we don't have contents. Reject.
-                return $q.reject();
+        var promise;
+        if ($scope.canGetUrl) {
+            promise = $mmaModUrl.getUrl(courseId, module.id);
+        } else {
+            promise = $mmCourse.getModule(module.id, courseId);
+        }
+        return promise.then(function(mod) {
+            if (!$scope.canGetUrl) {
+                if (!mod.contents.length) {
+                    // If the data was cached maybe we don't have contents. Reject.
+                    return $q.reject();
+                }
             }
 
-            module = mod;
-            $scope.title = module.name;
-            $scope.description = module.description;
+            $scope.title = mod.name;
+            $scope.description = mod.intro || mod.description;
 
-            $scope.url = (module.contents[0] && module.contents[0].fileurl) ? module.contents[0].fileurl : undefined;
+            $scope.url = $scope.canGetUrl ? mod.externalurl : 
+                            ((mod.contents[0] && mod.contents[0].fileurl) ? mod.contents[0].fileurl : undefined);
         }).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'mm.course.errorgetmodule', true);
             return $q.reject();
@@ -65,7 +74,7 @@ angular.module('mm.addons.mod_url')
     $scope.doRefresh = function() {
         if ($scope.loaded) {
             $scope.refreshIcon = 'spinner';
-            return $mmCourse.invalidateModule(module.id).then(function() {
+            return $mmaModUrl.invalidateContent(module.id, courseId).then(function() {
                 return fetchContent();
             }).finally(function() {
                 $scope.$broadcast('scroll.refreshComplete');
diff --git a/www/addons/mod/url/services/url.js b/www/addons/mod/url/services/url.js
index fe6b7a62ef1..a37fae3cbaf 100644
--- a/www/addons/mod/url/services/url.js
+++ b/www/addons/mod/url/services/url.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_url')
  * @ngdoc service
  * @name $mmaModUrl
  */
-.factory('$mmaModUrl', function($mmSite, $mmUtil, $q, $mmContentLinksHelper) {
+.factory('$mmaModUrl', function($mmSite, $mmUtil, $q, $mmContentLinksHelper, $mmCourse, $mmSitesManager) {
     var self = {};
 
     /**
@@ -43,6 +43,114 @@ angular.module('mm.addons.mod_url')
         return $q.reject();
     };
 
+    /**
+     * Returns whether or not getUrl WS available or not.
+     *
+     * @module mm.addons.mod_url
+     * @ngdoc method
+     * @name $mmaModUrl#isGetUrlWSAvailable
+     * @return {Boolean}
+     */
+    self.isGetUrlWSAvailable = function() {
+        return $mmSite.wsAvailable('mod_url_get_urls_by_courses');
+    };
+
+    /**
+     * Get a url.
+     *
+     * @param  {String} siteId    Site ID.
+     * @param  {Number} courseId  Course ID.
+     * @param  {String} key       Name of the property to check.
+     * @param  {Mixed}  value     Value to search.
+     * @return {Promise}          Promise resolved when the url is retrieved.
+     */
+    function getUrl(siteId, courseId, key, value) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getUrlCacheKey(courseId)
+                };
+
+            return site.read('mod_url_get_urls_by_courses', params, preSets).then(function(response) {
+                if (response && response.urls) {
+                    var currentUrl;
+                    angular.forEach(response.urls, function(url) {
+                        if (!currentUrl && url[key] == value) {
+                            currentUrl = url;
+                        }
+                    });
+                    if (currentUrl) {
+                        return currentUrl;
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a url by course module ID.
+     *
+     * @module mm.addons.mod_url
+     * @ngdoc method
+     * @name $mmaModUrl#getUrl
+     * @param {Number} courseId Course ID.
+     * @param {Number} cmId     Course module ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the url is retrieved.
+     */
+    self.getUrl = function(courseId, cmId, siteId) {
+        return getUrl(siteId, courseId, 'coursemodule', cmId);
+    };
+
+    /**
+     * Get cache key for url data WS calls.
+     *
+     * @param {Number} courseId Course ID.
+     * @return {String}         Cache key.
+     */
+    function getUrlCacheKey(courseId) {
+        return 'mmaModUrl:url:' + courseId;
+    }
+
+    /**
+     * Invalidates url data.
+     *
+     * @module mm.addons.mod_url
+     * @ngdoc method
+     * @name $mmaModUrl#invalidateUrlData
+     * @param {Number} courseId Course ID.
+     * @param {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateUrlData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getUrlCacheKey(courseId));
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_url
+     * @ngdoc method
+     * @name $mmaModUrl#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId, siteId) {
+        var promises = [];
+
+        promises.push(self.invalidateUrlData(courseId, siteId));
+        promises.push($mmCourse.invalidateModule(moduleId, siteId));
+
+        return $mmUtil.allPromises(promises);
+    };
+
     /**
      * Opens a URL.
      *

From eb98a189fa5b152d487b5f6a735eb2041fd47a77 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 14 Mar 2017 15:52:44 +0100
Subject: [PATCH 060/218] MOBILE-2056 choice: Don't show results if choice not
 open yet

---
 www/addons/mod/choice/controllers/index.js | 8 ++++++++
 www/addons/mod/choice/templates/index.html | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/choice/controllers/index.js b/www/addons/mod/choice/controllers/index.js
index 00188397173..d7eb13f2dcd 100644
--- a/www/addons/mod/choice/controllers/index.js
+++ b/www/addons/mod/choice/controllers/index.js
@@ -57,6 +57,8 @@ angular.module('mm.addons.mod_choice')
             $scope.title = choice.name || $scope.title;
             $scope.description = choice.intro || $scope.description;
             $scope.choice = choice;
+            $scope.choiceNotOpenYet = choice.timeopen && choice.timeopen > $scope.now;
+            $scope.choiceClosed = choice.timeclose && choice.timeclose <= $scope.now;
 
             if (sync) {
                 // Try to synchronize the choice.
@@ -175,6 +177,12 @@ angular.module('mm.addons.mod_choice')
 
     // Convenience function to get choice results.
     function fetchResults() {
+        if ($scope.choiceNotOpenYet) {
+            // Cannot see results yet.
+            $scope.canSeeResults = false;
+            return;
+        }
+
         return $mmaModChoice.getResults(choice.id).then(function(results) {
             var hasVotes = false;
             $scope.data = [];
diff --git a/www/addons/mod/choice/templates/index.html b/www/addons/mod/choice/templates/index.html
index 44364c3de32..aeb84f1bd0e 100644
--- a/www/addons/mod/choice/templates/index.html
+++ b/www/addons/mod/choice/templates/index.html
@@ -16,12 +16,12 @@
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
             <!-- Activity availability messages -->
-            <section class="mm-info-card-icon" ng-if="choice.timeopen != 0 && choice.timeopen > now">
+            <section class="mm-info-card-icon" ng-if="choiceNotOpenYet">
                 <i class="icon ion-information-circled padding"></i>
                 <p ng-if="options && options.length">{{ 'mma.mod_choice.previewonly' | translate:{$a: choice.openTimeReadable} }}</p>
                 <p ng-if="!options || !options.length">{{ 'mma.mod_choice.notopenyet' | translate:{$a: choice.openTimeReadable} }}</p>
             </section>
-            <section class="mm-info-card-icon" ng-if="choice.timeclose != 0 && choice.timeclose <= now">
+            <section class="mm-info-card-icon" ng-if="choiceClosed">
                 <i class="icon ion-information-circled padding"></i>
                 <p ng-if="options && options.length">{{ 'mma.mod_choice.yourselection' | translate }} <mm-format-text watch="true">{{options[0].text}}</mm-format-text></p>
                 <p>{{ 'mma.mod_choice.expired' | translate:{$a: choice.closeTimeReadable} }}</p>
@@ -78,7 +78,7 @@ <h2><mm-format-text watch="true">{{ result.text }}</mm-format-text></h2>
                     </div>
                 </div>
             </section>
-            <section class="mm-info-card" ng-if="!canSeeResults">
+            <section class="mm-info-card" ng-if="!canSeeResults && !choiceNotOpenYet">
                 <p>{{ 'mma.mod_choice.noresultsviewable' | translate }}</p>
             </section>
         </mm-loading>

From 0fd6d194a19f22b7e1995d8277558dc0c8c69ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Mar 2017 13:23:12 +0100
Subject: [PATCH 061/218] MOBILE-2037 sections: Support empty section names

---
 .../components/course/controllers/section.js  | 12 +++----
 .../components/course/controllers/sections.js | 31 +++++++++----------
 www/core/components/course/services/course.js |  2 --
 .../components/course/templates/section.html  |  6 ++--
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/www/core/components/course/controllers/section.js b/www/core/components/course/controllers/section.js
index 133a201e183..fde2f91fcf6 100644
--- a/www/core/components/course/controllers/section.js
+++ b/www/core/components/course/controllers/section.js
@@ -63,13 +63,17 @@ angular.module('mm.core.course')
                 } else {
                     sectionnumber = sectionId;
                     promise = $mmCourse.getSection(courseId, false, true, sectionId).then(function(section) {
-                        $scope.title = section.name;
+                        $scope.title = section.name.trim();
                         $scope.summary = section.summary;
                         return [section];
                     });
                 }
 
                 return promise.then(function(sections) {
+                    sections = sections.map(function(section) {
+                        section.name = section.name.trim() || false;
+                        return section;
+                    });
 
                     $scope.hasContent = $mmCourseHelper.addContentHandlerControllerForSectionModules(sections, courseId,
                         moduleId, completionStatus, $scope);
@@ -82,11 +86,7 @@ angular.module('mm.core.course')
                         $mmCourse.logView(courseId);
                     }
                 }, function(error) {
-                    if (error) {
-                        $mmUtil.showErrorModal(error);
-                    } else {
-                        $mmUtil.showErrorModal('mm.course.couldnotloadsectioncontent', true);
-                    }
+                    $mmUtil.showErrorModalDefault(error, 'mm.course.couldnotloadsectioncontent', true);
                 });
             });
         });
diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index 900e64719d9..540e4312c7c 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -61,27 +61,26 @@ angular.module('mm.core.course')
 
             // Get the sections.
             return $mmCourse.getSections(courseId, false, true).then(function(sections) {
+                sections = sections.map(function(section) {
+                    section.name = section.name.trim() || section.section;
+                    return section;
+                });
+
                 // Add a fake first section (all sections).
-                return $translate('mm.course.allsections').then(function(str) {
-                    // Adding fake first section.
-                    var result = [{
-                        name: str,
-                        id: mmCoreCourseAllSectionsId
-                    }].concat(sections);
+                var result = [{
+                    name: $translate.instant('mm.course.allsections'),
+                    id: mmCoreCourseAllSectionsId
+                }].concat(sections);
 
-                    $scope.sections = result;
 
-                    if ($scope.downloadSectionsEnabled) {
-                        calculateSectionStatus(refresh);
-                    }
-                });
+                $scope.sections = result;
+
+                if ($scope.downloadSectionsEnabled) {
+                    calculateSectionStatus(refresh);
+                }
             });
         }).catch(function(error) {
-            if (error) {
-                $mmUtil.showErrorModal(error);
-            } else {
-                $mmUtil.showErrorModal('mm.course.couldnotloadsections', true);
-            }
+            $mmUtil.showErrorModalDefault(error, 'mm.course.couldnotloadsections', true);
         });
     }
 
diff --git a/www/core/components/course/services/course.js b/www/core/components/course/services/course.js
index 47924d8cda6..a26ab1aa1be 100644
--- a/www/core/components/course/services/course.js
+++ b/www/core/components/course/services/course.js
@@ -167,8 +167,6 @@ angular.module('mm.core.course')
      * @return {Promise}         Promise resolved with the module's info.
      */
     self.getModuleBasicInfo = function(moduleId, siteId) {
-        siteId = siteId || $mmSite.getId();
-
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     cmid: moduleId
diff --git a/www/core/components/course/templates/section.html b/www/core/components/course/templates/section.html
index 3a2ffa4795f..32f0329bed5 100644
--- a/www/core/components/course/templates/section.html
+++ b/www/core/components/course/templates/section.html
@@ -1,6 +1,6 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
-    <ion-content delegate-handle="mmSectionScroll" mm-state-class padding="true">
+    <ion-content delegate-handle="mmSectionScroll" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="sectionLoaded" on-refresh="doRefresh()">
         </ion-refresher>
         <mm-loading hide-until="sectionLoaded" loading-padding-top="loadingPaddingTop">
@@ -12,9 +12,9 @@
                 </div>
             </section>
 
-            <section class="card" ng-repeat="section in sections" ng-if="sectionHasContent(section)">
+            <section ng-class="{'card': allSections}" ng-repeat="section in sections" ng-if="sectionHasContent(section)">
                 <!-- Title and summary are displayed when multiple sections per page. -->
-                <div class="item item-divider" ng-if="allSections">
+                <div class="item item-divider" ng-if="allSections && section.name">
                     <h2><mm-format-text watch="true">{{ section.name }}</mm-format-text></h2>
                 </div>
 

From 531720b58bfb76ce21367bef8aadc1c186f7791d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 3 Mar 2017 13:24:16 +0100
Subject: [PATCH 062/218] MOBILE-2037 course: Support visibleoncoursepage
 module field

---
 www/core/components/course/templates/module.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/core/components/course/templates/module.html b/www/core/components/course/templates/module.html
index 4aa7dd88b49..07feac6480b 100644
--- a/www/core/components/course/templates/module.html
+++ b/www/core/components/course/templates/module.html
@@ -1,4 +1,4 @@
-<a id="mm-course-module-{{module.id}}" class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-click="action && action($event)" ng-class="{'item-media': icon, 'mm-not-clickable': !action}" ng-controller="module._controller" title="{{ module.name }}">
+<a id="mm-course-module-{{module.id}}" class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-click="action && action($event)" ng-class="{'item-media': icon, 'mm-not-clickable': !action}" ng-controller="module._controller" title="{{ module.name }}" ng-if="module.visibleoncoursepage !== 0">
 
     <img ng-src="{{ icon }}" alt="" role="presentation" ng-if="icon">
 

From 4eb32f767eed02d669c52d4b1bc436845b0c167c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 24 Mar 2017 13:44:04 +0100
Subject: [PATCH 063/218] MOBILE-1963 notif: Allow disabling sound in
 notifications

---
 .../notifications/controllers/preferences.js  |  23 +++-
 www/addons/notifications/lang/en.json         |   1 +
 www/addons/notifications/services/handlers.js |   2 +-
 .../notifications/templates/preferences.html  | 114 ++++++++++--------
 www/addons/pushnotifications/main.js          |   6 +-
 .../services/pushnotifications.js             |  44 ++++---
 www/core/components/settings/main.js          |   1 +
 www/core/lib/events.js                        |   1 +
 www/core/lib/localnotif.js                    |  59 ++++++++-
 9 files changed, 169 insertions(+), 82 deletions(-)

diff --git a/www/addons/notifications/controllers/preferences.js b/www/addons/notifications/controllers/preferences.js
index ef542482346..226a12fcaab 100644
--- a/www/addons/notifications/controllers/preferences.js
+++ b/www/addons/notifications/controllers/preferences.js
@@ -21,12 +21,31 @@ angular.module('mm.addons.notifications')
  * @ngdoc controller
  * @name mmaNotificationsPreferencesCtrl
  */
-.controller('mmaNotificationsPreferencesCtrl', function($scope, $mmaNotifications, $mmUtil, $ionicPlatform, $mmUser,
-            $mmaMessageOutputDelegate, $q, $timeout, $mmSettingsHelper) {
+.controller('mmaNotificationsPreferencesCtrl', function($scope, $mmaNotifications, $mmUtil, $ionicPlatform, $mmUser, $mmConfig,
+            $mmaMessageOutputDelegate, $q, $timeout, $mmSettingsHelper, mmCoreSettingsNotificationSound, $mmLocalNotifications,
+            $mmEvents, mmCoreEventNotificationSoundChanged) {
 
     var updateTimeout;
 
     $scope.isTablet = $ionicPlatform.isTablet();
+    $scope.notifPrefsEnabled = $mmaNotifications.isNotificationPreferencesEnabled();
+
+    // Notification sound setting.
+    $mmConfig.get(mmCoreSettingsNotificationSound, true).then(function(enabled) {
+        $scope.notificationSound = enabled;
+    });
+
+    $scope.notificationSoundChanged = function(enabled) {
+        $mmConfig.set(mmCoreSettingsNotificationSound, enabled);
+        $mmEvents.trigger(mmCoreEventNotificationSoundChanged, enabled);
+        $mmLocalNotifications.rescheduleAll();
+    };
+
+    if (!$scope.notifPrefsEnabled) {
+        // Notification preferences aren't enabled, stop.
+        $scope.preferencesLoaded = true;
+        return;
+    }
 
     function fetchPreferences() {
         return $mmaNotifications.getNotificationPreferences().then(function(preferences) {
diff --git a/www/addons/notifications/lang/en.json b/www/addons/notifications/lang/en.json
index d2b8d4ca5af..1eb9faa18f7 100644
--- a/www/addons/notifications/lang/en.json
+++ b/www/addons/notifications/lang/en.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Error getting notifications",
 	"notificationpreferences": "Notification preferences",
     "notifications": "Notifications",
+    "playsound": "Play sound",
     "therearentnotificationsyet": "There are no notifications"
 }
diff --git a/www/addons/notifications/services/handlers.js b/www/addons/notifications/services/handlers.js
index 5730415baf9..90eb9a458c5 100644
--- a/www/addons/notifications/services/handlers.js
+++ b/www/addons/notifications/services/handlers.js
@@ -200,7 +200,7 @@ angular.module('mm.addons.notifications')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return $mmaNotifications.isNotificationPreferencesEnabled();
+            return true;
         };
 
         /**
diff --git a/www/addons/notifications/templates/preferences.html b/www/addons/notifications/templates/preferences.html
index 80ba9fb90ed..94ec50727c0 100644
--- a/www/addons/notifications/templates/preferences.html
+++ b/www/addons/notifications/templates/preferences.html
@@ -9,63 +9,73 @@
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="preferencesLoaded" on-refresh="refreshPreferences()">
         </ion-refresher>
         <mm-loading hide-until="preferencesLoaded">
-            <!-- Disable all. -->
-            <div class="card" ng-if="preferences">
-                <ion-toggle class="item item-text-wrap" ng-model="preferences.disableall" ng-change="disableAll(preferences.disableall)" >
-                    {{ 'mm.settings.disableall' | translate }}
-                </ion-toggle>
-            </div>
+            <!-- If notification preferences aren't enabled, show only the notification sound setting. -->
+            <ion-toggle ng-if="!notifPrefsEnabled" ng-model="notificationSound" ng-change="notificationSoundChanged(notificationSound)">
+                <p class="item-heading">{{ 'mma.notifications.playsound' | translate }}</p>
+            </ion-toggle>
 
-            <!-- Show current processor. -->
-            <div class="card" ng-if="currentProcessor">
-                <p class="item item-icon-left mm-info-item item-text-wrap" ng-class="{'item-icon-right': currentProcessor.hassettings && currentProcessor.supported}" ng-click="openProcessorPreferences()">
-                    <i class="icon ion-information"></i>
-                    {{ 'mm.settings.configuringnotifications' | translate:{$a: currentProcessor.displayname} }}
-                    <i ng-if="currentProcessor.hassettings && currentProcessor.supported" class="icon ion-gear-b"></i>
-                </p>
-            </div>
+            <div ng-if="notifPrefsEnabled">
+                <div class="card">
+                    <ion-toggle ng-if="preferences" class="item item-text-wrap" ng-model="preferences.disableall" ng-change="disableAll(preferences.disableall)" >
+                        {{ 'mm.settings.disableall' | translate }}
+                    </ion-toggle>
+                    <ion-toggle ng-model="notificationSound" ng-change="notificationSoundChanged(notificationSound)">
+                        <p class="item-heading">{{ 'mma.notifications.playsound' | translate }}</p>
+                    </ion-toggle>
+                </div>
 
-            <!-- Tablet view -->
-            <ul ng-if="isTablet" class="list card" ng-repeat="component in components">
-                <li class="item item-divider item-text-wrap row">
-                    <div class="col col-60">{{ component.displayname }}</div>
-                    <p class="col col-20 text-center">{{ 'mm.settings.loggedin' | translate }}</p>
-                    <p class="col col-20 text-center">{{ 'mm.settings.loggedoff' | translate }}</p>
-                </li>
-                <li class="item item-text-wrap item-toggle-relative row" ng-repeat="notification in component.notifications">
-                    <div class="col col-60">{{ notification.displayname }}</div>
-                    <div class="col col-20 text-center" ng-repeat="state in ['loggedin', 'loggedoff']">
-                        <!-- If notifications not disabled, show toggle. -->
-                        <ion-toggle ng-if="!preferences.disableall" ng-model="notification.currentProcessor[state].checked" ng-change="changePreference(notification, state)" ng-disabled="notification.currentProcessor.locked || notification.currentProcessor[state].updating">
-                            <ion-spinner ng-if="notification.currentProcessor[state].updating" class="mm-spinner-right"></ion-spinner>
-                        </ion-toggle>
-                        <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                        <span ng-if="preferences.disableall">{{ 'mm.settings.disabled' | translate }}</span>
-                    </div>
-                </li>
-            </ul>
 
-            <!-- Phone view -->
-            <ul ng-if="!isTablet" class="list card" ng-repeat="component in components">
-                <li class="item item-divider item-text-wrap">{{ component.displayname }}</li>
-                <div class="item item-text-wrap" ng-repeat="notification in component.notifications">
-                    {{ notification.displayname }}
-                    <!-- If notifications not disabled, show toggles. -->
-                    <div ng-if="!preferences.disableall">
-                        <ion-toggle ng-repeat="state in ['loggedin', 'loggedoff']" class="item-text-wrap has-spinner-right" ng-model="notification.currentProcessor[state].checked" ng-change="changePreference(notification, state)" ng-disabled="notification.currentProcessor.locked || notification.currentProcessor[state].updating">
-                            <small>{{ 'mm.settings.' + state | translate }}</small>
-                            <ion-spinner ng-if="notification.currentProcessor[state].updating" class="mm-spinner-right"></ion-spinner>
-                        </ion-toggle>
-                    </div>
-                    <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                    <div ng-if="preferences.disableall">
-                        <div ng-repeat="state in ['loggedin', 'loggedoff']" class="item item-text-wrap">
-                            <small>{{ 'mm.settings.' + state | translate }}</small>
-                            <span class="item-note">{{ 'mm.settings.disabled' | translate }}</span>
+                <!-- Show current processor. -->
+                <div class="card" ng-if="currentProcessor">
+                    <p class="item item-icon-left mm-info-item item-text-wrap" ng-class="{'item-icon-right': currentProcessor.hassettings && currentProcessor.supported}" ng-click="openProcessorPreferences()">
+                        <i class="icon ion-information"></i>
+                        {{ 'mm.settings.configuringnotifications' | translate:{$a: currentProcessor.displayname} }}
+                        <i ng-if="currentProcessor.hassettings && currentProcessor.supported" class="icon ion-gear-b"></i>
+                    </p>
+                </div>
+
+                <!-- Tablet view -->
+                <ul ng-if="isTablet" class="list card" ng-repeat="component in components">
+                    <li class="item item-divider item-text-wrap row">
+                        <div class="col col-60">{{ component.displayname }}</div>
+                        <p class="col col-20 text-center">{{ 'mm.settings.loggedin' | translate }}</p>
+                        <p class="col col-20 text-center">{{ 'mm.settings.loggedoff' | translate }}</p>
+                    </li>
+                    <li class="item item-text-wrap item-toggle-relative row" ng-repeat="notification in component.notifications">
+                        <div class="col col-60">{{ notification.displayname }}</div>
+                        <div class="col col-20 text-center" ng-repeat="state in ['loggedin', 'loggedoff']">
+                            <!-- If notifications not disabled, show toggle. -->
+                            <ion-toggle ng-if="!preferences.disableall" ng-model="notification.currentProcessor[state].checked" ng-change="changePreference(notification, state)" ng-disabled="notification.currentProcessor.locked || notification.currentProcessor[state].updating">
+                                <ion-spinner ng-if="notification.currentProcessor[state].updating" class="mm-spinner-right"></ion-spinner>
+                            </ion-toggle>
+                            <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
+                            <span ng-if="preferences.disableall">{{ 'mm.settings.disabled' | translate }}</span>
+                        </div>
+                    </li>
+                </ul>
+
+                <!-- Phone view -->
+                <ul ng-if="!isTablet" class="list card" ng-repeat="component in components">
+                    <li class="item item-divider item-text-wrap">{{ component.displayname }}</li>
+                    <div class="item item-text-wrap" ng-repeat="notification in component.notifications">
+                        {{ notification.displayname }}
+                        <!-- If notifications not disabled, show toggles. -->
+                        <div ng-if="!preferences.disableall">
+                            <ion-toggle ng-repeat="state in ['loggedin', 'loggedoff']" class="item-text-wrap has-spinner-right" ng-model="notification.currentProcessor[state].checked" ng-change="changePreference(notification, state)" ng-disabled="notification.currentProcessor.locked || notification.currentProcessor[state].updating">
+                                <small>{{ 'mm.settings.' + state | translate }}</small>
+                                <ion-spinner ng-if="notification.currentProcessor[state].updating" class="mm-spinner-right"></ion-spinner>
+                            </ion-toggle>
+                        </div>
+                        <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
+                        <div ng-if="preferences.disableall">
+                            <div ng-repeat="state in ['loggedin', 'loggedoff']" class="item item-text-wrap">
+                                <small>{{ 'mm.settings.' + state | translate }}</small>
+                                <span class="item-note">{{ 'mm.settings.disabled' | translate }}</span>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </ul>
+                </ul>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/pushnotifications/main.js b/www/addons/pushnotifications/main.js
index 3e3bf6b850a..65f6e2b4141 100644
--- a/www/addons/pushnotifications/main.js
+++ b/www/addons/pushnotifications/main.js
@@ -17,12 +17,16 @@ angular.module('mm.addons.pushnotifications', [])
 .constant('mmaPushNotificationsComponent', 'mmaPushNotifications')
 
 .run(function($mmaPushNotifications, $ionicPlatform, $rootScope, $mmEvents, $mmLocalNotifications, mmCoreEventLogin,
-            mmaPushNotificationsComponent, mmCoreEventSiteDeleted) {
+            mmaPushNotificationsComponent, mmCoreEventSiteDeleted, mmCoreEventNotificationSoundChanged) {
 
     // Register device on GCM or APNS server.
     $ionicPlatform.ready(function() {
         $mmaPushNotifications.registerDevice();
     });
+    $mmEvents.on(mmCoreEventNotificationSoundChanged, function() {
+        // Notification sound has changed, register the device again to update the sound setting.
+        $mmaPushNotifications.registerDevice();
+    });
 
     // Notification received.
     $rootScope.$on('$cordovaPushV5:notificationReceived', function(e, notification) {
diff --git a/www/addons/pushnotifications/services/pushnotifications.js b/www/addons/pushnotifications/services/pushnotifications.js
index e9a8d7a5651..138fcb09b9f 100644
--- a/www/addons/pushnotifications/services/pushnotifications.js
+++ b/www/addons/pushnotifications/services/pushnotifications.js
@@ -44,7 +44,7 @@ angular.module('mm.addons.pushnotifications')
  */
 .factory('$mmaPushNotifications', function($mmSite, $log, $cordovaPushV5, $mmText, $q, $cordovaDevice, $mmUtil, $mmSitesManager,
             mmCoreConfigConstants, $mmApp, $mmLocalNotifications, $mmPushNotificationsDelegate, mmaPushNotificationsComponent,
-            mmaPushNotificationsBadgeStore) {
+            mmaPushNotificationsBadgeStore, $mmConfig, mmCoreSettingsNotificationSound) {
     $log = $log.getInstance('$mmaPushNotifications');
 
     var self = {},
@@ -168,25 +168,29 @@ angular.module('mm.addons.pushnotifications')
      */
     self.registerDevice = function() {
         try {
-            var options = {
-                android: {
-                    senderID: mmCoreConfigConstants.gcmpn
-                },
-                ios: {
-                    alert: true,
-                    badge: true,
-                    sound: true
-                }
-            };
-            return $cordovaPushV5.initialize(options).then(function() {
-                // Start listening for notifications and errors.
-                $cordovaPushV5.onNotification();
-                $cordovaPushV5.onError();
-
-                // Register the device in GCM or APNS.
-                return $cordovaPushV5.register().then(function(token) {
-                    pushID = token;
-                    return self.registerDeviceOnMoodle();
+            // Check if sound is enabled for notifications.
+            return $mmConfig.get(mmCoreSettingsNotificationSound, true).then(function(soundEnabled) {
+                var options = {
+                    android: {
+                        senderID: mmCoreConfigConstants.gcmpn,
+                        sound: !!soundEnabled
+                    },
+                    ios: {
+                        alert: true,
+                        badge: true,
+                        sound: !!soundEnabled
+                    }
+                };
+                return $cordovaPushV5.initialize(options).then(function() {
+                    // Start listening for notifications and errors.
+                    $cordovaPushV5.onNotification();
+                    $cordovaPushV5.onError();
+
+                    // Register the device in GCM or APNS.
+                    return $cordovaPushV5.register().then(function(token) {
+                        pushID = token;
+                        return self.registerDeviceOnMoodle();
+                    });
                 });
             });
         } catch(ex) {}
diff --git a/www/core/components/settings/main.js b/www/core/components/settings/main.js
index 3c362329336..41c4c3c5b28 100644
--- a/www/core/components/settings/main.js
+++ b/www/core/components/settings/main.js
@@ -17,6 +17,7 @@ angular.module('mm.core.settings', [])
 .constant('mmCoreSettingsReportInBackground', 'mmCoreReportInBackground')
 .constant('mmCoreSettingsRichTextEditor', 'mmCoreSettingsRichTextEditor')
 .constant('mmCoreSettingsSyncOnlyOnWifi', 'mmCoreSyncOnlyOnWifi')
+.constant('mmCoreSettingsNotificationSound', 'mmCoreNotificationSound')
 
 .config(function($stateProvider) {
 
diff --git a/www/core/lib/events.js b/www/core/lib/events.js
index f0f92b400d3..38a8c590d69 100644
--- a/www/core/lib/events.js
+++ b/www/core/lib/events.js
@@ -23,6 +23,7 @@ angular.module('mm.core')
 .constant('mmCoreEventLogin', 'login')
 .constant('mmCoreEventLogout', 'logout')
 .constant('mmCoreEventLanguageChanged', 'language_changed')
+.constant('mmCoreEventNotificationSoundChanged', 'notification_sound_changed')
 .constant('mmCoreEventSiteAdded', 'site_added')
 .constant('mmCoreEventSiteUpdated', 'site_updated')
 .constant('mmCoreEventSiteDeleted', 'site_deleted')
diff --git a/www/core/lib/localnotif.js b/www/core/lib/localnotif.js
index 10e818b7bb6..e2300fed332 100644
--- a/www/core/lib/localnotif.js
+++ b/www/core/lib/localnotif.js
@@ -59,7 +59,8 @@ angular.module('mm.core')
  * Provides methods to trigger notifications, listen clicks on them, etc.
  */
 .factory('$mmLocalNotifications', function($log, $cordovaLocalNotification, $mmApp, $q, $rootScope, $ionicPopover, $timeout,
-        mmCoreNotificationsSitesStore, mmCoreNotificationsComponentsStore, mmCoreNotificationsTriggeredStore) {
+        $mmConfig, mmCoreNotificationsSitesStore, mmCoreNotificationsComponentsStore, mmCoreNotificationsTriggeredStore,
+        mmCoreSettingsNotificationSound) {
 
     $log = $log.getInstance('$mmLocalNotifications');
 
@@ -365,6 +366,31 @@ angular.module('mm.core')
         return $mmApp.getDB().remove(mmCoreNotificationsTriggeredStore, id);
     };
 
+    /**
+     * Reschedule all notifications that are already scheduled.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmLocalNotifications#rescheduleAll
+     * @return {Promise} Promise resolved when all notifications have been rescheduled.
+     */
+    self.rescheduleAll = function() {
+        // Get all the scheduled notifications.
+        return $cordovaLocalNotification.getAllScheduled().then(function(notifications) {
+            var promises = [];
+
+            angular.forEach(notifications, function(notification) {
+                // Convert some properties to the needed types.
+                notification.at = new Date(notification.at * 1000);
+                notification.data = notification.data ? JSON.parse(notification.data) : {};
+
+                promises.push(scheduleNotification(notification));
+            });
+
+            return $q.all(promises);
+        });
+    };
+
     /**
      * Schedule a local notification.
      * @see https://github.com/katzer/cordova-plugin-local-notifications/wiki/04.-Scheduling
@@ -384,6 +410,7 @@ angular.module('mm.core')
             notification.data = notification.data || {};
             notification.data.component = component;
             notification.data.siteid = siteid;
+
             if (ionic.Platform.isAndroid()) {
                 notification.icon = notification.icon || 'res://icon';
                 notification.smallIcon = notification.smallIcon || 'res://icon';
@@ -392,15 +419,35 @@ angular.module('mm.core')
                 notification.ledOffTime = notification.ledOffTime || 1000;
             }
 
-            return self.isTriggered(notification).then(function(triggered) {
-                if (!triggered) {
+            return scheduleNotification(notification);
+        });
+    };
+
+    /**
+     * Helper function to schedule a notification object if it hasn't been triggered already.
+     *
+     * @param  {Object} notification Notification to schedule.
+     * @return {Promise}             Promise resolved when scheduled.
+     */
+    function scheduleNotification(notification) {
+        // Check if the notification has been triggered already.
+        return self.isTriggered(notification).then(function(triggered) {
+            if (!triggered) {
+                // Check if sound is enabled for notifications.
+                return $mmConfig.get(mmCoreSettingsNotificationSound, true).then(function(soundEnabled) {
+                    if (!soundEnabled) {
+                        notification.sound = null;
+                    } else {
+                        delete notification.sound; // Use default value.
+                    }
+
                     // Remove from triggered, since the notification could be in there with a different time.
                     self.removeTriggered(notification.id);
                     return $cordovaLocalNotification.schedule(notification);
-                }
-            });
+                });
+            }
         });
-    };
+    }
 
     /**
      * Show an in app notification popover.

From 1f43d89374459131fd9d2b787b61f99143abc07d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 28 Mar 2017 11:19:29 +0200
Subject: [PATCH 064/218] MOBILE-1883 forum: Allow pin discussions and refactor
 offline stores

---
 upgrade.txt                                   |  2 +
 .../mod/forum/controllers/discussions.js      |  2 +
 .../mod/forum/controllers/newdiscussion.js    | 69 +++++++++++---
 .../mod/forum/directives/discussionpost.js    |  9 +-
 www/addons/mod/forum/lang/en.json             |  1 +
 www/addons/mod/forum/services/forum.js        | 63 ++++++-------
 .../mod/forum/services/forum_offline.js       | 23 ++---
 www/addons/mod/forum/services/forum_sync.js   | 10 +-
 www/addons/mod/forum/services/helper.js       |  6 +-
 .../mod/forum/services/prefetch_handler.js    | 22 ++++-
 .../mod/forum/templates/newdiscussion.html    |  3 +-
 www/core/lib/updatemanager.js                 | 93 +++++++++++++++++++
 12 files changed, 223 insertions(+), 80 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index a8e261f023a..4002e7ca763 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -10,6 +10,8 @@ information provided here is intended especially for developers.
  * mm-error CSS class has been deprecated. Use mm-error-card or similar instead.
  * The function $mmaMessages#isSearchEnabled has been deprecated. Please use $mmaMessages#isSearchContactsEnabled instead.
  * Question type addons can now implement an optional prepareAnswers function. If provided, this function will be called before sending the quiz data to the server, and allows the addon to perform changes in the data to send.
+ * The promise returned by $mmaModForum#canAddDiscussion is now resolved with an object (WS response) instead of a boolean.
+ * The parameters of the following functions have changed to match the WS behaviour: $mmaModForum#addNewDiscussion, $mmaModForum#addNewDiscussionOnline, $mmaModForumOffline#addNewDiscussion, $mmaModForum#replyPost, $mmaModForum#replyPostOnline, $mmaModForumOffline#replyPost.
 
 === 3.2.1 ===
 
diff --git a/www/addons/mod/forum/controllers/discussions.js b/www/addons/mod/forum/controllers/discussions.js
index 739eae4cc20..87775895d9f 100644
--- a/www/addons/mod/forum/controllers/discussions.js
+++ b/www/addons/mod/forum/controllers/discussions.js
@@ -98,6 +98,8 @@ angular.module('mm.addons.mod_forum')
                                 userPromises.push($mmUser.getProfile(discussion.userid, courseid, true).then(function(user) {
                                     discussion.userfullname = user.fullname;
                                     discussion.userpictureurl = user.profileimageurl;
+                                }).catch(function() {
+                                    // Ignore errors.
                                 }));
                             }
                         });
diff --git a/www/addons/mod/forum/controllers/newdiscussion.js b/www/addons/mod/forum/controllers/newdiscussion.js
index b3bffad2d87..c7a3b4d7687 100644
--- a/www/addons/mod/forum/controllers/newdiscussion.js
+++ b/www/addons/mod/forum/controllers/newdiscussion.js
@@ -40,12 +40,18 @@ angular.module('mm.addons.mod_forum')
         subject: '',
         text: '',
         subscribe: true,
+        pin: false,
         files: []
     };
 
     $scope.hasOffline = false;
     $scope.component = mmaModForumComponent;
-    $scope.canAddAttachments = $mmaModForum.canAddAttachments();
+    $scope.canCreateAttachments = true; // Assume he can by default.
+    $scope.canPin = false;
+
+    $mmaModForum.canAddAttachments().then(function(canAdd) {
+        $scope.canAddAttachments = canAdd;
+    });
 
     // Fetch if forum uses groups and the groups it uses.
     function fetchDiscussionData(refresh) {
@@ -79,6 +85,16 @@ angular.module('mm.addons.mod_forum')
                 }));
             } else {
                 $scope.showGroups = false;
+
+                if ($mmaModForum.isCanAddDiscussionAvailable()) {
+                    // Use the canAddDiscussion WS to check if the user can add attachments and pin discussions.
+                    promises.push($mmaModForum.canAddDiscussionToAll(forumId).then(function(response) {
+                        $scope.canPin = !!response.canpindiscussions;
+                        $scope.canCreateAttachments = !!response.cancreateattachment;
+                    }).catch(function() {
+                        // Ignore errors, use default values.
+                    }));
+                }
             }
 
             // Get forum.
@@ -96,13 +112,15 @@ angular.module('mm.addons.mod_forum')
                     }
                     return $mmaModForumOffline.getNewDiscussion(forumId, timecreated).then(function(discussion) {
                         $scope.hasOffline = true;
+                        discussion.options = discussion.options || {};
                         $scope.newDiscussion.groupid = discussion.groupid ? discussion.groupid : $scope.newDiscussion.groupid;
                         $scope.newDiscussion.subject = discussion.subject;
                         $scope.newDiscussion.text = discussion.message;
-                        $scope.newDiscussion.subscribe = discussion.subscribe;
+                        $scope.newDiscussion.subscribe = discussion.options.discussionsubscribe;
+                        $scope.newDiscussion.pin = discussion.options.discussionpinned;
 
                         // Treat offline attachments if any.
-                        if (discussion.attachments && discussion.attachments.offline) {
+                        if (discussion.options.attachmentsid && discussion.options.attachmentsid.offline) {
                             return $mmaModForumHelper.getNewDiscussionStoredFiles(forumId, timecreated).then(function(files) {
                                 $scope.newDiscussion.files = files;
                             });
@@ -132,9 +150,16 @@ angular.module('mm.addons.mod_forum')
             // We first check if the user can post to all the groups.
             return $mmaModForum.canAddDiscussionToAll(forumId).catch(function() {
                 // The call failed, let's assume he can't.
-                return false;
-            }).then(function(canAdd) {
-                if (canAdd) {
+                return {
+                    status: false,
+                    canpindiscussions: false,
+                    cancreateattachment: true
+                };
+            }).then(function(response) {
+                $scope.canPin = !!response.canpindiscussions;
+                $scope.canCreateAttachments = !!response.cancreateattachment;
+
+                if (response.status) {
                     // The user can post to all groups, add the "All participants" option and return them all.
                     return addAllParticipantsOption(forumgroups);
                 } else {
@@ -146,9 +171,11 @@ angular.module('mm.addons.mod_forum')
                         promises.push($mmaModForum.canAddDiscussion(forumId, group.id).catch(function() {
                             // The call failed, let's return true so the group is shown. If the user can't post to
                             // it an error will be shown when he tries to add the discussion.
-                            return true;
-                        }).then(function(canAdd) {
-                            if (canAdd) {
+                            return {
+                                status: true
+                            };
+                        }).then(function(response) {
+                            if (response.status) {
                                 filtered.push(group);
                             }
                         }));
@@ -198,7 +225,11 @@ angular.module('mm.addons.mod_forum')
             return $q.when(groups);
         } else if (check) {
             // We need to check if the user can add a discussion to all participants.
-            promise = $mmaModForum.canAddDiscussionToAll(forumId).catch(function() {
+            promise = $mmaModForum.canAddDiscussionToAll(forumId).then(function(response) {
+                $scope.canPin = !!response.canpindiscussions;
+                $scope.canCreateAttachments = !!response.cancreateattachment;
+                return response.status;
+            }).catch(function() {
                 // The call failed, let's assume he can't.
                 return false;
             });
@@ -288,10 +319,13 @@ angular.module('mm.addons.mod_forum')
             forumName = $scope.forum.name,
             subject = $scope.newDiscussion.subject,
             message = $scope.newDiscussion.text,
-            subscribe = $scope.newDiscussion.subscribe,
+            pin = $scope.newDiscussion.pin,
             groupId = $scope.newDiscussion.groupid,
             attachments = $scope.newDiscussion.files,
             discTimecreated = timecreated || Date.now(),
+            options = {
+                discussionsubscribe: !!$scope.newDiscussion.subscribe
+            },
             saveOffline = false;
 
         if (!subject) {
@@ -322,17 +356,24 @@ angular.module('mm.addons.mod_forum')
                 });
             }
         }).then(function(attach) {
+            if (attach) {
+                options.attachmentsid = attach;
+            }
+            if (pin) {
+                options.discussionpinned = true;
+            }
+
             if (saveOffline) {
                 // Save discussion in offline.
                 return $mmaModForumOffline.addNewDiscussion(forumId, forumName, courseId, subject,
-                        message, subscribe, groupId, attach, discTimecreated).then(function() {
+                        message, options, groupId, discTimecreated).then(function() {
                     // Don't return anything.
                 });
             } else {
                 // Try to send it to server.
                 // Don't allow offline if there are attachments since they were uploaded fine.
-                return $mmaModForum.addNewDiscussion(forumId, forumName, courseId, subject, message, subscribe,
-                        groupId, attach, undefined, discTimecreated, !attachments.length);
+                return $mmaModForum.addNewDiscussion(forumId, forumName, courseId, subject, message, options,
+                        groupId, undefined, discTimecreated, !attachments.length);
             }
         }).then(function(discussionId) {
             if (discussionId) {
diff --git a/www/addons/mod/forum/directives/discussionpost.js b/www/addons/mod/forum/directives/discussionpost.js
index 259e80bd272..d1a97045664 100644
--- a/www/addons/mod/forum/directives/discussionpost.js
+++ b/www/addons/mod/forum/directives/discussionpost.js
@@ -153,6 +153,7 @@ angular.module('mm.addons.mod_forum')
                     message = scope.newpost.text,
                     replyingTo = scope.newpost.replyingto,
                     files = scope.newpost.files || [],
+                    options = {},
                     modal = $mmUtil.showModalLoading('mm.core.sending', true),
                     saveOffline = false;
 
@@ -177,10 +178,14 @@ angular.module('mm.addons.mod_forum')
                         });
                     }
                 }).then(function(attach) {
+                    if (attach) {
+                        options.attachmentsid = attach;
+                    }
+
                     if (saveOffline) {
                         // Save post in offline.
                         return $mmaModForumOffline.replyPost(replyingTo, scope.discussionId, forum.id, forum.name,
-                                scope.courseid, subject, message, attach).then(function() {
+                                scope.courseid, subject, message, options).then(function() {
                             // Return false since it wasn't sent to server.
                             return false;
                         });
@@ -188,7 +193,7 @@ angular.module('mm.addons.mod_forum')
                         // Try to send it to server.
                         // Don't allow offline if there are attachments since they were uploaded fine.
                         return $mmaModForum.replyPost(replyingTo, scope.discussionId, forum.id, forum.name,
-                                scope.courseid, subject, message, attach, undefined, !files.length);
+                                scope.courseid, subject, message, options, undefined, !files.length);
                     }
                 }).then(function(sent) {
                     if (sent && forum.id) {
diff --git a/www/addons/mod/forum/lang/en.json b/www/addons/mod/forum/lang/en.json
index 626fac34557..58beac06eef 100644
--- a/www/addons/mod/forum/lang/en.json
+++ b/www/addons/mod/forum/lang/en.json
@@ -6,6 +6,7 @@
     "couldnotadd": "Could not add your post due to an unknown error",
     "discussion": "Discussion",
     "discussionlocked": "This discussion has been locked so you can no longer reply to it.",
+    "discussionpinned": "Pinned",
     "discussionsubscription": "Discussion subscription",
     "edit": "Edit",
     "erroremptymessage": "Post message cannot be empty",
diff --git a/www/addons/mod/forum/services/forum.js b/www/addons/mod/forum/services/forum.js
index d465e96eee6..5b7da638eec 100644
--- a/www/addons/mod/forum/services/forum.js
+++ b/www/addons/mod/forum/services/forum.js
@@ -87,15 +87,14 @@ angular.module('mm.addons.mod_forum')
      * @param {Number} courseId       Course ID the forum belongs to.
      * @param {String} subject        New discussion's subject.
      * @param {String} message        New discussion's message.
-     * @param {String} subscribe      True if should subscribe to the discussion, false otherwise.
+     * @param {Object} [options]      Options (subscribe, pin, ...).
      * @param {String} [groupId]      Group this discussion belongs to.
-     * @param {Mixed} [attach]        The attachments ID if sending online, result of $mmFileUploader#storeFilesToUpload otherwise.
      * @param {String} [siteId]       Site ID. If not defined, current site.
      * @param {Number} [timecreated]  The time the discussion was created. Only used when editing discussion.
      * @param {Boolean} allowOffline  True if it can be stored in offline, false otherwise.
      * @return {Promise}              Promise resolved with discussion ID if sent online, resolved with false if stored offline.
      */
-    self.addNewDiscussion = function(forumId, name, courseId, subject, message, subscribe, groupId, attach, siteId,
+    self.addNewDiscussion = function(forumId, name, courseId, subject, message, options, groupId, siteId,
                 timecreated, allowOffline) {
         siteId = siteId || $mmSite.getId();
 
@@ -108,7 +107,7 @@ angular.module('mm.addons.mod_forum')
                 return storeOffline();
             }
 
-            return self.addNewDiscussionOnline(forumId, subject, message, subscribe, groupId, attach, siteId).then(function(id) {
+            return self.addNewDiscussionOnline(forumId, subject, message, options, groupId, siteId).then(function(id) {
                 // Success, return the discussion ID.
                 return id;
             }).catch(function(error) {
@@ -124,8 +123,8 @@ angular.module('mm.addons.mod_forum')
 
         // Convenience function to store a message to be synchronized later.
         function storeOffline() {
-            return $mmaModForumOffline.addNewDiscussion(forumId, name, courseId, subject, message, subscribe,
-                    groupId, attach, timecreated, siteId).then(function() {
+            return $mmaModForumOffline.addNewDiscussion(forumId, name, courseId, subject, message, options,
+                    groupId, timecreated, siteId).then(function() {
                 return false;
             });
         }
@@ -140,13 +139,12 @@ angular.module('mm.addons.mod_forum')
      * @param  {Number} forumId    Forum ID.
      * @param  {String} subject    New discussion's subject.
      * @param  {String} message    New discussion's message.
-     * @param  {String} subscribe  True if should subscribe to the discussion, false otherwise.
+     * @param  {Object} [options]  Options (subscribe, pin, ...).
      * @param  {String} [groupId]  Group this discussion belongs to.
-     * @param  {Number} [attachId] Attachments ID (if any attachment).
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved when the discussion is created.
      */
-    self.addNewDiscussionOnline = function(forumId, subject, message, subscribe, groupId, attachId, siteId) {
+    self.addNewDiscussionOnline = function(forumId, subject, message, options, groupId, siteId) {
         siteId = siteId || $mmSite.getId();
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -154,25 +152,13 @@ angular.module('mm.addons.mod_forum')
                 forumid: forumId,
                 subject: subject,
                 message: message,
-                options: [
-                    {
-                        name: 'discussionsubscribe',
-                        value: !!subscribe
-                    }
-                ]
+                options: $mmUtil.objectToArrayOfObjects(options, 'name', 'value')
             };
 
             if (groupId) {
                 params.groupid = groupId;
             }
 
-            if (attachId) {
-                params.options.push({
-                    name: 'attachmentsid',
-                    value: attachId
-                });
-            }
-
             return site.write('mod_forum_add_discussion', params).catch(function(error) {
                 return $q.reject({
                     error: error,
@@ -228,7 +214,17 @@ angular.module('mm.addons.mod_forum')
 
         return $mmSite.read('mod_forum_can_add_discussion', params, preSets).then(function(result) {
             if (result) {
-                return !!result.status;
+                if (typeof result.canpindiscussions == 'undefined') {
+                    // WS doesn't support it yet, default it to false to prevent students from seing the option.
+                    result.canpindiscussions = false;
+                    result.defaultpinflag = true;
+                }
+                if (typeof result.cancreateattachment == 'undefined') {
+                    // WS doesn't support it yet, default it to true since usually the users will be able to create them.
+                    result.cancreateattachment = true;
+                    result.defaultcreateattachmentflag = true;
+                }
+                return result;
             }
             return $q.reject();
         });
@@ -752,12 +748,12 @@ angular.module('mm.addons.mod_forum')
      * @param {Number} courseId       Course ID the forum belongs to.
      * @param {String} subject        New post's subject.
      * @param {String} message        New post's message.
-     * @param {Mixed} [attach]        The attachments ID if sending online, result of $mmFileUploader#storeFilesToUpload otherwise.
+     * @param {Object} [options]      Options (subscribe, attachments, ...).
      * @param {String} [siteId]       Site ID. If not defined, current site.
      * @param {Boolean} allowOffline  True if it can be stored in offline, false otherwise.
      * @return {Promise}              Promise resolved when the post is created.
      */
-    self.replyPost = function(postId, discussionId, forumId, name, courseId, subject, message, attach, siteId, allowOffline) {
+    self.replyPost = function(postId, discussionId, forumId, name, courseId, subject, message, options, siteId, allowOffline) {
         siteId = siteId || $mmSite.getId();
 
         if (!$mmApp.isOnline() && allowOffline) {
@@ -767,7 +763,7 @@ angular.module('mm.addons.mod_forum')
 
         // If there's already a reply to be sent to the server, discard it first.
         return $mmaModForumOffline.deleteReply(postId, siteId).then(function() {
-            return self.replyPostOnline(postId, subject, message, attach, siteId).then(function() {
+            return self.replyPostOnline(postId, subject, message, options, siteId).then(function() {
                 return true;
             }).catch(function(error) {
                 if (allowOffline && error && !error.wserror) {
@@ -787,7 +783,7 @@ angular.module('mm.addons.mod_forum')
                 return $mmLang.translateAndReject('mm.core.networkerrormsg');
             }
 
-            return $mmaModForumOffline.replyPost(postId, discussionId, forumId, name, courseId, subject, message, attach, siteId)
+            return $mmaModForumOffline.replyPost(postId, discussionId, forumId, name, courseId, subject, message, options, siteId)
                     .then(function() {
                 return false;
             });
@@ -803,11 +799,11 @@ angular.module('mm.addons.mod_forum')
      * @param  {Number} postId     ID of the post being replied.
      * @param  {String} subject    New post's subject.
      * @param  {String} message    New post's message.
-     * @param  {Number} [attachId] Attachments ID (if any attachment).
+     * @param  {Object} [options]  Options (subscribe, attachments, ...).
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved when the post is created.
      */
-    self.replyPostOnline = function(postId, subject, message, attachId, siteId) {
+    self.replyPostOnline = function(postId, subject, message, options, siteId) {
         siteId = siteId || $mmSite.getId();
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -815,16 +811,9 @@ angular.module('mm.addons.mod_forum')
                 postid: postId,
                 subject: subject,
                 message: message,
-                options: []
+                options: $mmUtil.objectToArrayOfObjects(options, 'name', 'value')
             };
 
-            if (attachId) {
-                params.options.push({
-                    name: 'attachmentsid',
-                    value: attachId
-                });
-            }
-
             return site.write('mod_forum_add_discussion_post', params).catch(function(error) {
                 return $q.reject({
                     error: error,
diff --git a/www/addons/mod/forum/services/forum_offline.js b/www/addons/mod/forum/services/forum_offline.js
index 620e9159e13..73427c0f706 100644
--- a/www/addons/mod/forum/services/forum_offline.js
+++ b/www/addons/mod/forum/services/forum_offline.js
@@ -195,17 +195,16 @@ angular.module('mm.addons.mod_forum')
      * @param  {Number} courseId      Course ID the forum belongs to.
      * @param  {String} subject       New discussion's subject.
      * @param  {String} message       New discussion's message.
-     * @param  {String} subscribe     True if should subscribe to the discussion, false otherwise.
+     * @param  {Object} [options]     Options (subscribe, pin, ...).
      * @param  {String} [groupId]     Group this discussion belongs to.
-     * @param  {Object} [attach]      Result of $mmFileUploader#storeFilesToUpload for attachments.
      * @param  {Number} [timecreated] The time the discussion was created. If not defined, current time.
      * @param  {String} [siteId]      Site ID. If not defined, current site.
      * @param  {Number} [userId]      User the discussion belong to. If not defined, current user in site.
      * @return {Promise}              Promise resolved when new discussion is successfully saved.
      */
-    self.addNewDiscussion = function(forumId, name, courseId, subject, message, subscribe, groupId, attach, timecreated,
-                siteId, userId) {
+    self.addNewDiscussion = function(forumId, name, courseId, subject, message, options, groupId, timecreated, siteId, userId) {
         siteId = siteId || $mmSite.getId();
+        options = options || {};
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
@@ -217,16 +216,12 @@ angular.module('mm.addons.mod_forum')
                     courseid: courseId,
                     subject: subject,
                     message: message,
-                    subscribe: subscribe,
+                    options: options,
                     groupid: groupId || -1,
                     userid: userId,
                     timecreated: timecreated || new Date().getTime()
                 };
 
-            if (attach) {
-                entry.attachments = attach;
-            }
-
             return db.insert(mmaModForumOfflineDiscussionsStore, entry);
         });
     };
@@ -419,13 +414,14 @@ angular.module('mm.addons.mod_forum')
      * @param {Number}  courseId     Course ID the forum belongs to.
      * @param {String}  subject      New post's subject.
      * @param {String}  message      New post's message.
-     * @param  {Object} [attach]     Result of $mmFileUploader#storeFilesToUpload for attachments.
+     * @param {Object} [options]     Options (subscribe, attachments, ...).
      * @param {String}  [siteId]     Site ID. If not defined, current site.
      * @param  {Number} [userId]     User the post belong to. If not defined, current user in site.
      * @return {Promise}             Promise resolved when the post is created.
      */
-    self.replyPost = function(postId, discussionId, forumId, name, courseId, subject, message, attach, siteId, userId) {
+    self.replyPost = function(postId, discussionId, forumId, name, courseId, subject, message, options, siteId, userId) {
         siteId = siteId || $mmSite.getId();
+        options = options || {};
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
@@ -439,14 +435,11 @@ angular.module('mm.addons.mod_forum')
                     courseid: courseId,
                     subject: subject,
                     message: message,
+                    options: options,
                     userid: userId,
                     timecreated: new Date().getTime()
                 };
 
-            if (attach) {
-                discussion.attachments = attach;
-            }
-
             return db.insert(mmaModForumOfflineRepliesStore, discussion);
         });
     };
diff --git a/www/addons/mod/forum/services/forum_sync.js b/www/addons/mod/forum/services/forum_sync.js
index f57e5e068cf..a3e5ee7bef0 100644
--- a/www/addons/mod/forum/services/forum_sync.js
+++ b/www/addons/mod/forum/services/forum_sync.js
@@ -207,12 +207,14 @@ angular.module('mm.addons.mod_forum')
                 var promise;
 
                 courseId = data.courseid;
+                data.options = data.options || {};
 
                 // First of all upload the attachments (if any).
                 promise = uploadAttachments(forumId, data, true, siteId, userId).then(function(itemId) {
                     // Now try to add the discussion.
+                    data.options.attachmentsid = itemId;
                     return $mmaModForum.addNewDiscussionOnline(forumId, data.subject, data.message,
-                            data.subscribe, data.groupid, itemId, siteId);
+                            data.options, data.groupid, siteId);
                 });
 
                 promises.push(promise.then(function() {
@@ -433,11 +435,13 @@ angular.module('mm.addons.mod_forum')
 
                 courseId = data.courseid;
                 forumId = data.forumid;
+                data.options = data.options || {};
 
                 // First of all upload the attachments (if any).
                 promise = uploadAttachments(forumId, data, false, siteId, userId).then(function(itemId) {
                     // Now try to send the reply.
-                    return $mmaModForum.replyPostOnline(data.postid, data.subject, data.message, itemId, siteId);
+                    data.options.attachmentsid = itemId;
+                    return $mmaModForum.replyPostOnline(data.postid, data.subject, data.message, data.options, siteId);
                 });
 
                 promises.push(promise.then(function() {
@@ -499,7 +503,7 @@ angular.module('mm.addons.mod_forum')
      * @return {Promise}         Promise resolved with draftid if uploaded, resolved with undefined if nothing to upload.
      */
     function uploadAttachments(forumId, post, isDisc, siteId, userId) {
-        var attachments = post && post.attachments;
+        var attachments = post && post.options && post.options.attachmentsid;
         if (attachments) {
             // Has some attachments to sync.
             var files = attachments.online || [],
diff --git a/www/addons/mod/forum/services/helper.js b/www/addons/mod/forum/services/helper.js
index aaf89dca72c..83335c68f0e 100644
--- a/www/addons/mod/forum/services/helper.js
+++ b/www/addons/mod/forum/services/helper.js
@@ -59,10 +59,10 @@ angular.module('mm.addons.mod_forum')
             promises = [];
 
         // Treat attachments if any.
-        if (offlineReply.attachments) {
-            reply.attachments = offlineReply.attachments.online || [];
+        if (offlineReply.options && offlineReply.options.attachmentsid) {
+            reply.attachments = offlineReply.options.attachmentsid.online || [];
 
-            if (offlineReply.attachments.offline) {
+            if (offlineReply.options.attachmentsid.offline) {
                 promises.push(self.getReplyStoredFiles(offlineReply.forumid, reply.parent, siteId, reply.userid)
                             .then(function(files) {
                     reply.attachments = reply.attachments.concat(files);
diff --git a/www/addons/mod/forum/services/prefetch_handler.js b/www/addons/mod/forum/services/prefetch_handler.js
index 56f16998703..0b3956a770a 100644
--- a/www/addons/mod/forum/services/prefetch_handler.js
+++ b/www/addons/mod/forum/services/prefetch_handler.js
@@ -344,14 +344,24 @@ angular.module('mm.addons.mod_forum')
         // Check group mode.
         return $mmGroups.getActivityGroupMode(forum.cmid).then(function(mode) {
             if (mode !== $mmGroups.SEPARATEGROUPS && mode !== $mmGroups.VISIBLEGROUPS) {
-                // Activity doesn't use groups, nothing else to prefetch.
+                // Activity doesn't use groups. Prefetch canAddDiscussionToAll to determine if user can pin/attach.
+                if ($mmaModForum.isCanAddDiscussionAvailable()) {
+                    return $mmaModForum.canAddDiscussionToAll(forum.id).catch(function() {
+                        // Ignore errors.
+                    });
+                }
                 return;
             }
 
             // Activity uses groups, prefetch allowed groups.
             return $mmGroups.getActivityAllowedGroups(forum.cmid).then(function(groups) {
                 if (mode === $mmGroups.SEPARATEGROUPS) {
-                    // Groups are already filtered by WS, nothing else to prefetch.
+                    // Groups are already filtered by WS. Prefetch canAddDiscussionToAll to determine if user can pin/attach.
+                    if ($mmaModForum.isCanAddDiscussionAvailable()) {
+                        return $mmaModForum.canAddDiscussionToAll(forum.id).catch(function() {
+                            // Ignore errors.
+                        });
+                    }
                     return;
                 }
 
@@ -361,9 +371,11 @@ angular.module('mm.addons.mod_forum')
                         // Can add discussion WS available, prefetch the calls.
                         return $mmaModForum.canAddDiscussionToAll(forum.id).catch(function() {
                             // The call failed, let's assume he can't.
-                            return false;
-                        }).then(function(canAdd) {
-                            if (canAdd) {
+                            return {
+                                status: false
+                            };
+                        }).then(function(response) {
+                            if (response.status) {
                                 // User can post to all groups, nothing else to prefetch.
                                 return;
                             }
diff --git a/www/addons/mod/forum/templates/newdiscussion.html b/www/addons/mod/forum/templates/newdiscussion.html
index e333830c3d6..f145cdc812e 100644
--- a/www/addons/mod/forum/templates/newdiscussion.html
+++ b/www/addons/mod/forum/templates/newdiscussion.html
@@ -18,7 +18,8 @@
                     </select>
                 </div>
                 <ion-toggle ng-model="newDiscussion.subscribe">{{ 'mma.mod_forum.discussionsubscription' | translate }}</ion-toggle>
-                <mm-attachments ng-if="canAddAttachments && forum && forum.maxattachments > 0" files="newDiscussion.files" max-size="{{forum.maxbytes}}" max-submissions="{{forum.maxattachments}}" component="{{component}}" component-id="{{forum.cmid}}" allow-offline="true"></mm-attachments>
+                <ion-toggle ng-if="canPin" ng-model="newDiscussion.pin">{{ 'mma.mod_forum.discussionpinned' | translate }}</ion-toggle>
+                <mm-attachments ng-if="canAddAttachments && canCreateAttachments && forum && forum.maxattachments > 0" files="newDiscussion.files" max-size="{{forum.maxbytes}}" max-submissions="{{forum.maxattachments}}" component="{{component}}" component-id="{{forum.cmid}}" allow-offline="true"></mm-attachments>
                 <div class="item">
                     <button class="button button-block button-positive" ng-click="add()" ng-disabled="newDiscussion.subject == '' || newDiscussion.text == ''">{{ 'mma.mod_forum.posttoforum' | translate }}</button>
                     <button ng-if="hasOffline" class="button button-block button-outline button-positive" ng-click="discard()">{{ 'mm.core.discard' | translate }}</button>
diff --git a/www/core/lib/updatemanager.js b/www/core/lib/updatemanager.js
index b186cc8b804..450617c7ac5 100644
--- a/www/core/lib/updatemanager.js
+++ b/www/core/lib/updatemanager.js
@@ -80,6 +80,10 @@ angular.module('mm.core')
                 promises.push(migrateWikiNewPagesStore());
             }
 
+            if (versionCode >= 2018 && versionApplied < 2018) {
+                promises.push(adaptForumOfflineStores());
+            }
+
             return $q.all(promises).then(function() {
                 return $mmConfig.set(mmCoreVersionApplied, versionCode);
             }).catch(function() {
@@ -520,5 +524,94 @@ angular.module('mm.core')
         });
     }
 
+    /**
+     * The data stored for offline discussions and posts changed its format. Adapt the entries already stored.
+     * Since it can be slow, we'll only block migrating the db of current site, the rest will be in background.
+     *
+     * @return {Promise} Promise resolved when the db is migrated.
+     */
+    function adaptForumOfflineStores() {
+        return $mmSitesManager.getSitesIds().then(function(siteIds) {
+
+            return $mmSitesManager.getStoredCurrentSiteId().catch(function() {
+                // Error getting current site.
+            }).then(function(currentSiteId) {
+                var promise;
+
+                // Load the config of current site first.
+                if (currentSiteId) {
+                    promise = adaptForumOfflineSiteStores(currentSiteId);
+                } else {
+                    promise = $q.when();
+                }
+
+                // Load the config of rest of sites in background.
+                angular.forEach(siteIds, function(siteId) {
+                    if (siteId != currentSiteId) {
+                        adaptForumOfflineSiteStores(siteId);
+                    }
+                });
+
+                return promise;
+            });
+        });
+    }
+
+    /**
+     * The data stored for offline discussions and posts changed its format. Adapt the entries already stored.
+     *
+     * @param  {String} siteId Site ID.
+     * @return {Promise}       Promise resolved when the data is migrated for the site.
+     */
+    function adaptForumOfflineSiteStores(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var promises = [],
+                $mmaModForumOffline = $injector.get('$mmaModForumOffline'),
+                mmaModForumOfflineDiscussionsStore = $injector.get('mmaModForumOfflineDiscussionsStore'),
+                mmaModForumOfflineRepliesStore = $injector.get('mmaModForumOfflineRepliesStore');
+
+            // Adapt new discussions.
+            promises.push($mmaModForumOffline.getAllNewDiscussions(siteId).then(function(discs) {
+                var subPromises = [];
+
+                angular.forEach(discs, function(disc) {
+                    // Put subscribe and attachments into an options object.
+                    disc.options = {
+                        discussionsubscribe: disc.subscribe
+                    };
+                    if (disc.attachments) {
+                        disc.options.attachmentsid = disc.attachments;
+                    }
+                    delete disc.subscribe;
+                    delete disc.attachments;
+
+                    subPromises.push(site.getDb().insert(mmaModForumOfflineDiscussionsStore, disc));
+                });
+
+                return $q.all(subPromises);
+            }));
+
+            // Adapt replies.
+            promises.push($mmaModForumOffline.getAllReplies(siteId).then(function(replies) {
+                var subPromises = [];
+
+                angular.forEach(replies, function(reply) {
+                    // Put attachments into an options object.
+                    reply.options = {};
+                    if (reply.attachments) {
+                        reply.options.attachmentsid = reply.attachments;
+                    }
+                    delete reply.attachments;
+
+                    subPromises.push(site.getDb().insert(mmaModForumOfflineRepliesStore, reply));
+                });
+
+                return $q.all(subPromises);
+            }));
+
+            return $q.all(promises);
+        });
+    }
+
     return self;
 });

From 5d2a68f2d2e55b52a4d8d57b7795ee7ad9f9b636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 30 Mar 2017 16:52:40 +0200
Subject: [PATCH 065/218] MOBILE-2007 feedback: Add non respondents list

---
 .../mod/feedback/controllers/analysis.js      |   4 +-
 www/addons/mod/feedback/controllers/index.js  |   4 +-
 .../feedback/controllers/nonrespondents.js    | 143 ++++++++++++++++++
 .../mod/feedback/controllers/respondents.js   |   3 +-
 www/addons/mod/feedback/lang/en.json          |   3 +
 www/addons/mod/feedback/main.js               |  15 ++
 www/addons/mod/feedback/services/feedback.js  | 104 +++++++++++++
 www/addons/mod/feedback/services/helper.js    |  38 ++++-
 .../mod/feedback/services/prefetch_handler.js |   3 +
 .../mod/feedback/templates/analysis.html      |   7 +-
 www/addons/mod/feedback/templates/index.html  |   7 +-
 .../feedback/templates/nonrespondents.html    |  38 +++++
 12 files changed, 351 insertions(+), 18 deletions(-)
 create mode 100644 www/addons/mod/feedback/controllers/nonrespondents.js
 create mode 100644 www/addons/mod/feedback/templates/nonrespondents.html

diff --git a/www/addons/mod/feedback/controllers/analysis.js b/www/addons/mod/feedback/controllers/analysis.js
index 7fb9e729cfe..a8d289ff6ef 100644
--- a/www/addons/mod/feedback/controllers/analysis.js
+++ b/www/addons/mod/feedback/controllers/analysis.js
@@ -235,8 +235,8 @@ angular.module('mm.addons.mod_feedback')
     };
 
     // Function to link implemented features.
-    $scope.openFeature = function(feature, notImplemented) {
-        $mmaModFeedbackHelper.openFeature(feature, module, courseId, notImplemented);
+    $scope.openFeature = function(feature) {
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId);
     };
 
     // Refresh online status when changes.
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index e8b0e2df05e..09e7699092f 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -159,8 +159,8 @@ angular.module('mm.addons.mod_feedback')
     };
 
     // Function to link implemented features.
-    $scope.openFeature = function(feature, notImplemented) {
-        $mmaModFeedbackHelper.openFeature(feature, module, courseId, notImplemented);
+    $scope.openFeature = function(feature) {
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId);
     };
 
     // Function to go to the questions form.
diff --git a/www/addons/mod/feedback/controllers/nonrespondents.js b/www/addons/mod/feedback/controllers/nonrespondents.js
new file mode 100644
index 00000000000..fd0ca284f1b
--- /dev/null
+++ b/www/addons/mod/feedback/controllers/nonrespondents.js
@@ -0,0 +1,143 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback non respondents controller.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc controller
+ * @name mmaModFeedbackNonRespondentsCtrl
+ */
+.controller('mmaModFeedbackNonRespondentsCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmText, $translate,
+        mmaModFeedbackComponent, $mmGroups, $mmaModFeedbackHelper, $ionicHistory) {
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        page = 0,
+        feedback;
+
+    $scope.moduleUrl = module.url;
+    $scope.refreshIcon = 'spinner';
+    $scope.component = mmaModFeedbackComponent;
+    $scope.componentId = module.id;
+    $scope.selectedGroup = 0;
+    $scope.canLoadMore = false;
+    $scope.users = [];
+    $scope.total = 0;
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackRespondentsData(refresh) {
+        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
+            feedback = feedbackData;
+
+            $scope.description = feedback.intro;
+
+            $scope.feedbackId = feedback.id;
+            page = 0;
+            $scope.total = 0;
+            $scope.users = [];
+
+            // Get groups (only for teachers).
+            return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+                $scope.groupInfo = groupInfo;
+                return loadGroupUsers($scope.selectedGroup);
+            });
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+
+            if (!refresh) {
+                // Some call failed on first fetch, go back.
+                $ionicHistory.goBack();
+            }
+            return $q.reject();
+        });
+    }
+
+    /**
+     * Load Group responses.
+     *
+     * @param  {Number} [groupId]   If defined it will change group if not, it will load more users for the same group.
+     * @return {Promise}            Resolved with the users loaded.
+     */
+    function loadGroupUsers(groupId) {
+        if (typeof groupId == "undefined") {
+            page++;
+            $scope.loadingMore = true;
+        } else {
+            $scope.selectedGroup = groupId;
+            page = 0;
+            $scope.total = 0;
+            $scope.users = [];
+            $scope.feedbackLoaded = false;
+        }
+
+        return $mmaModFeedbackHelper.getNonRespondents(feedback.id, $scope.selectedGroup, page).then(function(response) {
+            $scope.total = response.total;
+
+            if ($scope.users.length < response.total) {
+                $scope.users = $scope.users.concat(response.users);
+            }
+
+            $scope.canLoadMore = $scope.users.length < response.total;
+
+            return response;
+        }).finally(function() {
+            $scope.loadingMore = false;
+            $scope.feedbackLoaded = true;
+        });
+    }
+
+    // Load group attempts.
+    $scope.loadGroupUsers = function(groupId) {
+        loadGroupUsers(groupId).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+        });
+    };
+
+    // Convenience function to refresh all the data.
+    function refreshAllData() {
+        var promises = [];
+        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
+        if (feedback) {
+            promises.push($mmaModFeedback.invalidateNonRespondentsData(feedback.id));
+            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
+            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+        }
+        return $q.all(promises).finally(function() {
+            return fetchFeedbackRespondentsData(true);
+        });
+    }
+
+    fetchFeedbackRespondentsData().finally(function() {
+        $scope.refreshIcon = 'ion-refresh';
+    });
+
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshFeedback = function() {
+        if ($scope.feedbackLoaded) {
+            $scope.refreshIcon = 'spinner';
+            return refreshAllData().finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/controllers/respondents.js b/www/addons/mod/feedback/controllers/respondents.js
index 4ae5619319e..9934eaa1292 100644
--- a/www/addons/mod/feedback/controllers/respondents.js
+++ b/www/addons/mod/feedback/controllers/respondents.js
@@ -33,7 +33,8 @@ angular.module('mm.addons.mod_feedback')
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
     $scope.selectedGroup = 0;
-    $scope.canLoadMore = false;
+    $scope.canLoadMoreAnon = false;
+    $scope.canLoadMoreNonAnon = false;
     $scope.responses = {
         attempts: [],
         anonattempts: [],
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 991cb3c0b1c..313959a9c60 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -14,7 +14,9 @@
     "next_page": "Next page",
     "non_anonymous": "User's name will be logged and shown with answers",
     "non_anonymous_entries": "Non anonymous entries ({{$a}})",
+    "non_respondents_students": "Non respondents students ({{$a}})",
     "not_selected": "Not selected",
+    "not_started": "Not started",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
@@ -25,5 +27,6 @@
     "save_entries": "Submit your answers",
     "show_entries": "Show responses",
     "show_nonrespondents": "Show non-respondents",
+    "started": "Started",
     "this_feedback_is_already_submitted": "You've already completed this activity."
 }
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 41cfd3b2036..06f9a5a245f 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -98,6 +98,21 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
                 templateUrl: 'addons/mod/feedback/templates/attempt.html'
             }
         }
+    })
+
+    .state('site.mod_feedback-nonrespondents', {
+        url: '/mod_feedback-nonrespondents',
+        params: {
+            courseid: null,
+            module: null,
+            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+        },
+        views: {
+            'site': {
+                controller: 'mmaModFeedbackNonRespondentsCtrl',
+                templateUrl: 'addons/mod/feedback/templates/nonrespondents.html'
+            }
+        }
     });
 })
 
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 57ec9608ce0..61a2b940760 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -128,6 +128,28 @@ angular.module('mm.addons.mod_feedback')
         return getResponsesAnalysisDataPrefixCacheKey(feedbackId) + groupId;
     }
 
+    /**
+     * Get prefix cache key for feedback non respondents data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getNonRespondentsDataPrefixCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':nonrespondents:';
+    }
+
+    /**
+     * Get cache key for non respondents feedback data WS calls.
+     *
+     * @param  {Number} feedbackId  Feedback ID.
+     * @param  {Number} groupId     Group id, 0 means that the function will determine the user group.
+     * @return {String}             Cache key.
+     */
+    function getNonRespondentsDataCacheKey(feedbackId, groupId) {
+        groupId = groupId || 0;
+        return getNonRespondentsDataPrefixCacheKey(feedbackId) + groupId;
+    }
+
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
      *
@@ -666,6 +688,88 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+
+    /**
+     * Retrieves a list of students who didn't submit the feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getNonRespondents
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    groupId         Group id, 0 means that the function will determine the user group.
+     * @param   {Number}    page            The page of records to return.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getNonRespondents = function(feedbackId, groupId, page, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId,
+                    groupid: groupId || 0,
+                    page: page || 0
+                },
+                preSets = {
+                    cacheKey: getNonRespondentsDataCacheKey(feedbackId, groupId)
+                };
+
+            return site.read('mod_feedback_get_non_respondents', params, preSets);
+        });
+    };
+
+    /**
+     * Returns all the feedback non respondents users.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getAllNonRespondents
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    groupId         Group id, 0 means that the function will determine the user group.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Object}    [previous]      Only for recurrent use. Object with the previous fetched info.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getAllNonRespondents = function(feedbackId, groupId, siteId, previous) {
+        siteId = siteId || $mmSite.getId();
+        if (typeof previous == "undefined") {
+            previous = {
+                page: 0,
+                users: []
+            };
+        }
+
+        return self.getNonRespondents(feedbackId, groupId, previous.page, siteId).then(function(response) {
+            if (previous.users.length < response.total) {
+                previous.users = previous.users.concat(response.users);
+            }
+
+            if (previous.users.length < response.total) {
+                // Can load more.
+                previous.page++;
+                return self.getAllNonRespondents(feedbackId, groupId, siteId, previous);
+            }
+
+            previous.total = response.total;
+            return previous;
+        });
+    };
+
+    /**
+     * Invalidates feedback non respondents record data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateNonRespondentsData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateNonRespondentsData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getNonRespondentsDataPrefixCacheKey(feedbackId));
+
+        });
+    };
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModFeedback#invalidateFiles.
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 9303d4d5cac..327c1ab873c 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -76,14 +76,8 @@ angular.module('mm.addons.mod_feedback')
      * @param {String}  feature          Name of the feature to open.
      * @param {Object}  module           Course module activity object.
      * @param {Number}  courseId         Course Id.
-     * @param {Boolean} [notImplemented] If not implemented the browser will be opened. Temporary.
      */
-    self.openFeature = function(feature, module, courseId, notImplemented) {
-        if (notImplemented) {
-            $mmUtil.openInApp($mmSite.getURL() + '/mod/feedback/' + feature + '.php?id=' + module.id);
-            return;
-        }
-
+    self.openFeature = function(feature, module, courseId) {
         var pageName = feature ? 'site.mod_feedback-' + feature : 'site.mod_feedback',
             backTimes = getHistoryBackCounter(pageName, module.instance);
 
@@ -533,5 +527,35 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+
+    /**
+     * Retrieves a list of students who didn't submit the feedback with extra info.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHelper#getNonRespondents
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    groupId         Group id, 0 means that the function will determine the user group.
+     * @param   {Number}    page            The page of records to return.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getNonRespondents = function(feedbackId, groupId, page) {
+        return $mmaModFeedback.getNonRespondents(feedbackId, groupId, page).then(function(responses) {
+            var promises = [];
+
+            angular.forEach(responses.users, function(user) {
+                promises.push($mmUser.getProfile(user.userid, user.courseid, true).then(function(u) {
+                    user.profileimageurl = u.profileimageurl;
+                }).catch(function() {
+                    // Error getting profile, resolve promise without adding any extra data.
+                }));
+            });
+
+            return $q.all(promises).then(function() {
+                return responses;
+            });
+        });
+    };
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 22eef6aa153..c5d22635021 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -210,6 +210,9 @@ angular.module('mm.addons.mod_feedback')
                             p3.push($mmaModFeedback.getAllResponsesAnalysis(feedback.id, group.id, siteId).then(function(responses) {
                                 userIds.push(responses.userid);
                             }));
+                            p3.push($mmaModFeedback.getAllNonRespondents(feedback.id, group.id, siteId).then(function(responses) {
+                                userIds.push(responses.userid);
+                            }));
                         });
 
                         return $q.all(p3).then(function() {
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
index 06430f5f9a9..6ed4300daf5 100644
--- a/www/addons/mod/feedback/templates/analysis.html
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -23,6 +23,10 @@
                         <span class="badge badge-positive">{{feedback.completedCount}}</span>
                         <i class="icon icon-accessory ion-chevron-right"></i>
                     </div>
+                    <div ng-if="!access.isanonymous" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
+                        <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
+                    </div>
                     <div class="item item-text-wrap item-icon-right">
                         <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
                         <span class="badge badge-positive">{{feedback.itemsCount}}</span>
@@ -71,9 +75,6 @@
             <a class="tab-item active">
                 <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
             </a>
-            <a class="tab-item" ng-if="!access.isanonymous" ng-click="openFeature('show_nonrespondents', true)">
-                <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
-            </a>
         </div>
     </ion-footer>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 2e2a267f79d..201345441d1 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -36,6 +36,10 @@
                         <span class="badge badge-positive">{{feedback.completedCount}}</span>
                         <i class="icon icon-accessory ion-chevron-right"></i>
                     </div>
+                    <div ng-if="!access.isanonymous" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
+                        <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
+                    </div>
                     <div class="item item-text-wrap item-icon-right">
                         <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
                         <span class="badge badge-positive">{{feedback.itemsCount}}</span>
@@ -83,9 +87,6 @@
             <a class="tab-item" ng-click="openFeature('analysis')">
                 <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
             </a>
-            <a class="tab-item" ng-if="!access.isanonymous" ng-click="openFeature('show_nonrespondents', true)">
-                <i class="icon ion-close-circled"></i>{{ 'mma.mod_feedback.show_nonrespondents' | translate }}
-            </a>
         </div>
     </ion-footer>
 </ion-view>
diff --git a/www/addons/mod/feedback/templates/nonrespondents.html b/www/addons/mod/feedback/templates/nonrespondents.html
new file mode 100644
index 00000000000..19c8e7530dd
--- /dev/null
+++ b/www/addons/mod/feedback/templates/nonrespondents.html
@@ -0,0 +1,38 @@
+<ion-view view-title="{{ 'mma.mod_feedback.responses' |translate }}">
+    <ion-nav-buttons side="secondary">
+        <mm-context-menu>
+            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
+            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="feedbackLoaded" content="'mm.core.refresh' | translate" action="refreshFeedback()" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+        </mm-context-menu>
+    </ion-nav-buttons>
+    <ion-content mm-state-class>
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback()"></ion-refresher>
+        <mm-loading hide-until="feedbackLoaded">
+            <section class="list">
+                <div class="item item-text-wrap item-input item-select" ng-if="groupInfo.separateGroups || groupInfo.visibleGroups">
+                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                    <select ng-model="selectedGroup" ng-change="loadGroupUsers(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                    </select>
+                </div>
+                <div class="item item-divider" ng-if="total > 0">
+                    {{ 'mma.mod_feedback.non_respondents_students' |translate : {$a: total } }}
+                </div>
+                <div ng-repeat="user in users" ng-if="total > 0">
+                    <div ng-class="{'item-avatar': user.profileimageurl}" class="item item-text-wrap item-icon-right">
+                        <img ng-if="user.profileimageurl" ng-src="{{user.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: user.fullname} }}" role="presentation">
+                        <h2>{{user.fullname}}</h2>
+                        <p ng-if="user.started" class="badge badge-inline badge-balanced">{{ 'mma.mod_feedback.started' | translate}}</p>
+                        <p ng-if="!user.started" class="badge badge-inline badge-balanced">{{ 'mma.mod_feedback.not_started' | translate}}</p>
+                    </div>
+                </div>
+                <div class="item padding text-center" ng-if="canLoadMore">
+                    <!-- Button and spinner to show more users. -->
+                    <button ng-if="!loadingMore" class="button button-block" ng-click="loadGroupUsers()">{{ 'mm.core.loadmore' | translate }}</button>
+                    <ion-spinner ng-if="loadingMore"></ion-spinner>
+                </div>
+            </section>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file

From a30cb625457842c07c1afd1d9498bcf9d7dc815c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 30 Mar 2017 16:58:31 +0200
Subject: [PATCH 066/218] MOBILE-2007 feedback: Register non respondents
 handler

---
 www/addons/mod/feedback/main.js              |  1 +
 www/addons/mod/feedback/services/handlers.js | 40 ++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 06f9a5a245f..0c0110db6f4 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -123,5 +123,6 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:complete', '$mmaModFeedbackHandlers.completeLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:print', '$mmaModFeedbackHandlers.printLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:showEntries', '$mmaModFeedbackHandlers.showEntriesLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:showNonRespondents', '$mmaModFeedbackHandlers.showNonRespondentsLinksHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackPrefetchHandler');
 });
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index c310ab9c667..bc9d08b8bbd 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -336,5 +336,45 @@ angular.module('mm.addons.mod_feedback')
         }];
     };
 
+    /**
+     * Content links handler for feedback show non respondents.
+     * Match mod/feedback/show_nonrespondents.php with a valid feedback id.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#showNonRespondentsLinksHandler
+     */
+    self.showNonRespondentsLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/feedback\/show_nonrespondents\.php.*([\?\&](id)=\d+)/, '$mmCourseDelegate_mmaModFeedback');
+
+    // Check if the printLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.showNonRespondentsLinksHandler.isEnabled = $mmaModFeedback.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.showNonRespondentsLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        return [{
+            action: function(siteId) {
+                if (typeof params.id == 'undefined') {
+                    // Id not defined. Cannot treat the URL.
+                    return false;
+                }
+
+                var modal = $mmUtil.showModalLoading(),
+                    moduleId = parseInt(params.id, 10);
+
+                return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
+                    var stateParams = {
+                        module: module,
+                        moduleid: module.id,
+                        courseid: module.course
+                    };
+                    return $mmContentLinksHelper.goInSite('site.mod_feedback-nonrespondents', stateParams, siteId);
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
     return self;
 });

From 769eec8ed9023153de97e1bf0bd2227291e3cf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 10 Apr 2017 10:40:07 +0200
Subject: [PATCH 067/218] MOBILE-2007 feedback: Change capability checking

---
 .../mod/feedback/templates/analysis.html      | 38 ++++++-----
 www/addons/mod/feedback/templates/index.html  | 64 +++++++++----------
 .../feedback/templates/nonrespondents.html    |  2 +-
 3 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
index 6ed4300daf5..f2657583388 100644
--- a/www/addons/mod/feedback/templates/analysis.html
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -11,26 +11,24 @@
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
             <section class="list" ng-if="access.canedititems || !access.isempty">
-                <div ng-if="access.canedititems">
-                    <div class="item item-text-wrap item-input item-select" ng-if="groupInfo.separateGroups || groupInfo.visibleGroups">
-                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
-                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
-                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
-                        </select>
-                    </div>
-                    <div class="item item-text-wrap item-icon-right"  ng-click="openFeature('respondents')">
-                        <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
-                        <span class="badge badge-positive">{{feedback.completedCount}}</span>
-                        <i class="icon icon-accessory ion-chevron-right"></i>
-                    </div>
-                    <div ng-if="!access.isanonymous" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
-                        <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
-                        <i class="icon icon-accessory ion-chevron-right"></i>
-                    </div>
-                    <div class="item item-text-wrap item-icon-right">
-                        <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
-                        <span class="badge badge-positive">{{feedback.itemsCount}}</span>
-                    </div>
+                <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
+                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                    <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                    </select>
+                </div>
+                <div ng-if="access.canviewreports || access.canedititems" class="item item-text-wrap" ng-class="{'item-icon-right': access.canviewreports}"   ng-click="access.canviewreports && openFeature('respondents')">
+                    <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
+                    <span class="badge badge-positive">{{feedback.completedCount}}</span>
+                    <i ng-if="access.canviewreports" class="icon icon-accessory ion-chevron-right"></i>
+                </div>
+                <div ng-if="!access.isanonymous && access.canviewreports" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
+                    <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
+                    <i class="icon icon-accessory ion-chevron-right"></i>
+                </div>
+                <div ng-if="access.canedititems" class="item item-text-wrap item-icon-right">
+                    <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
+                    <span class="badge badge-positive">{{feedback.itemsCount}}</span>
                 </div>
                 <div class="mm-warning-card-icon" ng-if="warning">
                     <i class="icon ion-close-circled padding"></i> {{ warning }}
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 201345441d1..3b87c7b83a8 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -23,39 +23,37 @@
                 <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
             </div>
 
-            <section class="list" ng-if="access.canedititems || !access.isempty">
-                <div ng-if="access.canedititems">
-                    <div class="item item-text-wrap item-input item-select" ng-if="groupInfo.separateGroups || groupInfo.visibleGroups">
-                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
-                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
-                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
-                        </select>
-                    </div>
-                    <div class="item item-text-wrap item-icon-right" ng-click="openFeature('respondents')">
-                        <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
-                        <span class="badge badge-positive">{{feedback.completedCount}}</span>
-                        <i class="icon icon-accessory ion-chevron-right"></i>
-                    </div>
-                    <div ng-if="!access.isanonymous" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
-                        <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
-                        <i class="icon icon-accessory ion-chevron-right"></i>
-                    </div>
-                    <div class="item item-text-wrap item-icon-right">
-                        <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
-                        <span class="badge badge-positive">{{feedback.itemsCount}}</span>
-                    </div>
-                    <div class="item item-text-wrap" ng-if="feedback.timeopen">
-                        <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
-                        <p>{{feedback.openTimeReadable}}</p>
-                    </div>
-                    <div class="item item-text-wrap" ng-if="feedback.timeclose">
-                        <p class="item-heading">{{ 'mma.mod_feedback.feedbackclose' | translate }}</p>
-                        <p>{{feedback.closeTimeReadable}}</p>
-                    </div>
-                    <div class="item item-text-wrap" ng-if="feedback.page_after_submit">
-                        <p class="item-heading">{{ 'mma.mod_feedback.page_after_submit' | translate }}</p>
-                        <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ feedback.page_after_submit }}</mm-format-text>
-                    </div>
+            <section class="list" ng-if="access.canedititems || access.canviewreports || !access.isempty">
+                <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
+                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                    <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                    </select>
+                </div>
+                <div ng-if="access.canviewreports || access.canedititems" class="item item-text-wrap" ng-class="{'item-icon-right': access.canviewreports}" ng-click="access.canviewreports && openFeature('respondents')">
+                    <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
+                    <span class="badge badge-positive">{{feedback.completedCount}}</span>
+                    <i ng-if="access.canviewreports" class="icon icon-accessory ion-chevron-right"></i>
+                </div>
+                <div ng-if="!access.isanonymous && access.canviewreports" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
+                    <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
+                    <i class="icon icon-accessory ion-chevron-right"></i>
+                </div>
+                <div ng-if="access.canedititems" class="item item-text-wrap item-icon-right">
+                    <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
+                    <span class="badge badge-positive">{{feedback.itemsCount}}</span>
+                </div>
+                <div ng-if="access.canedititems && feedback.timeopen" class="item item-text-wrap">
+                    <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
+                    <p>{{feedback.openTimeReadable}}</p>
+                </div>
+                <div ng-if="access.canedititems && feedback.timeclose" class="item item-text-wrap">
+                    <p class="item-heading">{{ 'mma.mod_feedback.feedbackclose' | translate }}</p>
+                    <p>{{feedback.closeTimeReadable}}</p>
+                </div>
+                <div ng-if="access.canedititems && feedback.page_after_submit" class="item item-text-wrap">
+                    <p class="item-heading">{{ 'mma.mod_feedback.page_after_submit' | translate }}</p>
+                    <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ feedback.page_after_submit }}</mm-format-text>
                 </div>
                 <div ng-if="!access.isempty">
                     <div class="item item-text-wrap">
diff --git a/www/addons/mod/feedback/templates/nonrespondents.html b/www/addons/mod/feedback/templates/nonrespondents.html
index 19c8e7530dd..4e874eb32af 100644
--- a/www/addons/mod/feedback/templates/nonrespondents.html
+++ b/www/addons/mod/feedback/templates/nonrespondents.html
@@ -16,7 +16,7 @@
                     <select ng-model="selectedGroup" ng-change="loadGroupUsers(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
                     </select>
                 </div>
-                <div class="item item-divider" ng-if="total > 0">
+                <div class="item item-divider">
                     {{ 'mma.mod_feedback.non_respondents_students' |translate : {$a: total } }}
                 </div>
                 <div ng-repeat="user in users" ng-if="total > 0">

From 7e2b80f8ce091a191df9cf80beeae6551abeb6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 4 Apr 2017 10:32:41 +0200
Subject: [PATCH 068/218] MOBILE-2004 feedback: Support check_updates_since
 module check

---
 www/addons/mod/feedback/services/prefetch_handler.js | 3 +--
 www/core/scss/styles.scss                            | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index c5d22635021..524c8ad1de7 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -27,8 +27,7 @@ angular.module('mm.addons.mod_feedback')
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModFeedbackComponent);
 
     // RegExp to check if a module has updates based on the result of $mmCoursePrefetchDelegate#getCourseUpdates.
-    // check_updates_since not available yet on module lib.
-    // self.updatesNames = /^configuration$|^.*files$|^answers$/;
+    self.updatesNames = /^configuration$|^.*files$|^attemptsfinished|^attemptsunfinished$/;
 
     /**
      * Download the module.
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 84acde7236e..c06af812b32 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -535,6 +535,10 @@ img.mm-media-adapt-width-enabled {
   height: 30px;
   text-align: center;
   line-height: 30px;
+
+  i.icon:before {
+    color: black !important;
+  }
 }
 
 // Remove padding-top and bottom from navigation bar to minimize height used.

From 84fd604fa4eee4622b77cb54713421d4f5f37bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 31 Mar 2017 11:35:27 +0200
Subject: [PATCH 069/218] MOBILE-2004 feedback: Save offline responses

---
 www/addons/mod/feedback/controllers/form.js   |  15 +-
 www/addons/mod/feedback/lang/en.json          |   1 +
 www/addons/mod/feedback/services/feedback.js  | 339 +++++++++++++++++-
 .../mod/feedback/services/feedback_offline.js | 162 +++++++++
 www/addons/mod/feedback/services/helper.js    | 170 +--------
 www/addons/mod/feedback/templates/form.html   |   3 +-
 6 files changed, 511 insertions(+), 179 deletions(-)
 create mode 100644 www/addons/mod/feedback/services/feedback_offline.js

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index dc0e4b1b4d3..c746b0b1897 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -87,7 +87,7 @@ angular.module('mm.addons.mod_feedback')
         } else {
             currentPage = page;
 
-            promise = $mmaModFeedbackHelper.getPageItems(feedback.id, page, offline, true).then(function(response) {
+            promise = $mmaModFeedback.getPageItemsWithValues(feedback.id, page, offline, true).then(function(response) {
                 $scope.hasPrevPage = !!response.hasprevpage;
                 $scope.hasNextPage = !!response.hasnextpage;
 
@@ -113,15 +113,24 @@ angular.module('mm.addons.mod_feedback')
         scrollTop();
         $scope.feedbackLoaded = false;
 
-        var responses = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
+        var responses = $mmaModFeedbackHelper.getPageItemsResponses($scope.items),
+            formHasErrors = false;
 
-        return $mmaModFeedback.processPage(feedback.id, currentPage, responses, goPrevious).then(function(response) {
+        for (var x in $scope.items) {
+            if ($scope.items[x].isEmpty) {
+                formHasErrors = true;
+                break;
+            }
+        }
+
+        return $mmaModFeedback.processPage(feedback.id, currentPage, responses, goPrevious, formHasErrors).then(function(response) {
             var jumpTo = parseInt(response.jumpto, 10);
 
             if (response.completed) {
                 // Form is completed, show completion message and buttons.
                 $scope.items = [];
                 $scope.completed = true;
+                $scope.completedOffline = !!response.offline;
                 $scope.completionPageContents = response.completionpagecontents;
                 siteAfterSubmit = response.siteaftersubmit;
                 submitted = true;
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 313959a9c60..5efc3a66ed8 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -7,6 +7,7 @@
     "completed_feedbacks": "Submitted answers",
     "continue_the_form": "Continue the form",
     "feedback_is_not_open": "The feedback is not open",
+    "feedback_submitted_offline": "This feedback has been saved to be submitted later.",
     "feedbackclose": "Allow answers to",
     "feedbackopen": "Allow answers from",
     "mapcourses": "Map feedback to courses",
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 61a2b940760..492f9e16559 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -21,8 +21,11 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedback
  */
-.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil) {
-    var self = {};
+.factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil, $mmApp,
+        $mmaModFeedbackOffline) {
+    var self = {},
+        FEEDBACK_MULTICHOICE_TYPE_SEP = '>>>>>',
+        FEEDBACK_LINE_SEP = '|';
 
     /**
      * Get cache key for feedback data WS calls.
@@ -461,6 +464,218 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Get a single feedback page items. If offline or server down it will use getItems to calculate dependencies.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getPageItemsWithValues
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    page            The page to get.
+     * @param   {Boolean}   offline         True if it should return cached data. Has priority over ignoreCache.
+     * @param   {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getPageItemsWithValues = function(feedbackId, page, offline, ignoreCache, siteId) {
+        siteId = siteId || $mmSite.getId();
+        return self.getPageItems(feedbackId, page, siteId).then(function(response) {
+            return fillValues(feedbackId, response.items, offline, ignoreCache, siteId).then(function(items) {
+                response.items = items;
+                return response;
+            });
+        }).catch(function() {
+            // If getPageItems fail we should calculate it using getItems.
+            return self.getItems(feedbackId, siteId).then(function(response) {
+                return fillValues(feedbackId, response.items, offline, ignoreCache, siteId).then(function(items) {
+                    // Separate items by pages.
+                    var pageItems = [],
+                        currentPage = 0,
+                        previousPageItems = [];
+
+                    pageItems = items.filter(function(item) {
+                        // Greater page, discard all entries.
+                        if (currentPage > page) {
+                            return false;
+                        }
+
+                        if (item.typ == "pagebreak") {
+                            currentPage++;
+                            return false;
+                        }
+
+                        // Save items on previous page to check dependencies and discard entry.
+                        if (currentPage < page) {
+                            previousPageItems.push(item);
+                            return false;
+                        }
+
+                        // Filter depending items.
+                        if (item && item.dependitem > 0 && previousPageItems.length > 0) {
+                            return checkDependencyItem(previousPageItems, item);
+                        }
+
+                        // Filter items with errors.
+                        return item;
+                    });
+
+                    // Check if there are more pages.
+                    response.hasprevpage = page > 0;
+                    response.hasnextpage = currentPage > page;
+                    response.items = pageItems;
+
+                    return response;
+                });
+            });
+        });
+
+        /**
+         * Fill values of item questions.
+         *
+         * @param   {Number}   feedbackId   Feedback ID.
+         * @param   {Array}    items        Item to fill the value.
+         * @param   {Boolean}  offline      True if it should return cached data. Has priority over ignoreCache.
+         * @param   {Boolean}  ignoreCache  True if it should ignore cached data (it will always fail in offline or server down).
+         * @param   {String}   siteId       Site ID.
+         * @return  {Promise}               Resolved with values when done.
+         */
+        function fillValues(feedbackId, items, offline, ignoreCache, siteId) {
+            return self.getCurrentValues(feedbackId, offline, ignoreCache, siteId).then(function(valuesArray) {
+                var values = {};
+
+                angular.forEach(valuesArray, function(value) {
+                    values[value.item] = value.value;
+                });
+
+                angular.forEach(items, function(itemData) {
+                    if (itemData.hasvalue && typeof values[itemData.id] != "undefined") {
+                        itemData.rawValue = values[itemData.id];
+                    }
+                });
+            }).catch(function() {
+                // Ignore errors.
+            }).then(function() {
+                // Merge with offline data.
+                return $mmaModFeedbackOffline.getFeedbackResponses(feedbackId, siteId).then(function(offlineValuesArray) {
+                    var offlineValues = {};
+
+                    // Merge all values into one array.
+                    offlineValuesArray = offlineValuesArray.reduce(function(a, b) {
+                        var responses = $mmUtil.objectToArrayOfObjects(b.responses, 'id', 'value');
+                        return a.concat(responses);
+                    }, []).map(function(a) {
+                        var parts = a.id.split('_');
+                        a.typ = parts[0];
+                        a.item = parseInt(parts[1], 0);
+                        return a;
+                    });
+
+                    angular.forEach(offlineValuesArray, function(value) {
+                        if (typeof offlineValues[value.item] == "undefined") {
+                            offlineValues[value.item] = [];
+                        }
+                        offlineValues[value.item].push(value.value);
+                    });
+
+                    angular.forEach(items, function(itemData) {
+                        if (itemData.hasvalue && typeof offlineValues[itemData.id] != "undefined") {
+                            // Treat multichoice checkboxes.
+                            if (itemData.typ == "multichoice" &&
+                                    itemData.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP)[0] == 'c') {
+
+                                offlineValues[itemData.id] = offlineValues[itemData.id].filter(function(value) {
+                                    return value > 0;
+                                });
+                                itemData.rawValue = offlineValues[itemData.id].join(FEEDBACK_LINE_SEP);
+                            } else {
+                                itemData.rawValue = offlineValues[itemData.id][0];
+                            }
+                        }
+                    });
+                    return items;
+                });
+            }).catch(function() {
+                // Ignore errors.
+                return items;
+            });
+        }
+
+        /**
+         * Check dependency of a question item.
+         *
+         * @param   {Array}     items       All question items to check dependency.
+         * @param   {Number}    item       Item to check.
+         * @return  {Boolean}              Return true if dependency is acomplished and it can be shown. False, otherwise.
+         */
+        function checkDependencyItem(items, item) {
+            var depend;
+            for (var x in items) {
+                if (items[x].id == item.dependitem) {
+                    depend = items[x];
+                    break;
+                }
+            }
+
+            // Item not found, looks like dependent item has been removed or is in the same or following pages.
+            if (!depend) {
+                return true;
+            }
+
+            switch (depend.typ) {
+                case 'label':
+                    return false;
+                case 'multichoice':
+                case 'multichoicerated':
+                    return compareDependItemMultichoice(depend, item.dependvalue);
+            }
+
+            return item.dependvalue == depend.rawValue;
+
+            // Helper functions by type:
+            function compareDependItemMultichoice(item, dependValue) {
+                var values, choices,
+                    parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [],
+                    subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
+
+                choices = parts[1] || '';
+                choices = choices.split(FEEDBACK_MULTICHOICE_ADJUST_SEP)[0] || '';
+                choices = choices.split(FEEDBACK_LINE_SEP) || [];
+
+
+                if (subtype === 'c') {
+                    if (typeof item.rawValue == "undefined") {
+                        values = [''];
+                    } else {
+                        item.rawValue = "" + item.rawValue;
+                        values = item.rawValue.split(FEEDBACK_LINE_SEP);
+                    }
+                } else {
+                    values = [item.rawValue];
+                }
+
+                for (var index = 0; index < choices.length; index++) {
+                    for (var x in values) {
+                        if (values[x] == index + 1) {
+                            var value = choices[index];
+                            if (item.typ == 'multichoicerated') {
+                                value = value.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP)[1] || '';
+                            }
+                            if (value.trim() == dependValue) {
+                                return true;
+                            }
+                            // We can finish checking if only searching on one value and we found it.
+                            if (values.length == 1) {
+                                return false;
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+    };
+
     /**
      * Process a jump between pages.
      *
@@ -470,22 +685,132 @@ angular.module('mm.addons.mod_feedback')
      * @param   {Number}    feedbackId      Feedback ID.
      * @param   {Number}    page            The page being processed.
      * @param   {Object}    responses       The data to be processed the key is the field name (usually type[index]_id).
-     * @param   {Boolean}   goprevious      Whether we want to jump to previous page.
+     * @param   {Boolean}   goPrevious      Whether we want to jump to previous page.
+     * @param   {Boolean}   formHasErrors   Whether the form we sent has required but empty fields (only used in offline).
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @return  {Promise}                   Promise resolved when the info is retrieved.
      */
-    self.processPage = function(feedbackId, page, responses, goprevious, siteId) {
+    self.processPage = function(feedbackId, page, responses, goPrevious, formHasErrors, siteId) {
+        siteId = siteId || $mmSite.getId();
+        if (!$mmApp.isOnline()) {
+            // App is offline, store the action.
+            return storeOffline();
+        }
+
+        // If there's already a response to be sent to the server, discard it first.
+        return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, page, false, siteId).then(function() {
+            // @todo: Sync other pages first here.
+            return self.processPageOnline(feedbackId, page, responses, goPrevious, siteId).catch(function(error) {
+                if (error && error.wserror) {
+                    // The WebService has thrown an error, this means that responses cannot be submitted.
+                    return $q.reject(error.error);
+                } else {
+                    // Couldn't connect to server, store in offline.
+                    return storeOffline();
+                }
+            });
+        });
+
+        // Convenience function to store a message to be synchronized later.
+        function storeOffline() {
+            return $mmaModFeedbackOffline.saveResponses(feedbackId, page, responses, false, siteId).then(function() {
+                // Simulate process_page response.
+                var response = {
+                        jumpto: page,
+                        completed: false,
+                        offline: true
+                    },
+                    changePage = 0;
+
+                if (goPrevious) {
+                    if (page > 0) {
+                        changePage = -1;
+                    }
+                } else if (!formHasErrors) {
+                    // We can only go next if it has no errors.
+                    changePage = 1;
+                }
+
+                if (changePage === 0) {
+                    return response;
+                }
+
+                return self.getPageItemsWithValues(feedbackId, page, true, false, siteId).then(function(resp) {
+                    // Check completion.
+                    if (changePage == 1 && !resp.hasnextpage) {
+                        response.completed = true;
+                        return response;
+                    }
+                    return getPageJumpTo(feedbackId, page + changePage, changePage, siteId).then(function(loadPage) {
+                        if (loadPage === false) {
+                            // Completed or first page.
+                            if (changePage == -1) {
+                                // First page.
+                                response.jumpto = 0;
+                            } else {
+                                // Completed.
+                                response.completed = true;
+                            }
+                        } else {
+                            response.jumpto = loadPage;
+                        }
+                        return response;
+                    });
+                });
+            });
+        }
+
+        // Convenience functio to get the page we can jump.
+        function getPageJumpTo(feedbackId, page, changePage, siteId) {
+            return self.getPageItemsWithValues(feedbackId, page, true, false, siteId).then(function(resp) {
+                // The page we are going has items.
+                if (resp.items.length > 0) {
+                    return page;
+                }
+
+                // Check we can jump futher.
+                if ((changePage == 1 && resp.hasnextpage) || (changePage == -1 && resp.hasprevpage)) {
+                    return getPageJumpTo(feedbackId, page + changePage, changePage, siteId);
+                }
+
+                // Completed or first page.
+                return false;
+            });
+        }
+    };
+
+    /**
+     * Process a jump between pages.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#processPage
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {Number}    page            The page being processed.
+     * @param   {Object}    responses       The data to be processed the key is the field name (usually type[index]_id).
+     * @param   {Boolean}   goPrevious      Whether we want to jump to previous page.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.processPageOnline = function(feedbackId, page, responses, goPrevious, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     feedbackid: feedbackId,
                     page: page,
                     responses: $mmUtil.objectToArrayOfObjects(responses, 'name', 'value'),
-                    goprevious: goprevious ? 1 : 0
+                    goprevious: goPrevious ? 1 : 0
                 };
 
-            return site.write('mod_feedback_process_page', params).then(function(response) {
+            return site.write('mod_feedback_process_page', params).catch(function(error) {
+                return $q.reject({
+                    error: error,
+                    wserror: $mmUtil.isWebServiceError(error)
+                });
+            }).then(function(response) {
                 // Invalidate corrent values because they will change.
-                return self.invalidateCurrentValuesData(feedbackId, site.getId()).then(function() {
+                return self.invalidateCurrentValuesData(feedbackId, site.getId()).catch(function() {
+                    // Ignore errors.
+                }).then(function() {
                     return response;
                 });
             });
diff --git a/www/addons/mod/feedback/services/feedback_offline.js b/www/addons/mod/feedback/services/feedback_offline.js
new file mode 100644
index 00000000000..1f427bfb8ab
--- /dev/null
+++ b/www/addons/mod/feedback/services/feedback_offline.js
@@ -0,0 +1,162 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+.constant('mmaModFeedbackResponsesStore', 'mma_mod_feedback_responses')
+
+.config(function($mmSitesFactoryProvider, mmaModFeedbackResponsesStore) {
+    var stores = [
+        {
+            name: mmaModFeedbackResponsesStore,
+            keyPath: ['feedbackid', 'userid', 'page'],
+            indexes: [
+                {
+                    name: 'feedbackid'
+                },
+                {
+                    name: 'userid'
+                },
+                {
+                    name: 'page'
+                },
+                {
+                    name: 'responses'
+                },
+                {
+                    name: 'timemodified'
+                }
+            ]
+        }
+    ];
+    $mmSitesFactoryProvider.registerStores(stores);
+})
+
+/**
+ * Offline feedback factory.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc service
+ * @name $mmaModFeedbackOffline
+ */
+.factory('$mmaModFeedbackOffline', function($mmSitesManager, $log, mmaModFeedbackResponsesStore, $mmUtil) {
+    $log = $log.getInstance('$mmaModFeedbackOffline');
+
+    var self = {};
+
+    /**
+     * Get if the feedback have something to be synced.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackOffline#hasFeedbackOfflineData
+     * @param  {Number} feedbackId Feedback ID.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with true if the feedback have something to be synced.
+     */
+    self.hasFeedbackOfflineData = function(feedbackId, siteId) {
+        return self.getFeedbackResponses(feedbackId, siteId).then(function(responses) {
+           return !!responses.length;
+        }).catch(function() {
+            // No offline data found, return false.
+            return false;
+        });
+    };
+
+    /**
+     * Get all the stored responses from a certain feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackOffline#getFeedbackResponses
+     * @param  {Number} feedbackId Feedback ID.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with responses.
+     */
+    self.getFeedbackResponses = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModFeedbackResponsesStore, 'feedbackid', feedbackId);
+        });
+    };
+
+    /**
+     * Get the stored responses for a certain feedback page.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackOffline#getFeedbackPageResponses
+     * @param  {Number} feedbackId Feedback ID.
+     * @param  {Number} page       Page of the form to get responses from.
+     * @param  {Number} [userId]   User ID. If not defined, site's current user.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with responses.
+     */
+    self.getFeedbackPageResponses = function(feedbackId, page, userId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.getDb().get(mmaModFeedbackResponsesStore, [feedbackId, userId, page]);
+        });
+    };
+
+    /**
+     * Delete the stored for a certain feedback page.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackOffline#deleteFeedbackPageResponses
+     * @param  {Number} feedbackId Feedback ID.
+     * @param  {Number} page       Page of the form to delete responses from.
+     * @param  {Number} [userId]   User ID. If not defined, site's current user.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved if deleted, rejected if failure.
+     */
+    self.deleteFeedbackPageResponses = function(feedbackId, page, userId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.getDb().remove(mmaModFeedbackResponsesStore, [feedbackId, userId, page]);
+        });
+    };
+
+    /**
+     * Save page responses to be sent later.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackOffline#saveResponses
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {Number} page         The page being processed.
+     * @param  {Object} responses    The data to be processed the key is the field name (usually type[index]_id)
+     * @param  {Number} [userId]     User ID. If not defined, site's current user.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved if stored, rejected if failure.
+     */
+    self.saveResponses = function(feedbackId, page, responses, userId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+
+            var now = $mmUtil.timestamp(),
+                entry = {
+                    feedbackid: feedbackId,
+                    userid: userId,
+                    page: page,
+                    responses: responses,
+                    timemodified: now
+                };
+
+            return site.getDb().insert(mmaModFeedbackResponsesStore, entry);
+        });
+    };
+
+    return self;
+});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 327c1ab873c..a108acc94c5 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -21,8 +21,7 @@ angular.module('mm.addons.mod_feedback')
  * @ngdoc service
  * @name $mmaModFeedbackHelper
  */
-.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $mmSite, $mmUtil, $state, $mmText, $mmUser, $q,
-        $mmaModFeedback) {
+.factory('$mmaModFeedbackHelper', function($ionicHistory, $mmGroups, $translate, $state, $mmText, $mmUser, $q, $mmaModFeedback) {
 
     var self = {},
         MODE_RESPONSETIME = 1,
@@ -252,6 +251,7 @@ angular.module('mm.addons.mod_feedback')
                 if (typeof item.rawValue == "undefined") {
                     item.value = "";
                 } else {
+                    item.rawValue = "" + item.rawValue;
                     var values = item.rawValue.split(FEEDBACK_LINE_SEP);
                     angular.forEach(item.choices, function(choice) {
                         for (var x in values) {
@@ -276,172 +276,6 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
-    /**
-     * Get a single feedback page items. If offline or server down it will use getItems to calculate dependencies.
-     *
-     * @module mm.addons.mod_feedback
-     * @ngdoc method
-     * @name $mmaModFeedbackHelper#getPageItems
-     * @param   {Number}    feedbackId      Feedback ID.
-     * @param   {Number}    page            The page to get.
-     * @param   {Boolean}   offline         True if it should return cached data. Has priority over ignoreCache.
-     * @param   {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
-     * @return  {Promise}                   Promise resolved when the info is retrieved.
-     */
-    self.getPageItems = function(feedbackId, page, offline, ignoreCache) {
-        return $mmaModFeedback.getPageItems(feedbackId, page).then(function(response) {
-            return fillValues(feedbackId, response.items, offline, ignoreCache).then(function(items) {
-                response.items = items;
-                return response;
-            });
-        }).catch(function() {
-            // If getPageItems fail we should calculate it using getItems.
-            return $mmaModFeedback.getItems(feedbackId).then(function(response) {
-                return fillValues(feedbackId, response.items, offline, ignoreCache).then(function(items) {
-                    // Separate items by pages.
-                    var pageItems = [],
-                        currentPage = 0,
-                        previousPageItems = [],
-
-                    pageItems = items.filter(function(item) {
-                        // Greater page, discard all entries.
-                        if (currentPage > page) {
-                            return false;
-                        }
-
-                        if (item.typ == "pagebreak") {
-                            currentPage++;
-                            return false;
-                        }
-
-                        // Save items on previous page to check dependencies and discard entry.
-                        if (currentPage < page) {
-                            previousPageItems.push(item);
-                            return false;
-                        }
-
-                        // Filter depending items.
-                        if (item && item.dependitem > 0 && previousPageItems.length > 0) {
-                            return checkDependencyItem(previousPageItems, item);
-                        }
-
-                        // Filter items with errors.
-                        return item;
-                    });
-
-                    // Check if there are more pages.
-                    response.hasprevpage = page > 0;
-                    response.hasnextpage = currentPage > page;
-                    response.items = pageItems;
-
-                    return response;
-                });
-            });
-        });
-    };
-
-    /**
-     * Fill values of item questions.
-     *
-     * @param   {Number}   feedbackId Feedback ID.
-     * @param   {Array}    items      Item to fill the value.
-     * @return  {Promise}             Resolved with values when done.
-     */
-    function fillValues(feedbackId, items, offline, ignoreCache) {
-        return $mmaModFeedback.getCurrentValues(feedbackId, offline, ignoreCache).then(function(values) {
-            angular.forEach(items, function(itemData) {
-                if (!itemData.hasvalue) {
-                    return;
-                }
-
-                for (var x in values) {
-                    if (values[x].item == itemData.id) {
-                        itemData.rawValue = values[x].value;
-                        return;
-                    }
-                }
-            });
-            return items;
-        }).catch(function() {
-            // Ignore errors.
-            return items;
-        });
-    }
-
-    /**
-     * Check dependency of a question item.
-     *
-     * @param   {Array}     tems       All question items to check dependency.
-     * @param   {Number}    item       Item to check.
-     * @return  {Boolean}              Return true if dependency is acomplished and it can be shown. False, otherwise.
-     */
-    function checkDependencyItem(items, item) {
-        var depend;
-        for (var x in items) {
-            if (items[x].id == item.dependitem) {
-                depend = items[x];
-                break;
-            }
-        }
-
-        // Item not found, looks like dependent item has been removed or is in the same or following pages.
-        if (!depend) {
-            return true;
-        }
-
-        var value;
-        switch (depend.typ) {
-            case 'label':
-                return false;
-            case 'multichoice':
-            case 'multichoicerated':
-                return compareDependItemMultichoice(depend, item.dependvalue);
-        }
-
-        return item.dependvalue == depend.rawValue;
-
-        // Helper functions by type:
-        function compareDependItemMultichoice(item, dependValue) {
-            var values, choices,
-                parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [],
-                subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
-
-            choices = parts[1] || '';
-            choices = choices.split(FEEDBACK_MULTICHOICE_ADJUST_SEP)[0] || '';
-            choices = choices.split(FEEDBACK_LINE_SEP) || [];
-
-
-            if (subtype === 'c') {
-                if (typeof item.rawValue == "undefined") {
-                    values = [''];
-                } else {
-                    values = item.rawValue.split(FEEDBACK_LINE_SEP);
-                }
-            } else {
-                values = [item.rawValue];
-            }
-
-            for (var index = 0; index < choices.length; index++) {
-                for (var x in values) {
-                    if (values[x] == index + 1) {
-                        var value = choices[index];
-                        if (item.typ == 'multichoicerated') {
-                            value = value.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP)[1] || '';
-                        }
-                        if (value.trim() == dependValue) {
-                            return true;
-                        }
-                        // We can finish checking if only searching on one value and we found it.
-                        if (values.length == 1) {
-                            return false;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-    }
-
     /**
      * Get page items responses to be sent.
      *
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 4df53d74900..6630ec3893b 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -63,7 +63,8 @@
                 </div>
             </section>
             <div class="mm-success-card-icon" ng-if="completed">
-                <i class="icon ion-checkmark-round padding"></i> <p ng-if="!completionPageContents">{{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}</p>
+                <i class="icon ion-checkmark-round padding"></i> <p ng-if="!completionPageContents && !completedOffline">{{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}</p>
+                <i class="icon ion-checkmark-round padding"></i> <p ng-if="!completionPageContents && completedOffline">{{ 'mma.mod_feedback.feedback_submitted_offline' | translate }}</p>
                 <p ng-if="completionPageContents"><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ completionPageContents }}</mm-format-text></p>
             </div>
             <div class="item item-text-wrap row-buttons responsive-sm" ng-if="completed">

From ecab6f683284365ec4d1633f3595dfc5f051ef4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 5 Apr 2017 09:47:07 +0200
Subject: [PATCH 070/218] MOBILE-2004 util: Execute ordered promises function

---
 www/core/lib/init.js | 67 +++++++++++++++++++-------------------------
 www/core/lib/util.js | 45 +++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/www/core/lib/init.js b/www/core/lib/init.js
index ec8a6536b1c..3155fae3dc6 100644
--- a/www/core/lib/init.js
+++ b/www/core/lib/init.js
@@ -94,28 +94,26 @@ angular.module('mm.core')
          * @return {Function}
          */
         function prepareProcess(data) {
-            return function() {
-                var promise,
-                    fn;
-
-                $log.debug('Executing init process \'' + data.name + '\'');
-
-                try {
-                    fn = $mmUtil.resolveObject(data.callable);
-                } catch (e) {
-                    $log.error('Could not resolve object of init process \'' + data.name + '\'. ' + e);
-                    return;
-                }
-
-                try {
-                    promise = fn($injector);
-                } catch (e) {
-                    $log.error('Error while calling the init process \'' + data.name + '\'. ' + e);
-                    return;
-                }
-
-                return promise;
-            };
+            var promise,
+                fn;
+
+            $log.debug('Executing init process \'' + data.name + '\'');
+
+            try {
+                fn = $mmUtil.resolveObject(data.callable);
+            } catch (e) {
+                $log.error('Could not resolve object of init process \'' + data.name + '\'. ' + e);
+                return;
+            }
+
+            try {
+                promise = fn($injector);
+            } catch (e) {
+                $log.error('Error while calling the init process \'' + data.name + '\'. ' + e);
+                return;
+            }
+
+            return promise;
         }
 
         /**
@@ -130,9 +128,7 @@ angular.module('mm.core')
          * @return {Void}
          */
         self.executeInitProcesses = function() {
-            var ordered = [],
-                promises = [],
-                dependency = $q.when();
+            var ordered = [];
 
             if (typeof readiness === 'undefined') {
                 readiness = $q.defer();
@@ -146,21 +142,16 @@ angular.module('mm.core')
                 return b.priority - a.priority;
             });
 
-            // Execute all the processes.
-            angular.forEach(ordered, function(data) {
-                var promise;
-
-                // Add the process to the dependency stack.
-                promise = dependency.finally(prepareProcess(data));
-                promises.push(promise);
-
-                // If the new process is blocking, we set it as the dependency.
-                if (data.blocking) {
-                    dependency = promise;
-                }
+            ordered = ordered.map(function (data) {
+                return {
+                    func: prepareProcess,
+                    params: [data],
+                    blocking: !!data.blocking
+                };
             });
 
-            $mmUtil.allPromises(promises).finally(readiness.resolve);
+            // Execute all the processes in order to solve dependencies.
+            $mmUtil.executeOrderedPromises(ordered, true).finally(readiness.resolve);
         };
 
         /**
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 01016c11a5e..ffb40d2fd94 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -1201,6 +1201,51 @@ angular.module('mm.core')
             return deferred.promise;
         };
 
+        /**
+         * Execute promises one depending on the previous.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#executeOrderedPromises
+         * @param  {Object[]} orderedPromisesData       Data to be executed including the following values:
+         *                                               - func: Function to be executed.
+         *                                               - params: Array of data to be sent to the function.
+         *                                               - blocking: Boolean. If promise should block the following.
+         * @return {Promise}                        Promise resolved when all generated promises are resolved.
+         */
+        self.executeOrderedPromises = function(orderedPromisesData) {
+            var promises = [],
+                dependency = $q.when();
+
+            // Execute all the processes in order.
+            angular.forEach(orderedPromisesData, function(data) {
+                var promise;
+
+                // Add the process to the dependency stack.
+                promise = dependency.finally(function() {
+                    var prom, fn;
+
+                    try {
+                        fn = self.resolveObject(data.func);
+                        prom = fn.apply(prom, data.params || []);
+                    } catch (e) {
+                        $log.error(e.message);
+                        return;
+                    }
+                    return prom;
+                });
+                promises.push(promise);
+
+                // If the new process is blocking, we set it as the dependency.
+                if (data.blocking) {
+                    dependency = promise;
+                }
+            });
+
+            // Return when all promises are done.
+            return self.allPromises(promises);
+        };
+
         /**
          * Check if a promise works and returns true if resolves or false if rejects.
          *

From 49281a95135dbd3d4f83e7d16aa64c9140cc4ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 3 Apr 2017 11:19:09 +0200
Subject: [PATCH 071/218] MOBILE-2004 feedback: Implement sync

---
 www/addons/mod/feedback/controllers/form.js   |  61 ++---
 www/addons/mod/feedback/controllers/index.js  |  41 ++-
 www/addons/mod/feedback/main.js               |   4 +
 www/addons/mod/feedback/services/feedback.js  |  56 +++--
 .../mod/feedback/services/feedback_offline.js |  40 +--
 .../mod/feedback/services/feedback_sync.js    | 234 ++++++++++++++++++
 www/addons/mod/feedback/services/handlers.js  |  55 +++-
 www/addons/mod/feedback/services/helper.js    |  25 +-
 www/addons/mod/feedback/templates/index.html  |   5 +
 9 files changed, 434 insertions(+), 87 deletions(-)
 create mode 100644 www/addons/mod/feedback/services/feedback_sync.js

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index c746b0b1897..acb1bc2ac9e 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $timeout, $mmSite, $state,
             mmaModFeedbackComponent, $mmEvents, $mmApp, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper, $ionicScrollDelegate,
-            $ionicHistory, $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted, $translate) {
+            $ionicHistory, $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted, $translate, $mmaModFeedbackSync) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -103,7 +103,7 @@ angular.module('mm.addons.mod_feedback')
             });
 
             if (!$scope.preview) {
-                originalData = $mmaModFeedbackHelper.getPageItemsResponses($scope.items);
+                originalData = $mmaModFeedbackHelper.getPageItemsResponses(angular.copy($scope.items));
             }
         });
     }
@@ -123,32 +123,37 @@ angular.module('mm.addons.mod_feedback')
             }
         }
 
-        return $mmaModFeedback.processPage(feedback.id, currentPage, responses, goPrevious, formHasErrors).then(function(response) {
-            var jumpTo = parseInt(response.jumpto, 10);
-
-            if (response.completed) {
-                // Form is completed, show completion message and buttons.
-                $scope.items = [];
-                $scope.completed = true;
-                $scope.completedOffline = !!response.offline;
-                $scope.completionPageContents = response.completionpagecontents;
-                siteAfterSubmit = response.siteaftersubmit;
-                submitted = true;
-
-                // Invalidate access information so user will see home page updated (continue form or completion messages).
-                // No need to wait the promises to finish.
-                $mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id);
-                $mmaModFeedback.invalidateResumePageData(feedback.id);
-            } else if (isNaN(jumpTo) || jumpTo == currentPage) {
-                // Errors on questions, stay in page.
-                return $q.when();
-            } else {
-                submitted = true;
-                // Invalidate access information so user will see home page updated (continue form).
-                $mmaModFeedback.invalidateResumePageData(feedback.id);
-                // Fetch the new page.
-                return fetchFeedbackPageData(jumpTo);
-            }
+        // Sync other pages first.
+        return $mmaModFeedbackSync.syncFeedback(feedback.id).catch(function() {
+            // Ignore errors.
+        }).then(function() {
+            return $mmaModFeedback.processPage(feedback.id, currentPage, responses, goPrevious, formHasErrors, courseId).then(function(response) {
+                var jumpTo = parseInt(response.jumpto, 10);
+
+                if (response.completed) {
+                    // Form is completed, show completion message and buttons.
+                    $scope.items = [];
+                    $scope.completed = true;
+                    $scope.completedOffline = !!response.offline;
+                    $scope.completionPageContents = response.completionpagecontents;
+                    siteAfterSubmit = response.siteaftersubmit;
+                    submitted = true;
+
+                    // Invalidate access information so user will see home page updated (continue form or completion messages).
+                    // No need to wait the promises to finish.
+                    $mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id);
+                    $mmaModFeedback.invalidateResumePageData(feedback.id);
+                } else if (isNaN(jumpTo) || jumpTo == currentPage) {
+                    // Errors on questions, stay in page.
+                    return $q.when();
+                } else {
+                    submitted = true;
+                    // Invalidate access information so user will see home page updated (continue form).
+                    $mmaModFeedback.invalidateResumePageData(feedback.id);
+                    // Fetch the new page.
+                    return fetchFeedbackPageData(jumpTo);
+                }
+            });
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 09e7699092f..036f8d38f74 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -22,12 +22,11 @@ angular.module('mm.addons.mod_feedback')
  * @name mmaModFeedbackIndexCtrl
  */
 .controller('mmaModFeedbackIndexCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $mmCourseHelper, $q, $mmCourse,
-            $mmText, mmaModFeedbackComponent, $mmEvents, $ionicScrollDelegate, $mmApp, $translate, $mmGroups, $mmaModFeedbackHelper,
-            mmCoreEventOnlineStatusChanged, $state, mmaModFeedbackEventFormSubmitted) {
+            $mmText, mmaModFeedbackComponent, $mmEvents, $mmApp, $translate, $mmGroups, $mmaModFeedbackHelper, $mmaModFeedbackSync,
+            mmCoreEventOnlineStatusChanged, $state, mmaModFeedbackEventFormSubmitted, $mmaModFeedbackOffline) {
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         feedback,
-        scrollView,
         onlineObserver,
         obsSubmitted;
 
@@ -53,6 +52,13 @@ angular.module('mm.addons.mod_feedback')
 
             $scope.feedback = feedback;
 
+            if (sync) {
+                // Try to synchronize the feedback.
+                return syncFeedback(showErrors).catch(function() {
+                    // Ignore errors.
+                });
+            }
+        }).then(function() {
             return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
         }).then(function(accessData) {
             var promises = [];
@@ -82,6 +88,11 @@ angular.module('mm.addons.mod_feedback')
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModFeedbackComponent);
+
+            // Check if there are responses stored in offline.
+            return $mmaModFeedbackOffline.hasFeedbackOfflineData(feedback.id).then(function(hasOffline) {
+                $scope.hasOffline = !!hasOffline;
+            });
         }).catch(function(message) {
             if (!refresh) {
                 // Some call failed, retry without using cache since it might be a new activity.
@@ -122,6 +133,22 @@ angular.module('mm.addons.mod_feedback')
         });
     }
 
+    // Tries to synchronize the feedback.
+    function syncFeedback(showErrors) {
+        return $mmaModFeedbackSync.syncFeedback(feedback.id).then(function(result) {
+            if (result.warnings && result.warnings.length) {
+                $mmUtil.showErrorModal(result.warnings[0]);
+            }
+
+            return result.updated;
+        }).catch(function(error) {
+            if (showErrors) {
+                $mmUtil.showErrorModalDefault(error, 'mm.core.errorsync', true);
+            }
+            return $q.reject();
+        });
+    }
+
     fetchFeedbackData(false, true).then(function() {
         $mmaModFeedback.logView(feedback.id).then(function() {
             $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
@@ -174,14 +201,6 @@ angular.module('mm.addons.mod_feedback')
         $state.go('site.mod_feedback-form', stateParams);
     };
 
-
-    function scrollTop() {
-        if (!scrollView) {
-            scrollView = $ionicScrollDelegate.$getByHandle('mmaModFeedbackScroll');
-        }
-        scrollView && scrollView.scrollTop && scrollView.scrollTop();
-    }
-
     // Listen for form submit events.
     obsSubmitted = $mmEvents.on(mmaModFeedbackEventFormSubmitted, function(data) {
         // Go to review attempt if an attempt in this quiz was finished and synced.
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 0c0110db6f4..fdd890d0349 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -16,6 +16,8 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
 
 .constant('mmaModFeedbackComponent', 'mmaModFeedback')
 .constant('mmaModFeedbackEventFormSubmitted', 'mma_mod_feedback_form_submitted')
+.constant('mmaModFeedbackAutomSyncedEvent', 'mma-mod_feedback_autom_synced')
+.constant('mmaModFeedbackSyncTime', 300000) // In milliseconds.
 
 .config(function($stateProvider) {
 
@@ -125,4 +127,6 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:showEntries', '$mmaModFeedbackHandlers.showEntriesLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModFeedback:showNonRespondents', '$mmaModFeedbackHandlers.showNonRespondentsLinksHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModFeedback', 'feedback', '$mmaModFeedbackPrefetchHandler');
+}).run(function($mmCronDelegate) {
+    $mmCronDelegate.register('mmaModFeedback', '$mmaModFeedbackHandlers.syncHandler');
 });
diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 492f9e16559..259b8151b09 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -23,9 +23,12 @@ angular.module('mm.addons.mod_feedback')
  */
 .factory('$mmaModFeedback', function($q, $mmSite, $mmSitesManager, $mmFilepool, mmaModFeedbackComponent, $mmUtil, $mmApp,
         $mmaModFeedbackOffline) {
-    var self = {},
-        FEEDBACK_MULTICHOICE_TYPE_SEP = '>>>>>',
-        FEEDBACK_LINE_SEP = '|';
+    var self = {};
+    self.FEEDBACK_LINE_SEP = '|';
+    self.FEEDBACK_MULTICHOICE_TYPE_SEP = '>>>>>';
+    self.FEEDBACK_MULTICHOICE_ADJUST_SEP = '<<<<<';
+    self.FEEDBACK_MULTICHOICE_HIDENOSELECT = 'h';
+    self.FEEDBACK_MULTICHOICERATED_VALUE_SEP = '####';
 
     /**
      * Get cache key for feedback data WS calls.
@@ -581,12 +584,12 @@ angular.module('mm.addons.mod_feedback')
                         if (itemData.hasvalue && typeof offlineValues[itemData.id] != "undefined") {
                             // Treat multichoice checkboxes.
                             if (itemData.typ == "multichoice" &&
-                                    itemData.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP)[0] == 'c') {
+                                    itemData.presentation.split(self.FEEDBACK_MULTICHOICE_TYPE_SEP)[0] == 'c') {
 
                                 offlineValues[itemData.id] = offlineValues[itemData.id].filter(function(value) {
                                     return value > 0;
                                 });
-                                itemData.rawValue = offlineValues[itemData.id].join(FEEDBACK_LINE_SEP);
+                                itemData.rawValue = offlineValues[itemData.id].join(self.FEEDBACK_LINE_SEP);
                             } else {
                                 itemData.rawValue = offlineValues[itemData.id][0];
                             }
@@ -634,12 +637,12 @@ angular.module('mm.addons.mod_feedback')
             // Helper functions by type:
             function compareDependItemMultichoice(item, dependValue) {
                 var values, choices,
-                    parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [],
+                    parts = item.presentation.split(self.FEEDBACK_MULTICHOICE_TYPE_SEP) || [],
                     subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
 
                 choices = parts[1] || '';
-                choices = choices.split(FEEDBACK_MULTICHOICE_ADJUST_SEP)[0] || '';
-                choices = choices.split(FEEDBACK_LINE_SEP) || [];
+                choices = choices.split(self.FEEDBACK_MULTICHOICE_ADJUST_SEP)[0] || '';
+                choices = choices.split(self.FEEDBACK_LINE_SEP) || [];
 
 
                 if (subtype === 'c') {
@@ -647,7 +650,7 @@ angular.module('mm.addons.mod_feedback')
                         values = [''];
                     } else {
                         item.rawValue = "" + item.rawValue;
-                        values = item.rawValue.split(FEEDBACK_LINE_SEP);
+                        values = item.rawValue.split(self.FEEDBACK_LINE_SEP);
                     }
                 } else {
                     values = [item.rawValue];
@@ -658,7 +661,7 @@ angular.module('mm.addons.mod_feedback')
                         if (values[x] == index + 1) {
                             var value = choices[index];
                             if (item.typ == 'multichoicerated') {
-                                value = value.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP)[1] || '';
+                                value = value.split(self.FEEDBACK_MULTICHOICERATED_VALUE_SEP)[1] || '';
                             }
                             if (value.trim() == dependValue) {
                                 return true;
@@ -687,10 +690,11 @@ angular.module('mm.addons.mod_feedback')
      * @param   {Object}    responses       The data to be processed the key is the field name (usually type[index]_id).
      * @param   {Boolean}   goPrevious      Whether we want to jump to previous page.
      * @param   {Boolean}   formHasErrors   Whether the form we sent has required but empty fields (only used in offline).
+     * @param   {Number}    courseId        Course ID the feedback belongs to.
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @return  {Promise}                   Promise resolved when the info is retrieved.
      */
-    self.processPage = function(feedbackId, page, responses, goPrevious, formHasErrors, siteId) {
+    self.processPage = function(feedbackId, page, responses, goPrevious, formHasErrors, courseId, siteId) {
         siteId = siteId || $mmSite.getId();
         if (!$mmApp.isOnline()) {
             // App is offline, store the action.
@@ -698,8 +702,7 @@ angular.module('mm.addons.mod_feedback')
         }
 
         // If there's already a response to be sent to the server, discard it first.
-        return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, page, false, siteId).then(function() {
-            // @todo: Sync other pages first here.
+        return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, page, siteId).then(function() {
             return self.processPageOnline(feedbackId, page, responses, goPrevious, siteId).catch(function(error) {
                 if (error && error.wserror) {
                     // The WebService has thrown an error, this means that responses cannot be submitted.
@@ -713,7 +716,7 @@ angular.module('mm.addons.mod_feedback')
 
         // Convenience function to store a message to be synchronized later.
         function storeOffline() {
-            return $mmaModFeedbackOffline.saveResponses(feedbackId, page, responses, false, siteId).then(function() {
+            return $mmaModFeedbackOffline.saveResponses(feedbackId, page, responses, courseId, siteId).then(function() {
                 // Simulate process_page response.
                 var response = {
                         jumpto: page,
@@ -807,8 +810,10 @@ angular.module('mm.addons.mod_feedback')
                     wserror: $mmUtil.isWebServiceError(error)
                 });
             }).then(function(response) {
-                // Invalidate corrent values because they will change.
-                return self.invalidateCurrentValuesData(feedbackId, site.getId()).catch(function() {
+                // Invalidate and update current values because they will change.
+                return self.invalidateCurrentValuesData(feedbackId, site.getId()).then(function() {
+                    return self.getCurrentValues(feedbackId, false, false, site.getId());
+                }).catch(function() {
                     // Ignore errors.
                 }).then(function() {
                     return response;
@@ -1095,6 +1100,23 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Invalidates feedback data except files and module info.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateFeedbackWSData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateFeedbackWSData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getFeedbackDataPrefixCacheKey(feedbackId));
+
+        });
+    };
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModFeedback#invalidateFiles.
@@ -1113,7 +1135,7 @@ angular.module('mm.addons.mod_feedback')
             var ps = [];
             // Do not invalidate feedback data before getting feedback info, we need it!
             ps.push(self.invalidateFeedbackData(courseId, siteId));
-            ps.push(self.invalidateWsCacheForKeyStartingWith(getFeedbackDataPrefixCacheKey(feedback.id), siteId));
+            ps.push(self.invalidateFeedbackWSData(feedback.id, siteId));
 
             return $q.all(ps);
         });
diff --git a/www/addons/mod/feedback/services/feedback_offline.js b/www/addons/mod/feedback/services/feedback_offline.js
index 1f427bfb8ab..97933618cda 100644
--- a/www/addons/mod/feedback/services/feedback_offline.js
+++ b/www/addons/mod/feedback/services/feedback_offline.js
@@ -20,16 +20,16 @@ angular.module('mm.addons.mod_feedback')
     var stores = [
         {
             name: mmaModFeedbackResponsesStore,
-            keyPath: ['feedbackid', 'userid', 'page'],
+            keyPath: ['feedbackid', 'page'],
             indexes: [
                 {
                     name: 'feedbackid'
                 },
                 {
-                    name: 'userid'
+                    name: 'page'
                 },
                 {
-                    name: 'page'
+                    name: 'courseid'
                 },
                 {
                     name: 'responses'
@@ -74,6 +74,21 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Get all the stored feedback responses data from all the feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackOffline#getAllFeedbackResponses
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with entries.
+     */
+    self.getAllFeedbackResponses = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().getAll(mmaModFeedbackResponsesStore);
+        });
+    };
+
     /**
      * Get all the stored responses from a certain feedback.
      *
@@ -98,14 +113,12 @@ angular.module('mm.addons.mod_feedback')
      * @name $mmaModFeedbackOffline#getFeedbackPageResponses
      * @param  {Number} feedbackId Feedback ID.
      * @param  {Number} page       Page of the form to get responses from.
-     * @param  {Number} [userId]   User ID. If not defined, site's current user.
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved with responses.
      */
-    self.getFeedbackPageResponses = function(feedbackId, page, userId, siteId) {
+    self.getFeedbackPageResponses = function(feedbackId, page, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            userId = userId || site.getUserId();
-            return site.getDb().get(mmaModFeedbackResponsesStore, [feedbackId, userId, page]);
+            return site.getDb().get(mmaModFeedbackResponsesStore, [feedbackId, page]);
         });
     };
 
@@ -117,14 +130,12 @@ angular.module('mm.addons.mod_feedback')
      * @name $mmaModFeedbackOffline#deleteFeedbackPageResponses
      * @param  {Number} feedbackId Feedback ID.
      * @param  {Number} page       Page of the form to delete responses from.
-     * @param  {Number} [userId]   User ID. If not defined, site's current user.
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved if deleted, rejected if failure.
      */
-    self.deleteFeedbackPageResponses = function(feedbackId, page, userId, siteId) {
+    self.deleteFeedbackPageResponses = function(feedbackId, page, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            userId = userId || site.getUserId();
-            return site.getDb().remove(mmaModFeedbackResponsesStore, [feedbackId, userId, page]);
+            return site.getDb().remove(mmaModFeedbackResponsesStore, [feedbackId, page]);
         });
     };
 
@@ -137,19 +148,18 @@ angular.module('mm.addons.mod_feedback')
      * @param  {Number} feedbackId   Feedback ID.
      * @param  {Number} page         The page being processed.
      * @param  {Object} responses    The data to be processed the key is the field name (usually type[index]_id)
-     * @param  {Number} [userId]     User ID. If not defined, site's current user.
+     * @param  {Number} courseId     Course ID the feedback belongs to.
      * @param  {String} [siteId]     Site ID. If not defined, current site.
      * @return {Promise}             Promise resolved if stored, rejected if failure.
      */
-    self.saveResponses = function(feedbackId, page, responses, userId, siteId) {
+    self.saveResponses = function(feedbackId, page, responses, courseId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            userId = userId || site.getUserId();
 
             var now = $mmUtil.timestamp(),
                 entry = {
                     feedbackid: feedbackId,
-                    userid: userId,
                     page: page,
+                    courseid: courseId,
                     responses: responses,
                     timemodified: now
                 };
diff --git a/www/addons/mod/feedback/services/feedback_sync.js b/www/addons/mod/feedback/services/feedback_sync.js
new file mode 100644
index 00000000000..2ffd1ea81fa
--- /dev/null
+++ b/www/addons/mod/feedback/services/feedback_sync.js
@@ -0,0 +1,234 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_feedback')
+
+/**
+ * Feedback synchronization service.
+ *
+ * @module mm.addons.mod_feedback
+ * @ngdoc service
+ * @name $mmaModFeedbackSync
+ */
+.factory('$mmaModFeedbackSync', function($q, $log, $mmApp, $mmSitesManager, $mmaModFeedbackOffline, $mmSite, $mmEvents, $mmSync,
+        $mmLang, mmaModFeedbackComponent, $mmaModFeedback, $translate, mmaModFeedbackAutomSyncedEvent, mmaModFeedbackSyncTime,
+        $mmCourse, $mmSyncBlock, $mmUtil) {
+
+    $log = $log.getInstance('$mmaModFeedbackSync');
+
+    // Inherit self from $mmSync.
+    var self = $mmSync.createChild(mmaModFeedbackComponent, mmaModFeedbackSyncTime);
+
+    /**
+     * Try to synchronize all feedback from current site that need it and haven't been synchronized in a while.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackSync#syncAllFeedback
+     * @param {String} [siteId] Site ID to sync. If not defined, sync all sites.
+     * @return {Promise}        Promise resolved when the sync is done.
+     */
+    self.syncAllFeedback = function(siteId) {
+        if (!$mmApp.isOnline()) {
+            $log.debug('Cannot sync all feedback because device is offline.');
+            return $q.reject();
+        }
+
+        var promise;
+        if (!siteId) {
+            // No site ID defined, sync all sites.
+            $log.debug('Try to sync feedback in all sites.');
+            promise = $mmSitesManager.getSitesIds();
+        } else {
+            $log.debug('Try to sync feedback in site ' + siteId);
+            promise = $q.when([siteId]);
+        }
+
+        return promise.then(function(siteIds) {
+            var sitePromises = [];
+
+            angular.forEach(siteIds, function(siteId) {
+                // Sync all new responses.
+                sitePromises.push($mmaModFeedbackOffline.getAllFeedbackResponses(siteId).then(function(responses) {
+                    var promises = {};
+
+                    // Do not sync same feedback twice.
+                    for (var i in responses) {
+                        var response = responses[i];
+
+                        if (typeof promises[response.feedbackid] != 'undefined') {
+                            continue;
+                        }
+
+                        promises[response.feedbackid] = self.syncFeedbackIfNeeded(response.feedbackid, siteId)
+                                .then(function(result) {
+                            if (result && result.updated) {
+                                // Sync successful, send event.
+                                $mmEvents.trigger(mmaModFeedbackAutomSyncedEvent, {
+                                    siteid: siteId,
+                                    feedbackid: response.feedbackid,
+                                    userid: response.userid,
+                                    warnings: result.warnings
+                                });
+                            }
+                        });
+                    }
+                    // Promises will be an object so, convert to an array first;
+                    promises = $mmUtil.objectToArray(promises);
+
+                    return $q.all(promises);
+                }));
+            });
+
+            return $q.all(sitePromises);
+        });
+    };
+
+    /**
+     * Sync a feedback only if a certain time has passed since the last time.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackSync#syncFeedbackIfNeeded
+     * @param  {Number} feedbackId  Feedback ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved when the feedback is synced or if it doesn't need to be synced.
+     */
+    self.syncFeedbackIfNeeded = function(feedbackId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        return self.isSyncNeeded(feedbackId, siteId).then(function(needed) {
+            if (needed) {
+                return self.syncFeedback(feedbackId, siteId);
+            }
+        });
+    };
+
+    /**
+     * Synchronize all offline responses of a feedback.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackSync#syncFeedback
+     * @param  {Number} feedbackId  Feedback ID to be synced.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved if sync is successful, rejected otherwise.
+     */
+    self.syncFeedback = function(feedbackId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var syncPromise,
+            feedback,
+            courseId,
+            syncId = feedbackId,
+            result = {
+                warnings: [],
+                updated: false
+            };
+
+        if (self.isSyncing(syncId, siteId)) {
+            // There's already a sync ongoing for this feedback, return the promise.
+            return self.getOngoingSync(syncId, siteId);
+        }
+
+        // Verify that feedback isn't blocked.
+        if ($mmSyncBlock.isBlocked(mmaModFeedbackComponent, syncId, siteId)) {
+            $log.debug('Cannot sync feedback ' + feedbackId + ' because it is blocked.');
+            var modulename = $mmCourse.translateModuleName('feedback');
+            return $mmLang.translateAndReject('mm.core.errorsyncblocked', {$a: modulename});
+        }
+
+        $log.debug('Try to sync feedback ' + feedbackId);
+
+        // Get offline responses to be sent.
+        syncPromise = $mmaModFeedbackOffline.getFeedbackResponses(feedbackId, siteId).catch(function() {
+            // No offline data found, return empty object.
+            return [];
+        }).then(function(responses) {
+            if (!responses.length) {
+                // Nothing to sync.
+                return;
+            } else if (!$mmApp.isOnline()) {
+                // Cannot sync in offline.
+                return $q.reject();
+            }
+
+            courseId = responses[0].courseid;
+
+            return $mmaModFeedback.getFeedbackById(courseId, feedbackId, siteId).then(function(feedbackData) {
+                feedback = feedbackData;
+
+                // Sort by page.
+                responses.sort(function (a, b) {
+                    return a.page - b.page;
+                });
+
+                responses = responses.map(function (data) {
+                    return {
+                        func: processPage,
+                        params: [feedbackId, data, siteId, result],
+                        blocking: true
+                    };
+                });
+
+                // Execute all the processes in order to solve dependencies.
+                return $mmUtil.executeOrderedPromises(responses);
+            });
+        }).then(function() {
+            if (result.updated) {
+                // Data has been sent to server. Now invalidate the WS calls.
+                return $mmaModFeedback.invalidateFeedbackWSData(feedbackId, siteId).catch(function() {
+                    // Ignore errors.
+                });
+            }
+        }).then(function() {
+            // Sync finished, set sync time.
+            return self.setSyncTime(syncId, siteId).catch(function() {
+                // Ignore errors.
+            });
+        }).then(function() {
+            // All done, return the warnings.
+            return result;
+        });
+
+        return self.addOngoingSync(syncId, syncPromise, siteId);
+    };
+
+    // Convenience function to sync process page calls.
+    function processPage(feedbackId, data, siteId, result) {
+        return $mmaModFeedback.processPageOnline(feedbackId, data.page, data.responses, false, siteId).then(function() {
+            result.updated = true;
+
+            return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, data.page, siteId);
+        }).catch(function(error) {
+            if (error && error.wserror) {
+                // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
+                result.updated = true;
+                return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, data.page, siteId).then(function() {
+                    // Responses deleted, add a warning.
+                    result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
+                        component: $mmCourse.translateModuleName('feedback'),
+                        name: feedback.name,
+                        error: error.error
+                    }));
+                });
+            } else {
+                // Couldn't connect to server, reject.
+                return $q.reject(error && error.error);
+            }
+        });
+    }
+
+    return self;
+});
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index bc9d08b8bbd..24d7f685f6f 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_feedback')
  * @name $mmaModFeedbackHandlers
  */
 .factory('$mmaModFeedbackHandlers', function($mmCourse, $mmaModFeedback, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
-        mmaModFeedbackComponent, $mmaModFeedbackPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded,
+        mmaModFeedbackComponent, $mmaModFeedbackPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded, $mmaModFeedbackSync,
         mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, $mmContentLinkHandlerFactory) {
     var self = {};
 
@@ -376,5 +376,58 @@ angular.module('mm.addons.mod_feedback')
         }];
     };
 
+    /**
+     * Synchronization handler.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedbackHandlers#syncHandler
+     */
+    self.syncHandler = function() {
+
+        var self = {};
+
+        /**
+         * Execute the process.
+         * Receives the ID of the site affected, undefined for all sites.
+         *
+         * @param  {String} [siteId] ID of the site affected, undefined for all sites.
+         * @return {Promise}         Promise resolved when done, rejected if failure.
+         */
+        self.execute = function(siteId) {
+            return $mmaModFeedbackSync.syncAllFeedback(siteId);
+        };
+
+        /**
+         * Get the time between consecutive executions.
+         *
+         * @return {Number} Time between consecutive executions (in ms).
+         */
+        self.getInterval = function() {
+            return 600000; // 10 minutes.
+        };
+
+        /**
+         * Whether it's a synchronization process or not.
+         *
+         * @return {Boolean} True if is a sync process, false otherwise.
+         */
+        self.isSync = function() {
+            return true;
+        };
+
+        /**
+         * Whether the process uses network or not.
+         *
+         * @return {Boolean} True if uses network, false otherwise.
+         */
+        self.usesNetwork = function() {
+            return true;
+        };
+
+        return self;
+    };
+
+
     return self;
 });
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index a108acc94c5..3a7bc56233e 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -26,12 +26,7 @@ angular.module('mm.addons.mod_feedback')
     var self = {},
         MODE_RESPONSETIME = 1,
         MODE_COURSE = 2,
-        MODE_CATEGORY = 3,
-        FEEDBACK_LINE_SEP = '|',
-        FEEDBACK_MULTICHOICE_TYPE_SEP = '>>>>>',
-        FEEDBACK_MULTICHOICE_ADJUST_SEP = '<<<<<',
-        FEEDBACK_MULTICHOICE_HIDENOSELECT = 'h',
-        FEEDBACK_MULTICHOICERATED_VALUE_SEP = '####';
+        MODE_CATEGORY = 3;
 
     /**
      * Get activity feedback group info to be shown on templates.
@@ -198,7 +193,7 @@ angular.module('mm.addons.mod_feedback')
         function getItemFormNumeric(item) {
             item.template = 'numeric';
 
-            var range = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+            var range = item.presentation.split($mmaModFeedback.FEEDBACK_LINE_SEP) || [];
             item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '';
             item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '';
             item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
@@ -208,7 +203,7 @@ angular.module('mm.addons.mod_feedback')
 
         function getItemFormTextfield(item) {
             item.template = 'textfield';
-            item.length = item.presentation.split(FEEDBACK_LINE_SEP)[1] || 255;
+            item.length = item.presentation.split($mmaModFeedback.FEEDBACK_LINE_SEP)[1] || 255;
             item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
             return item;
         }
@@ -220,13 +215,13 @@ angular.module('mm.addons.mod_feedback')
         }
 
         function getItemFormMultichoice(item) {
-            var parts = item.presentation.split(FEEDBACK_MULTICHOICE_TYPE_SEP) || [];
+            var parts = item.presentation.split($mmaModFeedback.FEEDBACK_MULTICHOICE_TYPE_SEP) || [];
             item.subtype = parts.length > 0 && parts[0] ? parts[0] : 'r';
             item.template = 'multichoice-' + item.subtype;
 
             item.presentation = parts.length > 1 ? parts[1] : '';
             if (item.subtype != 'd') {
-                parts = item.presentation.split(FEEDBACK_MULTICHOICE_ADJUST_SEP) || [];
+                parts = item.presentation.split($mmaModFeedback.FEEDBACK_MULTICHOICE_ADJUST_SEP) || [];
                 item.presentation = parts.length > 0 ? parts[0] : '';
                 // Horizontal are not supported right now.
                 //item.horizontal = parts.length > 1 && !!parts[1];
@@ -234,14 +229,14 @@ angular.module('mm.addons.mod_feedback')
                 item.class = "item-select";
             }
 
-            item.choices = item.presentation.split(FEEDBACK_LINE_SEP) || [];
+            item.choices = item.presentation.split($mmaModFeedback.FEEDBACK_LINE_SEP) || [];
             item.choices = item.choices.map(function(choice, index) {
-                var weightValue = choice.split(FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''];
+                var weightValue = choice.split($mmaModFeedback.FEEDBACK_MULTICHOICERATED_VALUE_SEP) || [''];
                 choice = weightValue.length == 1 ? weightValue[0] : '(' + weightValue[0] + ') ' + weightValue[1];
                 return {value: index + 1, label: choice};
             });
 
-            if (item.subtype === 'r' && item.options.search(FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
+            if (item.subtype === 'r' && item.options.search($mmaModFeedback.FEEDBACK_MULTICHOICE_HIDENOSELECT) == -1) {
                 item.choices.unshift({value: 0, label: $translate.instant('mma.mod_feedback.not_selected')});
                 item.value = typeof item.rawValue != "undefined" ? parseInt(item.rawValue, 10) : 0;
             } else if (item.subtype === 'd') {
@@ -252,7 +247,7 @@ angular.module('mm.addons.mod_feedback')
                     item.value = "";
                 } else {
                     item.rawValue = "" + item.rawValue;
-                    var values = item.rawValue.split(FEEDBACK_LINE_SEP);
+                    var values = item.rawValue.split($mmaModFeedback.FEEDBACK_LINE_SEP);
                     angular.forEach(item.choices, function(choice) {
                         for (var x in values) {
                             if (choice.value == values[x]) {
@@ -313,7 +308,7 @@ angular.module('mm.addons.mod_feedback')
                         value = itemData.value || 0;
                     } else {
                         name = nameTemp;
-                        value = itemData.value || "";
+                        value = itemData.value || itemData.value  == 0 ? itemData.value : "";
                     }
 
                     answered = !!value;
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 3b87c7b83a8..74bff999918 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -15,6 +15,11 @@
         <mm-loading hide-until="feedbackLoaded">
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
+            <!-- Feedback responses found to be synchronized -->
+            <div class="mm-warning-card-icon" ng-if="hasOffline">
+                <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
+            </div>
+
             <div class="mm-warning-card-icon" ng-if="access.cancomplete && !access.isopen">
                 <i class="icon ion-close-circled padding"></i> {{ 'mma.mod_feedback.feedback_is_not_open' | translate }}
             </div>

From 1818a5518b3b9c01927725b480f879215f79f039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 5 Apr 2017 14:17:56 +0200
Subject: [PATCH 072/218] MOBILE-2009 feedback: Special sync cases

---
 www/addons/mod/feedback/services/feedback.js  | 106 ++++++++++++++++++
 .../mod/feedback/services/feedback_sync.js    |  67 ++++++++---
 2 files changed, 155 insertions(+), 18 deletions(-)

diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 259b8151b09..1d61b96f7c2 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -156,6 +156,26 @@ angular.module('mm.addons.mod_feedback')
         return getNonRespondentsDataPrefixCacheKey(feedbackId) + groupId;
     }
 
+    /**
+     * Get prefix cache key for feedback current completed temp data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getCurrentCompletedTimeModifiedDataCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':completedtime:';
+    }
+
+    /**
+     * Get prefix cache key for feedback completion data WS calls.
+     *
+     * @param {Number} feedbackId Feedback ID.
+     * @return {String}         Cache key.
+     */
+    function getCompletedDataCacheKey(feedbackId) {
+        return getFeedbackDataPrefixCacheKey(feedbackId) + ':completed:';
+    }
+
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
      *
@@ -1100,6 +1120,92 @@ angular.module('mm.addons.mod_feedback')
         });
     };
 
+    /**
+     * Returns the temporary completion timemodified for the current user.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#getCurrentCompletedTimeModified
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.getCurrentCompletedTimeModified = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getCurrentCompletedTimeModifiedDataCacheKey(feedbackId)
+                };
+
+            return site.read('mod_feedback_get_current_completed_tmp', params, preSets).then(function(response) {
+                if (response && typeof response.feedback != "undefined" && typeof response.feedback.timemodified != "undefined") {
+                    return response.feedback.timemodified;
+                }
+                return 0;
+            }).catch(function() {
+                // Ignore errors.
+                return 0;
+            });
+        });
+    };
+
+    /**
+     * Invalidates temporary completion timemodified data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateCurrentCompletedInfoData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidategetCurrentCompletedTimeModifiedData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getCurrentCompletedTimeModifiedDataCacheKey(feedbackId));
+        });
+    };
+
+    /**
+     * Returns if feedback has been completed
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#isCompleted
+     * @param   {Number}    feedbackId      Feedback ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the info is retrieved.
+     */
+    self.isCompleted = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    feedbackid: feedbackId
+                },
+                preSets = {
+                    cacheKey: getCompletedDataCacheKey(feedbackId)
+                };
+
+            return $mmUtil.promiseWorks(site.read('mod_feedback_get_last_completed', params, preSets));
+        });
+    };
+
+    /**
+     * Invalidates temporary completion timemodified data.
+     *
+     * @module mm.addons.mod_feedback
+     * @ngdoc method
+     * @name $mmaModFeedback#invalidateCurrentCompletedInfoData
+     * @param  {Number} feedbackId   Feedback ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateCompletedData = function(feedbackId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getCompletedDataCacheKey(feedbackId));
+        });
+    };
+
     /**
      * Invalidates feedback data except files and module info.
      *
diff --git a/www/addons/mod/feedback/services/feedback_sync.js b/www/addons/mod/feedback/services/feedback_sync.js
index 2ffd1ea81fa..c00b76490f0 100644
--- a/www/addons/mod/feedback/services/feedback_sync.js
+++ b/www/addons/mod/feedback/services/feedback_sync.js
@@ -169,22 +169,48 @@ angular.module('mm.addons.mod_feedback')
             return $mmaModFeedback.getFeedbackById(courseId, feedbackId, siteId).then(function(feedbackData) {
                 feedback = feedbackData;
 
-                // Sort by page.
-                responses.sort(function (a, b) {
-                    return a.page - b.page;
-                });
+                if (!feedback.multiple_submit) {
+                    // If it does not admit multiple submits, check if it is completed to know if we can submit.
+                    return $mmaModFeedback.isCompleted(feedbackId);
+                } else {
+                    return false;
+                }
+            }).then(function(isCompleted) {
+                if (isCompleted) {
+                    // Cannot submit again, delete resposes.
+                    var promises = [];
 
-                responses = responses.map(function (data) {
-                    return {
-                        func: processPage,
-                        params: [feedbackId, data, siteId, result],
-                        blocking: true
-                    };
-                });
+                    angular.forEach(responses, function(data) {
+                        promises.push($mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, data.page, siteId));
+                    });
 
-                // Execute all the processes in order to solve dependencies.
-                return $mmUtil.executeOrderedPromises(responses);
-            });
+                    result.updated = true;
+                    result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
+                        component: $mmCourse.translateModuleName('feedback'),
+                        name: feedback.name,
+                        error: $translate.instant('mma.mod_feedback.this_feedback_is_already_submitted')
+                    }));
+                    return $q.all(promises);
+                }
+
+                return $mmaModFeedback.getCurrentCompletedTimeModified(feedbackId, siteId).then(function(timemodified) {
+                    // Sort by page.
+                    responses.sort(function (a, b) {
+                        return a.page - b.page;
+                    });
+
+                    responses = responses.map(function (data) {
+                        return {
+                            func: processPage,
+                            params: [feedback, data, siteId, timemodified, result],
+                            blocking: true
+                        };
+                    });
+
+                    // Execute all the processes in order to solve dependencies.
+                    return $mmUtil.executeOrderedPromises(responses);
+                });
+            })
         }).then(function() {
             if (result.updated) {
                 // Data has been sent to server. Now invalidate the WS calls.
@@ -206,16 +232,21 @@ angular.module('mm.addons.mod_feedback')
     };
 
     // Convenience function to sync process page calls.
-    function processPage(feedbackId, data, siteId, result) {
-        return $mmaModFeedback.processPageOnline(feedbackId, data.page, data.responses, false, siteId).then(function() {
+    function processPage(feedback, data, siteId, timemodified, result) {
+        // Delete all pages that are submitted before changing website.
+        if (timemodified > data.timemodified) {
+            return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedback.id, data.page, siteId);
+        }
+
+        return $mmaModFeedback.processPageOnline(feedback.id, data.page, data.responses, false, siteId).then(function() {
             result.updated = true;
 
-            return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, data.page, siteId);
+            return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedback.id, data.page, siteId);
         }).catch(function(error) {
             if (error && error.wserror) {
                 // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
                 result.updated = true;
-                return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedbackId, data.page, siteId).then(function() {
+                return $mmaModFeedbackOffline.deleteFeedbackPageResponses(feedback.id, data.page, siteId).then(function() {
                     // Responses deleted, add a warning.
                     result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                         component: $mmCourse.translateModuleName('feedback'),

From b2b6a2b15ee57aefbed1ca77e786c655c354a87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 7 Apr 2017 16:03:24 +0200
Subject: [PATCH 073/218] MOBILE-2009 feedback: Go offline if a WS fails

---
 www/addons/mod/feedback/controllers/form.js | 27 ++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index acb1bc2ac9e..ad558973384 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackFormCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $timeout, $mmSite, $state,
             mmaModFeedbackComponent, $mmEvents, $mmApp, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper, $ionicScrollDelegate,
-            $ionicHistory, $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted, $translate, $mmaModFeedbackSync) {
+            $mmContentLinksHelper,mmaModFeedbackEventFormSubmitted, $translate, $mmaModFeedbackSync) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -56,7 +56,14 @@ angular.module('mm.addons.mod_feedback')
             $scope.title = feedback.name || $scope.title;
             $scope.feedback = feedback;
 
-            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, offline, true);
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, offline, true).catch(function(error) {
+                if (!offline && !$mmUtil.isWebServiceError(error)) {
+                    // If it fails, go offline.
+                    offline = true;
+                    return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, true);
+                }
+                return $q.reject(error);
+            });
         }).then(function(accessData) {
             $scope.access = accessData;
 
@@ -66,6 +73,13 @@ angular.module('mm.addons.mod_feedback')
                 $scope.preview = true;
                 return $q.when(0);
             }
+        }).catch(function(error) {
+            if (!offline && !$mmUtil.isWebServiceError(error)) {
+                // If it fails, go offline.
+                offline = true;
+                return $mmaModFeedback.getResumePage(feedback.id, true);
+            }
+            return $q.reject(error);
         }).then(function(page) {
             page = page || 0;
             return fetchFeedbackPageData(page);
@@ -87,7 +101,14 @@ angular.module('mm.addons.mod_feedback')
         } else {
             currentPage = page;
 
-            promise = $mmaModFeedback.getPageItemsWithValues(feedback.id, page, offline, true).then(function(response) {
+            promise = $mmaModFeedback.getPageItemsWithValues(feedback.id, page, offline, true).catch(function(error) {
+                if (!offline && !$mmUtil.isWebServiceError(error)) {
+                    // If it fails, go offline.
+                    offline = true;
+                    return $mmaModFeedback.getPageItemsWithValues(feedback.id, page, true);
+                }
+                return $q.reject(error);
+            }).then(function(response) {
                 $scope.hasPrevPage = !!response.hasprevpage;
                 $scope.hasNextPage = !!response.hasnextpage;
 

From 28dc03b8d5f9320b8d74143e19b7a8e042d082c0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 11 Apr 2017 12:31:27 +0200
Subject: [PATCH 074/218] MOBILE-2085 prefetch: Fix mark outdated in offline
 when it shouldn't

---
 .../course/services/prefetchdelegate.js       | 120 +++++++++++++-----
 1 file changed, 90 insertions(+), 30 deletions(-)

diff --git a/www/core/components/course/services/prefetchdelegate.js b/www/core/components/course/services/prefetchdelegate.js
index 49bc7e73102..fb1a9c691be 100644
--- a/www/core/components/course/services/prefetchdelegate.js
+++ b/www/core/components/course/services/prefetchdelegate.js
@@ -14,6 +14,8 @@
 
 angular.module('mm.core')
 
+.constant('mmCoreCheckUpdatesTimesStore', 'check_updates_times')
+
 /**
  * Delegate to register prefetch handlers.
  *
@@ -30,9 +32,18 @@ angular.module('mm.core')
  *
  * To see the methods that must provide the prefetch handler see {@link $mmCoursePrefetchDelegateProvider#registerPrefetchHandler}.
  */
-.provider('$mmCoursePrefetchDelegate', function() {
+.provider('$mmCoursePrefetchDelegate', function($mmSitesFactoryProvider, mmCoreCheckUpdatesTimesStore) {
     var prefetchHandlers = {},
-        self = {};
+        self = {},
+        stores = [
+            {
+                name: mmCoreCheckUpdatesTimesStore,
+                keyPath: 'courseid',
+                indexes: []
+            }
+        ];
+
+    $mmSitesFactoryProvider.registerStores(stores);
 
     /**
      * Register a prefetch handler.
@@ -100,7 +111,8 @@ angular.module('mm.core')
     };
 
     self.$get = function($q, $log, $mmSite, $mmUtil, $mmFilepool, $mmEvents, $mmCourse, mmCoreDownloaded, mmCoreDownloading,
-                mmCoreNotDownloaded, mmCoreOutdated, mmCoreNotDownloadable, mmCoreEventSectionStatusChanged, $mmFS, md5) {
+                mmCoreNotDownloaded, mmCoreOutdated, mmCoreNotDownloadable, mmCoreEventSectionStatusChanged, $mmFS, md5,
+                $mmSitesManager, mmCoreCheckUpdatesTimesStore) {
         var enabledHandlers = {},
             self = {},
             deferreds = {},
@@ -423,9 +435,7 @@ angular.module('mm.core')
             }
 
             promise = createToCheckList(modules, courseId).then(function(data) {
-                var result = {},
-                    params,
-                    preSets;
+                var result = {};
 
                 // Mark as false the modules that cannot use check updates WS.
                 angular.forEach(data.cannotUse, function(module) {
@@ -437,34 +447,49 @@ angular.module('mm.core')
                     return result;
                 }
 
-                params = {
-                    courseid: courseId,
-                    tocheck: data.toCheck
-                };
-                preSets = {
-                    cacheKey: getCourseUpdatesCacheKey(courseId),
-                    getEmergencyCacheUsingCacheKey: true,
-                    uniqueCacheKey: true
-                };
+                // Get the site, maybe the user changed site.
+                return $mmSitesManager.getSite(siteId).then(function(site) {
+                    var params = {
+                            courseid: courseId,
+                            tocheck: data.toCheck
+                        },
+                        preSets = {
+                            cacheKey: getCourseUpdatesCacheKey(courseId),
+                            emergencyCache: false, // If downloaded data has changed and offline, just fail. See MOBILE-2085.
+                            uniqueCacheKey: true
+                        };
 
-                return $mmSite.read('core_course_check_updates', params, preSets).then(function(response) {
-                    if (!response || typeof response.instances == 'undefined') {
-                        return $q.reject();
-                    }
+                    return site.read('core_course_check_updates', params, preSets).then(function(response) {
+                        if (!response || typeof response.instances == 'undefined') {
+                            return $q.reject();
+                        }
 
-                    // Format the response to index it by module ID.
-                    angular.forEach(response.instances, function(instance) {
-                        result[instance.id] = instance;
-                    });
+                        // Store the last execution of the check updates call.
+                        site.getDb().insert(mmCoreCheckUpdatesTimesStore, {
+                            courseid: courseId,
+                            time: $mmUtil.timestamp()
+                        });
 
-                    // Treat warnings, adding the not supported modules.
-                    angular.forEach(response.warnings, function(warning) {
-                        if (warning.warningcode == 'missingcallback') {
-                            result[warning.itemid] = false;
-                        }
-                    });
+                        return treatCheckUpdatesResult(data.toCheck, response, result);
+                    }).catch(function(error) {
+                        // Cannot get updates. Get the cached entries but discard the modules with a download time higher
+                        // than the last execution of check updates.
+                        return site.getDb().get(mmCoreCheckUpdatesTimesStore, courseId).then(function(entry) {
+                            preSets.getCacheUsingCacheKey = true;
+                            preSets.omitExpires = true;
+
+                            return site.read('core_course_check_updates', params, preSets).then(function(response) {
+                                if (!response || typeof response.instances == 'undefined') {
+                                    return $q.reject(error);
+                                }
 
-                    return result;
+                                return treatCheckUpdatesResult(data.toCheck, response, result, entry.time);
+                            });
+                        }, function() {
+                            // No previous executions, return result as it is.
+                            return result;
+                        });
+                    });
                 });
             }).finally(function() {
                 // Get updates finished, delete the promise.
@@ -475,6 +500,41 @@ angular.module('mm.core')
             return promise;
         };
 
+        /**
+         * Treat the result of the check updates WS call.
+         *
+         * @param  {Object[]} toCheckList  List of modules to check (from createToCheckList).
+         * @param  {Object} response       WS call response.
+         * @param  {Object} result         Object where to store the result.
+         * @param  {Number} [previousTime] Time of the previous check updates execution. If set, modules downloaded
+         *                                 after this time will be ignored.
+         * @return {Object}                Result.
+         */
+        function treatCheckUpdatesResult(toCheckList, response, result, previousTime) {
+            // Format the response to index it by module ID.
+            angular.forEach(response.instances, function(instance) {
+                result[instance.id] = instance;
+            });
+
+            // Treat warnings, adding the not supported modules.
+            angular.forEach(response.warnings, function(warning) {
+                if (warning.warningcode == 'missingcallback') {
+                    result[warning.itemid] = false;
+                }
+            });
+
+            if (previousTime) {
+                // Remove from the list the modules downloaded after previousTime.
+                angular.forEach(toCheckList, function(entry) {
+                    if (result[entry.id] && entry.since > previousTime) {
+                        delete result[entry.id];
+                    }
+                });
+            }
+
+            return result;
+        }
+
         /**
          * Check for updates in a course.
          *

From 26857ac30cc11ce745f89b6d80335675becf6f98 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 12 Apr 2017 15:56:32 +0200
Subject: [PATCH 075/218] MOBILE-2060 contentlinks: Fix content links when the
 app is closed

---
 www/core/components/contentlinks/services/helper.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/core/components/contentlinks/services/helper.js b/www/core/components/contentlinks/services/helper.js
index 198ef6ab0c1..f93fec07c69 100644
--- a/www/core/components/contentlinks/services/helper.js
+++ b/www/core/components/contentlinks/services/helper.js
@@ -22,7 +22,7 @@ angular.module('mm.core.contentlinks')
  * @name $mmContentLinksHelper
  */
 .factory('$mmContentLinksHelper', function($log, $ionicHistory, $state, $mmSite, $mmContentLinksDelegate, $mmUtil, $translate,
-            $mmCourseHelper, $mmSitesManager, $q, $mmLoginHelper, $mmText, mmCoreConfigConstants, $mmCourse,
+            $mmCourseHelper, $mmSitesManager, $q, $mmLoginHelper, $mmText, mmCoreConfigConstants, $mmCourse, $mmApp,
             $mmContentLinkHandlerFactory) {
 
     $log = $log.getInstance('$mmContentLinksHelper');
@@ -196,8 +196,11 @@ angular.module('mm.core.contentlinks')
             url = url.replace(username + '@', ''); // Remove the username from the URL.
         }
 
-        // Check if the site is stored.
-        $mmSitesManager.getSiteIdsFromUrl(url, false, username).then(function(siteIds) {
+        // Wait for the app to be ready.
+        $mmApp.ready().then(function() {
+            // Check if the site is stored.
+            return $mmSitesManager.getSiteIdsFromUrl(url, false, username);
+        }).then(function(siteIds) {
             if (siteIds.length) {
                 modal.dismiss(); // Dismiss modal so it doesn't collide with confirms.
                 return self.handleLink(url, username).then(function(treated) {

From 5c3105c818f50a37ec519a25b8f78618e784f6d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 10 Apr 2017 12:53:22 +0200
Subject: [PATCH 076/218] MOBILE-2074 feedback: Implement Captcha challenge

---
 www/addons/mod/feedback/controllers/form.js | 44 +++++++++++++++------
 www/addons/mod/feedback/lang/en.json        |  1 +
 www/addons/mod/feedback/services/helper.js  | 28 ++++++++++++-
 www/addons/mod/feedback/templates/form.html | 12 +++++-
 4 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index ad558973384..d8c645327f8 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -32,7 +32,6 @@ angular.module('mm.addons.mod_feedback')
         siteAfterSubmit,
         scrollView,
         onlineObserver,
-        offline = false,
         submitted = false,
         originalData,
         blockData;
@@ -42,13 +41,14 @@ angular.module('mm.addons.mod_feedback')
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
     $scope.preview = !!$stateParams.preview;
+    $scope.offline = false;
 
     // Block leaving the view, we want to save changes before leaving.
     blockData = $mmUtil.blockLeaveView($scope, leavePlayer);
 
     // Convenience function to get feedback data.
     function fetchFeedbackFormData() {
-        offline = !$mmApp.isOnline();
+        $scope.offline = !$mmApp.isOnline();
 
         return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
             feedback = feedbackData;
@@ -56,10 +56,10 @@ angular.module('mm.addons.mod_feedback')
             $scope.title = feedback.name || $scope.title;
             $scope.feedback = feedback;
 
-            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, offline, true).catch(function(error) {
-                if (!offline && !$mmUtil.isWebServiceError(error)) {
+            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, $scope.offline, true).catch(function(error) {
+                if (!$scope.offline && !$mmUtil.isWebServiceError(error)) {
                     // If it fails, go offline.
-                    offline = true;
+                    $scope.offline = true;
                     return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, true);
                 }
                 return $q.reject(error);
@@ -68,15 +68,16 @@ angular.module('mm.addons.mod_feedback')
             $scope.access = accessData;
 
             if (!$scope.preview && accessData.cansubmit && !accessData.isempty) {
-                return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id, offline, true) : $q.when(currentPage);
+                return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id, $scope.offline, true) :
+                    $q.when(currentPage);
             } else {
                 $scope.preview = true;
                 return $q.when(0);
             }
         }).catch(function(error) {
-            if (!offline && !$mmUtil.isWebServiceError(error)) {
+            if (!$scope.offline && !$mmUtil.isWebServiceError(error)) {
                 // If it fails, go offline.
-                offline = true;
+                $scope.offline = true;
                 return $mmaModFeedback.getResumePage(feedback.id, true);
             }
             return $q.reject(error);
@@ -101,10 +102,10 @@ angular.module('mm.addons.mod_feedback')
         } else {
             currentPage = page;
 
-            promise = $mmaModFeedback.getPageItemsWithValues(feedback.id, page, offline, true).catch(function(error) {
-                if (!offline && !$mmUtil.isWebServiceError(error)) {
+            promise = $mmaModFeedback.getPageItemsWithValues(feedback.id, page, $scope.offline, true).catch(function(error) {
+                if (!$scope.offline && !$mmUtil.isWebServiceError(error)) {
                     // If it fails, go offline.
-                    offline = true;
+                    $scope.offline = true;
                     return $mmaModFeedback.getPageItemsWithValues(feedback.id, page, true);
                 }
                 return $q.reject(error);
@@ -217,6 +218,25 @@ angular.module('mm.addons.mod_feedback')
         }
     };
 
+    // Request another captcha.
+    $scope.requestCaptcha = function(item) {
+        var modal = $mmUtil.showModalLoading();
+        $mmaModFeedback.getPageItems(feedback.id, currentPage).then(function(response) {
+            for (var x in response.items) {
+                if (response.items[x].typ == 'captcha') {
+                    response.items[x] = $mmaModFeedbackHelper.getItemForm(response.items[x], false);
+                    if (response.items[x].captcha) {
+                        item.value = "";
+                        item.captcha = response.items[x].captcha;
+                    }
+                    break;
+                }
+            }
+        }).finally(function() {
+            modal.dismiss();
+        });
+    };
+
     // Function to link implemented features.
     $scope.openFeature = function(feature) {
         $mmaModFeedbackHelper.openFeature(feature, module, courseId);
@@ -235,7 +255,7 @@ angular.module('mm.addons.mod_feedback')
 
     // Refresh online status when changes.
     onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
-        offline = !online;
+        $scope.offline = !online;
     });
 
     $scope.$on('$destroy', function() {
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 5efc3a66ed8..e0dc3905876 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -3,6 +3,7 @@
     "anonymous": "Anonymous",
     "anonymous_entries": "Anonymous entries ({{$a}})",
     "average": "Average",
+    "captchaofflinewarning" : "Feedback with captcha cannot be completed in offline mode or with the server down.",
     "complete_the_form": "Answer the questions...",
     "completed_feedbacks": "Submitted answers",
     "continue_the_form": "Continue the form",
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 3a7bc56233e..8da69f3f577 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -265,6 +265,15 @@ angular.module('mm.addons.mod_feedback')
         }
 
         function getItemFormCaptcha(item) {
+            var data = $mmText.parseJSON(item.otherdata);
+            if (data && data.length > 3) {
+                item.captcha = {
+                    challengehash: data[0],
+                    imageurl: data[1],
+                    jsurl: data[2],
+                    recaptchapublickey: data[3]
+                };
+            }
             item.template = 'captcha';
             item.value = "";
             return item;
@@ -284,7 +293,7 @@ angular.module('mm.addons.mod_feedback')
         var responses = {};
 
         angular.forEach(items, function(itemData) {
-            if (itemData.hasvalue || itemData.typ == "captcha") {
+            if (itemData.hasvalue) {
                 var name, value,
                     nameTemp = itemData.typ + '_' + itemData.id,
                     answered = false;
@@ -315,6 +324,23 @@ angular.module('mm.addons.mod_feedback')
                     responses[name] = value;
                 }
 
+                if (itemData.required && !answered) {
+                    // Check if it has any value.
+                    itemData.isEmpty = true;
+                } else {
+                    itemData.isEmpty = false;
+                }
+            } else if (itemData.typ == "captcha") {
+                var value = itemData.value || "",
+                    name = itemData.typ + '_' + itemData.id,
+                    answered = false;
+
+                answered = !!value;
+                responses[name] = 1;
+                responses.recaptcha_challenge_field = itemData.captcha.challengehash;
+                responses.recaptcha_response_field = value;
+                responses.recaptcha_element = 'dummyvalue';
+
                 if (itemData.required && !answered) {
                     // Check if it has any value.
                     itemData.isEmpty = true;
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 6630ec3893b..c3b5701cc41 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -47,7 +47,17 @@
                 </script>
 
                 <script type="text/ng-template" id="captcha">
-                    <p ng-if="!preview">Captcha is not supported right now, feedback cannot be submitted.</p>
+                    <div ng-if="!preview && item.captcha && item.captcha.challengehash && item.captcha.imageurl && !offline">
+                        <img ng-src="{{item.captcha.imageurl}}" alt="{{ 'mm.login.recaptchachallengeimage' | translate }}">
+                        <ion-input class="item-input">
+                            <input type="text" name="recaptcharesponse" placeholder="{{ 'mm.login.enterthewordsabove' | translate }}" ng-model="item.value" autocapitalize="none" autocorrect="off" required>
+                        </ion-input>
+                        <!-- Use anchor instead of button to prevent marking form as submitted. -->
+                        <a class="button button-block" ng-click="requestCaptcha(item)">{{ 'mm.login.getanothercaptcha' | translate }}</a>
+                    </div>
+                    <div ng-if="!preview && (!item.captcha || !item.captcha.challengehash || !item.captcha.imageurl || offline)" class="mm-warning-card-icon">
+                        <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_feedback.captchaofflinewarning' | translate }}
+                    </div>
                 </script>
 
                 <div ng-if="!preview" class="item item-text-wrap row-buttons responsive-sm">

From 2cd8c3bce6d31970129004213d6c28625b6a4e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 10 Apr 2017 13:51:24 +0200
Subject: [PATCH 077/218] MOBILE-2081 feedback: Refurbish feedback UI

---
 .../mod/feedback/controllers/analysis.js       |  4 ++--
 www/addons/mod/feedback/controllers/index.js   |  4 ++--
 .../mod/feedback/controllers/nonrespondents.js |  2 +-
 .../mod/feedback/controllers/respondents.js    |  2 +-
 www/addons/mod/feedback/main.js                | 12 ++++++++----
 www/addons/mod/feedback/services/helper.js     | 11 +++++++++--
 .../mod/feedback/templates/analysis.html       | 16 +++++-----------
 www/addons/mod/feedback/templates/index.html   | 18 +++++++-----------
 8 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/analysis.js b/www/addons/mod/feedback/controllers/analysis.js
index a8d289ff6ef..028bc016675 100644
--- a/www/addons/mod/feedback/controllers/analysis.js
+++ b/www/addons/mod/feedback/controllers/analysis.js
@@ -36,7 +36,7 @@ angular.module('mm.addons.mod_feedback')
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
-    $scope.selectedGroup = 0;
+    $scope.selectedGroup = $stateParams.group || 0;
     $scope.chartOptions = {
         'legend': {
             'display': true,
@@ -236,7 +236,7 @@ angular.module('mm.addons.mod_feedback')
 
     // Function to link implemented features.
     $scope.openFeature = function(feature) {
-        $mmaModFeedbackHelper.openFeature(feature, module, courseId);
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId, $scope.selectedGroup);
     };
 
     // Refresh online status when changes.
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 036f8d38f74..92b1f3aacef 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -39,7 +39,7 @@ angular.module('mm.addons.mod_feedback')
     $scope.syncIcon = 'spinner';
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
-    $scope.selectedGroup = 0;
+    $scope.selectedGroup = $stateParams.group || 0;
 
     // Convenience function to get feedback data.
     function fetchFeedbackData(refresh, sync, showErrors) {
@@ -187,7 +187,7 @@ angular.module('mm.addons.mod_feedback')
 
     // Function to link implemented features.
     $scope.openFeature = function(feature) {
-        $mmaModFeedbackHelper.openFeature(feature, module, courseId);
+        $mmaModFeedbackHelper.openFeature(feature, module, courseId, $scope.selectedGroup);
     };
 
     // Function to go to the questions form.
diff --git a/www/addons/mod/feedback/controllers/nonrespondents.js b/www/addons/mod/feedback/controllers/nonrespondents.js
index fd0ca284f1b..d42539eeb9d 100644
--- a/www/addons/mod/feedback/controllers/nonrespondents.js
+++ b/www/addons/mod/feedback/controllers/nonrespondents.js
@@ -32,7 +32,7 @@ angular.module('mm.addons.mod_feedback')
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
-    $scope.selectedGroup = 0;
+    $scope.selectedGroup = $stateParams.group || 0;
     $scope.canLoadMore = false;
     $scope.users = [];
     $scope.total = 0;
diff --git a/www/addons/mod/feedback/controllers/respondents.js b/www/addons/mod/feedback/controllers/respondents.js
index 9934eaa1292..3b1889132e0 100644
--- a/www/addons/mod/feedback/controllers/respondents.js
+++ b/www/addons/mod/feedback/controllers/respondents.js
@@ -32,7 +32,7 @@ angular.module('mm.addons.mod_feedback')
     $scope.refreshIcon = 'spinner';
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
-    $scope.selectedGroup = 0;
+    $scope.selectedGroup = $stateParams.group || 0;
     $scope.canLoadMoreAnon = false;
     $scope.canLoadMoreNonAnon = false;
     $scope.responses = {
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index fdd890d0349..0ad4c15abb8 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -28,7 +28,8 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
         params: {
             module: null,
             moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
-            courseid: null
+            courseid: null,
+            group: null
         },
         views: {
             'site': {
@@ -61,7 +62,8 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
             feedbackid: null,
             courseid: null,
             module: null,
-            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            group: null
         },
         views: {
             'site': {
@@ -76,7 +78,8 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
         params: {
             courseid: null,
             module: null,
-            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            group: null
         },
         views: {
             'site': {
@@ -107,7 +110,8 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
         params: {
             courseid: null,
             module: null,
-            moduleid: null // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            group: null
         },
         views: {
             'site': {
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 8da69f3f577..5936f20d4ed 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -70,10 +70,16 @@ angular.module('mm.addons.mod_feedback')
      * @param {String}  feature          Name of the feature to open.
      * @param {Object}  module           Course module activity object.
      * @param {Number}  courseId         Course Id.
+     * @param {Number}  group            Course module activity object.
      */
-    self.openFeature = function(feature, module, courseId) {
+    self.openFeature = function(feature, module, courseId, group) {
         var pageName = feature ? 'site.mod_feedback-' + feature : 'site.mod_feedback',
+            backTimes = 0;
+
+        // Only check history if navigating through tabs.
+        if (!feature || feature == "analysis") {
             backTimes = getHistoryBackCounter(pageName, module.instance);
+        }
 
         if (backTimes < 0) {
             // Go back X times until the the page we want to reach.
@@ -84,7 +90,8 @@ angular.module('mm.addons.mod_feedback')
                 module: module,
                 moduleid: module.id,
                 courseid: courseId,
-                feedbackid: module.instance
+                feedbackid: module.instance,
+                group: group || 0
             };
             $state.go(pageName, stateParams);
         }
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
index f2657583388..6afca384f97 100644
--- a/www/addons/mod/feedback/templates/analysis.html
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -7,9 +7,13 @@
             <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
-    <ion-content mm-state-class ng-class="{'has-footer': feedbackLoaded && access.canviewreports}">
+    <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
+            <div class="tabs tabs-striped tabs-free tabs-color-positive" ng-if="access.canviewreports">
+              <a class="tab-item" ng-click="openFeature()">{{ 'mma.mod_feedback.overview' | translate }}</a>
+              <a class="tab-item active">{{ 'mma.mod_feedback.analysis' | translate }}</a>
+            </div>
             <section class="list" ng-if="access.canedititems || !access.isempty">
                 <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
                     <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
@@ -65,14 +69,4 @@
             </section>
         </mm-loading>
     </ion-content>
-    <ion-footer ng-if="feedbackLoaded && access.canviewreports">
-        <div class="tabs tabs-icon-top">
-            <a class="tab-item" ng-click="openFeature()">
-                <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
-            </a>
-            <a class="tab-item active">
-                <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
-            </a>
-        </div>
-    </ion-footer>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 74bff999918..d616e1e6316 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -10,9 +10,10 @@
             <mm-context-menu-item priority="400" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
-    <ion-content mm-state-class ng-class="{'has-footer': feedbackLoaded && access.canviewreports}">
+    <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
+
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
             <!-- Feedback responses found to be synchronized -->
@@ -28,6 +29,11 @@
                 <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
             </div>
 
+            <div class="tabs tabs-striped tabs-free tabs-color-positive" ng-if="access.canviewreports">
+              <a class="tab-item active">{{ 'mma.mod_feedback.overview' | translate }}</a>
+              <a class="tab-item" ng-click="openFeature('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
+            </div>
+
             <section class="list" ng-if="access.canedititems || access.canviewreports || !access.isempty">
                 <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
                     <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
@@ -82,14 +88,4 @@
             </section>
         </mm-loading>
     </ion-content>
-    <ion-footer ng-if="feedbackLoaded && access.canviewreports">
-        <div class="tabs tabs-icon-top">
-            <a class="tab-item active">
-                <i class="icon ion-home"></i>{{ 'mma.mod_feedback.overview' | translate }}
-            </a>
-            <a class="tab-item" ng-click="openFeature('analysis')">
-                <i class="icon ion-stats-bars"></i>{{ 'mma.mod_feedback.analysis' | translate }}
-            </a>
-        </div>
-    </ion-footer>
 </ion-view>

From caf7440a570b3b62c1b0f5aa7b2016bc76e5044e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 21 Apr 2017 10:24:42 +0200
Subject: [PATCH 078/218] MOBILE-1157 course: Fix PTR in section with pages

---
 www/addons/mod/page/services/prefetch_handler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/mod/page/services/prefetch_handler.js b/www/addons/mod/page/services/prefetch_handler.js
index 70a48961626..0ee7e7d2456 100644
--- a/www/addons/mod/page/services/prefetch_handler.js
+++ b/www/addons/mod/page/services/prefetch_handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_page')
  * @ngdoc service
  * @name $mmaModPagePrefetchHandler
  */
-.factory('$mmaModPagePrefetchHandler', function($mmPrefetchFactory, mmaModPageComponent, $mmaModPage, $mmCourse) {
+.factory('$mmaModPagePrefetchHandler', function($mmPrefetchFactory, mmaModPageComponent, $mmaModPage, $mmCourse, $q) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModPageComponent, true);
 

From b166bd09b779fe1eec7886e90a613d4ab5adb848 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 21 Apr 2017 13:33:39 +0200
Subject: [PATCH 079/218] MOBILE-2051 file: Fix open online files

---
 upgrade.txt                                   |  1 +
 www/addons/mod/resource/services/resource.js  | 36 +++++++++++--
 .../login/controllers/sitepolicy.js           |  2 +-
 www/core/directives/file.js                   | 26 +++++++--
 www/core/lib/filepool.js                      |  2 +-
 www/core/lib/util.js                          | 54 ++++++++++++-------
 6 files changed, 92 insertions(+), 29 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index 4002e7ca763..3a68a11e53c 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -12,6 +12,7 @@ information provided here is intended especially for developers.
  * Question type addons can now implement an optional prepareAnswers function. If provided, this function will be called before sending the quiz data to the server, and allows the addon to perform changes in the data to send.
  * The promise returned by $mmaModForum#canAddDiscussion is now resolved with an object (WS response) instead of a boolean.
  * The parameters of the following functions have changed to match the WS behaviour: $mmaModForum#addNewDiscussion, $mmaModForum#addNewDiscussionOnline, $mmaModForumOffline#addNewDiscussion, $mmaModForum#replyPost, $mmaModForum#replyPostOnline, $mmaModForumOffline#replyPost.
+ * The function $mmUtil#getMimeType has been deprecated. Please use $mmUtil#getMimeTypeFromUrl instead.
 
 === 3.2.1 ===
 
diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index 94659ddf2e8..412db75f4c7 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -226,11 +226,14 @@ angular.module('mm.addons.mod_resource')
             component = mmaModResourceComponent,
             url = contents[0].fileurl,
             fixedUrl = $mmSite.fixPluginfileURL(url),
+            status,
             promise;
 
         if ($mmFS.isAvailable()) {
             // The file system is available.
-            promise = $mmFilepool.getPackageStatus(siteId, component, moduleId, revision, timeMod).then(function(status) {
+            promise = $mmFilepool.getPackageStatus(siteId, component, moduleId, revision, timeMod).then(function(stat) {
+                status = stat;
+
                 var isWifi = !$mmApp.isNetworkAccessLimited(),
                     isOnline = $mmApp.isOnline();
 
@@ -272,11 +275,34 @@ angular.module('mm.addons.mod_resource')
             promise = $q.when(fixedUrl);
         }
 
-        return promise.then(function(url) {
-            if (url.indexOf('http') === 0) {
-                return $mmUtil.openOnlineFile(url);
+        return promise.then(function(path) {
+            if (path.indexOf('http') === 0) {
+                return $mmUtil.openOnlineFile(path).catch(function(error) {
+                    // Error opening the file, some apps don't allow opening online files.
+                    if (!$mmFS.isAvailable()) {
+                        return $q.reject(error);
+                    }
+
+                    var subPromise;
+                    if (status === mmCoreDownloading) {
+                        subPromise = $mmLang.translateAndReject('mm.core.erroropenfiledownloading');
+                    } else if (status === mmCoreNotDownloaded) {
+                        // File is not downloaded, download and then return the local URL.
+                        subPromise = $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod)
+                                .then(function() {
+                            return $mmFilepool.getInternalUrlByUrl(siteId, url);
+                        });
+                    } else {
+                        // File is outdated or stale and can't be opened in online, return the local URL.
+                        subPromise = $mmFilepool.getInternalUrlByUrl(siteId, url);
+                    }
+
+                    return subPromise.then(function(path) {
+                        return $mmUtil.openFile(path);
+                    });
+                });
             } else {
-                return $mmUtil.openFile(url);
+                return $mmUtil.openFile(path);
             }
         });
     };
diff --git a/www/core/components/login/controllers/sitepolicy.js b/www/core/components/login/controllers/sitepolicy.js
index 43ae68ce62b..d6afcecb1dc 100644
--- a/www/core/components/login/controllers/sitepolicy.js
+++ b/www/core/components/login/controllers/sitepolicy.js
@@ -42,7 +42,7 @@ angular.module('mm.core.login')
             $scope.sitePolicy = settings.sitepolicy;
 
             // Try to get the mime type.
-            return $mmUtil.getMimeType($scope.sitePolicy).then(function(mimeType) {
+            return $mmUtil.getMimeTypeFromUrl($scope.sitePolicy).then(function(mimeType) {
                 var extension = $mmFS.getExtension(mimeType, $scope.sitePolicy);
                 $scope.showInline = extension == 'html' || extension == 'html';
 
diff --git a/www/core/directives/file.js b/www/core/directives/file.js
index b8617802087..18eecd4a1b7 100644
--- a/www/core/directives/file.js
+++ b/www/core/directives/file.js
@@ -40,7 +40,7 @@ angular.module('mm.core')
  * @param {Boolean} [noBorder=false]   True if want to show file entry without borders. Defaults to false.
  */
 .directive('mmFile', function($q, $mmUtil, $mmFilepool, $mmSite, $mmApp, $mmEvents, $mmFS, mmCoreDownloaded, mmCoreDownloading,
-            mmCoreNotDownloaded, mmCoreOutdated) {
+            mmCoreNotDownloaded, mmCoreOutdated, $mmLang) {
 
     /**
      * Convenience function to get the file state and set scope variables based on it.
@@ -142,7 +142,7 @@ angular.module('mm.core')
                             downloadFile(scope, siteId, fileUrl, component, componentId, timeModified, alwaysDownload);
                         }
 
-                        if (isDownloading|| !scope.isDownloaded || isOnline) {
+                        if (isDownloading || !scope.isDownloaded || isOnline) {
                             // Not downloaded or outdated and online, return the online URL.
                             return fixedUrl;
                         } else {
@@ -163,7 +163,27 @@ angular.module('mm.core')
             }
 
             if (url.indexOf('http') === 0) {
-                return $mmUtil.openOnlineFile(url);
+                return $mmUtil.openOnlineFile(url).catch(function(error) {
+                    // Error opening the file, some apps don't allow opening online files.
+                    if (!$mmFS.isAvailable()) {
+                        return $q.reject(error);
+                    }
+
+                    var subPromise;
+                    if (scope.isDownloading) {
+                        subPromise = $mmLang.translateAndReject('mm.core.erroropenfiledownloading');
+                    } else if (status === mmCoreNotDownloaded) {
+                        // File is not downloaded, download and then return the local URL.
+                        subPromise = downloadFile(scope, siteId, fileUrl, component, componentId, timeModified, alwaysDownload);
+                    } else {
+                        // File is outdated and can't be opened in online, return the local URL.
+                        subPromise = $mmFilepool.getInternalUrlByUrl(siteId, fileUrl);
+                    }
+
+                    return subPromise.then(function(url) {
+                        return $mmUtil.openFile(url);
+                    });
+                });
             } else {
                 return $mmUtil.openFile(url);
             }
diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index f32d1e639ab..b617369bb69 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -2758,7 +2758,7 @@ angular.module('mm.core')
             return $q.when();
         }
 
-        return $mmUtil.getMimeType(url).then(function(mimetype) {
+        return $mmUtil.getMimeTypeFromUrl(url).then(function(mimetype) {
             // If the file is streaming (audio or video) we reject.
             if (mimetype.indexOf('video') != -1 || mimetype.indexOf('audio') != -1) {
                 return $q.reject();
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index ffb40d2fd94..0202aacc1c1 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -445,14 +445,15 @@ angular.module('mm.core')
 
             if (ionic.Platform.isAndroid() && window.plugins && window.plugins.webintent) {
                 // In Android we need the mimetype to open it.
-                var extension,
-                    iParams;
+                var iParams;
 
-                $mmWS.getRemoteFileMimeType(url).then(function(mimetype) {
+                self.getMimeTypeFromUrl(url).catch(function() {
+                    // Error getting mimetype, return undefined.
+                }).then(function(mimetype) {
                     if (!mimetype) {
-                        // Couldn't retireve mimetype. Try to guess it.
-                        extension = $mmFS.guessExtensionFromUrl(url);
-                        mimetype = $mmFS.getMimeType(extension);
+                        // Couldn't retrieve mimetype. Return error.
+                        $mmLang.translateAndRejectDeferred(deferred, 'mm.core.erroropenfilenoextension');
+                        return;
                     }
 
                     iParams = {
@@ -473,12 +474,7 @@ angular.module('mm.core')
                             $log.debug('url: ' + iParams.url);
                             $log.debug('type: ' + iParams.type);
 
-                            if (!extension || extension.indexOf('/') > -1 || extension.indexOf('\\') > -1) {
-                                // Extension not found.
-                                $mmLang.translateAndRejectDeferred(deferred, 'mm.core.erroropenfilenoextension');
-                            } else {
-                                $mmLang.translateAndRejectDeferred(deferred, 'mm.core.erroropenfilenoapp');
-                            }
+                            $mmLang.translateAndRejectDeferred(deferred, 'mm.core.erroropenfilenoapp');
                         }
                     );
                 });
@@ -492,22 +488,42 @@ angular.module('mm.core')
         };
 
         /**
-         * Get the mimetype of a file given its URL. It'll perform a HEAD request to get it, if that
-         * fails it'll try to guess it using the URL.
+         * Get the mimetype of a file given its URL. It'll try to guess it using the URL, if that fails then it'll
+         * perform a HEAD request to get it. It's done in this order because pluginfile.php can return wrong mimetypes.
          *
          * @module mm.core
          * @ngdoc method
          * @name $mmUtil#getMimeType
          * @param  {String} url The URL of the file.
          * @return {Promise}    Promise resolved with the mimetype.
+         * @deprecated since 3.3. Use $mmUtil#getMimeTypeFromUrl.
          */
         self.getMimeType = function(url) {
+            $log.warn('$mmUtil#getMimeType is deprecated. Use $mmUtil#getMimeTypeFromUrl instead');
+            return self.getMimeTypeFromUrl(url);
+        };
+
+        /**
+         * Get the mimetype of a file given its URL. It'll try to guess it using the URL, if that fails then it'll
+         * perform a HEAD request to get it. It's done in this order because pluginfile.php can return wrong mimetypes.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#getMimeTypeFromUrl
+         * @param  {String} url The URL of the file.
+         * @return {Promise}    Promise resolved with the mimetype.
+         */
+        self.getMimeTypeFromUrl = function(url) {
+            // First check if it can be guessed from the URL.
+            var extension = $mmFS.guessExtensionFromUrl(url),
+                mimetype = $mmFS.getMimeType(extension);
+
+            if (mimetype) {
+                return $q.when(mimetype);
+            }
+
+            // Can't be guessed, get the remote mimetype.
             return $mmWS.getRemoteFileMimeType(url).then(function(mimetype) {
-                if (!mimetype) {
-                    // Couldn't retireve mimetype. Try to guess it.
-                    extension = $mmFS.guessExtensionFromUrl(url);
-                    mimetype = $mmFS.getMimeType(extension);
-                }
                 return mimetype || '';
             });
         };

From 9941e6b8c8291b4cd778ae361fdcead90d068d4b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 31 Mar 2017 09:45:41 +0200
Subject: [PATCH 080/218] MOBILE-2015 prefetch: Don't force cache in
 isDownloadable

---
 www/addons/mod/choice/services/prefetch_handler.js | 2 +-
 www/addons/mod/quiz/services/prefetch_handler.js   | 7 ++++---
 www/addons/mod/scorm/services/prefetch_handler.js  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/www/addons/mod/choice/services/prefetch_handler.js b/www/addons/mod/choice/services/prefetch_handler.js
index 8165cecb859..07aa5c6048f 100644
--- a/www/addons/mod/choice/services/prefetch_handler.js
+++ b/www/addons/mod/choice/services/prefetch_handler.js
@@ -165,7 +165,7 @@ angular.module('mm.addons.mod_choice')
      * @return {Promise}         Promise resolved with true if downloadable, resolved with false otherwise.
      */
     self.isDownloadable = function(module, courseId) {
-        return $mmaModChoice.getChoice(courseId, module.id, false, true).then(function(choice) {
+        return $mmaModChoice.getChoice(courseId, module.id).then(function(choice) {
             var now = $mmUtil.timestamp();
             if (choice.timeopen && choice.timeopen > now) {
                 return false;
diff --git a/www/addons/mod/quiz/services/prefetch_handler.js b/www/addons/mod/quiz/services/prefetch_handler.js
index f7d6d6a3135..f2848f0caca 100644
--- a/www/addons/mod/quiz/services/prefetch_handler.js
+++ b/www/addons/mod/quiz/services/prefetch_handler.js
@@ -65,7 +65,7 @@ angular.module('mm.addons.mod_quiz')
     self.gatherPreflightData = function(quiz, quizAccessInfo, attempt, preflightData, siteId, askPreflight, modalTitle) {
         if (askPreflight) {
             // Check if the quiz requires preflight data.
-            scope = $rootScope.$new();
+            var scope = $rootScope.$new();
             scope.preflightData = preflightData;
             scope.preflightModalTitle = modalTitle;
 
@@ -294,13 +294,14 @@ angular.module('mm.addons.mod_quiz')
      * @return {Promise}         Promise resolved with true if downloadable, resolved with false otherwise.
      */
     self.isDownloadable = function(module, courseId) {
-        return $mmaModQuiz.getQuiz(courseId, module.id, false, true).then(function(quiz) {
+        var siteId = $mmSite.getId();
+        return $mmaModQuiz.getQuiz(courseId, module.id, siteId).then(function(quiz) {
             if (quiz.allowofflineattempts !== 1 || quiz.hasquestions === 0) {
                 return false;
             }
 
             // Not downloadable if we reached max attempts.
-            return $mmaModQuiz.getUserAttempts(quiz.id).then(function(attempts) {
+            return $mmaModQuiz.getUserAttempts(quiz.id, false, true, false, false, siteId).then(function(attempts) {
                 var isLastFinished = !attempts.length || $mmaModQuiz.isAttemptFinished(attempts[attempts.length - 1].state);
                 return quiz.attempts === 0 || quiz.attempts > attempts.length || !isLastFinished;
             });
diff --git a/www/addons/mod/scorm/services/prefetch_handler.js b/www/addons/mod/scorm/services/prefetch_handler.js
index 8808164712f..c953023c85b 100644
--- a/www/addons/mod/scorm/services/prefetch_handler.js
+++ b/www/addons/mod/scorm/services/prefetch_handler.js
@@ -381,7 +381,7 @@ angular.module('mm.addons.mod_scorm')
      * @return {Promise}         Promise resolved with true if downloadable, resolved with false otherwise.
      */
     self.isDownloadable = function(module, courseId) {
-        return $mmaModScorm.getScorm(courseId, module.id, module.url, false, true).then(function(scorm) {
+        return $mmaModScorm.getScorm(courseId, module.id, module.url).then(function(scorm) {
             if (scorm.warningmessage) {
                 // SCORM closed or not opened yet.
                 return false;

From 06d0614811ffd3e9123d3ff1640e4e288ced43e2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 31 Mar 2017 10:46:15 +0200
Subject: [PATCH 081/218] MOBILE-2015 lesson: Support prefetching lessons

---
 www/addons/mod/lesson/controllers/index.js    |  39 +-
 www/addons/mod/lesson/controllers/player.js   |   2 +-
 www/addons/mod/lesson/main.js                 |   3 +-
 www/addons/mod/lesson/services/handlers.js    |  79 ++-
 www/addons/mod/lesson/services/lesson.js      |  13 +
 .../mod/lesson/services/prefetch_handler.js   | 469 ++++++++++++++++++
 www/addons/mod/lesson/templates/index.html    |   2 +
 .../mod/lesson/templates/password-modal.html  |  15 +
 www/core/components/course/services/helper.js |  16 +-
 www/core/lib/util.js                          |   8 +-
 www/core/main.js                              |   1 +
 11 files changed, 621 insertions(+), 26 deletions(-)
 create mode 100644 www/addons/mod/lesson/services/prefetch_handler.js
 create mode 100644 www/addons/mod/lesson/templates/password-modal.html

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index cf9a38384ad..3c38f4fd53a 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -45,6 +45,7 @@ angular.module('mm.addons.mod_lesson')
     // Convenience function to get Lesson data.
     function fetchLessonData(refresh) {
         $scope.isOnline = $mmApp.isOnline();
+        $scope.askPassword = false;
 
         return $mmaModLesson.getLesson(courseId, module.id).then(function(lessonData) {
             lesson = lessonData;
@@ -58,30 +59,29 @@ angular.module('mm.addons.mod_lesson')
             var promise;
 
             accessInfo = info;
-            $scope.preventMessages = info.preventaccessreasons;
 
-            if ($scope.preventMessages && $scope.preventMessages.length) {
-                $scope.askPassword = $scope.preventMessages.length == 1 && $mmaModLesson.isPasswordProtected(info);
-                if ($scope.askPassword) {
+            if (info.preventaccessreasons && info.preventaccessreasons.length) {
+                var askPassword = info.preventaccessreasons.length == 1 && $mmaModLesson.isPasswordProtected(info);
+                if (askPassword) {
                     // The lesson requires a password. Check if there is one in memory or DB.
                     promise = password ? $q.when(password) : $mmaModLesson.getStoredPassword(lesson.id);
 
                     return promise.then(function(pwd) {
-                        return validatePassword(pwd);
+                        return validatePassword(pwd, refresh);
                     }).catch(function() {
-                        // No password or the validation failed. The password form will be shown.
+                        // No password or the validation failed. Show password form.
+                        $scope.askPassword = true;
+                        $scope.preventMessages = info.preventaccessreasons;
                     });
                 } else  {
                     // Lesson cannot be attempted, stop.
+                    $scope.preventMessages = info.preventaccessreasons;
                     return;
                 }
             }
 
             // Lesson can be attempted, don't ask the password and don't show prevent messages.
-            fetchDataFinished();
-        }).then(function() {
-            // All data obtained, now fill the context menu.
-            $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModLessonComponent);
+            fetchDataFinished(refresh);
         }).catch(function(message) {
             if (!refresh && !lesson) {
                 // Get lesson failed, retry without using cache since it might be a new activity.
@@ -94,7 +94,7 @@ angular.module('mm.addons.mod_lesson')
     }
 
     // Function called when all the data has been fetched.
-    function fetchDataFinished(pwd) {
+    function fetchDataFinished(refresh, pwd) {
         password = pwd;
         $scope.data.password = '';
         $scope.askPassword = false;
@@ -105,15 +105,18 @@ angular.module('mm.addons.mod_lesson')
             // Store the password in DB.
             $mmaModLesson.storePassword(lesson.id, password);
         }
+
+        // All data obtained, now fill the context menu.
+        $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModLessonComponent);
     }
 
     // Validate a password and retrieve extra data.
-    function validatePassword(pwd) {
+    function validatePassword(pwd, refresh) {
         return $mmaModLesson.getLessonWithPassword(lesson.id, pwd).then(function(lessonData) {
             lesson = lessonData;
 
             // Password validated, remove the form and the prevent message.
-            fetchDataFinished(pwd);
+            fetchDataFinished(refresh, pwd);
 
             // Log view now that we have the password.
             logView();
@@ -222,6 +225,16 @@ angular.module('mm.addons.mod_lesson')
         }
     };
 
+    // Confirm and Remove action.
+    $scope.removeFiles = function() {
+        $mmCourseHelper.confirmAndRemove(module, courseId);
+    };
+
+    // Context Menu Prefetch action.
+    $scope.prefetch = function() {
+        $mmCourseHelper.contextMenuPrefetch($scope, module, courseId);
+    };
+
     // Context Menu Description action.
     $scope.expandDescription = function() {
         $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModLessonComponent, module.id);
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 26d50144f45..350bdbd76f1 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -60,7 +60,7 @@ angular.module('mm.addons.mod_lesson')
                 // If it's a password protected lesson and we have the password, allow attempting it.
                 if (!password || info.preventaccessreasons.length > 1 || !$mmaModLesson.isPasswordProtected(info)) {
                     // Lesson cannot be attempted, show message and go back.
-                    return $q.reject(info.preventaccessreasons[0]);
+                    return $q.reject(info.preventaccessreasons[0].message);
                 }
             }
 
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 003d51442db..da6d5abf4db 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -52,6 +52,7 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
 
 })
 
-.config(function($mmCourseDelegateProvider) {
+.config(function($mmCourseDelegateProvider, $mmCoursePrefetchDelegateProvider) {
     $mmCourseDelegateProvider.registerContentHandler('mmaModLesson', 'lesson', '$mmaModLessonHandlers.courseContentHandler');
+    $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModLesson', 'lesson', '$mmaModLessonPrefetchHandler');
 });
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index 9633f81c6fb..c8740ce8fe1 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -21,7 +21,9 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonHandlers
  */
-.factory('$mmaModLessonHandlers', function($mmCourse, $mmaModLesson, $state) {
+.factory('$mmaModLessonHandlers', function($mmCourse, $mmaModLesson, $state, $mmaModLessonPrefetchHandler, $mmUtil, $mmEvents,
+            $mmSite, $mmCoursePrefetchDelegate, mmCoreEventPackageStatusChanged, mmaModLessonComponent, mmCoreDownloading,
+            mmCoreNotDownloaded, mmCoreOutdated) {
 
     var self = {};
 
@@ -53,9 +55,23 @@ angular.module('mm.addons.mod_lesson')
          */
         self.getController = function(module, courseId) {
             return function($scope) {
+                var downloadBtn  = {
+                        hidden: true,
+                        icon: 'ion-ios-cloud-download-outline',
+                        label: 'mm.core.download',
+                        action: download
+                    },
+                    refreshBtn = {
+                        icon: 'ion-android-refresh',
+                        label: 'mm.core.refresh',
+                        hidden: true,
+                        action: download
+                    };
+
                 $scope.icon = $mmCourse.getModuleIconSrc('lesson');
                 $scope.title = module.name;
-                $scope.buttons = [];
+                $scope.buttons = [downloadBtn, refreshBtn];
+                $scope.spinner = true; // Show spinner while calculating status.
 
                 $scope.action = function(e) {
                     if (e) {
@@ -64,6 +80,65 @@ angular.module('mm.addons.mod_lesson')
                     }
                     $state.go('site.mod_lesson', {module: module, courseid: courseId});
                 };
+
+                function download(e) {
+                    if (e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+
+                    var wasDwnHidden = downloadBtn.hidden,
+                        wasRefreshHidden = refreshBtn.hidden;
+
+                    // Show spinner since this operation might take a while.
+                    $scope.spinner = true;
+                    downloadBtn.hidden = true;
+                    refreshBtn.hidden = true;
+
+                    $mmaModLessonPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
+                        $mmUtil.confirmDownloadSize(size).then(function() {
+                            $mmaModLessonPrefetchHandler.prefetch(module, courseId).catch(function() {
+                                if (!$scope.$$destroyed) {
+                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                }
+                            });
+                        }).catch(function() {
+                            // User hasn't confirmed, stop spinner.
+                            $scope.spinner = false;
+                            downloadBtn.hidden = wasDwnHidden;
+                            refreshBtn.hidden = wasRefreshHidden;
+                        });
+                    }).catch(function(error) {
+                        $scope.spinner = false;
+                        downloadBtn.hidden = wasDwnHidden;
+                        refreshBtn.hidden = wasRefreshHidden;
+                        $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                    });
+                }
+
+                // Show buttons according to module status.
+                function showStatus(status) {
+                    if (status) {
+                        $scope.spinner = status === mmCoreDownloading;
+                        downloadBtn.hidden = status !== mmCoreNotDownloaded;
+                        refreshBtn.hidden = status !== mmCoreOutdated;
+                    }
+                }
+
+                // Listen for changes on this module status.
+                var statusObserver = $mmEvents.on(mmCoreEventPackageStatusChanged, function(data) {
+                    if (data.siteid === $mmSite.getId() && data.componentId === module.id &&
+                            data.component === mmaModLessonComponent) {
+                        showStatus(data.status);
+                    }
+                });
+
+                // Get current status to decide which icon should be shown.
+                $mmCoursePrefetchDelegate.getModuleStatus(module, courseId).then(showStatus);
+
+                $scope.$on('$destroy', function() {
+                    statusObserver && statusObserver.off && statusObserver.off();
+                });
             };
         };
 
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 17592fef89c..62b80d74038 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -613,6 +613,19 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if a lesson is enabled to be used in offline.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#isLessonOffline
+     * @param  {Object} lesson Lesson.
+     * @return {Boolean}       True offline is enabled, false otherwise.
+     */
+    self.isLessonOffline = function(lesson) {
+        return !!lesson.allowofflineattempts;
+    };
+
     /**
      * Check if a lesson is password protected based in the access info.
      *
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
new file mode 100644
index 00000000000..b0620fbb9a2
--- /dev/null
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -0,0 +1,469 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Mod lesson prefetch handler.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc service
+ * @name $mmaModLessonPrefetchHandler
+ */
+.factory('$mmaModLessonPrefetchHandler', function($mmaModLesson, $q, $mmPrefetchFactory, mmaModLessonComponent, $mmUtil,
+    $mmSite, $mmFilepool, $rootScope, $timeout, $ionicModal, mmCoreDontShowError) {
+
+    var self = $mmPrefetchFactory.createPrefetchHandler(mmaModLessonComponent, false);
+
+    // RegExp to check if a module has updates based on the result of $mmCoursePrefetchDelegate#getCourseUpdates.
+    // Don't check timers to decrease positives. If a user performs some action it will be reflected in other items.
+    self.updatesNames = /^configuration$|^.*files$|^grades$|^gradeitems$|^pages$|^answers$|^questionattempts$|^pagesviewed$/;
+
+    /**
+     * Download the module.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#download
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @return {Promise}         Promise resolved when all files have been downloaded. Data returned is not reliable.
+     */
+    self.download = function(module, courseId) {
+        // Lessons cannot be downloaded right away, only prefetched.
+        return self.prefetch(module, courseId);
+    };
+
+    /**
+     * Get the lesson password if needed. If not stored, it can ask the user to enter it.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#gatherLessonPassword
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Boolean} forceCache  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {Boolean} askPassword True if we should ask for password if needed, false otherwise.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved with an object containing access info, password and the lesson (if needed).
+     */
+    self.gatherLessonPassword = function(lessonId, forceCache, ignoreCache, askPassword, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        // Get access information to check if password is needed.
+        return $mmaModLesson.getAccessInformation(lessonId, forceCache, ignoreCache, siteId).then(function(info) {
+            if (info.preventaccessreasons && info.preventaccessreasons.length) {
+                var passwordNeeded = info.preventaccessreasons.length == 1 && $mmaModLesson.isPasswordProtected(info);
+                if (passwordNeeded) {
+                    // The lesson requires a password. Check if there is one in DB.
+                    return $mmaModLesson.getStoredPassword(lessonId).catch(function() {
+                        // No password found.
+                    }).then(function(pwd) {
+                        if (pwd) {
+                            return validatePassword(info, pwd);
+                        } else {
+                            return $q.reject();
+                        }
+                    }).catch(function() {
+                        // No password or error validating it. Ask for it if allowed.
+                        if (askPassword) {
+                            return askUserPassword(info);
+                        }
+                        return $q.reject(info.preventaccessreasons[0].message);
+                    });
+                } else  {
+                    // Lesson cannot be attempted, reject.
+                    return $q.reject(info.preventaccessreasons[0].message);
+                }
+            }
+
+            // Password not needed.
+            return {accessinfo: info};
+        });
+
+        // Validate the password.
+        function validatePassword(info, pwd) {
+            return $mmaModLesson.getLessonWithPassword(lessonId, pwd, true, forceCache, ignoreCache, siteId).then(function(lesson) {
+                // Password is ok, store it and return the data.
+                return $mmaModLesson.storePassword(lesson.id, pwd).then(function() {
+                    return {password: pwd, lesson: lesson, accessinfo: info};
+                });
+            });
+        }
+
+        // Ask password.
+        function askUserPassword(info) {
+            var scope = $rootScope.$new();
+            scope.data = {
+                password: ''
+            };
+
+            // Init the modal.
+            return $ionicModal.fromTemplateUrl('addons/mod/lesson/templates/password-modal.html', {
+                scope: scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                var resolved = false,
+                    deferred = $q.defer();
+
+                scope.modal = modal;
+                modal.show();
+
+                scope.submitPassword = function(pwd) {
+                    modal.hide();
+                    scope.$destroy();
+
+                    resolved = true;
+                    validatePassword(info, pwd).then(deferred.resolve).catch(function(error) {
+                        // Wait a bit to reject to prevent Ionic bug: https://github.com/driftyco/ionic/issues/9069
+                        $timeout(function() {
+                            deferred.reject(error);
+                        }, 400);
+                    });
+                };
+
+                scope.closeModal = function() {
+                    modal.hide();
+                    scope.$destroy();
+
+                    if (!resolved) {
+                        // Wait a bit to reject to prevent Ionic bug: https://github.com/driftyco/ionic/issues/9069
+                        $timeout(function() {
+                            deferred.reject(mmCoreDontShowError);
+                        }, 400);
+                    }
+                };
+
+                scope.$on('$destroy', function() {
+                    modal.remove();
+                });
+
+                return deferred.promise;
+            });
+        }
+    };
+
+    /**
+     * Get the download size of a module.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#getDownloadSize
+     * @param  {Object} module       Module to get the size.
+     * @param  {Number} courseId     Course ID the module belongs to.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Object}              With the file size and a boolean to indicate if it is the total size or only partial.
+     */
+    self.getDownloadSize = function(module, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var lesson,
+            password,
+            result;
+
+        return $mmaModLesson.getLesson(courseId, module.id, siteId).then(function(lessonData) {
+            lesson = lessonData;
+
+            // Get the lesson password if it's needed.
+            return self.gatherLessonPassword(lesson.id, false, true, true, siteId);
+        }).then(function(data) {
+            password = data.password;
+            lesson = data.lesson || lesson;
+
+            // Get intro files and media files.
+            var files = lesson.mediafiles || [];
+            files = files.concat(self.getIntroFilesFromInstance(module, lesson));
+
+            result = $mmUtil.sumFileSizes(files);
+
+            // Get the pages to calculate the size.
+            return $mmaModLesson.getPages(lesson.id, password);
+        }).then(function(pages) {
+            angular.forEach(pages, function(page) {
+                result.size += page.filessizetotal;
+            });
+
+            return result;
+        });
+    };
+
+    /**
+     * Get the downloaded size of a module.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#getDownloadedSize
+     * @param {Object} module   Module to get the downloaded size.
+     * @param {Number} courseId Course ID the module belongs to.
+     * @return {Promise}        Promise resolved with the size.
+     */
+    self.getDownloadedSize = function(module, courseId) {
+        return $mmFilepool.getFilesSizeByComponent($mmSite.getId(), self.component, module.id);
+    };
+
+    /**
+     * Get revision of a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#getRevision
+     * @param {Object} module   Module to get the revision.
+     * @param {Number} courseId Course ID the module belongs to.
+     * @return {Number}         Promise resolved with revision.
+     */
+    self.getRevision = function(module, courseId) {
+        // Lessons will always be controlled using the getCourseUpdates.
+        return 0;
+    };
+
+    /**
+     * Get timemodified of a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#getTimemodified
+     * @param {Object} module    Module to get the timemodified.
+     * @param {Number} courseId  Course ID the module belongs to.
+     * @return {Promise}         Promise resolved with timemodified.
+     */
+    self.getTimemodified = function(module, courseId) {
+        var siteId = $mmSite.getId(),
+            lesson,
+            password,
+            timemodified = 0;
+
+        return $mmaModLesson.getLesson(courseId, module.id, siteId).then(function(lessonData) {
+            lesson = lessonData;
+
+            // Get the lesson password if it's needed.
+            return self.gatherLessonPassword(lesson.id, false, false, false, siteId);
+        }).then(function(data) {
+            password = data.password;
+            lesson = data.lesson || lesson;
+
+            var promises = [],
+                files = lesson.mediafiles || [];
+            files = files.concat(self.getIntroFilesFromInstance(module, lesson));
+
+            timemodified = Math.max(lesson.timemodified || 0, $mmFilepool.getTimemodifiedFromFileList(files));
+
+            // Get the list of pages.
+            promises.push($mmaModLesson.getPages(lesson.id, password, false, false, siteId).then(function(pages) {
+                // Check the timemodified of each page. Don't check the files in each page because it requires a WS call
+                // per page and it will fail if the user hasn't attempted the lesson yet.
+                angular.forEach(pages, function(data) {
+                    timemodified = Math.max(timemodified, data.page.timemodified || data.page.timecreated || 0);
+                });
+            }));
+
+            // Get the user timer to check the last user action.
+            promises.push($mmaModLesson.getTimers(lesson.id, false, false, siteId).then(function(timers) {
+                var lastTimer = timers[timers.length - 1];
+                console.log('ABCDE TIMERS', lastTimer);
+                if (lastTimer) {
+                    timemodified = Math.max(timemodified, lastTimer.starttime || 0,
+                            lastTimer.lessontime || 0, lastTimer.timemodifiedoffline || 0);
+                }
+            }).catch(function() {
+                // Ignore errors.
+            }));
+
+            return $q.all(promises);
+        }).then(function() {
+            console.log('ABCDE TIMEMOD END', timemodified);
+            return timemodified;
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId) {
+        return $mmaModLesson.invalidateContent(moduleId, courseId);
+    };
+
+    /**
+     * Invalidates WS calls needed to determine module status.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#invalidateModule
+     * @param  {Object} module   Module to invalidate.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.invalidateModule = function(module, courseId) {
+        // Invalidate data to determine if module is downloadable.
+        return $mmaModLesson.getLesson(courseId, module.id, false, true).then(function(lesson) {
+            var promises = [];
+
+            promises.push($mmaModLesson.invalidateLessonData(courseId));
+            promises.push($mmaModLesson.invalidateAccessInformation(lesson.id));
+
+            return $q.all(promises);
+        });
+    };
+
+    /**
+     * Check if a lesson is downloadable.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#isDownloadable
+     * @param {Object} module    Module to check.
+     * @param {Number} courseId  Course ID the module belongs to.
+     * @return {Promise}         Promise resolved with true if downloadable, resolved with false otherwise.
+     */
+    self.isDownloadable = function(module, courseId) {
+        var siteId = $mmSite.getId();
+        return $mmaModLesson.getLesson(courseId, module.id, siteId).then(function(lesson) {
+            if (!$mmaModLesson.isLessonOffline(lesson)) {
+                return false;
+            }
+
+            // Check if there is any prevent access reason.
+            return $mmaModLesson.getAccessInformation(lesson.id, false, false, siteId).then(function(info) {
+                // It's downloadable if there are no prevent access reasons or there is just 1 and it's password.
+                return !info.preventaccessreasons || !info.preventaccessreasons.length ||
+                        (info.preventaccessreasons.length == 1 && $mmaModLesson.isPasswordProtected(info));
+            });
+        });
+    };
+
+    /**
+     * Whether or not the module is enabled for the site.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#isEnabled
+     * @return {Boolean} True if enabled, false otherwise.
+     */
+    self.isEnabled = function() {
+        return $mmaModLesson.isPluginEnabled();
+    };
+
+    /**
+     * Prefetch the module.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonPrefetchHandler#prefetch
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @param  {Boolean} single  True if we're downloading a single module, false if we're downloading a whole section.
+     * @return {Promise}         Promise resolved when the prefetch is finished. Data returned is not reliable.
+     */
+    self.prefetch = function(module, courseId, single) {
+        return self.prefetchPackage(module, courseId, single, prefetchLesson, $mmSite.getId());
+    };
+
+    /**
+     * Prefetch a lesson.
+     *
+     * @param  {Object} module   The module object returned by WS.
+     * @param  {Number} courseId Course ID the module belongs to.
+     * @param  {Boolean} single  True if we're downloading a single module, false if we're downloading a whole section.
+     * @param  {String} siteId   Site ID.
+     * @return {Promise}         Promise resolved with an object with 'revision' and 'timemod'.
+     */
+    function prefetchLesson(module, courseId, single, siteId) {
+        var lesson,
+            password,
+            accessInfo;
+
+        return $mmaModLesson.getLesson(courseId, module.id, siteId).then(function(lessonData) {
+            lesson = lessonData;
+
+            // Get the lesson password if it's needed.
+            return self.gatherLessonPassword(lesson.id, false, true, single, siteId);
+        }).then(function(data) {
+            password = data.password;
+            lesson = data.lesson || lesson;
+            accessInfo = data.info;
+
+            if (!$mmaModLesson.leftDuringTimed(accessInfo)) {
+                // The user didn't left during a timed session. Call launch attempt to make sure there is a started attempt.
+                return $mmaModLesson.launchAttempt(lesson.id, password, false, false, siteId);
+            }
+        }).then(function() {
+            var promises = [],
+                files;
+
+            // Download intro files and media files.
+            files = lesson.mediafiles || [];
+            files = files.concat(self.getIntroFilesFromInstance(module, lesson));
+
+            angular.forEach(files, function(file) {
+                var url = file.url || file.fileurl;
+                promises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
+            });
+
+            // Get the list of pages.
+            promises.push($mmaModLesson.getPages(lesson.id, password, false, true, siteId).then(function(pages) {
+                var subPromises = [];
+
+                // Get the data for each page.
+                angular.forEach(pages, function(data) {
+                    subPromises.push($mmaModLesson.getPageData(lesson.id, data.page.id, password, false, true, false, true, siteId)
+                            .then(function(pageData) {
+
+                        // Download the page files.
+                        var filePromises = [],
+                            pageFiles = pageData.contentfiles || [];
+
+                        angular.forEach(pageData.answers, function(answer) {
+                            if (answer.answerfiles && answer.answerfiles.length) {
+                                pageFiles = pageFiles.concat(answer.answerfiles);
+                            }
+                            if (answer.responsefiles && answer.responsefiles.length) {
+                                pageFiles = pageFiles.concat(answer.responsefiles);
+                            }
+                        });
+
+                        angular.forEach(pageFiles, function(file) {
+                            var url = file.url || file.fileurl;
+                            filePromises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
+                        });
+
+                        return $q.all(filePromises);
+                    }));
+                });
+
+                return $q.all(subPromises);
+            }));
+
+            // Prefetch user timers to be able to calculate timemodified in offline.
+            promises.push($mmaModLesson.getTimers(lesson.id, false, true, siteId).catch(function() {
+                // Ignore errors.
+            }));
+
+            return $q.all(promises);
+        }).then(function() {
+            // Return revision and timemodified.
+            return {
+                revision: 0,
+                timemod: $mmUtil.timestamp()
+            };
+        });
+    }
+
+    return self;
+});
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 29e2c42722a..36089ae0912 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -5,6 +5,8 @@
             <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
             <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
             <mm-context-menu-item priority="700" ng-if="lessonLoaded && isOnline" content="'mm.core.refresh' | translate" action="refreshLesson(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="500" ng-if="timemodified" content="timemodified" icon-action="prefetchStatusIcon" action="prefetch()" close-on-click="false"></mm-context-menu-item>
+            <mm-context-menu-item priority="400" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModLessonIndexScroll" >
diff --git a/www/addons/mod/lesson/templates/password-modal.html b/www/addons/mod/lesson/templates/password-modal.html
new file mode 100644
index 00000000000..c8a0b9873af
--- /dev/null
+++ b/www/addons/mod/lesson/templates/password-modal.html
@@ -0,0 +1,15 @@
+<ion-modal-view class="mma-mod_lesson-password-modal">
+    <ion-header-bar class="bar bar-header">
+        <h1 class="title">{{ 'mm.login.password' | translate}}</h1>
+        <button class="button button-icon ion-close-round" ng-click="closeModal()" aria-label="{{ 'mm.core.close' | translate }}"></button>
+    </ion-header-bar>
+    <ion-content>
+        <form class="list">
+            <ion-input class="item item-input item-stacked-label">
+                <ion-label>{{ 'mma.mod_lesson.enterpassword' | translate }}</ion-label>
+                <input id="mma-mod-lesson-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="data.password" mm-show-password>
+                <button class="button button-block" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+            </ion-input>
+        </form>
+    </ion-content>
+</ion-modal-view>
diff --git a/www/core/components/course/services/helper.js b/www/core/components/course/services/helper.js
index 8194a374fb3..1f6e4b7f5b3 100644
--- a/www/core/components/course/services/helper.js
+++ b/www/core/components/course/services/helper.js
@@ -23,7 +23,7 @@ angular.module('mm.core.course')
  */
 .factory('$mmCourseHelper', function($q, $mmCoursePrefetchDelegate, $mmFilepool, $mmUtil, $mmCourse, $mmSite, $state, $mmText,
             mmCoreNotDownloaded, mmCoreOutdated, mmCoreDownloading, mmCoreCourseAllSectionsId, $mmSitesManager, $mmAddonManager,
-            $controller, $mmCourseDelegate, $translate, $mmEvents, mmCoreEventPackageStatusChanged) {
+            $controller, $mmCourseDelegate, $translate, $mmEvents, mmCoreEventPackageStatusChanged, mmCoreNotDownloadable) {
 
     var self = {},
         calculateSectionStatus = false;
@@ -715,11 +715,15 @@ angular.module('mm.core.course')
         return self.getModulePrefetchInfo(module, courseId, invalidateCache).then(function(moduleInfo) {
             scope.size = moduleInfo.size > 0 ? moduleInfo.sizeReadable : 0;
             scope.prefetchStatusIcon = moduleInfo.statusIcon;
-            if (moduleInfo.timemodified > 0) {
-                scope.timemodified = $translate.instant('mm.core.lastmodified') + ': ' + moduleInfo.timemodifiedReadable;
-            } else {
-                // Cannot calculate time modified, show a default text.
-                scope.timemodified = $translate.instant('mm.core.download');
+
+            if (moduleInfo.status != mmCoreNotDownloadable) {
+                // Module is downloadable, calculate timemodified.
+                if (moduleInfo.timemodified > 0) {
+                    scope.timemodified = $translate.instant('mm.core.lastmodified') + ': ' + moduleInfo.timemodifiedReadable;
+                } else {
+                    // Cannot calculate time modified, show a default text.
+                    scope.timemodified = $translate.instant('mm.core.download');
+                }
             }
 
             if (typeof scope.statusObserver == 'undefined' && component) {
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 0202aacc1c1..3570f249397 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -69,7 +69,7 @@ angular.module('mm.core')
     this.$get = function($ionicLoading, $ionicPopup, $injector, $translate, $http, $log, $q, $mmLang, $mmFS, $timeout, $mmApp,
                 $mmText, mmCoreWifiDownloadThreshold, mmCoreDownloadThreshold, $ionicScrollDelegate, $mmWS, $cordovaInAppBrowser,
                 $mmConfig, mmCoreSettingsRichTextEditor, $rootScope, $ionicPlatform, $ionicHistory, mmCoreSplitViewBlock, $state,
-                $window, $cordovaClipboard) {
+                $window, $cordovaClipboard, mmCoreDontShowError) {
 
         $log = $log.getInstance('$mmUtil');
 
@@ -736,8 +736,10 @@ angular.module('mm.core')
          *                                    If not defined, modal won't be automatically closed.
          */
         self.showErrorModalDefault = function(errorMessage, defaultError, needsTranslate, autocloseTime) {
-            errorMessage = typeof errorMessage == 'string' ? errorMessage : defaultError;
-            return self.showErrorModal(errorMessage, needsTranslate, autocloseTime);
+            if (errorMessage != mmCoreDontShowError) {
+                errorMessage = typeof errorMessage == 'string' ? errorMessage : defaultError;
+                return self.showErrorModal(errorMessage, needsTranslate, autocloseTime);
+            }
         };
 
         /**
diff --git a/www/core/main.js b/www/core/main.js
index ad786c324bb..64b2e2ba88d 100644
--- a/www/core/main.js
+++ b/www/core/main.js
@@ -24,6 +24,7 @@ angular.module('mm.core', ['pascalprecht.translate'])
 .constant('mmCoreSecondsDay', 86400)
 .constant('mmCoreSecondsHour', 3600)
 .constant('mmCoreSecondsMinute', 60)
+.constant('mmCoreDontShowError', 'mmCoreDontShowError') // Pass it to reject functions to indicate that no error should be shown.
 
 // States for downloading files/modules.
 .constant('mmCoreDownloaded', 'downloaded')

From 6bb79e7c516c7fdc02f03ec67d6e77a4ad897fa5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 4 Apr 2017 14:35:17 +0200
Subject: [PATCH 082/218] MOBILE-2015 lesson: Support processPage in offline

---
 www/addons/mod/lesson/controllers/index.js    |  89 ++-
 www/addons/mod/lesson/controllers/player.js   |  49 +-
 www/addons/mod/lesson/lang/en.json            |  10 +
 www/addons/mod/lesson/services/lesson.js      | 706 +++++++++++++++++-
 .../mod/lesson/services/lesson_offline.js     | 218 ++++++
 .../mod/lesson/services/prefetch_handler.js   |  14 +-
 www/addons/mod/lesson/templates/index.html    |   7 +-
 www/addons/mod/quiz/controllers/index.js      |   5 +-
 www/core/components/grades/main.js            |   4 +
 9 files changed, 1064 insertions(+), 38 deletions(-)
 create mode 100644 www/addons/mod/lesson/services/lesson_offline.js

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index 3c38f4fd53a..70b6843afd9 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -23,7 +23,8 @@ angular.module('mm.addons.mod_lesson')
  */
 .controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
             $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged,
-            $ionicHistory) {
+            $ionicHistory, mmCoreEventPackageStatusChanged, mmCoreDownloading, mmCoreDownloaded, $mmCoursePrefetchDelegate,
+            $mmaModLessonPrefetchHandler, $mmSite) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -31,7 +32,9 @@ angular.module('mm.addons.mod_lesson')
         accessInfo,
         scrollView,
         onlineObserver,
-        password;
+        password,
+        currentStatus,
+        statusObserver;
 
     $scope.title = module.name;
     $scope.moduleUrl = module.url;
@@ -60,6 +63,12 @@ angular.module('mm.addons.mod_lesson')
 
             accessInfo = info;
 
+            if ($mmaModLesson.isLessonOffline(lesson)) {
+                // Handle status.
+                setStatusListener();
+                getStatus().then(updateStatus);
+            }
+
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
                 var askPassword = info.preventaccessreasons.length == 1 && $mmaModLesson.isPasswordProtected(info);
                 if (askPassword) {
@@ -135,6 +144,7 @@ angular.module('mm.addons.mod_lesson')
             promises.push($mmaModLesson.invalidateAccessInformation(lesson.id));
             promises.push($mmaModLesson.invalidatePages(lesson.id));
             promises.push($mmaModLesson.invalidateLessonWithPassword(lesson.id));
+            promises.push($mmaModLesson.invalidateTimers(lesson.id));
         }
 
         return $q.all(promises).finally(function() {
@@ -168,6 +178,47 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    // Open the lesson player.
+    function playLesson(continueLast) {
+        // Calculate the pageId to load. If there is timelimit, lesson is always restarted from the start.
+        var pageId = false;
+        if ($scope.leftDuringTimed && !lesson.timelimit) {
+            pageId = continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid;
+        }
+
+        $state.go('site.mod_lesson-player', {
+            courseid: courseId,
+            lessonid: lesson.id,
+            pageid: pageId,
+            password: password
+        });
+    }
+
+    // Get status of the lesson.
+    function getStatus() {
+        return $mmCoursePrefetchDelegate.getModuleStatus(module, courseId);
+    }
+
+    // Set a listener to monitor changes on this lesson status.
+    function setStatusListener() {
+        if (typeof statusObserver !== 'undefined') {
+            return; // Already set.
+        }
+
+        // Listen for changes on this module status to show a message to the user.
+        statusObserver = $mmEvents.on(mmCoreEventPackageStatusChanged, function(data) {
+            if (data.siteid === $mmSite.getId() && data.componentId === module.id && data.component === mmaModLessonComponent) {
+                updateStatus(data.status);
+            }
+        });
+    }
+
+    // Update current lesson status.
+    function updateStatus(status) {
+        currentStatus = status;
+        $scope.showSpinner = status == mmCoreDownloading;
+    }
+
     // Fetch the Lesson data.
     fetchLessonData().then(function() {
         if (!$scope.preventMessages || !$scope.preventMessages.length) {
@@ -181,18 +232,31 @@ angular.module('mm.addons.mod_lesson')
 
     // Start the lesson.
     $scope.start = function(continueLast) {
-        // Calculate the pageId to load. If there is timelimit, lesson is always restarted from the start.
-        var pageId = false;
-        if ($scope.leftDuringTimed && !lesson.timelimit) {
-            pageId = continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid;
+        if ($scope.showSpinner) {
+            // Lesson is being downloaded, abort.
+            return;
         }
 
-        $state.go('site.mod_lesson-player', {
-            courseid: courseId,
-            lessonid: lesson.id,
-            pageid: pageId,
-            password: password
-        });
+        if ($mmaModLesson.isLessonOffline(lesson)) {
+            // Lesson supports offline, check if it needs to be downloaded.
+            if (currentStatus != mmCoreDownloaded) {
+                // Prefetch the lesson.
+                $scope.showSpinner = true;
+                return $mmaModLessonPrefetchHandler.prefetch(module, courseId, true).then(function() {
+                    // Success downloading, open lesson.
+                    playLesson(continueLast);
+                }).catch(function(error) {
+                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                }).finally(function() {
+                    $scope.showSpinner = false;
+                });
+            } else {
+                // Already downloaded, open it.
+                playLesson(continueLast);
+            }
+        } else {
+            playLesson(continueLast);
+        }
     };
 
     // Submit password for password protected lessons.
@@ -263,6 +327,7 @@ angular.module('mm.addons.mod_lesson')
 
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
+        statusObserver && statusObserver.off && statusObserver.off();
     });
 
 });
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 350bdbd76f1..237003532e0 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -32,7 +32,8 @@ angular.module('mm.addons.mod_lesson')
         offline = false,
         scrollView,
         originalData,
-        blockData;
+        blockData,
+        jumps;
 
     // Block the lesson so it cannot be synced.
     $mmSyncBlock.blockOperation(mmaModLessonComponent, lessonId);
@@ -53,8 +54,22 @@ angular.module('mm.addons.mod_lesson')
             $scope.lesson = lesson;
             $scope.title = lesson.name; // Temporary title.
 
+            if ($mmaModLesson.isLessonOffline(lesson)) {
+                // Lesson supports offline.
+                return true;
+            } else {
+                // Lesson doesn't support offline right now, but maybe it did and then the setting was changed.
+                // @todo
+                // return $mmaModQuiz.isLastAttemptOfflineUnfinished(quiz);
+                return false;
+            }
+        }).then(function(offlineMode) {
+            offline = offlineMode;
+
             return $mmaModLesson.getAccessInformation(lesson.id, offline, true);
         }).then(function(info) {
+            var promises = [];
+
             accessInfo = info;
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
                 // If it's a password protected lesson and we have the password, allow attempting it.
@@ -66,11 +81,20 @@ angular.module('mm.addons.mod_lesson')
 
             if (password) {
                 // Lesson uses password, get the whole lesson object.
-                return $mmaModLesson.getLessonWithPassword(lesson.id, password, true, offline, true).then(function(lessonData) {
-                    lesson = lessonData;
+                promises.push($mmaModLesson.getLessonWithPassword(lesson.id, password, true, offline, true).then(function(less) {
+                    lesson = less;
                     $scope.lesson = lesson;
-                });
+                }));
             }
+
+            if (offline) {
+                // Offline mode, get the list of possible jumps to allow navigation.
+                promises.push($mmaModLesson.getPagesPossibleJumps(lesson.id, offline).then(function(jumpList) {
+                    jumps = jumpList;
+                }));
+            }
+
+            return $q.all(promises);
         }).then(function() {
             $scope.mediaFile = lesson.mediafiles && lesson.mediafiles[0];
 
@@ -87,7 +111,16 @@ angular.module('mm.addons.mod_lesson')
 
     // Start or continue an attempt.
     function launchAttempt(pageId) {
-        return $mmaModLesson.launchAttempt(lesson.id, password, pageId).then(function(data) {
+        var promise;
+
+        if (!offline) {
+            // Not in offline mode, launch the attempt.
+            promise = $mmaModLesson.launchAttempt(lesson.id, password, pageId);
+        } else {
+            promise = $q.when({});
+        }
+
+        return promise.then(function(data) {
             $scope.currentPage = pageId || accessInfo.firstpageid;
             $scope.messages = data.messages || [];
 
@@ -105,7 +138,8 @@ angular.module('mm.addons.mod_lesson')
 
     // Load a certain page.
     function loadPage(pageId) {
-        return $mmaModLesson.getPageData(lesson.id, pageId, password, $scope.review, true, offline, true).then(function(data) {
+        return $mmaModLesson.getPageData(lesson, pageId, password, $scope.review, true, offline, true, accessInfo, jumps)
+                .then(function(data) {
             if (data.newpageid == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
                 return finishAttempt();
@@ -211,7 +245,8 @@ angular.module('mm.addons.mod_lesson')
     function processPage(data) {
         showLoading();
 
-        return $mmaModLesson.processPage(lessonId, $scope.currentPage, data, password, $scope.review).then(function(result) {
+        return $mmaModLesson.processPage(lesson, courseId, $scope.pageData, data, password, $scope.review,
+                offline, accessInfo, jumps).then(function(result) {
             if (result.nodefaultresponse || result.inmediatejump) {
                 // Don't display feedback or force a redirect to a new page. Load the new page.
                 return jumpToPage(result.newpageid);
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 86f491f8975..1a4469fd21f 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,4 +1,6 @@
 {
+    "attemptsremaining": "You have {{$a}} attempt(s) remaining",
+    "clusterjump": "Unseen question within a cluster",
     "congratulations": "Congratulations - end of lesson reached",
     "continue": "Continue",
     "continuetonextpage": "Continue to next page.",
@@ -11,6 +13,10 @@
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
     "loginfail": "Login failed, please try again...",
+    "numberofcorrectanswers": "Number of correct answers: {{$a}}",
+    "numberofpagesviewednotice": "Number of questions answered: {{$a.nquestions}} (You should answer at least {{$a.minquestions}})",
+    "ongoingcustom": "You have earned {{$a.score}} point(s) out of {{$a.currenthigh}} point(s) thus far.",
+    "ongoingnormal": "You have answered {{$a.correct}} correctly out of {{$a.viewed}} attempts.",
     "or": "OR",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
     "reviewlesson": "Review lesson",
@@ -18,7 +24,11 @@
     "reviewquestioncontinue": "No, I just want to go on to the next question",
     "startattempt": "Start attempt",
     "submit": "Submit",
+    "teacherongoingwarning": "Ongoing score is only displayed for student.  Login as a student to test ongoing score",
+    "teachertimerwarning": "Timer only works for students.  Test the timer by logging in as a student.",
+    "teacherjumpwarning": "An {{$a.cluster}} jump or an {{$a.unseen}} jump is being used in this lesson.  The next page jump will be used instead.  Login as a student to test these jumps.",
     "timeremaining": "Time remaining",
+    "unseenpageinbranch": "Unseen question within a content page",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
     "youranswer": "Your answer"
 }
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 62b80d74038..4e7eb63a472 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -34,13 +34,19 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLesson
  */
-.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $mmLang) {
+.factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $mmLang, $mmaModLessonOffline,
+            $translate, $mmSite, mmCoreGradeTypeNone) {
 
     $log = $log.getInstance('$mmaModLesson');
 
     var self = {};
 
+    // End of Lesson.
     self.LESSON_EOL = -9;
+    // Jump to an unseen page within a branch and end of branch or end of lesson.
+    self.LESSON_UNSEENBRANCHPAGE = -50;
+    // Cluster Jump.
+    self.LESSON_CLUSTERJUMP = -80;
 
     // Constants used to identify the type of pages and questions.
     self.TYPE_QUESTION = 0;
@@ -57,6 +63,108 @@ angular.module('mm.addons.mod_lesson')
     self.LESSON_PAGE_CLUSTER =      30;
     self.LESSON_PAGE_ENDOFCLUSTER = 31;
 
+    /**
+     * Calculate some offline data like progress and ongoingscore.
+     *
+     * @param  {Object} lesson     Lesson.
+     * @param  {Object} accessInfo Result of get access info.
+     * @param  {String} [password] Lesson password (if any).
+     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with the calculated data.
+     */
+    function calculateOfflineData(lesson, accessInfo, password, review, siteId) {
+        accessInfo = accessInfo || {};
+
+        var reviewMode = review || accessInfo.reviewmode,
+            ongoingMessage = '',
+            progress,
+            promises = [];
+
+        if (!accessInfo.canmanage) {
+            if (lesson.ongoing && !reviewMode) {
+                ongoingMessage = self.getOngoingScoreMessage(lesson, accessInfo, review);
+            }
+            if (lesson.progressbar) {
+                promises.push(self.calculateProgress(lesson.id, accessInfo, password, review, false, siteId).then(function(p) {
+                    progress = p;
+                }));
+            }
+        }
+
+        return $q.all(promises).then(function() {
+            return {
+                reviewmode: reviewMode,
+                progress: progress,
+                ongoingscore: ongoingMessage
+            };
+        });
+    }
+
+    /**
+     * Calculate the progress of the current user in the lesson.
+     * Based on Moodle's calculate_progress.
+     *
+     * @param  {Number} lessonId   Lesson ID.
+     * @param  {Object} accessInfo Result of get access info.
+     * @param  {String} [password] Lesson password (if any).
+     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object[]} [pages]  Result of getPages. If not defined, it will be calculated.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with a number: the progress (scale 0-100).
+     */
+    self.calculateProgress = function(lessonId, accessInfo, password, review, pages, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        // Check if the user is reviewing the attempt.
+        if (review) {
+            return 100;
+        }
+
+        var promise = pages ? $q.when(pages) : self.getPages(lessonId, password, true, false, siteId),
+            pageIndex;
+
+        return promise.then(function(pages) {
+            pageIndex = createPagesIndex(pages);
+
+            // @todo Question pages.
+
+            // Get the list of viewed content pages.
+            return self.getContentPagesViewedIds(lessonId, accessInfo.attemptscount, siteId);
+        }).then(function(viewedPagesIds) {
+            var pageId = accessInfo.firstpageid,
+                validPages = {};
+
+            // Filter out the following pages:
+            // - End of Cluster
+            // - End of Branch
+            // - Pages found inside of Clusters
+            // Do not filter out Cluster Page(s) because we count a cluster as one.
+            // By keeping the cluster page, we get our 1.
+            while (pageId) {
+                pageId = self.validPageAndView(pageIndex, pageIndex[pageId], validPages, viewedPagesIds);
+            }
+
+            // Progress calculation as a percent.
+            return $mmUtil.roundToDecimals(viewedPagesIds.length / Object.keys(validPages).length, 2) * 100;
+        });
+    };
+
+    /**
+     * Create a list of pages indexed by page ID based on a list of pages.
+     *
+     * @param  {Object[]} pageList Result of get pages.
+     * @return {Object}            Pages index.
+     */
+    function createPagesIndex(pageList) {
+        // Index the pages by page ID.
+        var pages = {};
+        angular.forEach(pageList, function(pageData) {
+            pages[pageData.page.id] = pageData.page;
+        });
+        return pages;
+    }
+
     /**
      * Finishes an attempt.
      *
@@ -122,7 +230,7 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
      * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]       Site ID. If not defined, current site.
-     * @return {Promise}               Promise resolved with the access information-
+     * @return {Promise}               Promise resolved with the access information.
      */
     self.getAccessInformation = function(lessonId, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -144,6 +252,125 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get content pages viewed in online and offline.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getContentPagesViewed
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with an object with the online and offline viewed pages.
+     */
+    self.getContentPagesViewed = function(lessonId, attempt, siteId) {
+        var promises = [],
+            type = self.TYPE_STRUCTURE,
+            result = {
+                online: [],
+                offline: []
+            };
+
+        // Get the online pages.
+        promises.push(self.getContentPagesViewedOnline(lessonId, attempt, false, false, siteId).then(function(pages) {
+            result.online = pages;
+        }));
+
+        // Get the offline pages.
+        promises.push($mmaModLessonOffline.getAttemptAnswersForType(lessonId, attempt, type, siteId).catch(function() {
+            return [];
+        }).then(function(pages) {
+            result.offline = pages;
+        }));
+
+        return $q.all(promises).then(function() {
+            return result;
+        });
+    };
+
+    /**
+     * Get IDS of content pages viewed in online and offline.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getContentPagesViewedIds
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with list of IDs.
+     */
+    self.getContentPagesViewedIds = function(lessonId, attempt, siteId) {
+        return self.getContentPagesViewed(lessonId, attempt, siteId).then(function(result) {
+            var ids = {},
+                pages = result.online.concat(result.offline);
+
+            angular.forEach(pages, function(page) {
+                if (!ids[page.pageid]) {
+                    ids[page.pageid] = true;
+                }
+            });
+
+            return Object.keys(ids);
+        });
+    };
+
+    /**
+     * Get cache key for get content pages viewed WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @return {String}         Cache key.
+     */
+    function getContentPagesViewedCacheKey(lessonId, attempt) {
+        return getContentPagesViewedCommonCacheKey(lessonId) + ':' + attempt;
+    }
+
+    /**
+     * Get common cache key for get content pages viewed WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}         Cache key.
+     */
+    function getContentPagesViewedCommonCacheKey(lessonId) {
+        return 'mmaModLesson:contentPagesViewed:' + lessonId;
+    }
+
+    /**
+     * Get the list of content pages viewed in the site for a certain attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getContentPagesViewedOnline
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} attempt        Attempt number.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the access information.
+     */
+    self.getContentPagesViewedOnline = function(lessonId, attempt, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId,
+                    lessonattempt: attempt
+                },
+                preSets = {
+                    cacheKey: getContentPagesViewedCacheKey(lessonId, attempt)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_content_pages_viewed', params, preSets).then(function(result) {
+                return result.pages;
+            });
+        });
+    };
+
     /**
      * Get cache key for Lesson data WS calls.
      *
@@ -292,6 +519,43 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get the ongoing score message for the user (depending on the user permission and lesson settings).
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getOngoingScoreMessage
+     * @param  {Object} lesson     Lesson.
+     * @param  {Object} accessInfo Result of get access info.
+     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
+     * @return {String}            Ongoing score message.
+     */
+    self.getOngoingScoreMessage = function(lesson, accessInfo, review) {
+        if (accessInfo.canmanage) {
+            return $translate.instant('mma.mod_lesson.teacherongoingwarning');
+        } else {
+            var ntries = accessInfo.attemptscount;
+            if (review) {
+                ntries--;
+            }
+
+            var gradeInfo = self.lessonGrade(),
+                data = {};
+
+            if (lesson.custom) {
+                data.score = gradeInfo.earned;
+                data.currenthigh = gradeInfo.total;
+                return $translate.instant('mma.mod_lesson.ongoingcustom', {$a: data});
+            } else {
+                data.correct = gradeInfo.earned;
+                data.viewed = gradeInfo.attempts;
+                return $translate.instant('mma.mod_lesson.ongoingnormal', {$a: data});
+            }
+        }
+
+        return '';
+    };
+
     /**
      * Get cache key for get page data WS calls.
      *
@@ -319,26 +583,30 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getPageData
-     * @param  {Number} lessonId           Lesson ID.
+     * @param  {Object} lesson             Lesson.
      * @param  {Number} pageId             Page ID.
      * @param  {String} [password]         Lesson password (if any).
      * @param  {Boolean} [review]          If the user wants to review just after finishing (1 hour margin).
      * @param  {Boolean} [includeContents] Include the page rendered contents.
      * @param  {Boolean} [forceCache]      True if it should return cached data. Has priority over ignoreCache.
      * @param  {Boolean} [ignoreCache]     True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {Object} [accessInfo]       Result of get access info. Required if offline is true.
+     * @param  {Object} [jumps]            Result of get pages possible jumps. Required if offline is true.
      * @param  {String} [siteId]           Site ID. If not defined, current site.
      * @return {Promise}                   Promise resolved with the page data.
      */
-    self.getPageData = function(lessonId, pageId, password, review, includeContents, forceCache, ignoreCache, siteId) {
+    self.getPageData = function(lesson, pageId, password, review, includeContents, forceCache, ignoreCache, accessInfo, jumps, siteId) {
+        siteId = siteId || $mmSite.getId();
+
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
-                    lessonid: lessonId,
+                    lessonid: lesson.id,
                     pageid: pageId,
                     review: review ? 1 : 0,
                     returncontents: includeContents ? 1 : 0
                 },
                 preSets = {
-                    cacheKey: getPageDataCacheKey(lessonId, pageId)
+                    cacheKey: getPageDataCacheKey(lesson.id, pageId)
                 };
 
             if (typeof password == 'string') {
@@ -352,7 +620,26 @@ angular.module('mm.addons.mod_lesson')
                 preSets.emergencyCache = 0;
             }
 
-            return site.read('mod_lesson_get_page_data', params, preSets);
+            return site.read('mod_lesson_get_page_data', params, preSets).then(function(data) {
+                if (forceCache && accessInfo) {
+                    // Offline mode, check if there is any answer stored.
+                    var attempt = accessInfo.attemptscount;
+                    return $mmaModLessonOffline.hasAttemptAnswers(lesson.id, attempt, siteId).then(function(hasAnswers) {
+                        if (!hasAnswers) {
+                            // No offline answers, return the WS data.
+                            return data;
+                        }
+
+                        // There are offline answers stored. Calculate the data that might be affected.
+                        return calculateOfflineData(lesson, accessInfo, password, review, siteId).then(function(calculatedData) {
+                            data.messages = self.getPageViewMessages(lesson, accessInfo, data.page, review, jumps);
+                            return angular.extend(data, calculatedData);
+                        });
+                    });
+                }
+
+                return data;
+            });
         });
     };
 
@@ -405,6 +692,201 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get cache key for get pages possible jumps WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}          Cache key.
+     */
+    function getPagesPossibleJumpsCacheKey(lessonId) {
+        return 'mmaModLesson:pagesJumps:' + lessonId;
+    }
+
+    /**
+     * Get possible jumps for a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getPagesPossibleJumps
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the jumps.
+     */
+    self.getPagesPossibleJumps = function(lessonId, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId,
+                },
+                preSets = {
+                    cacheKey: getPagesPossibleJumpsCacheKey(lessonId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_pages_possible_jumps', params, preSets).then(function(response) {
+                // Index the jumps by page and jumpto.
+                if (response.jumps) {
+                    var jumps = {};
+
+                    angular.forEach(response.jumps, function(jump) {
+                        if (typeof jumps[jump.pageid] == 'undefined') {
+                            jumps[jump.pageid] = {};
+                        }
+                        jumps[jump.pageid][jump.jumpto] = jump;
+                    });
+
+                    return jumps;
+                }
+                return $q.reject();
+            });
+        });
+    };
+
+    /**
+     * Get different informative messages when processing a lesson page.
+     * Please try to use WS response messages instead of this function if possible.
+     * Based on Moodle's add_messages_on_page_process.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getPageProcessMessages
+     * @param  {Object} lesson     Lesson.
+     * @param  {Object} accessInfo Result of get access info. Required if offline is true.
+     * @param  {Object} result     Result of process page.
+     * @param  {Boolean} review    If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} jumps      Result of get pages possible jumps.
+     * @return {String[]}          Messages.
+     */
+    self.getPageProcessMessages = function(lesson, accessInfo, result, review, jumps) {
+        var messages = [];
+
+        if (accessInfo.canmanage) {
+            // This is the warning msg for teachers to inform them that cluster and unseen does not work while logged in as a teacher.
+            if (self.lessonDisplayTeacherWarning(jumps)) {
+                var data = {
+                    cluster: $translate.instant('mma.mod_lesson.clusterjump'),
+                    unseen: $translate.instant('mma.mod_lesson.unseenpageinbranch')
+                };
+                messages.push($translate.instant('mma.mod_lesson.teacherjumpwarning'), {$a: data});
+            }
+
+            // Inform teacher that s/he will not see the timer.
+            if (lesson.timelimit) {
+                messages.push($translate.instant('mma.mod_lesson.teachertimerwarning'));
+            }
+        }
+        // Report attempts remaining.
+        if (result.attemptsremaining > 0 && lesson.review && !review) {
+            messages.push($translate.instant('mma.mod_lesson.attemptsremaining'), {$a: result.attemptsremaining});
+        }
+
+        return messages;
+    };
+
+    /**
+     * Get different informative messages when viewing a lesson page.
+     * Please try to use WS response messages instead of this function if possible.
+     * Based on Moodle's add_messages_on_page_view.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getPageViewMessages
+     * @param  {Object} lesson     Lesson.
+     * @param  {Object} accessInfo Result of get access info. Required if offline is true.
+     * @param  {Object} page       Page loaded.
+     * @param  {Boolean} review    If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} jumps      Result of get pages possible jumps.
+     * @return {String[]}          Messages.
+     */
+    self.getPageViewMessages = function(lesson, accessInfo, page, review, jumps) {
+        var messages = [],
+            data;
+
+        if (!accessInfo.canmanage) {
+            if (page.qtype == self.LESSON_PAGE_BRANCHTABLE && lesson.minquestions) {
+                // Tell student how many questions they have seen, how many are required and their grade.
+                var ntries = accessInfo.attemptscount,
+                    gradeInfo = self.lessonGrade();
+
+                if (gradeInfo.attempts) {
+                    if (gradeInfo.nquestions < lesson.minquestions) {
+                        data = {
+                            nquestions: gradeInfo.nquestions,
+                            minquestions: lesson.minquestions
+                        };
+                        messages.push($translate.instant('mma.mod_lesson.numberofpagesviewednotice'), {$a: data});
+                    }
+
+                    if (!review && !lesson.retake) {
+                        messages.push($translate.instant('mma.mod_lesson.numberofcorrectanswers'), {$a: gradeInfo.earned});
+                        if (lesson.grade != mmCoreGradeTypeNone) {
+                            data = {
+                                grade: $mmUtil.roundToDecimals(gradeInfo.grade * lesson.grade / 100, 1),
+                                total: lesson.grade
+                            };
+                            messages.push($translate.instant('mma.mod_lesson.yourcurrentgradeisoutof'), {$a: data});
+                        }
+                    }
+                }
+            }
+        } else {
+            if (lesson.timelimit) {
+                messages.push($translate.instant('mma.mod_lesson.teachertimerwarning'));
+            }
+
+            if (self.lessonDisplayTeacherWarning(jumps)) {
+                // This is the warning msg for teachers to inform them that cluster
+                // and unseen does not work while logged in as a teacher.
+                data = {
+                    cluster: $translate.instant('mma.mod_lesson.clusterjump'),
+                    unseen: $translate.instant('mma.mod_lesson.unseenpageinbranch')
+                };
+                messages.push($translate.instant('mma.mod_lesson.teacherjumpwarning'), {$a: data});
+            }
+        }
+
+        return messages;
+    };
+
+    /**
+     * Finds all pages that appear to be a subtype of the provided pageid until
+     * an end point specified within "ends" is encountered or no more pages exist.
+     * Based on Moodle's get_sub_pages_of.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getSubpagesOf
+     * @param  {Object} pages  Index of lesson pages, indexed by page ID. See createPagesIndex.
+     * @param  {Number} pageId Page ID to get subpages of.
+     * @param  {Number[]} end  An array of LESSON_PAGE_* types that signify an end of the subtype.
+     * @return {Object[]}      List of subpages.
+     */
+    self.getSubpagesOf = function(pages, pageId, ends) {
+        var subPages = [];
+
+        pageId = pages[pageId].nextpageid; // Move to the first page after the given page.
+        ends = ends || [];
+
+        while (true) {
+            if (!pageId || ends.indexOf(pages[pageId].qtype) != -1) {
+                // No more pages or it reached a page of the searched types. Stop.
+                break;
+            }
+
+            subPages.push(pages[pageId]);
+            pageId = pages[pageId].nextpageid;
+        }
+
+        return subPages;
+    };
+
     /**
      * Get a password stored in DB.
      *
@@ -498,6 +980,39 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates content pages viewed for all attempts.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateContentPagesViewed
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateContentPagesViewed = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getContentPagesViewedCommonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates content pages viewed for a certain attempts.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateContentPagesViewedForAttempt
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateContentPagesViewedForAttempt = function(lessonId, attempt, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getContentPagesViewedCacheKey(lessonId, attempt));
+        });
+    };
+
     /**
      * Invalidates Lesson data.
      *
@@ -579,6 +1094,22 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates pages possible jumps.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidatePagesPossibleJumps
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidatePagesPossibleJumps = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getPagesPossibleJumpsCacheKey(lessonId));
+        });
+    };
+
     /**
      * Invalidates timers for all users in a lesson.
      *
@@ -721,6 +1252,70 @@ angular.module('mm.addons.mod_lesson')
         return info && info.lastpageseen && info.lastpageseen != self.LESSON_EOL && info.leftduringtimedsession;
     };
 
+    /**
+     * Checks to see if a LESSON_CLUSTERJUMP or a LESSON_UNSEENBRANCHPAGE is used in a lesson.
+     * Based on Moodle's lesson_display_teacher_warning.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#lessonDisplayTeacherWarning
+     * @param  {Object} jumps Result of get pages possible jumps.
+     * @return {Boolean}      Whether the lesson uses one of those jumps.
+     */
+    self.lessonDisplayTeacherWarning = function(jumps) {
+        if (!jumps) {
+            return false;
+        }
+
+        // Check if any jump is to cluster or unseen branch.
+        for (var pageId in jumps) {
+            for (var jumpto in jumps[pageId]) {
+                if (jumpto == self.LESSON_CLUSTERJUMP || jumpto == self.LESSON_UNSEENBRANCHPAGE) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    };
+
+    /**
+     * Calculates a user's grade for a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#lessonGrade
+     * @return {Object} Object with the grade data.
+     */
+    self.lessonGrade = function() {
+        // Initialize all variables.
+        var ncorrect     = 0,
+            nviewed      = 0,
+            score        = 0,
+            nmanual      = 0,
+            manualpoints = 0,
+            thegrade     = 0,
+            nquestions   = 0,
+            total        = 0,
+            earned       = 0;
+
+        // @todo Handle questions.
+
+        if (total) { // Not zero.
+            thegrade = $mmUtil.roundToDecimals(100 * earned / total, 5);
+        }
+
+        return {
+            nquestions: nquestions,
+            attempts: nviewed,
+            total: total,
+            earned: earned,
+            grade: thegrade,
+            nmanual: nmanual,
+            manualpoints: manualpoints
+        };
+    };
+
     /**
      * Report a lesson as being viewed.
      *
@@ -756,7 +1351,65 @@ angular.module('mm.addons.mod_lesson')
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#processAttempt
+     * @name $mmaModLesson#processPage
+     * @param  {Object} lesson       Lesson.
+     * @param  {Number} courseId     Course ID the lesson belongs to.
+     * @param  {Object} pageData     Result of getPageData for the page to process.
+     * @param  {Object} data         Data to save.
+     * @param  {String} [password]   Lesson password (if any).
+     * @param  {Boolean} [review]    If the user wants to review just after finishing (1 hour margin).
+     * @param  {Boolean} [offline]   Whether it's offline mode.
+     * @param  {Object} [accessInfo] Result of get access info. Required if offline is true.
+     * @param  {Object} [jumps]      Result of get pages possible jumps. Required if offline is true.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved when done.
+     */
+    self.processPage = function(lesson, courseId, pageData, data, password, review, offline, accessInfo, jumps, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var pageId = pageData.page.id;
+
+        if (offline) {
+            var attempt = accessInfo.attemptscount;
+            return $mmaModLessonOffline.processPage(lesson.id, courseId, attempt, pageData.page, data, siteId).then(function() {
+                // Data stored, now it must return the data. Calculate some needed offline data.
+                return calculateOfflineData(lesson, accessInfo, password, review, siteId);
+            }).then(function(calculatedData) {
+                // @todo Handle question pages.
+                var result = {
+                    newpageid: jumps[pageId] && jumps[pageId][data.jumpto] ? jumps[pageId][data.jumpto].calculatedjump : pageId,
+                    inmediatejump: true,
+                    answerid: 0,
+                    noanswer: false,
+                    correctanswer: false,
+                    isessayquestion: false,
+                    response: '',
+                    studentanswer: '',
+                    userresponse: null,
+                    feedback: '',
+                    nodefaultresponse: false,
+                    attemptsremaining: null,
+                    maxattemptsreached: false,
+                    displaymenu: pageData.displaymenu, // Keep the same value since we can't calculate it in offline.
+                    warnings: []
+                };
+
+                result.messages = self.getPageProcessMessages(lesson, accessInfo, result, review, jumps);
+                angular.extend(result, calculatedData);
+
+                return result;
+            });
+        }
+
+        return self.processPageOnline(lesson.id, pageId, data, password, review, siteId);
+    };
+
+    /**
+     * Process a lesson page, saving its data. It will fail if offline or cannot connect.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#processPageOnline
      * @param  {Number} lessonId   Lesson ID.
      * @param  {Number} pageId     Page ID.
      * @param  {Object} data       Data to save.
@@ -765,7 +1418,7 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved in success, rejected otherwise.
      */
-    self.processPage = function(lessonId, pageId, data, password, review, siteId) {
+    self.processPageOnline = function(lessonId, pageId, data, password, review, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 lessonid: lessonId,
@@ -821,5 +1474,40 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Function to determine if a page is a valid page. It will add the page to validPages if valid. It can also
+     * modify the list of viewedPagesIds for cluster pages.
+     * Based on Moodle's valid_page_and_view.
+     *
+     * @param  {Object} pages            Index of lesson pages, indexed by page ID. See createPagesIndex.
+     * @param  {Object} page             Page to check.
+     * @param  {Object} validPages       Valid pages, indexed by page ID.
+     * @param  {Number[]} viewedPagesIds List of viewed pages IDs.
+     * @return {Number}                  Next page ID.
+     */
+    self.validPageAndView = function(pages, page, validPages, viewedPagesIds) {
+        if (page.qtype != self.LESSON_PAGE_ENDOFCLUSTER && page.qtype != self.LESSON_PAGE_ENDOFBRANCH) {
+            // Add this page as a valid page.
+            validPages[page.id] = 1;
+        }
+
+        if (page.qtype == self.LESSON_PAGE_CLUSTER) {
+            // Get list of pages in the cluster.
+            var subPages = self.getSubpagesOf(pages, page.id, [self.LESSON_PAGE_ENDOFCLUSTER]);
+            angular.forEach(subPages, function(subPage) {
+                var position = viewedPagesIds.indexOf(subPage.id);
+                if (position != -1) {
+                    delete viewedPagesIds[position]; // Remove it.
+                    // Since the user did see one page in the cluster, add the cluster pageid to the viewedPagesIds.
+                    if (viewedPagesIds.indexOf(page.id) == -1) {
+                        viewedPagesIds.push(page.id);
+                    }
+                }
+            });
+        }
+
+        return page.nextpageid;
+    };
+
     return self;
 });
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
new file mode 100644
index 00000000000..ac90227fdbf
--- /dev/null
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -0,0 +1,218 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+.constant('mmaModLessonAttemptsStore', 'mod_lesson_attempts')
+.constant('mmaModLessonAnswersStore', 'mod_lesson_answers')
+
+.config(function($mmSitesFactoryProvider, mmaModLessonAttemptsStore, mmaModLessonAnswersStore) {
+    var stores = [
+        {
+            name: mmaModLessonAttemptsStore,
+            keyPath: 'lessonid',
+            indexes: [
+                {
+                    name: 'attempt'
+                },
+                {
+                    name: 'lessonid'
+                },
+                {
+                    name: 'courseid'
+                },
+                {
+                    name: 'timemodified'
+                },
+                {
+                    name: 'finished'
+                }
+            ]
+        },
+        {
+            name: mmaModLessonAnswersStore,
+            keyPath: ['lessonid', 'attempt', 'pageid'],
+            indexes: [
+                {
+                    name: 'lessonid'
+                },
+                {
+                    name: 'attempt'
+                },
+                {
+                    name: 'pageid'
+                },
+                {
+                    name: 'type' // Type of the page: TYPE_QUESTION or TYPE_STRUCTURE.
+                },
+                {
+                    name: 'timemodified'
+                },
+                {
+                    name: 'lessonAndPage',
+                    keyPath: ['lessonid', 'pageid']
+                },
+                {
+                    name: 'lessonAndAttempt',
+                    keyPath: ['lessonid', 'attempt']
+                },
+                {
+                    name: 'lessonAndAttemptAndPage',
+                    keyPath: ['lessonid', 'attempt', 'pageid']
+                },
+                {
+                    name: 'lessonAndAttemptAndType',
+                    keyPath: ['lessonid', 'attempt', 'type']
+                }
+            ]
+        }
+    ];
+    $mmSitesFactoryProvider.registerStores(stores);
+})
+
+/**
+ * Lesson offline service.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc service
+ * @name $mmaModLessonOffline
+ */
+.factory('$mmaModLessonOffline', function($log, $mmSitesManager, $mmUtil, $q, mmaModLessonAttemptsStore, mmaModLessonAnswersStore) {
+
+    $log = $log.getInstance('$mmaModLessonOffline');
+
+    var self = {};
+
+    /**
+     * Get all the offline attempts in a certain site.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAllAttempts
+     * @param {String} [siteId] Site ID. If not set, use current site.
+     * @return {Promise}        Promise resolved when the offline attempts are retrieved.
+     */
+    self.getAllAttempts = function(siteId) {
+        return $mmSitesManager.getSiteDb(siteId).then(function(db) {
+            if (!db) {
+                return $q.reject();
+            }
+
+            return db.getAll(mmaModLessonAttemptsStore);
+        });
+    };
+
+    /**
+     * Retrieve an attempt from site DB.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAttempt
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempt.
+     */
+    self.getAttempt = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmaModLessonAttemptsStore, lessonId);
+        });
+    };
+
+    /**
+     * Retrieve all offline answers for an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAttemptAnswers
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempt answers.
+     */
+    self.getAttemptAnswers = function(lessonId, attempt, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttempt', [lessonId, attempt]);
+        });
+    };
+
+    /**
+     * Retrieve offline answers for certain pages for an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAttemptAnswersForType
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} type     Type of the pages to get: TYPE_QUESTION or TYPE_STRUCTURE.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempt answers.
+     */
+    self.getAttemptAnswersForType = function(lessonId, attempt, type, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttemptAndType', [lessonId, attempt, type]);
+        });
+    };
+
+    /**
+     * Check if there are offline answers for an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#hasAttemptAnswers
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with a boolean.
+     */
+    self.hasAttemptAnswers = function(lessonId, attempt, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttempt', [lessonId, attempt]).then(function(list) {
+                return !!list.length;
+            });
+        }).catch(function() {
+            return false;
+        });
+    };
+
+    /**
+     * Process a lesson page, saving its data.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#processPage
+     * @param  {Number} lessonId   Lesson ID.
+     * @param  {Number} courseId   Course ID the lesson belongs to.
+     * @param  {Object} page       Page.
+     * @param  {Object} data       Data to save.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved in success, rejected otherwise.
+     */
+    self.processPage = function(lessonId, courseId, attempt, page, data, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var entry = {
+                lessonid: lessonId,
+                attempt: attempt,
+                pageid: page.id,
+                courseid: courseId,
+                data: data,
+                type: page.type,
+                timemodified: $mmUtil.timestamp()
+            };
+
+            return site.getDb().insert(mmaModLessonAnswersStore, entry);
+        });
+    };
+
+    return self;
+});
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index b0620fbb9a2..a0476cefffb 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -270,7 +270,6 @@ angular.module('mm.addons.mod_lesson')
             // Get the user timer to check the last user action.
             promises.push($mmaModLesson.getTimers(lesson.id, false, false, siteId).then(function(timers) {
                 var lastTimer = timers[timers.length - 1];
-                console.log('ABCDE TIMERS', lastTimer);
                 if (lastTimer) {
                     timemodified = Math.max(timemodified, lastTimer.starttime || 0,
                             lastTimer.lessontime || 0, lastTimer.timemodifiedoffline || 0);
@@ -281,7 +280,6 @@ angular.module('mm.addons.mod_lesson')
 
             return $q.all(promises);
         }).then(function() {
-            console.log('ABCDE TIMEMOD END', timemodified);
             return timemodified;
         });
     };
@@ -397,7 +395,7 @@ angular.module('mm.addons.mod_lesson')
         }).then(function(data) {
             password = data.password;
             lesson = data.lesson || lesson;
-            accessInfo = data.info;
+            accessInfo = data.accessinfo;
 
             if (!$mmaModLesson.leftDuringTimed(accessInfo)) {
                 // The user didn't left during a timed session. Call launch attempt to make sure there is a started attempt.
@@ -422,8 +420,8 @@ angular.module('mm.addons.mod_lesson')
 
                 // Get the data for each page.
                 angular.forEach(pages, function(data) {
-                    subPromises.push($mmaModLesson.getPageData(lesson.id, data.page.id, password, false, true, false, true, siteId)
-                            .then(function(pageData) {
+                    subPromises.push($mmaModLesson.getPageData(lesson, data.page.id, password, false, true, false,
+                            true, undefined, undefined, siteId).then(function(pageData) {
 
                         // Download the page files.
                         var filePromises = [],
@@ -455,6 +453,12 @@ angular.module('mm.addons.mod_lesson')
                 // Ignore errors.
             }));
 
+            // Prefetch the list of possible jumps for offline navigation.
+            promises.push($mmaModLesson.getPagesPossibleJumps(lesson.id, false, true, siteId));
+
+            // Prefetch viewed pages in last attempt to calculate progress.
+            promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, accessInfo.attemptscount, false, true, siteId));
+
             return $q.all(promises);
         }).then(function() {
             // Return revision and timemodified.
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 36089ae0912..85bc24bd1ae 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -29,7 +29,7 @@
                 </ion-input>
             </form>
 
-            <div ng-if="lesson && (!preventMessages || !preventMessages.length)">
+            <div ng-if="lesson && (!preventMessages || !preventMessages.length) && !showSpinner">
                 <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
                     <!-- User left during the session and there is no time limit, ask to continue. -->
                     <p class="item" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
@@ -56,6 +56,11 @@
                     </div>
                 </div>
             </div>
+            <div class="card" ng-if="showSpinner">
+                <div class="item text-center">
+                    <ion-spinner></ion-spinner>
+                </div>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/quiz/controllers/index.js b/www/addons/mod/quiz/controllers/index.js
index 21b646c8734..62d779b119f 100644
--- a/www/addons/mod/quiz/controllers/index.js
+++ b/www/addons/mod/quiz/controllers/index.js
@@ -407,10 +407,7 @@ angular.module('mm.addons.mod_quiz')
     // Showing or hide a status message depending on the SCORM status.
     function showStatus(status) {
         currentStatus = status;
-
-        if (status == mmCoreDownloading) {
-            $scope.showSpinner = true;
-        }
+        $scope.showSpinner = status == mmCoreDownloading;
     }
 
     // Fetch the Quiz data.
diff --git a/www/core/components/grades/main.js b/www/core/components/grades/main.js
index 0a231e40883..58c90db5aa6 100644
--- a/www/core/components/grades/main.js
+++ b/www/core/components/grades/main.js
@@ -14,6 +14,10 @@
 
 angular.module('mm.core.grades', [])
 
+.constant('mmCoreGradeTypeNone', 0) // Moodle's GRADE_TYPE_NONE.
+.constant('mmCoreGradeTypeValue', 1) // Moodle's GRADE_TYPE_VALUE.
+.constant('mmCoreGradeTypeScale', 2) // Moodle's GRADE_TYPE_SCALE.
+.constant('mmCoreGradeTypeText', 3) // Moodle's GRADE_TYPE_TEXT.
 
 .config(function($stateProvider) {
 

From 848884eb1297e7a4b745fae6875b28e7199b71eb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 5 Apr 2017 13:57:37 +0200
Subject: [PATCH 083/218] MOBILE-2015 lesson: Support last page seen in offline

---
 www/addons/mod/lesson/controllers/index.js    | 40 +++++++---
 www/addons/mod/lesson/services/lesson.js      | 79 ++++++++++++++++++-
 .../mod/lesson/services/lesson_offline.js     |  9 ++-
 www/addons/mod/lesson/templates/index.html    |  6 +-
 4 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index 70b6843afd9..f549a150bc4 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -24,7 +24,7 @@ angular.module('mm.addons.mod_lesson')
 .controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
             $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged,
             $ionicHistory, mmCoreEventPackageStatusChanged, mmCoreDownloading, mmCoreDownloaded, $mmCoursePrefetchDelegate,
-            $mmaModLessonPrefetchHandler, $mmSite) {
+            $mmaModLessonPrefetchHandler, $mmSite, $mmaModLessonOffline) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -59,7 +59,8 @@ angular.module('mm.addons.mod_lesson')
 
             return $mmaModLesson.getAccessInformation(lesson.id);
         }).then(function(info) {
-            var promise;
+            var promises = [],
+                promise;
 
             accessInfo = info;
 
@@ -67,6 +68,11 @@ angular.module('mm.addons.mod_lesson')
                 // Handle status.
                 setStatusListener();
                 getStatus().then(updateStatus);
+
+                // Check if there is offline data.
+                promises.push($mmaModLessonOffline.hasAttemptAnswers(lesson.id, info.attemptscount).then(function(hasAnswers) {
+                    $scope.hasOffline = hasAnswers;
+                }));
             }
 
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
@@ -89,8 +95,10 @@ angular.module('mm.addons.mod_lesson')
                 }
             }
 
-            // Lesson can be attempted, don't ask the password and don't show prevent messages.
-            fetchDataFinished(refresh);
+            return $q.all(promises).then(function() {
+                // Lesson can be attempted, don't ask the password and don't show prevent messages.
+                fetchDataFinished(refresh);
+            });
         }).catch(function(message) {
             if (!refresh && !lesson) {
                 // Get lesson failed, retry without using cache since it might be a new activity.
@@ -108,7 +116,7 @@ angular.module('mm.addons.mod_lesson')
         $scope.data.password = '';
         $scope.askPassword = false;
         $scope.preventMessages = [];
-        $scope.leftDuringTimed = $mmaModLesson.leftDuringTimed(accessInfo);
+        $scope.leftDuringTimed = $scope.hasOffline || $mmaModLesson.leftDuringTimed(accessInfo);
 
         if (pwd) {
             // Store the password in DB.
@@ -181,16 +189,22 @@ angular.module('mm.addons.mod_lesson')
     // Open the lesson player.
     function playLesson(continueLast) {
         // Calculate the pageId to load. If there is timelimit, lesson is always restarted from the start.
-        var pageId = false;
-        if ($scope.leftDuringTimed && !lesson.timelimit) {
-            pageId = continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid;
+        var promise;
+        if ($scope.hasOffline) {
+            promise = $mmaModLesson.getLastPageSeen(lesson.id, accessInfo.attemptscount);
+        } else if ($scope.leftDuringTimed && !lesson.timelimit) {
+            promise = $q.when(continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid);
+        } else {
+            promise = $q.when(false);
         }
 
-        $state.go('site.mod_lesson-player', {
-            courseid: courseId,
-            lessonid: lesson.id,
-            pageid: pageId,
-            password: password
+        return promise.then(function(pageId) {
+            $state.go('site.mod_lesson-player', {
+                courseid: courseId,
+                lessonid: lesson.id,
+                pageid: pageId,
+                password: password
+            });
         });
     }
 
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 4e7eb63a472..819b0eba142 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -371,6 +371,73 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get the last content page viewed.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getLastContentPageViewed
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the last content page viewed.
+     */
+    self.getLastContentPageViewed = function(lessonId, attempt, siteId) {
+        return self.getContentPagesViewed(lessonId, attempt, siteId).then(function(data) {
+            var lastPage,
+                maxTime = 0;
+
+            angular.forEach(data.online, function(page) {
+                if (page.timeseen > maxTime) {
+                    lastPage = page;
+                    maxTime = page.timeseen;
+                }
+            });
+
+            angular.forEach(data.offline, function(page) {
+                if (page.timemodified > maxTime) {
+                    lastPage = page;
+                    maxTime = page.timemodified;
+                }
+            });
+
+            return lastPage;
+        }).catch(function() {
+            // Error getting last page, don't return anything.
+        });
+    };
+
+    /**
+     * Get the last page seen.
+     * Based on Moodle's get_last_page_seen.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getLastPageSeen
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the last page seen.
+     */
+    self.getLastPageSeen = function(lessonId, attempt, siteId) {
+        var lastPageSeen = false;
+
+        // @todo Check question answers.
+
+        return self.getLastContentPageViewed(lessonId, attempt, siteId).then(function(page) {
+            if (page) {
+                if (false) {
+                    // @todo Check if the page was seen after the last question answer.
+                } else {
+                    // Has not answered any questions but has viewed a branch table.
+                    lastPageSeen = page.newpageid || page.pageid;
+                }
+            }
+
+            return lastPageSeen;
+        });
+    };
+
     /**
      * Get cache key for Lesson data WS calls.
      *
@@ -1367,17 +1434,21 @@ angular.module('mm.addons.mod_lesson')
     self.processPage = function(lesson, courseId, pageData, data, password, review, offline, accessInfo, jumps, siteId) {
         siteId = siteId || $mmSite.getId();
 
-        var pageId = pageData.page.id;
+        var page = pageData.page,
+            pageId = page.id;
 
         if (offline) {
-            var attempt = accessInfo.attemptscount;
-            return $mmaModLessonOffline.processPage(lesson.id, courseId, attempt, pageData.page, data, siteId).then(function() {
+            // Calculate and store the new page id so it can be stored in offline.
+            var attempt = accessInfo.attemptscount,
+                newPageId = jumps[pageId] && jumps[pageId][data.jumpto] ? jumps[pageId][data.jumpto].calculatedjump : pageId;
+
+            return $mmaModLessonOffline.processPage(lesson.id, courseId, attempt, page, data, newPageId, siteId).then(function() {
                 // Data stored, now it must return the data. Calculate some needed offline data.
                 return calculateOfflineData(lesson, accessInfo, password, review, siteId);
             }).then(function(calculatedData) {
                 // @todo Handle question pages.
                 var result = {
-                    newpageid: jumps[pageId] && jumps[pageId][data.jumpto] ? jumps[pageId][data.jumpto].calculatedjump : pageId,
+                    newpageid: newPageId,
                     inmediatejump: true,
                     answerid: 0,
                     noanswer: false,
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index ac90227fdbf..fd784c962cb 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
     var stores = [
         {
             name: mmaModLessonAttemptsStore,
-            keyPath: 'lessonid',
+            keyPath: 'lessonid', // Only 1 offline attempt per lesson.
             indexes: [
                 {
                     name: 'attempt'
@@ -190,15 +190,17 @@ angular.module('mm.addons.mod_lesson')
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#processPage
+     * @name $mmaModLessonOffline#processPage
      * @param  {Number} lessonId   Lesson ID.
      * @param  {Number} courseId   Course ID the lesson belongs to.
+     * @param  {Number} attempt    Attempt number.
      * @param  {Object} page       Page.
      * @param  {Object} data       Data to save.
+     * @param  {Number} newPageId  New page ID (calculated).
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved in success, rejected otherwise.
      */
-    self.processPage = function(lessonId, courseId, attempt, page, data, siteId) {
+    self.processPage = function(lessonId, courseId, attempt, page, data, newPageId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var entry = {
                 lessonid: lessonId,
@@ -207,6 +209,7 @@ angular.module('mm.addons.mod_lesson')
                 courseid: courseId,
                 data: data,
                 type: page.type,
+                newpageid: newPageId,
                 timemodified: $mmUtil.timestamp()
             };
 
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 85bc24bd1ae..0a87d2255b8 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -32,7 +32,7 @@
             <div ng-if="lesson && (!preventMessages || !preventMessages.length) && !showSpinner">
                 <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
                     <!-- User left during the session and there is no time limit, ask to continue. -->
-                    <p class="item" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
+                    <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
                     <div class="item button-bar">
                         <button class="button" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
                         <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
@@ -40,14 +40,14 @@
                 </div>
                 <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="card">
                     <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
-                    <p class="item" ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
+                    <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
                     <div class="item">
                         <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.continue' | translate }}</button>
                     </div>
                 </div>
                 <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="card">
                     <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
-                    <p class="item" ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
+                    <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
                 </div>
                 <div ng-if="!leftDuringTimed" class="card">
                     <!-- User hasn't left during the session, show a start button. -->

From 6ea74e2987aa24e88fc8133003eada89fd856169 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 7 Apr 2017 09:41:40 +0200
Subject: [PATCH 084/218] MOBILE-2015 lesson: Support finish attempt in offline

---
 www/addons/mod/lesson/controllers/index.js    |  13 ++-
 www/addons/mod/lesson/controllers/player.js   |  18 ++-
 www/addons/mod/lesson/lang/en.json            |   5 +
 www/addons/mod/lesson/services/lesson.js      | 108 +++++++++++++++++-
 .../mod/lesson/services/lesson_offline.js     |  99 +++++++++++++++-
 www/addons/mod/lesson/templates/player.html   |   3 +
 www/addons/mod/quiz/controllers/index.js      |   7 +-
 7 files changed, 241 insertions(+), 12 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index f549a150bc4..085146324fa 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -191,7 +191,11 @@ angular.module('mm.addons.mod_lesson')
         // Calculate the pageId to load. If there is timelimit, lesson is always restarted from the start.
         var promise;
         if ($scope.hasOffline) {
-            promise = $mmaModLesson.getLastPageSeen(lesson.id, accessInfo.attemptscount);
+            if (continueLast) {
+                promise = $mmaModLesson.getLastPageSeen(lesson.id, accessInfo.attemptscount);
+            } else {
+                promise = $q.when(accessInfo.firstpageid);
+            }
         } else if ($scope.leftDuringTimed && !lesson.timelimit) {
             promise = $q.when(continueLast ? accessInfo.lastpageseen : accessInfo.firstpageid);
         } else {
@@ -260,7 +264,12 @@ angular.module('mm.addons.mod_lesson')
                     // Success downloading, open lesson.
                     playLesson(continueLast);
                 }).catch(function(error) {
-                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                    if ($scope.hasOffline) {
+                        // Error downloading but there is something offline, allow continuing it.
+                        playLesson(continueLast);
+                    } else {
+                        $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                    }
                 }).finally(function() {
                     $scope.showSpinner = false;
                 });
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 237003532e0..4dc64877543 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonPlayerCtrl
  */
 .controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
-            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate) {
+            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate, $mmaModLessonOffline) {
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
@@ -117,7 +117,14 @@ angular.module('mm.addons.mod_lesson')
             // Not in offline mode, launch the attempt.
             promise = $mmaModLesson.launchAttempt(lesson.id, password, pageId);
         } else {
-            promise = $q.when({});
+            // Check if there is a finished offline attempt.
+            promise = $mmaModLessonOffline.hasFinishedAttempt(lesson.id).then(function(finished) {
+                if (finished) {
+                    // Always show EOL page.
+                    pageId = $mmaModLesson.LESSON_EOL;
+                }
+                return {};
+            });
         }
 
         return promise.then(function(data) {
@@ -132,6 +139,10 @@ angular.module('mm.addons.mod_lesson')
                 });
             }
         }).then(function() {
+            if ($scope.currentPage == $mmaModLesson.LESSON_EOL) {
+                // End of lesson reached.
+                return finishAttempt();
+            }
             return loadPage($scope.currentPage);
         });
     }
@@ -176,7 +187,8 @@ angular.module('mm.addons.mod_lesson')
     // Finish the attempt.
     function finishAttempt(outOfTime) {
         $scope.messages = [];
-        return $mmaModLesson.finishAttempt(lesson.id, password, outOfTime, $scope.review).then(function(data) {
+        return $mmaModLesson.finishAttempt(lesson, courseId, password, outOfTime, $scope.review, offline, accessInfo)
+                .then(function(data) {
             $scope.title = lesson.name;
             $scope.eolData = data.data;
             $scope.eolProgress = data.progress;
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 1a4469fd21f..b3b75c775d2 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -4,15 +4,19 @@
     "congratulations": "Congratulations - end of lesson reached",
     "continue": "Continue",
     "continuetonextpage": "Continue to next page.",
+    "displayofgrade": "Display of grade (for students only)",
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
+    "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
     "finish": "Finish",
+    "finishattemptoffline": "This attempt has been finished in offline.",
     "gotoendoflesson": "Go to the end of the lesson",
     "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
     "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
     "loginfail": "Login failed, please try again...",
+    "modattemptsnoteacher": "Student review only works for students.",
     "numberofcorrectanswers": "Number of correct answers: {{$a}}",
     "numberofpagesviewednotice": "Number of questions answered: {{$a.nquestions}} (You should answer at least {{$a.minquestions}})",
     "ongoingcustom": "You have earned {{$a.score}} point(s) out of {{$a.currenthigh}} point(s) thus far.",
@@ -29,6 +33,7 @@
     "teacherjumpwarning": "An {{$a.cluster}} jump or an {{$a.unseen}} jump is being used in this lesson.  The next page jump will be used instead.  Login as a student to test these jumps.",
     "timeremaining": "Time remaining",
     "unseenpageinbranch": "Unseen question within a content page",
+    "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
     "youranswer": "Your answer"
 }
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 819b0eba142..5575a965283 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -105,6 +105,9 @@ angular.module('mm.addons.mod_lesson')
      * Calculate the progress of the current user in the lesson.
      * Based on Moodle's calculate_progress.
      *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#calculateProgress
      * @param  {Number} lessonId   Lesson ID.
      * @param  {Object} accessInfo Result of get access info.
      * @param  {String} [password] Lesson password (if any).
@@ -171,6 +174,109 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#finishAttempt
+     * @param  {Object} lesson       Lesson.
+     * @param  {Number} courseId     Course ID the lesson belongs to.
+     * @param  {String} [password]   Lesson password (if any).
+     * @param  {Boolean} [outOfTime] If the user ran out of time.
+     * @param  {Boolean} [review]    If the user wants to review just after finishing (1 hour margin).
+     * @param  {Boolean} [offline]   Whether it's offline mode.
+     * @param  {Object} [accessInfo] Result of get access info. Required if offline is true.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved in success, rejected otherwise.
+     */
+    self.finishAttempt = function(lesson, courseId, password, outOfTime, review, offline, accessInfo, siteId) {
+        if (offline) {
+            var attempt = accessInfo.attemptscount;
+            return $mmaModLessonOffline.finishAttempt(lesson.id, courseId, attempt, true, outOfTime, siteId).then(function() {
+                // Attempt marked, now return the response. We won't return all the possible data.
+                // This code is based in Moodle's process_eol_page.
+                var gradeInfo = self.lessonGrade(),
+                    gradeLesson = true,
+                    result = {
+                        data: {},
+                        messages: [],
+                        warnings: []
+                    },
+                    messageParams,
+                    promises = [];
+
+                addResultValue(result, 'offline', true); // Mark the result as offline.
+                addResultValue(result, 'gradeinfo', gradeInfo);
+
+                if (lesson.custom && !accessInfo.canmanage) {
+                    // Before we calculate the custom score make sure they answered the minimum
+                    // number of questions. We only need to do this for custom scoring as we can
+                    // not get the miniumum score the user should achieve. If we are not using
+                    // custom scoring (so all questions are valued as 1) then we simply check if
+                    // they answered more than the minimum questions, if not, we mark it out of the
+                    // number specified in the minimum questions setting - which is done in lesson_grade().
+                    // Get the number of answers given.
+                    if (gradeInfo.nquestions < lesson.minquestions) {
+                        gradeLesson = false;
+                        messageParams = {
+                            nquestions: gradeInfo.nquestions,
+                            minquestions: lesson.minquestions
+                        };
+                        messages.push($translate.instant('mma.mod_lesson.numberofpagesviewednotice'), {$a: data});
+                    }
+                }
+
+                if (!accessInfo.canmanage) {
+                    if (gradeLesson) {
+                        promises.push(self.calculateProgress(lesson.id, accessInfo, password, review, false, siteId)
+                                    .then(function(progress) {
+                            addResultValue(result, 'progresscompleted', progress);
+                        }));
+
+                        if (false) {
+                            // @todo Handle questions.
+                        } else {
+                            if (lesson.timelimit) {
+                                if (outOfTime) {
+                                    addResultValue(result, 'eolstudentoutoftimenoanswers', true, true);
+                                }
+                            } else {
+                                addResultValue(result, 'welldone', true, true);
+                            }
+                        }
+                    }
+                } else {
+                    // Display for teacher.
+                    if (lesson.grade != mmCoreGradeTypeNone) {
+                        addResultValue(result, 'displayofgrade', true, true);
+                    }
+                }
+
+                if (lesson.modattempts && accessInfo.canmanage) {
+                    addResultValue(result, 'modattemptsnoteacher', true, true);
+                }
+
+                if (gradeLesson) {
+                    addResultValue(result, 'gradelesson', 1);
+                }
+
+                return result;
+            });
+        }
+
+        return self.finishAttemptOnline(lesson.id, password, outOfTime, review, siteId);
+
+        // Add a property to the offline result.
+        function addResultValue(result, name, value, addMessage) {
+            result.data[name] = {
+                name: name,
+                value: value,
+                message: addMessage ? $translate.instant('mma.mod_lesson.' + name) : ''
+            };
+        }
+    };
+
+    /**
+     * Finishes an attempt. It will fail if offline or cannot connect.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#finishAttemptOnline
      * @param  {Number} lessonId     Lesson ID.
      * @param  {String} [password]   Lesson password (if any).
      * @param  {Boolean} [outOfTime] If the user ran out of time.
@@ -178,7 +284,7 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [siteId]     Site ID. If not defined, current site.
      * @return {Promise}             Promise resolved in success, rejected otherwise.
      */
-    self.finishAttempt = function(lessonId, password, outOfTime, review, siteId) {
+    self.finishAttemptOnline = function(lessonId, password, outOfTime, review, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 lessonid: lessonId,
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index fd784c962cb..6c1b31f4ce0 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -67,10 +67,6 @@ angular.module('mm.addons.mod_lesson')
                     name: 'lessonAndAttempt',
                     keyPath: ['lessonid', 'attempt']
                 },
-                {
-                    name: 'lessonAndAttemptAndPage',
-                    keyPath: ['lessonid', 'attempt', 'pageid']
-                },
                 {
                     name: 'lessonAndAttemptAndType',
                     keyPath: ['lessonid', 'attempt', 'type']
@@ -88,12 +84,42 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonOffline
  */
-.factory('$mmaModLessonOffline', function($log, $mmSitesManager, $mmUtil, $q, mmaModLessonAttemptsStore, mmaModLessonAnswersStore) {
+.factory('$mmaModLessonOffline', function($log, $mmSitesManager, $mmUtil, $q, mmaModLessonAttemptsStore, mmaModLessonAnswersStore,
+            $mmSite) {
 
     $log = $log.getInstance('$mmaModLessonOffline');
 
     var self = {};
 
+    /**
+     * Mark an attempt as finished.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#finishAttempt
+     * @param  {Number} lessonId   Lesson ID.
+     * @param  {Number} courseId   Course ID the lesson belongs to.
+     * @param  {Number} attempt    Attempt number.
+     * @param  {Boolean} finished  Whether attempt is finished.
+     * @param  {Boolean} outOfTime If the user ran out of time.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved in success, rejected otherwise.
+     */
+    self.finishAttempt = function(lessonId, courseId, attempt, finished, outOfTime, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        // Get current stored attempt.
+        return getAttemptWithFallback(lessonId, courseId, attempt, siteId).then(function(entry) {
+            return $mmSitesManager.getSite(siteId).then(function(site) {
+                entry.finished = !!finished;
+                entry.outoftime = !!outOfTime;
+                entry.timemodified = $mmUtil.timestamp();
+
+                return site.getDb().insert(mmaModLessonAttemptsStore, entry);
+            });
+        });
+    };
+
     /**
      * Get all the offline attempts in a certain site.
      *
@@ -146,6 +172,24 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Retrieve offline answers for an attempt and page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAttemptAnswerForPage
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} pageId   Page ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempt answers.
+     */
+    self.getAttemptAnswerForPage = function(lessonId, attempt, pageId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmaModLessonAnswersStore, [lessonId, attempt, pageId]);
+        });
+    };
+
     /**
      * Retrieve offline answers for certain pages for an attempt.
      *
@@ -163,6 +207,33 @@ angular.module('mm.addons.mod_lesson')
             return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttemptAndType', [lessonId, attempt, type]);
         });
     };
+    /**
+     * Get stored attempt. If not found or doesn't match the attempt number, return a new one.
+     *
+     * @param  {Number} lessonId  Lesson ID.
+     * @param  {Number} courseId  Course ID the lesson belongs to.
+     * @param  {Number} attempt   Attempt number.
+     * @param  {String} [siteId]  Site ID. If not defined, current site.
+     * @return {Promise}          Promise resolved with the attempt.
+     */
+    function getAttemptWithFallback(lessonId, courseId, attempt, siteId) {
+        // Get current stored attempt.
+        return self.getAttempt(lessonId, siteId).then(function(attemptData) {
+            if (attemptData.attempt != attempt) {
+                // The stored attempt doesn't match the attempt number, create a new one.
+                return $q.reject();
+            }
+            return attemptData;
+        }).catch(function() {
+            // No attempt, create a new one.
+            return {
+                lessonid: lessonId,
+                attempt: attempt,
+                courseid: courseId,
+                finished: false
+            };
+        });
+    }
 
     /**
      * Check if there are offline answers for an attempt.
@@ -185,6 +256,24 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if there is a finished attempt for a certain lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#hasFinishedAttempt
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with boolean.
+     */
+    self.hasFinishedAttempt = function(lessonId, siteId) {
+        return self.getAttempt(lessonId, siteId).then(function(attempt) {
+            return !!attempt.finished;
+        }).catch(function() {
+            return false;
+        });
+    };
+
     /**
      * Process a lesson page, saving its data.
      *
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index d5fd8cf92da..7ae0cc6f4a2 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -35,6 +35,9 @@
 
                 <!-- End of lesson reached. -->
                 <div ng-if="eolData && !processData" class="padding">
+                    <div class="mm-warning" ng-if="eolData.offline && eolData.offline.value">
+                        <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_lesson.finishattemptoffline' | translate }}
+                    </div>
                     <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
                     <p ng-if="eolData.notenoughtimespent"><mm-format-text>{{ eolData.notenoughtimespent.message }}</mm-format-text></p>
                     <p ng-if="eolData.numberofpagesviewed"><mm-format-text>{{ eolData.numberofpagesviewed.message }}</mm-format-text></p>
diff --git a/www/addons/mod/quiz/controllers/index.js b/www/addons/mod/quiz/controllers/index.js
index 62d779b119f..b8a6dfda97e 100644
--- a/www/addons/mod/quiz/controllers/index.js
+++ b/www/addons/mod/quiz/controllers/index.js
@@ -450,7 +450,12 @@ angular.module('mm.addons.mod_quiz')
                     // Success downloading, open quiz.
                     openQuiz();
                 }).catch(function(error) {
-                    $mmaModQuizHelper.showError(error, 'mma.mod_quiz.errordownloading');
+                    if ($scope.hasOffline) {
+                        // Error downloading but there is something offline, allow continuing it.
+                        openQuiz();
+                    } else {
+                        $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                    }
                 }).finally(function() {
                     $scope.showSpinner = false;
                 });

From 60a4092c89d8ac6691a43365e1803fd7331eaeb7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 7 Apr 2017 11:32:37 +0200
Subject: [PATCH 085/218] MOBILE-2015 prefetch: Prevent outdate when creating
 data in prefetch

---
 .../mod/lesson/services/prefetch_handler.js   | 12 +++++++-
 .../mod/quiz/services/prefetch_handler.js     |  5 ++++
 www/core/lib/filepool.js                      | 29 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index a0476cefffb..134d9daf7de 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -399,7 +399,17 @@ angular.module('mm.addons.mod_lesson')
 
             if (!$mmaModLesson.leftDuringTimed(accessInfo)) {
                 // The user didn't left during a timed session. Call launch attempt to make sure there is a started attempt.
-                return $mmaModLesson.launchAttempt(lesson.id, password, false, false, siteId);
+                return $mmaModLesson.launchAttempt(lesson.id, password, false, false, siteId).then(function() {
+                    var promises = [];
+
+                    // New data generated, update the download time and refresh the access info.
+                    promises.push($mmFilepool.updatePackageDownloadTime(siteId, self.component, module.id).catch(function() {
+                        // Ignore errors.
+                    }));
+                    promises.push($mmaModLesson.getAccessInformation(lesson.id, false, true, siteId));
+
+                    return $q.all(promises);
+                });
             }
         }).then(function() {
             var promises = [],
diff --git a/www/addons/mod/quiz/services/prefetch_handler.js b/www/addons/mod/quiz/services/prefetch_handler.js
index f2848f0caca..6a2b7669365 100644
--- a/www/addons/mod/quiz/services/prefetch_handler.js
+++ b/www/addons/mod/quiz/services/prefetch_handler.js
@@ -403,6 +403,11 @@ angular.module('mm.addons.mod_quiz')
                 promises.push($mmaModQuiz.getUserAttempts(quiz.id, 'all', true, false, true, siteId).then(function(atts) {
                     attempts = atts;
                 }));
+
+                // Update the download time to prevent detecting the new attempt as an update.
+                promises.push($mmFilepool.updatePackageDownloadTime(siteId, self.component, module.id).catch(function() {
+                    // Ignore errors.
+                }));
             }
 
             // Fetch attempt related data.
diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index b617369bb69..8a75a6a33da 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -2892,6 +2892,35 @@ angular.module('mm.core')
         $mmEvents.trigger(mmCoreEventPackageStatusChanged, data);
     };
 
+    /**
+     * Update the download time of a package. This doesn't modify the previous download time.
+     * This function should be used if a package generates some new data during a download. Calling this function
+     * right after generating the data in the download will prevent detecting this data as an update.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFilepool#updatePackageDownloadTime
+     * @param {String} siteId         Site ID.
+     * @param {String} component      Package's component.
+     * @param {Mixed} [componentId]   An ID to use in conjunction with the component.
+     * @return {Promise}              Promise resolved when status is stored.
+     */
+    self.updatePackageDownloadTime = function(siteId, component, componentId) {
+        componentId = self._fixComponentId(componentId);
+
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var db = site.getDb(),
+                packageId = self.getPackageId(component, componentId);
+
+            // Get current entry.
+            return db.get(mmFilepoolPackagesStore, packageId).then(function(entry) {
+                entry.downloadtime = $mmUtil.timestamp();
+
+                return db.insert(mmFilepoolPackagesStore, entry);
+            });
+        });
+    };
+
     return self;
 })
 

From b0b278d36351ffb92812d998ebb866b552d98a7d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 Apr 2017 12:57:56 +0200
Subject: [PATCH 086/218] MOBILE-2015 lesson: Implement lesson sync

---
 www/addons/mod/lesson/controllers/index.js    |  73 +++-
 www/addons/mod/lesson/controllers/player.js   |  13 +-
 www/addons/mod/lesson/main.js                 |   6 +
 www/addons/mod/lesson/services/handlers.js    |  54 ++-
 www/addons/mod/lesson/services/lesson.js      |  17 +-
 .../mod/lesson/services/lesson_offline.js     |  89 +++++
 www/addons/mod/lesson/services/lesson_sync.js | 375 ++++++++++++++++++
 www/addons/mod/lesson/templates/index.html    |   8 +-
 8 files changed, 604 insertions(+), 31 deletions(-)
 create mode 100644 www/addons/mod/lesson/services/lesson_sync.js

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index 085146324fa..e0b4baf4453 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -24,7 +24,7 @@ angular.module('mm.addons.mod_lesson')
 .controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
             $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged,
             $ionicHistory, mmCoreEventPackageStatusChanged, mmCoreDownloading, mmCoreDownloaded, $mmCoursePrefetchDelegate,
-            $mmaModLessonPrefetchHandler, $mmSite, $mmaModLessonOffline) {
+            $mmaModLessonPrefetchHandler, $mmSite, $mmaModLessonSync, mmaModLessonAutomSyncedEvent) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -34,19 +34,21 @@ angular.module('mm.addons.mod_lesson')
         onlineObserver,
         password,
         currentStatus,
-        statusObserver;
+        statusObserver, syncObserver;
 
     $scope.title = module.name;
     $scope.moduleUrl = module.url;
     $scope.refreshIcon = 'spinner';
+    $scope.syncIcon = 'spinner';
     $scope.component = mmaModLessonComponent;
     $scope.componentId = module.id;
+    $scope.moduleName = $mmCourse.translateModuleName('lesson');
     $scope.data = {
         password: ''
     };
 
     // Convenience function to get Lesson data.
-    function fetchLessonData(refresh) {
+    function fetchLessonData(refresh, sync, showErrors) {
         $scope.isOnline = $mmApp.isOnline();
         $scope.askPassword = false;
 
@@ -57,6 +59,13 @@ angular.module('mm.addons.mod_lesson')
             $scope.title = lesson.name || $scope.title;
             $scope.description = lesson.intro; // Show description only if intro is present.
 
+            if (sync) {
+                // Try to synchronize the lesson.
+                return syncLesson(showErrors).catch(function() {
+                    // Ignore errors.
+                });
+            }
+        }).then(function() {
             return $mmaModLesson.getAccessInformation(lesson.id);
         }).then(function(info) {
             var promises = [],
@@ -70,9 +79,12 @@ angular.module('mm.addons.mod_lesson')
                 getStatus().then(updateStatus);
 
                 // Check if there is offline data.
-                promises.push($mmaModLessonOffline.hasAttemptAnswers(lesson.id, info.attemptscount).then(function(hasAnswers) {
-                    $scope.hasOffline = hasAnswers;
+                promises.push($mmaModLessonSync.hasDataToSync(lesson.id, info.attemptscount).then(function(hasOffline) {
+                    $scope.hasOffline = hasOffline;
                 }));
+
+                // Update the list of content pages viewed.
+                promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, accessInfo.attemptscount));
             }
 
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
@@ -102,7 +114,7 @@ angular.module('mm.addons.mod_lesson')
         }).catch(function(message) {
             if (!refresh && !lesson) {
                 // Get lesson failed, retry without using cache since it might be a new activity.
-                return refreshData();
+                return refreshData(sync, showErrors);
             }
 
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
@@ -110,6 +122,22 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    // Tries to synchronize the lesson.
+    function syncLesson(showErrors) {
+        return $mmaModLessonSync.syncLesson(lesson.id, true).then(function(result) {
+            if (result.warnings && result.warnings.length) {
+                $mmUtil.showErrorModal(result.warnings[0]);
+            }
+
+            return result.updated;
+        }).catch(function(error) {
+            if (showErrors) {
+                $mmUtil.showErrorModalDefault(error, 'mm.core.errorsync', true);
+            }
+            return $q.reject();
+        });
+    }
+
     // Function called when all the data has been fetched.
     function fetchDataFinished(refresh, pwd) {
         password = pwd;
@@ -144,7 +172,7 @@ angular.module('mm.addons.mod_lesson')
     }
 
     // Refreshes data.
-    function refreshData() {
+    function refreshData(sync, showErrors) {
         var promises = [];
 
         promises.push($mmaModLesson.invalidateLessonData(courseId));
@@ -153,21 +181,24 @@ angular.module('mm.addons.mod_lesson')
             promises.push($mmaModLesson.invalidatePages(lesson.id));
             promises.push($mmaModLesson.invalidateLessonWithPassword(lesson.id));
             promises.push($mmaModLesson.invalidateTimers(lesson.id));
+            promises.push($mmaModLesson.invalidateContentPagesViewed(lesson.id));
         }
 
         return $q.all(promises).finally(function() {
-            return fetchLessonData(true);
+            return fetchLessonData(true, sync, showErrors);
         });
     }
 
-    function showSpinnerAndRefresh() {
+    function showSpinnerAndRefresh(sync, showErrors) {
         scrollTop();
         $scope.lessonLoaded = false;
         $scope.refreshIcon = 'spinner';
+        $scope.syncIcon = 'spinner';
 
-        refreshData().finally(function() {
+        refreshData(sync, showErrors).finally(function() {
             $scope.lessonLoaded = true;
             $scope.refreshIcon = 'ion-refresh';
+            $scope.syncIcon = 'ion-loop';
         });
     }
 
@@ -238,7 +269,7 @@ angular.module('mm.addons.mod_lesson')
     }
 
     // Fetch the Lesson data.
-    fetchLessonData().then(function() {
+    fetchLessonData(false, true).then(function() {
         if (!$scope.preventMessages || !$scope.preventMessages.length) {
             // Lesson can be attempted, log viewing it.
             logView();
@@ -246,6 +277,7 @@ angular.module('mm.addons.mod_lesson')
     }).finally(function() {
         $scope.lessonLoaded = true;
         $scope.refreshIcon = 'ion-refresh';
+        $scope.syncIcon = 'ion-loop';
     });
 
     // Start the lesson.
@@ -292,21 +324,25 @@ angular.module('mm.addons.mod_lesson')
         scrollTop();
         $scope.lessonLoaded = false;
         $scope.refreshIcon = 'spinner';
+        $scope.syncIcon = 'spinner';
 
         validatePassword(pwd).catch(function(error) {
             $mmUtil.showErrorModal(error);
         }).finally(function() {
             $scope.lessonLoaded = true;
             $scope.refreshIcon = 'ion-refresh';
+            $scope.syncIcon = 'ion-loop';
         });
     };
 
     // Pull to refresh.
-    $scope.refreshLesson = function() {
+    $scope.refreshLesson = function(showErrors) {
         if ($scope.lessonLoaded) {
             $scope.refreshIcon = 'spinner';
-            return refreshData().finally(function() {
+            $scope.syncIcon = 'spinner';
+            return refreshData(true, showErrors).finally(function() {
                 $scope.refreshIcon = 'ion-refresh';
+                $scope.syncIcon = 'ion-loop';
                 $scope.$broadcast('scroll.refreshComplete');
             });
         }
@@ -339,7 +375,7 @@ angular.module('mm.addons.mod_lesson')
         var forwardView = $ionicHistory.forwardView();
         if (forwardView && forwardView.stateName === 'site.mod_lesson-player') {
             // Refresh data.
-            showSpinnerAndRefresh();
+            showSpinnerAndRefresh(true, false);
         }
     });
 
@@ -348,9 +384,18 @@ angular.module('mm.addons.mod_lesson')
         $scope.isOnline = online;
     });
 
+    // Refresh data if this lesson is synchronized automatically.
+    syncObserver = $mmEvents.on(mmaModLessonAutomSyncedEvent, function(data) {
+        if (lesson && data && data.siteid == $mmSite.getId() && data.lessonid == lesson.id) {
+            // Refresh the data.
+            showSpinnerAndRefresh(false);
+        }
+    });
+
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
         statusObserver && statusObserver.off && statusObserver.off();
+        syncObserver && syncObserver.off && syncObserver.off();
     });
 
 });
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 4dc64877543..f7cce059a3f 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -22,7 +22,8 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonPlayerCtrl
  */
 .controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
-            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate, $mmaModLessonOffline) {
+            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate, $mmaModLessonOffline,
+            $mmaModLessonSync) {
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
@@ -49,7 +50,10 @@ angular.module('mm.addons.mod_lesson')
 
     // Convenience function to get Lesson data.
     function fetchLessonData() {
-        return $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
+        // Wait for any ongoing sync to finish. We won't sync a lesson while it's being played.
+        return $mmaModLessonSync.waitForSync(lessonId).then(function() {
+            return $mmaModLesson.getLessonById(courseId, lessonId);
+        }).then(function(lessonData) {
             lesson = lessonData;
             $scope.lesson = lesson;
             $scope.title = lesson.name; // Temporary title.
@@ -387,4 +391,9 @@ angular.module('mm.addons.mod_lesson')
     // Setup right side menu.
     $mmSideMenu.showRightSideMenu('addons/mod/lesson/templates/menu.html', $scope);
 
+    $scope.$on('$destroy', function() {
+        // Unblock the lesson so it can be synced.
+        $mmSyncBlock.unblockOperation(mmaModLessonComponent, lessonId);
+    });
+
 });
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index da6d5abf4db..2f103c5d952 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -15,6 +15,8 @@
 angular.module('mm.addons.mod_lesson', ['mm.core'])
 
 .constant('mmaModLessonComponent', 'mmaModLesson')
+.constant('mmaModLessonAutomSyncedEvent', 'mma_mod_lesson_autom_synced')
+.constant('mmaModLessonSyncTime', 300000) // In milliseconds.
 
 .config(function($stateProvider) {
 
@@ -55,4 +57,8 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
 .config(function($mmCourseDelegateProvider, $mmCoursePrefetchDelegateProvider) {
     $mmCourseDelegateProvider.registerContentHandler('mmaModLesson', 'lesson', '$mmaModLessonHandlers.courseContentHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModLesson', 'lesson', '$mmaModLessonPrefetchHandler');
+})
+
+.run(function($mmCronDelegate) {
+    $mmCronDelegate.register('mmaModLesson', '$mmaModLessonHandlers.syncHandler');
 });
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index c8740ce8fe1..8c64ac1ef6d 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_lesson')
  */
 .factory('$mmaModLessonHandlers', function($mmCourse, $mmaModLesson, $state, $mmaModLessonPrefetchHandler, $mmUtil, $mmEvents,
             $mmSite, $mmCoursePrefetchDelegate, mmCoreEventPackageStatusChanged, mmaModLessonComponent, mmCoreDownloading,
-            mmCoreNotDownloaded, mmCoreOutdated) {
+            mmCoreNotDownloaded, mmCoreOutdated, $mmaModLessonSync) {
 
     var self = {};
 
@@ -145,5 +145,57 @@ angular.module('mm.addons.mod_lesson')
         return self;
     };
 
+    /**
+     * Synchronization handler.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHandlers#syncHandler
+     */
+    self.syncHandler = function() {
+
+        var self = {};
+
+        /**
+         * Execute the process.
+         * Receives the ID of the site affected, undefined for all sites.
+         *
+         * @param  {String} [siteId] ID of the site affected, undefined for all sites.
+         * @return {Promise}         Promise resolved when done, rejected if failure.
+         */
+        self.execute = function(siteId) {
+            return $mmaModLessonSync.syncAllLessons(siteId);
+        };
+
+        /**
+         * Get the time between consecutive executions.
+         *
+         * @return {Number} Time between consecutive executions (in ms).
+         */
+        self.getInterval = function() {
+            return 600000; // 10 minutes.
+        };
+
+        /**
+         * Whether it's a synchronization process or not.
+         *
+         * @return {Boolean} True if is a sync process, false otherwise.
+         */
+        self.isSync = function() {
+            return true;
+        };
+
+        /**
+         * Whether the process uses network or not.
+         *
+         * @return {Boolean} True if uses network, false otherwise.
+         */
+        self.usesNetwork = function() {
+            return true;
+        };
+
+        return self;
+    };
+
     return self;
 });
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 5575a965283..59747d8a8cd 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -795,19 +795,10 @@ angular.module('mm.addons.mod_lesson')
 
             return site.read('mod_lesson_get_page_data', params, preSets).then(function(data) {
                 if (forceCache && accessInfo) {
-                    // Offline mode, check if there is any answer stored.
-                    var attempt = accessInfo.attemptscount;
-                    return $mmaModLessonOffline.hasAttemptAnswers(lesson.id, attempt, siteId).then(function(hasAnswers) {
-                        if (!hasAnswers) {
-                            // No offline answers, return the WS data.
-                            return data;
-                        }
-
-                        // There are offline answers stored. Calculate the data that might be affected.
-                        return calculateOfflineData(lesson, accessInfo, password, review, siteId).then(function(calculatedData) {
-                            data.messages = self.getPageViewMessages(lesson, accessInfo, data.page, review, jumps);
-                            return angular.extend(data, calculatedData);
-                        });
+                    // Offline mode. Calculate the data that might be affected.
+                    return calculateOfflineData(lesson, accessInfo, password, review, siteId).then(function(calculatedData) {
+                        data.messages = self.getPageViewMessages(lesson, accessInfo, data.page, review, jumps);
+                        return angular.extend(data, calculatedData);
                     });
                 }
 
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index 6c1b31f4ce0..65c9cac89e9 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -47,6 +47,9 @@ angular.module('mm.addons.mod_lesson')
                 {
                     name: 'lessonid'
                 },
+                {
+                    name: 'courseid'
+                },
                 {
                     name: 'attempt'
                 },
@@ -91,6 +94,40 @@ angular.module('mm.addons.mod_lesson')
 
     var self = {};
 
+    /**
+     * Delete offline attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#deleteAttempt
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.deleteAttempt = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().remove(mmaModLessonAttemptsStore, lessonId);
+        });
+    };
+
+    /**
+     * Delete offline answers for an attempt and page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#deleteAttemptAnswerForPage
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} pageId   Page ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.deleteAttemptAnswerForPage = function(lessonId, attempt, pageId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().remove(mmaModLessonAnswersStore, [lessonId, attempt, pageId]);
+        });
+    };
+
     /**
      * Mark an attempt as finished.
      *
@@ -139,6 +176,42 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get all the lessons that have offline data in a certain site.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAllLessonsWithData
+     * @param {String} [siteId] Site ID. If not set, use current site.
+     * @return {Promise}        Promise resolved with an object containing the lessons.
+     */
+    self.getAllLessonsWithData = function(siteId) {
+        var promises = [],
+            lessons = {};
+
+        promises.push(getLessons(self.getAllAttempts(siteId)));
+        promises.push(getLessons(self.getLessonAnswers(siteId)));
+
+        return $q.all(promises).then(function() {
+            return lessons;
+        });
+
+        function getLessons(promise) {
+            return promise.then(function(entries) {
+                angular.forEach(entries, function(entry) {
+                    if (!lessons[entry.lessonid]) {
+                        lessons[entry.lessonid] = {
+                            id: entry.lessonid,
+                            courseid: entry.courseid
+                        };
+                    }
+                });
+            }).catch(function() {
+                // Ignore errors.
+            });
+        }
+    };
+
     /**
      * Retrieve an attempt from site DB.
      *
@@ -235,6 +308,22 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    /**
+     * Retrieve all offline answers for a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getLessonAnswers
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the answers.
+     */
+    self.getLessonAnswers = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonid', lessonId);
+        });
+    };
+
     /**
      * Check if there are offline answers for an attempt.
      *
diff --git a/www/addons/mod/lesson/services/lesson_sync.js b/www/addons/mod/lesson/services/lesson_sync.js
new file mode 100644
index 00000000000..72e285a05a8
--- /dev/null
+++ b/www/addons/mod/lesson/services/lesson_sync.js
@@ -0,0 +1,375 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * Lesson synchronization service.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc service
+ * @name $mmaModLessonSync
+ */
+.factory('$mmaModLessonSync', function($log, $mmaModLesson, $mmSite, $mmSitesManager, $q, $mmaModLessonOffline, $mmUtil,
+            $mmLang, $mmApp, $mmEvents, $translate, mmaModLessonSyncTime, $mmSync, mmaModLessonAutomSyncedEvent,
+            mmaModLessonComponent, $mmaModLessonPrefetchHandler, $mmCourse, $mmSyncBlock) {
+
+    $log = $log.getInstance('$mmaModLessonSync');
+
+    // Inherit self from $mmSync.
+    var self = $mmSync.createChild(mmaModLessonComponent, mmaModLessonSyncTime);
+
+    /**
+     * Check if a lesson has data to synchronize.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#hasDataToSync
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with boolean: true if has data to sync, false otherwise.
+     */
+    self.hasDataToSync = function(lessonId, attempt, siteId) {
+        var promises = [],
+            hasDataToSync = false;
+
+        promises.push($mmaModLessonOffline.hasAttemptAnswers(lessonId, attempt, siteId).then(function(hasAnswers) {
+            hasDataToSync = hasDataToSync || hasAnswers;
+        }).catch(function() {
+            // Ignore errors.
+        }));
+
+        promises.push($mmaModLessonOffline.hasFinishedAttempt(lessonId, siteId).then(function(hasFinished) {
+            hasDataToSync = hasDataToSync || hasFinished;
+        }));
+
+        return $q.all(promises).then(function() {
+            return hasDataToSync;
+        });
+    };
+
+    /**
+     * Try to synchronize all lessons that need it and haven't been synchronized in a while.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#syncAllLessons
+     * @param {String} [siteId] Site ID to sync. If not defined, sync all sites.
+     * @return {Promise}        Promise resolved when the sync is done.
+     */
+    self.syncAllLessons = function(siteId) {
+        if (!$mmApp.isOnline()) {
+            $log.debug('Cannot sync all lessons because device is offline.');
+            return $q.reject();
+        }
+
+        var promise;
+        if (!siteId) {
+            // No site ID defined, sync all sites.
+            $log.debug('Try to sync lessons in all sites.');
+            promise = $mmSitesManager.getSitesIds();
+        } else {
+            $log.debug('Try to sync lessons in site ' + siteId);
+            promise = $q.when([siteId]);
+        }
+
+        return promise.then(function(siteIds) {
+            var sitePromises = [];
+
+            angular.forEach(siteIds, function(siteId) {
+                sitePromises.push($mmaModLessonOffline.getAllLessonsWithData(siteId).then(function(lessons) {
+                    // Sync all lessons that haven't been synced for a while.
+                    var promises = [];
+
+                    angular.forEach(lessons, function(lesson) {
+                        promises.push(self.syncLessonIfNeeded(lesson.id, false, siteId).then(function(result) {
+                            if (result && result.updated) {
+                                // Sync successful, send event.
+                                $mmEvents.trigger(mmaModLessonAutomSyncedEvent, {
+                                    siteid: siteId,
+                                    lessonid: lesson.id,
+                                    warnings: result.warnings
+                                });
+                            }
+                        }));
+                    });
+
+                    return $q.all(promises);
+                }));
+            });
+
+            return $q.all(sitePromises);
+        });
+    };
+
+    /**
+     * Sync a lesson only if a certain time has passed since the last time.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#syncLessonIfNeeded
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Boolean} askPassword True if we should ask for password if needed, false otherwise.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved when the lesson is synced or if it doesn't need to be synced.
+     */
+    self.syncLessonIfNeeded = function(lessonId, askPassword, siteId) {
+        return self.isSyncNeeded(lessonId, siteId).then(function(needed) {
+            if (needed) {
+                return self.syncLesson(lessonId, askPassword, siteId);
+            }
+        });
+    };
+
+    /**
+     * Try to synchronize a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#syncLesson
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Boolean} askPassword True if we should ask for password if needed, false otherwise.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise rejected in failure, resolved in success with an object containing:
+     *                                       -warnings Array of warnings.
+     *                                       -updated  True if some data was sent to the server.
+     */
+    self.syncLesson = function(lessonId, askPassword, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var syncPromise,
+            lesson,
+            courseId,
+            password,
+            accessInfo,
+            result = {
+                warnings: [],
+                updated: false
+            };
+
+        if (self.isSyncing(lessonId, siteId)) {
+            // There's already a sync ongoing for this lesson, return the promise.
+            return self.getOngoingSync(lessonId, siteId);
+        }
+
+        // Verify that lesson isn't blocked.
+        if ($mmSyncBlock.isBlocked(mmaModLessonComponent, lessonId, siteId)) {
+            $log.debug('Cannot sync lesson ' + lessonId + ' because it is blocked.');
+            var moduleName = $mmCourse.translateModuleName('lesson');
+            return $mmLang.translateAndReject('mm.core.errorsyncblocked', {$a: moduleName});
+        }
+
+        $log.debug('Try to sync lesson ' + lessonId + ' in site ' + siteId);
+
+        // Try to synchronize the answers first.
+        syncPromise = $mmaModLessonOffline.getLessonAnswers(lessonId, siteId).then(function(answers) {
+            if (!answers.length) {
+                return;
+            } else if (!$mmApp.isOnline()) {
+                // Cannot sync in offline.
+                return $q.reject();
+            }
+
+            courseId = answers[0].courseid;
+
+            // Get the info, access info and the lesson password if needed.
+            return $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
+                lesson = lessonData;
+
+                return $mmaModLessonPrefetchHandler.gatherLessonPassword(lessonId, false, true, askPassword, siteId);
+            }).then(function(data) {
+                var answersLength = answers.length,
+                    lastAnswer,
+                    promises = [];
+
+                accessInfo = data.accessinfo;
+                password = data.password;
+                lesson = data.lesson || lesson;
+
+                // Filter the answers, get only the ones that belong to the current attempt.
+                answers = answers.filter(function(answer) {
+                    return answer.attempt == accessInfo.attemptscount;
+                });
+
+                if (answers.length != answersLength) {
+                    // Some answers won't be sent, add a warning.
+                    result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
+                        component: $mmCourse.translateModuleName('lesson'),
+                        name: lesson.name,
+                        error: ''
+                    }));
+                }
+
+                if (!answers.length) {
+                    return;
+                }
+
+                // Sort the answers by timemodified.
+                answers.sort(function(a, b) {
+                    return a.timemodified > b.timemodified;
+                });
+                lastAnswer = answers.pop();
+
+                // Send all the answers except the last page (so last page seen is calculated right).
+                angular.forEach(answers, function(answer) {
+                    promises.push(sendAnswer(lesson, password, answer, result, siteId));
+                });
+
+                return $q.all(promises).then(function() {
+                    // Now send the last page.
+                    return sendAnswer(lesson, password, lastAnswer, result, siteId);
+                });
+            });
+        }).then(function() {
+            // Answers sent or there was none. If there is a finished attempt, send it.
+            return $mmaModLessonOffline.getAttempt(lessonId, siteId).then(function(attempt) {
+                if (!attempt.finished) {
+                    // The attempt isn't marked as finished, nothing to send. Delete the attempt.
+                    return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
+                } else if (!$mmApp.isOnline()) {
+                    // Cannot sync in offline.
+                    return $q.reject();
+                }
+
+                var promise;
+
+                courseId = attempt.courseid;
+
+                if (lesson) {
+                    // Data already retrieved when syncing answers.
+                    promise = $q.when();
+                } else {
+                    promise = $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
+                        lesson = lessonData;
+
+                        return $mmaModLessonPrefetchHandler.gatherLessonPassword(lessonId, false, true, askPassword, siteId);
+                    }).then(function(data) {
+                        accessInfo = data.accessinfo;
+                        password = data.password;
+                        lesson = data.lesson || lesson;
+                    });
+                }
+
+                return promise.then(function() {
+                    if (attempt.attempt != accessInfo.attemptscount) {
+                        // The attempt changed, add a warning if it isn't there already.
+                        if (!result.warnings.length) {
+                            result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
+                                component: $mmCourse.translateModuleName('lesson'),
+                                name: lesson.name,
+                                error: ''
+                            }));
+                        }
+
+                        return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
+                    }
+
+                    // All good, finish the attempt.
+                    return $mmaModLesson.finishAttemptOnline(lessonId, password, false, false, siteId).then(function() {
+                        result.updated = true;
+
+                        return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
+                    }).catch(function(error) {
+                        if (error && $mmUtil.isWebServiceError(error)) {
+                            // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
+                            result.updated = true;
+                            return $mmaModLessonOffline.deleteAttempt(lessonId, siteId).then(function() {
+                                // Attempt deleted, add a warning.
+                                result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
+                                    component: $mmCourse.translateModuleName('lesson'),
+                                    name: lesson.name,
+                                    error: error
+                                }));
+                            });
+                        } else {
+                            // Couldn't connect to server, reject.
+                            return $q.reject(error);
+                        }
+                    });
+                });
+            }, function() {
+                // No attempt stored, nothing to do.
+            });
+        }).then(function() {
+            if (result.updated && courseId) {
+                // Data has been sent to server. Now invalidate the WS calls.
+                var promises = [];
+                promises.push($mmaModLesson.invalidateAccessInformation(lessonId, siteId));
+                promises.push($mmaModLesson.invalidateContentPagesViewed(lessonId, siteId));
+                promises.push($mmaModLesson.invalidatePagesPossibleJumps(lessonId, siteId));
+                promises.push($mmaModLesson.invalidateTimers(lessonId, siteId));
+
+                return $mmUtil.allPromises(promises).catch(function() {
+                    // Ignore errors.
+                }).then(function() {
+                    // Sync successful, update some data that might have been modified.
+                    return $mmaModLesson.getAccessInformation(lessonId, false, false, siteId).then(function(info) {
+                        return $mmaModLesson.getContentPagesViewedOnline(lessonId, info.attemptscount, false, false, siteId);
+                    }).catch(function() {
+                        // Ignore errors.
+                    });
+
+                });
+            }
+        }).then(function() {
+            // Sync finished, set sync time.
+            return self.setSyncTime(lessonId, siteId).catch(function() {
+                // Ignore errors.
+            });
+        }).then(function() {
+            // All done, return the warnings.
+            return result;
+        });
+
+        return self.addOngoingSync(lessonId, syncPromise, siteId);
+    };
+
+    /**
+     * Send an answer to the site and delete it afterwards.
+     *
+     * @param  {Object} lesson   Lesson.
+     * @param  {String} password Password (if any).
+     * @param  {Object} answer   Answer to send.
+     * @param  {Object} result   Result where to store the data.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when done.
+     */
+    function sendAnswer(lesson, password, answer, result, siteId) {
+        return $mmaModLesson.processPageOnline(lesson.id, answer.pageid, answer.data, password, false, siteId).then(function() {
+            result.updated = true;
+
+            return $mmaModLessonOffline.deleteAttemptAnswerForPage(lesson.id, answer.attempt, answer.pageid, siteId);
+        }).catch(function(error) {
+            if (error && $mmUtil.isWebServiceError(error)) {
+                // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
+                result.updated = true;
+                return $mmaModLessonOffline.deleteAttemptAnswerForPage(lesson.id, answer.attempt, answer.pageid, siteId)
+                        .then(function() {
+                    // Responses deleted, add a warning.
+                    result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
+                        component: $mmCourse.translateModuleName('lesson'),
+                        name: lesson.name,
+                        error: error
+                    }));
+                });
+            } else {
+                // Couldn't connect to server, reject.
+                return $q.reject(error);
+            }
+        });
+    }
+
+    return self;
+});
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 0a87d2255b8..0cdaed48ccf 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -4,7 +4,8 @@
         <mm-context-menu>
             <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
             <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
-            <mm-context-menu-item priority="700" ng-if="lessonLoaded && isOnline" content="'mm.core.refresh' | translate" action="refreshLesson(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="700" ng-if="lessonLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshLesson(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="650" ng-show="lessonLoaded && hasOffline && isOnline" content="'mm.settings.synchronizenow' | translate" action="refreshLesson(true)" icon-action="syncIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
             <mm-context-menu-item priority="500" ng-if="timemodified" content="timemodified" icon-action="prefetchStatusIcon" action="prefetch()" close-on-click="false"></mm-context-menu-item>
             <mm-context-menu-item priority="400" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
         </mm-context-menu>
@@ -20,6 +21,11 @@
                 <i class="icon ion-information-circled padding"></i> <mm-format-text watch="true">{{ preventMessages[0].message }}</mm-format-text>
             </div>
 
+            <!-- Lesson has data to be synchronized -->
+            <div class="mm-warning" ng-if="hasOffline">
+                <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
+            </div>
+
             <!-- Input password for protected lessons. -->
             <form ng-if="askPassword" class="card">
                 <ion-input class="item item-input item-stacked-label">

From 33c100f6c5b994401413115ff049fcab248bfb2e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 Apr 2017 13:45:17 +0200
Subject: [PATCH 087/218] MOBILE-2015 lesson: Sync lesson when reaching EOL
 page

---
 www/addons/mod/lesson/controllers/player.js   | 39 +++++++++++++++++--
 .../mod/lesson/services/lesson_offline.js     | 21 +++++++++-
 www/addons/mod/lesson/services/lesson_sync.js |  7 ++--
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index f7cce059a3f..07fba5ab6e8 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc controller
  * @name mmaModLessonPlayerCtrl
  */
-.controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil,
+.controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil, $mmApp,
             mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate, $mmaModLessonOffline,
             $mmaModLessonSync) {
 
@@ -190,9 +190,42 @@ angular.module('mm.addons.mod_lesson')
 
     // Finish the attempt.
     function finishAttempt(outOfTime) {
+        var promise;
+
         $scope.messages = [];
-        return $mmaModLesson.finishAttempt(lesson, courseId, password, outOfTime, $scope.review, offline, accessInfo)
-                .then(function(data) {
+
+        if (offline && $mmApp.isOnline()) {
+            // Offline mode but the app is online. Try to sync the data.
+            promise = $mmaModLessonSync.syncLesson(lesson.id, true, true).then(function(result) {
+                if (result.warnings && result.warnings.length) {
+                    var error = result.warnings[0];
+
+                    // Some data was deleted. Check if the attempt has changed.
+                    return $mmaModLesson.getAccessInformation(lesson.id).then(function(info) {
+                        if (info.attemptscount != accessInfo.attemptscount) {
+                            // The attempt has changed. Leave the view and show the error.
+                            blockData && blockData.back();
+                            return $q.reject(error);
+                        }
+
+                        // Attempt hasn't changed, show the warning and finish the attempt in online.
+                        offline = false;
+                        $mmUtil.showErrorModal(error);
+                    });
+                }
+
+                offline = false;
+            }, function() {
+                // Ignore errors.
+            });
+        } else {
+            promise = $q.when();
+        }
+
+        return promise.then(function() {
+            // Now finish the attempt.
+            return $mmaModLesson.finishAttempt(lesson, courseId, password, outOfTime, $scope.review, offline, accessInfo);
+        }).then(function(data) {
             $scope.title = lesson.name;
             $scope.eolData = data.data;
             $scope.eolProgress = data.progress;
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index 65c9cac89e9..ac7a8b99f2e 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -157,6 +157,25 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get all the offline answers in a certain site.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getAllAnswers
+     * @param {String} [siteId] Site ID. If not set, use current site.
+     * @return {Promise}        Promise resolved when the offline answers are retrieved.
+     */
+    self.getAllAnswers = function(siteId) {
+        return $mmSitesManager.getSiteDb(siteId).then(function(db) {
+            if (!db) {
+                return $q.reject();
+            }
+
+            return db.getAll(mmaModLessonAnswersStore);
+        });
+    };
+
     /**
      * Get all the offline attempts in a certain site.
      *
@@ -190,7 +209,7 @@ angular.module('mm.addons.mod_lesson')
             lessons = {};
 
         promises.push(getLessons(self.getAllAttempts(siteId)));
-        promises.push(getLessons(self.getLessonAnswers(siteId)));
+        promises.push(getLessons(self.getAllAnswers(siteId)));
 
         return $q.all(promises).then(function() {
             return lessons;
diff --git a/www/addons/mod/lesson/services/lesson_sync.js b/www/addons/mod/lesson/services/lesson_sync.js
index 72e285a05a8..36029057a62 100644
--- a/www/addons/mod/lesson/services/lesson_sync.js
+++ b/www/addons/mod/lesson/services/lesson_sync.js
@@ -128,7 +128,7 @@ angular.module('mm.addons.mod_lesson')
     self.syncLessonIfNeeded = function(lessonId, askPassword, siteId) {
         return self.isSyncNeeded(lessonId, siteId).then(function(needed) {
             if (needed) {
-                return self.syncLesson(lessonId, askPassword, siteId);
+                return self.syncLesson(lessonId, askPassword, false, siteId);
             }
         });
     };
@@ -141,12 +141,13 @@ angular.module('mm.addons.mod_lesson')
      * @name $mmaModLessonSync#syncLesson
      * @param  {Number} lessonId     Lesson ID.
      * @param  {Boolean} askPassword True if we should ask for password if needed, false otherwise.
+     * @param  {Boolean} ignoreBlock True to ignore the sync block setting.
      * @param  {String} [siteId]     Site ID. If not defined, current site.
      * @return {Promise}             Promise rejected in failure, resolved in success with an object containing:
      *                                       -warnings Array of warnings.
      *                                       -updated  True if some data was sent to the server.
      */
-    self.syncLesson = function(lessonId, askPassword, siteId) {
+    self.syncLesson = function(lessonId, askPassword, ignoreBlock, siteId) {
         siteId = siteId || $mmSite.getId();
 
         var syncPromise,
@@ -165,7 +166,7 @@ angular.module('mm.addons.mod_lesson')
         }
 
         // Verify that lesson isn't blocked.
-        if ($mmSyncBlock.isBlocked(mmaModLessonComponent, lessonId, siteId)) {
+        if (!ignoreBlock && $mmSyncBlock.isBlocked(mmaModLessonComponent, lessonId, siteId)) {
             $log.debug('Cannot sync lesson ' + lessonId + ' because it is blocked.');
             var moduleName = $mmCourse.translateModuleName('lesson');
             return $mmLang.translateAndReject('mm.core.errorsyncblocked', {$a: moduleName});

From 718046ffd2d72e03c7dafed737c024250c8fc6c1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 Apr 2017 16:25:24 +0200
Subject: [PATCH 088/218] MOBILE-2015 lesson: Prioritize online mode in lesson
 player

---
 www/addons/mod/lesson/controllers/player.js   | 61 +++++++++++++------
 .../mod/lesson/services/lesson_offline.js     | 31 ++++++++++
 www/addons/mod/lesson/templates/player.html   |  1 -
 3 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 07fba5ab6e8..1c58c406b57 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -58,19 +58,16 @@ angular.module('mm.addons.mod_lesson')
             $scope.lesson = lesson;
             $scope.title = lesson.name; // Temporary title.
 
-            if ($mmaModLesson.isLessonOffline(lesson)) {
-                // Lesson supports offline.
-                return true;
-            } else {
-                // Lesson doesn't support offline right now, but maybe it did and then the setting was changed.
-                // @todo
-                // return $mmaModQuiz.isLastAttemptOfflineUnfinished(quiz);
-                return false;
-            }
+            // If lesson has offline data already, use offline mode.
+            return $mmaModLessonOffline.hasOfflineData(lessonId);
         }).then(function(offlineMode) {
             offline = offlineMode;
+            if (!offline && !$mmApp.isOnline() && $mmaModLesson.isLessonOffline(lesson)) {
+                // Lesson doesn't have offline data, but it allows offline and the device is offline. Use offline mode.
+                offline = true;
+            }
 
-            return $mmaModLesson.getAccessInformation(lesson.id, offline, true);
+            return callFunction($mmaModLesson.getAccessInformation, [lesson.id, offline, true], 1);
         }).then(function(info) {
             var promises = [];
 
@@ -85,7 +82,8 @@ angular.module('mm.addons.mod_lesson')
 
             if (password) {
                 // Lesson uses password, get the whole lesson object.
-                promises.push($mmaModLesson.getLessonWithPassword(lesson.id, password, true, offline, true).then(function(less) {
+                var args = [lesson.id, password, true, offline, true];
+                promises.push(callFunction($mmaModLesson.getLessonWithPassword, args, 3).then(function(less) {
                     lesson = less;
                     $scope.lesson = lesson;
                 }));
@@ -153,8 +151,8 @@ angular.module('mm.addons.mod_lesson')
 
     // Load a certain page.
     function loadPage(pageId) {
-        return $mmaModLesson.getPageData(lesson, pageId, password, $scope.review, true, offline, true, accessInfo, jumps)
-                .then(function(data) {
+        var args = [lesson, pageId, password, $scope.review, true, offline, true, accessInfo, jumps];
+        return callFunction($mmaModLesson.getPageData, args, 5).then(function(data) {
             if (data.newpageid == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
                 return finishAttempt();
@@ -224,7 +222,8 @@ angular.module('mm.addons.mod_lesson')
 
         return promise.then(function() {
             // Now finish the attempt.
-            return $mmaModLesson.finishAttempt(lesson, courseId, password, outOfTime, $scope.review, offline, accessInfo);
+            var args = [lesson, courseId, password, outOfTime, $scope.review, offline, accessInfo];
+            return callFunction($mmaModLesson.finishAttempt, args, 5);
         }).then(function(data) {
             $scope.title = lesson.name;
             $scope.eolData = data.data;
@@ -278,7 +277,7 @@ angular.module('mm.addons.mod_lesson')
         }
 
         $scope.loadingMenu = true;
-        return $mmaModLesson.getPages(lesson.id, password).then(function(pages) {
+        return callFunction($mmaModLesson.getPages, [lesson.id, password, offline, true], 2).then(function(pages) {
             $scope.lessonPages = pages.map(function(entry) {
                 return entry.page;
             });
@@ -294,8 +293,8 @@ angular.module('mm.addons.mod_lesson')
     function processPage(data) {
         showLoading();
 
-        return $mmaModLesson.processPage(lesson, courseId, $scope.pageData, data, password, $scope.review,
-                offline, accessInfo, jumps).then(function(result) {
+        var args = [lesson, courseId, $scope.pageData, data, password, $scope.review, offline, accessInfo, jumps];
+        return callFunction($mmaModLesson.processPage, args, 6).then(function(result) {
             if (result.nodefaultresponse || result.inmediatejump) {
                 // Don't display feedback or force a redirect to a new page. Load the new page.
                 return jumpToPage(result.newpageid);
@@ -353,6 +352,33 @@ angular.module('mm.addons.mod_lesson')
         return loadPage(pageId);
     }
 
+    /**
+     * Call a function and go offline if allowed and the call fails.
+     *
+     * @param  {Function} func          Function to call.
+     * @param  {Mixed[]} args           Arguments to pass to the function.
+     * @param  {Number} offlineParamPos Position of the offline parameter in the args.
+     * @return {Promise}                Promise resolved in success, rejected otherwise.
+     */
+    function callFunction(func, args, offlineParamPos) {
+        return func.apply(this, args).catch(function(error) {
+            if (!offline && !$scope.review && $mmaModLesson.isLessonOffline(lesson) && !$mmUtil.isWebServiceError(error)) {
+                // If it fails, go offline.
+                offline = true;
+
+                // Get the possible jumps now.
+                return $mmaModLesson.getPagesPossibleJumps(lesson.id, offline).then(function(jumpList) {
+                    jumps = jumpList;
+
+                    // Call the function again with offline set to true.
+                    args[offlineParamPos] = true;
+                    return func.apply(this, args);
+                });
+            }
+            return $q.reject(error);
+        });
+    }
+
     // Fetch the Lesson data.
     fetchLessonData().finally(function() {
         $scope.pageLoaded = true;
@@ -414,6 +440,7 @@ angular.module('mm.addons.mod_lesson')
     $scope.reviewLesson = function(pageId) {
         showLoading();
         $scope.review = true;
+        offline = false; // Don't allow offline mode in review.
 
         loadPage(pageId).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'Error loading page');
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index ac7a8b99f2e..9f7f013aada 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -382,6 +382,37 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if a lesson has offline data.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#hasOfflineData
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with boolean.
+     */
+    self.hasOfflineData = function(lessonId, siteId) {
+        var promises = [],
+            hasData = false;
+
+        promises.push(self.getAttempt(lessonId, siteId).then(function() {
+            hasData = true;
+        }).catch(function() {
+            // Ignore errors.
+        }));
+
+        promises.push(self.getLessonAnswers(lessonId, siteId).then(function(answers) {
+            hasData = hasData || !!answers.length;
+        }).catch(function() {
+            // Ignore errors.
+        }));
+
+        return $q.all(promises).then(function() {
+            return hasData;
+        });
+    };
+
     /**
      * Process a lesson page, saving its data.
      *
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 7ae0cc6f4a2..95359d8ba35 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -56,7 +56,6 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
                     <button ng-if="eolData.reviewlesson" class="button button-block" ng-click="reviewLesson(eolData.reviewlesson.pageid)"><mm-format-text>{{ 'mma.mod_lesson.reviewlesson' | translate }}</mm-format-text></button>
                     <p ng-if="eolData.modattemptsnoteacher"><mm-format-text>{{ eolData.modattemptsnoteacher.message }}</mm-format-text></p>
                     <mm-format-text ng-if="eolData.activitylink" watch="true">{{ eolData.activitylink.value }}</mm-format-text>
-                    <!-- @todo Return & grade links. -->
                 </div>
 
                 <!-- Feedback returned when processing an action. -->

From 368a1a8f2929437a700455f2615ae34d8775de50 Mon Sep 17 00:00:00 2001
From: magician03 <diwakar03121997@gmail.com>
Date: Mon, 24 Apr 2017 21:41:15 +0530
Subject: [PATCH 089/218] MOBILE-2095 functions: modified sort() implementation

---
 www/addons/messages/services/messages.js                | 2 +-
 www/addons/mod/forum/services/prefetch_handler.js       | 2 +-
 www/addons/mod/scorm/services/scorm_sync.js             | 4 ++--
 www/addons/mod/survey/services/prefetch_handler.js      | 2 +-
 www/core/components/contentlinks/services/delegate.js   | 2 +-
 www/core/components/course/services/prefetchdelegate.js | 2 +-
 www/core/components/fileuploader/services/helper.js     | 2 +-
 www/core/lib/util.js                                    | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/addons/messages/services/messages.js b/www/addons/messages/services/messages.js
index bf203ddde17..f2aa2c61b2f 100644
--- a/www/addons/messages/services/messages.js
+++ b/www/addons/messages/services/messages.js
@@ -1241,7 +1241,7 @@ angular.module('mm.addons.messages')
             timecreatedB = parseInt(b.timecreated, 10);
             if (timecreatedA == timecreatedB && a.id) {
                 // Same time, sort by ID.
-                return a.id >= b.id;
+                return a.id >= b.id ? 1 : -1;
             }
             return timecreatedA >= timecreatedB ? 1 : -1;
         });
diff --git a/www/addons/mod/forum/services/prefetch_handler.js b/www/addons/mod/forum/services/prefetch_handler.js
index 0b3956a770a..e5ad3df8074 100644
--- a/www/addons/mod/forum/services/prefetch_handler.js
+++ b/www/addons/mod/forum/services/prefetch_handler.js
@@ -148,7 +148,7 @@ angular.module('mm.addons.mod_forum')
             // If the forum has introfiles there's no need to do this because they have timemodified.
             var urls = $mmUtil.extractDownloadableFilesFromHtml(forum.intro);
             urls = urls.sort(function (a, b) {
-                return a > b;
+                return a >= b ? 1 : -1;
             });
             return revision + '#' + md5.createHash(JSON.stringify(urls));
         }
diff --git a/www/addons/mod/scorm/services/scorm_sync.js b/www/addons/mod/scorm/services/scorm_sync.js
index 8c232d0b7f8..018e15438cc 100644
--- a/www/addons/mod/scorm/services/scorm_sync.js
+++ b/www/addons/mod/scorm/services/scorm_sync.js
@@ -559,7 +559,7 @@ angular.module('mm.addons.mod_scorm')
 
         // Sort offline attempts in DESC order.
         offlineAttempts = offlineAttempts.sort(function(a, b) {
-            return parseInt(a, 10) < parseInt(b, 10);
+            return parseInt(a, 10) <= parseInt(b, 10) ? 1 : -1;
         });
 
         // First move the offline attempts after the collisions;
@@ -581,7 +581,7 @@ angular.module('mm.addons.mod_scorm')
 
             // Sort newAttempts in ASC order.
             newAttempts = newAttempts.sort(function(a, b) {
-                return parseInt(a, 10) > parseInt(b, 10);
+                return parseInt(a, 10) >= parseInt(b, 10) ? 1 : -1;
             });
 
             // Now move the attempts in newAttempts.
diff --git a/www/addons/mod/survey/services/prefetch_handler.js b/www/addons/mod/survey/services/prefetch_handler.js
index e0f63849408..5e153fb0a62 100644
--- a/www/addons/mod/survey/services/prefetch_handler.js
+++ b/www/addons/mod/survey/services/prefetch_handler.js
@@ -124,7 +124,7 @@ angular.module('mm.addons.mod_survey')
                 // If the survey has introfiles there's no need to do this because they have timemodified.
                 var urls = $mmUtil.extractDownloadableFilesFromHtml(survey.intro);
                 urls = urls.sort(function (a, b) {
-                    return a > b;
+                    return a >= b ? 1 : -1;
                 });
                 return revision + '#' + md5.createHash(JSON.stringify(urls));
             }
diff --git a/www/core/components/contentlinks/services/delegate.js b/www/core/components/contentlinks/services/delegate.js
index 7fecafd370b..892378b608d 100644
--- a/www/core/components/contentlinks/services/delegate.js
+++ b/www/core/components/contentlinks/services/delegate.js
@@ -211,7 +211,7 @@ angular.module('mm.core.contentlinks')
 
             // Sort by priority.
             actions = actions.sort(function(a, b) {
-                return a.priority > b.priority;
+                return a.priority >= b.priority ? 1 : -1;
             });
 
             // Fill result array.
diff --git a/www/core/components/course/services/prefetchdelegate.js b/www/core/components/course/services/prefetchdelegate.js
index 49bc7e73102..aea73dac938 100644
--- a/www/core/components/course/services/prefetchdelegate.js
+++ b/www/core/components/course/services/prefetchdelegate.js
@@ -339,7 +339,7 @@ angular.module('mm.core')
             return $q.all(promises).then(function() {
                 // Sort toCheck list.
                 result.toCheck.sort(function (a, b) {
-                    return a.id > b.id;
+                    return a.id >= b.id ? 1 : -1;
                 });
 
                 return result;
diff --git a/www/core/components/fileuploader/services/helper.js b/www/core/components/fileuploader/services/helper.js
index 2e1902b7d9a..aea9ef476d5 100644
--- a/www/core/components/fileuploader/services/helper.js
+++ b/www/core/components/fileuploader/services/helper.js
@@ -298,7 +298,7 @@ angular.module('mm.core.fileuploader')
         // Add buttons for handlers.
         handlers = $mmFileUploaderDelegate.getHandlers();
         handlers.sort(function(a, b) {
-            return a.priority < b.priority;
+            return a.priority <= b.priority ? 1 : -1;
         });
 
         angular.forEach(handlers, function(handler) {
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 0202aacc1c1..512f58e276c 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -1949,7 +1949,7 @@ angular.module('mm.core')
             var entries = getEntries('', obj);
             if (sort) {
                 return entries.sort(function(a, b) {
-                    return a.name > b.name;
+                    return a.name >= b.name ? 1 : -1;
                 });
             }
             return entries;

From 6951af443f0212ccd1013be50095435b5034ba33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Apr 2017 09:58:28 +0200
Subject: [PATCH 090/218] MOBILE-2078 overview: Add component and change my
 courses link

---
 www/addons/myoverview/controllers/index.js    | 36 +++++++++
 www/addons/myoverview/lang/en.json            |  3 +
 www/addons/myoverview/main.js                 | 38 +++++++++
 www/addons/myoverview/services/handlers.js    | 77 ++++++++++++++++++
 www/addons/myoverview/services/myoverview.js  | 81 +++++++++++++++++++
 www/addons/myoverview/templates/index.html    |  9 +++
 .../components/courses/controllers/list.js    |  6 +-
 www/core/components/courses/main.js           |  7 +-
 .../components/courses/services/handlers.js   | 61 +++++++++++++-
 www/core/components/login/services/helper.js  | 55 +++++++++----
 .../components/sidemenu/controllers/menu.js   |  1 -
 .../components/sidemenu/templates/menu.html   |  5 --
 12 files changed, 348 insertions(+), 31 deletions(-)
 create mode 100644 www/addons/myoverview/controllers/index.js
 create mode 100644 www/addons/myoverview/lang/en.json
 create mode 100644 www/addons/myoverview/main.js
 create mode 100644 www/addons/myoverview/services/handlers.js
 create mode 100644 www/addons/myoverview/services/myoverview.js
 create mode 100644 www/addons/myoverview/templates/index.html

diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
new file mode 100644
index 00000000000..a784b3aa85c
--- /dev/null
+++ b/www/addons/myoverview/controllers/index.js
@@ -0,0 +1,36 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.myoverview')
+
+/**
+ * Controller to handle my overview.
+ *
+ * @module mm.addons.myoverview
+ * @ngdoc controller
+ * @name mmaMyOverviewCtrl
+ */
+.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q) {
+    function fetchMyOverview() {
+        return $q.when();
+    }
+
+    fetchMyOverview().finally(function() {
+        $scope.myOverviewLoaded = true;
+    });
+
+    // Pull to refresh.
+    $scope.refreshMyOverview = function() {
+    };
+});
diff --git a/www/addons/myoverview/lang/en.json b/www/addons/myoverview/lang/en.json
new file mode 100644
index 00000000000..97467aafdf1
--- /dev/null
+++ b/www/addons/myoverview/lang/en.json
@@ -0,0 +1,3 @@
+{
+    "pluginname": "Course overview"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/main.js b/www/addons/myoverview/main.js
new file mode 100644
index 00000000000..d4dd2874602
--- /dev/null
+++ b/www/addons/myoverview/main.js
@@ -0,0 +1,38 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.myoverview', [])
+
+.constant('mmaMyOverviewSideMenuPriority', 1100)
+
+.config(function($stateProvider) {
+
+    $stateProvider
+
+    .state('site.myoverview', {
+        url: '/myoverview',
+        views: {
+            'site': {
+                templateUrl: 'addons/myoverview/templates/index.html',
+                controller: 'mmaMyOverviewCtrl'
+            }
+        }
+    });
+})
+
+.config(function($mmSideMenuDelegateProvider, mmaMyOverviewSideMenuPriority) {
+    // Register side menu addon.
+    $mmSideMenuDelegateProvider.registerNavHandler('mmaMyOverview', '$mmaMyOverviewHandlers.sideMenuNav',
+        mmaMyOverviewSideMenuPriority);
+});
diff --git a/www/addons/myoverview/services/handlers.js b/www/addons/myoverview/services/handlers.js
new file mode 100644
index 00000000000..4527f9c4c7a
--- /dev/null
+++ b/www/addons/myoverview/services/handlers.js
@@ -0,0 +1,77 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.myoverview')
+
+/**
+ * My Overview handlers factory.
+ *
+ * This factory holds the different handlers used for delegates.
+ *
+ * @module mm.addons.myoverview
+ * @ngdoc service
+ * @name $mmaMyOverviewHandlers
+ */
+.factory('$mmaMyOverviewHandlers', function($mmaMyOverview) {
+
+    var self = {};
+
+    /**
+     * Side menu nav handler.
+     *
+     * @module mm.addons.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverviewHandlers#sideMenuNav
+     */
+    self.sideMenuNav = function() {
+
+        var self = {};
+
+        /**
+         * Check if handler is enabled.
+         *
+         * @return {Promise|Boolean} If handler is enabled returns a resolved promise. If it's not it can return a
+         *                           rejected promise or false.
+         */
+        self.isEnabled = function() {
+            return $mmaMyOverview.isSideMenuAvalaible();
+        };
+
+        /**
+         * Get the controller.
+         *
+         * @return {Object} Controller.
+         */
+        self.getController = function() {
+
+            /**
+             * Side menu nav handler controller.
+             *
+             * @module mm.addons.myoverview
+             * @ngdoc controller
+             * @name $mmaMyOverviewHandlers#sideMenuNav:controller
+             */
+            return function($scope) {
+                $scope.icon = 'ion-ionic';
+                $scope.title = 'mma.myoverview.pluginname';
+                $scope.state = 'site.myoverview';
+                $scope.class = 'mma-myoverview-handler';
+            };
+        };
+
+        return self;
+    };
+
+    return self;
+});
diff --git a/www/addons/myoverview/services/myoverview.js b/www/addons/myoverview/services/myoverview.js
new file mode 100644
index 00000000000..4c3ba36ab01
--- /dev/null
+++ b/www/addons/myoverview/services/myoverview.js
@@ -0,0 +1,81 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.myoverview')
+
+/**
+ * My overview factory.
+ *
+ * @module mm.addons.myoverview
+ * @ngdoc service
+ * @name $mmaMyOverview
+ */
+.factory('$mmaMyOverview', function($log, $mmSitesManager, $mmSite) {
+    $log = $log.getInstance('$mmaMyOverview');
+
+    var self = {};
+
+    /**
+     * Returns whether or not the my overview plugin is enabled for a certain site.
+     *
+     * This method is called quite often and thus should only perform a quick
+     * check, we should not be calling WS from here.
+     *
+     * @module mm.addons.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverview#isPluginEnabled
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     */
+    self.isPluginEnabled = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.wsAvailable('core_calendar_get_action_events_by_courses');
+        });
+    };
+
+    /**
+     * Check if My Overview is disabled in a certain site.
+     *
+     * @module mm.addons.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverview#isMyOverviewDisabledInSite
+     * @param  {Object} [site] Site. If not defined, use current site.
+     * @return {Boolean}       True if disabled, false otherwise.
+     */
+    self.isMyOverviewDisabledInSite = function(site) {
+        site = site || $mmSite;
+        return site.isFeatureDisabled('$mmSideMenuDelegate_mmaMyOverview');
+    };
+
+
+    /**
+     * Check if My Overview is avalaible to be shown on side meny.
+     *
+     * @module mm.addons.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverview#isSideMenuAvalaible
+     * @param  {Object} [site] Site. If not defined, use current site.
+     * @return {Boolean}       True if disabled, false otherwise.
+     */
+    self.isSideMenuAvalaible = function() {
+        if (!self.isMyOverviewDisabledInSite()) {
+            return self.isPluginEnabled().catch(function() {
+                return false;
+            });
+        }
+        return $q.when(false);
+    };
+
+    return self;
+});
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
new file mode 100644
index 00000000000..b682c771118
--- /dev/null
+++ b/www/addons/myoverview/templates/index.html
@@ -0,0 +1,9 @@
+<ion-view view-title="{{ 'mma.myoverview.pluginname' | translate }}">
+    <ion-content mm-state-class>
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="myOverviewLoaded" on-refresh="refreshMyOverview()">
+        </ion-refresher>
+        <mm-loading hide-until="myOverviewLoaded">
+
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file
diff --git a/www/core/components/courses/controllers/list.js b/www/core/components/courses/controllers/list.js
index d5402fc0a46..0161f3beeb7 100644
--- a/www/core/components/courses/controllers/list.js
+++ b/www/core/components/courses/controllers/list.js
@@ -39,11 +39,7 @@ angular.module('mm.core.courses')
 
             return loadCoursesNavHandlers(refresh);
         }, function(error) {
-            if (typeof error != 'undefined' && error !== '') {
-                $mmUtil.showErrorModal(error);
-            } else {
-                $mmUtil.showErrorModal('mm.courses.errorloadcourses', true);
-            }
+            $mmUtil.showErrorModalDefault(error, 'mm.courses.errorloadcourses', true);
         });
     }
 
diff --git a/www/core/components/courses/main.js b/www/core/components/courses/main.js
index d11651bdeb0..26f370e7fc4 100644
--- a/www/core/components/courses/main.js
+++ b/www/core/components/courses/main.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-angular.module('mm.core.courses', ['mm.core.contentlinks'])
+angular.module('mm.core.courses', ['mm.core.contentlinks', 'mm.core.sidemenu'])
 
 .constant('mmCoursesSearchComponent', 'mmCoursesSearch')
 .constant('mmCoursesSearchPerPage', 20) // Max of courses per page when searching courses.
@@ -23,6 +23,7 @@ angular.module('mm.core.courses', ['mm.core.contentlinks'])
      guest: 'guest',
      default: 'default'
 })
+.constant('mmaMyCoursesSideMenuPriority', 1100)
 
 .config(function($stateProvider) {
 
@@ -86,10 +87,12 @@ angular.module('mm.core.courses', ['mm.core.contentlinks'])
 
 })
 
-.config(function($mmContentLinksDelegateProvider) {
+.config(function($mmContentLinksDelegateProvider, $mmSideMenuDelegateProvider, mmaMyCoursesSideMenuPriority) {
     $mmContentLinksDelegateProvider.registerLinkHandler('mmCourses:courses', '$mmCoursesHandlers.coursesLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmCourses:course', '$mmCoursesHandlers.courseLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmCourses:dashboard', '$mmCoursesHandlers.dashboardLinksHandler');
+    // Register side menu addon.
+    $mmSideMenuDelegateProvider.registerNavHandler('mmCourses', '$mmCoursesHandlers.sideMenuNav', mmaMyCoursesSideMenuPriority);
 })
 
 .run(function($mmEvents, mmCoreEventLogin, mmCoreEventSiteUpdated, mmCoreEventLogout, $mmCoursesDelegate, $mmCourses,
diff --git a/www/core/components/courses/services/handlers.js b/www/core/components/courses/services/handlers.js
index 2933c46787e..f08dac2a694 100644
--- a/www/core/components/courses/services/handlers.js
+++ b/www/core/components/courses/services/handlers.js
@@ -22,7 +22,7 @@ angular.module('mm.core.courses')
  * @name $mmCoursesHandlers
  */
 .factory('$mmCoursesHandlers', function($mmSite, $state, $mmCourses, $q, $mmUtil, $translate, $timeout, $mmCourse, $mmSitesManager,
-            mmCoursesEnrolInvalidKey, $mmContentLinkHandlerFactory) {
+            mmCoursesEnrolInvalidKey, $mmContentLinkHandlerFactory, $mmAddonManager) {
 
     var self = {};
 
@@ -265,5 +265,64 @@ angular.module('mm.core.courses')
         }];
     };
 
+    /**
+     * Side menu nav handler.
+     *
+     * @module mm.addons.courses
+     * @ngdoc method
+     * @name $mmCoursesHandlers#sideMenuNav
+     */
+    self.sideMenuNav = function() {
+
+        var self = {};
+
+        /**
+         * Check if handler is enabled.
+         *
+         * @return {Promise|Boolean} If handler is enabled returns a resolved promise. If it's not it can return a
+         *                           rejected promise or false.
+         */
+        self.isEnabled = function() {
+            var myCoursesDisabled = $mmCourses.isMyCoursesDisabledInSite();
+
+            var $mmaMyOverview = $mmAddonManager.get('$mmaMyOverview');
+            if ($mmaMyOverview) {
+                return $mmaMyOverview.isSideMenuAvalaible().then(function(enabled) {
+                    if (enabled) {
+                        return false;
+                    }
+                    // Addon not enabled, check my courses.
+                    return !myCoursesDisabled;
+                });
+            }
+            // Addon not present, check my courses.
+            return !myCoursesDisabled;
+        };
+
+        /**
+         * Get the controller.
+         *
+         * @return {Object} Controller.
+         */
+        self.getController = function() {
+
+            /**
+             * Side menu nav handler controller.
+             *
+             * @module mm.addons.courses
+             * @ngdoc controller
+             * @name $mmCoursesHandlers#sideMenuNav:controller
+             */
+            return function($scope) {
+                $scope.icon = 'ion-ionic';
+                $scope.title = 'mm.courses.mycourses';
+                $scope.state = 'site.mm_courses';
+                $scope.class = 'mm-mycourses-handler';
+            };
+        };
+
+        return self;
+    };
+
     return self;
 });
diff --git a/www/core/components/login/services/helper.js b/www/core/components/login/services/helper.js
index 3919263c77e..ddb74a4f551 100644
--- a/www/core/components/login/services/helper.js
+++ b/www/core/components/login/services/helper.js
@@ -188,33 +188,54 @@ angular.module('mm.core.login')
      * @return {Promise} Promise resolved when the state changes.
      */
     self.goToSiteInitialPage = function() {
-        var myCoursesDisabled = $mmCourses.isMyCoursesDisabledInSite();
+        return isMyOverviewEnabled().then(function(myOverview) {
+            var myCourses = !myOverview && isMyCoursesEnabled();
 
-        if (myCoursesDisabled || ($mmSite.getInfo() && $mmSite.getInfo().userhomepage === 0)) {
-            // Configured to go to Site Home OR My Courses is disabled. Check if plugin is installed in the app.
+            // Check if frontpage is needed to be shown. (If configured or if any of the other avalaible).
+            if (($mmSite.getInfo() && $mmSite.getInfo().userhomepage === 0) || (!myCourses && !myOverview)) {
+                promise = isFrontpageEnabled();
+            } else {
+                promise = $q.when(false);
+            }
+
+            return promise.then(function(frontpage) {
+                // Check avalaibility in priority order.
+                if (frontpage) {
+                    return $state.go('site.frontpage');
+                } else if (myOverview) {
+                    return $state.go('site.myoverview');
+                } else if (myCourses) {
+                    return $state.go('site.mm_courses');
+                } else {
+                    // Anything else available, go to the user profile.
+                    return $state.go(mmUserProfileState, {userid: $mmSite.getUserId()});
+                }
+            });
+        });
+
+        function isFrontpageEnabled() {
             var $mmaFrontpage = $mmAddonManager.get('$mmaFrontpage');
             if ($mmaFrontpage && !$mmaFrontpage.isDisabledInSite()) {
                 return $mmaFrontpage.isFrontpageAvailable().then(function() {
-                    return $state.go('site.frontpage');
+                    return true;
                 }).catch(function() {
-                    if (!myCoursesDisabled) {
-                        // Site Home not available, go to My Courses.
-                        return $state.go('site.mm_courses');
-                    }
-
-                    // Both Site Home and My Courses aren't available, go to the user profile.
-                    return $state.go(mmUserProfileState, {userid: $mmSite.getUserId()});
+                    return false;
                 });
             }
+            return $q.when(false);
         }
 
-        if (!myCoursesDisabled) {
-            // Site Home not available, go to My Courses.
-            return $state.go('site.mm_courses');
+        function isMyCoursesEnabled() {
+            return !$mmCourses.isMyCoursesDisabledInSite();
         }
 
-        // Both Site Home and My Courses aren't available, go to the user profile.
-        return $state.go(mmUserProfileState, {userid: $mmSite.getUserId()});
+        function isMyOverviewEnabled() {
+            var $mmaMyOverview = $mmAddonManager.get('$mmaMyOverview');
+            if ($mmaMyOverview) {
+                return $mmaMyOverview.isSideMenuAvalaible();
+            }
+            return $q.when(false);
+        }
     };
 
     /**
@@ -418,7 +439,7 @@ angular.module('mm.core.login')
                     stateparams: data.stateparams
                 };
             } else {
-                $log.debug('Inalid signature in the URL request yours: ' + params[0] + ' mine: '
+                $log.debug('Invalid signature in the URL request yours: ' + params[0] + ' mine: '
                                 + signature + ' for passport ' + passport);
                 return $mmLang.translateAndReject('mm.core.unexpectederror');
             }
diff --git a/www/core/components/sidemenu/controllers/menu.js b/www/core/components/sidemenu/controllers/menu.js
index 864c55d01d1..3edc382bd8c 100644
--- a/www/core/components/sidemenu/controllers/menu.js
+++ b/www/core/components/sidemenu/controllers/menu.js
@@ -40,7 +40,6 @@ angular.module('mm.core.sidemenu')
 
         $scope.siteinfo = $mmSite.getInfo();
         $scope.logoutLabel = 'mm.sidemenu.' + (config && config.tool_mobile_forcelogout == "1" ? 'logout': 'changesite');
-        $scope.showMyCourses = !$mmCourses.isMyCoursesDisabledInSite();
         $scope.showWeb = !$mmSite.isFeatureDisabled('$mmSideMenuDelegate_website');
         $scope.showHelp = !$mmSite.isFeatureDisabled('$mmSideMenuDelegate_help');
 
diff --git a/www/core/components/sidemenu/templates/menu.html b/www/core/components/sidemenu/templates/menu.html
index 10ca082233d..f7acee79e28 100644
--- a/www/core/components/sidemenu/templates/menu.html
+++ b/www/core/components/sidemenu/templates/menu.html
@@ -29,11 +29,6 @@ <h2>{{siteinfo.fullname}}</h2>
         <ion-content class="has-side-menu-header mm-sidemenu-menu">
             <nav>
                 <ul class="list dark">
-                    <li ng-if="showMyCourses" class="mm-mycourses-handler">
-                        <a menu-close class="item item-icon-left" ui-sref="site.mm_courses" title="{{ 'mm.sidemenu.mycourses' | translate}}">
-                            <i class="icon ion-ionic"></i>{{ 'mm.sidemenu.mycourses' | translate}}
-                        </a>
-                    </li>
                     <li class="item text-center" ng-if="(!handlers || !handlers.length) && !areNavHandlersLoaded()">
                         <ion-spinner></ion-spinner>
                     </li>

From 6ea67c96227586ee2016411633f778511b5be53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Apr 2017 15:29:36 +0200
Subject: [PATCH 091/218] MOBILE-2078 overview: Get events by time

---
 .../mod/assign/templates/submission.html      |   2 +-
 .../mod/feedback/templates/analysis.html      |   2 +-
 www/addons/mod/feedback/templates/index.html  |   2 +-
 www/addons/myoverview/controllers/index.js    |  94 ++++++++++++-
 www/addons/myoverview/directives/eventlist.js |  40 ++++++
 www/addons/myoverview/lang/en.json            |  17 ++-
 www/addons/myoverview/services/myoverview.js  | 127 +++++++++++++++++-
 .../myoverview/templates/eventlist.html       |   9 ++
 www/addons/myoverview/templates/index.html    |  33 ++++-
 www/core/scss/styles.scss                     |  20 ++-
 10 files changed, 325 insertions(+), 21 deletions(-)
 create mode 100644 www/addons/myoverview/directives/eventlist.js
 create mode 100644 www/addons/myoverview/templates/eventlist.html

diff --git a/www/addons/mod/assign/templates/submission.html b/www/addons/mod/assign/templates/submission.html
index 0d6a06d8c57..47bf66d4ccb 100644
--- a/www/addons/mod/assign/templates/submission.html
+++ b/www/addons/mod/assign/templates/submission.html
@@ -35,7 +35,7 @@ <h2>{{ 'mma.mod_assign.submissionstatus' | translate }}</h2>
         <p ng-if="gradingStatusTranslationId" class="badge badge-inline {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
     </div>
 
-    <div class="tabs tabs-striped tabs-free tabs-color-positive" ng-if="feedback || isGrading">
+    <div class="tabs tabs-striped tabs-free tabs-color-orange" ng-if="feedback || isGrading">
       <a class="tab-item" ng-class="{'active': showSubmission}" ng-click="changeShowSubmission(true)">{{ 'mma.mod_assign.submission' | translate }}</a>
       <a class="tab-item" ng-class="{'active': !showSubmission}" ng-click="changeShowSubmission(false)">{{ 'mma.mod_assign.grade' | translate }}</a>
     </div>
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
index 6afca384f97..87e10a47d18 100644
--- a/www/addons/mod/feedback/templates/analysis.html
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -10,7 +10,7 @@
     <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
-            <div class="tabs tabs-striped tabs-free tabs-color-positive" ng-if="access.canviewreports">
+            <div class="tabs tabs-striped tabs-free tabs-color-orange" ng-if="access.canviewreports">
               <a class="tab-item" ng-click="openFeature()">{{ 'mma.mod_feedback.overview' | translate }}</a>
               <a class="tab-item active">{{ 'mma.mod_feedback.analysis' | translate }}</a>
             </div>
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index d616e1e6316..f38076590a9 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -29,7 +29,7 @@
                 <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
             </div>
 
-            <div class="tabs tabs-striped tabs-free tabs-color-positive" ng-if="access.canviewreports">
+            <div class="tabs tabs-striped tabs-free tabs-color-orange" ng-if="access.canviewreports">
               <a class="tab-item active">{{ 'mma.mod_feedback.overview' | translate }}</a>
               <a class="tab-item" ng-click="openFeature('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
             </div>
diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
index a784b3aa85c..e58750caf9d 100644
--- a/www/addons/myoverview/controllers/index.js
+++ b/www/addons/myoverview/controllers/index.js
@@ -21,16 +21,98 @@ angular.module('mm.addons.myoverview')
  * @ngdoc controller
  * @name mmaMyOverviewCtrl
  */
-.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q) {
-    function fetchMyOverview() {
-        return $q.when();
+.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q, $mmCourse) {
+
+    var timeline = [];
+    $scope.tabShown = 'timeline';
+    $scope.timeline = {
+        loaded: false,
+        loadingMore: false,
+        canLoadMore: false
     }
 
-    fetchMyOverview().finally(function() {
-        $scope.myOverviewLoaded = true;
-    });
+    function fetchMyOverviewTimeline(afterEventId) {
+        return $mmaMyOverview.getActionEventsByTimesort(afterEventId).then(function(events) {
+            timeline = timeline.concat(events);
+
+            $scope.timeline.empty = !timeline.length;
+            $scope.timeline.recentlyOverdue = filterEventsByTime(timeline, -14, 0);
+            $scope.timeline.today = filterEventsByTime(timeline, 0, 1);
+            $scope.timeline.next7Days = filterEventsByTime(timeline, 1, 7);
+            $scope.timeline.next30Days = filterEventsByTime(timeline, 7, 30);
+            $scope.timeline.future = filterEventsByTime(timeline, 30);
+            $scope.timeline.canLoadMore = events.length >= 20;
+
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
+            return $q.reject();
+        });
+    }
+
+    function filterEventsByTime(events, start, end) {
+        start = moment().add(start, 'days').unix();
+        end = typeof end == "undefined" ? false : moment().add(end, 'days').unix();
+
+        return events.filter(function(event) {
+            if (end) {
+                return start <= event.timesort && event.timesort < end;
+            }
+
+            return start <= event.timesort;
+        }).map(function(event) {
+            event.iconUrl = $mmCourse.getModuleIconSrc(event.icon.component);
+            return event;
+        });
+    }
 
     // Pull to refresh.
     $scope.refreshMyOverview = function() {
+        switch($scope.tabShown) {
+            case 'timeline':
+                timeline = [];
+                $mmaMyOverview.invalidateActionEventsByTimesort().finally(function() {
+                    fetchMyOverviewTimesort().finally(function() {
+                        $scope.$broadcast('scroll.refreshComplete');
+                    });
+                });
+                break;
+            case 'courses':
+                break;
+        }
+    };
+
+    // Change tab being viewed.
+    $scope.switchTab = function(tab) {
+        $scope.tabShown = tab;
+        switch($scope.tabShown) {
+            case 'timeline':
+                if (!$scope.timeline.loaded) {
+                    fetchMyOverviewTimeline().finally(function() {
+                        $scope.timeline.loaded = true;
+                    });
+                }
+                break;
+            case 'courses':
+                break;
+        }
+    };
+
+    $scope.switchTab('timeline');
+
+    // Load more events.
+    $scope.loadMore = function() {
+        switch($scope.tabShown) {
+            case 'timeline':
+                $scope.timeline.loadingMore = true;
+                fetchMyOverviewTimeline(timeline[timeline.length -1].id).catch(function(message) {
+                    $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
+                }).finally(function() {
+                    $scope.timeline.loadingMore = false;
+                });
+                break;
+            case 'courses':
+                break;
+        }
+
     };
 });
diff --git a/www/addons/myoverview/directives/eventlist.js b/www/addons/myoverview/directives/eventlist.js
new file mode 100644
index 00000000000..83bdca44a6d
--- /dev/null
+++ b/www/addons/myoverview/directives/eventlist.js
@@ -0,0 +1,40 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.myoverview')
+
+/**
+ * Directive to render the overview events lists.
+ *
+ * @module mm.addons.myoverview
+ * @ngdoc directive
+ * @name mmaMyOverviewEventList
+ * @description
+ *
+ * Parameters received by this directive and shared with the directive to render the plugin:
+ *
+ * @param {Array} events        Array of event items to show.
+ * @param {Boolean} showCourse  Whether of not show course name.
+ */
+.directive('mmaMyOverviewEventList', function() {
+
+    return {
+        restrict: 'E',
+        scope: {
+            events: '=',
+            showCourse: '=?'
+        },
+        templateUrl: 'addons/myoverview/templates/eventlist.html'
+    };
+});
diff --git a/www/addons/myoverview/lang/en.json b/www/addons/myoverview/lang/en.json
index 97467aafdf1..3fd5dfc1647 100644
--- a/www/addons/myoverview/lang/en.json
+++ b/www/addons/myoverview/lang/en.json
@@ -1,3 +1,18 @@
 {
-    "pluginname": "Course overview"
+    "future": "Future",
+    "inprogress": "In progress",
+    "morecourses": "More courses",
+    "nocourses": "No courses",
+    "nocoursesinprogress": "No in progress courses",
+    "nocoursesfuture": "No future courses",
+    "nocoursespast": "No past courses",
+    "noevents": "No upcoming activities due",
+    "next30days": "Next 30 days",
+    "next7days": "Next 7 days",
+    "past": "Past",
+    "pluginname": "Course overview",
+    "recentlyoverdue": "Recently overdue",
+    "sortbycourses": "Sort by courses",
+    "sortbydates": "Sort by dates",
+    "timeline": "Timeline"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/services/myoverview.js b/www/addons/myoverview/services/myoverview.js
index 4c3ba36ab01..2bdeddc8a30 100644
--- a/www/addons/myoverview/services/myoverview.js
+++ b/www/addons/myoverview/services/myoverview.js
@@ -21,11 +21,39 @@ angular.module('mm.addons.myoverview')
  * @ngdoc service
  * @name $mmaMyOverview
  */
-.factory('$mmaMyOverview', function($log, $mmSitesManager, $mmSite) {
+.factory('$mmaMyOverview', function($log, $mmSitesManager, $mmSite, $mmUtil) {
     $log = $log.getInstance('$mmaMyOverview');
 
     var self = {};
 
+    /**
+     * Get cache key for get calendar action events for a given list of courses value WS call.
+     *
+     * @return {String}       Cache key.
+     */
+    function getActionEventsByCoursesCacheKey() {
+        return 'myoverview:bycourses';
+    }
+
+    /**
+     * Get cache key for get calendar action events for the given course value WS call.
+     *
+     * @param {Number}   courseId    Only events in this course.
+     * @return {String}             Cache key.
+     */
+    function getActionEventsByCourseCacheKey(courseId) {
+        return 'myoverview:bycourse:' + courseId;
+    }
+
+    /**
+     * Get cache key for get calendar action events based on the timesort value WS call.
+     *
+     * @return {String}       Cache key.
+     */
+    function getActionEventsByTimesortCacheKey() {
+        return 'myoverview:bytimesort';
+    }
+
     /**
      * Returns whether or not the my overview plugin is enabled for a certain site.
      *
@@ -77,5 +105,102 @@ angular.module('mm.addons.myoverview')
         return $q.when(false);
     };
 
+
+    /**
+     * Get calendar action events for a given list of courses.
+     *
+     * @module mm.core.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverview#getActionEventsByCourses
+     * @param {Array} courseIds
+     * @param {String}  [siteId]    Site. If not defined, use current site.
+     * @return {Promise}            Promise to be resolved when the info is retrieved.
+     */
+    self.getActionEventsByCourses = function(courseIds, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+
+            var data = {
+                    courseids: courseIds
+                },
+                presets = {
+                    cacheKey: getActionEventsByCoursesCacheKey()
+                };
+
+            return site.read('core_calendar_get_action_events_by_courses', data, presets);
+        });
+    };
+
+    /**
+     * Get calendar action events for the given course.
+     *
+     * @module mm.core.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverview#getActionEventsByCourse
+     * @param {Number}  courseId    Only events in this course.
+     * @param {String}  [siteId]    Site. If not defined, use current site.
+     * @return {Promise}            Promise to be resolved when the info is retrieved.
+     */
+    self.getActionEventsByCourse = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+
+            var data = {
+                    courseid: courseId
+                },
+                presets = {
+                    cacheKey: getActionEventsByCourseCacheKey(courseId)
+                };
+
+            return site.read('core_calendar_get_action_events_by_course', data, presets);
+        });
+    };
+
+    /**
+     * Get calendar action events based on the timesort value.
+     *
+     * @module mm.core.myoverview
+     * @ngdoc method
+     * @name $mmaMyOverview#getActionEventsByTimesort
+     * @param {Number}  [afterEventId]  The last seen event id.
+     * @param {String}  [siteId]        Site. If not defined, use current site.
+     * @return {Promise}                Promise to be resolved when the info is retrieved.
+     */
+    self.getActionEventsByTimesort = function(afterEventId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
+                data = {
+                    timesortfrom: time
+                },
+                presets = {
+                    cacheKey: getActionEventsByTimesortCacheKey()
+                };
+
+            if (afterEventId) {
+                data.aftereventid = afterEventId;
+            }
+
+            return site.read('core_calendar_get_action_events_by_timesort', data, presets).then(function(events) {
+                // Filter events by time in case it uses cache.
+                return events.events.filter(function(element) {
+                    return element.timesort >= time;
+                });
+            });
+        });
+    };
+
+    /**
+     * Invalidates get calendar action events based on the timesort value WS call.
+     *
+     * @module mm.core.myoverview
+     * @ngdoc method
+     * @name $mmCourses#invalidateActionEventsByTimesort
+     * @param {String} [siteId] Site ID to invalidate. If not defined, use current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateActionEventsByTimesort = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getActionEventsByTimesortCacheKey());
+        });
+    };
+
     return self;
 });
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
new file mode 100644
index 00000000000..385aa030ce9
--- /dev/null
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -0,0 +1,9 @@
+<ul class="list">
+    <li ng-repeat="event in events">
+        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
+            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index b682c771118..6846c4189a9 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -1,9 +1,34 @@
 <ion-view view-title="{{ 'mma.myoverview.pluginname' | translate }}">
     <ion-content mm-state-class>
-        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="myOverviewLoaded" on-refresh="refreshMyOverview()">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="timeline.loaded" on-refresh="refreshMyOverview()">
         </ion-refresher>
-        <mm-loading hide-until="myOverviewLoaded">
-
-        </mm-loading>
+        <div class="tabs tabs-striped tabs-free tabs-color-orange">
+          <a class="tab-item" ng-class="{'active': tabShown == 'timeline'}" ng-click="switchTab('timeline')">{{ 'mma.myoverview.timeline' | translate }}</a>
+          <a class="tab-item" ng-class="{'active': tabShown == 'courses'}" ng-click="switchTab('courses')">{{ 'mm.courses.courses' | translate }}</a>
+        </div>
+        <div class="padding">
+            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline'">
+                <h5 ng-if="timeline.recentlyOverdue.length > 0" class="assertive">{{ 'mma.myoverview.recentlyoverdue' | translate }}</h5>
+                <mma-my-overview-event-list ng-if="timeline.recentlyOverdue.length > 0" events="timeline.recentlyOverdue" show-course="true"></mma-my-overview-event-list>
+                <h5 ng-if="timeline.today.length > 0">{{ 'mma.myoverview.today' | translate }}</h5>
+                <mma-my-overview-event-list ng-if="timeline.today.length > 0" events="timeline.today" show-course="true"></mma-my-overview-event-list>
+                <h5 ng-if="timeline.next7Days.length > 0">{{ 'mma.myoverview.next7days' | translate }}</h5>
+                <mma-my-overview-event-list ng-if="timeline.next7Days.length > 0" events="timeline.next7Days" show-course="true"></mma-my-overview-event-list>
+                <h5 ng-if="timeline.next30Days.length > 0">{{ 'mma.myoverview.next30days' | translate }}</h5>
+                <mma-my-overview-event-list ng-if="timeline.next30Days.length > 0" events="timeline.next30Days" show-course="true"></mma-my-overview-event-list>
+                <h5 ng-if="timeline.future.length > 0">{{ 'mma.myoverview.future' | translate }}</h5>
+                <mma-my-overview-event-list ng-if="timeline.future.length > 0" events="timeline.future" show-course="true"></mma-my-overview-event-list>
+                <div class="padding text-center" ng-if="timeline.canLoadMore">
+                    <!-- Button and spinner to show more attempts. -->
+                    <button ng-if="!timeline.loadingMore" class="button button-block" ng-click="loadMore()">{{ 'mm.core.loadmore' | translate }}</button>
+                    <ion-spinner ng-if="timeline.loadingMore"></ion-spinner>
+                </div>
+                <div ng-if="timeline.empty">
+                    <p>{{ 'mma.myoverview.noevents' | translate }}</p>
+                </div>
+            </mm-loading>
+            <mm-loading hide-until="coursesLoaded" ng-show="tabShown == 'courses'">
+            </mm-loading>
+        </div>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index c06af812b32..e8679ce851c 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -15,8 +15,10 @@
  * Variables
  */
 
+$orange-medium: #ff7701; // Default app color.
+
 // Bar content.
-$bar-content-bg: #f70 !default;
+$bar-content-bg: $orange-medium !default;
 $bar-content-border: transparent !default;
 $bar-content-text: #fff !default;
 
@@ -298,20 +300,26 @@ p.item-text-wrap {
 }
 
 /* Show buttons as tabs */
+@include tabs-striped-color('tabs-color-orange', $orange-medium);
+@include tabs-color('tabs-color-orange', $orange-medium);
+
 .tabs.tabs-free {
   position: initial;
-  background: transparent;
+  background: white;
   border: 0;
-  margin-bottom: 0;
-  margin-top: 10px;
+  margin: 0;
+  padding: 0;
+  box-shadow: 0px 6px 6px -3px rgba(0, 0, 0, 0.2);
 
   .tab-item {
-    margin-top: -1px;
+    color: #666;
+    margin-top: 0;
     max-width: initial;
     font-size: 120%;
 
     &.active, &.activated {
-      margin-top: -1px;
+      color: black;
+      margin-top: 0;
       border-top-width: 0;
       border-bottom-width: 3px;
     }

From efd9e8e491e4506acf472bbf9dcb8899f825459f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Apr 2017 13:29:41 +0200
Subject: [PATCH 092/218] MOBILE-2042 messages: Expect boolean on
 core_message_mark_all_messages_as_read

---
 www/addons/messages/services/messages.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/addons/messages/services/messages.js b/www/addons/messages/services/messages.js
index f2aa2c61b2f..41f22f2a6aa 100644
--- a/www/addons/messages/services/messages.js
+++ b/www/addons/messages/services/messages.js
@@ -470,8 +470,11 @@ angular.module('mm.addons.messages')
         var params = {
                 'useridto': $mmSite.getUserId(),
                 'useridfrom': userIdFrom
+            },
+            preSets = {
+                typeExpected: 'boolean'
             };
-        return $mmSite.write('core_message_mark_all_messages_as_read', params);
+        return $mmSite.write('core_message_mark_all_messages_as_read', params, preSets);
 
     };
 

From 07f72b562f41c138f95b3a1cc1d9fc46f77efa30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Apr 2017 12:29:39 +0200
Subject: [PATCH 093/218] MOBILE-2078 overview: Basic courses view

---
 www/addons/myoverview/controllers/index.js    | 231 +++++++++++++---
 www/addons/myoverview/directives/eventlist.js |  52 +++-
 www/addons/myoverview/img/activities.svg      | 178 ++++++++++++
 www/addons/myoverview/img/courses.svg         | 257 ++++++++++++++++++
 www/addons/myoverview/scss/styles.scss        |  52 ++++
 www/addons/myoverview/services/myoverview.js  | 109 ++++++--
 .../myoverview/templates/eventlist.html       |  59 +++-
 www/addons/myoverview/templates/index.html    |  77 ++++--
 .../components/courses/controllers/list.js    |  29 +-
 .../courses/directives/courselistprogress.js  | 110 ++++++++
 www/core/components/courses/scss/styles.scss  | 110 ++++++++
 .../components/courses/services/delegate.js   |  57 ++--
 .../courses/templates/courselistprogress.html |  34 +++
 .../components/courses/templates/list.html    |  24 +-
 www/core/scss/styles.scss                     |  58 ++++
 15 files changed, 1288 insertions(+), 149 deletions(-)
 create mode 100644 www/addons/myoverview/img/activities.svg
 create mode 100644 www/addons/myoverview/img/courses.svg
 create mode 100644 www/addons/myoverview/scss/styles.scss
 create mode 100644 www/core/components/courses/directives/courselistprogress.js
 create mode 100644 www/core/components/courses/scss/styles.scss
 create mode 100644 www/core/components/courses/templates/courselistprogress.html

diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
index e58750caf9d..127375173b4 100644
--- a/www/addons/myoverview/controllers/index.js
+++ b/www/addons/myoverview/controllers/index.js
@@ -21,62 +21,198 @@ angular.module('mm.addons.myoverview')
  * @ngdoc controller
  * @name mmaMyOverviewCtrl
  */
-.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q, $mmCourse) {
+.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q, $mmCourses) {
 
-    var timeline = [];
     $scope.tabShown = 'timeline';
     $scope.timeline = {
+        sort: 'sortbydates',
+        events: [],
         loaded: false,
-        loadingMore: false,
-        canLoadMore: false
-    }
+        canLoadMore: false,
+    };
+    $scope.timelineCourses = {
+        courses: [],
+        loaded: false,
+        canLoadMore: false,
+    };
+    $scope.courses = {
+        selected: 'inprogress',
+        loaded: false,
+        filter: ''
+    };
+    $scope.showGrid = true;
+    $scope.showFilter = false;
+
+    $scope.searchEnabled = $mmCourses.isSearchCoursesAvailable() && !$mmCourses.isSearchCoursesDisabledInSite();
 
     function fetchMyOverviewTimeline(afterEventId) {
         return $mmaMyOverview.getActionEventsByTimesort(afterEventId).then(function(events) {
-            timeline = timeline.concat(events);
+            $scope.timeline.events = $scope.timeline.events.concat(events.events);
+            $scope.timeline.canLoadMore = events.canLoadMore;
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
+            return $q.reject();
+        });
+    }
 
-            $scope.timeline.empty = !timeline.length;
-            $scope.timeline.recentlyOverdue = filterEventsByTime(timeline, -14, 0);
-            $scope.timeline.today = filterEventsByTime(timeline, 0, 1);
-            $scope.timeline.next7Days = filterEventsByTime(timeline, 1, 7);
-            $scope.timeline.next30Days = filterEventsByTime(timeline, 7, 30);
-            $scope.timeline.future = filterEventsByTime(timeline, 30);
-            $scope.timeline.canLoadMore = events.length >= 20;
+    function fetchMyOverviewTimelineByCourses() {
+        return fetchUserCourses().then(function(courses) {
+            var today = moment().unix(),
+                courseIds = [];
+            courses = courses.filter(function(course) {
+                return course.startdate <= today && (!course.enddate || course.enddate >= today);
+            }).sort(function(a, b) {
+                var compareA = a.fullname.toLowerCase(),
+                    compareB = b.fullname.toLowerCase();
 
+                return compareA.localeCompare(compareB);
+            });
+            $scope.timelineCourses.courses = courses;
+            if (courses.length > 0) {
+                courseIds = courses.map(function(course) {
+                    return course.id;
+                });
+                return $mmaMyOverview.getActionEventsByCourses(courseIds).then(function(courseEvents) {
+                    angular.forEach($scope.timelineCourses.courses, function(course) {
+                        course.events = courseEvents[course.id].events;
+                        course.canLoadMore = courseEvents[course.id].canLoadMore;
+                    });
+                });
+            }
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
             return $q.reject();
         });
     }
 
-    function filterEventsByTime(events, start, end) {
-        start = moment().add(start, 'days').unix();
-        end = typeof end == "undefined" ? false : moment().add(end, 'days').unix();
+    function fetchMyOverviewCourses() {
+        return fetchUserCourses().then(function(courses) {
+            var today = moment().unix();
 
-        return events.filter(function(event) {
-            if (end) {
-                return start <= event.timesort && event.timesort < end;
-            }
+            $scope.courses.filter = ''; // Filter value MUST be set after courses are shown.
+            $scope.showFilter = false;
+            $scope.courses.past = [];
+            $scope.courses.inprogress = [];
+            $scope.courses.future = [];
 
-            return start <= event.timesort;
-        }).map(function(event) {
-            event.iconUrl = $mmCourse.getModuleIconSrc(event.icon.component);
-            return event;
+            courses.sort(function(a, b) {
+                var compareA = a.fullname.toLowerCase(),
+                    compareB = b.fullname.toLowerCase();
+
+                return compareA.localeCompare(compareB);
+            })
+
+            angular.forEach(courses, function(course) {
+                if (course.startdate > today) {
+                    // Courses that have not started yet.
+                    $scope.courses.future.push(course);
+                } else if (course.enddate && course.enddate < today) {
+                    // Courses that have already ended.
+                    $scope.courses.past.push(course);
+                } else {
+                    // Courses still in progress. Either their end date is not set, or the end date is not yet past the current date.
+                    $scope.courses.inprogress.push(course);
+                }
+            });
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
+            return $q.reject();
         });
     }
 
+    function fetchUserCourses() {
+        var courseIds = [];
+        return $mmCourses.getUserCourses().then(function(courses) {
+            courseIds = courses.map(function(course) {
+                return course.id;
+            });
+
+            // Load the handlers of each course.
+            return $mmCourses.getCoursesOptions(courseIds).then(function(options) {
+                angular.forEach(courses, function(course) {
+                    course.showProgress = true;
+                    course.progress = isNaN(parseInt(course.progress, 10)) ? false : parseInt(course.progress, 10);
+
+                    course.navOptions = options.navOptions[course.id];
+                    course.admOptions = options.admOptions[course.id];
+                });
+                return courses;
+            });
+        });
+    }
+
+    $scope.switchFilter = function() {
+        $scope.showFilter = !$scope.showFilter;
+        if (!$scope.showFilter) {
+            $scope.courses.filter = "";
+        }
+    };
+
+    $scope.switchGrid = function() {
+        $scope.showGrid = !$scope.showGrid;
+    };
+
     // Pull to refresh.
     $scope.refreshMyOverview = function() {
+        var promises = [];
+
         switch($scope.tabShown) {
             case 'timeline':
-                timeline = [];
-                $mmaMyOverview.invalidateActionEventsByTimesort().finally(function() {
-                    fetchMyOverviewTimesort().finally(function() {
-                        $scope.$broadcast('scroll.refreshComplete');
-                    });
-                });
+                promises.push($mmaMyOverview.invalidateActionEventsByTimesort());
+                promises.push($mmaMyOverview.invalidateActionEventsByCourses());
+                promises.push($mmCourses.invalidateUserNavigationOptions());
+                promises.push($mmCourses.invalidateUserAdministrationOptions());
+                promises.push($mmCourses.invalidateUserCourses());
                 break;
             case 'courses':
+                promises.push($mmCourses.invalidateUserNavigationOptions());
+                promises.push($mmCourses.invalidateUserAdministrationOptions());
+                promises.push($mmCourses.invalidateUserCourses());
+                break;
+        }
+
+        $q.all(promises).finally(function() {
+            var promise;
+
+            switch($scope.tabShown) {
+                case 'timeline':
+                    switch($scope.timeline.sort) {
+                        case 'sortbydates':
+                            $scope.timeline.events = [];
+                            promise = fetchMyOverviewTimesort();
+                            break;
+                        case 'sortbycourses':
+                            $scope.timeline.courses = [];
+                            promise = fetchMyOverviewTimelineByCourses();
+                            break;
+                    }
+                    break;
+                case 'courses':
+                    promise = fetchMyOverviewCourses();
+                    break;
+            }
+            promise.finally(function() {
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        });
+    };
+
+    // Change timeline sort being viewed.
+    $scope.switchSort = function() {
+        switch($scope.timeline.sort) {
+            case 'sortbydates':
+                if (!$scope.timeline.loaded) {
+                    fetchMyOverviewTimeline().finally(function() {
+                        $scope.timeline.loaded = true;
+                    });
+                }
+                break;
+            case 'sortbycourses':
+                if (!$scope.timelineCourses.loaded) {
+                    fetchMyOverviewTimelineByCourses().finally(function() {
+                        $scope.timelineCourses.loaded = true;
+                    });
+                }
                 break;
         }
     };
@@ -87,32 +223,37 @@ angular.module('mm.addons.myoverview')
         switch($scope.tabShown) {
             case 'timeline':
                 if (!$scope.timeline.loaded) {
-                    fetchMyOverviewTimeline().finally(function() {
+                    return fetchMyOverviewTimeline().finally(function() {
                         $scope.timeline.loaded = true;
                     });
                 }
                 break;
             case 'courses':
+                if (!$scope.courses.loaded) {
+                    return fetchMyOverviewCourses().finally(function() {
+                        $scope.courses.loaded = true;
+                    });
+                }
                 break;
         }
     };
 
-    $scope.switchTab('timeline');
+    $scope.switchTab('timeline').finally(function() {
+        if ($scope.timeline.events.length == 0) {
+            $scope.switchTab('courses')
+        }
+    });
 
     // Load more events.
-    $scope.loadMore = function() {
-        switch($scope.tabShown) {
-            case 'timeline':
-                $scope.timeline.loadingMore = true;
-                fetchMyOverviewTimeline(timeline[timeline.length -1].id).catch(function(message) {
-                    $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
-                }).finally(function() {
-                    $scope.timeline.loadingMore = false;
-                });
-                break;
-            case 'courses':
-                break;
-        }
+    $scope.loadMoreTimeline = function() {
+        return fetchMyOverviewTimeline($scope.timeline.canLoadMore);
+    };
 
+    // Load more events.
+    $scope.loadMoreCourse = function(course) {
+        return $mmaMyOverview.getActionEventsByCourse(course.id, course.canLoadMore).then(function(courseEvents) {
+            course.events = course.events.concat(courseEvents.events);
+            course.canLoadMore = courseEvents.canLoadMore;
+        });
     };
 });
diff --git a/www/addons/myoverview/directives/eventlist.js b/www/addons/myoverview/directives/eventlist.js
index 83bdca44a6d..a03d8779afc 100644
--- a/www/addons/myoverview/directives/eventlist.js
+++ b/www/addons/myoverview/directives/eventlist.js
@@ -27,14 +27,60 @@ angular.module('mm.addons.myoverview')
  * @param {Array} events        Array of event items to show.
  * @param {Boolean} showCourse  Whether of not show course name.
  */
-.directive('mmaMyOverviewEventList', function() {
+.directive('mmaMyOverviewEventList', function($mmCourse, $mmUtil) {
+
+    function filterEventsByTime(events, start, end) {
+        start = moment().add(start, 'days').unix();
+        end = typeof end == "undefined" ? false : moment().add(end, 'days').unix();
+
+        return events.filter(function(event) {
+            if (end) {
+                return start <= event.timesort && event.timesort < end;
+            }
+
+            return start <= event.timesort;
+        }).map(function(event) {
+            event.iconUrl = $mmCourse.getModuleIconSrc(event.icon.component);
+            return event;
+        });
+    }
 
     return {
         restrict: 'E',
         scope: {
             events: '=',
-            showCourse: '=?'
+            canLoadMore: '=?',
+            showCourse: '=?',
+            loadMore: '&'
         },
-        templateUrl: 'addons/myoverview/templates/eventlist.html'
+        templateUrl: 'addons/myoverview/templates/eventlist.html',
+        link: function(scope, element, attrs) {
+
+            updateEvents(scope.events);
+
+            scope.$watch('events', function(newValue) {
+                updateEvents(newValue);
+            });
+
+            function updateEvents(events) {
+                scope.empty = !events || events.length <= 0;
+                if (!scope.empty) {
+                    scope.recentlyOverdue = filterEventsByTime(events, -14, 0);
+                    scope.today = filterEventsByTime(events, 0, 1);
+                    scope.next7Days = filterEventsByTime(events, 1, 7);
+                    scope.next30Days = filterEventsByTime(events, 7, 30);
+                    scope.future = filterEventsByTime(events, 30);
+                }
+            }
+
+            scope.loadMoreEvents = function() {
+                scope.loadingMore = true;
+                scope.loadMore().catch(function(message) {
+                    $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
+                }).finally(function() {
+                    scope.loadingMore = false;
+                });
+            };
+        }
     };
 });
diff --git a/www/addons/myoverview/img/activities.svg b/www/addons/myoverview/img/activities.svg
new file mode 100644
index 00000000000..56243a53c8e
--- /dev/null
+++ b/www/addons/myoverview/img/activities.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="157 -1509 148 125"
+   preserveAspectRatio="xMinYMid meet"
+   version="1.1"
+   id="svg23"
+   sodipodi:docname="activities.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata27">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview25"
+     showgrid="false"
+     inkscape:zoom="5.981125"
+     inkscape:cx="38.889548"
+     inkscape:cy="62.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Group_42" />
+  <defs
+     id="defs7">
+    <style
+       id="style2">
+      .cls-1 {
+        clip-path: url(#clip-Activities);
+      }
+
+      .cls-2 {
+        fill: #eee;
+      }
+
+      .cls-3 {
+        fill: #c4c8cc;
+      }
+
+      .cls-4 {
+        fill: #fff;
+      }
+    </style>
+    <clipPath
+       id="clip-Activities">
+      <rect
+         x="157"
+         y="-1509"
+         width="148"
+         height="125"
+         id="rect4" />
+    </clipPath>
+  </defs>
+  <g
+     id="Activities"
+     class="cls-1"
+     clip-path="url(#clip-Activities)">
+    <g
+       id="Group_42"
+       data-name="Group 42"
+       transform="translate(-268 -1985)">
+      <ellipse
+         id="Ellipse_37"
+         data-name="Ellipse 37"
+         class="cls-2"
+         cx="74"
+         cy="14.785"
+         rx="74"
+         ry="14.785"
+         transform="translate(425 571.43)"
+         style="fill:#000000;fill-opacity:0.06666667" />
+      <rect
+         id="Rectangle_80"
+         data-name="Rectangle 80"
+         class="cls-3"
+         width="94.182"
+         height="110.215"
+         transform="translate(451.909 476)" />
+      <g
+         id="Group_41"
+         data-name="Group 41"
+         transform="translate(467.043 493)">
+        <rect
+           id="Rectangle_81"
+           data-name="Rectangle 81"
+           class="cls-4"
+           width="44.456"
+           height="5.625"
+           transform="translate(21.16 0.549)" />
+        <rect
+           id="Rectangle_82"
+           data-name="Rectangle 82"
+           class="cls-4"
+           width="33.342"
+           height="5.625"
+           transform="translate(21.16 11.652)" />
+        <rect
+           id="Rectangle_83"
+           data-name="Rectangle 83"
+           class="cls-4"
+           width="44.456"
+           height="5.625"
+           transform="translate(21.16 30.772)" />
+        <rect
+           id="Rectangle_84"
+           data-name="Rectangle 84"
+           class="cls-4"
+           width="33.342"
+           height="5.625"
+           transform="translate(21.16 41.875)" />
+        <rect
+           id="Rectangle_85"
+           data-name="Rectangle 85"
+           class="cls-4"
+           width="44.456"
+           height="5.625"
+           transform="translate(21.16 61.291)" />
+        <rect
+           id="Rectangle_86"
+           data-name="Rectangle 86"
+           class="cls-4"
+           width="33.342"
+           height="5.625"
+           transform="translate(21.16 72.393)" />
+        <ellipse
+           id="Ellipse_38"
+           data-name="Ellipse 38"
+           class="cls-4"
+           cx="7.007"
+           cy="7"
+           rx="7.007"
+           ry="7"
+           transform="translate(0 0)" />
+        <ellipse
+           id="Ellipse_39"
+           data-name="Ellipse 39"
+           class="cls-4"
+           cx="7.007"
+           cy="7"
+           rx="7.007"
+           ry="7"
+           transform="translate(0 31)" />
+        <ellipse
+           id="Ellipse_40"
+           data-name="Ellipse 40"
+           class="cls-4"
+           cx="7.007"
+           cy="7"
+           rx="7.007"
+           ry="7"
+           transform="translate(0 61)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/www/addons/myoverview/img/courses.svg b/www/addons/myoverview/img/courses.svg
new file mode 100644
index 00000000000..7bd9cb6724d
--- /dev/null
+++ b/www/addons/myoverview/img/courses.svg
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="157 -1305 148 125"
+   preserveAspectRatio="xMinYMid meet"
+   version="1.1"
+   id="svg34"
+   sodipodi:docname="courses.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata38">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="744"
+     inkscape:window-height="480"
+     id="namedview36"
+     showgrid="false"
+     inkscape:zoom="1.888"
+     inkscape:cx="74"
+     inkscape:cy="62.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Group_44" />
+  <defs
+     id="defs7">
+    <style
+       id="style2">
+      .cls-1 {
+        clip-path: url(#clip-Courses);
+      }
+
+      .cls-2 {
+        fill: #eee;
+      }
+
+      .cls-3 {
+        fill: #c4c8cc;
+      }
+
+      .cls-4 {
+        fill: #fff;
+      }
+    </style>
+    <clipPath
+       id="clip-Courses">
+      <rect
+         x="157"
+         y="-1305"
+         width="148"
+         height="125"
+         id="rect4" />
+    </clipPath>
+  </defs>
+  <g
+     id="Courses"
+     class="cls-1"
+     clip-path="url(#clip-Courses)">
+    <g
+       id="Group_44"
+       data-name="Group 44"
+       transform="translate(-268 -1781)">
+      <ellipse
+         id="Ellipse_41"
+         data-name="Ellipse 41"
+         class="cls-2"
+         cx="74"
+         cy="14.785"
+         rx="74"
+         ry="14.785"
+         transform="translate(425 571.43)"
+         style="fill:#000000;fill-opacity:0.06666667" />
+      <rect
+         id="Rectangle_87"
+         data-name="Rectangle 87"
+         class="cls-3"
+         width="95.097"
+         height="110.215"
+         transform="translate(451.909 476)" />
+      <g
+         id="Group_43"
+         data-name="Group 43"
+         transform="translate(464.04 494)">
+        <rect
+           id="Rectangle_88"
+           data-name="Rectangle 88"
+           class="cls-4"
+           width="31.043"
+           height="34"
+           transform="translate(0)" />
+        <rect
+           id="Rectangle_89"
+           data-name="Rectangle 89"
+           class="cls-4"
+           width="31.043"
+           height="34"
+           transform="translate(0 42)" />
+        <rect
+           id="Rectangle_90"
+           data-name="Rectangle 90"
+           class="cls-4"
+           width="31.067"
+           height="34"
+           transform="translate(39.005)" />
+        <rect
+           id="Rectangle_91"
+           data-name="Rectangle 91"
+           class="cls-4"
+           width="31.067"
+           height="34"
+           transform="translate(39.005 42)" />
+        <rect
+           id="Rectangle_92"
+           data-name="Rectangle 92"
+           class="cls-3"
+           width="23.023"
+           height="3.18"
+           transform="translate(3.081 16.549)" />
+        <rect
+           id="Rectangle_93"
+           data-name="Rectangle 93"
+           class="cls-3"
+           width="23.023"
+           height="3.18"
+           transform="translate(3.081 58.549)" />
+        <rect
+           id="Rectangle_94"
+           data-name="Rectangle 94"
+           class="cls-3"
+           width="23.023"
+           height="3.18"
+           transform="translate(43.122 16.549)" />
+        <rect
+           id="Rectangle_95"
+           data-name="Rectangle 95"
+           class="cls-3"
+           width="23.023"
+           height="3.18"
+           transform="translate(43.122 58.549)" />
+        <rect
+           id="Rectangle_96"
+           data-name="Rectangle 96"
+           class="cls-3"
+           width="14.014"
+           height="3.18"
+           transform="translate(3.081 21.825)" />
+        <rect
+           id="Rectangle_97"
+           data-name="Rectangle 97"
+           class="cls-3"
+           width="18.845"
+           height="3.18"
+           transform="translate(3.081 26.825)" />
+        <rect
+           id="Rectangle_98"
+           data-name="Rectangle 98"
+           class="cls-3"
+           width="14.014"
+           height="3.18"
+           transform="translate(3.081 63.825)" />
+        <rect
+           id="Rectangle_99"
+           data-name="Rectangle 99"
+           class="cls-3"
+           width="18.845"
+           height="3.18"
+           transform="translate(3.081 68.825)" />
+        <rect
+           id="Rectangle_100"
+           data-name="Rectangle 100"
+           class="cls-3"
+           width="14.014"
+           height="3.18"
+           transform="translate(43.122 21.825)" />
+        <rect
+           id="Rectangle_101"
+           data-name="Rectangle 101"
+           class="cls-3"
+           width="18.845"
+           height="3.18"
+           transform="translate(43.122 26.825)" />
+        <rect
+           id="Rectangle_102"
+           data-name="Rectangle 102"
+           class="cls-3"
+           width="14.014"
+           height="3.18"
+           transform="translate(43.122 63.825)" />
+        <rect
+           id="Rectangle_103"
+           data-name="Rectangle 103"
+           class="cls-3"
+           width="18.845"
+           height="3.18"
+           transform="translate(43.122 68.825)" />
+        <ellipse
+           id="Ellipse_42"
+           data-name="Ellipse 42"
+           class="cls-3"
+           cx="5.658"
+           cy="5.652"
+           rx="5.658"
+           ry="5.652"
+           transform="translate(3.003 3.55)" />
+        <ellipse
+           id="Ellipse_43"
+           data-name="Ellipse 43"
+           class="cls-3"
+           cx="5.658"
+           cy="5.652"
+           rx="5.658"
+           ry="5.652"
+           transform="translate(3.003 45.55)" />
+        <ellipse
+           id="Ellipse_44"
+           data-name="Ellipse 44"
+           class="cls-3"
+           cx="5.658"
+           cy="5.652"
+           rx="5.658"
+           ry="5.652"
+           transform="translate(43.044 3.55)" />
+        <ellipse
+           id="Ellipse_45"
+           data-name="Ellipse 45"
+           class="cls-3"
+           cx="5.658"
+           cy="5.652"
+           rx="5.658"
+           ry="5.652"
+           transform="translate(43.044 45.55)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/www/addons/myoverview/scss/styles.scss b/www/addons/myoverview/scss/styles.scss
new file mode 100644
index 00000000000..18905fdb0b1
--- /dev/null
+++ b/www/addons/myoverview/scss/styles.scss
@@ -0,0 +1,52 @@
+@media only screen and (min-width: $grid-responsive-sm-break) {
+  .mm-course-grid {
+    padding: 0;
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: space-around;
+    flex-wrap: wrap;
+
+    mm-course-list-progress {
+      padding: 0 ($padding-base-horizontal / 2);
+      margin: 0;
+      max-width: 50%;
+      width: 50%;
+      display: flex;
+
+      .card {
+        width: 100%;
+        align-items: stretch;
+      }
+    }
+
+    &:after {
+      content: '';
+      width: 100%;
+    }
+  }
+}
+
+.mm-timelinesort {
+  float: right;
+}
+
+.mm-timelinetitle {
+  float: left;
+}
+
+.mm-site_myoverview {
+  mm-course-list-progress .card {
+    margin-top: 0;
+
+    h5 {
+      margin-left: 10px;
+    }
+    .list.block  .item {
+      border-top: $item-border-width solid $item-light-border;
+      border-bottom: $item-border-width solid $item-light-border;
+    }
+    .list.block:last-child .item{
+      border-bottom: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/services/myoverview.js b/www/addons/myoverview/services/myoverview.js
index 2bdeddc8a30..a6f51920977 100644
--- a/www/addons/myoverview/services/myoverview.js
+++ b/www/addons/myoverview/services/myoverview.js
@@ -21,10 +21,13 @@ angular.module('mm.addons.myoverview')
  * @ngdoc service
  * @name $mmaMyOverview
  */
-.factory('$mmaMyOverview', function($log, $mmSitesManager, $mmSite, $mmUtil) {
+.factory('$mmaMyOverview', function($log, $mmSitesManager, $mmSite) {
     $log = $log.getInstance('$mmaMyOverview');
 
-    var self = {};
+    var self = {
+        eventsLimit: 20,
+        eventsLimitPerCourse: 10
+    };
 
     /**
      * Get cache key for get calendar action events for a given list of courses value WS call.
@@ -32,7 +35,7 @@ angular.module('mm.addons.myoverview')
      * @return {String}       Cache key.
      */
     function getActionEventsByCoursesCacheKey() {
-        return 'myoverview:bycourses';
+        return 'myoverview:bycourse';
     }
 
     /**
@@ -42,7 +45,7 @@ angular.module('mm.addons.myoverview')
      * @return {String}             Cache key.
      */
     function getActionEventsByCourseCacheKey(courseId) {
-        return 'myoverview:bycourse:' + courseId;
+        return getActionEventsByCoursesCacheKey() + ':' + courseId;
     }
 
     /**
@@ -118,15 +121,52 @@ angular.module('mm.addons.myoverview')
      */
     self.getActionEventsByCourses = function(courseIds, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-
-            var data = {
-                    courseids: courseIds
+            var time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
+                data = {
+                    //timesortfrom: time,
+                    courseids: courseIds,
+                    limitnum: self.eventsLimitPerCourse
                 },
                 presets = {
                     cacheKey: getActionEventsByCoursesCacheKey()
                 };
 
-            return site.read('core_calendar_get_action_events_by_courses', data, presets);
+            return site.read('core_calendar_get_action_events_by_courses', data, presets).then(function(events) {
+                if (events && events.groupedbycourse) {
+                    var courseEvents = {};
+
+                    angular.forEach(events.groupedbycourse, function(course) {
+                        var canLoadMore = course.events.length >= self.eventsLimitPerCourse ? course.lastid : false;
+
+                        // Filter events by time in case it uses cache.
+                        course.events = course.events.filter(function(element) {
+                            return element.timesort >= time;
+                        });
+
+                        courseEvents[course.courseid] = {
+                            events: course.events,
+                            canLoadMore: canLoadMore
+                        };
+                    });
+                    return courseEvents;
+                }
+                return $q.reject();
+            });
+        });
+    };
+
+    /**
+     * Invalidates get calendar action events for a given list of courses WS call.
+     *
+     * @module mm.core.myoverview
+     * @ngdoc method
+     * @name $mmCourses#invalidateActionEventsByCourses
+     * @param {String} [siteId] Site ID to invalidate. If not defined, use current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateActionEventsByCourses = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getActionEventsByCoursesCacheKey());
         });
     };
 
@@ -137,20 +177,42 @@ angular.module('mm.addons.myoverview')
      * @ngdoc method
      * @name $mmaMyOverview#getActionEventsByCourse
      * @param {Number}  courseId    Only events in this course.
+     * @param {Number}  [afterEventId]  The last seen event id.
      * @param {String}  [siteId]    Site. If not defined, use current site.
      * @return {Promise}            Promise to be resolved when the info is retrieved.
      */
-    self.getActionEventsByCourse = function(courseId, siteId) {
+    self.getActionEventsByCourse = function(courseId, afterEventId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-
-            var data = {
-                    courseid: courseId
+            var time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
+                data = {
+                    timesortfrom: time,
+                    courseid: courseId,
+                    limitnum: self.eventsLimitPerCourse
                 },
                 presets = {
                     cacheKey: getActionEventsByCourseCacheKey(courseId)
                 };
 
-            return site.read('core_calendar_get_action_events_by_course', data, presets);
+            if (afterEventId) {
+                data.aftereventid = afterEventId;
+            }
+
+            return site.read('core_calendar_get_action_events_by_course', data, presets).then(function(events) {
+                if (events && events.events) {
+                    var canLoadMore = events.events.length >= self.eventsLimitPerCourse ? events.lastid : false;
+
+                    // Filter events by time in case it uses cache.
+                    events = events.events.filter(function(element) {
+                        return element.timesort >= time;
+                    });
+
+                    return {
+                        events: events,
+                        canLoadMore: canLoadMore
+                    };
+                }
+                return $q.reject();
+            });
         });
     };
 
@@ -168,7 +230,8 @@ angular.module('mm.addons.myoverview')
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
                 data = {
-                    timesortfrom: time
+                    timesortfrom: time,
+                    limitnum: self.eventsLimit
                 },
                 presets = {
                     cacheKey: getActionEventsByTimesortCacheKey()
@@ -179,10 +242,20 @@ angular.module('mm.addons.myoverview')
             }
 
             return site.read('core_calendar_get_action_events_by_timesort', data, presets).then(function(events) {
-                // Filter events by time in case it uses cache.
-                return events.events.filter(function(element) {
-                    return element.timesort >= time;
-                });
+                if (events && events.events) {
+                    var canLoadMore = events.events.length >= self.eventsLimit ? events.lastid : false;
+
+                    // Filter events by time in case it uses cache.
+                    events = events.events.filter(function(element) {
+                        return element.timesort >= time;
+                    });
+
+                    return {
+                        events: events,
+                        canLoadMore: canLoadMore
+                    };
+                }
+                return $q.reject();
             });
         });
     };
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index 385aa030ce9..47320dd1674 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -1,9 +1,62 @@
-<ul class="list">
-    <li ng-repeat="event in events">
+<h5 ng-if="recentlyOverdue.length > 0" class="assertive mm-timelinetitle">{{ 'mma.myoverview.recentlyoverdue' | translate }}</h5>
+<ul class="list block" ng-if="recentlyOverdue.length > 0">
+    <li ng-repeat="event in recentlyOverdue">
         <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
             <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
             <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
             <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
         </a>
     </li>
-</ul>
\ No newline at end of file
+</ul>
+
+<h5 ng-if="today.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.today' | translate }}</h5>
+<ul class="list block" ng-if="today.length > 0">
+    <li ng-repeat="event in today">
+        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
+            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
+        </a>
+    </li>
+</ul>
+
+<h5 ng-if="next7Days.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.next7days' | translate }}</h5>
+<ul class="list block" ng-if="next7Days.length > 0">
+    <li ng-repeat="event in next7Days">
+        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
+            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
+        </a>
+    </li>
+</ul>
+
+<h5 ng-if="next30Days.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.next30days' | translate }}</h5>
+<ul class="list block" ng-if="next30Days.length > 0">
+    <li ng-repeat="event in next30Days">
+        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
+            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
+        </a>
+    </li>
+</ul>
+
+<h5 ng-if="future.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.future' | translate }}</h5>
+<div class="list block" ng-if="future.length > 0">
+    <a ng-repeat="event in future" mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+        <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+        <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
+        <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
+    </a>
+</div>
+
+<div class="padding text-center" ng-if="canLoadMore && !empty">
+    <!-- Button and spinner to show more attempts. -->
+    <button ng-if="!loadingMore" class="button button-block" ng-click="loadMoreEvents()">{{ 'mm.core.loadmore' | translate }}</button>
+    <ion-spinner ng-if="loadingMore"></ion-spinner>
+</div>
+<div ng-if="empty" class="mm-empty-box block">
+    <img ng-if="showCourse" src="addons/myoverview/img/activities.svg">
+    <p>{{ 'mma.myoverview.noevents' | translate }}</p>
+</div>
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index 6846c4189a9..d02997f2974 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -1,4 +1,7 @@
 <ion-view view-title="{{ 'mma.myoverview.pluginname' | translate }}">
+    <ion-nav-buttons side="secondary">
+        <a ui-sref="site.mm_searchcourses" ng-if="searchEnabled" class="button button-icon ion-ios-search-strong"></a>
+    </ion-nav-buttons>
     <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="timeline.loaded" on-refresh="refreshMyOverview()">
         </ion-refresher>
@@ -7,27 +10,65 @@
           <a class="tab-item" ng-class="{'active': tabShown == 'courses'}" ng-click="switchTab('courses')">{{ 'mm.courses.courses' | translate }}</a>
         </div>
         <div class="padding">
-            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline'">
-                <h5 ng-if="timeline.recentlyOverdue.length > 0" class="assertive">{{ 'mma.myoverview.recentlyoverdue' | translate }}</h5>
-                <mma-my-overview-event-list ng-if="timeline.recentlyOverdue.length > 0" events="timeline.recentlyOverdue" show-course="true"></mma-my-overview-event-list>
-                <h5 ng-if="timeline.today.length > 0">{{ 'mma.myoverview.today' | translate }}</h5>
-                <mma-my-overview-event-list ng-if="timeline.today.length > 0" events="timeline.today" show-course="true"></mma-my-overview-event-list>
-                <h5 ng-if="timeline.next7Days.length > 0">{{ 'mma.myoverview.next7days' | translate }}</h5>
-                <mma-my-overview-event-list ng-if="timeline.next7Days.length > 0" events="timeline.next7Days" show-course="true"></mma-my-overview-event-list>
-                <h5 ng-if="timeline.next30Days.length > 0">{{ 'mma.myoverview.next30days' | translate }}</h5>
-                <mma-my-overview-event-list ng-if="timeline.next30Days.length > 0" events="timeline.next30Days" show-course="true"></mma-my-overview-event-list>
-                <h5 ng-if="timeline.future.length > 0">{{ 'mma.myoverview.future' | translate }}</h5>
-                <mma-my-overview-event-list ng-if="timeline.future.length > 0" events="timeline.future" show-course="true"></mma-my-overview-event-list>
-                <div class="padding text-center" ng-if="timeline.canLoadMore">
-                    <!-- Button and spinner to show more attempts. -->
-                    <button ng-if="!timeline.loadingMore" class="button button-block" ng-click="loadMore()">{{ 'mm.core.loadmore' | translate }}</button>
-                    <ion-spinner ng-if="timeline.loadingMore"></ion-spinner>
+            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbydates'">
+                <div class="item-select mm-full-width-centered mm-timelinesort">
+                    <select ng-model="timeline.sort" ng-change="switchSort()">
+                        <option value="sortbydates">{{ 'mma.myoverview.sortbydates' | translate }}</option>
+                        <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
+                    </select>
                 </div>
-                <div ng-if="timeline.empty">
-                    <p>{{ 'mma.myoverview.noevents' | translate }}</p>
+                <mma-my-overview-event-list events="timeline.events" show-course="true" can-load-more="timeline.canLoadMore" load-more="loadMoreTimeline()"></mma-my-overview-event-list>
+            </mm-loading>
+            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'">
+                <div class="item-select mm-full-width-centered mm-timelinesort">
+                    <select ng-model="timeline.sort" ng-change="switchSort()">
+                        <option value="sortbydates">{{ 'mma.myoverview.sortbydates' | translate }}</option>
+                        <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
+                    </select>
+                </div>
+                <div class="block mm-course-grid">
+                    <mm-course-list-progress ng-repeat="course in timelineCourses.courses" course="course" round-progress="true" show-summary="true">
+                        <mma-my-overview-event-list events="course.events" can-load-more="course.canLoadMore" load-more="loadMoreCourse(course)"></mma-my-overview-event-list>
+                    </mm-course-list-progress>
+                </div>
+                <div ng-if="timelineCourses.courses.length == 0" class="mm-empty-box block">
+                    <img src="addons/myoverview/img/courses.svg">
+                    <p>{{ 'mma.myoverview.nocourses' | translate }}</p>
                 </div>
             </mm-loading>
-            <mm-loading hide-until="coursesLoaded" ng-show="tabShown == 'courses'">
+            <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'">
+                <div class="row row-no-padding">
+                    <div class="col-10 text-left">
+                        <a ng-if="courses[courses.selected] && courses[courses.selected].length > 5" ng-class="{'ion-funnel': !showFilter, 'ion-close-round': showFilter}" class="button button-dark button-icon icon" ng-click="switchFilter()"></a>
+                    </div>
+                    <div class="col text-center" ng-show="!showFilter">
+                        <div class="item-select mm-full-width-centered">
+                            <select ng-model="courses.selected">
+                                <option value="inprogress">{{ 'mma.myoverview.inprogress' | translate }}</option>
+                                <option value="future">{{ 'mma.myoverview.future' | translate }}</option>
+                                <option value="past">{{ 'mma.myoverview.past' | translate }}</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-10 text-right" ng-show="!showFilter">
+                        <a ng-class="{'ion-grid': !showGrid, 'ion-navicon': showGrid}" class="button button-dark button-icon icon" ng-click="switchGrid()"></a>
+                    </div>
+                    <div class="col" ng-show="showFilter">
+                        <ion-input class="item item-input">
+                            <i class="icon ion-funnel placeholder-icon"></i>
+                            <input type="text" placeholder="{{ 'mm.courses.filtermycourses' | translate}}" ng-model="courses.filter">
+                        </ion-input>
+                    </div>
+                </div>
+                <div ng-class="{'mm-course-grid': showGrid}">
+                    <mm-course-list-progress ng-repeat="course in courses[courses.selected] | filter:{fullname: courses.filter}" course="course" round-progress="showGrid" show-summary="showGrid"></mm-course-list-progress>
+                </div>
+                <div ng-if="courses[courses.selected].length == 0" class="mm-empty-box">
+                    <img src="addons/myoverview/img/courses.svg">
+                    <p ng-if="courses.selected == 'inprogress'">{{ 'mma.myoverview.nocoursesinprogress' | translate }}</p>
+                    <p ng-if="courses.selected == 'future'">{{ 'mma.myoverview.nocoursesfuture' | translate }}</p>
+                    <p ng-if="courses.selected == 'past'">{{ 'mma.myoverview.nocoursespast' | translate }}</p>
+                </div>
             </mm-loading>
         </div>
     </ion-content>
diff --git a/www/core/components/courses/controllers/list.js b/www/core/components/courses/controllers/list.js
index 0161f3beeb7..216db823ea3 100644
--- a/www/core/components/courses/controllers/list.js
+++ b/www/core/components/courses/controllers/list.js
@@ -28,32 +28,27 @@ angular.module('mm.core.courses')
         myCoursesObserver;
 
     $scope.searchEnabled = $mmCourses.isSearchCoursesAvailable() && !$mmCourses.isSearchCoursesDisabledInSite();
-    $scope.areNavHandlersLoadedFor = $mmCoursesDelegate.areNavHandlersLoadedFor;
     $scope.filter = {};
 
     // Convenience function to fetch courses.
     function fetchCourses(refresh) {
         return $mmCourses.getUserCourses().then(function(courses) {
-            $scope.courses = courses;
             $scope.filter.filterText = ''; // Filter value MUST be set after courses are shown.
 
-            return loadCoursesNavHandlers(refresh);
-        }, function(error) {
-            $mmUtil.showErrorModalDefault(error, 'mm.courses.errorloadcourses', true);
-        });
-    }
-
-    // Convenience function to load the handlers of each course.
-    function loadCoursesNavHandlers(refresh) {
-        var courseIds = $scope.courses.map(function(course) {
-            return course.id;
-        });
+            var courseIds = courses.map(function(course) {
+                return course.id;
+            });
 
-        return $mmCourses.getCoursesOptions(courseIds).then(function(options) {
-            angular.forEach($scope.courses, function(course) {
-                course._handlers = $mmCoursesDelegate.getNavHandlersFor(
-                            course.id, refresh, options.navOptions[course.id], options.admOptions[course.id]);
+            return $mmCourses.getCoursesOptions(courseIds).then(function(options) {
+                angular.forEach(courses, function(course) {
+                    course.progress = isNaN(parseInt(course.progress, 10)) ? false : parseInt(course.progress, 10);
+                    course.navOptions = options.navOptions[course.id];
+                    course.admOptions = options.admOptions[course.id];
+                });
+                $scope.courses = courses;
             });
+        }, function(error) {
+            $mmUtil.showErrorModalDefault(error, 'mm.courses.errorloadcourses', true);
         });
     }
 
diff --git a/www/core/components/courses/directives/courselistprogress.js b/www/core/components/courses/directives/courselistprogress.js
new file mode 100644
index 00000000000..e626621a835
--- /dev/null
+++ b/www/core/components/courses/directives/courselistprogress.js
@@ -0,0 +1,110 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.core.courses')
+
+/**
+ * Course List Item with progress directive.
+ *
+ * Display a course list item.
+ *
+ * @module mm.core.courses
+ * @ngdoc directive
+ * @name mmCourseListItem
+ * @description
+ *
+ * This directive is meant to display an item for a list of courses with progress.
+ *
+ * @example
+ *
+ * <mm-course-list-progress course="course" round-progress="true" show-summary="true"></mm-course-list-progress>
+ */
+.directive('mmCourseListProgress', function($ionicActionSheet, $mmCourses, $mmCoursesDelegate, $translate, $controller, $q) {
+    return {
+        restrict: 'E',
+        templateUrl: 'core/components/courses/templates/courselistprogress.html',
+        transclude: true,
+        scope: {
+            course: '=',
+            roundProgress: '=?',
+            showSummary: "=?"
+        },
+        link: function(scope) {
+            var buttonPromise,
+                courseId = scope.course.id;
+
+            // Load course options if missing.
+            if (typeof scope.course.navOptions == "undefined" || typeof scope.course.admOptions == "undefined") {
+                buttonPromise = $mmCourses.getCoursesOptions([courseId]).then(function(options) {
+                    scope.course.navOptions = options.navOptions[courseId];
+                    scope.course.admOptions = options.admOptions[courseId];
+                });
+            } else {
+                buttonPromise = $q.when();
+            }
+
+            // @todo: refresh?
+            buttonPromise = buttonPromise.then(function() {
+                return $mmCoursesDelegate.getNavHandlersFor(
+                        courseId, false, scope.course.navOptions, scope.course.admOptions, true);
+            }).then(function(buttons) {
+                scope.showActions = !!buttons.length;
+                return buttons.map(function(button) {
+                    var newScope = scope.$new();
+                    $controller(button.controller, {$scope: newScope});
+
+                    var title = newScope.title || "",
+                        icon = newScope.icon || false,
+                        buttonInfo = {
+                            text: (icon ? '<i class="icon ' + icon + '"></i>' : '') + $translate.instant(title),
+                            action: newScope.action || false,
+                            className: newScope.class || false,
+                            priority: button.priority || false
+                        };
+
+                    newScope.$destroy();
+                    return buttonInfo;
+                }).sort(function(a, b) {
+                    return b.priority - a.priority;
+                });
+            });
+
+            scope.showCourseActions = function($event) {
+                $event.preventDefault();
+                $event.stopPropagation();
+                buttonPromise.then(function(buttons) {
+                    $ionicActionSheet.show({
+                        titleText: scope.course.fullname,
+                        buttons: buttons,
+                        cancelText: $translate.instant('mm.core.cancel'),
+                        buttonClicked: function(index) {
+                            if (angular.isFunction(buttons[index].action)) {
+                                // Execute the action and close the action sheet.
+                                return buttons[index].action($event, scope.course);
+                            }
+                            // Never close the action sheet. It will automatically be closed if success.
+                            return false;
+                        },
+                        cancel: function() {
+                            // User cancelled the action sheet.
+                            return true;
+                        }
+                    });
+                });
+            };
+
+
+        }
+    };
+});
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
new file mode 100644
index 00000000000..c76e3667d29
--- /dev/null
+++ b/www/core/components/courses/scss/styles.scss
@@ -0,0 +1,110 @@
+$chart-size: 70px;
+$doughnut-border-size: 15px;
+$doughnut-dasharray: 173;
+$doughnut-empty-colour: #dcdcdc;
+$doughnut-fill-colour: #f89406;
+$doughnut-border-colour: #c4c8cc;
+$doughnut-text-colour: #73777d;
+
+.item-course {
+  >.icon {
+    height: 32px + ($item-padding /2);
+    width: 32px + ($item-padding /2);
+    right: 0;
+    top: 6px;
+    color: $doughnut-text-colour;
+  }
+}
+
+.item-progress {
+  @extend .item-avatar;
+  padding-left: $chart-size + ($item-padding * 2);
+  min-height: $chart-size + ($item-padding * 2);
+  >.progress-chart-container {
+    max-width: $chart-size;
+    max-height: $chart-size;
+    position: absolute;
+    top: $item-padding;
+    left: $item-padding;
+  }
+  h2 {
+    font-size: 24px;
+  }
+}
+
+.progress-chart-container {
+  height: $chart-size;
+  width: $chart-size;
+
+  .progress-doughnut {
+    position: relative;
+    height: $chart-size;
+    width: $chart-size;
+    background-clip: padding-box;
+    border: $doughnut-border-size solid $doughnut-empty-colour;
+    border-radius: 50%;
+    box-sizing: border-box;
+
+    .progress-text {
+      position: absolute;
+      top: 50%;
+      /*rtl:ignore*/
+      left: 50%;
+      transform: translate(-50%, -50%);
+      color: $doughnut-text-colour;
+    }
+
+    .progress-indicator {
+      position: absolute;
+      top: ($doughnut-border-size * -1);
+      left: ($doughnut-border-size * -1);
+      height: $chart-size;
+      width: $chart-size;
+
+      svg {
+        position: relative;
+        height: 100%;
+        width: 100%;
+
+        .circle {
+          stroke-width: $doughnut-border-size;
+          stroke: $doughnut-fill-colour;
+          fill: none;
+          stroke-dasharray: $doughnut-dasharray;
+          stroke-dashoffset: $doughnut-dasharray;
+          transform: rotate(-90deg);
+          transform-origin: center center;
+
+          @for $i from 1 through 100 {
+              &.percent-#{$i} {
+                  stroke-dashoffset: $doughnut-dasharray - ($i / 100 * $doughnut-dasharray);
+              }
+          }
+        }
+      }
+    }
+  }
+
+  .no-progress {
+    height: $chart-size;
+    width: $chart-size;
+    background-color: $doughnut-empty-colour;
+    border-radius: 50%;
+    position: relative;
+    border: 0.5px solid $doughnut-border-colour;
+
+    .icon {
+      position: absolute;
+      top: 50%;
+      text-align: center;
+      /*rtl:ignore*/
+      left: 50%;
+      margin: 0;
+      transform: translate(-42%, -50%);
+      color: #fff;
+      height: ($chart-size / 2) + 10px;
+      width: ($chart-size / 2) + 10px;
+      font-size: ($chart-size / 2) + 10px;
+    }
+  }
+}
diff --git a/www/core/components/courses/services/delegate.js b/www/core/components/courses/services/delegate.js
index fe2d5dddfd3..1f58b4027c9 100644
--- a/www/core/components/courses/services/delegate.js
+++ b/www/core/components/courses/services/delegate.js
@@ -103,23 +103,31 @@ angular.module('mm.core.courses')
         /**
          * Get the handler for a course using a certain access type.
          *
-         * @param  {Number} courseId     The course ID.
-         * @param  {Boolean} refresh     True if it should refresh the list.
-         * @param  {Object} accessData   Access type and data. Default, guest, ...
-         * @param  {Object} [navOptions] Course navigation options for current user. See $mmCourses#getUserNavigationOptions.
-         * @param  {Object} [admOptions] Course admin options for current user. See $mmCourses#getUserAdministrationOptions.
-         * @return {Array}               Array of objects containing 'priority' and 'controller'.
+         * @param  {Number}  courseId         The course ID.
+         * @param  {Boolean} refresh          True if it should refresh the list.
+         * @param  {Object}  accessData       Access type and data. Default, guest, ...
+         * @param  {Object}  [navOptions]     Course navigation options for current user. See $mmCourses#getUserNavigationOptions.
+         * @param  {Object}  [admOptions]     Course admin options for current user. See $mmCourses#getUserAdministrationOptions.
+         * @param  {Boolean} [waitForPromise] Wait for handlers to be loaded.
+         * @return {Array|Promise}            Array of objects containing 'priority' and 'controller'. Or promise if asked for it.
          */
-        function getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions) {
+        function getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions, waitForPromise) {
             if (refresh || !coursesHandlers[courseId] || coursesHandlers[courseId].access.type != accessData.type) {
                 coursesHandlers[courseId] = {
                     access: accessData,
                     navOptions: navOptions,
                     admOptions: admOptions,
-                    handlers: []
+                    handlers: [],
+                    deferred: $q.defer()
                 };
                 self.updateNavHandlersForCourse(courseId, accessData, navOptions, admOptions);
             }
+
+            if (waitForPromise) {
+                return coursesHandlers[courseId].deferred.promise.then(function() {
+                    return coursesHandlers[courseId].handlers;
+                });
+            }
             return coursesHandlers[courseId].handlers;
         }
 
@@ -129,18 +137,19 @@ angular.module('mm.core.courses')
          * @module mm.core.courses
          * @ngdoc method
          * @name $mmCoursesDelegate#getNavHandlersFor
-         * @param  {Number} courseId     The course ID.
-         * @param  {Boolean} refresh     True if it should refresh the list.
-         * @param  {Object} [navOptions] Course navigation options for current user. See $mmCourses#getUserNavigationOptions.
-         * @param  {Object} [admOptions] Course admin options for current user. See $mmCourses#getUserAdministrationOptions.
-         * @return {Array}               Array of objects containing 'priority' and 'controller'.
+         * @param  {Number}  courseId         The course ID.
+         * @param  {Boolean} refresh          True if it should refresh the list.
+         * @param  {Object}  [navOptions]     Course navigation options for current user. See $mmCourses#getUserNavigationOptions.
+         * @param  {Object}  [admOptions]     Course admin options for current user. See $mmCourses#getUserAdministrationOptions.
+         * @param  {Boolean} [waitForPromise] Wait for handlers to be loaded.
+         * @return {Array|Promise}            Array of objects containing 'priority' and 'controller'. Or promise if asked for it.
          */
-        self.getNavHandlersFor = function(courseId, refresh, navOptions, admOptions) {
+        self.getNavHandlersFor = function(courseId, refresh, navOptions, admOptions, waitForPromise) {
             // Default access.
             var accessData = {
                 type: mmCoursesAccessMethods.default
             };
-            return getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions);
+            return getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions, waitForPromise);
         };
 
         /**
@@ -149,18 +158,19 @@ angular.module('mm.core.courses')
          * @module mm.core.courses
          * @ngdoc method
          * @name $mmCoursesDelegate#getNavHandlersForGuest
-         * @param  {Number} courseId     The course ID.
-         * @param  {Boolean} refresh     True if it should refresh the list.
-         * @param  {Object} [navOptions] Course navigation options for current user. See $mmCourses#getUserNavigationOptions.
-         * @param  {Object} [admOptions] Course admin options for current user. See $mmCourses#getUserAdministrationOptions.
-         * @return {Array}               Array of objects containing 'priority' and 'controller'.
+         * @param  {Number}  courseId         The course ID.
+         * @param  {Boolean} refresh          True if it should refresh the list.
+         * @param  {Object}  [navOptions]     Course navigation options for current user. See $mmCourses#getUserNavigationOptions.
+         * @param  {Object}  [admOptions]     Course admin options for current user. See $mmCourses#getUserAdministrationOptions.
+         * @param  {Boolean} [waitForPromise] Wait for handlers to be loaded.
+         * @return {Array|Promise}            Array of objects containing 'priority' and 'controller'. Or promise if asked for it.
          */
-        self.getNavHandlersForGuest = function(courseId, refresh, navOptions, admOptions) {
+        self.getNavHandlersForGuest = function(courseId, refresh, navOptions, admOptions, waitForPromise) {
             // Guest access.
             var accessData = {
                 type: mmCoursesAccessMethods.guest
             };
-            return getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions);
+            return getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions, waitForPromise);
         };
 
         /**
@@ -339,6 +349,9 @@ angular.module('mm.core.courses')
                         });
                     });
                     loaded[courseId] = true;
+
+                    // Resolve the promise.
+                    coursesHandlers[courseId].deferred.resolve();
                 }
             });
         };
diff --git a/www/core/components/courses/templates/courselistprogress.html b/www/core/components/courses/templates/courselistprogress.html
new file mode 100644
index 00000000000..0e5723d9758
--- /dev/null
+++ b/www/core/components/courses/templates/courselistprogress.html
@@ -0,0 +1,34 @@
+<div class="card">
+    <a class="item item-text-wrap item-icon-right item-borderless item-course" ng-class="{'item-progress': roundProgress}" ui-sref="site.mm_course({courseid: course.id, coursefullname: course.fullname})" title="{{course.fullname}}">
+        <div class="progress-chart-container" ng-if="roundProgress">
+            <div ng-if="course.progress !== false" class="progress-doughnut">
+                <div class="progress-text has-percent">{{course.progress}}&#37;</div>
+                <div class="progress-indicator">
+                    <svg xmlns="http://www.w3.org/2000/svg">
+                        <g>
+                            <title>{{course.progress}}&#37;</title>
+                            <circle class="circle percent-{{course.progress}}" r="27.5" cx="35" cy="35"/>
+                        </g>
+                    </svg>
+                </div>
+            </div>
+            <div ng-if="course.progress === false" class="no-progress">
+                <i class="icon ion-ionic"></i>
+            </div>
+        </div>
+        <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
+        <div ng-if="!roundProgress && course.progress !== false" class="row row-no-padding">
+            <progress class="col-90" max="100" value="{{ course.progress }}"></progress>
+            <div class="col col-center text-right mm-progress-text">{{course.progress}}&#37;</div>
+        </div>
+        <i ng-if="showActions" class="icon ion-android-more-vertical" ng-click="showCourseActions($event)"></i>
+    </a>
+    <div class="item item-text-wrap item-borderless" ng-show="course.summary" ng-if="showSummary">
+        <p>
+            <summary>
+                <mm-format-text watch="true" max-height="60">{{course.summary}}</mm-format-text>
+            </summary>
+        </p>
+    </div>
+    <div ng-transclude></div>
+</div>
diff --git a/www/core/components/courses/templates/list.html b/www/core/components/courses/templates/list.html
index f528c378ded..a13e14eff1a 100644
--- a/www/core/components/courses/templates/list.html
+++ b/www/core/components/courses/templates/list.html
@@ -13,29 +13,7 @@
                     <input type="text" placeholder="{{ 'mm.courses.filtermycourses' | translate}}" ng-model="filter.filterText">
                 </ion-input>
             </div>
-            <section ng-repeat="course in courses | filter:{fullname: filter.filterText}" class="list card">
-                <a class="item item-icon-right" ui-sref="site.mm_course({courseid: course.id, coursefullname: course.fullname})" title="{{course.fullname}}">
-                    <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
-                    <i class="icon icon-accessory ion-chevron-right"></i>
-                </a>
-                <div class="item item-text-wrap" ng-show="course.summary">
-                    <p>
-                        <summary>
-                            <mm-format-text watch="true" max-height="60">{{course.summary}}</mm-format-text>
-                        </summary>
-                    </p>
-                </div>
-                <div class="item mm-tab-handlers" ng-show="(course._handlers && course._handlers.length) || !areNavHandlersLoadedFor(course.id)">
-                    <div class="item tabs tabs-icon-top" ng-show="course._handlers && course._handlers.length">
-                        <a ng-repeat="handler in course._handlers | orderBy:'-priority'" ng-controller="handler.controller" ng-click="action($event, course)" class="tab-item active mm-courses-handler {{class}}" title="{{title | translate}}">
-                            <i class="icon {{icon}}"></i> {{title | translate}}
-                        </a>
-                    </div>
-                    <div class="mm-loading-handlers text-center" ng-if="!course._handlers || !course._handlers.length">
-                        <ion-spinner></ion-spinner>
-                    </div>
-                </div>
-            </section>
+            <mm-course-list-progress ng-repeat="course in courses | filter:{fullname: filter.filterText}" course="course" show-summary="true"></mm-course-list-progress>
             <div ng-if="!courses || !courses.length">
                 <p>{{ 'mm.courses.nocourses' | translate }}</p>
                 <p ng-if="searchEnabled">{{ 'mm.courses.searchcoursesadvice' | translate }}</p>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index e8679ce851c..887b0689fc7 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -883,6 +883,22 @@ mm-timer {
   }
 }
 
+.item-select.mm-full-width-centered {
+  display: inline;
+
+  select {
+    max-width: 100%;
+    background: transparent;
+    direction: ltr;
+    text-indent: 0;
+    margin: 0 auto;
+    padding: $item-input-padding ($item-input-padding*3) $item-input-padding $item-input-padding;
+    line-height: 14px;
+    border: 0;
+    position: relative;
+  }
+}
+
 .item-select .mm-select-fix {
   // Taken from .item-select select.
   position: absolute;
@@ -1652,3 +1668,45 @@ mm-format-text[max-height], *[mm-format-text][max-height] {
 .action-sheet-open.loading-active .action-sheet-backdrop {
   pointer-events: none;
 }
+
+
+.mm-empty-box {
+  padding-top: $item-padding;
+  text-align: center;
+  color: $dark;
+
+  .icon {
+    font-size: 120px;
+  }
+  img {
+    height: 125px;
+    width: 145px;
+  }
+  p {
+    font-size: 120%;
+  }
+  .icon + p, img + p {
+    padding-top: $item-padding;
+  }
+}
+
+progress {
+  -webkit-appearance: none;
+  appearance: none;
+
+  &[value]::-webkit-progress-bar {
+    background-color: #eee;
+    border-radius: 2px;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25) inset;
+  }
+
+  &[value]::-webkit-progress-value {
+    background-color: $orange-medium;
+    border-radius: 2px;
+    background-size: 35px 20px, 100% 100%, 100% 100%;
+  }
+}
+
+.mm-progress-text {
+  margin-left: 10px;
+}
\ No newline at end of file

From f73300e2bebf14ac0e6b21d7ed250593db58afab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 26 Apr 2017 16:49:32 +0200
Subject: [PATCH 094/218] MOBILE-2078 competency: Style progressbar

---
 www/addons/competency/templates/plan.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/addons/competency/templates/plan.html b/www/addons/competency/templates/plan.html
index 2691d40755b..28260facc65 100644
--- a/www/addons/competency/templates/plan.html
+++ b/www/addons/competency/templates/plan.html
@@ -30,8 +30,11 @@
                     </li>
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.progress' | translate }}</strong>:
-                        {{ 'mma.competency.xcompetenciesproficientoutofy' | translate: {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }} ({{ plan.proficientcompetencypercentageformatted }}%)
-                        <progress max="100" value="{{ plan.proficientcompetencypercentage }}"></progress>
+                        {{ 'mma.competency.xcompetenciesproficientoutofy' | translate: {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }}
+                        <div class="row row-no-padding">
+                            <progress class="col-80" max="100" value="{{ plan.proficientcompetencypercentage }}"></progress>
+                            <div class="col col-center text-right mm-progress-text">{{plan.proficientcompetencypercentageformatted}}&#37;</div>
+                        </div>
                     </li>
                 </ul>
             </article>

From a9e0ea2fa5de405cbba0e9b014cdb0a95758f4a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Apr 2017 10:34:52 +0200
Subject: [PATCH 095/218] MOBILE-2078 course: Add course actions to sections
 context menu

---
 .../components/course/controllers/sections.js | 34 ++++++++++++++++---
 www/core/components/course/main.js            |  2 +-
 .../components/course/templates/sections.html |  1 +
 .../courses/directives/courselistprogress.js  | 19 +----------
 .../components/courses/services/delegate.js   | 31 ++++++++++++++++-
 .../courses/templates/courselistprogress.html |  2 +-
 .../courses/templates/viewresult.html         |  4 +--
 7 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index 540e4312c7c..13cd9b6194f 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -23,30 +23,32 @@ angular.module('mm.core.course')
  */
 .controller('mmCourseSectionsCtrl', function($mmCourse, $mmUtil, $scope, $stateParams, $translate, $mmCourseHelper, $mmEvents,
             $mmSite, $mmCoursePrefetchDelegate, $mmCourses, $q, $ionicHistory, $ionicPlatform, mmCoreCourseAllSectionsId,
-            mmCoreEventSectionStatusChanged, $state, $timeout) {
+            mmCoreEventSectionStatusChanged, $state, $timeout, $mmCoursesDelegate, $controller) {
     var courseId = $stateParams.courseid,
         sectionId = $stateParams.sid,
         moduleId = $stateParams.moduleid,
-        courseFullName = $stateParams.coursefullname;
+        course = $stateParams.course || false;
 
     $scope.courseId = courseId;
     $scope.sectionToLoad = 2; // Load "General" section by default.
-    $scope.fullname = courseFullName;
+    $scope.fullname = course.fullname || "";
     $scope.downloadSectionsEnabled = $mmCourseHelper.isDownloadSectionsEnabled();
     $scope.downloadSectionsIcon = getDownloadSectionIcon();
     $scope.sectionHasContent = $mmCourseHelper.sectionHasContent;
+    $scope.courseActions = [];
 
     function loadSections(refresh) {
         var promise;
 
-        if (courseFullName) {
+        if (course) {
             promise = $q.when();
         } else {
             // We don't have the course name, get it.
             promise = $mmCourses.getUserCourse(courseId).catch(function() {
                 // Fail, maybe user isn't enrolled but he has capabilities to view it.
                 return $mmCourses.getCourse(courseId);
-            }).then(function(course) {
+            }).then(function(courseResponse) {
+                course = courseResponse;
                 return course.fullname;
             }).catch(function() {
                 // Fail again, return generic value.
@@ -59,6 +61,28 @@ angular.module('mm.core.course')
                 $scope.fullname = courseFullName;
             }
 
+            // Load course actions in background.
+            $mmCoursesDelegate.getNavHandlersForCourse(course, refresh, true).then(function(buttons) {
+                $scope.courseActions = buttons.map(function(button) {
+                    var newScope = $scope.$new();
+                    $controller(button.controller, {$scope: newScope});
+
+                    var buttonInfo = {
+                            text: $translate.instant(newScope.title),
+                            icon: newScope.icon || false,
+                            priority: button.priority || false,
+                            action: function() {
+                                // Fake event (already prevented) to avoid errors on app.
+                                var ev = document.createEvent("MouseEvent");
+                                return newScope.action(ev, course);
+                            }
+                        };
+
+                    newScope.$destroy();
+                    return buttonInfo;
+                });
+            });
+
             // Get the sections.
             return $mmCourse.getSections(courseId, false, true).then(function(sections) {
                 sections = sections.map(function(section) {
diff --git a/www/core/components/course/main.js b/www/core/components/course/main.js
index 4412e7e65eb..ea85c0ea079 100644
--- a/www/core/components/course/main.js
+++ b/www/core/components/course/main.js
@@ -27,7 +27,7 @@ angular.module('mm.core.course', ['mm.core.courses'])
             courseid: null,
             sid: null, // Section to load. Not naming it sectionid because it collides with 'mm_course-section' param in split-view.
             moduleid: null, // Module to load.
-            coursefullname: null
+            course: null
         },
         views: {
             'site': {
diff --git a/www/core/components/course/templates/sections.html b/www/core/components/course/templates/sections.html
index 6baf05fcfd1..984aab625f8 100644
--- a/www/core/components/course/templates/sections.html
+++ b/www/core/components/course/templates/sections.html
@@ -3,6 +3,7 @@
     <ion-nav-buttons side="secondary">
         <mm-context-menu>
             <mm-context-menu-item priority="900" content="'mm.settings.enabledownloadsection' | translate" action="toggleDownloadSections()" icon-action="downloadSectionsIcon"></mm-context-menu-item>
+            <mm-context-menu-item ng-repeat="item in courseActions" priority="item.priority" content="item.text" action="item.action()" icon-action="item.icon"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
     <mm-split-view load-when="sectionsLoaded" load="{{sectionToLoad}}" component="mmCoreCourseSectionsList">
diff --git a/www/core/components/courses/directives/courselistprogress.js b/www/core/components/courses/directives/courselistprogress.js
index e626621a835..020df9fdb32 100644
--- a/www/core/components/courses/directives/courselistprogress.js
+++ b/www/core/components/courses/directives/courselistprogress.js
@@ -41,24 +41,7 @@ angular.module('mm.core.courses')
             showSummary: "=?"
         },
         link: function(scope) {
-            var buttonPromise,
-                courseId = scope.course.id;
-
-            // Load course options if missing.
-            if (typeof scope.course.navOptions == "undefined" || typeof scope.course.admOptions == "undefined") {
-                buttonPromise = $mmCourses.getCoursesOptions([courseId]).then(function(options) {
-                    scope.course.navOptions = options.navOptions[courseId];
-                    scope.course.admOptions = options.admOptions[courseId];
-                });
-            } else {
-                buttonPromise = $q.when();
-            }
-
-            // @todo: refresh?
-            buttonPromise = buttonPromise.then(function() {
-                return $mmCoursesDelegate.getNavHandlersFor(
-                        courseId, false, scope.course.navOptions, scope.course.admOptions, true);
-            }).then(function(buttons) {
+            var buttonPromise = $mmCoursesDelegate.getNavHandlersForCourse(scope.course, false, true).then(function(buttons) {
                 scope.showActions = !!buttons.length;
                 return buttons.map(function(button) {
                     var newScope = scope.$new();
diff --git a/www/core/components/courses/services/delegate.js b/www/core/components/courses/services/delegate.js
index 1f58b4027c9..a107461c262 100644
--- a/www/core/components/courses/services/delegate.js
+++ b/www/core/components/courses/services/delegate.js
@@ -58,7 +58,7 @@ angular.module('mm.core.courses')
         return true;
     };
 
-    self.$get = function($mmUtil, $q, $log, $mmSite, mmCoursesAccessMethods) {
+    self.$get = function($mmUtil, $q, $log, $mmSite, mmCoursesAccessMethods, $mmCourses) {
         var enabledNavHandlers = {},
             coursesHandlers = {},
             self = {},
@@ -152,6 +152,35 @@ angular.module('mm.core.courses')
             return getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions, waitForPromise);
         };
 
+        /**
+         * Get the handlers for a course where the user is enrolled in, using course object.
+         *
+         * @module mm.core.courses
+         * @ngdoc method
+         * @name $mmCoursesDelegate#getNavHandlersForCourse
+         * @param  {Object}  course           The course object.
+         * @param  {Boolean} refresh          True if it should refresh the list.
+         * @param  {Boolean} [waitForPromise] Wait for handlers to be loaded.
+         * @return {Array|Promise}            Array of objects containing 'priority' and 'controller'. Or promise if asked for it.
+         */
+        self.getNavHandlersForCourse = function(course, refresh, waitForPromise) {
+            var promise;
+
+            // Load course options if missing.
+            if (typeof course.navOptions == "undefined" || typeof course.admOptions == "undefined" || refresh) {
+                promise = $mmCourses.getCoursesOptions([course.id]).then(function(options) {
+                    course.navOptions = options.navOptions[course.id];
+                    course.admOptions = options.admOptions[course.id];
+                });
+            } else {
+                promise = $q.when();
+            }
+
+            return promise.then(function() {
+                return self.getNavHandlersFor(course.id, refresh, course.navOptions, course.admOptions, waitForPromise);
+            });
+        };
+
         /**
          * Get the handlers for a course as guest.
          *
diff --git a/www/core/components/courses/templates/courselistprogress.html b/www/core/components/courses/templates/courselistprogress.html
index 0e5723d9758..8c4750235c3 100644
--- a/www/core/components/courses/templates/courselistprogress.html
+++ b/www/core/components/courses/templates/courselistprogress.html
@@ -1,5 +1,5 @@
 <div class="card">
-    <a class="item item-text-wrap item-icon-right item-borderless item-course" ng-class="{'item-progress': roundProgress}" ui-sref="site.mm_course({courseid: course.id, coursefullname: course.fullname})" title="{{course.fullname}}">
+    <a class="item item-text-wrap item-icon-right item-borderless item-course" ng-class="{'item-progress': roundProgress}" ui-sref="site.mm_course({courseid: course.id, course: course})" title="{{course.fullname}}">
         <div class="progress-chart-container" ng-if="roundProgress">
             <div ng-if="course.progress !== false" class="progress-doughnut">
                 <div class="progress-text has-percent">{{course.progress}}&#37;</div>
diff --git a/www/core/components/courses/templates/viewresult.html b/www/core/components/courses/templates/viewresult.html
index 727bcc9ec6b..99843fc930b 100644
--- a/www/core/components/courses/templates/viewresult.html
+++ b/www/core/components/courses/templates/viewresult.html
@@ -5,7 +5,7 @@
         <mm-loading hide-until="courseLoaded">
 
             <div ng-if="course" class="list">
-                <a class="item item-icon-left" ui-sref="site.mm_course({courseid: course.id, coursefullname: course.fullname})" title="{{course.fullname}}" ng-if="handlersShouldBeShown">
+                <a class="item item-icon-left" ui-sref="site.mm_course({courseid: course.id, course: course})" title="{{course.fullname}}" ng-if="handlersShouldBeShown">
                     <i class="icon ion-ionic"></i>
                     <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
                     <p ng-if="course.categoryname">{{course.categoryname}}</p>
@@ -35,7 +35,7 @@ <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
                 <div class="item" ng-if="!isEnrolled && !selfEnrolInstances.length">
                     <p>{{ 'mm.courses.notenrollable' | translate }}</p>
                 </div>
-                <a class="item item-icon-left item-icon-right" ui-sref="site.mm_course({courseid: course.id, coursefullname: course.fullname})" title="{{course.fullname}}" ng-if="handlersShouldBeShown">
+                <a class="item item-icon-left item-icon-right" ui-sref="site.mm_course({courseid: course.id, course: course})" title="{{course.fullname}}" ng-if="handlersShouldBeShown">
                     <i class="icon ion-briefcase"></i>
                     <h2><mm-format-text watch="true">{{ 'mm.course.contents' | translate }}</mm-format-text></h2>
                     <i class="icon icon-accessory ion-chevron-right"></i>

From 430369e932399e4e9ba2551497172485c3db4c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Apr 2017 15:32:06 +0200
Subject: [PATCH 096/218] MOBILE-2078 styles: Add a color palette

---
 scss/app.scss                                |  53 +++++++--
 www/addons/mod/forum/scss/styles.scss        |   4 +-
 www/addons/mod/wiki/scss/styles.scss         | 110 ++++++++++---------
 www/core/components/courses/scss/styles.scss |   8 +-
 www/core/components/grades/scss/styles.scss  |   1 +
 www/core/scss/styles.scss                    |  71 +++++++-----
 6 files changed, 150 insertions(+), 97 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 539099979b5..b5cdb2cbd8a 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -4,11 +4,44 @@
  * Use it to customise the look and feel of the app.
  */
 
-// Colors.
-$positive: #387ef5;
-$stable: #f5f5f5;
-
-$base-background-color: #fcfcfc;
+// Color palette
+$black:           #3a3a3a; // Headings, standard text.
+$gray-dark:       #626262; // Text (emphasis-detail), placeholder, background.
+$gray-medium:     #9e9e9e; // Borders (never text).
+$gray-light:      #eeeeee; // Background.
+$white:           #ffffff; // Background, reversed text.
+
+$blue:            #0064d2; // Link, background.
+$blue-light:      #eaf4ff; // Background.
+$blue-dark:       darken($blue, 10%);
+
+$turquoise:       #007982; // Accent.
+$turquoise-light: #edfafb; // Background.
+$turquoise-dark:  darken($turquoise, 10%);
+
+$green:           #739500; // Accent.
+$green-light:     lighten($green, 10%);
+$green-dark:      darken($green, 10%);
+
+$red:             #a22b38;
+$red-light:       lighten($red, 10%);
+$red-dark:        darken($red, 10%);
+
+$orange:          #e07627; // Accent (never text).
+$orange-light:    lighten($orange, 10%);
+$orange-dark:     darken($orange, 10%);
+
+$yellow:          #fbad1a; // Accent (never text).
+
+// Change Ionic default colors.
+$dark: $black !default;
+$positive: $blue !default;
+$balanced: $green !default;
+$assertive: $red-light !default;
+$energized: $yellow !default;
+$stable: #f5f5f5 !default;
+
+$base-background-color: $gray-light;
 $item-default-bg: white;
 $item-divider-bg: #f1f1f1;
 
@@ -43,7 +76,7 @@ $button-default-active-border: $positive;
 }
 
 .button, .button.button-light, .button.button-stable, .button.button-positive, .button.button-calm, .button.button-assertive,
-.button.button-balanced, .button.button-energized, .button.button-royal, .button.button-dark {
+.button.button-balanced, .button.button-energized, .button.button-royal {
   border-color: $button-default-border;
 
   &.activated, &.active  {
@@ -52,7 +85,7 @@ $button-default-active-border: $positive;
 }
 
 .button.button-light, .button.button-stable, .button.button-calm, .button.button-assertive, .button.button-balanced,
-.button.button-energized, .button.button-royal, .button.button-dark {
+.button.button-energized, .button.button-royal {
   color: $button-default-text;
 }
 
@@ -74,9 +107,13 @@ $button-default-active-border: $positive;
 
 .button.button-icon, .button-icon {
   border-color: transparent;
-  color: $button-default-text;
+  color: $positive;
   background-color: transparent;
 }
 
+.button.button-icon.button-dark, .button-icon.button-dark {
+  color: $gray-dark;
+}
+
 // Include all of Moodle Mobile.
 @import "www/build/mm.bundle.scss";
diff --git a/www/addons/mod/forum/scss/styles.scss b/www/addons/mod/forum/scss/styles.scss
index 00fbc17a7db..a0257213f02 100644
--- a/www/addons/mod/forum/scss/styles.scss
+++ b/www/addons/mod/forum/scss/styles.scss
@@ -47,7 +47,7 @@
         overflow: hidden;
         margin: 1px 10px 10px;
         border-radius: 0;
-        background-color: #fff;
+        background-color: $white;
 
         .item {
             border-left: 0;
@@ -69,7 +69,7 @@
         margin-left: 10px;
 
         &>article:nth-child(even)>.mm-nested-card>mma-mod-forum-discussion-post>.item-heading {
-            background: #eee;
+            background: $gray-light;
         }
     }
 
diff --git a/www/addons/mod/wiki/scss/styles.scss b/www/addons/mod/wiki/scss/styles.scss
index 373b2892f6e..5e6be36214c 100644
--- a/www/addons/mod/wiki/scss/styles.scss
+++ b/www/addons/mod/wiki/scss/styles.scss
@@ -1,55 +1,59 @@
 $mma-mod-wiki-toc-level-padding:    12px !default;
-$mma-mod-wiki-newentry-link-color:   red !default;
-$mma-mod-wiki-toc-title-color:   #666 !default;
-$mma-mod-wiki-toc-border-color:   #bbb !default;
-$mma-mod-wiki-toc-background-color:   #eee !default;
-$mma-mod-wiki-subwiki-selected-background-color:   #eee !default;
-
-.wiki-toc {
-  border: 1px solid $mma-mod-wiki-toc-border-color;
-  background: $mma-mod-wiki-toc-background-color;
-  margin: 16px;
-  padding: 8px;
-}
-
-.wiki-toc-title {
-  color: $mma-mod-wiki-toc-title-color;
-  font-size: 1.1em;
-  font-variant: small-caps;
-  text-align: center;
-}
-
-.wiki-toc-section {
-  padding: 0;
-  margin: 2px 8px;
-}
-
-.wiki-toc-section-2 {
-  padding-left: $mma-mod-wiki-toc-level-padding;
-}
-
-.wiki-toc-section-3 {
-  padding-left: $mma-mod-wiki-toc-level-padding * 2;
-}
-
-.mm-site_mod_wiki .wiki_newentry {
-  color: $mma-mod-wiki-newentry-link-color;
-  font-style: italic;
-}
-
-/* Hide edit section links */
-.mma-mod_wiki-noedit a.wiki_edit_section {
-  display: none;
-}
-
-.mma-mod_wiki-subwiki-picker .item-divider {
-  font-weight: bold;
-}
-
-.mma-mod_wiki-subwiki-picker .item.item-selected {
-  background-color: $mma-mod-wiki-subwiki-selected-background-color;
-}
-
-.mma-mod_wiki-subwiki-picker .item.item-selected .icon {
-  font-size: 24px;
+$mma-mod-wiki-newentry-link-color:  $red !default;
+$mma-mod-wiki-toc-title-color:      $gray-dark !default;
+$mma-mod-wiki-toc-border-color:     $gray-medium !default;
+$mma-mod-wiki-toc-background-color: $gray-light !default;
+$mma-mod-wiki-subwiki-selected-background-color:   $gray-light !default;
+
+.mm-site_mod_wiki {
+  background-color: white;
+
+  .wiki-toc {
+    border: 1px solid $mma-mod-wiki-toc-border-color;
+    background: $mma-mod-wiki-toc-background-color;
+    margin: 16px;
+    padding: 8px;
+  }
+
+  .wiki-toc-title {
+    color: $mma-mod-wiki-toc-title-color;
+    font-size: 1.1em;
+    font-variant: small-caps;
+    text-align: center;
+  }
+
+  .wiki-toc-section {
+    padding: 0;
+    margin: 2px 8px;
+  }
+
+  .wiki-toc-section-2 {
+    padding-left: $mma-mod-wiki-toc-level-padding;
+  }
+
+  .wiki-toc-section-3 {
+    padding-left: $mma-mod-wiki-toc-level-padding * 2;
+  }
+
+  .wiki_newentry {
+    color: $mma-mod-wiki-newentry-link-color;
+    font-style: italic;
+  }
+
+  /* Hide edit section links */
+  .mma-mod_wiki-noedit a.wiki_edit_section {
+    display: none;
+  }
+
+  .mma-mod_wiki-subwiki-picker .item-divider {
+    font-weight: bold;
+  }
+
+  .mma-mod_wiki-subwiki-picker .item.item-selected {
+    background-color: $mma-mod-wiki-subwiki-selected-background-color;
+  }
+
+  .mma-mod_wiki-subwiki-picker .item.item-selected .icon {
+    font-size: 24px;
+  }
 }
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index c76e3667d29..c2266ea8502 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -1,10 +1,10 @@
 $chart-size: 70px;
 $doughnut-border-size: 15px;
 $doughnut-dasharray: 173;
-$doughnut-empty-colour: #dcdcdc;
-$doughnut-fill-colour: #f89406;
-$doughnut-border-colour: #c4c8cc;
-$doughnut-text-colour: #73777d;
+$doughnut-empty-colour: $gray-light;
+$doughnut-fill-colour: $orange-light;
+$doughnut-border-colour:  $gray-medium;
+$doughnut-text-colour: $gray-dark;
 
 .item-course {
   >.icon {
diff --git a/www/core/components/grades/scss/styles.scss b/www/core/components/grades/scss/styles.scss
index 36f07a891bd..c806a2b28d1 100644
--- a/www/core/components/grades/scss/styles.scss
+++ b/www/core/components/grades/scss/styles.scss
@@ -2,6 +2,7 @@
 -------------------------------------------------------------------------- */
 .mm-grades-container {
   padding-right: 2px;
+  background: white;
 }
 
 .mm-grades-table {
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 887b0689fc7..20b3a5ce453 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -15,22 +15,20 @@
  * Variables
  */
 
-$orange-medium: #ff7701; // Default app color.
-
 // Bar content.
-$bar-content-bg: $orange-medium !default;
+$bar-content-bg: $orange !default;
 $bar-content-border: transparent !default;
-$bar-content-text: #fff !default;
+$bar-content-text: $white !default;
 
 // Small avatar ideal for icons.
 $item-media-width: 32px !default;
 $item-media-height: 32px !default;
 
 // Messages.
-$item-message-bg: $stable !default;
-$item-message-note-text: #999 !default;
+$item-message-bg: $white !default;
+$item-message-note-text: $gray-dark !default;
 $item-message-note-font-size: $font-size-small !default;
-$item-message-mine-bg: rgba(17, 193, 243, .1) !default;
+$item-message-mine-bg: $turquoise-light !default;
 
 // Disabled items.
 $item-disabled-color: #999 !default;
@@ -39,11 +37,11 @@ $item-disabled-color: #999 !default;
 $mm-warning-color: $energized !default; // Energized / yellow.
 $mm-success-color: $balanced !default; // Balanced / green.
 $mm-info-color: $positive !default; // Positive / blue.
-$mm-error-color: #c00 !default; // Red.
+$mm-error-color: $assertive !default; // Red.
 
 // Timer variables.
-$mm-timer-warn-color:     #f00 !default;
-$mm-timer-color:          #fff !default;
+$mm-timer-warn-color:     $assertive !default;
+$mm-timer-color:          $white !default;
 $mm-timer-iterations:     15 !default;
 
 // Text with icon.
@@ -53,7 +51,7 @@ $mm-text-with-icon-height: 22px !default;
 $mm-button-icon-small-height: 22px !default;
 
 // Required inputs asterisk color.
-$mm-input-required-asterisk-color: #ff4136 !default;
+$mm-input-required-asterisk-color: $red !default;
 
 // Item padding.
 $item-input-padding: 16px !default;
@@ -123,7 +121,7 @@ em {
   @include bar-style($bar-content-bg, $bar-content-border, $bar-content-text);
   .button {
     @include button-style($bar-content-bg, $bar-content-border, $bar-content-bg, $bar-content-border, $bar-content-text);
-    @include button-clear(#fff, $bar-title-font-size);
+    @include button-clear($white, $bar-title-font-size);
   }
 }
 
@@ -214,11 +212,6 @@ p.item-text-wrap {
   }
 }
 
-.item-message .item-content {
-  background-color: $item-message-bg;
-  padding: 0;
-}
-
 // Defines when an item-message is the user's.
 .item-message-mine {
   background-color: $item-message-mine-bg;
@@ -239,7 +232,8 @@ p.item-text-wrap {
   }
 }
 
-.item-message-mine .item-content {
+.item-message .item-content,
+.item-message-mine .item-content{
   background-color: transparent;
   padding: 0;
 }
@@ -300,8 +294,8 @@ p.item-text-wrap {
 }
 
 /* Show buttons as tabs */
-@include tabs-striped-color('tabs-color-orange', $orange-medium);
-@include tabs-color('tabs-color-orange', $orange-medium);
+@include tabs-striped-color('tabs-color-orange', $orange);
+@include tabs-color('tabs-color-orange', $orange);
 
 .tabs.tabs-free {
   position: initial;
@@ -312,13 +306,13 @@ p.item-text-wrap {
   box-shadow: 0px 6px 6px -3px rgba(0, 0, 0, 0.2);
 
   .tab-item {
-    color: #666;
+    color: $gray-dark;
     margin-top: 0;
     max-width: initial;
     font-size: 120%;
 
     &.active, &.activated {
-      color: black;
+      color: $black;
       margin-top: 0;
       border-top-width: 0;
       border-bottom-width: 3px;
@@ -480,8 +474,17 @@ mm-loading.mm-loading-center {
 }
 
 .mm-split-item-selected, .mm-split-item-selected .item {
-  border-color: #ccc;
-  background-color: #D9D9D9;
+  background-color: $gray-light;
+  border-left: 5px solid $orange-light;
+  padding-left: $item-padding - 4;
+
+  &.item-avatar,
+  &.item-avatar-left {
+    padding-left: $item-avatar-width + ($item-padding * 2) - 4;
+    > img:first-child {
+      left: $item-padding - 4;
+    }
+  }
 }
 
 .mm-module-buttons {
@@ -535,7 +538,7 @@ img.mm-media-adapt-width-enabled {
   position: absolute;
   right: 10px;
   bottom: 10px;
-  color: black;
+  color: $black;
   font-size: 20px;
   border-radius: 5px;
   background: rgba(255, 255, 255, .5);
@@ -545,7 +548,7 @@ img.mm-media-adapt-width-enabled {
   line-height: 30px;
 
   i.icon:before {
-    color: black !important;
+    color: $black !important;
   }
 }
 
@@ -591,7 +594,7 @@ mm-navigation-bar {
   padding: $card-padding;
   box-shadow: $card-box-shadow;
   margin: 20px 10px;
-  background-color: #fff;
+  background-color: $white;
   position: relative;
   text-align: left;
 
@@ -626,7 +629,7 @@ mm-navigation-bar {
   padding: $card-padding;
   box-shadow: $card-box-shadow;
   margin: 20px 10px;
-  background-color: #fff;
+  background-color: $white;
   position: relative;
   padding-left: $item-padding * 3;
   text-align: left;
@@ -1043,6 +1046,10 @@ input[type="radio"].mm-radio {
   padding-top: 0;
   padding-left: 0;
   padding-right: 0;
+
+  .item-input-wrapper {
+    background: white;
+  }
 }
 
 .item.mm-not-clickable {
@@ -1669,6 +1676,10 @@ mm-format-text[max-height], *[mm-format-text][max-height] {
   pointer-events: none;
 }
 
+.item-divider .item-note {
+  color: $gray-dark;
+}
+
 
 .mm-empty-box {
   padding-top: $item-padding;
@@ -1695,13 +1706,13 @@ progress {
   appearance: none;
 
   &[value]::-webkit-progress-bar {
-    background-color: #eee;
+    background-color: $gray-light;
     border-radius: 2px;
     box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25) inset;
   }
 
   &[value]::-webkit-progress-value {
-    background-color: $orange-medium;
+    background-color: $orange-light;
     border-radius: 2px;
     background-size: 35px 20px, 100% 100%, 100% 100%;
   }

From 95ba0d05a02169450f9abd992dc3b7de5c6629ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 3 May 2017 15:39:38 +0200
Subject: [PATCH 097/218] MOBILE-2078 overview: Refresh course options on PTR

---
 scss/app.scss                                 | 32 ++++---
 .../services/coursecompletion.js              | 11 ++-
 .../coursecompletion/services/handlers.js     |  2 +-
 .../mod/assign/templates/submission.html      |  6 +-
 .../mod/feedback/templates/analysis.html      |  6 +-
 www/addons/mod/feedback/templates/index.html  |  6 +-
 www/addons/myoverview/controllers/index.js    | 55 +++++-------
 www/addons/myoverview/directives/eventlist.js |  4 +-
 www/addons/myoverview/scss/styles.scss        |  4 +-
 www/addons/myoverview/services/handlers.js    |  2 +-
 www/addons/myoverview/services/myoverview.js  | 79 ++++++++++-------
 .../myoverview/templates/eventlist.html       | 52 ++++-------
 www/addons/myoverview/templates/index.html    | 26 +++---
 .../components/course/controllers/sections.js |  3 +
 .../components/courses/controllers/list.js    | 10 +--
 .../courses/directives/courselistprogress.js  | 87 +++++++++++--------
 www/core/components/courses/main.js           |  1 +
 www/core/components/courses/scss/styles.scss  |  3 +-
 .../components/courses/services/delegate.js   | 34 +++++++-
 .../components/courses/services/handlers.js   |  3 +-
 .../courses/templates/courselistprogress.html |  3 +-
 www/core/components/login/services/helper.js  |  2 +-
 www/core/scss/styles.scss                     | 10 +--
 www/core/templates/file.html                  |  4 +-
 www/core/templates/localfile.html             |  2 +-
 25 files changed, 243 insertions(+), 204 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index b5cdb2cbd8a..eb868d1cf56 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -41,16 +41,24 @@ $assertive: $red-light !default;
 $energized: $yellow !default;
 $stable: #f5f5f5 !default;
 
+$mm-color:          $orange;
+$mm-color-light:    lighten($mm-color, 10%);
+$mm-color-dark:     darken($mm-color, 10%);
+$mm-color-lighter:  mix($mm-color, white, 20%);
+$mm-color-darker:   mix($mm-color, black, 20%);
+
+$mm-buttons-color: $positive;
+
 $base-background-color: $gray-light;
 $item-default-bg: white;
 $item-divider-bg: #f1f1f1;
 
 // Setting the default button to button-outline.
-$button-default-bg: white;
-$button-default-text: $positive;
-$button-default-border: $positive;
-$button-default-active-bg: $positive;
-$button-default-active-border: $positive;
+$button-default-bg: $white !default;
+$button-default-text: $mm-buttons-color !default;
+$button-default-border: $mm-buttons-color !default;
+$button-default-active-bg: $mm-buttons-color !default;
+$button-default-active-border: $mm-buttons-color !default;
 
 $tabs-off-opacity:                0.6;
 $tabs-striped-off-opacity:        $tabs-off-opacity;
@@ -62,17 +70,17 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
 @import "www/lib/ionic/scss/ionic";
 
 // Tmp fix until Ionic adds !default to $button-default-border and $button-default-active-border.
-$button-default-bg: white;
-$button-default-text: $positive;
-$button-default-border: $positive;
-$button-default-active-bg: $positive;
-$button-default-active-border: $positive;
+$button-default-bg: $white;
+$button-default-text: $mm-buttons-color;
+$button-default-border: $mm-buttons-color;
+$button-default-active-bg: $mm-buttons-color;
+$button-default-active-border: $mm-buttons-color;
 
 // Setting the default button to button-outline.
 .button.active, .button.activated {
   background-color: $button-default-active-bg;
   box-shadow: none;
-  color: #fff;
+  color: $button-default-bg;
 }
 
 .button, .button.button-light, .button.button-stable, .button.button-positive, .button.button-calm, .button.button-assertive,
@@ -107,7 +115,7 @@ $button-default-active-border: $positive;
 
 .button.button-icon, .button-icon {
   border-color: transparent;
-  color: $positive;
+  color: $mm-buttons-color;
   background-color: transparent;
 }
 
diff --git a/www/addons/coursecompletion/services/coursecompletion.js b/www/addons/coursecompletion/services/coursecompletion.js
index 1c454ba08e0..843aaf7ea96 100644
--- a/www/addons/coursecompletion/services/coursecompletion.js
+++ b/www/addons/coursecompletion/services/coursecompletion.js
@@ -167,15 +167,20 @@ angular.module('mm.addons.coursecompletion')
      * @module mm.addons.coursecompletion
      * @ngdoc method
      * @name $mmaCourseCompletion#isPluginViewEnabledForCourse
-     * @param {Number} courseId Course ID.
+     * @param {Number}  courseId            Course ID.
+     * @param {Boolean} [preferCache=true]  True if shouldn't call WS if data is cached, false otherwise.
      * @return {Promise}        Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
-    self.isPluginViewEnabledForCourse = function(courseId) {
+    self.isPluginViewEnabledForCourse = function(courseId, preferCache) {
         if (!courseId) {
             return $q.reject();
         }
 
-        return $mmCourses.getUserCourse(courseId, true).then(function(course) {
+        if (typeof preferCache == "undefined") {
+            preferCache = true;
+        }
+
+        return $mmCourses.getUserCourse(courseId, preferCache).then(function(course) {
             if (course && typeof course.enablecompletion != 'undefined' && course.enablecompletion == 0) {
                 return false;
             }
diff --git a/www/addons/coursecompletion/services/handlers.js b/www/addons/coursecompletion/services/handlers.js
index 62d3397b04a..52da6c58332 100644
--- a/www/addons/coursecompletion/services/handlers.js
+++ b/www/addons/coursecompletion/services/handlers.js
@@ -191,7 +191,7 @@ angular.module('mm.addons.coursecompletion')
                 return false; // Not enabled for guests.
             }
 
-            return $mmaCourseCompletion.isPluginViewEnabledForCourse(courseId).then(function(courseEnabled) {
+            return $mmaCourseCompletion.isPluginViewEnabledForCourse(courseId, false).then(function(courseEnabled) {
                 // If is not enabled in the course, is not enabled for the user.
                 if (!courseEnabled) {
                     coursesNavEnabledCache[courseId] = false;
diff --git a/www/addons/mod/assign/templates/submission.html b/www/addons/mod/assign/templates/submission.html
index 47bf66d4ccb..24c1f9d3ea3 100644
--- a/www/addons/mod/assign/templates/submission.html
+++ b/www/addons/mod/assign/templates/submission.html
@@ -35,9 +35,9 @@ <h2>{{ 'mma.mod_assign.submissionstatus' | translate }}</h2>
         <p ng-if="gradingStatusTranslationId" class="badge badge-inline {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
     </div>
 
-    <div class="tabs tabs-striped tabs-free tabs-color-orange" ng-if="feedback || isGrading">
-      <a class="tab-item" ng-class="{'active': showSubmission}" ng-click="changeShowSubmission(true)">{{ 'mma.mod_assign.submission' | translate }}</a>
-      <a class="tab-item" ng-class="{'active': !showSubmission}" ng-click="changeShowSubmission(false)">{{ 'mma.mod_assign.grade' | translate }}</a>
+    <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="feedback || isGrading">
+        <a class="tab-item" ng-class="{'active': showSubmission}" ng-click="changeShowSubmission(true)">{{ 'mma.mod_assign.submission' | translate }}</a>
+        <a class="tab-item" ng-class="{'active': !showSubmission}" ng-click="changeShowSubmission(false)">{{ 'mma.mod_assign.grade' | translate }}</a>
     </div>
 
     <div ng-show="showSubmission">
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
index 87e10a47d18..3114aa6fa0c 100644
--- a/www/addons/mod/feedback/templates/analysis.html
+++ b/www/addons/mod/feedback/templates/analysis.html
@@ -10,9 +10,9 @@
     <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
         <mm-loading hide-until="feedbackLoaded">
-            <div class="tabs tabs-striped tabs-free tabs-color-orange" ng-if="access.canviewreports">
-              <a class="tab-item" ng-click="openFeature()">{{ 'mma.mod_feedback.overview' | translate }}</a>
-              <a class="tab-item active">{{ 'mma.mod_feedback.analysis' | translate }}</a>
+            <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="access.canviewreports">
+                <a class="tab-item" ng-click="openFeature()">{{ 'mma.mod_feedback.overview' | translate }}</a>
+                <a class="tab-item active">{{ 'mma.mod_feedback.analysis' | translate }}</a>
             </div>
             <section class="list" ng-if="access.canedititems || !access.isempty">
                 <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index f38076590a9..0f7013df685 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -29,9 +29,9 @@
                 <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
             </div>
 
-            <div class="tabs tabs-striped tabs-free tabs-color-orange" ng-if="access.canviewreports">
-              <a class="tab-item active">{{ 'mma.mod_feedback.overview' | translate }}</a>
-              <a class="tab-item" ng-click="openFeature('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
+            <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="access.canviewreports">
+                <a class="tab-item active">{{ 'mma.mod_feedback.overview' | translate }}</a>
+                <a class="tab-item" ng-click="openFeature('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
             </div>
 
             <section class="list" ng-if="access.canedititems || access.canviewreports || !access.isempty">
diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
index 127375173b4..6edd3f619c2 100644
--- a/www/addons/myoverview/controllers/index.js
+++ b/www/addons/myoverview/controllers/index.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.myoverview')
  * @ngdoc controller
  * @name mmaMyOverviewCtrl
  */
-.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q, $mmCourses) {
+.controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q, $mmCourses, $mmCoursesDelegate) {
 
     $scope.tabShown = 'timeline';
     $scope.timeline = {
@@ -61,12 +61,8 @@ angular.module('mm.addons.myoverview')
                 courseIds = [];
             courses = courses.filter(function(course) {
                 return course.startdate <= today && (!course.enddate || course.enddate >= today);
-            }).sort(function(a, b) {
-                var compareA = a.fullname.toLowerCase(),
-                    compareB = b.fullname.toLowerCase();
-
-                return compareA.localeCompare(compareB);
             });
+
             $scope.timelineCourses.courses = courses;
             if (courses.length > 0) {
                 courseIds = courses.map(function(course) {
@@ -95,13 +91,6 @@ angular.module('mm.addons.myoverview')
             $scope.courses.inprogress = [];
             $scope.courses.future = [];
 
-            courses.sort(function(a, b) {
-                var compareA = a.fullname.toLowerCase(),
-                    compareB = b.fullname.toLowerCase();
-
-                return compareA.localeCompare(compareB);
-            })
-
             angular.forEach(courses, function(course) {
                 if (course.startdate > today) {
                     // Courses that have not started yet.
@@ -127,7 +116,7 @@ angular.module('mm.addons.myoverview')
                 return course.id;
             });
 
-            // Load the handlers of each course.
+            // Load course options of the course.
             return $mmCourses.getCoursesOptions(courseIds).then(function(options) {
                 angular.forEach(courses, function(course) {
                     course.showProgress = true;
@@ -136,7 +125,13 @@ angular.module('mm.addons.myoverview')
                     course.navOptions = options.navOptions[course.id];
                     course.admOptions = options.admOptions[course.id];
                 });
-                return courses;
+
+                return courses.sort(function(a, b) {
+                    var compareA = a.fullname.toLowerCase(),
+                        compareB = b.fullname.toLowerCase();
+
+                    return compareA.localeCompare(compareB);
+                });
             });
         });
     }
@@ -156,27 +151,20 @@ angular.module('mm.addons.myoverview')
     $scope.refreshMyOverview = function() {
         var promises = [];
 
-        switch($scope.tabShown) {
-            case 'timeline':
-                promises.push($mmaMyOverview.invalidateActionEventsByTimesort());
-                promises.push($mmaMyOverview.invalidateActionEventsByCourses());
-                promises.push($mmCourses.invalidateUserNavigationOptions());
-                promises.push($mmCourses.invalidateUserAdministrationOptions());
-                promises.push($mmCourses.invalidateUserCourses());
-                break;
-            case 'courses':
-                promises.push($mmCourses.invalidateUserNavigationOptions());
-                promises.push($mmCourses.invalidateUserAdministrationOptions());
-                promises.push($mmCourses.invalidateUserCourses());
-                break;
+        if ($scope.tabShown == 'timeline') {
+            promises.push($mmaMyOverview.invalidateActionEventsByTimesort());
+            promises.push($mmaMyOverview.invalidateActionEventsByCourses());
         }
 
+        promises.push($mmCourses.invalidateUserCourses());
+        promises.push($mmCoursesDelegate.clearAndInvalidateCoursesOptions());
+
         $q.all(promises).finally(function() {
             var promise;
 
-            switch($scope.tabShown) {
+            switch ($scope.tabShown) {
                 case 'timeline':
-                    switch($scope.timeline.sort) {
+                    switch ($scope.timeline.sort) {
                         case 'sortbydates':
                             $scope.timeline.events = [];
                             promise = fetchMyOverviewTimesort();
@@ -191,6 +179,7 @@ angular.module('mm.addons.myoverview')
                     promise = fetchMyOverviewCourses();
                     break;
             }
+
             promise.finally(function() {
                 $scope.$broadcast('scroll.refreshComplete');
             });
@@ -199,7 +188,7 @@ angular.module('mm.addons.myoverview')
 
     // Change timeline sort being viewed.
     $scope.switchSort = function() {
-        switch($scope.timeline.sort) {
+        switch ($scope.timeline.sort) {
             case 'sortbydates':
                 if (!$scope.timeline.loaded) {
                     fetchMyOverviewTimeline().finally(function() {
@@ -220,7 +209,7 @@ angular.module('mm.addons.myoverview')
     // Change tab being viewed.
     $scope.switchTab = function(tab) {
         $scope.tabShown = tab;
-        switch($scope.tabShown) {
+        switch ($scope.tabShown) {
             case 'timeline':
                 if (!$scope.timeline.loaded) {
                     return fetchMyOverviewTimeline().finally(function() {
@@ -240,7 +229,7 @@ angular.module('mm.addons.myoverview')
 
     $scope.switchTab('timeline').finally(function() {
         if ($scope.timeline.events.length == 0) {
-            $scope.switchTab('courses')
+            $scope.switchTab('courses');
         }
     });
 
diff --git a/www/addons/myoverview/directives/eventlist.js b/www/addons/myoverview/directives/eventlist.js
index a03d8779afc..2fb5020db3e 100644
--- a/www/addons/myoverview/directives/eventlist.js
+++ b/www/addons/myoverview/directives/eventlist.js
@@ -75,9 +75,7 @@ angular.module('mm.addons.myoverview')
 
             scope.loadMoreEvents = function() {
                 scope.loadingMore = true;
-                scope.loadMore().catch(function(message) {
-                    $mmUtil.showErrorModalDefault(message, 'Error getting my overview data.');
-                }).finally(function() {
+                scope.loadMore().finally(function() {
                     scope.loadingMore = false;
                 });
             };
diff --git a/www/addons/myoverview/scss/styles.scss b/www/addons/myoverview/scss/styles.scss
index 18905fdb0b1..9acfc1afbdc 100644
--- a/www/addons/myoverview/scss/styles.scss
+++ b/www/addons/myoverview/scss/styles.scss
@@ -41,11 +41,11 @@
     h5 {
       margin-left: 10px;
     }
-    .list.block  .item {
+    .list.block .item {
       border-top: $item-border-width solid $item-light-border;
       border-bottom: $item-border-width solid $item-light-border;
     }
-    .list.block:last-child .item{
+    .list.block:last-child .item {
       border-bottom: 0;
     }
   }
diff --git a/www/addons/myoverview/services/handlers.js b/www/addons/myoverview/services/handlers.js
index 4527f9c4c7a..4903135e58b 100644
--- a/www/addons/myoverview/services/handlers.js
+++ b/www/addons/myoverview/services/handlers.js
@@ -45,7 +45,7 @@ angular.module('mm.addons.myoverview')
          *                           rejected promise or false.
          */
         self.isEnabled = function() {
-            return $mmaMyOverview.isSideMenuAvalaible();
+            return $mmaMyOverview.isSideMenuAvailable();
         };
 
         /**
diff --git a/www/addons/myoverview/services/myoverview.js b/www/addons/myoverview/services/myoverview.js
index a6f51920977..220d4a2b85c 100644
--- a/www/addons/myoverview/services/myoverview.js
+++ b/www/addons/myoverview/services/myoverview.js
@@ -48,13 +48,25 @@ angular.module('mm.addons.myoverview')
         return getActionEventsByCoursesCacheKey() + ':' + courseId;
     }
 
+    /**
+     * Get prefix cache key for calendar action events based on the timesort value WS calls.
+     *
+     * @return {String}         Cache key.
+     */
+    function getActionEventsByTimesortPrefixCacheKey() {
+        return 'myoverview:bytimesort:';
+    }
+
     /**
      * Get cache key for get calendar action events based on the timesort value WS call.
      *
-     * @return {String}       Cache key.
+     * @param  {Number}     [afterEventId]  The last seen event id.
+     * @param  {Number}     [limit]         Limit num of the call.
+     * @return {String}     Cache key.
      */
-    function getActionEventsByTimesortCacheKey() {
-        return 'myoverview:bytimesort';
+    function getActionEventsByTimesortCacheKey(afterEventId, limit) {
+        afterEventId = afterEventId || 0;
+        return getActionEventsByTimesortPrefixCacheKey() + afterEventId + ':' + limit;
     }
 
     /**
@@ -95,11 +107,11 @@ angular.module('mm.addons.myoverview')
      *
      * @module mm.addons.myoverview
      * @ngdoc method
-     * @name $mmaMyOverview#isSideMenuAvalaible
+     * @name $mmaMyOverview#isSideMenuAvailable
      * @param  {Object} [site] Site. If not defined, use current site.
      * @return {Boolean}       True if disabled, false otherwise.
      */
-    self.isSideMenuAvalaible = function() {
+    self.isSideMenuAvailable = function() {
         if (!self.isMyOverviewDisabledInSite()) {
             return self.isPluginEnabled().catch(function() {
                 return false;
@@ -123,7 +135,7 @@ angular.module('mm.addons.myoverview')
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
                 data = {
-                    //timesortfrom: time,
+                    timesortfrom: time,
                     courseids: courseIds,
                     limitnum: self.eventsLimitPerCourse
                 },
@@ -136,17 +148,7 @@ angular.module('mm.addons.myoverview')
                     var courseEvents = {};
 
                     angular.forEach(events.groupedbycourse, function(course) {
-                        var canLoadMore = course.events.length >= self.eventsLimitPerCourse ? course.lastid : false;
-
-                        // Filter events by time in case it uses cache.
-                        course.events = course.events.filter(function(element) {
-                            return element.timesort >= time;
-                        });
-
-                        courseEvents[course.courseid] = {
-                            events: course.events,
-                            canLoadMore: canLoadMore
-                        };
+                        courseEvents[course.courseid] = treatCourseEvents(course, time);
                     });
                     return courseEvents;
                 }
@@ -197,25 +199,36 @@ angular.module('mm.addons.myoverview')
                 data.aftereventid = afterEventId;
             }
 
-            return site.read('core_calendar_get_action_events_by_course', data, presets).then(function(events) {
-                if (events && events.events) {
-                    var canLoadMore = events.events.length >= self.eventsLimitPerCourse ? events.lastid : false;
-
-                    // Filter events by time in case it uses cache.
-                    events = events.events.filter(function(element) {
-                        return element.timesort >= time;
-                    });
-
-                    return {
-                        events: events,
-                        canLoadMore: canLoadMore
-                    };
+            return site.read('core_calendar_get_action_events_by_course', data, presets).then(function(courseEvents) {
+                if (courseEvents && courseEvents.events) {
+                    return treatCourseEvents(courseEvents, time);
                 }
                 return $q.reject();
             });
         });
     };
 
+    /**
+     * Handles course events, filtering and treating if more can be loaded.
+     *
+     * @param  {Object} course      Object containing response course events info.
+     * @param  {Number} timeFrom    Current time to filter events from.
+     * @return {Object}             Object containing course events and and last loaded event id if more can be loaded.
+     */
+    function treatCourseEvents(course, timeFrom) {
+        var canLoadMore = course.events.length >= self.eventsLimitPerCourse ? course.lastid : false;
+
+        // Filter events by time in case it uses cache.
+        course.events = course.events.filter(function(element) {
+            return element.timesort >= timeFrom;
+        });
+
+        return {
+            events: course.events,
+            canLoadMore: canLoadMore
+        };
+    }
+
     /**
      * Get calendar action events based on the timesort value.
      *
@@ -234,7 +247,9 @@ angular.module('mm.addons.myoverview')
                     limitnum: self.eventsLimit
                 },
                 presets = {
-                    cacheKey: getActionEventsByTimesortCacheKey()
+                    cacheKey: getActionEventsByTimesortCacheKey(afterEventId, self.eventsLimit),
+                    getCacheUsingCacheKey: true,
+                    uniqueCacheKey: true
                 };
 
             if (afterEventId) {
@@ -271,7 +286,7 @@ angular.module('mm.addons.myoverview')
      */
     self.invalidateActionEventsByTimesort = function(siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKey(getActionEventsByTimesortCacheKey());
+            return site.invalidateWsCacheForKeyStartingWith(getActionEventsByTimesortPrefixCacheKey());
         });
     };
 
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index 47320dd1674..e0348ab0f31 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -1,55 +1,35 @@
+<script type="text/ng-template" id="event">
+    <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+        <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+        <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
+        <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
+    </a>
+</script>
+
 <h5 ng-if="recentlyOverdue.length > 0" class="assertive mm-timelinetitle">{{ 'mma.myoverview.recentlyoverdue' | translate }}</h5>
 <ul class="list block" ng-if="recentlyOverdue.length > 0">
-    <li ng-repeat="event in recentlyOverdue">
-        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
-            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
-            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
-            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
-        </a>
-    </li>
+    <li ng-repeat="event in recentlyOverdue" ng-include="'event'"></li>
 </ul>
 
 <h5 ng-if="today.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.today' | translate }}</h5>
 <ul class="list block" ng-if="today.length > 0">
-    <li ng-repeat="event in today">
-        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
-            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
-            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
-            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
-        </a>
-    </li>
+    <li ng-repeat="event in today" ng-include="'event'"></li>
 </ul>
 
 <h5 ng-if="next7Days.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.next7days' | translate }}</h5>
 <ul class="list block" ng-if="next7Days.length > 0">
-    <li ng-repeat="event in next7Days">
-        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
-            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
-            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
-            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
-        </a>
-    </li>
+    <li ng-repeat="event in next7Days" ng-include="'event'"></li>
 </ul>
 
 <h5 ng-if="next30Days.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.next30days' | translate }}</h5>
 <ul class="list block" ng-if="next30Days.length > 0">
-    <li ng-repeat="event in next30Days">
-        <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
-            <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
-            <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
-            <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
-        </a>
-    </li>
+    <li ng-repeat="event in next30Days" ng-include="'event'"></li>
 </ul>
 
 <h5 ng-if="future.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.future' | translate }}</h5>
-<div class="list block" ng-if="future.length > 0">
-    <a ng-repeat="event in future" mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
-        <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
-        <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
-        <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
-    </a>
-</div>
+<ul class="list block" ng-if="future.length > 0">
+    <li ng-repeat="event in future" ng-include="'event'"></li>
+</ul>
 
 <div class="padding text-center" ng-if="canLoadMore && !empty">
     <!-- Button and spinner to show more attempts. -->
@@ -59,4 +39,4 @@ <h5 ng-if="future.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.future
 <div ng-if="empty" class="mm-empty-box block">
     <img ng-if="showCourse" src="addons/myoverview/img/activities.svg">
     <p>{{ 'mma.myoverview.noevents' | translate }}</p>
-</div>
+</div>
\ No newline at end of file
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index d02997f2974..8c50a17d3c5 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -5,27 +5,21 @@
     <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="timeline.loaded" on-refresh="refreshMyOverview()">
         </ion-refresher>
-        <div class="tabs tabs-striped tabs-free tabs-color-orange">
-          <a class="tab-item" ng-class="{'active': tabShown == 'timeline'}" ng-click="switchTab('timeline')">{{ 'mma.myoverview.timeline' | translate }}</a>
-          <a class="tab-item" ng-class="{'active': tabShown == 'courses'}" ng-click="switchTab('courses')">{{ 'mm.courses.courses' | translate }}</a>
+        <div class="tabs tabs-striped tabs-free mm-tabs-color">
+            <a class="tab-item" ng-class="{'active': tabShown == 'timeline'}" ng-click="switchTab('timeline')">{{ 'mma.myoverview.timeline' | translate }}</a>
+            <a class="tab-item" ng-class="{'active': tabShown == 'courses'}" ng-click="switchTab('courses')">{{ 'mm.courses.courses' | translate }}</a>
         </div>
         <div class="padding">
+            <div class="item-select mm-full-width-centered mm-timelinesort" ng-show="tabShown == 'timeline' && (timeline.loaded || timelineCourses.loaded)">
+                <select ng-model="timeline.sort" ng-change="switchSort()">
+                    <option value="sortbydates">{{ 'mma.myoverview.sortbydates' | translate }}</option>
+                    <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
+                </select>
+            </div>
             <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbydates'">
-                <div class="item-select mm-full-width-centered mm-timelinesort">
-                    <select ng-model="timeline.sort" ng-change="switchSort()">
-                        <option value="sortbydates">{{ 'mma.myoverview.sortbydates' | translate }}</option>
-                        <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
-                    </select>
-                </div>
                 <mma-my-overview-event-list events="timeline.events" show-course="true" can-load-more="timeline.canLoadMore" load-more="loadMoreTimeline()"></mma-my-overview-event-list>
             </mm-loading>
-            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'">
-                <div class="item-select mm-full-width-centered mm-timelinesort">
-                    <select ng-model="timeline.sort" ng-change="switchSort()">
-                        <option value="sortbydates">{{ 'mma.myoverview.sortbydates' | translate }}</option>
-                        <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
-                    </select>
-                </div>
+            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'" class="block">
                 <div class="block mm-course-grid">
                     <mm-course-list-progress ng-repeat="course in timelineCourses.courses" course="course" round-progress="true" show-summary="true">
                         <mma-my-overview-event-list events="course.events" can-load-more="course.canLoadMore" load-more="loadMoreCourse(course)"></mma-my-overview-event-list>
diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index 13cd9b6194f..d70910d82c5 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -197,6 +197,7 @@ angular.module('mm.core.course')
 
     $scope.doRefresh = function() {
         var promises = [];
+
         promises.push($mmCourses.invalidateUserCourses());
         promises.push($mmCourse.invalidateSections(courseId));
 
@@ -206,6 +207,8 @@ angular.module('mm.core.course')
             promises.push($mmCoursePrefetchDelegate.invalidateModules(modules, courseId));
         }
 
+        promises.push($mmCoursesDelegate.clearAndInvalidateCoursesOptions(courseId));
+
         $q.all(promises).finally(function() {
             loadSections(true).finally(function() {
                 $scope.$broadcast('scroll.refreshComplete');
diff --git a/www/core/components/courses/controllers/list.js b/www/core/components/courses/controllers/list.js
index 216db823ea3..a2cdb6b5c69 100644
--- a/www/core/components/courses/controllers/list.js
+++ b/www/core/components/courses/controllers/list.js
@@ -22,7 +22,7 @@ angular.module('mm.core.courses')
  * @name mmCoursesListCtrl
  */
 .controller('mmCoursesListCtrl', function($scope, $mmCourses, $mmCoursesDelegate, $mmUtil, $mmEvents, $mmSite, $q,
-            mmCoursesEventMyCoursesUpdated, mmCoursesEventMyCoursesRefreshed, mmCoreEventSiteUpdated) {
+            mmCoursesEventMyCoursesUpdated, mmCoreEventSiteUpdated) {
 
     var updateSiteObserver,
         myCoursesObserver;
@@ -59,15 +59,11 @@ angular.module('mm.core.courses')
     $scope.refreshCourses = function() {
         var promises = [];
 
-        $mmEvents.trigger(mmCoursesEventMyCoursesRefreshed);
-
         promises.push($mmCourses.invalidateUserCourses());
-        promises.push($mmCourses.invalidateUserNavigationOptions());
-        promises.push($mmCourses.invalidateUserAdministrationOptions());
-
-        $mmCoursesDelegate.clearCoursesHandlers();
+        promises.push($mmCoursesDelegate.clearAndInvalidateCoursesOptions());
 
         $q.all(promises).finally(function() {
+
             fetchCourses(true).finally(function() {
                 $scope.$broadcast('scroll.refreshComplete');
             });
diff --git a/www/core/components/courses/directives/courselistprogress.js b/www/core/components/courses/directives/courselistprogress.js
index 020df9fdb32..17653bd836a 100644
--- a/www/core/components/courses/directives/courselistprogress.js
+++ b/www/core/components/courses/directives/courselistprogress.js
@@ -30,7 +30,8 @@ angular.module('mm.core.courses')
  *
  * <mm-course-list-progress course="course" round-progress="true" show-summary="true"></mm-course-list-progress>
  */
-.directive('mmCourseListProgress', function($ionicActionSheet, $mmCourses, $mmCoursesDelegate, $translate, $controller, $q) {
+.directive('mmCourseListProgress', function($ionicActionSheet, $mmCoursesDelegate, $translate, $controller, $mmEvents,
+        mmCoursesEventCourseOptionsInvalidated) {
     return {
         restrict: 'E',
         templateUrl: 'core/components/courses/templates/courselistprogress.html',
@@ -41,53 +42,67 @@ angular.module('mm.core.courses')
             showSummary: "=?"
         },
         link: function(scope) {
-            var buttonPromise = $mmCoursesDelegate.getNavHandlersForCourse(scope.course, false, true).then(function(buttons) {
-                scope.showActions = !!buttons.length;
-                return buttons.map(function(button) {
-                    var newScope = scope.$new();
-                    $controller(button.controller, {$scope: newScope});
+            var buttons, invObserver;
+            scope.loaded = false;
 
-                    var title = newScope.title || "",
-                        icon = newScope.icon || false,
-                        buttonInfo = {
-                            text: (icon ? '<i class="icon ' + icon + '"></i>' : '') + $translate.instant(title),
-                            action: newScope.action || false,
-                            className: newScope.class || false,
-                            priority: button.priority || false
-                        };
+            function updateButtons(refresh) {
+                scope.loaded = false;
+                $mmCoursesDelegate.getNavHandlersForCourse(scope.course, refresh, true).then(function(buttonsLoaded) {
+                    buttons = buttonsLoaded.map(function(button) {
+                        var newScope = scope.$new();
+                        $controller(button.controller, {$scope: newScope});
 
-                    newScope.$destroy();
-                    return buttonInfo;
-                }).sort(function(a, b) {
-                    return b.priority - a.priority;
+                        var title = newScope.title || "",
+                            icon = newScope.icon || false,
+                            buttonInfo = {
+                                text: (icon ? '<i class="icon ' + icon + '"></i>' : '') + $translate.instant(title),
+                                action: newScope.action || false,
+                                className: newScope.class || false,
+                                priority: button.priority || false
+                            };
+
+                        newScope.$destroy();
+                        return buttonInfo;
+                    }).sort(function(a, b) {
+                        return b.priority - a.priority;
+                    });
+                }).finally(function() {
+                    scope.showActions = !!buttons.length;
+                    scope.loaded = true;
                 });
-            });
+            }
+
+            updateButtons(false);
 
             scope.showCourseActions = function($event) {
                 $event.preventDefault();
                 $event.stopPropagation();
-                buttonPromise.then(function(buttons) {
-                    $ionicActionSheet.show({
-                        titleText: scope.course.fullname,
-                        buttons: buttons,
-                        cancelText: $translate.instant('mm.core.cancel'),
-                        buttonClicked: function(index) {
-                            if (angular.isFunction(buttons[index].action)) {
-                                // Execute the action and close the action sheet.
-                                return buttons[index].action($event, scope.course);
-                            }
-                            // Never close the action sheet. It will automatically be closed if success.
-                            return false;
-                        },
-                        cancel: function() {
-                            // User cancelled the action sheet.
-                            return true;
+                $ionicActionSheet.show({
+                    titleText: scope.course.fullname,
+                    buttons: buttons,
+                    cancelText: $translate.instant('mm.core.cancel'),
+                    buttonClicked: function(index) {
+                        if (angular.isFunction(buttons[index].action)) {
+                            // Execute the action and close the action sheet.
+                            return buttons[index].action($event, scope.course);
                         }
-                    });
+                        // Never close the action sheet. It will automatically be closed if success.
+                        return false;
+                    },
+                    cancel: function() {
+                        // User cancelled the action sheet.
+                        return true;
+                    }
                 });
             };
 
+            invObserver = $mmEvents.on(mmCoursesEventCourseOptionsInvalidated, function() {
+                updateButtons(true);
+            });
 
+            scope.$on('$destroy', function() {
+                invObserver && invObserver.off && invObserver.off();
+            });
         }
     };
 });
diff --git a/www/core/components/courses/main.js b/www/core/components/courses/main.js
index 26f370e7fc4..f88e7bd5c62 100644
--- a/www/core/components/courses/main.js
+++ b/www/core/components/courses/main.js
@@ -19,6 +19,7 @@ angular.module('mm.core.courses', ['mm.core.contentlinks', 'mm.core.sidemenu'])
 .constant('mmCoursesEnrolInvalidKey', 'mmCoursesEnrolInvalidKey')
 .constant('mmCoursesEventMyCoursesUpdated', 'my_courses_updated')
 .constant('mmCoursesEventMyCoursesRefreshed', 'my_courses_refreshed') // User refreshed My Courses.
+.constant('mmCoursesEventCourseOptionsInvalidated', 'course_options_invalidated')
 .constant('mmCoursesAccessMethods', {
      guest: 'guest',
      default: 'default'
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index c2266ea8502..a0c4da75dbd 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -7,12 +7,13 @@ $doughnut-border-colour:  $gray-medium;
 $doughnut-text-colour: $gray-dark;
 
 .item-course {
-  >.icon {
+  >.icon, >ion-spinner {
     height: 32px + ($item-padding /2);
     width: 32px + ($item-padding /2);
     right: 0;
     top: 6px;
     color: $doughnut-text-colour;
+    position: absolute;
   }
 }
 
diff --git a/www/core/components/courses/services/delegate.js b/www/core/components/courses/services/delegate.js
index a107461c262..f83718a296b 100644
--- a/www/core/components/courses/services/delegate.js
+++ b/www/core/components/courses/services/delegate.js
@@ -58,7 +58,8 @@ angular.module('mm.core.courses')
         return true;
     };
 
-    self.$get = function($mmUtil, $q, $log, $mmSite, mmCoursesAccessMethods, $mmCourses) {
+    self.$get = function($mmUtil, $q, $log, $mmSite, mmCoursesAccessMethods, $mmCourses, $mmEvents,
+            mmCoursesEventCourseOptionsInvalidated, mmCoursesEventMyCoursesRefreshed) {
         var enabledNavHandlers = {},
             coursesHandlers = {},
             self = {},
@@ -100,6 +101,30 @@ angular.module('mm.core.courses')
             }
         };
 
+        /**
+         * Clear all courses handlers and invalidate its options.
+         *
+         * @module mm.core.courses
+         * @ngdoc method
+         * @name $mmCoursesDelegate#clearAndInvalidateCoursesOptions
+         * @param {Number} [courseId]   The course ID. If not defined, all handlers will be cleared.
+         * @protected
+         */
+        self.clearAndInvalidateCoursesOptions = function(courseId) {
+            var promises = [];
+
+            $mmEvents.trigger(mmCoursesEventMyCoursesRefreshed);
+
+            promises.push($mmCourses.invalidateUserNavigationOptions());
+            promises.push($mmCourses.invalidateUserAdministrationOptions());
+
+            self.clearCoursesHandlers(courseId);
+
+            return $q.all(promises).finally(function() {
+                $mmEvents.trigger(mmCoursesEventCourseOptionsInvalidated);
+            });
+        };
+
         /**
          * Get the handler for a course using a certain access type.
          *
@@ -112,6 +137,13 @@ angular.module('mm.core.courses')
          * @return {Array|Promise}            Array of objects containing 'priority' and 'controller'. Or promise if asked for it.
          */
         function getNavHandlersForAccess(courseId, refresh, accessData, navOptions, admOptions, waitForPromise) {
+            // If the promise is pending, do not refresh.
+            if (coursesHandlers[courseId] && coursesHandlers[courseId].deferred &&
+                    coursesHandlers[courseId].deferred.promise.$$state &&
+                    coursesHandlers[courseId].deferred.promise.$$state.status === 0) {
+                refresh = false;
+            }
+
             if (refresh || !coursesHandlers[courseId] || coursesHandlers[courseId].access.type != accessData.type) {
                 coursesHandlers[courseId] = {
                     access: accessData,
diff --git a/www/core/components/courses/services/handlers.js b/www/core/components/courses/services/handlers.js
index f08dac2a694..6ebbe389417 100644
--- a/www/core/components/courses/services/handlers.js
+++ b/www/core/components/courses/services/handlers.js
@@ -285,9 +285,10 @@ angular.module('mm.core.courses')
         self.isEnabled = function() {
             var myCoursesDisabled = $mmCourses.isMyCoursesDisabledInSite();
 
+            // Check if overview side menu is available, so it won't show My courses.
             var $mmaMyOverview = $mmAddonManager.get('$mmaMyOverview');
             if ($mmaMyOverview) {
-                return $mmaMyOverview.isSideMenuAvalaible().then(function(enabled) {
+                return $mmaMyOverview.isSideMenuAvailable().then(function(enabled) {
                     if (enabled) {
                         return false;
                     }
diff --git a/www/core/components/courses/templates/courselistprogress.html b/www/core/components/courses/templates/courselistprogress.html
index 8c4750235c3..6818a2573d1 100644
--- a/www/core/components/courses/templates/courselistprogress.html
+++ b/www/core/components/courses/templates/courselistprogress.html
@@ -21,7 +21,8 @@ <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
             <progress class="col-90" max="100" value="{{ course.progress }}"></progress>
             <div class="col col-center text-right mm-progress-text">{{course.progress}}&#37;</div>
         </div>
-        <i ng-if="showActions" class="icon ion-android-more-vertical" ng-click="showCourseActions($event)"></i>
+        <i ng-if="showActions && loaded" class="icon ion-android-more-vertical" ng-click="showCourseActions($event)"></i>
+        <ion-spinner ng-if="!loaded"></ion-spinner>
     </a>
     <div class="item item-text-wrap item-borderless" ng-show="course.summary" ng-if="showSummary">
         <p>
diff --git a/www/core/components/login/services/helper.js b/www/core/components/login/services/helper.js
index ddb74a4f551..789d6be7bed 100644
--- a/www/core/components/login/services/helper.js
+++ b/www/core/components/login/services/helper.js
@@ -232,7 +232,7 @@ angular.module('mm.core.login')
         function isMyOverviewEnabled() {
             var $mmaMyOverview = $mmAddonManager.get('$mmaMyOverview');
             if ($mmaMyOverview) {
-                return $mmaMyOverview.isSideMenuAvalaible();
+                return $mmaMyOverview.isSideMenuAvailable();
             }
             return $q.when(false);
         }
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 20b3a5ce453..7bd7d671354 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -16,7 +16,7 @@
  */
 
 // Bar content.
-$bar-content-bg: $orange !default;
+$bar-content-bg: $mm-color !default;
 $bar-content-border: transparent !default;
 $bar-content-text: $white !default;
 
@@ -294,8 +294,8 @@ p.item-text-wrap {
 }
 
 /* Show buttons as tabs */
-@include tabs-striped-color('tabs-color-orange', $orange);
-@include tabs-color('tabs-color-orange', $orange);
+@include tabs-striped-color('mm-tabs-color', $mm-color);
+@include tabs-color('mm-tabs-color', $mm-color);
 
 .tabs.tabs-free {
   position: initial;
@@ -475,7 +475,7 @@ mm-loading.mm-loading-center {
 
 .mm-split-item-selected, .mm-split-item-selected .item {
   background-color: $gray-light;
-  border-left: 5px solid $orange-light;
+  border-left: 5px solid $mm-color-light;
   padding-left: $item-padding - 4;
 
   &.item-avatar,
@@ -1712,7 +1712,7 @@ progress {
   }
 
   &[value]::-webkit-progress-value {
-    background-color: $orange-light;
+    background-color: $mm-color-light;
     border-radius: 2px;
     background-size: 35px 20px, 100% 100%, 100% 100%;
   }
diff --git a/www/core/templates/file.html b/www/core/templates/file.html
index e9deaf1d3d9..4137821ffce 100644
--- a/www/core/templates/file.html
+++ b/www/core/templates/file.html
@@ -3,10 +3,10 @@
     <p>{{filename}}</p>
     <div class="buttons">
 	    <button class="button button-icon" ng-click="download($event)" ng-if="!isDownloading && showDownload" aria-label="{{ 'mm.core.download' | translate }}">
-	        <i class="icon" ng-class="isDownloaded ? 'ion-android-refresh' : 'ion-ios-cloud-download-outline'"></i>
+	        <i class="icon positive" ng-class="isDownloaded ? 'ion-android-refresh' : 'ion-ios-cloud-download-outline'"></i>
 	    </button>
 	    <button class="button button-icon" ng-click="delete($event)" ng-if="!isDownloading && canDelete" aria-label="{{ 'mm.core.delete' | translate }}">
-	        <i class="icon ion-trash-a"></i>
+	        <i class="icon assertive ion-trash-a"></i>
 	    </button>
     </div>
     <ion-spinner class="spinner-right" ng-if="isDownloading"></ion-spinner>
diff --git a/www/core/templates/localfile.html b/www/core/templates/localfile.html
index 278c9d37e8f..26ad708935d 100644
--- a/www/core/templates/localfile.html
+++ b/www/core/templates/localfile.html
@@ -11,7 +11,7 @@
     </form>
     <p ng-if="size">{{ size }}</p>
     <p ng-if="timeModified">{{ timeModified }}</p>
-    <button class="button button-icon" ng-if="manage" ng-click="deleteFile($event)" aria-label="{{ 'mm.core.delete' | translate }}">
+    <button class="button assertive button-icon" ng-if="manage" ng-click="deleteFile($event)" aria-label="{{ 'mm.core.delete' | translate }}">
         <i class="icon ion-trash-a"></i>
     </button>
 </a>

From eb530cccadbcdb34cc3916064150640603d6248f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Apr 2017 15:09:02 +0200
Subject: [PATCH 098/218] MOBILE-2049 formattext: Support atto classes for
 images

---
 gulpfile.js                       |   1 +
 www/core/directives/formattext.js |   5 +
 www/core/scss/atto.scss           |  70 ++++++++
 www/core/scss/formattext.scss     | 130 ++++++++++++++
 www/core/scss/styles.scss         | 285 ------------------------------
 www/core/scss/textarea.scss       | 165 +++++++++++++++++
 6 files changed, 371 insertions(+), 285 deletions(-)
 create mode 100644 www/core/scss/atto.scss
 create mode 100644 www/core/scss/formattext.scss
 create mode 100644 www/core/scss/textarea.scss

diff --git a/gulpfile.js b/gulpfile.js
index a153416901d..717d913d651 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -335,6 +335,7 @@ var paths = {
   ],
   sass: {
     core: [
+      './www/core/scss/styles.scss',
       './www/core/scss/*.scss',
       './www/core/components/**/scss/*.scss',
       './www/addons/**/scss/*.scss',
diff --git a/www/core/directives/formattext.js b/www/core/directives/formattext.js
index be2b1b3a19a..451f54ff777 100644
--- a/www/core/directives/formattext.js
+++ b/www/core/directives/formattext.js
@@ -257,6 +257,11 @@ angular.module('mm.core')
                             jqImg = angular.element(img);
 
                         container.css('float', img.style.float); // Copy the float to corretly position the search icon.
+                        if (jqImg.hasClass('atto_image_button_right')) {
+                            container.addClass('atto_image_button_right');
+                        } else if (jqImg.hasClass('atto_image_button_left')) {
+                            container.addClass('atto_image_button_left');
+                        }
                         jqImg.wrap(container);
 
                         if (imgWidth > elWidth) {
diff --git a/www/core/scss/atto.scss b/www/core/scss/atto.scss
new file mode 100644
index 00000000000..a913c735951
--- /dev/null
+++ b/www/core/scss/atto.scss
@@ -0,0 +1,70 @@
+.atto_image_preview {
+    width: 100%;
+    height: 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.atto_image_preview_box {
+    max-height: 200px;
+    margin-bottom: 1em;
+    overflow: auto;
+}
+
+.editor_atto_content img {
+    cursor: pointer;
+}
+
+.atto_image_size {
+    display: inline-block;
+}
+
+.atto_image_size input[type=checkbox] {
+    margin-left: 1em;
+    margin-right: 1em;
+}
+
+.atto_image_size input[type=text] {
+    width: 3em;
+}
+
+.atto_image_size label {
+    display: inline-block;
+}
+
+.atto_image_button_text-top {
+    vertical-align: text-top;
+    margin: 0 0.5em;
+}
+
+.atto_image_button_middle {
+    vertical-align: middle;
+    margin: 0 0.5em;
+}
+
+.atto_image_button_text-bottom {
+    vertical-align: text-bottom;
+    margin: 0 0.5em;
+}
+
+.atto_image_button_text-top.img-responsive,
+.atto_image_button_middle.img-responsive,
+.atto_image_button_text-bottom.img-responsive {
+    /* If the image is display: block then linking the image to URLs won't work. */
+    display: inline-block;
+    max-width: calc(100% - 1em);
+}
+
+/*rtl:begin:ignore*/
+.atto_image_button_left {
+    float: left;
+    margin: 0 0.5em 0 0;
+    max-width: calc(100% - 1em);
+}
+
+.atto_image_button_right {
+    float: right;
+    margin: 0 0 0 0.5em;
+    max-width: calc(100% - 1em);
+}
+/*rtl:end:ignore*/
\ No newline at end of file
diff --git a/www/core/scss/formattext.scss b/www/core/scss/formattext.scss
new file mode 100644
index 00000000000..42098cd9d98
--- /dev/null
+++ b/www/core/scss/formattext.scss
@@ -0,0 +1,130 @@
+/**
+ * In this file we will reset ionic styles that can bother online html.
+ */
+
+/** Format Text */
+mm-format-text[max-height], *[mm-format-text][max-height] {
+  display: block;
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+
+  /* Force display inline */
+  &.inline {
+    display: inline-block;
+    width: auto;
+  }
+
+  // This is to allow clicks in radio/checkbox content.
+  &.mm-text-formatted {
+    cursor: pointer;
+
+    .mm-show-more {
+      display: none;
+    }
+
+    &:not(.mm-shortened) {
+      max-height: none !important;
+    }
+
+    &.mm-shortened {
+      color: #777;
+      overflow: hidden;
+      min-height: 50px;
+
+      .mm-show-more {
+        color: $dark;
+        text-align: right;
+        font-size: 14px;
+        display: block;
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        z-index: 1001;
+        background-color: white;
+        padding-left: 10px;
+
+        &:after {
+          @extend .ion;
+          content: $ionicon-var-chevron-down;
+          margin-left: 10px;
+          color: $item-icon-accessory-color;
+        }
+      }
+
+      &.mm-expand-in-fullview .mm-show-more:after {
+        content: $ionicon-var-chevron-right;
+      }
+
+      &:before {
+        content: '';
+        height: 100%;
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: -moz-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
+        background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba(255, 255, 255, 0)), color-stop(calc(100% - 15px), white));
+        background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
+        background: -o-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
+        background: -ms-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
+        background: linear-gradient(to bottom, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
+        z-index: 1000;
+      }
+    }
+  }
+}
+
+.item.active,
+.item.activated,
+.item-complex.active .item-content,
+.item-complex.activated .item-content,
+.item .item-content.active,
+.item .item-content.activated {
+
+  mm-format-text[max-height], *[mm-format-text][max-height] {
+    // This is to allow clicking on activated areas and have background the same color.
+    &.mm-text-formatted.mm-shortened {
+      .mm-show-more {
+        background-color: $item-default-active-bg;
+      }
+
+      &:before {
+        background: -moz-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
+        background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba($item-default-active-bg, 0)), color-stop(calc(100% - 15px), $item-default-active-bg));
+        background: -webkit-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
+        background: -o-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
+        background: -ms-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
+        background: linear-gradient(to bottom, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
+      }
+    }
+  }
+}
+
+mm-format-text, *[mm-format-text] {
+  audio, video, a, iframe {
+    pointer-events: auto;
+  }
+
+  // Fix lists styles in mm-format-text.
+  ul, ol {
+    -webkit-padding-start: 40px;
+  }
+  ul {
+    list-style: disc;
+  }
+  ol {
+    list-style: decimal;
+  }
+
+  .badge {
+    position: initial !important;
+  }
+}
+
+// Message item.
+.item-message {
+  mm-format-text > p:only-child {
+    display: inline;
+  }
+}
\ No newline at end of file
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 7bd7d671354..2ea6ef70ec9 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -56,9 +56,6 @@ $mm-input-required-asterisk-color: $red !default;
 // Item padding.
 $item-input-padding: 16px !default;
 
-// Rich text editor.
-$mm-rte-min-height: 80px !default;
-
 /**
  * App Branding
  */
@@ -206,10 +203,6 @@ p.item-text-wrap {
     font-size: $item-message-note-font-size;
     margin-left: 20px;
   }
-
-  mm-format-text > p:only-child {
-    display: inline;
-  }
 }
 
 // Defines when an item-message is the user's.
@@ -1127,168 +1120,6 @@ input[type="radio"].mm-radio {
     display: none !important;
   }
 }
-/**
- * RichTextEditor.
- */
-
-.mm-textarea {
-  width: 100%;
-  resize: none;
-
-  &[mm-auto-rows] {
-    height: auto;
-    line-height: 18px;
-    padding: 5px;
-  }
-  &:not([mm-auto-rows]) {
-    height: 200px;
-    min-height: $mm-rte-min-height;
-  }
-}
-
-.item-input-wrapper .mm-textarea {
-  background: transparent;
-}
-
-.item.mm-item-has-rich-text-editor {
-  &.item-input {
-    padding: 0;
-  }
-  padding: 0;
-  display: block;
-
-  .input-label, .mm-textarea {
-    padding-left: $item-padding;
-    padding-top: $item-padding/2;
-  }
-}
-
-.mm-rich-text-editor-container {
-
-  .cke.cke_chrome {
-    border: 0;
-    box-shadow: none;
-  }
-
-  .cke_bottom.cke_expanded {
-    height: auto;
-  }
-
-  .cke_bottom .cke_path {
-    display: none;
-    float: none;
-    margin: 0;
-  }
-
-  .cke_bottom.cke_expanded .cke_path {
-    display: block;
-  }
-
-  textarea.cke_source {
-    padding: 20px;
-    box-sizing: border-box;
-  }
-
-  .cke_contents {
-    min-height: $mm-rte-min-height;
-  }
-}
-
-.mm-rich-text-editor-container,
-.cke_inner.cke_maximized {
-
-  .cke_bottom {
-    padding: 0;
-    border-color: #ddd;
-    box-shadow: none;
-    background: #F2F2F2;
-    height: 30px;
-  }
-
-  .cke_button:first-child, .cke_button:last-child {
-    border-radius: 0;
-  }
-
-  .cke_button,
-  a.cke_combo_button,
-  .cke_toolbox_collapser {
-    background: white;
-    background-image: none;
-    box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-    padding: 5px 8px;
-    border-radius: 0;
-    border: 0;
-    margin: 1px;
-  }
-
-  a.cke_combo_button {
-    min-height: 26px;
-    padding: 1px;
-  }
-
-  .cke_button:hover,
-  a.cke_combo_button:hover,
-  .cke_combo_off a.cke_combo_button:hover,
-  .cke_toolbox_collapser:hover {
-    background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);
-    background-color: #ebebeb;
-  }
-
-  .cke_button:active,
-  a.cke_combo_button:active,
-  .cke_toolbox_collapser:active {
-    background-image: radial-gradient(ellipse at center, #ffffff 50%, #dfdfdf 100%);
-    background-color: #ebebeb;
-    border: 0;
-  }
-
-  .cke_toolgroup {
-    margin: 0;
-    border: 0;
-    background: none;
-    background-image: none;
-    border-radius: 0;
-    box-shadow: none;
-  }
-
-  .cke_toolbar_separator,
-  .cke_toolbar_break {
-    clear: none;
-    display: none;
-  }
-
-  .cke_toolbox_collapser {
-    padding-top: 9px;
-    padding-bottom: 8px;
-    position: absolute;
-    top: 0;
-    right: 0;
-  }
-
-  .cke_toolbox_main {
-    margin-right: 30px;
-    float: left;
-    display: block !important;
-  }
-
-  .cke_button__source_label {
-    display: none;
-  }
-}
-
-.cke_inner.cke_maximized {
-  .cke_bottom {
-    height: auto;
-  }
-
-  .cke_toolbox_collapser {
-    display: none;
-  }
-
-  .cke_toolbox_main {
-    margin: 0;
-  }
-}
 
 // Disable input copy to prevent errors in iOS.
 
@@ -1544,122 +1375,6 @@ i, cite, em, var, address, dfn {
   }
 }
 
-/** Format Text */
-mm-format-text, *[mm-format-text] {
-  audio, video, a, iframe {
-    pointer-events: auto;
-  }
-
-  // Fix lists styles in mm-format-text.
-  ul, ol {
-    -webkit-padding-start: 40px;
-  }
-  ul {
-    list-style: disc;
-  }
-  ol {
-    list-style: decimal;
-  }
-}
-
-mm-format-text[max-height], *[mm-format-text][max-height] {
-  display: block;
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-
-  /* Force display inline */
-  &.inline {
-    display: inline-block;
-    width: auto;
-  }
-
-  // This is to allow clicks in radio/checkbox content.
-  &.mm-text-formatted {
-    cursor: pointer;
-
-    .mm-show-more {
-      display: none;
-    }
-
-    &:not(.mm-shortened) {
-      max-height: none !important;
-    }
-
-    &.mm-shortened {
-      color: #777;
-      overflow: hidden;
-      min-height: 50px;
-
-      .mm-show-more {
-        color: $dark;
-        text-align: right;
-        font-size: 14px;
-        display: block;
-        position: absolute;
-        bottom: 0;
-        right: 0;
-        z-index: 1001;
-        background-color: white;
-        padding-left: 10px;
-
-        &:after {
-          @extend .ion;
-          content: $ionicon-var-chevron-down;
-          margin-left: 10px;
-          color: $item-icon-accessory-color;
-        }
-      }
-
-      &.mm-expand-in-fullview .mm-show-more:after {
-        content: $ionicon-var-chevron-right;
-      }
-
-      &:before {
-        content: '';
-        height: 100%;
-        position: absolute;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background: -moz-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
-        background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba(255, 255, 255, 0)), color-stop(calc(100% - 15px), white));
-        background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
-        background: -o-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
-        background: -ms-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
-        background: linear-gradient(to bottom, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
-        z-index: 1000;
-      }
-    }
-  }
-}
-
-.item.active,
-.item.activated,
-.item-complex.active .item-content,
-.item-complex.activated .item-content,
-.item .item-content.active,
-.item .item-content.activated {
-
-  mm-format-text[max-height], *[mm-format-text][max-height] {
-    // This is to allow clicking on activated areas and have background the same color.
-    &.mm-text-formatted.mm-shortened {
-      .mm-show-more {
-        background-color: $item-default-active-bg;
-      }
-
-      &:before {
-        background: -moz-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
-        background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba($item-default-active-bg, 0)), color-stop(calc(100% - 15px), $item-default-active-bg));
-        background: -webkit-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
-        background: -o-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
-        background: -ms-linear-gradient(top, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
-        background: linear-gradient(to bottom, rgba($item-default-active-bg, 0) calc(100% - 50px), $item-default-active-bg calc(100% - 15px));
-      }
-    }
-  }
-}
-
 // Position modals over action sheet. This means that modals will ALWAYS be over action sheet (in Ionic it's the opposite).
 .action-sheet-open .modal-backdrop.active {
   z-index: 20;
diff --git a/www/core/scss/textarea.scss b/www/core/scss/textarea.scss
new file mode 100644
index 00000000000..e33c523dca8
--- /dev/null
+++ b/www/core/scss/textarea.scss
@@ -0,0 +1,165 @@
+/**
+ * Textarea related css.
+ */
+
+// Rich text editor.
+$mm-rte-min-height: 80px !default;
+
+.mm-textarea {
+  width: 100%;
+  resize: none;
+
+  &[mm-auto-rows] {
+    height: auto;
+    line-height: 18px;
+    padding: 5px;
+  }
+  &:not([mm-auto-rows]) {
+    height: 200px;
+    min-height: $mm-rte-min-height;
+  }
+}
+
+.item-input-wrapper .mm-textarea {
+  background: transparent;
+}
+
+.item.mm-item-has-rich-text-editor {
+  &.item-input {
+    padding: 0;
+  }
+  padding: 0;
+  display: block;
+
+  .input-label, .mm-textarea {
+    padding-left: $item-padding;
+    padding-top: $item-padding/2;
+  }
+}
+
+.mm-rich-text-editor-container {
+
+  .cke.cke_chrome {
+    border: 0;
+    box-shadow: none;
+  }
+
+  .cke_bottom.cke_expanded {
+    height: auto;
+  }
+
+  .cke_bottom .cke_path {
+    display: none;
+    float: none;
+    margin: 0;
+  }
+
+  .cke_bottom.cke_expanded .cke_path {
+    display: block;
+  }
+
+  textarea.cke_source {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+
+  .cke_contents {
+    min-height: $mm-rte-min-height;
+  }
+}
+
+.mm-rich-text-editor-container,
+.cke_inner.cke_maximized {
+
+  .cke_bottom {
+    padding: 0;
+    border-color: #ddd;
+    box-shadow: none;
+    background: #F2F2F2;
+    height: 30px;
+  }
+
+  .cke_button:first-child, .cke_button:last-child {
+    border-radius: 0;
+  }
+
+  .cke_button,
+  a.cke_combo_button,
+  .cke_toolbox_collapser {
+    background: white;
+    background-image: none;
+    box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+    padding: 5px 8px;
+    border-radius: 0;
+    border: 0;
+    margin: 1px;
+  }
+
+  a.cke_combo_button {
+    min-height: 26px;
+    padding: 1px;
+  }
+
+  .cke_button:hover,
+  a.cke_combo_button:hover,
+  .cke_combo_off a.cke_combo_button:hover,
+  .cke_toolbox_collapser:hover {
+    background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);
+    background-color: #ebebeb;
+  }
+
+  .cke_button:active,
+  a.cke_combo_button:active,
+  .cke_toolbox_collapser:active {
+    background-image: radial-gradient(ellipse at center, #ffffff 50%, #dfdfdf 100%);
+    background-color: #ebebeb;
+    border: 0;
+  }
+
+  .cke_toolgroup {
+    margin: 0;
+    border: 0;
+    background: none;
+    background-image: none;
+    border-radius: 0;
+    box-shadow: none;
+  }
+
+  .cke_toolbar_separator,
+  .cke_toolbar_break {
+    clear: none;
+    display: none;
+  }
+
+  .cke_toolbox_collapser {
+    padding-top: 9px;
+    padding-bottom: 8px;
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+
+  .cke_toolbox_main {
+    margin-right: 30px;
+    float: left;
+    display: block !important;
+  }
+
+  .cke_button__source_label {
+    display: none;
+  }
+}
+
+.cke_inner.cke_maximized {
+  .cke_bottom {
+    height: auto;
+  }
+
+  .cke_toolbox_collapser {
+    display: none;
+  }
+
+  .cke_toolbox_main {
+    margin: 0;
+  }
+}
\ No newline at end of file

From 593578aba6469d75569b38cc91a75aaf83214470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 28 Apr 2017 16:54:05 +0200
Subject: [PATCH 099/218] MOBILE-2055 formattext: Inherit font color property

---
 www/core/scss/formattext.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/www/core/scss/formattext.scss b/www/core/scss/formattext.scss
index 42098cd9d98..a3cc5f14ddb 100644
--- a/www/core/scss/formattext.scss
+++ b/www/core/scss/formattext.scss
@@ -127,4 +127,11 @@ mm-format-text, *[mm-format-text] {
   mm-format-text > p:only-child {
     display: inline;
   }
-}
\ No newline at end of file
+}
+
+.item mm-format-text,
+.item *[mm-format-text] {
+  p {
+    color: inherit;
+  }
+}

From c688a0fc2297510c976df3efc1d87e71d27a543a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sun, 30 Apr 2017 11:11:29 +0200
Subject: [PATCH 100/218] MOBILE-2099 quiz: Add Next/Previous buttons on quiz
 player

---
 www/addons/mod/quiz/templates/player.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/addons/mod/quiz/templates/player.html b/www/addons/mod/quiz/templates/player.html
index d3f90e99b5b..97b8ceb3dc2 100644
--- a/www/addons/mod/quiz/templates/player.html
+++ b/www/addons/mod/quiz/templates/player.html
@@ -40,6 +40,14 @@ <h2 ng-if="!question.number" class="inline">{{ 'mm.question.information' | tran
                     </section>
                 </div>
             </form>
+            <div ng-if="dataLoaded && questions.length && !quizAborted && !showSummary" class="item item-text-wrap row-buttons responsive-sm">
+                <button ng-if="previousPage >= 0" class="button button-block icon-left ion-chevron-left" ng-click="loadPage(previousPage)">
+                    {{ 'mm.core.previous' | translate }}
+                </button>
+                <button ng-if="nextPage >= -1" class="button button-block button-positive icon-right ion-chevron-right" ng-click="loadPage(nextPage)">
+                    {{ 'mm.core.next' | translate }}
+                </button>
+            </div>
             <!-- Summary -->
             <div ng-if="!quizAborted && showSummary && summaryQuestions && summaryQuestions.length" class="card mma-mod-quiz-table">
                 <div class="item item-divider">

From 8f89a55d06d401c83e9b1fde2fe2b1c2b2b8b103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sun, 30 Apr 2017 11:10:46 +0200
Subject: [PATCH 101/218] MOBILE-2099 quiz: Improve styles using default color
 palette

---
 scss/app.scss                                 | 22 +++++++++--
 www/addons/mod/quiz/controllers/index.js      |  5 +--
 www/addons/mod/quiz/scss/styles.scss          | 17 +++++----
 www/addons/mod/quiz/templates/arrows.html     |  2 +-
 www/addons/mod/quiz/templates/attempt.html    |  2 +-
 www/addons/mod/quiz/templates/index.html      | 22 +++++------
 www/addons/mod/quiz/templates/player.html     | 20 +++++-----
 www/addons/mod/quiz/templates/toc.html        |  2 +-
 www/addons/qtype/ddimageortext/render.js      |  2 +-
 .../qtype/ddimageortext/scss/styles.scss      | 10 ++---
 www/addons/qtype/ddmarker/scss/styles.scss    | 14 +++----
 www/addons/qtype/ddwtos/render.js             |  2 +-
 www/addons/qtype/ddwtos/scss/styles.scss      | 18 +++++----
 www/addons/qtype/essay/template.html          |  4 +-
 www/core/components/question/scss/styles.scss | 37 +++++++++++--------
 15 files changed, 102 insertions(+), 77 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index eb868d1cf56..f9d67c39acb 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -12,26 +12,40 @@ $gray-light:      #eeeeee; // Background.
 $white:           #ffffff; // Background, reversed text.
 
 $blue:            #0064d2; // Link, background.
-$blue-light:      #eaf4ff; // Background.
+$blue-light:      lighten($blue, 10%);
 $blue-dark:       darken($blue, 10%);
+$blue-lighter:    #eaf4ff; // Background.
+$blue-darker:     mix($blue, black, 20%);
 
-$turquoise:       #007982; // Accent.
-$turquoise-light: #edfafb; // Background.
-$turquoise-dark:  darken($turquoise, 10%);
+$turquoise:           #007982; // Accent.
+$turquoise-light:     #edfafb; // Background.
+$turquoise-dark:      darken($turquoise, 10%);
+$turquoise-lighter:   mix($turquoise, white, 20%);
+$turquoise-darker:    mix($turquoise, black, 20%);
 
 $green:           #739500; // Accent.
 $green-light:     lighten($green, 10%);
 $green-dark:      darken($green, 10%);
+$green-lighter:   mix($green, white, 20%);
+$green-darker:    mix($green, black, 20%);
 
 $red:             #a22b38;
 $red-light:       lighten($red, 10%);
 $red-dark:        darken($red, 10%);
+$red-lighter:     mix($red, white, 20%);
+$red-darker:      mix($red, black, 20%);
 
 $orange:          #e07627; // Accent (never text).
 $orange-light:    lighten($orange, 10%);
 $orange-dark:     darken($orange, 10%);
+$orange-lighter:  mix($orange, white, 20%);
+$orange-darker:   mix($orange, black, 20%);
 
 $yellow:          #fbad1a; // Accent (never text).
+$yellow-light:    lighten($yellow, 10%);
+$yellow-dark:     darken($yellow, 10%);
+$yellow-lighter:  mix($yellow, white, 20%);
+$yellow-darker:   mix($yellow, black, 40%);
 
 // Change Ionic default colors.
 $dark: $black !default;
diff --git a/www/addons/mod/quiz/controllers/index.js b/www/addons/mod/quiz/controllers/index.js
index b8a6dfda97e..5f59ecf133b 100644
--- a/www/addons/mod/quiz/controllers/index.js
+++ b/www/addons/mod/quiz/controllers/index.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_quiz')
  * @ngdoc controller
  * @name mmaModQuizIndexCtrl
  */
-.controller('mmaModQuizIndexCtrl', function($scope, $stateParams, $mmaModQuiz, $mmCourse, $ionicPlatform, $q, $translate,
+.controller('mmaModQuizIndexCtrl', function($scope, $stateParams, $mmaModQuiz, $mmCourse, $q, $translate,
             $mmaModQuizHelper, $ionicHistory, $ionicScrollDelegate, $mmEvents, mmaModQuizEventAttemptFinished, $state,
             $mmQuestionBehaviourDelegate, $mmaModQuizSync, $mmText, $mmUtil, $mmCourseHelper, mmaModQuizEventAutomSynced, $mmSite,
             $mmCoursePrefetchDelegate, mmCoreDownloaded, mmCoreDownloading, mmCoreEventPackageStatusChanged,
@@ -46,7 +46,6 @@ angular.module('mm.addons.mod_quiz')
     $scope.description = module.description;
     $scope.moduleUrl = module.url;
     $scope.moduleName = $mmCourse.translateModuleName('quiz');
-    $scope.isTablet = $ionicPlatform.isTablet();
     $scope.courseId = courseId;
     $scope.refreshIcon = 'spinner';
     $scope.syncIcon = 'spinner';
@@ -477,7 +476,7 @@ angular.module('mm.addons.mod_quiz')
     $scope.prefetch = function() {
         $mmCourseHelper.contextMenuPrefetch($scope, module, courseId);
     };
-    
+
     // Context Menu Description action.
     $scope.expandDescription = function() {
         $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModQuizComponent, module.id);
diff --git a/www/addons/mod/quiz/scss/styles.scss b/www/addons/mod/quiz/scss/styles.scss
index dcd40cda431..792acc0bdee 100644
--- a/www/addons/mod/quiz/scss/styles.scss
+++ b/www/addons/mod/quiz/scss/styles.scss
@@ -1,9 +1,9 @@
 
-$mma-mod-quiz-warning-color:      #c00 !default;
-$mma-mod-quiz-highlight-color:    #d9edf7 !default;
+$mma-mod-quiz-warning-color:      $red !default;
+$mma-mod-quiz-highlight-color:    $blue-lighter !default;
 $mma-mod-quiz-alternate-color:    #fbfbfb !default;
-$mma-mod-quiz-conecterr-color:    #fcc !default;
-$mma-mod-quiz-selected-color:     #666 !default;
+$mma-mod-quiz-conecterr-color:    $red-lighter !default;
+$mma-mod-quiz-selected-color:     $blue-lighter !default;
 
 // Deprecated use mm-error-item instead.
 p.mma-mod-quiz-warning {
@@ -67,8 +67,9 @@ p.mma-mod-quiz-warning {
 .platform-android .item.mma-mod-quiz-selected,
 .platform-ios .item.mma-mod-quiz-selected,
 .mma-mod-quiz-table .item.row.mma-mod-quiz-selected {
-  border: 3px solid $mma-mod-quiz-selected-color;
-  &:not(.mma-mod-quiz-last-of-page) {
-    border-bottom: 0;
-  }
+  background: $mma-mod-quiz-selected-color;
 }
+
+#mma-mod-quiz-toc .item {
+  border-color: $gray-medium;
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/templates/arrows.html b/www/addons/mod/quiz/templates/arrows.html
index ba1c2dee841..9a021d959b9 100644
--- a/www/addons/mod/quiz/templates/arrows.html
+++ b/www/addons/mod/quiz/templates/arrows.html
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row" ng-if="previous >= 0 || next >= -1">
     <div class="col">
         <a class="button button-icon icon ion-arrow-left-b" ng-if="previous >= 0" ng-click="action(previous)" title="{{ 'mm.core.previous' | translate }}"></a>
     </div>
diff --git a/www/addons/mod/quiz/templates/attempt.html b/www/addons/mod/quiz/templates/attempt.html
index 5ccaddcda35..2a1ff67af94 100644
--- a/www/addons/mod/quiz/templates/attempt.html
+++ b/www/addons/mod/quiz/templates/attempt.html
@@ -26,7 +26,7 @@
                     <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ attempt.feedback }}</mm-format-text></p>
                 </div>
                 <div class="item" ng-if="quiz.showReviewColumn && attempt.finished">
-                    <button class="button button-block" ui-sref="site.mod_quiz-review({courseid: courseId, quizid: quiz.id, attemptid: attempt.id})">{{ 'mma.mod_quiz.review' | translate }}</button>
+                    <button class="button button-block icon-left ion-search" ui-sref="site.mod_quiz-review({courseid: courseId, quizid: quiz.id, attemptid: attempt.id})">{{ 'mma.mod_quiz.review' | translate }}</button>
                 </div>
                 <div class="item item-text-wrap mm-error-item" ng-if="!quiz.showReviewColumn">
                     <p>{{ 'mma.mod_quiz.noreviewattempt' | translate }}</p>
diff --git a/www/addons/mod/quiz/templates/index.html b/www/addons/mod/quiz/templates/index.html
index 556947ba1e0..23bad655f3d 100644
--- a/www/addons/mod/quiz/templates/index.html
+++ b/www/addons/mod/quiz/templates/index.html
@@ -35,25 +35,25 @@
                 <div class="item item-divider">
                     <h2>{{ 'mma.mod_quiz.summaryofattempts' | translate }}</h2>
                 </div>
-                <div class="item item-text-wrap row">
-                    <p class="col text-center" ng-if="quiz.showAttemptColumn"><b>{{ 'mma.mod_quiz.attemptnumber' | translate }}</b></p>
-                    <p class="col col-50"><b>{{ 'mma.mod_quiz.attemptstate' | translate }}</b></p>
-                    <p class="col text-center" ng-if="isTablet && quiz.showMarkColumn"><b>{{ 'mma.mod_quiz.marks' | translate }} / {{ quiz.sumGradesFormatted }}</b></p>
+                <div class="item item-text-wrap row row-center">
+                    <p class="col text-center col-10" ng-if="quiz.showAttemptColumn"><b>{{ 'mma.mod_quiz.attemptnumber' | translate }}</b></p>
+                    <p class="col"><b>{{ 'mma.mod_quiz.attemptstate' | translate }}</b></p>
+                    <p class="col text-center hidden-phone" ng-if="quiz.showMarkColumn"><b>{{ 'mma.mod_quiz.marks' | translate }} / {{ quiz.sumGradesFormatted }}</b></p>
                     <p class="col text-center" ng-if="quiz.showGradeColumn"><b>{{ 'mma.mod_quiz.grade' | translate }} / {{ quiz.gradeFormatted }}</b></p>
                     <p class="col col-10"></p>
                 </div>
-                <div class="item item-text-wrap row" ng-repeat="attempt in attempts" ng-class='{"mma-mod-quiz-highlighted": attempt.highlightGrade}'>
-                    <p class="col text-center" ng-if="quiz.showAttemptColumn && attempt.preview">{{ 'mma.mod_quiz.preview' | translate }}</p>
-                    <p class="col text-center" ng-if="quiz.showAttemptColumn && !attempt.preview">{{ attempt.attempt }}</p>
-                    <div class="col col-50">
+                <a class="item item-text-wrap row row-center" ng-repeat="attempt in attempts" ng-class='{"mma-mod-quiz-highlighted": attempt.highlightGrade}' ui-sref="site.mod_quiz-attempt({courseid: courseId, quizid: quiz.id, attemptid: attempt.id})" aria-label="{{ 'mm.core.seemoredetail' | translate }}">
+                    <p class="col text-center col-10" ng-if="quiz.showAttemptColumn && attempt.preview">{{ 'mma.mod_quiz.preview' | translate }}</p>
+                    <p class="col text-center col-10" ng-if="quiz.showAttemptColumn && !attempt.preview">{{ attempt.attempt }}</p>
+                    <div class="col">
                         <p ng-repeat="sentence in attempt.readableState">{{ sentence }}</p>
                     </div>
-                    <p class="col text-center" ng-if="isTablet && quiz.showMarkColumn">{{ attempt.readableMark }}</p>
+                    <p class="col text-center hidden-phone" ng-if="quiz.showMarkColumn">{{ attempt.readableMark }}</p>
                     <p class="col text-center" ng-if="quiz.showGradeColumn">{{ attempt.readableGrade }}</p>
                     <p class="col col-10 text-center">
-                        <a class="button button-block button-icon ion-chevron-right icon-accessory" ui-sref="site.mod_quiz-attempt({courseid: courseId, quizid: quiz.id, attemptid: attempt.id})" aria-label="{{ 'mm.core.seemoredetail' | translate }}"></a>
+                        <i class="icon ion-chevron-right icon-accessory"></i>
                     </p>
-                </div>
+                </a>
             </div>
 
             <!-- Result info -->
diff --git a/www/addons/mod/quiz/templates/player.html b/www/addons/mod/quiz/templates/player.html
index 97b8ceb3dc2..3602efdd5c4 100644
--- a/www/addons/mod/quiz/templates/player.html
+++ b/www/addons/mod/quiz/templates/player.html
@@ -7,7 +7,7 @@
     </ion-nav-buttons>
     <!-- Navigation arrows -->
     <ion-header-bar class="bar-subheader mma-mod-quiz-subheader" ng-if="dataLoaded && questions.length && !quizAborted && !showSummary">
-        <div class="row">
+        <div class="row row-center">
             <div class="col col-20">
                 <a class="button button-icon icon ion-arrow-left-b" ng-if="previousPage >= 0" ng-click="loadPage(previousPage)" title="{{ 'mm.core.previous' | translate }}"></a>
             </div>
@@ -53,18 +53,18 @@ <h2 ng-if="!question.number" class="inline">{{ 'mm.question.information' | tran
                 <div class="item item-divider">
                     <h2>{{ 'mma.mod_quiz.summaryofattempt' | translate }}</h2>
                 </div>
-                <div class="item item-text-wrap row">
-                    <p class="col col-25 text-center"><b>{{ 'mma.mod_quiz.question' | translate }}</b></p>
-                    <p class="col col-65 text-center"><b>{{ 'mma.mod_quiz.status' | translate }}</b></p>
+                <div class="item item-text-wrap row row-center">
+                    <p class="col col-20 text-center"><b>{{ 'mma.mod_quiz.question' | translate }}</b></p>
+                    <p class="col col-60"><b>{{ 'mma.mod_quiz.status' | translate }}</b></p>
                     <p class="col col-10 text-center" ng-if="!quiz.isSequential && canReturn"></p>
                 </div>
-                <div ng-repeat="question in summaryQuestions" class="item item-text-wrap row" ng-if="question.number">
-                    <p class="col col-25 text-center">{{ question.number }}</p>
-                    <p class="col col-65 text-center">{{ question.status }}</p>
+                <a ng-repeat="question in summaryQuestions" class="item item-text-wrap row row-center" ng-click="loadPage(question.page, false, question.slot)" ng-if="question.number" aria-label="{{ 'mm.question.questionno' | translate:{$a: question.number} }}">
+                    <p class="col col-20 text-center">{{ question.number }}</p>
+                    <p class="col col-60">{{ question.status }}</p>
                     <p class="col col-10 text-center" ng-if="!quiz.isSequential && canReturn">
-                        <a class="button button-block button-icon ion-ios-arrow-forward" ng-click="loadPage(question.page, false, question.slot)" aria-label="{{ 'mm.question.questionno' | translate:{$a: question.number} }}"></a>
+                        <i class="icon ion-chevron-right icon-accessory"></i>
                     </p>
-                </div>
+                </a>
                 <div class="item" ng-if="canReturn">
                     <a class="button button-block" ng-click="loadPage(attempt.currentpage)">{{ 'mma.mod_quiz.returnattempt' | translate }}</a>
                 </div>
@@ -78,7 +78,7 @@ <h2>{{ 'mma.mod_quiz.summaryofattempt' | translate }}</h2>
                     <a class="button button-block icon-right ion-share" ng-href="{{moduleUrl}}" mm-link>{{ 'mm.core.openinbrowser' | translate }}</a>
                 </div>
                 <div class="item" ng-if="!attempt.finishedOffline && !preventSubmitMessages.length">
-                    <a class="button button-block" ng-click="finishAttempt()">{{ 'mma.mod_quiz.submitallandfinish' | translate }}</a>
+                    <a class="button button-block button-positive" ng-click="finishAttempt()">{{ 'mma.mod_quiz.submitallandfinish' | translate }}</a>
                 </div>
             </div>
             <!-- Quiz aborted -->
diff --git a/www/addons/mod/quiz/templates/toc.html b/www/addons/mod/quiz/templates/toc.html
index 9ab5f647207..eba77392613 100644
--- a/www/addons/mod/quiz/templates/toc.html
+++ b/www/addons/mod/quiz/templates/toc.html
@@ -10,7 +10,7 @@
                 <span ng-if="!rsmScope.showAll">{{ 'mma.mod_quiz.showall' | translate }}</span>
                 <span ng-if="rsmScope.showAll">{{ 'mma.mod_quiz.showeachpage' | translate }}</span>
             </a>
-            <a menu-close ng-repeat="question in rsmScope.toc" class="item item-text-wrap {{question.stateClass}}" ng-class='{"mma-mod-quiz-selected": !rsmScope.showSummary && rsmScope.attempt.currentpage == question.page, "mma-mod-quiz-last-of-page": $last || rsmScope.toc[$index + 1].page != question.page}' ng-click="rsmScope.loadPage(question.page, true, question.slot)">
+            <a menu-close ng-repeat="question in rsmScope.toc" class="item item-text-wrap {{question.stateClass}}" ng-class='{"mma-mod-quiz-selected": !rsmScope.showSummary && rsmScope.attempt.currentpage == question.page}' ng-click="rsmScope.loadPage(question.page, true, question.slot)">
                 <span ng-if="question.number">{{ 'mm.question.questionno' | translate:{$a: question.number} }}</span>
                 <span ng-if="!question.number">{{ 'mm.question.information' | translate }}</span>
             </a>
diff --git a/www/addons/qtype/ddimageortext/render.js b/www/addons/qtype/ddimageortext/render.js
index 8e0b884dcd8..903efe298b4 100644
--- a/www/addons/qtype/ddimageortext/render.js
+++ b/www/addons/qtype/ddimageortext/render.js
@@ -157,7 +157,7 @@ angular.module('mm.addons.qtype_ddimageortext')
                             }
                         }
                     }
-                    throw 'Prefix "' + prefix + '" not found in class names.';
+                    console.warn('Qtype ddimageortext: Prefix "' + prefix + '" not found in class names.');
                 },
                 clone_new_drag_item : function (draginstanceno, dragitemno) {
                     var drag, divdrag;
diff --git a/www/addons/qtype/ddimageortext/scss/styles.scss b/www/addons/qtype/ddimageortext/scss/styles.scss
index 1c377537b8b..8480a545dc0 100644
--- a/www/addons/qtype/ddimageortext/scss/styles.scss
+++ b/www/addons/qtype/ddimageortext/scss/styles.scss
@@ -11,7 +11,7 @@
   }
 
   div.droparea img {
-    border: 1px solid #000000;
+    border: 1px solid $gray-dark;
     max-width: 100%;
   }
 
@@ -25,7 +25,7 @@
   }
 
   div.draghome {
-    border: 1px solid black;
+    border: 1px solid $gray-dark;
     cursor: pointer;
     background-color: #B0C4DE;
     display:inline-block;
@@ -59,7 +59,7 @@
     background-color: #F0E68C;
   }
   .drag {
-    border: 1px solid black;
+    border: 1px solid $gray-dark;
     cursor: pointer;
     z-index: 2;
   }
@@ -87,7 +87,7 @@
     margin:0 auto;
   }
   .dropzone {
-    border: 1px solid black;
+    border: 1px solid $gray-dark;
     position: absolute;
     z-index: 1;
     cursor: pointer;
@@ -101,6 +101,6 @@
   }
   .drag.beingdragged {
     z-index: 3;
-    box-shadow: 3px 3px 4px #000;
+    box-shadow: 3px 3px 4px $gray-dark;
   }
 }
\ No newline at end of file
diff --git a/www/addons/qtype/ddmarker/scss/styles.scss b/www/addons/qtype/ddmarker/scss/styles.scss
index a2d55040c63..caa5bff960a 100644
--- a/www/addons/qtype/ddmarker/scss/styles.scss
+++ b/www/addons/qtype/ddmarker/scss/styles.scss
@@ -11,7 +11,7 @@
   }
 
   div.droparea img  {
-    border: 1px solid #000;
+    border: 1px solid $gray-dark;
     max-width: 100%;
   }
 
@@ -34,7 +34,7 @@
 
   .dragitem.beingdragged .markertext {
     z-index: 5;
-    box-shadow: 3px 3px 4px #000;
+    box-shadow: 3px 3px 4px $gray-dark;
   }
   .dragitems .draghome {
     margin: 10px;
@@ -65,7 +65,7 @@
     margin: 0 5px;
     z-index: 2;
     background-color: white;
-    border: 2px solid black;
+    border: 2px solid $gray-dark;
     padding: 5px;
     display: inline-block;
     zoom: 1;
@@ -73,17 +73,17 @@
   }
   div.markertexts span.markertext {
     z-index: 3;
-    background-color: yellow;
+    background-color: $yellow-lighter;
     border-style: solid;
     border-width: 2px;
-    border-color: khaki;
+    border-color: $yellow;
     position: absolute;
   }
   span.wrongpart {
-    background-color: yellow;
+    background-color: $yellow-lighter;
     border-style: solid;
     border-width: 2px;
-    border-color: khaki;
+    border-color: $yellow;
     padding: 5px;
     border-radius: 10px;
     filter: alpha(opacity=60);
diff --git a/www/addons/qtype/ddwtos/render.js b/www/addons/qtype/ddwtos/render.js
index 99eeec4b299..7afdfad8752 100644
--- a/www/addons/qtype/ddwtos/render.js
+++ b/www/addons/qtype/ddwtos/render.js
@@ -211,7 +211,7 @@ angular.module('mm.addons.qtype_ddwtos')
                     }
                 }
             }
-            throw 'Prefix "' + prefix + '" not found in class names.';
+            console.warn('Qtype ddwtos: Prefix "' + prefix + '" not found in class names.');
         };
 
         this.get_choice = function(node) {
diff --git a/www/addons/qtype/ddwtos/scss/styles.scss b/www/addons/qtype/ddwtos/scss/styles.scss
index 5f6f7987364..244152c659f 100644
--- a/www/addons/qtype/ddwtos/scss/styles.scss
+++ b/www/addons/qtype/ddwtos/scss/styles.scss
@@ -16,8 +16,9 @@
   .drop {
       display: inline-block;
       text-align: center;
-      border: 1px solid #000000;
+      border: 1px solid $gray-dark;
       margin-bottom: 2px;
+      border-radius: 5px;
   }
   .draghome, .drag {
       display: inline-block;
@@ -26,22 +27,24 @@
       border: 0;
   }
   .draghome, .drag.unplaced{
-      border: 1px solid #000000;
+      border: 1px solid $gray-dark;
+      border-radius: 5px;
   }
   .draghome {
       visibility: hidden;
   }
   .drag {
       z-index: 2;
+      border-radius: 5px;
   }
   .drag.selected {
       z-index: 3;
-      box-shadow: 3px 3px 4px #000;
+      box-shadow: 3px 3px 4px $gray-dark;
   }
 
   .drop.selected {
-      border-color: #0a0;
-      box-shadow: 0 0 5px 5px rgba(255, 255, 150, 1);
+      border-color: $yellow-lighter;
+      box-shadow: 0 0 5px 5px $yellow-lighter;
   }
 
   &.notreadonly .drag,
@@ -49,6 +52,7 @@
   &.notreadonly .drop,
   &.notreadonly .answercontainer {
       cursor: pointer;
+      border-radius: 5px;
   }
 
   &.readonly .drag,
@@ -59,10 +63,10 @@
   }
 
   span.incorrect {
-      background-color: #faa;
+      background-color: $red-lighter;
   }
   span.correct {
-      background-color: #afa;
+      background-color: $green-lighter;
   }
 
   .group1 {
diff --git a/www/addons/qtype/essay/template.html b/www/addons/qtype/essay/template.html
index 446d35a1c14..9aeedc96d6a 100644
--- a/www/addons/qtype/essay/template.html
+++ b/www/addons/qtype/essay/template.html
@@ -10,13 +10,13 @@
         <!-- Rich text editor. -->
         <mm-rich-text-editor ng-if="!isPlainText" model="textarea" placeholder="{{ 'mm.question.answer' | translate }}" name="{{textarea.name}}" scroll-handle="{{scrollHandle}}" component="{{component}}" component-id="{{componentId}}"></mm-rich-text-editor>
     </ion-input>
-    <div ng-if="textarea && hasDraftFiles" class="item item-text-wrap">
+    <div ng-if="textarea && hasDraftFiles" class="item item-text-wrap mm-error-item">
         <p class="mm-question-warning">{{ 'mm.question.errorinlinefilesnotsupported' | translate }}</p>
     </div>
     <div ng-if="textarea && hasDraftFiles" class="item item-text-wrap">
         <p><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{textarea.text}}</mm-format-text></p>
     </div>
-    <div class="item item-text-wrap" ng-if="allowsAttachments">
+    <div class="item item-text-wrap mm-error-item" ng-if="allowsAttachments">
         <p class="mm-question-warning">{{ 'mm.question.errorattachmentsnotsupported' | translate }}</p>
     </div>
     <div class="item item-text-wrap" ng-if="!textarea && (answer || (!attachments.length && !allowsAttachments))">
diff --git a/www/core/components/question/scss/styles.scss b/www/core/components/question/scss/styles.scss
index 07b31738a92..7f395dde56f 100644
--- a/www/core/components/question/scss/styles.scss
+++ b/www/core/components/question/scss/styles.scss
@@ -1,10 +1,16 @@
 
-$mm-question-correct-color:         #468847 !default;
-$mm-question-incorrect-color:       #b94a48 !default;
-$mm-question-state-correct-color:   #cfc !default;
-$mm-question-state-partial-color:   #ffa !default;
-$mm-question-state-incorrect-color: #fcc !default;
-$mm-question-warning-color:         #c00 !default;
+$mm-question-correct-color:         $green-dark !default;
+$mm-question-correct-color-bg:      $green-lighter !default;
+$mm-question-incorrect-color:       $red !default;
+$mm-question-incorrect-color-bg:    $red-lighter !default;
+$mm-question-feedback-color:        $yellow-darker !default;
+$mm-question-feedback-color-bg:     $yellow-lighter !default;
+
+$mm-question-state-correct-color:   $green-lighter !default;
+$mm-question-state-partial-color:   $yellow-lighter !default;
+$mm-question-state-incorrect-color: $red-lighter !default;
+
+$mm-question-warning-color:         $red !default;
 
 .mm-question-textarea {
   width: 100%;
@@ -29,7 +35,7 @@ li.mm-question-answer-correct,
 .mm-question-comment p {
   color: $mm-question-correct-color;
   -webkit-text-fill-color: $mm-question-correct-color; /* Override iOS / Android font color change */
-  background-color: #dff0d8;
+  background-color: $mm-question-correct-color-bg;
 }
 
 .mm-question-answer-correct .checkbox input:disabled:checked:before,
@@ -55,7 +61,7 @@ li.mm-question-answer-incorrect,
 .mm-question-incorrect p {
   color: $mm-question-incorrect-color;
   -webkit-text-fill-color: $mm-question-incorrect-color; /* Override iOS / Android font color change */
-  background-color: #f2dede;
+  background-color: $mm-question-incorrect-color-bg;
 }
 
 .mm-question-answer-incorrect .checkbox input:disabled:checked:before,
@@ -69,9 +75,10 @@ li.mm-question-answer-incorrect,
   opacity: 1;
 }
 
-.mm-question-feedback-container {
-  background-color: #fcf8e3;
-  color: #8a6d3b;
+.mm-question-feedback-container,
+.mm-question-feedback-container p {
+  background-color: $mm-question-feedback-color-bg;
+  color: $mm-question-feedback-color;
 
   .specificfeedback, .rightanswer, .im-feedback, .feedback, .generalfeedback {
     margin: 0 0 .5em;
@@ -82,17 +89,17 @@ li.mm-question-answer-incorrect,
     padding: 2px 4px;
     font-weight: bold;
     line-height: 14px;
-    color: #fff;
+    color: $white;
     text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
-    background-color: #999;
+    background-color: $gray-medium;
     -webkit-border-radius: 3px;
     border-radius: 3px;
 
     &.incorrect {
-      background-color: $mm-question-incorrect-color;
+      background-color: $red;
     }
     &.correct {
-      background-color: $mm-question-correct-color;
+      background-color: $green;
     }
   }
 }

From a0f238f8bdbdfbd9edc8df4a2af5d8d9317731e7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Apr 2017 14:54:18 +0200
Subject: [PATCH 102/218] MOBILE-2096 login: Simplify credentials screen

---
 .../login/templates/credentials.html          | 64 ++++++++-----------
 www/core/scss/styles.scss                     |  8 ++-
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 5c73e088397..d51079a247e 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -1,40 +1,32 @@
 <ion-view view-title="{{ 'mm.login.login' | translate }}">
-  <ion-content padding="true" mm-state-class>
-    <div class="card">
-        <div class="item item-text-wrap item-avatar-center">
-            <!-- Show site logo or a default image. -->
-            <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
-            <img ng-if="!logourl" ng-src="img/user-avatar.png" class="avatar" mm-external-content role="presentation">
+    <ion-content mm-state-class>
+        <div class="list">
+            <div class="item item-text-wrap item-avatar-center">
+                <!-- Show site logo or a default image. -->
+                <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
 
-            <p>{{ 'mm.login.credentialsdescription' | translate }}</p>
-            <!-- If no sitename show big siteurl. -->
-            <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
-            <!-- If sitename, show big sitename and small siteurl. -->
-            <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
-            <p ng-if="sitename">{{siteurl}}</p>
+                <!-- If no sitename show big siteurl. -->
+                <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
+                <!-- If sitename, show big sitename and small siteurl. -->
+                <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
+                <p ng-if="sitename">{{siteurl}}</p>
+            </div>
+            <form>
+                <ion-input class="item item-input" ng-if="siteChecked && !isBrowserSSO">
+                    <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
+                </ion-input>
+                <ion-input class="item item-input" ng-if="siteChecked && !isBrowserSSO">
+                    <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
+                </ion-input>
+                <div class="item padding">
+                    <button class="button button-block" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+                </div>
+            </form>
+            <div ng-if="canSignup" class="item item-text-wrap">
+                <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
+                <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
+                <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
+            </div>
         </div>
-    </div>
-    <div class="list list-inset">
-      <form>
-        <ion-input class="item item-input item-stacked-label" ng-if="siteChecked && !isBrowserSSO">
-          <ion-label>{{ 'mm.login.username' | translate }}</ion-label>
-          <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
-        </ion-input>
-        <ion-input class="item item-input item-stacked-label" ng-if="siteChecked && !isBrowserSSO">
-          <ion-label>{{ 'mm.login.password' | translate }}</ion-label>
-          <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
-        </ion-input>
-        <div class="item item-input padding">
-          <button class="button button-block" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
-        </div>
-      </form>
-    </div>
-    <div class="card" ng-if="canSignup">
-      <div class="item item-text-wrap">
-        <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
-        <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
-        <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
-      </div>
-    </div>
-  </ion-content>
+    </ion-content>
 </ion-view>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 2ea6ef70ec9..82e8aca51de 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -274,7 +274,7 @@ p.item-text-wrap {
           border-radius: 2%;
           border: 0;
           max-width: 100%;
-          max-height: 200px;
+          max-height: 160px;
           width: auto;
           height: auto;
         }
@@ -1435,4 +1435,8 @@ progress {
 
 .mm-progress-text {
   margin-left: 10px;
-}
\ No newline at end of file
+}
+
+.padding > .button.button-block:only-child {
+  margin-bottom: 0;
+}

From b1c35d501b3dd76515a61cdd2fe4d0e90d08e734 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Apr 2017 08:55:41 +0200
Subject: [PATCH 103/218] MOBILE-2096 login: Support OAuth buttons

---
 .../login/controllers/credentials.js          | 19 ++++++
 .../components/login/controllers/reconnect.js | 23 ++++++-
 www/core/components/login/main.js             |  6 +-
 www/core/components/login/scss/styles.scss    | 28 +++++++++
 www/core/components/login/services/helper.js  | 62 ++++++++++++++++++-
 .../login/templates/credentials.html          |  8 ++-
 .../components/login/templates/reconnect.html | 19 +++---
 7 files changed, 152 insertions(+), 13 deletions(-)

diff --git a/www/core/components/login/controllers/credentials.js b/www/core/components/login/controllers/credentials.js
index 2597b6537cb..e647b40ca70 100644
--- a/www/core/components/login/controllers/credentials.js
+++ b/www/core/components/login/controllers/credentials.js
@@ -49,6 +49,7 @@ angular.module('mm.core.login')
             $scope.siteChecked = true;
             $scope.siteurl = result.siteurl;
 
+            siteConfig = result.config;
             treatSiteConfig(result.config);
 
             if (result && result.warning) {
@@ -83,6 +84,7 @@ angular.module('mm.core.login')
             $scope.logourl = siteConfig.logourl || siteConfig.compactlogourl;
             $scope.authInstructions = siteConfig.authinstructions || $translate.instant('mm.login.loginsteps');
             $scope.canSignup = siteConfig.registerauth == 'email' && !$mmLoginHelper.isEmailSignupDisabled(siteConfig);
+            $scope.identityProviders = $mmLoginHelper.getValidIdentityProviders(siteConfig);
 
             if (!eventThrown && !$scope.$$destroyed) {
                 eventThrown = true;
@@ -95,6 +97,7 @@ angular.module('mm.core.login')
             $scope.logourl = null;
             $scope.authInstructions = null;
             $scope.canSignup = false;
+            $scope.identityProviders = [];
         }
     }
 
@@ -167,6 +170,22 @@ angular.module('mm.core.login')
         });
     };
 
+    // An OAuth button was clicked.
+    $scope.oauthClicked = function(providerUrl) {
+        if (!providerUrl) {
+            // Stop.
+            return;
+        }
+
+        var params = $mmUtil.extractUrlParams(providerUrl);
+        if (!params.id) {
+            $mmUtil.showErrorModal('Invalid data.');
+            return;
+        }
+
+        $mmLoginHelper.openBrowserForOAuthLogin($scope.siteurl, params.id, siteConfig.launchurl);
+    };
+
     $scope.$on('$destroy', function() {
         $mmEvents.trigger(mmCoreLoginSiteUncheckedEvent, {
             siteid: siteId,
diff --git a/www/core/components/login/controllers/reconnect.js b/www/core/components/login/controllers/reconnect.js
index 3d31f56f799..3bbcd1291b0 100644
--- a/www/core/components/login/controllers/reconnect.js
+++ b/www/core/components/login/controllers/reconnect.js
@@ -26,7 +26,8 @@ angular.module('mm.core.login')
 
     var infositeurl = $stateParams.infositeurl, // Siteurl in site info. It might be different than siteurl (http/https).
         stateName = $stateParams.statename,
-        stateParams = $stateParams.stateparams;
+        stateParams = $stateParams.stateparams,
+        siteConfig = $stateParams.siteconfig;
 
     $scope.siteurl = $stateParams.siteurl;
     $scope.credentials = {
@@ -46,6 +47,10 @@ angular.module('mm.core.login')
         $scope.siteurl = site.infos.siteurl;
     });
 
+    if (siteConfig) {
+        $scope.identityProviders = $mmLoginHelper.getValidIdentityProviders(siteConfig);
+    }
+
     $scope.cancel = function() {
         $mmSitesManager.logout().finally(function() {
             $ionicHistory.nextViewOptions({
@@ -99,4 +104,20 @@ angular.module('mm.core.login')
         });
     };
 
+    // An OAuth button was clicked.
+    $scope.oauthClicked = function(providerUrl) {
+        if (!providerUrl) {
+            // Stop.
+            return;
+        }
+
+        var params = $mmUtil.extractUrlParams(providerUrl);
+        if (!params.id) {
+            $mmUtil.showErrorModal('Invalid data.');
+            return;
+        }
+
+        $mmLoginHelper.openBrowserForOAuthLogin($scope.siteurl, params.id, siteConfig.launchurl);
+    };
+
 });
diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index 06e0ac3e280..d4cac17104b 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -87,7 +87,8 @@ angular.module('mm.core.login', [])
             infositeurl: '',
             siteid: '',
             statename: null, // Name and params of the state to go once authenticated. If not defined, site initial page.
-            stateparams: null
+            stateparams: null,
+            siteconfig: null
         }
     })
 
@@ -303,7 +304,8 @@ angular.module('mm.core.login', [])
                         infositeurl: info.siteurl,
                         siteid: siteId,
                         statename: data.statename,
-                        stateparams: data.stateparams
+                        stateparams: data.stateparams,
+                        siteconfig: result.config
                     });
                 }
             }
diff --git a/www/core/components/login/scss/styles.scss b/www/core/components/login/scss/styles.scss
index 8cd78f0fd42..17b4fc1a9f5 100644
--- a/www/core/components/login/scss/styles.scss
+++ b/www/core/components/login/scss/styles.scss
@@ -24,3 +24,31 @@
 .mm-login-sitepolicy-iframe {
   height: 300px;
 }
+
+.mm-oauth-icon, .button.mm-oauth-icon, .button-bar > .button.mm-oauth-icon {
+  padding: 0 4px;
+
+  > img, > span {
+    max-height: $item-icon-font-size;
+    max-width: $item-icon-font-size;
+    vertical-align: middle;
+  }
+  > span {
+    margin-left: 5px;
+  }
+}
+
+.mm-mm_login_credentials, .mm-mm_login_reconnect {
+  .mm-ioninput-password {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+}
+
+@media only screen and (max-width: 768px) {
+  .mm-oauth-icon, .button.mm-oauth-icon, .button-bar > .button.mm-oauth-icon {
+    &:not(:only-child) > span {
+      display: none;
+    }
+  }
+}
diff --git a/www/core/components/login/services/helper.js b/www/core/components/login/services/helper.js
index 789d6be7bed..e410590f339 100644
--- a/www/core/components/login/services/helper.js
+++ b/www/core/components/login/services/helper.js
@@ -29,7 +29,7 @@ angular.module('mm.core.login')
  */
 .factory('$mmLoginHelper', function($q, $log, $mmConfig, mmLoginSSOCode, mmLoginSSOInAppCode, mmLoginLaunchData, $mmEvents,
             md5, $mmSite, $mmSitesManager, $mmLang, $mmUtil, $state, $mmAddonManager, $translate, mmCoreConfigConstants,
-            mmCoreEventSessionExpired, mmUserProfileState, $mmCourses) {
+            mmCoreEventSessionExpired, mmUserProfileState, $mmCourses, $mmFS) {
 
     $log = $log.getInstance('$mmLoginHelper');
 
@@ -161,6 +161,29 @@ angular.module('mm.core.login')
         return errors;
     };
 
+    /**
+     * Get the valid identity providers from a site config.
+     *
+     * @module mm.core.login
+     * @ngdoc method
+     * @name $mmLoginHelper#getValidIdentityProviders
+     * @param  {Object} siteConfig Site's public config.
+     * @return {Object[]}          Valid identity providers.
+     */
+    self.getValidIdentityProviders = function(siteConfig) {
+        var validProviders = [],
+            httpUrl = $mmFS.concatenatePaths(siteConfig.wwwroot, 'auth/oauth2/'),
+            httpsUrl = $mmFS.concatenatePaths(siteConfig.httpswwwroot, 'auth/oauth2/');
+
+        angular.forEach(siteConfig.identityproviders, function(provider) {
+            if (provider.url && (provider.url.indexOf(httpsUrl) != -1 || provider.url.indexOf(httpUrl) != -1)) {
+                validProviders.push(provider);
+            }
+        });
+
+        return validProviders;
+    };
+
     /**
      * Go to the view to add a new site.
      * If a fixed URL is configured, go to credentials instead.
@@ -317,6 +340,43 @@ angular.module('mm.core.login')
         return code == mmLoginSSOCode || code == mmLoginSSOInAppCode;
     };
 
+    /**
+     * Open a browser to perform OAuth login (Google, Facebook, Microsoft).
+     *
+     * @module mm.core.login
+     * @ngdoc method
+     * @name $mmLoginHelper#openBrowserForOAuthLogin
+     * @param  {String} siteUrl       URL of the site where the login will be performed.
+     * @param  {Number} id            ID of the identity provider.
+     * @param  {String} [launchUrl]   The URL to open. If not defined, local_mobile URL will be used.
+     * @param  {String} [stateName]   Name of the state to go once authenticated. If not defined, site initial page.
+     * @param  {Object} [stateParams] Params of the state to go once authenticated.
+     * @return {Void}
+     */
+    self.openBrowserForOAuthLogin = function(siteUrl, id, launchUrl, stateName, stateParams) {
+        launchUrl = launchUrl || siteUrl + '/admin/tool/mobile/launch.php';
+
+        var service = $mmSitesManager.determineService(siteUrl),
+            loginUrl = self.prepareForSSOLogin(siteUrl, service, launchUrl, stateName, stateParams);
+
+        loginUrl += '&oauthsso=' + id;
+
+        if (id != 1) {
+            // Not Google, open in InAppBrowser.
+            var options = {
+                clearsessioncache: 'yes', // Clear the session cache to allow for multiple logins.
+                closebuttoncaption: $translate.instant('mm.login.cancel'),
+            };
+            $mmUtil.openInApp(loginUrl, options);
+        } else {
+            // Open Google in browser.
+            $mmUtil.openInBrowser(loginUrl);
+            if (navigator.app) {
+                navigator.app.exitApp();
+            }
+        }
+    };
+
     /**
      * Open a browser to perform SSO login.
      *
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index d51079a247e..8f823e32db7 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -15,13 +15,19 @@
                 <ion-input class="item item-input" ng-if="siteChecked && !isBrowserSSO">
                     <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
                 </ion-input>
-                <ion-input class="item item-input" ng-if="siteChecked && !isBrowserSSO">
+                <ion-input class="item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
                     <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
                 </ion-input>
                 <div class="item padding">
                     <button class="button button-block" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
                 </div>
             </form>
+            <div ng-if="identityProviders && identityProviders.length" class="padding button-bar">
+                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider.url)" title="{{provider.name}}">
+                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                    <span>{{provider.name}}</span>
+                </button>
+            </div>
             <div ng-if="canSignup" class="item item-text-wrap">
                 <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
                 <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index 229914f470a..80776fad12c 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -1,27 +1,30 @@
 <ion-view view-title="{{ 'mm.login.reconnect' | translate }}">
     <ion-content mm-state-class>
-        <div class="card">
+        <div class="list">
             <div class="item item-text-wrap item-avatar-center">
                 <img ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
                 <h2 class="padding">{{siteurl}}</h2>
                 <p ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
             </div>
-        </div>
-        <div class="list list-inset">
             <div class="item">
                 <h2>{{ 'mm.login.username' | translate }}</h2>
                 <p>{{credentials.username}}</p>
             </div>
             <form>
-                <ion-input class="item item-input item-stacked-label">
-                    <ion-label>{{ 'mm.login.password' | translate }}</ion-label>
+                <ion-input class="item item-input mm-ioninput-password">
                     <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-auto-focus mm-show-password>
                 </ion-input>
-                <div class="item padding">
-                    <button class="button button-block button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
-                    <button class="button button-block button-outline button-positive" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
+                <div class="item padding button-bar">
+                    <button class="button button-outline" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
+                    <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
                 </div>
             </form>
+            <div ng-if="identityProviders && identityProviders.length" class="padding button-bar">
+                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider.url)" title="{{provider.name}}">
+                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                    <span>{{provider.name}}</span>
+                </button>
+            </div>
         </div>
     </ion-content>
 </ion-view>

From b1d90385ea8f1d82282d7a87998101460c7f9385 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 May 2017 10:25:26 +0200
Subject: [PATCH 104/218] MOBILE-2096 login: Check iconurl and name for Google

---
 .../login/controllers/credentials.js          | 13 +-----
 .../components/login/controllers/reconnect.js | 13 +-----
 www/core/components/login/services/helper.js  | 42 ++++++++++++-------
 .../login/templates/credentials.html          |  2 +-
 .../components/login/templates/reconnect.html |  2 +-
 5 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/www/core/components/login/controllers/credentials.js b/www/core/components/login/controllers/credentials.js
index e647b40ca70..d935c02173b 100644
--- a/www/core/components/login/controllers/credentials.js
+++ b/www/core/components/login/controllers/credentials.js
@@ -171,19 +171,10 @@ angular.module('mm.core.login')
     };
 
     // An OAuth button was clicked.
-    $scope.oauthClicked = function(providerUrl) {
-        if (!providerUrl) {
-            // Stop.
-            return;
-        }
-
-        var params = $mmUtil.extractUrlParams(providerUrl);
-        if (!params.id) {
+    $scope.oauthClicked = function(provider) {
+        if (!$mmLoginHelper.openBrowserForOAuthLogin($scope.siteurl, provider, siteConfig.launchurl)) {
             $mmUtil.showErrorModal('Invalid data.');
-            return;
         }
-
-        $mmLoginHelper.openBrowserForOAuthLogin($scope.siteurl, params.id, siteConfig.launchurl);
     };
 
     $scope.$on('$destroy', function() {
diff --git a/www/core/components/login/controllers/reconnect.js b/www/core/components/login/controllers/reconnect.js
index 3bbcd1291b0..7276ec594ba 100644
--- a/www/core/components/login/controllers/reconnect.js
+++ b/www/core/components/login/controllers/reconnect.js
@@ -105,19 +105,10 @@ angular.module('mm.core.login')
     };
 
     // An OAuth button was clicked.
-    $scope.oauthClicked = function(providerUrl) {
-        if (!providerUrl) {
-            // Stop.
-            return;
-        }
-
-        var params = $mmUtil.extractUrlParams(providerUrl);
-        if (!params.id) {
+    $scope.oauthClicked = function(provider) {
+        if (!$mmLoginHelper.openBrowserForOAuthLogin($scope.siteurl, provider, siteConfig.launchurl)) {
             $mmUtil.showErrorModal('Invalid data.');
-            return;
         }
-
-        $mmLoginHelper.openBrowserForOAuthLogin($scope.siteurl, params.id, siteConfig.launchurl);
     };
 
 });
diff --git a/www/core/components/login/services/helper.js b/www/core/components/login/services/helper.js
index e410590f339..a6a1f85bc1c 100644
--- a/www/core/components/login/services/helper.js
+++ b/www/core/components/login/services/helper.js
@@ -68,7 +68,7 @@ angular.module('mm.core.login')
      * @param  {String} siteurl     URL of the site where the SSO login will be performed.
      * @param  {Number} typeOfLogin mmLoginSSOCode or mmLoginSSOInAppCode.
      * @param  {String} [service]   The service to use. If not defined, external service will be used.
-     * @param  {String} [launchUrl] The URL to open. If not defined, local_mobile URL will be used.
+     * @param  {String} [launchUrl] The URL to open for SSO. If not defined, local_mobile launch URL will be used.
      * @return {Void}
      */
     self.confirmAndOpenBrowserForSSOLogin = function(siteurl, typeOfLogin, service, launchUrl) {
@@ -347,34 +347,44 @@ angular.module('mm.core.login')
      * @ngdoc method
      * @name $mmLoginHelper#openBrowserForOAuthLogin
      * @param  {String} siteUrl       URL of the site where the login will be performed.
-     * @param  {Number} id            ID of the identity provider.
-     * @param  {String} [launchUrl]   The URL to open. If not defined, local_mobile URL will be used.
+     * @param  {Object} provider      The identity provider.
+     * @param  {String} [launchUrl]   The URL to open for SSO. If not defined, tool/mobile launch URL will be used.
      * @param  {String} [stateName]   Name of the state to go once authenticated. If not defined, site initial page.
      * @param  {Object} [stateParams] Params of the state to go once authenticated.
-     * @return {Void}
+     * @return {Boolean}              True if success, false if error.
      */
-    self.openBrowserForOAuthLogin = function(siteUrl, id, launchUrl, stateName, stateParams) {
+    self.openBrowserForOAuthLogin = function(siteUrl, provider, launchUrl, stateName, stateParams) {
         launchUrl = launchUrl || siteUrl + '/admin/tool/mobile/launch.php';
+        if (!provider || !provider.url) {
+            return false;
+        }
 
         var service = $mmSitesManager.determineService(siteUrl),
             loginUrl = self.prepareForSSOLogin(siteUrl, service, launchUrl, stateName, stateParams);
+            params = $mmUtil.extractUrlParams(provider.url);
 
-        loginUrl += '&oauthsso=' + id;
+        if (!params.id) {
+            return false;
+        }
 
-        if (id != 1) {
-            // Not Google, open in InAppBrowser.
+        loginUrl += '&oauthsso=' + params.id;
+
+        // Google will be opened in browser, others will be opened in InAppBrowser.
+        // There's no reliable attribute to check if it's google (ID is not reliable), search for "google" in icon and name.
+        if ((provider.name && provider.name.match(/google/i)) || (provider.iconurl && provider.iconurl.match(/google/i))) {
+            $mmUtil.openInBrowser(loginUrl);
+            if (navigator.app) {
+                navigator.app.exitApp();
+            }
+        } else {
             var options = {
                 clearsessioncache: 'yes', // Clear the session cache to allow for multiple logins.
                 closebuttoncaption: $translate.instant('mm.login.cancel'),
             };
             $mmUtil.openInApp(loginUrl, options);
-        } else {
-            // Open Google in browser.
-            $mmUtil.openInBrowser(loginUrl);
-            if (navigator.app) {
-                navigator.app.exitApp();
-            }
         }
+
+        return true;
     };
 
     /**
@@ -386,7 +396,7 @@ angular.module('mm.core.login')
      * @param  {String} siteurl       URL of the site where the SSO login will be performed.
      * @param  {Number} typeOfLogin   mmLoginSSOCode or mmLoginSSOInAppCode.
      * @param  {String} [service]     The service to use. If not defined, external service will be used.
-     * @param  {String} [launchUrl]   The URL to open. If not defined, local_mobile URL will be used.
+     * @param  {String} [launchUrl]   The URL to open for SSO. If not defined, local_mobile launch URL will be used.
      * @param  {String} [stateName]   Name of the state to go once authenticated. If not defined, site initial page.
      * @param  {Object} [stateParams] Params of the state to go once authenticated.
      * @return {Void}
@@ -416,7 +426,7 @@ angular.module('mm.core.login')
      * @name $mmLoginHelper#prepareForSSOLogin
      * @param  {String} siteUrl       URL of the site where the SSO login will be performed.
      * @param  {String} [service]     The service to use. If not defined, external service will be used.
-     * @param  {String} [launchUrl]   The URL to open. If not defined, local_mobile URL will be used.
+     * @param  {String} [launchUrl]   The URL to open for SSO. If not defined, local_mobile launch URL will be used.
      * @param  {String} [stateName]   Name of the state to go once authenticated. If not defined, site initial page.
      * @param  {Object} [stateParams] Params of the state to go once authenticated.
      * @return {Void}
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 8f823e32db7..334824cdfa1 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -23,7 +23,7 @@
                 </div>
             </form>
             <div ng-if="identityProviders && identityProviders.length" class="padding button-bar">
-                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider.url)" title="{{provider.name}}">
+                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
                     <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
                     <span>{{provider.name}}</span>
                 </button>
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index 80776fad12c..77341969c27 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -20,7 +20,7 @@ <h2>{{ 'mm.login.username' | translate }}</h2>
                 </div>
             </form>
             <div ng-if="identityProviders && identityProviders.length" class="padding button-bar">
-                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider.url)" title="{{provider.name}}">
+                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
                     <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
                     <span>{{provider.name}}</span>
                 </button>

From db098ad218f83a8dd465c887a4da5c06ad199593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sun, 30 Apr 2017 16:25:59 +0200
Subject: [PATCH 105/218] MOBILE-2028 section: Invalidate new modules to enable
 prefetch

---
 .../mod/forum/services/prefetch_handler.js    |  4 ++--
 .../mod/glossary/services/prefetch_handler.js |  4 ++--
 .../mod/wiki/services/prefetch_handler.js     |  5 ++---
 .../components/course/controllers/section.js  | 21 ++++++++++++++-----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/www/addons/mod/forum/services/prefetch_handler.js b/www/addons/mod/forum/services/prefetch_handler.js
index e5ad3df8074..91eac226998 100644
--- a/www/addons/mod/forum/services/prefetch_handler.js
+++ b/www/addons/mod/forum/services/prefetch_handler.js
@@ -223,8 +223,8 @@ angular.module('mm.addons.mod_forum')
      */
     self.invalidateModule = function(module, courseId) {
         if ($mmCoursePrefetchDelegate.canCheckUpdates()) {
-            // No need to invalidate anything if can check updates.
-            return $q.when();
+            // If can check updates only get forum by course is needed.
+            return $mmaModForum.invalidateForumData(courseId);
         }
 
         // Get the forum since we need its ID.
diff --git a/www/addons/mod/glossary/services/prefetch_handler.js b/www/addons/mod/glossary/services/prefetch_handler.js
index 7560e60e832..c196029ef43 100644
--- a/www/addons/mod/glossary/services/prefetch_handler.js
+++ b/www/addons/mod/glossary/services/prefetch_handler.js
@@ -163,8 +163,8 @@ angular.module('mm.addons.mod_glossary')
      */
     self.invalidateModule = function(module, courseId) {
         if ($mmCoursePrefetchDelegate.canCheckUpdates()) {
-            // No need to invalidate anything if can check updates.
-            return $q.when();
+            // If can check updates only get glossary by course is needed.
+            return $mmaModGlossary.invalidateCourseGlossaries(courseId);
         }
 
         return $mmaModGlossary.getGlossary(courseId, module.id).then(function(glossary) {
diff --git a/www/addons/mod/wiki/services/prefetch_handler.js b/www/addons/mod/wiki/services/prefetch_handler.js
index f8556f8434f..2a4671e47cf 100644
--- a/www/addons/mod/wiki/services/prefetch_handler.js
+++ b/www/addons/mod/wiki/services/prefetch_handler.js
@@ -196,13 +196,12 @@ angular.module('mm.addons.mod_wiki')
      */
     self.invalidateModule = function(module, courseId) {
         if ($mmCoursePrefetchDelegate.canCheckUpdates()) {
-            // No need to invalidate anything if can check updates.
-            return $q.when();
+            // If can check updates only get wiki by course is needed.
+            return $mmaModWiki.invalidateWikiData(courseId);
         }
 
         return $mmaModWiki.getWiki(courseId, module.id, 'coursemodule').then(function(wiki) {
             var promises = [];
-
             promises.push($mmaModWiki.invalidateWikiData(courseId));
             promises.push($mmaModWiki.invalidateSubwikis(wiki.id));
             promises.push($mmaModWiki.invalidateSubwikiFiles(wiki.id));
diff --git a/www/core/components/course/controllers/section.js b/www/core/components/course/controllers/section.js
index fde2f91fcf6..82fff925f91 100644
--- a/www/core/components/course/controllers/section.js
+++ b/www/core/components/course/controllers/section.js
@@ -40,7 +40,7 @@ angular.module('mm.core.course')
     }
 
     // Convenience function to fetch section(s).
-    function loadContent(sectionId) {
+    function loadContent(sectionId, refresh) {
         return $mmCourses.getUserCourse(courseId, true).catch(function() {
             // User not enrolled in the course or an error occurred, ignore the error.
         }).then(function(course) {
@@ -70,6 +70,19 @@ angular.module('mm.core.course')
                 }
 
                 return promise.then(function(sections) {
+                    var promise;
+                    if (refresh) {
+                        // Invalidate the recently downloaded module list. To ensure info can be prefetched.
+                        var modules = $mmCourseHelper.getSectionsModules(sections);
+                        promise = $mmCoursePrefetchDelegate.invalidateModules(modules, courseId);
+                    } else {
+                        promise = $q.when();
+                    }
+
+                    return promise.then(function() {
+                        return sections;
+                    });
+                }).then(function(sections) {
                     sections = sections.map(function(section) {
                         section.name = section.name.trim() || false;
                         return section;
@@ -113,13 +126,11 @@ angular.module('mm.core.course')
         promises.push($mmCourse.invalidateSections(courseId));
 
         if ($scope.sections) {
-            // Invalidate modules prefetch data.
-            var modules = $mmCourseHelper.getSectionsModules($scope.sections);
-            promises.push($mmCoursePrefetchDelegate.invalidateModules(modules, courseId));
+            promises.push($mmCoursePrefetchDelegate.invalidateCourseUpdates(courseId));
         }
 
         $q.all(promises).finally(function() {
-            loadContent(sectionId).finally(function() {
+            loadContent(sectionId, true).finally(function() {
                 $scope.$broadcast('scroll.refreshComplete');
             });
         });

From d0223e39e8aa079e0cc422865329a69ff7e5b96a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Apr 2017 12:58:43 +0200
Subject: [PATCH 106/218] MOBILE-2077 files: Handle external files in filepool

---
 .../mod/assign/services/prefetch_handler.js   |  10 +-
 .../mod/choice/services/prefetch_handler.js   |   4 +-
 .../mod/forum/services/prefetch_handler.js    |   4 +-
 .../mod/glossary/services/prefetch_handler.js |   4 +-
 .../mod/lesson/services/prefetch_handler.js   |  15 +-
 .../mod/quiz/services/prefetch_handler.js     |   5 +-
 www/addons/mod/resource/services/resource.js  |   6 +-
 .../mod/scorm/services/prefetch_handler.js    |  17 +-
 .../mod/survey/services/prefetch_handler.js   |   4 +-
 .../mod/wiki/services/prefetch_handler.js     |   9 +-
 .../course/services/prefetchfactory.js        |  12 +-
 .../fileuploader/services/fileuploader.js     |   3 +-
 www/core/directives/external_content.js       |   3 +
 www/core/directives/file.js                   |  11 +-
 www/core/lib/filepool.js                      | 227 ++++++++++++------
 www/core/lib/util.js                          |   3 +-
 16 files changed, 180 insertions(+), 157 deletions(-)

diff --git a/www/addons/mod/assign/services/prefetch_handler.js b/www/addons/mod/assign/services/prefetch_handler.js
index 8ae1fbc3cd0..44c83463ead 100644
--- a/www/addons/mod/assign/services/prefetch_handler.js
+++ b/www/addons/mod/assign/services/prefetch_handler.js
@@ -415,16 +415,8 @@ angular.module('mm.addons.mod_assign')
 
             // Get related submissions files and fetch them.
             subPromises.push(self.getFiles(module, courseId, siteId).then(function(files) {
-                var filePromises = [];
-
                 revision = self.getRevision(module, courseId);
-
-                angular.forEach(files, function(file) {
-                    var url = file.fileurl;
-                    filePromises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
-                });
-
-                return $q.all(filePromises);
+                return $mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id);
             }));
 
             return $q.all(subPromises);
diff --git a/www/addons/mod/choice/services/prefetch_handler.js b/www/addons/mod/choice/services/prefetch_handler.js
index 07aa5c6048f..8d42d05d25e 100644
--- a/www/addons/mod/choice/services/prefetch_handler.js
+++ b/www/addons/mod/choice/services/prefetch_handler.js
@@ -217,9 +217,7 @@ angular.module('mm.addons.mod_choice')
                 files = self.getIntroFilesFromInstance(module, choice);
 
             // Prefetch files.
-            angular.forEach(files, function(file) {
-                promises.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl, self.component, module.id, file.timemodified));
-            });
+            promises.push($mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id));
 
             // Get the options and results.
             promises.push($mmaModChoice.getOptions(choice.id));
diff --git a/www/addons/mod/forum/services/prefetch_handler.js b/www/addons/mod/forum/services/prefetch_handler.js
index e5ad3df8074..236c5ead9d5 100644
--- a/www/addons/mod/forum/services/prefetch_handler.js
+++ b/www/addons/mod/forum/services/prefetch_handler.js
@@ -315,9 +315,7 @@ angular.module('mm.addons.mod_forum')
             });
 
             // Prefetch files.
-            angular.forEach(files, function(file) {
-                promises.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl, self.component, module.id, file.timemodified));
-            });
+            promises.push($mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id));
 
             // Prefetch groups data.
             promises.push(prefetchGroupsInfo(forum, courseId, canCreateDiscussions));
diff --git a/www/addons/mod/glossary/services/prefetch_handler.js b/www/addons/mod/glossary/services/prefetch_handler.js
index 7560e60e832..ef9026d48cb 100644
--- a/www/addons/mod/glossary/services/prefetch_handler.js
+++ b/www/addons/mod/glossary/services/prefetch_handler.js
@@ -261,9 +261,7 @@ angular.module('mm.addons.mod_glossary')
                 // Prefetch user profiles.
                 promises.push($mmUser.prefetchProfiles(userIds, courseId, siteId));
 
-                angular.forEach(files, function(file) {
-                    promises.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl, self.component, module.id, file.timemodified));
-                });
+                promises.push($mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id));
 
                 return $q.all(promises);
             }));
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 134d9daf7de..6b214c4de6c 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -419,10 +419,7 @@ angular.module('mm.addons.mod_lesson')
             files = lesson.mediafiles || [];
             files = files.concat(self.getIntroFilesFromInstance(module, lesson));
 
-            angular.forEach(files, function(file) {
-                var url = file.url || file.fileurl;
-                promises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
-            });
+            promises.push($mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id));
 
             // Get the list of pages.
             promises.push($mmaModLesson.getPages(lesson.id, password, false, true, siteId).then(function(pages) {
@@ -434,8 +431,7 @@ angular.module('mm.addons.mod_lesson')
                             true, undefined, undefined, siteId).then(function(pageData) {
 
                         // Download the page files.
-                        var filePromises = [],
-                            pageFiles = pageData.contentfiles || [];
+                        var pageFiles = pageData.contentfiles || [];
 
                         angular.forEach(pageData.answers, function(answer) {
                             if (answer.answerfiles && answer.answerfiles.length) {
@@ -446,12 +442,7 @@ angular.module('mm.addons.mod_lesson')
                             }
                         });
 
-                        angular.forEach(pageFiles, function(file) {
-                            var url = file.url || file.fileurl;
-                            filePromises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
-                        });
-
-                        return $q.all(filePromises);
+                        return $mmFilepool.addFilesToQueueByUrl(siteId, pageFiles, self.component, module.id);
                     }));
                 });
 
diff --git a/www/addons/mod/quiz/services/prefetch_handler.js b/www/addons/mod/quiz/services/prefetch_handler.js
index 6a2b7669365..7c861cb758a 100644
--- a/www/addons/mod/quiz/services/prefetch_handler.js
+++ b/www/addons/mod/quiz/services/prefetch_handler.js
@@ -372,10 +372,7 @@ angular.module('mm.addons.mod_quiz')
                 attemptAccessInfo = info;
             }));
 
-            angular.forEach(introFiles, function(file) {
-                var url = file.fileurl;
-                promises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
-            });
+            promises.push($mmFilepool.addFilesToQueueByUrl(siteId, introFiles, self.component, module.id));
 
             return $q.all(promises);
         }).then(function() {
diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index 412db75f4c7..bb8ddb0ab4f 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -239,7 +239,7 @@ angular.module('mm.addons.mod_resource')
 
                 if (status === mmCoreDownloaded) {
                     // Get the local file URL.
-                    return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false);
+                    return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, contents[0]);
                 } else if (status === mmCoreDownloading) {
                     // Return the online URL.
                     return fixedUrl;
@@ -252,7 +252,7 @@ angular.module('mm.addons.mod_resource')
                     return $mmFilepool.shouldDownloadBeforeOpen(fixedUrl, contents[0].filesize).then(function() {
                         // Download and then return the local URL.
                         return $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod).then(function() {
-                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false);
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, contents[0]);
                         });
                     }, function() {
                         // Start the download if in wifi, but return the URL right away so the file is opened.
@@ -265,7 +265,7 @@ angular.module('mm.addons.mod_resource')
                             return fixedUrl;
                         } else {
                             // Outdated but offline, so we return the local URL.
-                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false);
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, contents[0]);
                         }
                     });
                 }
diff --git a/www/addons/mod/scorm/services/prefetch_handler.js b/www/addons/mod/scorm/services/prefetch_handler.js
index c953023c85b..bb8ea4e806f 100644
--- a/www/addons/mod/scorm/services/prefetch_handler.js
+++ b/www/addons/mod/scorm/services/prefetch_handler.js
@@ -73,19 +73,10 @@ angular.module('mm.addons.mod_scorm')
             promises.push(self._downloadOrPrefetchPackage(scorm, prefetch, siteId).then(undefined, undefined, deferred.notify));
 
             // Download intro files.
-            angular.forEach(introFiles, function(file) {
-                var promise;
-
-                if (prefetch) {
-                    promise = $mmFilepool.addToQueueByUrl(siteId, file.fileurl, self.component, module.id, file.timemodified);
-                } else {
-                    promise = $mmFilepool.downloadUrl(siteId, file.fileurl, false, self.component, module.id, file.timemodified);
-                }
-
-                promises.push(promise.catch(function() {
-                    // Ignore errors for now.
-                }));
-            });
+            promises.push($mmFilepool.downloadOrPrefetchFiles(siteId, introFiles, prefetch, false, self.component, module.id)
+                    .catch(function() {
+                // Ignore errors.
+            }));
 
             return $q.all(promises);
         }).then(function() {
diff --git a/www/addons/mod/survey/services/prefetch_handler.js b/www/addons/mod/survey/services/prefetch_handler.js
index 5e153fb0a62..e8c08e39524 100644
--- a/www/addons/mod/survey/services/prefetch_handler.js
+++ b/www/addons/mod/survey/services/prefetch_handler.js
@@ -225,9 +225,7 @@ angular.module('mm.addons.mod_survey')
             timemod = $mmFilepool.getTimemodifiedFromFileList(files);
 
             // Prefetch files.
-            angular.forEach(files, function(file) {
-                promises.push($mmFilepool.addToQueueByUrl(siteId, file.fileurl, component, module.id, file.timemodified));
-            });
+            promises.push($mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id));
 
             // If survey isn't answered, prefetch the questions.
             if (!survey.surveydone) {
diff --git a/www/addons/mod/wiki/services/prefetch_handler.js b/www/addons/mod/wiki/services/prefetch_handler.js
index f8556f8434f..2db7c6a64d9 100644
--- a/www/addons/mod/wiki/services/prefetch_handler.js
+++ b/www/addons/mod/wiki/services/prefetch_handler.js
@@ -287,16 +287,9 @@ angular.module('mm.addons.mod_wiki')
 
                 // Get related page files and fetch them.
                 promises.push(self.getFiles(module, courseId, siteId).then(function (files) {
-                    var filePromises = [];
-
                     revision = $mmFilepool.getRevisionFromFileList(files);
 
-                    angular.forEach(files, function(file) {
-                        var url = file.fileurl;
-                        filePromises.push($mmFilepool.addToQueueByUrl(siteId, url, self.component, module.id, file.timemodified));
-                    });
-
-                    return $q.all(filePromises);
+                    return $mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id);
                 }));
 
                 // Get timemodified.
diff --git a/www/core/components/course/services/prefetchfactory.js b/www/core/components/course/services/prefetchfactory.js
index 50d64490f8a..b651a2d01e6 100644
--- a/www/core/components/course/services/prefetchfactory.js
+++ b/www/core/components/course/services/prefetchfactory.js
@@ -103,16 +103,8 @@ angular.module('mm.core.course')
 
                         if (dirPath) {
                             // Download intro files in filepool root folder.
-                            angular.forEach(introFiles, function(file) {
-                                var fileUrl = file.url || file.fileurl;
-                                if (prefetch) {
-                                    promises.push($mmFilepool.addToQueueByUrl(siteId, fileUrl,
-                                            that.component, module.id, file.timemodified));
-                                } else {
-                                    promises.push($mmFilepool.downloadUrl(siteId, fileUrl, false,
-                                            that.component, module.id, file.timemodified));
-                                }
-                            });
+                            promises.push($mmFilepool.downloadOrPrefetchFiles(siteId, introFiles, prefetch, false,
+                                    that.component, module.id));
 
                             // Download content files inside dirPath.
                             promises.push(downloadFn(siteId, contentFiles, that.component,
diff --git a/www/core/components/fileuploader/services/fileuploader.js b/www/core/components/fileuploader/services/fileuploader.js
index 9e229ad7f8d..362189e0fda 100644
--- a/www/core/components/fileuploader/services/fileuploader.js
+++ b/www/core/components/fileuploader/services/fileuploader.js
@@ -237,7 +237,8 @@ angular.module('mm.core.fileuploader')
         if (file.filename && !file.name) {
             // It's an online file. We need to download it and re-upload it.
             fileName = file.filename;
-            promise = $mmFilepool.downloadUrl(siteId, file.fileurl, false, component, componentId).then(function(path) {
+            promise = $mmFilepool.downloadUrl(siteId, file.url || file.fileurl, false, component, componentId,
+                    file.timemodified, undefined, file).then(function(path) {
                 return $mmFS.getExternalFile(path);
             });
         } else {
diff --git a/www/core/directives/external_content.js b/www/core/directives/external_content.js
index 6acc0926987..7e8ad0d1cba 100644
--- a/www/core/directives/external_content.js
+++ b/www/core/directives/external_content.js
@@ -30,6 +30,9 @@ angular.module('mm.core')
  *
  * Attributes accepted:
  *     - siteid: Reference to the site ID if different than the site the user is connected to.
+ *
+ * @todo We can't detect changes in files from external repositories. A solution would be to always download them,
+ * but we could increase the data usage A LOT if we're always downloading the embedded files.
  */
 .directive('mmExternalContent', function($log, $mmFilepool, $mmSite, $mmSitesManager, $mmUtil, $q, $mmApp, $ionicPlatform) {
     $log = $log.getInstance('mmExternalContent');
diff --git a/www/core/directives/file.js b/www/core/directives/file.js
index 18eecd4a1b7..9749479d428 100644
--- a/www/core/directives/file.js
+++ b/www/core/directives/file.js
@@ -81,7 +81,8 @@ angular.module('mm.core')
         }
 
         scope.isDownloading = true;
-        return $mmFilepool.downloadUrl(siteId, fileUrl, false, component, componentId, timeModified).then(function(localUrl) {
+        return $mmFilepool.downloadUrl(siteId, fileUrl, false, component, componentId, timeModified, undefined, scope.file)
+                .then(function(localUrl) {
             return localUrl;
         }).catch(function() {
             // Call getState to make sure we have the right state.
@@ -120,7 +121,7 @@ angular.module('mm.core')
 
                 if (scope.isDownloaded && !scope.showDownload) {
                     // Get the local file URL.
-                    return $mmFilepool.getUrlByUrl(siteId, fileUrl, component, componentId, timeModified);
+                    return $mmFilepool.getUrlByUrl(siteId, fileUrl, component, componentId, timeModified, false, false, scope.file);
                 } else {
                     if (!isOnline && !scope.isDownloaded) {
                         // Not downloaded and we're offline, reject.
@@ -147,7 +148,8 @@ angular.module('mm.core')
                             return fixedUrl;
                         } else {
                             // Outdated but offline, so we return the local URL.
-                            return $mmFilepool.getUrlByUrl(siteId, fileUrl, component, componentId, timeModified);
+                            return $mmFilepool.getUrlByUrl(siteId, fileUrl, component, componentId, timeModified,
+                                    false, false, scope.file);
                         }
                     });
                 }
@@ -258,7 +260,8 @@ angular.module('mm.core')
                         // User confirmed, add the file to queue.
                         $mmFilepool.invalidateFileByUrl(siteId, fileUrl).finally(function() {
                             scope.isDownloading = true;
-                            $mmFilepool.addToQueueByUrl(siteId, fileUrl, component, componentId, timeModified).catch(function() {
+                            $mmFilepool.addToQueueByUrl(siteId, fileUrl, component, componentId, timeModified,
+                                    undefined, 0, scope.file).catch(function() {
                                 $mmUtil.showErrorModal('mm.core.errordownloading', true);
                             });
                         });
diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index 8a75a6a33da..3110d845a40 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -177,7 +177,9 @@ angular.module('mm.core')
         queueState,
         urlAttributes = [
             tokenRegex,
-            new RegExp('(\\?|&)forcedownload=[0-1]')
+            new RegExp('(\\?|&)forcedownload=[0-1]'),
+            new RegExp('(\\?|&)preview=[A-Za-z0-9]+'),
+            new RegExp('(\\?|&)offline=[0-1]', 'g')
         ],
         revisionRegex = new RegExp('/content/([0-9]+)/'),
         queueDeferreds = {}, // To handle file downloads using the queue.
@@ -318,13 +320,7 @@ angular.module('mm.core')
      * @return {Promise} Resolved on success. The returned value can be inconsistent, do not use.
      */
     self.addFilesToQueueByUrl = function(siteId, files, component, componentId) {
-        var promises = [];
-        // Prefetch files.
-        angular.forEach(files, function(file) {
-            promises.push(self.addToQueueByUrl(siteId, file.url || file.fileurl, component, componentId, file.timemodified));
-        });
-
-        return $q.all(promises);
+        return self.downloadOrPrefetchFiles(siteId, files, true, false, component, componentId);
     };
 
     /**
@@ -333,16 +329,19 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#addToQueueByUrl
-     * @param {String} siteId The site ID.
-     * @param {String} fileUrl The absolute URL to the file.
-     * @param {String} [component] The component to link the file to.
-     * @param {Mixed} [componentId] An ID to use in conjunction with the component (optional).
+     * @param {String} siteId           The site ID.
+     * @param {String} fileUrl          The absolute URL to the file.
+     * @param {String} [component]      The component to link the file to.
+     * @param {Mixed} [componentId]     An ID to use in conjunction with the component (optional).
      * @param {Number} [timemodified=0] The time this file was modified. Can be used to check file state.
      * @param {String} [filePath]       Filepath to download the file to.
-     * @param {Number} [priority=0] The priority this file should get in the queue (range 0-999).
-     * @return {Promise} Resolved on success. The returned value can be inconsistent, do not use.
+     * @param {Number} [priority=0]     The priority this file should get in the queue (range 0-999).
+     * @param {Object} [options]        Extra options (isexternalfile, repositorytype).
+     * @return {Promise}                Resolved on success. The returned value can be inconsistent, do not use.
      */
-    self.addToQueueByUrl = function(siteId, fileUrl, component, componentId, timemodified, filePath, priority) {
+    self.addToQueueByUrl = function(siteId, fileUrl, component, componentId, timemodified, filePath, priority, options) {
+        options = options || {};
+
         var db = $mmApp.getDB(),
             fileId,
             now = new Date(),
@@ -400,6 +399,14 @@ angular.module('mm.core')
                             update = true;
                             fileObject.path = filePath;
                         }
+                        if (fileObject.isexternalfile !== options.isexternalfile) {
+                            update = true;
+                            fileObject.isexternalfile = options.isexternalfile;
+                        }
+                        if (fileObject.repositorytype !== options.repositorytype) {
+                            update = true;
+                            fileObject.repositorytype = options.repositorytype;
+                        }
 
                         if (link) {
                             // We need to add the new link if it does not exist yet.
@@ -448,6 +455,8 @@ angular.module('mm.core')
                         url: fileUrl,
                         revision: revision,
                         timemodified: timemodified,
+                        isexternalfile: options.isexternalfile,
+                        repositorytype: options.repositorytype,
                         path: filePath,
                         links: link ? [link] : []
                     }).then(function() {
@@ -599,6 +608,42 @@ angular.module('mm.core')
         return current;
     };
 
+    /**
+     * Download or prefetch several files.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFilepool#downloadOrPrefetchFiles
+     * @param {String} siteId         The site ID.
+     * @param {Array}  files          Array of files to download.
+     * @param {Boolean} prefetch      True if prefetching.
+     * @param {Boolean} [ignoreStale] True if 'stale' should be ignored. Only if prefetch=false.
+     * @param {String} [component]    The component to link the file to.
+     * @param {Mixed}  [componentId]  An ID to use in conjunction with the component (optional).
+     * @return {Promise}              Resolved on success. The returned value can be inconsistent, do not use.
+     */
+    self.downloadOrPrefetchFiles = function(siteId, files, prefetch, ignoreStale, component, componentId) {
+        var promises = [];
+
+        // Download files.
+        angular.forEach(files, function(file) {
+            var url = file.url || file.fileurl,
+                timemodified = file.timemodified,
+                options = {
+                    isexternalfile: file.isexternalfile,
+                    repositorytype: file.repositorytype
+                };
+
+            if (prefetch) {
+                promises.push(self.addToQueueByUrl(siteId, url, component, componentId, timemodified, undefined, 0, options));
+            } else {
+                promises.push(self.downloadUrl(siteId, url, ignoreStale, component, componentId, timemodified, undefined, options));
+            }
+        });
+
+        return $mmUtil.allPromises(promises);
+    };
+
     /**
      * Downloads or prefetches a list of files.
      *
@@ -644,7 +689,11 @@ angular.module('mm.core')
                 var path,
                     promise,
                     fileLoaded = 0,
-                    fileUrl = file.url || file.fileurl;
+                    fileUrl = file.url || file.fileurl,
+                    options = {
+                        isexternalfile: file.isexternalfile,
+                        repositorytype: file.repositorytype
+                    };
 
                 if (dirPath) {
                     // Calculate the path to the file.
@@ -656,9 +705,9 @@ angular.module('mm.core')
                 }
 
                 if (prefetch) {
-                    promise = self.addToQueueByUrl(siteId, fileUrl, component, componentId, file.timemodified, path);
+                    promise = self.addToQueueByUrl(siteId, fileUrl, component, componentId, file.timemodified, path, options);
                 } else {
-                    promise = self.downloadUrl(siteId, fileUrl, false, component, componentId, file.timemodified, path);
+                    promise = self.downloadUrl(siteId, fileUrl, false, component, componentId, file.timemodified, path, options);
                 }
 
                 // Using undefined for success & fail will pass the success/failure to the parent promise.
@@ -725,14 +774,15 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#downloadUrl
-     * @param {String} siteId The site ID.
-     * @param {String} fileUrl The file URL.
-     * @param {Boolean} [ignoreStale] True if 'stale' should be ignored.
-     * @param {String} component The component to link the file to.
-     * @param {Mixed} [componentId] An ID to use in conjunction with the component.
+     * @param {String} siteId           The site ID.
+     * @param {String} fileUrl          The file URL.
+     * @param {Boolean} [ignoreStale]   True if 'stale' should be ignored.
+     * @param {String} component        The component to link the file to.
+     * @param {Mixed} [componentId]     An ID to use in conjunction with the component.
      * @param {Number} [timemodified=0] The time this file was modified. Can be used to check file state.
      * @param {String} [filePath]       Filepath to download the file to.
-     * @return {Promise} Resolved with internal URL on success, rejected otherwise.
+     * @param {Object} [options]        Extra options (isexternalfile, repositorytype).
+     * @return {Promise}                Resolved with internal URL on success, rejected otherwise.
      * @description
      * Downloads a file on the spot.
      *
@@ -743,16 +793,17 @@ angular.module('mm.core')
      *
      * See {@link $mmFilepool#_getInternalUrlById} for the type of local URL returned.
      */
-    self.downloadUrl = function(siteId, fileUrl, ignoreStale, component, componentId, timemodified, filePath) {
+    self.downloadUrl = function(siteId, fileUrl, ignoreStale, component, componentId, timemodified, filePath, options) {
+        options = options || {};
+
         var fileId,
-            revision,
             promise;
 
         if ($mmFS.isAvailable()) {
             return self._fixPluginfileURL(siteId, fileUrl).then(function(fixedUrl) {
                 fileUrl = fixedUrl;
-                timemodified = timemodified || 0;
-                revision = self.getRevisionFromUrl(fileUrl);
+                options.timemodified = timemodified || 0;
+                options.revision = self.getRevisionFromUrl(fileUrl);
                 fileId = self._getFileIdByUrl(fileUrl);
 
                 // Restore old file if needed.
@@ -764,12 +815,13 @@ angular.module('mm.core')
                     if (typeof fileObject === 'undefined') {
                         // We do not have the file, download and add to pool.
                         self._notifyFileDownloading(siteId, fileId);
-                        return self._downloadForPoolByUrl(siteId, fileUrl, revision, timemodified, filePath);
+                        return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath);
 
-                    } else if (self._isFileOutdated(fileObject, revision, timemodified) && $mmApp.isOnline() && !ignoreStale) {
+                    } else if (self._isFileOutdated(fileObject, options.revision, options.timemodified) &&
+                                $mmApp.isOnline() && !ignoreStale) {
                         // The file is outdated, force the download and update it.
                         self._notifyFileDownloading(siteId, fileId);
-                        return self._downloadForPoolByUrl(siteId, fileUrl, revision, timemodified, filePath, fileObject);
+                        return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath, fileObject);
                     }
 
                     // Everything is fine, return the file on disk.
@@ -783,13 +835,13 @@ angular.module('mm.core')
                     }, function() {
                         // The file was not found in the pool, weird.
                         self._notifyFileDownloading(siteId, fileId);
-                        return self._downloadForPoolByUrl(siteId, fileUrl, revision, timemodified, filePath, fileObject);
+                        return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath, fileObject);
                     });
 
                 }, function() {
                     // The file is not in the pool just yet.
                     self._notifyFileDownloading(siteId, fileId);
-                    return self._downloadForPoolByUrl(siteId, fileUrl, revision, timemodified, filePath);
+                    return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath);
                 })
                 .then(function(response) {
                     if (typeof component !== 'undefined') {
@@ -818,14 +870,15 @@ angular.module('mm.core')
      * @name $mmFilepool#_downloadForPoolByUrl
      * @param {String} siteId           The site ID.
      * @param {String} fileUrl          The file URL.
-     * @param {Number} [revision]       File revision number.
-     * @param {Number} [timemodified]   The time this file was modified. Can be used to check file state.
+     * @param {Object} [options]        Extra options (revision, timemodified, isexternalfile, repositorytype).
      * @param {String} [filePath]       Filepath to download the file to. If defined, no extension will be added.
      * @param {Object} [poolFileObject] When set, the object will be updated, a new entry will not be created.
      * @return {Promise} Resolved with internal URL on success, rejected otherwise.
      * @protected
      */
-    self._downloadForPoolByUrl = function(siteId, fileUrl, revision, timemodified, filePath, poolFileObject) {
+    self._downloadForPoolByUrl = function(siteId, fileUrl, options, filePath, poolFileObject) {
+        options = options || {};
+
         var fileId = self._getFileIdByUrl(fileUrl),
             extension = $mmFS.guessExtensionFromUrl(fileUrl),
             addExtension = typeof filePath == "undefined",
@@ -860,8 +913,10 @@ angular.module('mm.core')
                     data.downloaded = now.getTime();
                     data.stale = false;
                     data.url = fileUrl;
-                    data.revision = revision;
-                    data.timemodified = timemodified;
+                    data.revision = options.revision;
+                    data.timemodified = options.timemodified;
+                    data.isexternalfile = options.isexternalfile;
+                    data.repositorytype = options.repositorytype;
                     data.path = fileEntry.path;
                     data.extension = fileEntry.extension;
 
@@ -1366,16 +1421,17 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#_getFileUrlByUrl
-     * @param {String} siteId            The site ID.
-     * @param {String} fileUrl           The absolute URL to the file.
-     * @param {String} [mode=url]        The type of URL to return. Accepts 'url' or 'src'.
-     * @param {String} component         The component to link the file to.
-     * @param {Mixed} [componentId]      An ID to use in conjunction with the component.
-     * @param {Number} [timemodified=0]  The time this file was modified.
-     * @param {Boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {Boolean} downloadUnknown  True to download file in WiFi if their size is unknown, false otherwise.
-     *                                   Ignored if checkSize=false.
-     * @return {Promise}                 Resolved with the URL to use. When rejected, nothing could be done.
+     * @param {String} siteId             The site ID.
+     * @param {String} fileUrl            The absolute URL to the file.
+     * @param {String} [mode=url]         The type of URL to return. Accepts 'url' or 'src'.
+     * @param {String} component          The component to link the file to.
+     * @param {Mixed} [componentId]       An ID to use in conjunction with the component.
+     * @param {Number} [timemodified=0]   The time this file was modified.
+     * @param {Boolean} [checkSize=true]  True if we shouldn't download files if their size is big, false otherwise.
+     * @param {Boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
+     *                                    Ignored if checkSize=false.
+     * @param {Object} [options]          Extra options (isexternalfile, repositorytype).
+     * @return {Promise}                  Resolved with the URL to use. When rejected, nothing could be done.
      * @description
      * This will return a URL pointing to the content of the requested URL.
      *
@@ -1387,7 +1443,10 @@ angular.module('mm.core')
      * When the file cannot be found, and we are offline, then we reject the promise because
      * there was nothing we could do.
      */
-    self._getFileUrlByUrl = function(siteId, fileUrl, mode, component, componentId, timemodified, checkSize, downloadUnknown) {
+    self._getFileUrlByUrl = function(siteId, fileUrl, mode, component, componentId, timemodified, checkSize, downloadUnknown,
+                options) {
+        options = options || {};
+
         var fileId,
             revision;
 
@@ -1483,14 +1542,14 @@ angular.module('mm.core')
                     // Check if the file should be downloaded.
                     if (sizeUnknown) {
                         if (downloadUnknown && isWifi) {
-                            self.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified);
+                            self.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, 0, options);
                         }
                     } else if (size <= mmFilepoolDownloadThreshold || (isWifi && size <= mmFilepoolWifiDownloadThreshold)) {
-                        self.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified);
+                        self.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, 0, options);
                     }
                 });
             } else {
-                self.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified);
+                self.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, 0, options);
             }
         }
     };
@@ -1877,23 +1936,25 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#getSrcByUrl
-     * @param {String} siteId            The site ID.
-     * @param {String} fileUrl           The absolute URL to the file.
-     * @param {String} component         The component to link the file to.
-     * @param {Mixed} [componentId]      An ID to use in conjunction with the component.
-     * @param {Number} [timemodified]    The time this file was modified.
-     * @param {Boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {Boolean} downloadUnknown  True to download file in WiFi if their size is unknown, false otherwise.
-     *                                   Ignored if checkSize=false.
-     * @return {Promise}                 Resolved with the URL to use. When rejected, nothing could be done,
-     *                                   which means that you should not even use the fileUrl passed.
+     * @param {String} siteId             The site ID.
+     * @param {String} fileUrl            The absolute URL to the file.
+     * @param {String} component          The component to link the file to.
+     * @param {Mixed} [componentId]       An ID to use in conjunction with the component.
+     * @param {Number} [timemodified]     The time this file was modified.
+     * @param {Boolean} [checkSize=true]  True if we shouldn't download files if their size is big, false otherwise.
+     * @param {Boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
+     *                                    Ignored if checkSize=false.
+     * @param {Object} [options]          Extra options (isexternalfile, repositorytype).
+     * @return {Promise}                  Resolved with the URL to use. When rejected, nothing could be done,
+     *                                    which means that you should not even use the fileUrl passed.
      * @description
      * This will return a URL pointing to the content of the requested URL.
      * The URL returned is compatible to use with IMG tags.
      * See {@link $mmFilepool#_getFileUrlByUrl} for more details.
      */
-    self.getSrcByUrl = function(siteId, fileUrl, component, componentId, timemodified, checkSize, downloadUnknown) {
-        return self._getFileUrlByUrl(siteId, fileUrl, 'src', component, componentId, timemodified, checkSize, downloadUnknown);
+    self.getSrcByUrl = function(siteId, fileUrl, component, componentId, timemodified, checkSize, downloadUnknown, options) {
+        return self._getFileUrlByUrl(siteId, fileUrl, 'src', component, componentId,
+                timemodified, checkSize, downloadUnknown, options);
     };
 
     /**
@@ -1923,23 +1984,25 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#getUrlByUrl
-     * @param {String} siteId            The site ID.
-     * @param {String} fileUrl           The absolute URL to the file.
-     * @param {String} component         The component to link the file to.
-     * @param {Mixed} [componentId]      An ID to use in conjunction with the component.
-     * @param {Number} [timemodified]    The time this file was modified.
-     * @param {Boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {Boolean} downloadUnknown  True to download file in WiFi if their size is unknown, false otherwise.
-     *                                   Ignored if checkSize=false.
-     * @return {Promise}                 Resolved with the URL to use. When rejected, nothing could be done,
-     *                                   which means that you should not even use the fileUrl passed.
+     * @param {String} siteId             The site ID.
+     * @param {String} fileUrl            The absolute URL to the file.
+     * @param {String} component          The component to link the file to.
+     * @param {Mixed} [componentId]       An ID to use in conjunction with the component.
+     * @param {Number} [timemodified]     The time this file was modified.
+     * @param {Boolean} [checkSize=true]  True if we shouldn't download files if their size is big, false otherwise.
+     * @param {Boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
+     *                                    Ignored if checkSize=false.
+     * @param {Object} [options]          Extra options (isexternalfile, repositorytype).
+     * @return {Promise}                  Resolved with the URL to use. When rejected, nothing could be done,
+     *                                    which means that you should not even use the fileUrl passed.
      * @description
      * This will return a URL pointing to the content of the requested URL.
      * The URL returned is compatible to use with a local browser.
      * See {@link $mmFilepool#_getFileUrlByUrl} for more details.
      */
-    self.getUrlByUrl = function(siteId, fileUrl, component, componentId, timemodified, checkSize, downloadUnknown) {
-        return self._getFileUrlByUrl(siteId, fileUrl, 'url', component, componentId, timemodified, checkSize, downloadUnknown);
+    self.getUrlByUrl = function(siteId, fileUrl, component, componentId, timemodified, checkSize, downloadUnknown, options) {
+        return self._getFileUrlByUrl(siteId, fileUrl, 'url', component, componentId,
+                timemodified, checkSize, downloadUnknown, options);
     };
 
     /**
@@ -2283,15 +2346,19 @@ angular.module('mm.core')
         var siteId = item.siteId,
             fileId = item.fileId,
             fileUrl = item.url,
-            revision = item.revision,
-            timemodified = item.timemodified,
+            options = {
+                revision: item.revision,
+                timemodified: item.timemodified,
+                isexternalfile: item.isexternalfile,
+                repositorytype: item.repositorytype
+            },
             filePath = item.path,
             links = item.links || [];
 
         $log.debug('Processing queue item: ' + siteId + ', ' + fileId);
         return getSiteDb(siteId).then(function(db) {
             return db.get(mmFilepoolStore, fileId).then(function(fileObject) {
-                if (fileObject && !self._isFileOutdated(fileObject, revision, timemodified)) {
+                if (fileObject && !self._isFileOutdated(fileObject, options.revision, options.timemodified)) {
                     // We have the file, it is not stale, we can update links and remove from queue.
                     $log.debug('Queued file already in store, ignoring...');
                     self._addFileLinks(siteId, fileId, links);
@@ -2322,7 +2389,7 @@ angular.module('mm.core')
         function download(siteId, fileUrl, fileObject, links) {
             // Restore old file if needed.
             return self._restoreOldFileIfNeeded(siteId, fileId, fileUrl, filePath).then(function() {
-                return self._downloadForPoolByUrl(siteId, fileUrl, revision, timemodified, filePath, fileObject).then(function() {
+                return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath, fileObject).then(function() {
                     var promise;
 
                     // Success, we add links and remove from queue.
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 683f6ad649f..e051cba61e0 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -265,7 +265,8 @@ angular.module('mm.core')
             } else {
                 url += '?';
             }
-            url += 'token=' + token;
+            // Always send offline=1 (for external repositories). It shouldn't cause problems for local files or old Moodles.
+            url += 'token=' + token + '&offline=1';
 
             // Some webservices returns directly the correct download url, others not.
             if (url.indexOf('/webservice/pluginfile') == -1) {

From aa0cf27f90fd766c5d5a9f12fab4d47abf0579bd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 2 May 2017 13:45:14 +0200
Subject: [PATCH 107/218] MOBILE-2077 files: Show refresh in resource and
 mm-file if external

---
 www/addons/mod/resource/services/handlers.js  |  8 ++++---
 .../mod/resource/services/prefetch_handler.js | 21 ++++++++++++++++++-
 www/addons/mod/resource/services/resource.js  | 13 ++++++++++++
 .../course/services/prefetchdelegate.js       |  6 +++---
 www/core/directives/file.js                   |  4 ++++
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/resource/services/handlers.js b/www/addons/mod/resource/services/handlers.js
index 2a65b640fdd..6120b4f45b0 100644
--- a/www/addons/mod/resource/services/handlers.js
+++ b/www/addons/mod/resource/services/handlers.js
@@ -112,6 +112,9 @@ angular.module('mm.addons.mod_resource')
                     } else {
                         $scope.icon = $mmCourse.getModuleIconSrc('resource');
                     }
+                }).finally(function() {
+                    // Get current status to decide which icon should be shown.
+                    $mmCoursePrefetchDelegate.getModuleStatus(module, courseId).then(showStatus);
                 });
 
                 $scope.action = function(e) {
@@ -156,6 +159,8 @@ angular.module('mm.addons.mod_resource')
 
                 // Show buttons according to module status.
                 function showStatus(status) {
+                    status = $mmaModResourcePrefetchHandler.determineStatus(status, false, module);
+
                     if (status) {
                         $scope.spinner = status === mmCoreDownloading;
                         downloadBtn.hidden = status !== mmCoreNotDownloaded;
@@ -172,9 +177,6 @@ angular.module('mm.addons.mod_resource')
                     }
                 });
 
-                // Get current status to decide which icon should be shown.
-                $mmCoursePrefetchDelegate.getModuleStatus(module, courseId).then(showStatus);
-
                 $scope.$on('$destroy', function() {
                     statusObserver && statusObserver.off && statusObserver.off();
                 });
diff --git a/www/addons/mod/resource/services/prefetch_handler.js b/www/addons/mod/resource/services/prefetch_handler.js
index 8ccc5fed5cc..82acaa55565 100644
--- a/www/addons/mod/resource/services/prefetch_handler.js
+++ b/www/addons/mod/resource/services/prefetch_handler.js
@@ -22,10 +22,29 @@ angular.module('mm.addons.mod_resource')
  * @name $mmaModResourcePrefetchHandler
  */
 .factory('$mmaModResourcePrefetchHandler', function($mmaModResource, $mmSite, $mmFilepool, $mmPrefetchFactory, $q,
-            mmaModResourceComponent, $mmCourse) {
+            mmaModResourceComponent, $mmCourse, mmCoreDownloaded, mmCoreOutdated) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModResourceComponent, true);
 
+    /**
+     * Determine the status of a module based on the current status detected.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResourcePrefetchHandler#determineStatus
+     * @param {String} status     Current status.
+     * @param  {Boolean} canCheck True if updates can be checked using core_course_check_updates.
+     * @param  {Object} module    The module object returned by WS.
+     * @return {String}           Status to show.
+     */
+    self.determineStatus = function(status, canCheck, module) {
+        if (status === mmCoreDownloaded && $mmaModResource.hasExternalFile(module)) {
+            // The file is from an external repository, show outdated since we can't tell if it was updated.
+            return mmCoreOutdated;
+        }
+        return status;
+    };
+
     /**
      * Prefetch the module.
      *
diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index bb8ddb0ab4f..c67fa2fd018 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -137,6 +137,19 @@ angular.module('mm.addons.mod_resource')
         });
     };
 
+    /**
+     * Check if the file in the resource is an external file.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#hasExternalFile
+     * @param {Object} module The module object.
+     * @return {Boolean}      Whether it's a external file.
+     */
+    self.hasExternalFile = function(module) {
+        return module && module.contents && module.contents[0] && module.contents[0].isexternalfile;
+    };
+
     /**
      * Whether the resource has to be displayed in an iframe.
      *
diff --git a/www/core/components/course/services/prefetchdelegate.js b/www/core/components/course/services/prefetchdelegate.js
index ae78ebcd807..6859ca5ed9d 100644
--- a/www/core/components/course/services/prefetchdelegate.js
+++ b/www/core/components/course/services/prefetchdelegate.js
@@ -68,7 +68,7 @@ angular.module('mm.core')
      *                             - prefetch(module, courseid, single) (Promise) Prefetches a module.
      *                             - (Optional) getFiles(module, courseid) (Object[]|Promise) Get list of files. If not defined,
      *                                                                 we'll assume they're in module.contents.
-     *                             - (Optional) determineStatus(status, canCheck) (String) Returns status to show based on
+     *                             - (Optional) determineStatus(status, canCheck, module) (String) Returns status to show based on
      *                                                                 current. E.g. for books we'll show "outdated" even if state
      *                                                                 is "downloaded" if canCheck=false.
      *                             - (Optional) getRevision(module, courseid) (String|Number|Promise) Returns the module revision.
@@ -295,7 +295,7 @@ angular.module('mm.core')
                     }
                 } else if (handler.determineStatus) {
                     // The handler implements a determineStatus function. Apply it.
-                    return handler.determineStatus(status, canCheck);
+                    return handler.determineStatus(status, canCheck, module);
                 }
             }
             return status;
@@ -926,7 +926,7 @@ angular.module('mm.core')
 
                     // Get the saved package status.
                     return $mmFilepool.getPackageCurrentStatus(siteid, handler.component, module.id).then(function(status) {
-                        status = handler.determineStatus ? handler.determineStatus(status, canCheck) : status;
+                        status = handler.determineStatus ? handler.determineStatus(status, canCheck, module) : status;
                         if (status == mmCoreNotDownloaded || status == mmCoreOutdated || status == mmCoreDownloading) {
                             self.updateStatusCache(handler.component, module.id, status);
                             return self.determineModuleStatus(module, status, true, canCheck);
diff --git a/www/core/directives/file.js b/www/core/directives/file.js
index 9749479d428..e7f44d95d03 100644
--- a/www/core/directives/file.js
+++ b/www/core/directives/file.js
@@ -219,6 +219,10 @@ angular.module('mm.core')
                 return;
             }
 
+            if (scope.file.isexternalfile) {
+                alwaysDownload = true; // Always show the download button in external files.
+            }
+
             scope.filename = fileName;
             scope.fileicon = $mmFS.getFileIcon(fileName);
 

From ccee2a2a9f1e25bf2897963e262cb0ce592b649e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 2 May 2017 16:13:49 +0200
Subject: [PATCH 108/218] MOBILE-2077 mimetypes: Add Google Drive mimetypes

---
 www/core/assets/mimetoext.json | 3 +++
 www/core/assets/mimetypes.json | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/www/core/assets/mimetoext.json b/www/core/assets/mimetoext.json
index 74487ba2c8b..842fcf09d07 100644
--- a/www/core/assets/mimetoext.json
+++ b/www/core/assets/mimetoext.json
@@ -269,6 +269,9 @@
 "application/vnd.geoplan": ["g2w"],
 "application/vnd.geospace": ["g3w"],
 "application/vnd.gmx": ["gmx"],
+"application/vnd.google-apps.document": ["gdoc"],
+"application/vnd.google-apps.presentation": ["gslides"],
+"application/vnd.google-apps.spreadsheet": ["gsheet"],
 "application/vnd.google-earth.kml+xml": ["kml"],
 "application/vnd.google-earth.kmz": ["kmz"],
 "application/vnd.grafeq": ["gqf","gqs"],
diff --git a/www/core/assets/mimetypes.json b/www/core/assets/mimetypes.json
index 060a6500420..2d20c735997 100644
--- a/www/core/assets/mimetypes.json
+++ b/www/core/assets/mimetypes.json
@@ -318,6 +318,8 @@
 "gbr": {"type":"application/rpki-ghostbusters"},
 "gca": {"type":"application/x-gca-compressed"},
 "gdl": {"type":"model/vnd.gdl"},
+"gdoc": {"type":"application/vnd.google-apps.document","icon":"document","groups":["document"]},
+"gdraw": {"type":"application/vnd.google-apps.drawing","icon":"draw"},
 "geo": {"type":"application/vnd.dynageo"},
 "gex": {"type":"application/vnd.geometry-explorer"},
 "ggb": {"type":"application/vnd.geogebra.file","icon":"archive"},
@@ -340,6 +342,8 @@
 "grxml": {"type":"application/srgs+xml"},
 "gsd": {"type":"audio/x-gsm"},
 "gsf": {"type":"application/x-font-ghostscript"},
+"gsheet": {"type":"application/vnd.google-apps.spreadsheet","icon":"spreadsheet","groups":["spreadsheet"]},
+"gslides": {"type":"application/vnd.google-apps.presentation","icon":"powerpoint","groups":["presentation"]},
 "gsm": {"type":"audio/x-gsm"},
 "gsp": {"type":"application/x-gsp"},
 "gss": {"type":"application/x-gss"},

From d28ecb85bc773bd412576f83b63191e0ec8066f0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 3 May 2017 12:35:34 +0200
Subject: [PATCH 109/218] MOBILE-2077 resource: Support embedded files

---
 www/addons/mod/resource/controllers/index.js |  38 +--
 www/addons/mod/resource/services/resource.js | 235 +++++++++++++------
 www/addons/mod/resource/templates/index.html |   4 +
 www/core/assets/mimetypes.json               |  30 +--
 www/core/directives/formattext.js            |   2 +-
 www/core/lib/fs.js                           |  54 +++++
 6 files changed, 260 insertions(+), 103 deletions(-)

diff --git a/www/addons/mod/resource/controllers/index.js b/www/addons/mod/resource/controllers/index.js
index 13cda8fb1c2..ac7377bd09a 100644
--- a/www/addons/mod/resource/controllers/index.js
+++ b/www/addons/mod/resource/controllers/index.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_resource')
  * @name mmaModResourceIndexCtrl
  */
 .controller('mmaModResourceIndexCtrl', function($scope, $stateParams, $mmUtil, $mmaModResource, $log, $mmApp, $mmCourse, $timeout,
-        $mmText, $translate, mmaModResourceComponent, $mmaModResourcePrefetchHandler, $mmCourseHelper, $mmaModResourceHelper) {
+        $mmText, $translate, mmaModResourceComponent, $mmaModResourcePrefetchHandler, $mmCourseHelper, $mmaModResourceHelper, $q) {
     $log = $log.getInstance('mmaModResourceIndexCtrl');
 
     var module = $stateParams.module || {},
@@ -45,6 +45,20 @@ angular.module('mm.addons.mod_resource')
                 return $q.reject();
             }
 
+            // Get the resource instance to get the latest name/description and to know if it's embedded.
+            if ($scope.canGetResource) {
+                return $mmaModResource.getResourceData(courseId, module.id).catch(function() {
+                    // Ignore errors.
+                });
+            } else {
+                return $mmCourse.getModule(module.id, courseId).catch(function() {
+                    // Ignore errors.
+                });
+            }
+        }).then(function(mod) {
+            $scope.title = mod.name;
+            $scope.description = mod.intro || mod.description;
+
             if ($mmaModResource.isDisplayedInIframe(module)) {
                 $scope.mode = 'iframe';
 
@@ -71,6 +85,11 @@ angular.module('mm.addons.mod_resource')
                         }
                     });
                 });
+            } else if ($mmaModResource.isDisplayedEmbedded(module, mod.display)) {
+                $scope.mode = 'embedded';
+                return $mmaModResource.getEmbeddedHtml(module).then(function(html) {
+                    $scope.content = html;
+                });
             } else {
                 $scope.mode = 'external';
 
@@ -78,23 +97,6 @@ angular.module('mm.addons.mod_resource')
                     $mmaModResourceHelper.openFile(module, courseId);
                 };
             }
-        }).then(function() {
-
-            var promise;
-            // Get the module to get the latest title and description.
-            if ($scope.canGetResource) {
-                promise = $mmaModResource.getResourceData(courseId, module.id);
-            } else {
-                promise = $mmCourse.getModule(module.id, courseId);
-            }
-
-            return promise.then(function(mod) {
-                $scope.title = mod.name;
-                $scope.description = mod.intro || mod.description;
-            }).catch(function() {
-                // Ignore errors.
-            });
-
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModResourceComponent);
diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index c67fa2fd018..2f1ef522068 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -27,6 +27,57 @@ angular.module('mm.addons.mod_resource')
 
     var self = {};
 
+    /* Constants to determine how a resource should be displayed in Moodle. */
+    // Try the best way.
+    self.DISPLAY_AUTO = 0;
+    // Display using object tag.
+    self.DISPLAY_EMBED = 1;
+    // Display inside frame.
+    self.DISPLAY_FRAME = 2;
+    // Display normal link in new window.
+    self.DISPLAY_NEW = 3;
+    // Force download of file instead of display.
+    self.DISPLAY_DOWNLOAD = 4;
+    // Open directly.
+    self.DISPLAY_OPEN = 5;
+    // Open in "emulated" pop-up without navigation.
+    self.DISPLAY_POPUP = 6;
+
+    /**
+     * Get the HTML to display an embedded resource.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#getEmbeddedHtml
+     * @param {Object} module The module object.
+     * @return {Promise}      Promise resolved with the iframe src.
+     * @since 3.3
+     */
+    self.getEmbeddedHtml = function(module) {
+        if (!module.contents || !module.contents.length) {
+            return $q.reject();
+        }
+
+        var file = module.contents[0],
+            ext = $mmFS.getFileExtension(file.filename);
+
+        return treatResourceMainFile(file, module.id).then(function(result) {
+            var type = $mmFS.getExtensionType(ext),
+                mimeType = $mmFS.getMimeType(ext);
+
+            if (type == 'image') {
+                return '<img src="' + result.path + '"></img>';
+            } else if (type == 'audio' || type == 'video') {
+                return '<' + type + ' controls title="' + file.filename +'"" src="' + result.path + '">' +
+                    '<source src="' + result.path + '" type="' + mimeType + '">' +
+                    '</' + type +'>';
+            } else {
+                // Shouldn't reach here, the user should have called $mmFS#canBeEmbedded.
+                return '';
+            }
+        });
+    };
+
     /**
      * Download all the files needed and returns the src of the iframe.
      *
@@ -150,6 +201,26 @@ angular.module('mm.addons.mod_resource')
         return module && module.contents && module.contents[0] && module.contents[0].isexternalfile;
     };
 
+    /**
+     * Whether the resource has to be displayed embedded.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#isDisplayedEmbedded
+     * @param {Object} module    The module object.
+     * @param {Number} [display] The display mode (if available).
+     * @return {Boolean}         Whether the resource should be displayed in an iframe.
+     * @since 3.3
+     */
+    self.isDisplayedEmbedded = function(module, display) {
+        if (!module.contents.length || !$mmFS.isAvailable()) {
+            return false;
+        }
+
+        var ext = $mmFS.getFileExtension(module.contents[0].filename);
+        return (display == self.DISPLAY_EMBED || display == self.DISPLAY_AUTO) && $mmFS.canBeEmbedded(ext);
+    };
+
     /**
      * Whether the resource has to be displayed in an iframe.
      *
@@ -157,15 +228,17 @@ angular.module('mm.addons.mod_resource')
      * @ngdoc method
      * @name $mmaModResource#isDisplayedInIframe
      * @param {Object} module The module object.
-     * @return {Boolean}
+     * @return {Boolean}      Whether the resource should be displayed in an iframe.
      */
     self.isDisplayedInIframe = function(module) {
-        if (!module.contents.length) {
+        if (!module.contents.length || !$mmFS.isAvailable()) {
             return false;
         }
-        var ext = $mmFS.getFileExtension(module.contents[0].filename);
 
-        return (ext === 'htm' || ext === 'html') && $mmFS.isAvailable();
+        var ext = $mmFS.getFileExtension(module.contents[0].filename),
+            mimetype = $mmFS.getMimeType(ext);
+
+        return mimetype == 'text/html';
     };
 
     /**
@@ -232,78 +305,25 @@ angular.module('mm.addons.mod_resource')
             return $q.reject();
         }
 
-        var files = [contents[0]],
-            siteId = $mmSite.getId(),
-            revision = $mmFilepool.getRevisionFromFileList(files),
-            timeMod = $mmFilepool.getTimemodifiedFromFileList(files),
-            component = mmaModResourceComponent,
-            url = contents[0].fileurl,
-            fixedUrl = $mmSite.fixPluginfileURL(url),
-            status,
-            promise;
-
-        if ($mmFS.isAvailable()) {
-            // The file system is available.
-            promise = $mmFilepool.getPackageStatus(siteId, component, moduleId, revision, timeMod).then(function(stat) {
-                status = stat;
+        var siteId = $mmSite.getId(),
+            file = contents[0],
+            files = [file];
 
-                var isWifi = !$mmApp.isNetworkAccessLimited(),
-                    isOnline = $mmApp.isOnline();
-
-                if (status === mmCoreDownloaded) {
-                    // Get the local file URL.
-                    return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, contents[0]);
-                } else if (status === mmCoreDownloading) {
-                    // Return the online URL.
-                    return fixedUrl;
-                } else {
-                    if (!isOnline && status === mmCoreNotDownloaded) {
-                        // Not downloaded and we're offline, reject.
-                        return $q.reject();
-                    }
-
-                    return $mmFilepool.shouldDownloadBeforeOpen(fixedUrl, contents[0].filesize).then(function() {
-                        // Download and then return the local URL.
-                        return $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod).then(function() {
-                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, contents[0]);
-                        });
-                    }, function() {
-                        // Start the download if in wifi, but return the URL right away so the file is opened.
-                        if (isWifi && isOnline) {
-                            $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod);
-                        }
-
-                        if (status === mmCoreNotDownloaded || isOnline) {
-                            // Not downloaded or outdated and online, return the online URL.
-                            return fixedUrl;
-                        } else {
-                            // Outdated but offline, so we return the local URL.
-                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, contents[0]);
-                        }
-                    });
-                }
-            });
-        } else {
-            // We use the live URL.
-            promise = $q.when(fixedUrl);
-        }
-
-        return promise.then(function(path) {
-            if (path.indexOf('http') === 0) {
-                return $mmUtil.openOnlineFile(path).catch(function(error) {
+        return treatResourceMainFile(file, moduleId).then(function(result) {
+            if (result.path.indexOf('http') === 0) {
+                return $mmUtil.openOnlineFile(result.path).catch(function(error) {
                     // Error opening the file, some apps don't allow opening online files.
                     if (!$mmFS.isAvailable()) {
                         return $q.reject(error);
                     }
 
                     var subPromise;
-                    if (status === mmCoreDownloading) {
+                    if (result.status === mmCoreDownloading) {
                         subPromise = $mmLang.translateAndReject('mm.core.erroropenfiledownloading');
-                    } else if (status === mmCoreNotDownloaded) {
-                        // File is not downloaded, download and then return the local URL.
-                        subPromise = $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod)
-                                .then(function() {
-                            return $mmFilepool.getInternalUrlByUrl(siteId, url);
+                    } else if (result.status === mmCoreNotDownloaded) {
+                        subPromise = $mmFilepool.downloadPackage(siteId, files, mmaModResourceComponent,
+                                moduleId, result.revision, result.timemodified).then(function() {
+                            return $mmFilepool.getInternalUrlByUrl(siteId, file.fileurl);
                         });
                     } else {
                         // File is outdated or stale and can't be opened in online, return the local URL.
@@ -315,7 +335,7 @@ angular.module('mm.addons.mod_resource')
                     });
                 });
             } else {
-                return $mmUtil.openFile(path);
+                return $mmUtil.openFile(result.path);
             }
         });
     };
@@ -434,5 +454,82 @@ angular.module('mm.addons.mod_resource')
         return $mmUtil.allPromises(promises);
     };
 
+    /**
+     * Treat the main file of a resource, downloading it if needed and returning the URL to use and the status of the resource.
+     *
+     * @param  {Object} file     Resource's main file.
+     * @param  {Number} moduleId The module ID.
+     * @return {Promise}         Promise resolved with an object containing:
+     *                               * fixedurl: The online URL of the main file, ready to be used.
+     *                               * path: The URL to use; can be an online URL or an offline path.
+     *                               * status: The status of the resource.
+     *                               * revision: The resource revision.
+     *                               * timemodified: The resource timemodified.
+     */
+    function treatResourceMainFile(file, moduleId) {
+        var files = [file],
+            siteId = $mmSite.getId(),
+            revision = $mmFilepool.getRevisionFromFileList(files),
+            timeMod = $mmFilepool.getTimemodifiedFromFileList(files),
+            component = mmaModResourceComponent,
+            url = file.fileurl,
+            fixedUrl = $mmSite.fixPluginfileURL(url),
+            result = {
+                fixedurl: fixedUrl,
+                revision: revision,
+                timemodified: timeMod
+            };
+
+        if ($mmFS.isAvailable()) {
+            // The file system is available.
+            return $mmFilepool.getPackageStatus(siteId, component, moduleId, revision, timeMod).then(function(status) {
+                result.status = status;
+
+                var isWifi = !$mmApp.isNetworkAccessLimited(),
+                    isOnline = $mmApp.isOnline();
+
+                if (status === mmCoreDownloaded) {
+                    // Get the local file URL.
+                    return $mmFilepool.getInternalUrlByUrl(siteId, url);
+                } else if (status === mmCoreDownloading) {
+                    // Return the online URL.
+                    return fixedUrl;
+                } else {
+                    if (!isOnline && status === mmCoreNotDownloaded) {
+                        // Not downloaded and we're offline, reject.
+                        return $q.reject();
+                    }
+
+                    return $mmFilepool.shouldDownloadBeforeOpen(fixedUrl, file.filesize).then(function() {
+                        // Download and then return the local URL.
+                        return $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod).then(function() {
+                            return $mmFilepool.getInternalUrlByUrl(siteId, url);
+                        });
+                    }, function() {
+                        // Start the download if in wifi, but return the URL right away so the file is opened.
+                        if (isWifi && isOnline) {
+                            $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod);
+                        }
+
+                        if (status === mmCoreNotDownloaded || isOnline) {
+                            // Not downloaded or outdated and online, return the online URL.
+                            return fixedUrl;
+                        } else {
+                            // Outdated but offline, so we return the local URL.
+                            return $mmFilepool.getUrlByUrl(siteId, url, component, moduleId, timeMod, false, false, file);
+                        }
+                    });
+                }
+            }).then(function(path) {
+                result.path = path;
+                return result;
+            });
+        } else {
+            // We use the live URL.
+            result.path = fixedUrl;
+            return $q.when(result);
+        }
+    }
+
     return self;
 });
diff --git a/www/addons/mod/resource/templates/index.html b/www/addons/mod/resource/templates/index.html
index 49dc696b8a4..4bc50791d68 100644
--- a/www/addons/mod/resource/templates/index.html
+++ b/www/addons/mod/resource/templates/index.html
@@ -18,6 +18,10 @@
                 <mm-iframe src="src"></mm-iframe>
             </div>
 
+            <div ng-if="mode == 'embedded'">
+                <mm-format-text watch="true">{{content}}</mm-format-text>
+            </div>
+
             <div ng-if="mode == 'external'">
                 <a ng-click="open()" class="button button-block icon-left ion-document">{{ 'mma.mod_resource.openthefile' | translate }}</a>
             </div>
diff --git a/www/core/assets/mimetypes.json b/www/core/assets/mimetypes.json
index 2d20c735997..445a11777dd 100644
--- a/www/core/assets/mimetypes.json
+++ b/www/core/assets/mimetypes.json
@@ -82,9 +82,9 @@
 "bin": {"type":"application/octet-stream"},
 "blb": {"type":"application/x-blorb"},
 "blorb": {"type":"application/x-blorb"},
-"bm": {"type":"image/bmp"},
+"bm": {"type":"image/bmp","icon":"bmp","string":"image","groups":["image","web_image"]},
 "bmi": {"type":"application/vnd.bmi"},
-"bmp": {"type":"image/bmp","icon":"bmp","string":"image","groups":["image"]},
+"bmp": {"type":"image/bmp","icon":"bmp","string":"image","groups":["image","web_image"]},
 "boo": {"type":"application/book"},
 "book": {"type":"application/vnd.framemaker"},
 "box": {"type":"application/vnd.previewsystems.box"},
@@ -286,7 +286,7 @@
 "fhc": {"type":"image/x-freehand"},
 "fif": {"type":"application/fractals"},
 "fig": {"type":"application/x-xfig"},
-"flac": {"type":"audio/x-flac"},
+"flac": {"type":"audio/x-flac","icon":"audio","string":"audio","groups":["audio","web_audio"]},
 "fli": {"type":"video/x-fli"},
 "flo": {"type":"application/vnd.micrografx.flo"},
 "flv": {"type":"video/x-flv","icon":"flash","string":"video","groups":["video","web_video"]},
@@ -521,7 +521,7 @@
 "m3a": {"type":"audio/mpeg"},
 "m3u": {"type":"audio/x-mpegurl","icon":"mp3","string":"audio","groups":["audio"]},
 "m3u8": {"type":"application/vnd.apple.mpegurl"},
-"m4a": {"type":"audio/mp4","icon":"mp3","string":"audio","groups":["audio"]},
+"m4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","web_audio"]},
 "m4u": {"type":"video/vnd.mpegurl"},
 "m4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
 "ma": {"type":"application/mathematica","string":"math"},
@@ -588,9 +588,9 @@
 "mp2a": {"type":"audio/mpeg"},
 "mp3": {"type":"audio/mp3","icon":"mp3","string":"audio","groups":["audio","web_audio"]},
 "mp4": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
-"mp4a": {"type":"audio/mp4"},
+"mp4a": {"type":"audio/mp4","icon":"audio","string":"audio","groups":["audio","web_audio"]},
 "mp4s": {"type":"application/mp4"},
-"mp4v": {"type":"video/mp4"},
+"mp4v": {"type":"video/mp4","icon":"mpeg","string":"video","groups":["video","web_video"]},
 "mpa": {"type":"audio/mpeg"},
 "mpc": {"type":"application/vnd.mophun.certificate"},
 "mpe": {"type":"video/mpeg","icon":"mpeg","string":"video","groups":["video","web_video"]},
@@ -674,9 +674,9 @@
 "odp": {"type":"application/vnd.oasis.opendocument.presentation","icon":"impress"},
 "ods": {"type":"application/vnd.oasis.opendocument.spreadsheet","icon":"calc","groups":["spreadsheet"]},
 "odt": {"type":"application/vnd.oasis.opendocument.text","icon":"writer","groups":["document"]},
-"oga": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio"]},
-"ogg": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio"]},
-"ogv": {"type":"video/ogg","icon":"video","string":"video","groups":["video"]},
+"oga": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","web_audio"]},
+"ogg": {"type":"audio/ogg","icon":"audio","string":"audio","groups":["audio","web_audio"]},
+"ogv": {"type":"video/ogg","icon":"video","string":"video","groups":["video","web_video"]},
 "ogx": {"type":"application/ogg"},
 "omc": {"type":"application/x-omc"},
 "omcd": {"type":"application/x-omcdatamaker"},
@@ -975,8 +975,8 @@
 "svgz": {"type":"image/svg+xml","icon":"image","string":"image","groups":["image","web_image"]},
 "svr": {"type":"application/x-world"},
 "swa": {"type":"application/x-director","icon":"flash"},
-"swf": {"type":"application/x-shockwave-flash","icon":"flash","groups":["video","web_video"]},
-"swfl": {"type":"application/x-shockwave-flash","icon":"flash","groups":["video","web_video"]},
+"swf": {"type":"application/x-shockwave-flash","icon":"flash","groups":["video"]},
+"swfl": {"type":"application/x-shockwave-flash","icon":"flash","groups":["video"]},
 "swi": {"type":"application/vnd.aristanetworks.swi"},
 "sxc": {"type":"application/vnd.sun.xml.calc","icon":"calc"},
 "sxd": {"type":"application/vnd.sun.xml.draw","icon":"draw"},
@@ -1111,7 +1111,7 @@
 "w61": {"type":"application/wordperfect6.1"},
 "w6w": {"type":"application/msword"},
 "wad": {"type":"application/x-doom"},
-"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio"]},
+"wav": {"type":"audio/wav","icon":"wav","string":"audio","groups":["audio","web_audio"]},
 "wax": {"type":"audio/x-ms-wax"},
 "wb1": {"type":"application/x-qpro"},
 "wbmp": {"type":"image/vnd.wap.wbmp"},
@@ -1121,8 +1121,8 @@
 "wdb": {"type":"application/vnd.ms-works"},
 "wdp": {"type":"image/vnd.ms-photo"},
 "web": {"type":"application/vnd.xara"},
-"weba": {"type":"audio/webm"},
-"webm": {"type":"video/webm","icon":"video","string":"video","groups":["video"]},
+"weba": {"type":"audio/webm","icon":"audio","string":"audio","groups":["audio","web_audio"]},
+"webm": {"type":"video/webm","icon":"video","string":"video","groups":["video","web_video"]},
 "webp": {"type":"image/webp"},
 "wg": {"type":"application/vnd.pmi.widget"},
 "wgt": {"type":"application/widget"},
@@ -1160,7 +1160,7 @@
 "wtb": {"type":"application/vnd.webturbo"},
 "wtk": {"type":"application/x-wintalk"},
 "wvx": {"type":"video/x-ms-wvx"},
-"x-png": {"type":"image/png"},
+"x-png": {"type":"image/png","icon":"png","string":"image","groups":["image","web_image"]},
 "x3d": {"type":"model/x3d+xml"},
 "x3db": {"type":"model/x3d+binary"},
 "x3dbz": {"type":"model/x3d+binary"},
diff --git a/www/core/directives/formattext.js b/www/core/directives/formattext.js
index 451f54ff777..4c43b72edc3 100644
--- a/www/core/directives/formattext.js
+++ b/www/core/directives/formattext.js
@@ -256,7 +256,7 @@ angular.module('mm.core')
                             container = angular.element('<span class="mm-adapted-img-container"></span>'),
                             jqImg = angular.element(img);
 
-                        container.css('float', img.style.float); // Copy the float to corretly position the search icon.
+                        container.css('float', img.style.float); // Copy the float to correctly position the search icon.
                         if (jqImg.hasClass('atto_image_button_right')) {
                             container.addClass('atto_image_button_right');
                         } else if (jqImg.hasClass('atto_image_button_left')) {
diff --git a/www/core/lib/fs.js b/www/core/lib/fs.js
index 7c600bc7927..63de16de91c 100644
--- a/www/core/lib/fs.js
+++ b/www/core/lib/fs.js
@@ -943,6 +943,22 @@ angular.module('mm.core')
         }
     };
 
+    /**
+     * Get the "type" of an extension, something like "image", "video" or "audio".
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFS#getExtensionType
+     * @param  {String} extension Extension.
+     * @return {Mixed}            Type of the extension.
+     * @since 3.3
+     */
+    self.getExtensionType = function(extension) {
+        if (extToMime[extension] && extToMime[extension].string) {
+            return extToMime[extension].string;
+        }
+    };
+
     /**
      * Guess the extension of a file from its URL.
      *
@@ -1333,5 +1349,43 @@ angular.module('mm.core')
         });
     };
 
+    /**
+     * Check if an extension belongs to at least one of the groups.
+     * Similar to Moodle's file_mimetype_in_typegroup, but using the extension instead of mimetype.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFS#isExtensionInGroup
+     * @param  {String} extension Extension.
+     * @param  {String[]} groups  List of groups to check.
+     * @return {Boolean}          Whether the extension belongs to any of the groups.
+     * @since 3.3
+     */
+    self.isExtensionInGroup = function(extension, groups) {
+        if (groups && groups.length && extToMime[extension] && extToMime[extension].groups) {
+            for (var i = 0; i < extToMime[extension].groups.length; i++) {
+                var group = extToMime[extension].groups[i];
+                if (groups.indexOf(group) != -1) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
+
+    /**
+     * Check if a file can be embedded without using iframes.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFS#canBeEmbedded
+     * @param  {String} extension Extension.
+     * @return {Boolean}          Whether it can be embedded.
+     * @since 3.3
+     */
+    self.canBeEmbedded = function(extension) {
+        return self.isExtensionInGroup(extension, ['web_image', 'web_video', 'web_audio']);
+    };
+
     return self;
 });

From 7d0d43e411bbff4401771d5070c05c7a6711d98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sun, 30 Apr 2017 17:40:40 +0200
Subject: [PATCH 110/218] MOBILE-2100 core: Add empty boxes style

---
 scss/app.scss                                 |  3 +-
 www/addons/badges/templates/userbadges.html   |  5 ++-
 www/addons/calendar/templates/list.html       |  5 ++-
 .../templates/coursecompetencies.html         |  9 +++---
 www/addons/competency/templates/planlist.html |  7 ++--
 www/addons/files/templates/list.html          |  7 ++--
 www/addons/frontpage/templates/frontpage.html |  5 ++-
 www/addons/grades/templates/courses.html      |  5 ++-
 www/addons/messages/templates/contacts.html   |  3 +-
 www/addons/messages/templates/discussion.html |  3 +-
 .../messages/templates/discussions.html       |  7 ++--
 .../mod/assign/templates/submissionlist.html  |  7 ++--
 www/addons/mod/folder/templates/index.html    |  3 +-
 www/addons/mod/forum/scss/styles.scss         |  9 ++++++
 .../mod/forum/templates/discussions.html      | 12 +++++--
 www/addons/mod/glossary/templates/index.html  |  5 +--
 www/addons/mod/wiki/templates/page.html       |  5 ++-
 www/addons/notes/templates/list.html          | 25 ++++++++-------
 www/addons/notifications/templates/list.html  |  5 +--
 www/addons/participants/templates/list.html   |  6 +++-
 .../comments/templates/commentviewer.html     |  5 +--
 .../components/course/templates/section.html  |  5 ++-
 .../courses/controllers/availablecourses.js   |  6 ++--
 .../courses/templates/availablecourses.html   |  7 ++--
 .../courses/templates/coursecategories.html   |  5 +--
 .../components/courses/templates/list.html    |  3 +-
 .../components/courses/templates/search.html  |  5 ++-
 .../sharedfiles/templates/list.html           | 11 ++++---
 www/core/components/user/templates/about.html |  5 +--
 www/core/scss/styles.scss                     | 32 ++++++++++++++-----
 30 files changed, 153 insertions(+), 67 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index f9d67c39acb..1367b867627 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -9,6 +9,7 @@ $black:           #3a3a3a; // Headings, standard text.
 $gray-dark:       #626262; // Text (emphasis-detail), placeholder, background.
 $gray-medium:     #9e9e9e; // Borders (never text).
 $gray-light:      #eeeeee; // Background.
+$gray-lighter:    #f5f5f5;
 $white:           #ffffff; // Background, reversed text.
 
 $blue:            #0064d2; // Link, background.
@@ -53,7 +54,7 @@ $positive: $blue !default;
 $balanced: $green !default;
 $assertive: $red-light !default;
 $energized: $yellow !default;
-$stable: #f5f5f5 !default;
+$stable: $gray-lighter !default;
 
 $mm-color:          $orange;
 $mm-color-light:    lighten($mm-color, 10%);
diff --git a/www/addons/badges/templates/userbadges.html b/www/addons/badges/templates/userbadges.html
index 6d99243b52c..a604c8c6342 100644
--- a/www/addons/badges/templates/userbadges.html
+++ b/www/addons/badges/templates/userbadges.html
@@ -4,7 +4,6 @@
             <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="badgesLoaded" on-refresh="refreshBadges()">
             </ion-refresher>
             <mm-loading hide-until="badgesLoaded">
-                <p ng-if="badges && badges.length == 0" class="padding">{{ 'mma.badges.nobadges' | translate }}</p>
                 <ul class="list" ng-if="badges && badges.length > 0">
                     <li ng-repeat="badge in badges">
                         <a class="item item-avatar" mm-split-view-link="site.issuedbadge({cid: courseId, uid: userId, uniquehash: badge.uniquehash})" title="{{badge.name}}">
@@ -14,6 +13,10 @@ <h2><mm-format-text>{{badge.name}}</mm-format-text></h2>
                         </a>
                     </li>
                 </ul>
+                <div ng-if="badges && badges.length == 0" class="mm-empty-box block">
+                    <i class="icon ion-trophy"></i>
+                    <p>{{ 'mma.badges.nobadges' | translate }}</p>
+                </div>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/calendar/templates/list.html b/www/addons/calendar/templates/list.html
index c40ed64d64f..6e063799e23 100644
--- a/www/addons/calendar/templates/list.html
+++ b/www/addons/calendar/templates/list.html
@@ -11,7 +11,6 @@
             </ion-refresher>
             <mm-loading hide-until="eventsLoaded">
                 <ul class="list">
-                    <li ng-if="filtered.length == 0" class="item">{{ 'mma.calendar.noevents' | translate }}</li>
                     <li ng-repeat="event in events | filter:filterEvent as filtered">
                         <a class="item item-media item-text-wrap" mm-split-view-link="site.calendar-event({id: event.id})" title="{{event.name}}">
                             <img ng-src="{{event.icon}}">
@@ -20,6 +19,10 @@ <h2><mm-format-text watch="true">{{event.name}}</mm-format-text></h2>
                         </a>
                     </li>
                 </ul>
+                <div ng-if="filtered.length == 0" class="mm-empty-box block">
+                    <i class="icon ion-calendar"></i>
+                    <p>{{ 'mma.calendar.noevents' | translate }}</p>
+                </div>
 
                 <ion-infinite-scroll ng-if="canLoadMore" on-infinite="loadMoreEvents()" >
                 </ion-infinite-scroll>
diff --git a/www/addons/competency/templates/coursecompetencies.html b/www/addons/competency/templates/coursecompetencies.html
index b539033bd57..161f9bbf20d 100644
--- a/www/addons/competency/templates/coursecompetencies.html
+++ b/www/addons/competency/templates/coursecompetencies.html
@@ -33,15 +33,16 @@
             </article>
 
             <article>
-                <h3>{{ 'mma.competency.competencies' | translate }}</h3>
+                <h3 ng-if="competencies.statistics.competencycount > 0">{{ 'mma.competency.competencies' | translate }}</h3>
                 <p ng-if="user" class="item item-avatar">
                     <img ng-if="user.profileimageurl && user.profileimageurl !== true" ng-src="{{user.profileimageurl}}" alt="{{ 'mm.core.pictureof' | translate:{$a: user.fullname} }}" mm-external-content>
                     <span ng-if="user.profileimageurl === true" class="button button-icon icon ion-person"></span>
                     <mm-format-text>{{ user.fullname }}</mm-format-text>
                 </p>
-                <span ng-if="competencies.statistics.competencycount == 0">
-                    {{ 'mma.competency.nocompetencies' | translate }}
-                </span>
+                <div ng-if="competencies.statistics.competencycount == 0" class="mm-empty-box block">
+                    <i class="icon ion-ribbon-a"></i>
+                    <p>{{ 'mma.competency.nocompetencies' | translate }}</p>
+                </div>
 
                 <div class="list card" ng-repeat="competency in competencies.competencies">
                     <a ng-click="gotoCompetency(competency.competency.id)" title="{{competency.competency.shortname}}" class="item item-heading item-text-wrap clearfix">
diff --git a/www/addons/competency/templates/planlist.html b/www/addons/competency/templates/planlist.html
index 00c7905495c..53d12d3ba66 100644
--- a/www/addons/competency/templates/planlist.html
+++ b/www/addons/competency/templates/planlist.html
@@ -4,8 +4,7 @@
             <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="plansLoaded" on-refresh="refreshLearningPlans()">
             </ion-refresher>
             <mm-loading hide-until="plansLoaded">
-                <ul class="list">
-                    <li ng-if="plans.length == 0" class="item">{{ 'mma.competency.noplanswerecreated' | translate }}</li>
+                <ul class="list" ng-if="plans.length > 0">
                     <li ng-repeat="plan in plans">
                         <a class="item item-text-wrap" mm-split-view-link="site.learningplan({id: plan.id})" title="{{plan.name}}">
                             <h2>{{plan.name}}</h2>
@@ -13,6 +12,10 @@ <h2>{{plan.name}}</h2>
                         </a>
                     </li>
                 </ul>
+                <div ng-if="plans.length == 0" class="mm-empty-box block">
+                    <i class="icon ion-map"></i>
+                    <p>{{ 'mma.competency.noplanswerecreated' | translate }}</p>
+                </div>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/files/templates/list.html b/www/addons/files/templates/list.html
index 70ab8872f16..4aec5b47306 100644
--- a/www/addons/files/templates/list.html
+++ b/www/addons/files/templates/list.html
@@ -6,7 +6,7 @@
     <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="filesLoaded" on-refresh="refreshFiles()"></ion-refresher>
         <mm-loading hide-until="filesLoaded">
-            <ul class="list">
+            <ul class="list" ng-if="count > 0">
                 <li ng-repeat="file in files">
                     <a ui-sref="site.files-list({path: file.link, title: file.filename})" class="item item-media" ng-if="file.isdir">
                         <img ng-src="{{file.imgpath}}" alt="" role="presentation">
@@ -14,8 +14,11 @@
                     </a>
                     <mm-file ng-if="!file.isdir" file="file" component="{{component}}" component-id="{{file.contextid}}" timemodified="{{file.timemodified}}"></mm-file>
                 </li>
-                <li ng-if="count == 0" class="item">{{ 'mma.files.emptyfilelist' | translate }}</li>
             </ul>
+            <div ng-if="count == 0" class="mm-empty-box block">
+                <i class="icon ion-folder"></i>
+                <p>{{ 'mma.files.emptyfilelist' | translate }}</p>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/addons/frontpage/templates/frontpage.html b/www/addons/frontpage/templates/frontpage.html
index 4be9a33423b..349daf09258 100644
--- a/www/addons/frontpage/templates/frontpage.html
+++ b/www/addons/frontpage/templates/frontpage.html
@@ -23,7 +23,10 @@
                 <mm-course-module class="item item-complex" ng-repeat="module in block.modules" module="module"></mm-course-module>
             </section>
 
-            <p class="padding" ng-if="!hasContent">{{ 'mm.course.nocontentavailable' | translate }}</p>
+            <div ng-if="!hasContent" class="mm-empty-box block">
+                <i class="icon ion-qr-scanner"></i>
+                <p>{{ 'mm.course.nocontentavailable' | translate }}</p>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/addons/grades/templates/courses.html b/www/addons/grades/templates/courses.html
index 33aec098734..6078fa0caa8 100644
--- a/www/addons/grades/templates/courses.html
+++ b/www/addons/grades/templates/courses.html
@@ -4,7 +4,6 @@
             <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="gradesLoaded" on-refresh="refreshGrades()">
             </ion-refresher>
             <mm-loading hide-until="gradesLoaded">
-                <p ng-if="grades.length == 0" class="padding">{{ 'mma.grades.nogradesreturned' | translate }}</p>
                 <ul class="list">
                     <li ng-repeat="grade in grades">
                         <a class="item item-icon-right" mm-split-view-link="site.grades({courseid: grade.courseid, user: userid, forcephoneview: 1})" title="{{grade.coursefullname}}">
@@ -13,6 +12,10 @@
                         </a>
                     </li>
                 </ul>
+                <div ng-if="grades.length == 0" class="mm-empty-box block">
+                    <i class="icon ion-stats-bars"></i>
+                    <p>{{ 'mma.grades.nogradesreturned' | translate }}</p>
+                </div>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/messages/templates/contacts.html b/www/addons/messages/templates/contacts.html
index 2072aaa575a..1de6c5cfb2c 100644
--- a/www/addons/messages/templates/contacts.html
+++ b/www/addons/messages/templates/contacts.html
@@ -22,7 +22,8 @@ <h2>{{ 'mma.messages.type_' + contactType | translate }}</h2>
             </li>
         </ul>
 
-        <div ng-if="!hasContacts" class="padding">
+        <div ng-if="!hasContacts" class="mm-empty-box block">
+            <i class="icon ion-person-stalker"></i>
             <p ng-if="!contacts[searchType]">{{ 'mma.messages.contactlistempty' | translate}}</p>
             <p ng-if="contacts[searchType]">{{ 'mma.messages.nousersfound' | translate}}</p>
         </div>
diff --git a/www/addons/messages/templates/discussion.html b/www/addons/messages/templates/discussion.html
index eb581e8e4b8..aa732a4295f 100644
--- a/www/addons/messages/templates/discussion.html
+++ b/www/addons/messages/templates/discussion.html
@@ -38,7 +38,8 @@
                     <div class="clearfix"></div>
                 </ion-list>
 
-                <div ng-if="!messages || messages.length <= 0">
+                <div ng-if="!messages || messages.length <= 0" class="mm-empty-box block">
+                    <i class="icon ion-chatboxes"></i>
                     <p>{{ 'mma.messages.nomessages' | translate}}</p>
                 </div>
             </section>
diff --git a/www/addons/messages/templates/discussions.html b/www/addons/messages/templates/discussions.html
index 20e5608eb7f..c8dcd2acbc7 100644
--- a/www/addons/messages/templates/discussions.html
+++ b/www/addons/messages/templates/discussions.html
@@ -44,10 +44,13 @@ <h2>{{ 'mm.core.searchresults' | translate }}</h2>
             </li>
         </ul>
 
-        <div ng-if="(!discussions || discussions.length <= 0) && !showSearchResults" class="padding">
+        <div ng-if="(!discussions || discussions.length <= 0) && !showSearchResults" class="mm-empty-box block">
+            <i class="icon ion-chatboxes"></i>
             <p>{{ 'mma.messages.nomessages' | translate}}</p>
         </div>
-        <div ng-if="(!results || results.length <= 0) && showSearchResults" class="padding">
+
+        <div ng-if="(!results || results.length <= 0) && showSearchResults" class="mm-empty-box block">
+            <i class="icon ion-ios-search-strong"></i>
             <p>{{ 'mm.core.noresults' | translate}}</p>
         </div>
     </mm-loading>
diff --git a/www/addons/mod/assign/templates/submissionlist.html b/www/addons/mod/assign/templates/submissionlist.html
index e9ad58f0cd1..990a07e5364 100644
--- a/www/addons/mod/assign/templates/submissionlist.html
+++ b/www/addons/mod/assign/templates/submissionlist.html
@@ -23,10 +23,11 @@ <h2 ng-if="!submission.userfullname">{{ 'mma.mod_assign.hiddenuser' | translate
                     <li class="mm-warning-card-icon item item-text-wrap" ng-if="!haveAllParticipants">
                         <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_assign.notallparticipantsareshown' | translate }}
                     </li>
-                    <li class="padding" ng-if="!submissions || submissions.length == 0">
-                        <p>{{ 'mma.mod_assign.submissionstatus_' | translate }}</p>
-                    </li>
                 </ul>
+                <div ng-if="!submissions || submissions.length == 0" class="mm-empty-box block">
+                    <i class="icon ion-archive"></i>
+                    <p>{{ 'mma.mod_assign.submissionstatus_' | translate }}</p>
+                </div>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/mod/folder/templates/index.html b/www/addons/mod/folder/templates/index.html
index d50b5be1503..3f4a959ca4d 100644
--- a/www/addons/mod/folder/templates/index.html
+++ b/www/addons/mod/folder/templates/index.html
@@ -22,7 +22,8 @@
                     </a>
                 </li>
             </ul>
-            <div class="padding" ng-if="!contents || contents.length == 0">
+            <div ng-if="!contents || contents.length == 0" class="mm-empty-box block">
+                <i class="icon ion-folder"></i>
                 <p>{{ 'mma.mod_folder.emptyfilelist' | translate}}</p>
             </div>
         </mm-loading>
diff --git a/www/addons/mod/forum/scss/styles.scss b/www/addons/mod/forum/scss/styles.scss
index a0257213f02..8631d8d3924 100644
--- a/www/addons/mod/forum/scss/styles.scss
+++ b/www/addons/mod/forum/scss/styles.scss
@@ -1,6 +1,15 @@
 
 .mma-forum-discussion-link {
     text-decoration: none;
+    &.mm-split-item-selected,
+    &.mm-split-item-selected>.item {
+        border-left: 0;
+        padding-left: 0;
+        article .item-heading {
+            border-top: 5px solid $mm-color;
+            margin-top: -1px;
+        }
+    }
 }
 
 .mma-forum-align-right {
diff --git a/www/addons/mod/forum/templates/discussions.html b/www/addons/mod/forum/templates/discussions.html
index 905e1237349..8bc7c25f3c6 100644
--- a/www/addons/mod/forum/templates/discussions.html
+++ b/www/addons/mod/forum/templates/discussions.html
@@ -22,7 +22,7 @@
                     <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
                 </div>
 
-                <ul class="list" ng-if="forum">
+                <ul class="list" ng-if="forum && count > 0">
                     <li class="padding-horizontal" ng-if="isCreateEnabled && forum.cancreatediscussions">
                         <button class="button button-block" mm-split-view-link="site.mod_forum-newdiscussion({forumid: forum.id, cmid: forum.cmid, cid: courseid})">
                             {{ 'mma.mod_forum.addanewdiscussion' | translate }}
@@ -82,8 +82,16 @@ <h2>
                             </article>
                         </a>
                     </li>
-                    <li ng-if="count == 0" class="item item-text-wrap">{{ 'mma.mod_forum.forumnodiscussionsyet' | translate }}</li>
                 </ul>
+                <div ng-if="forum && count == 0" class="mm-empty-box block">
+                    <i class="icon ion-chatboxes"></i>
+                    <p>{{ 'mma.mod_forum.forumnodiscussionsyet' | translate }}</p>
+                    <div class="padding-top" ng-if="isCreateEnabled && forum.cancreatediscussions">
+                        <button class="button button-block" mm-split-view-link="site.mod_forum-newdiscussion({forumid: forum.id, cmid: forum.cmid, cid: courseid})">
+                            {{ 'mma.mod_forum.addanewdiscussion' | translate }}
+                        </button>
+                    </div>
+                </div>
                 <ion-infinite-scroll ng-if="canLoadMore"
                         immediate-check="false"
                         on-infinite="loadMoreDiscussions()" >
diff --git a/www/addons/mod/glossary/templates/index.html b/www/addons/mod/glossary/templates/index.html
index 0087707ab6a..f366fd3cb19 100644
--- a/www/addons/mod/glossary/templates/index.html
+++ b/www/addons/mod/glossary/templates/index.html
@@ -51,8 +51,9 @@ <h2>{{getDivider(entries[$index])}}</h2>
                     </div>
                 </div>
 
-                <div ng-if="showNoEntries" class="mm-info-card">
-                    {{ 'mma.mod_glossary.noentriesfound' | translate }}
+                <div ng-if="showNoEntries" class="mm-empty-box block">
+                    <i class="icon ion-ios-list"></i>
+                    <p>{{ 'mma.mod_glossary.noentriesfound' | translate }}</p>
                 </div>
 
                 <ion-infinite-scroll ng-if="canLoadMore" immediate-check="false" on-infinite="loadMoreEntries()"></ion-infinite-scroll>
diff --git a/www/addons/mod/wiki/templates/page.html b/www/addons/mod/wiki/templates/page.html
index 6929dfeaeeb..46b8bf1c561 100644
--- a/www/addons/mod/wiki/templates/page.html
+++ b/www/addons/mod/wiki/templates/page.html
@@ -19,7 +19,10 @@
 
         <article ng-class="{'mma-mod_wiki-noedit': !canEdit}">
             <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}" ng-if="pageContent">{{ pageContent }}</mm-format-text>
-            <p ng-if="!pageContent">{{ 'mma.mod_wiki.nocontent' | translate }}</p>
+            <div ng-if="!pageContent" class="mm-empty-box block">
+                <i class="icon ion-document"></i>
+                <p>{{ 'mma.mod_wiki.nocontent' | translate }}</p>
+            </div>
         </article>
     </mm-loading>
 </ion-content>
\ No newline at end of file
diff --git a/www/addons/notes/templates/list.html b/www/addons/notes/templates/list.html
index 3657defb6f3..5db33a7f75c 100644
--- a/www/addons/notes/templates/list.html
+++ b/www/addons/notes/templates/list.html
@@ -18,18 +18,21 @@
 
             <div class="list">
                 <article class="card" ng-repeat="note in notes">
-                        <div class="item item-avatar">
-                            <img ng-if="note.userprofileimageurl" ng-src="{{note.userprofileimageurl}}" mm-external-content mm-user-link courseid="{{courseid}}" userid="{{note.userid}}" alt="{{ 'mm.core.pictureof' | translate:{$a: note.userfullname} }}" role="presentation">
-                            <img ng-if="!note.userprofileimageurl" src="img/user-avatar.png" alt="{{ 'mm.core.pictureof' | translate:{$a: note.userfullname} }}" role="presentation">
-                            <div class="item-note" ng-if="!note.offline">{{note.lastmodified | mmDateDayOrTime}}</div>
-                            <div class="item-note" ng-if="note.offline"><i class="icon ion-clock"></i> {{ 'mm.core.notsent' | translate }}</div>
-                            <p>{{note.userfullname}}</p>
-                        </div>
-                        <div class="item item-body">
-                            <p><mm-format-text watch="true" clean="true">{{note.content}}</mm-format-text></p>
-                        </div>
+                    <div class="item item-avatar">
+                        <img ng-if="note.userprofileimageurl" ng-src="{{note.userprofileimageurl}}" mm-external-content mm-user-link courseid="{{courseid}}" userid="{{note.userid}}" alt="{{ 'mm.core.pictureof' | translate:{$a: note.userfullname} }}" role="presentation">
+                        <img ng-if="!note.userprofileimageurl" src="img/user-avatar.png" alt="{{ 'mm.core.pictureof' | translate:{$a: note.userfullname} }}" role="presentation">
+                        <div class="item-note" ng-if="!note.offline">{{note.lastmodified | mmDateDayOrTime}}</div>
+                        <div class="item-note" ng-if="note.offline"><i class="icon ion-clock"></i> {{ 'mm.core.notsent' | translate }}</div>
+                        <p>{{note.userfullname}}</p>
+                    </div>
+                    <div class="item item-body">
+                        <p><mm-format-text watch="true" clean="true">{{note.content}}</mm-format-text></p>
+                    </div>
                 </article>
-                <div ng-if="notes.length == 0" class="item item-text-wrap">{{ 'mma.notes.nonotes' | translate }}</div>
+            </div>
+            <div ng-if="notes.length == 0" class="mm-empty-box block">
+                <i class="icon ion-ios-list"></i>
+                <p>{{ 'mma.notes.nonotes' | translate }}</p>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/addons/notifications/templates/list.html b/www/addons/notifications/templates/list.html
index 5e4882ad7db..fc9ba0ae18e 100644
--- a/www/addons/notifications/templates/list.html
+++ b/www/addons/notifications/templates/list.html
@@ -22,8 +22,9 @@ <h2>{{notification.userfromfullname}}</h2>
                     on-infinite="loadMoreNotifications()" >
             </ion-infinite-scroll>
 
-            <div class="padding" ng-if="!notifications || notifications.length <= 0">
-                <p>{{ 'mma.notifications.therearentnotificationsyet' | translate}}</p>
+            <div ng-if="!notifications || notifications.length <= 0" class="mm-empty-box block">
+                <i class="icon ion-ios-bell"></i>
+                <p>{{ 'mma.notifications.therearentnotificationsyet' | translate }}</p>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/addons/participants/templates/list.html b/www/addons/participants/templates/list.html
index ff3ca689573..f72dbc72a07 100644
--- a/www/addons/participants/templates/list.html
+++ b/www/addons/participants/templates/list.html
@@ -4,7 +4,6 @@
             <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="participantsLoaded" on-refresh="refreshParticipants()">
             </ion-refresher>
             <mm-loading hide-until="participantsLoaded">
-                <p ng-if="participants && participants.length == 0" class="padding">{{ 'mma.participants.noparticipants' | translate }}</p>
                 <ul class="list" ng-if="participants && participants.length > 0">
                     <li ng-repeat="participant in participants">
                         <a class="item item-avatar" mm-split-view-link="{{userStateName}}({courseid: courseid, userid: participant.id})" title="{{participant.fullname}}">
@@ -14,6 +13,11 @@
                     </li>
                 </ul>
 
+                <div ng-if="participants && participants.length == 0" class="mm-empty-box block">
+                    <i class="icon ion-person-stalker"></i>
+                    <p>{{ 'mma.participants.noparticipants' | translate }}</p>
+                </div>
+
                 <ion-infinite-scroll ng-if="canLoadMore"
                         immediate-check="false"
                         on-infinite="loadMoreParticipants()" >
diff --git a/www/core/components/comments/templates/commentviewer.html b/www/core/components/comments/templates/commentviewer.html
index 29d864991cd..a96f6a3a91d 100644
--- a/www/core/components/comments/templates/commentviewer.html
+++ b/www/core/components/comments/templates/commentviewer.html
@@ -13,8 +13,9 @@ <h2>{{ comment.fullname }}</h2>
                     <mm-format-text watch="true" clean="true">{{comment.content}}</mm-format-text>
                 </div>
             </div>
-            <div class="card" ng-if="!comments || !comments.length">
-                <p class="item">{{ 'mm.core.nocomments' | translate }}</p>
+            <div ng-if="!comments || !comments.length" class="mm-empty-box block">
+                <i class="icon ion-chatbubble-working"></i>
+                <p>{{ 'mm.core.nocomments' | translate }}</p>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/core/components/course/templates/section.html b/www/core/components/course/templates/section.html
index 32f0329bed5..10260c99ec2 100644
--- a/www/core/components/course/templates/section.html
+++ b/www/core/components/course/templates/section.html
@@ -29,7 +29,10 @@ <h2><mm-format-text watch="true">{{ section.name }}</mm-format-text></h2>
                     {{ 'mm.course.nocontentavailable' | translate }}
                 </div>
             </section>
-            <p class="padding" ng-if="!hasContent">{{ 'mm.course.nocontentavailable' | translate }}</p>
+            <div ng-if="!hasContent" class="mm-empty-box block">
+                <i class="icon ion-qr-scanner"></i>
+                <p>{{ 'mm.course.nocontentavailable' | translate }}</p>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/courses/controllers/availablecourses.js b/www/core/components/courses/controllers/availablecourses.js
index 7676d2e1330..868d0d6238e 100644
--- a/www/core/components/courses/controllers/availablecourses.js
+++ b/www/core/components/courses/controllers/availablecourses.js
@@ -25,9 +25,11 @@ angular.module('mm.core.courses')
 
     // Convenience function to search courses.
     function loadCourses() {
-        $scope.frontpageCourseId = $mmSite.getSiteHomeId();
+        var frontpageCourseId = $mmSite.getSiteHomeId();
         return $mmCourses.getCoursesByField().then(function(courses) {
-            $scope.courses = courses;
+            $scope.courses = courses.filter(function(course) {
+                return course.id != frontpageCourseId;
+            });
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.courses.errorloadcourses', true);
             return $q.reject();
diff --git a/www/core/components/courses/templates/availablecourses.html b/www/core/components/courses/templates/availablecourses.html
index f28466958f3..e262b41e6cc 100644
--- a/www/core/components/courses/templates/availablecourses.html
+++ b/www/core/components/courses/templates/availablecourses.html
@@ -4,10 +4,11 @@
         </ion-refresher>
         <mm-loading hide-until="coursesLoaded">
             <div ng-if="courses.length > 0">
-                <mm-course-list-item ng-if="course.id != frontpageCourseId" ng-repeat="course in courses track by course.id" course="course"></mm-course-list-item>
+                <mm-course-list-item ng-repeat="course in courses track by course.id" course="course"></mm-course-list-item>
             </div>
-            <div ng-if="!courses.length" class="item">
-                {{ 'mm.courses.nocourses' | translate }}
+            <div ng-if="!courses.length" class="mm-empty-box block">
+                <i class="icon ion-ionic"></i>
+                <p>{{ 'mm.courses.nocourses' | translate }}</p>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/core/components/courses/templates/coursecategories.html b/www/core/components/courses/templates/coursecategories.html
index ab1c1f1d69a..c9dff8a4a3f 100644
--- a/www/core/components/courses/templates/coursecategories.html
+++ b/www/core/components/courses/templates/coursecategories.html
@@ -28,8 +28,9 @@ <h2><mm-format-text watch="true">{{category.name}}</mm-format-text></h2>
                 <p class="item item-divider">{{ 'mm.courses.courses' | translate }}</p>
                 <mm-course-list-item ng-repeat="course in courses" course="course"></mm-course-list-item>
             </div>
-            <div ng-if="!categories.length && !courses.length" class="item">
-                {{ 'mm.courses.nocoursesyet' | translate }}
+            <div ng-if="!categories.length && !courses.length" class="mm-empty-box block">
+                <i class="icon ion-ionic"></i>
+                <p>{{ 'mm.courses.nocoursesyet' | translate }}</p>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/core/components/courses/templates/list.html b/www/core/components/courses/templates/list.html
index a13e14eff1a..91b151ab137 100644
--- a/www/core/components/courses/templates/list.html
+++ b/www/core/components/courses/templates/list.html
@@ -14,7 +14,8 @@
                 </ion-input>
             </div>
             <mm-course-list-progress ng-repeat="course in courses | filter:{fullname: filter.filterText}" course="course" show-summary="true"></mm-course-list-progress>
-            <div ng-if="!courses || !courses.length">
+            <div ng-if="!courses || !courses.length" class="mm-empty-box block">
+                <i class="icon ion-ionic"></i>
                 <p>{{ 'mm.courses.nocourses' | translate }}</p>
                 <p ng-if="searchEnabled">{{ 'mm.courses.searchcoursesadvice' | translate }}</p>
             </div>
diff --git a/www/core/components/courses/templates/search.html b/www/core/components/courses/templates/search.html
index cc69a20c257..5bf0116d3cd 100644
--- a/www/core/components/courses/templates/search.html
+++ b/www/core/components/courses/templates/search.html
@@ -3,7 +3,10 @@
         <mm-searchbox submit-action="search" placeholder="{{ 'mm.courses.search' | translate }}" initial-value="{{searchText}}" search-label="{{ 'mm.courses.search' | translate}}" autofocus="true"></mm-searchbox>
         <div ng-if="courses">
             <p class="item item-divider">{{ 'mm.courses.totalcoursesearchresults' | translate:{$a: total} }}</p>
-            <p class="item" ng-if="total == 0">{{ 'mm.courses.nosearchresults' | translate }}</p>
+            <div ng-if="total == 0" class="mm-empty-box block">
+                <i class="icon ion-ios-search-strong"></i>
+                <p>{{ 'mm.courses.nosearchresults' | translate }}</p>
+            </div>
             <mm-course-list-item ng-repeat="course in courses track by course.id" course="course"></mm-course-list-item>
             <ion-infinite-scroll ng-if="canLoadMore" immediate-check="false" on-infinite="loadMoreResults()">
             </ion-infinite-scroll>
diff --git a/www/core/components/sharedfiles/templates/list.html b/www/core/components/sharedfiles/templates/list.html
index d92a29bae7b..c890613d14e 100644
--- a/www/core/components/sharedfiles/templates/list.html
+++ b/www/core/components/sharedfiles/templates/list.html
@@ -5,7 +5,7 @@
         <mm-site-picker site-selected="changeSite(siteId)" ng-show="filesLoaded"></mm-site-picker>
         <li class="item item-divider"></li>
         <mm-loading hide-until="filesLoaded">
-            <ul class="list">
+            <ul class="list" ng-if="files.length > 0">
                 <li ng-repeat="file in files">
                     <mm-local-file ng-if="file.isFile" file="file" manage="manage" override-click="pick" file-deleted="fileDeleted($index)" file-clicked="filePicked(file)" file-renamed="fileRenamed($index, file)"></mm-local-file>
                     <a class="item item-media" ng-if="!file.isFile" ng-click="openFolder(file)">
@@ -13,11 +13,12 @@
                         {{ file.name }}
                     </a>
                 </li>
-                <li ng-if="files && !files.length" class="item item-text-wrap">
-                    <p ng-if="manage">{{ 'mm.sharedfiles.nosharedfiles' | translate }}</p>
-                    <p ng-if="!manage">{{ 'mm.sharedfiles.nosharedfilestoupload' | translate }}</p>
-                </li>
             </ul>
+            <div ng-if="files && !files.length" class="mm-empty-box block">
+                <i class="icon ion-folder"></i>
+                <p ng-if="manage">{{ 'mm.sharedfiles.nosharedfiles' | translate }}</p>
+                <p ng-if="!manage">{{ 'mm.sharedfiles.nosharedfilestoupload' | translate }}</p>
+            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/user/templates/about.html b/www/core/components/user/templates/about.html
index eb1a9a59cc5..b94162f9c15 100644
--- a/www/core/components/user/templates/about.html
+++ b/www/core/components/user/templates/about.html
@@ -87,8 +87,9 @@ <h2>{{ 'mm.user.description' | translate}}</h2>
                 </div>
             </div>
 
-            <div ng-if="!user">
-                {{ 'mm.user.detailsnotavailable' | translate }}
+            <div ng-if="!user || !hasContact || !hasDetails || !user.description" class="mm-empty-box block">
+                <i class="icon ion-person"></i>
+                <p>{{ 'mm.user.detailsnotavailable' | translate }}</p>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 82e8aca51de..5a29b137675 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -433,9 +433,19 @@ button.item.item-button-right {
 }
 
 .mm-loading-container {
-    width: 100%;
-    text-align: center;
-    margin-top: 10px;
+  width: 100%;
+  text-align: center;
+  margin-top: 10px;
+  clear: both;
+}
+
+.scroll > .padding > mm-loading > .mm-loading-container,
+.scroll > mm-loading > .mm-loading-container {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  right: 0;
+  transform: translateY(-50%);
 }
 
 .mm-loading-content {
@@ -466,8 +476,9 @@ mm-loading.mm-loading-center {
   right: 16px;
 }
 
-.mm-split-item-selected, .mm-split-item-selected .item {
-  background-color: $gray-light;
+.mm-split-item-selected:not(.button),
+.mm-split-item-selected.item:not(.button) {
+  background-color: $gray-lighter;
   border-left: 5px solid $mm-color-light;
   padding-left: $item-padding - 4;
 
@@ -1397,9 +1408,14 @@ i, cite, em, var, address, dfn {
 
 
 .mm-empty-box {
-  padding-top: $item-padding;
+  padding: $item-padding;
   text-align: center;
   color: $dark;
+  position: absolute;
+  top: 50%;
+  left: 0;
+  right: 0;
+  transform: translateY(-65%);
 
   .icon {
     font-size: 120px;
@@ -1419,17 +1435,17 @@ i, cite, em, var, address, dfn {
 progress {
   -webkit-appearance: none;
   appearance: none;
+  height: 5px;
 
   &[value]::-webkit-progress-bar {
     background-color: $gray-light;
     border-radius: 2px;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25) inset;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset;
   }
 
   &[value]::-webkit-progress-value {
     background-color: $mm-color-light;
     border-radius: 2px;
-    background-size: 35px 20px, 100% 100%, 100% 100%;
   }
 }
 

From 8b029327c7bf43e018a5ff427e9bef461e28c9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Sun, 30 Apr 2017 14:27:23 +0200
Subject: [PATCH 111/218] MOBILE-2098 login: Improve login look and feel

---
 www/core/components/login/lang/en.json        |  1 +
 www/core/components/login/scss/styles.scss    | 15 ++----
 .../login/templates/credentials.html          | 49 ++++++++++---------
 .../components/login/templates/reconnect.html | 42 ++++++++--------
 www/core/components/login/templates/site.html | 15 ++----
 www/core/directives/showpassword.js           |  2 +-
 www/core/scss/styles.scss                     | 26 +++++++---
 7 files changed, 79 insertions(+), 71 deletions(-)

diff --git a/www/core/components/login/lang/en.json b/www/core/components/login/lang/en.json
index 58d2cfc96e2..af23eb1c22c 100644
--- a/www/core/components/login/lang/en.json
+++ b/www/core/components/login/lang/en.json
@@ -53,6 +53,7 @@
     "problemconnectingerror": "We're having trouble connecting to",
     "problemconnectingerrorcontinue": "Double check you've entered the address correctly and try again.",
     "profileinvaliddata": "Invalid value",
+    "potentialidps": "Log in using your account on:",
     "recaptchachallengeimage": "reCAPTCHA challenge image",
     "reconnect": "Reconnect",
     "reconnectdescription": "Your authentication token is invalid or has expired, you have to reconnect to the site.",
diff --git a/www/core/components/login/scss/styles.scss b/www/core/components/login/scss/styles.scss
index 17b4fc1a9f5..568c7f79c1a 100644
--- a/www/core/components/login/scss/styles.scss
+++ b/www/core/components/login/scss/styles.scss
@@ -25,8 +25,8 @@
   height: 300px;
 }
 
-.mm-oauth-icon, .button.mm-oauth-icon, .button-bar > .button.mm-oauth-icon {
-  padding: 0 4px;
+.mm-oauth-icon, .item.mm-oauth-icon {
+  padding: ($item-padding / 2);
 
   > img, > span {
     max-height: $item-icon-font-size;
@@ -35,6 +35,7 @@
   }
   > span {
     margin-left: 5px;
+    color: $gray-dark;
   }
 }
 
@@ -43,12 +44,4 @@
     padding-top: 0;
     padding-bottom: 0;
   }
-}
-
-@media only screen and (max-width: 768px) {
-  .mm-oauth-icon, .button.mm-oauth-icon, .button-bar > .button.mm-oauth-icon {
-    &:not(:only-child) > span {
-      display: none;
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 334824cdfa1..1f2559cec9c 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -1,6 +1,6 @@
 <ion-view view-title="{{ 'mm.login.login' | translate }}">
-    <ion-content mm-state-class>
-        <div class="list">
+    <ion-content mm-state-class padding="true">
+        <div class="card">
             <div class="item item-text-wrap item-avatar-center">
                 <!-- Show site logo or a default image. -->
                 <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
@@ -11,28 +11,33 @@
                 <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
                 <p ng-if="sitename">{{siteurl}}</p>
             </div>
-            <form>
-                <ion-input class="item item-input" ng-if="siteChecked && !isBrowserSSO">
-                    <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
-                </ion-input>
-                <ion-input class="item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
-                    <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
-                </ion-input>
-                <div class="item padding">
-                    <button class="button button-block" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+        </div>
+        <form>
+            <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
+                <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
+            </ion-input>
+            <ion-input class="list item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
+                <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
+            </ion-input>
+            <button class="button button-block button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+        </form>
+
+        <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
+            <p>{{ 'mm.login.potentialidps' | translate }}</p>
+            <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
+                <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                <span>{{provider.name}}</span>
+                <i class="icon icon-accessory ion-chevron-right"></i>
+            </a>
+        </div>
+        <div ng-if="canSignup">
+            <div class="card">
+                <div class="item item-text-wrap">
+                    <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
+                    <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
                 </div>
-            </form>
-            <div ng-if="identityProviders && identityProviders.length" class="padding button-bar">
-                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
-                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
-                    <span>{{provider.name}}</span>
-                </button>
-            </div>
-            <div ng-if="canSignup" class="item item-text-wrap">
-                <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
-                <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
-                <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
             </div>
+            <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
         </div>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index 77341969c27..4eff2e7d8e7 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -1,30 +1,32 @@
 <ion-view view-title="{{ 'mm.login.reconnect' | translate }}">
-    <ion-content mm-state-class>
-        <div class="list">
+    <ion-content mm-state-class padding="true">
+        <div class="card">
             <div class="item item-text-wrap item-avatar-center">
                 <img ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
                 <h2 class="padding">{{siteurl}}</h2>
                 <p ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
             </div>
-            <div class="item">
-                <h2>{{ 'mm.login.username' | translate }}</h2>
-                <p>{{credentials.username}}</p>
-            </div>
-            <form>
-                <ion-input class="item item-input mm-ioninput-password">
-                    <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-auto-focus mm-show-password>
-                </ion-input>
-                <div class="item padding button-bar">
-                    <button class="button button-outline" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
-                    <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
-                </div>
-            </form>
-            <div ng-if="identityProviders && identityProviders.length" class="padding button-bar">
-                <button ng-repeat="provider in identityProviders" class="button mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
-                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
-                    <span>{{provider.name}}</span>
-                </button>
+        </div>
+        <div class="list item padding">
+            <h2>{{ 'mm.login.username' | translate }}</h2>
+            <p>{{credentials.username}}</p>
+        </div>
+        <form>
+            <ion-input class="list item item-input mm-ioninput-password">
+                <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-auto-focus mm-show-password>
+            </ion-input>
+            <div class="button-bar">
+                <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
+                <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
             </div>
+        </form>
+        <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
+            <p>{{ 'mm.login.potentialidps' | translate }}</p>
+            <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
+                <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                <span>{{provider.name}}</span>
+                <i class="icon icon-accessory ion-chevron-right"></i>
+            </a>
         </div>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/login/templates/site.html b/www/core/components/login/templates/site.html
index 688d593d345..27532924a48 100644
--- a/www/core/components/login/templates/site.html
+++ b/www/core/components/login/templates/site.html
@@ -3,21 +3,14 @@
       <button class="button button-icon ion-help-circled" ng-click="showHelp()" aria-label="{{ 'mm.core.help' | translate }}"></button>
   </ion-nav-buttons>
   <ion-content padding="true" id="mm-login-site" mm-state-class>
+      <h2 class="padding-top">{{ 'mm.login.siteaddress' | translate }}</h2>
       <div class="card">
         <div class="item item-text-wrap">{{ 'mm.login.newsitedescription' | translate }}</div>
       </div>
-      <div class="list list-inset">
-        <form>
-          <ion-input class="item item-input item-stacked-label">
-            <ion-label>{{ 'mm.login.siteaddress' | translate }}</ion-label>
-            <input type="url" placeholder="moodle.org" ng-model="siteurl" mm-no-input-validation mm-auto-focus >
-          </ion-input>
-          <div class="item item-input padding">
-              <button class="button button-block" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
-              <!-- <input type="submit" class="button button-block" value="{{ 'mm.login.connect' | translate }}" > -->
-          </div>
-        </form>
+      <div class="list item item-input">
+        <input type="url" placeholder="moodle.org" ng-model="siteurl" mm-no-input-validation mm-auto-focus >
       </div>
+      <button class="button button-block button-positive" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
     </form>
   </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/core/directives/showpassword.js b/www/core/directives/showpassword.js
index 7a6c594b189..71688df33bf 100644
--- a/www/core/directives/showpassword.js
+++ b/www/core/directives/showpassword.js
@@ -30,7 +30,7 @@ angular.module('mm.core')
  */
 .directive('mmShowPassword', function($compile) {
 
-    var buttonHtml = '<a class="button button-clear button-positive icon" aria-label="{{ label | translate }}" ' +
+    var buttonHtml = '<a class="button button-clear icon" aria-label="{{ label | translate }}" ' +
                         'ng-class="{\'ion-eye\': !shown, \'ion-eye-disabled\': shown}" ng-click="toggle()" ' +
                         'mm-keep-keyboard="{{selector}}" keep-in-button="true"></a>';
 
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 82e8aca51de..abe6608a562 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -358,10 +358,10 @@ p.item-text-wrap {
   .mm-split-pane-menu {
     @include flex(0, 0, $menu-width);
     width: $menu-width;
-    border-right: 1px solid #ddd;
   }
   .mm-split-pane-content {
     display: block;
+    box-shadow: $menu-side-shadow;
   }
 }
 
@@ -572,11 +572,21 @@ mm-navigation-bar {
 
 .row-buttons {
   @include display-flex();
-  padding: $item-padding - ($button-block-margin / 2);
+  padding: 0;
+
+  &.item {
+    padding: $item-padding - ($button-block-margin / 2);
+  }
+  &.padding-top {
+    padding-top: $content-padding;
+  }
 
   .button.button-block {
     @include flex(1);
-    margin: ($button-block-margin / 2);
+    margin: ($button-block-margin/2) $button-block-margin ($button-block-margin/2) 0;
+    &:last-child {
+      margin-right: 0;
+    }
   }
 }
 
@@ -844,7 +854,7 @@ mm-timer {
   .icon {
     font-size: $mm-text-with-icon-height;
     padding: 0 5px;
-    color: $positive;
+    color: $mm-buttons-color;
   }
 }
 
@@ -1067,7 +1077,7 @@ input[type="radio"].mm-radio {
     border: 0;
   }
   .tabs-icon-round {
-    color: $positive;
+    color: $mm-buttons-color;
 
     .tab-item.activated {
       opacity: 0.7;
@@ -1079,7 +1089,7 @@ input[type="radio"].mm-radio {
       font-size: 22px;
       line-height: 32px;
       color: white;
-      background-color: $positive;
+      background-color: $mm-buttons-color;
       margin-bottom: 5px;
 
       &:before {
@@ -1440,3 +1450,7 @@ progress {
 .padding > .button.button-block:only-child {
   margin-bottom: 0;
 }
+
+h2.invert {
+  color: $white;
+}

From 3d3f2f764f1fa7f8481b04e9e35976f7fa3d68f1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 19 Apr 2017 10:52:48 +0200
Subject: [PATCH 112/218] MOBILE-2016 lesson: Allow storing multiple offline
 answers per page

---
 www/addons/mod/lesson/main.js                 |   4 +
 .../mod/lesson/services/lesson_offline.js     | 139 ++++++++++++++++--
 2 files changed, 130 insertions(+), 13 deletions(-)

diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 2f103c5d952..a406fb8d19c 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -18,6 +18,10 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
 .constant('mmaModLessonAutomSyncedEvent', 'mma_mod_lesson_autom_synced')
 .constant('mmaModLessonSyncTime', 300000) // In milliseconds.
 
+// Constants used to identify the type of pages and questions.
+.constant('mmaModLessonTypeQuestion', 0)
+.constant('mmaModLessonTypeStructure', 1)
+
 .config(function($stateProvider) {
 
     $stateProvider
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index 9f7f013aada..c5a778dae0b 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -14,8 +14,8 @@
 
 angular.module('mm.addons.mod_lesson')
 
-.constant('mmaModLessonAttemptsStore', 'mod_lesson_attempts')
-.constant('mmaModLessonAnswersStore', 'mod_lesson_answers')
+.constant('mmaModLessonAttemptsStore', 'mma_mod_lesson_attempts')
+.constant('mmaModLessonAnswersStore', 'mma_mod_lesson_answers')
 
 .config(function($mmSitesFactoryProvider, mmaModLessonAttemptsStore, mmaModLessonAnswersStore) {
     var stores = [
@@ -42,7 +42,7 @@ angular.module('mm.addons.mod_lesson')
         },
         {
             name: mmaModLessonAnswersStore,
-            keyPath: ['lessonid', 'attempt', 'pageid'],
+            keyPath: ['lessonid', 'attempt', 'pageid', 'timemodified'], // A user can answer several times per page and attempt.
             indexes: [
                 {
                     name: 'lessonid'
@@ -57,7 +57,7 @@ angular.module('mm.addons.mod_lesson')
                     name: 'pageid'
                 },
                 {
-                    name: 'type' // Type of the page: TYPE_QUESTION or TYPE_STRUCTURE.
+                    name: 'type' // Type of the page: mmaModLessonTypeQuestion or mmaModLessonTypeStructure.
                 },
                 {
                     name: 'timemodified'
@@ -73,6 +73,10 @@ angular.module('mm.addons.mod_lesson')
                 {
                     name: 'lessonAndAttemptAndType',
                     keyPath: ['lessonid', 'attempt', 'type']
+                },
+                {
+                    name: 'lessonAndAttemptAndPage',
+                    keyPath: ['lessonid', 'attempt', 'pageid']
                 }
             ]
         }
@@ -88,7 +92,7 @@ angular.module('mm.addons.mod_lesson')
  * @name $mmaModLessonOffline
  */
 .factory('$mmaModLessonOffline', function($log, $mmSitesManager, $mmUtil, $q, mmaModLessonAttemptsStore, mmaModLessonAnswersStore,
-            $mmSite) {
+            $mmSite, mmaModLessonTypeQuestion) {
 
     $log = $log.getInstance('$mmaModLessonOffline');
 
@@ -115,16 +119,25 @@ angular.module('mm.addons.mod_lesson')
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#deleteAttemptAnswerForPage
+     * @name $mmaModLessonOffline#deleteAttemptAnswersForPage
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} attempt  Attempt number.
      * @param  {Number} pageId   Page ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when done.
      */
-    self.deleteAttemptAnswerForPage = function(lessonId, attempt, pageId, siteId) {
+    self.deleteAttemptAnswersForPage = function(lessonId, attempt, pageId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().remove(mmaModLessonAnswersStore, [lessonId, attempt, pageId]);
+            // Get the answers and delete them.
+            return self.getAttemptAnswersForPage(lessonId, attempt, pageId, siteId).then(function(answers) {
+                var promises = [];
+
+                angular.forEach(answers, function(answer) {
+                    promises.push(site.getDb().remove(mmaModLessonAnswersStore, [lessonId, attempt, pageId, answer.timemodified]));
+                });
+
+                return $q.all(promises);
+            });
         });
     };
 
@@ -269,16 +282,16 @@ angular.module('mm.addons.mod_lesson')
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAttemptAnswerForPage
+     * @name $mmaModLessonOffline#getAttemptAnswersForPage
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} attempt  Attempt number.
      * @param  {Number} pageId   Page ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with the attempt answers.
      */
-    self.getAttemptAnswerForPage = function(lessonId, attempt, pageId, siteId) {
+    self.getAttemptAnswersForPage = function(lessonId, attempt, pageId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().get(mmaModLessonAnswersStore, [lessonId, attempt, pageId]);
+            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttemptAndPage', [lessonId, attempt, pageId]);
         });
     };
 
@@ -290,7 +303,7 @@ angular.module('mm.addons.mod_lesson')
      * @name $mmaModLessonOffline#getAttemptAnswersForType
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} attempt  Attempt number.
-     * @param  {Number} type     Type of the pages to get: TYPE_QUESTION or TYPE_STRUCTURE.
+     * @param  {Number} type     Type of the pages to get: mmaModLessonTypeQuestion or mmaModLessonTypeStructure.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with the attempt answers.
      */
@@ -327,6 +340,37 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    /**
+     * Retrieve the last offline answer stored in an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getLastQuestionPageAnswer
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempt (undefined if no attempts).
+     */
+    self.getLastQuestionPageAnswer = function(lessonId, attempt, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        return getAttemptWithFallback(lessonId, 0, attempt, siteId).then(function(attemptData) {
+            if (!attemptData.lastquestionpage) {
+                // No question page answered.
+                return;
+            }
+
+            return self.getAttemptAnswersForPage(lessonId, attempt, attemptData.lastquestionpage, siteId).then(function(answers) {
+                // Return the answer with highest timemodified.
+                return answers.reduce(function(a, b) {
+                    return a.timemodified > b.timemodified ? a : b;
+                });
+            });
+        }).catch(function() {
+            // Error, return undefined.
+        });
+    };
+
     /**
      * Retrieve all offline answers for a lesson.
      *
@@ -343,6 +387,39 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get questions attempts for a lesson and attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getQuestionsAttempts
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} attempt        Attempt number.
+     * @param  {Boolean} correct       True to only fetch correct attempts, false to get them all.
+     * @param  {Number} [pageId]       If defined, only get attempts on this page.
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the questions attempts.
+     */
+    self.getQuestionsAttempts = function(lessonId, attempt, correct, pageId, siteId) {
+        var promise;
+        if (pageId) {
+            // Page ID is set, only get the answers for that page.
+            promise = self.getAttemptAnswersForPage(lessonId, attempt, pageId, siteId);
+        } else {
+            // Page ID not specified, get all the question answers.
+            promise = self.getAttemptAnswersForType(lessonId, attempt, mmaModLessonTypeQuestion, siteId);
+        }
+
+        return promise.then(function(answers) {
+            if (correct) {
+                return answers.filter(function(answer) {
+                    return !!answer.correct;
+                });
+            }
+            return answers;
+        });
+    };
+
     /**
      * Check if there are offline answers for an attempt.
      *
@@ -425,10 +502,13 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Object} page       Page.
      * @param  {Object} data       Data to save.
      * @param  {Number} newPageId  New page ID (calculated).
+     * @param  {Boolean} [correct] If answer is correct. Only for question pages.
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved in success, rejected otherwise.
      */
-    self.processPage = function(lessonId, courseId, attempt, page, data, newPageId, siteId) {
+    self.processPage = function(lessonId, courseId, attempt, page, data, newPageId, correct, siteId) {
+        siteId = siteId || $mmSite.getId();
+
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var entry = {
                 lessonid: lessonId,
@@ -438,10 +518,43 @@ angular.module('mm.addons.mod_lesson')
                 data: data,
                 type: page.type,
                 newpageid: newPageId,
+                correct: !!correct,
                 timemodified: $mmUtil.timestamp()
             };
 
             return site.getDb().insert(mmaModLessonAnswersStore, entry);
+        }).then(function() {
+            if (page.type == mmaModLessonTypeQuestion) {
+                // It's a question page, set it as last question page answered.
+                return self.setLastQuestionPageAnswered(lessonId, courseId, attempt, page.id, siteId);
+            }
+        });
+    };
+
+    /**
+     * Set the last question page answered in an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#setLastQuestionPageAnswered
+     * @param  {Number} lessonId  Lesson ID.
+     * @param  {Number} courseId  Course ID the lesson belongs to.
+     * @param  {Number} attempt   Attempt number.
+     * @param  {Number} lastPage  ID of the last question page answered.
+     * @param  {String} [siteId]  Site ID. If not defined, current site.
+     * @return {Promise}          Promise resolved in success, rejected otherwise.
+     */
+    self.setLastQuestionPageAnswered = function(lessonId, courseId, attempt, lastPage, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        // Get current stored attempt.
+        return getAttemptWithFallback(lessonId, courseId, attempt, siteId).then(function(entry) {
+            return $mmSitesManager.getSite(siteId).then(function(site) {
+                entry.lastquestionpage = lastPage;
+                entry.timemodified = $mmUtil.timestamp();
+
+                return site.getDb().insert(mmaModLessonAttemptsStore, entry);
+            });
         });
     };
 

From 34b0c2cfa6eb39068bda56d52270923a6e2bd291 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 20 Apr 2017 12:25:34 +0200
Subject: [PATCH 113/218] MOBILE-2016 lesson: Allow answering questions in
 offline

---
 www/addons/mod/lesson/controllers/index.js    |    4 +-
 www/addons/mod/lesson/controllers/player.js   |    1 +
 www/addons/mod/lesson/lang/en.json            |    7 +
 www/addons/mod/lesson/services/lesson.js      | 1183 +++++++++++++++--
 www/addons/mod/lesson/services/lesson_sync.js |   14 +-
 .../mod/lesson/services/prefetch_handler.js   |   12 +-
 www/core/lib/text.js                          |   24 +
 7 files changed, 1159 insertions(+), 86 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index e0b4baf4453..a31e74db5e6 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -83,8 +83,9 @@ angular.module('mm.addons.mod_lesson')
                     $scope.hasOffline = hasOffline;
                 }));
 
-                // Update the list of content pages viewed.
+                // Update the list of content pages viewed and question attempts.
                 promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, accessInfo.attemptscount));
+                promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, accessInfo.attemptscount));
             }
 
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
@@ -182,6 +183,7 @@ angular.module('mm.addons.mod_lesson')
             promises.push($mmaModLesson.invalidateLessonWithPassword(lesson.id));
             promises.push($mmaModLesson.invalidateTimers(lesson.id));
             promises.push($mmaModLesson.invalidateContentPagesViewed(lesson.id));
+            promises.push($mmaModLesson.invalidateQuestionsAttempts(lesson.id));
         }
 
         return $q.all(promises).finally(function() {
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 1c58c406b57..41d0afa92b6 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -293,6 +293,7 @@ angular.module('mm.addons.mod_lesson')
     function processPage(data) {
         showLoading();
 
+        // @todo Refresh contentpagesviewed and questionsattempts after online process.
         var args = [lesson, courseId, $scope.pageData, data, password, $scope.review, offline, accessInfo, jumps];
         return callFunction($mmaModLesson.processPage, args, 6).then(function(result) {
             if (result.nodefaultresponse || result.inmediatejump) {
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index b3b75c775d2..69ebdd7c0c3 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -4,19 +4,23 @@
     "congratulations": "Congratulations - end of lesson reached",
     "continue": "Continue",
     "continuetonextpage": "Continue to next page.",
+    "defaultessayresponse": "Your essay will be graded by your teacher.",
     "displayofgrade": "Display of grade (for students only)",
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
     "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
     "finish": "Finish",
     "finishattemptoffline": "This attempt has been finished in offline.",
+    "firstwrong": "You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)",
     "gotoendoflesson": "Go to the end of the lesson",
     "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
     "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
     "lessonmenu": "Lesson menu",
     "linkedmedia": "Linked media",
     "loginfail": "Login failed, please try again...",
+    "maximumnumberofattemptsreached": "Maximum number of attempts reached - Moving to next page",
     "modattemptsnoteacher": "Student review only works for students.",
+    "noanswer": "One or more questions have no answer given.  Please go back and submit an answer.",
     "numberofcorrectanswers": "Number of correct answers: {{$a}}",
     "numberofpagesviewednotice": "Number of questions answered: {{$a.nquestions}} (You should answer at least {{$a.minquestions}})",
     "ongoingcustom": "You have earned {{$a.score}} point(s) out of {{$a.currenthigh}} point(s) thus far.",
@@ -26,11 +30,14 @@
     "reviewlesson": "Review lesson",
     "reviewquestionback": "Yes, I'd like to try again",
     "reviewquestioncontinue": "No, I just want to go on to the next question",
+    "secondpluswrong": "Not quite.  Would you like to try again?",
     "startattempt": "Start attempt",
     "submit": "Submit",
     "teacherongoingwarning": "Ongoing score is only displayed for student.  Login as a student to test ongoing score",
     "teachertimerwarning": "Timer only works for students.  Test the timer by logging in as a student.",
     "teacherjumpwarning": "An {{$a.cluster}} jump or an {{$a.unseen}} jump is being used in this lesson.  The next page jump will be used instead.  Login as a student to test these jumps.",
+    "thatsthecorrectanswer": "That's the correct answer",
+    "thatsthewronganswer": "That's the wrong answer",
     "timeremaining": "Time remaining",
     "unseenpageinbranch": "Unseen question within a content page",
     "welldone": "Well done!",
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 59747d8a8cd..20ec8834ac2 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -14,7 +14,7 @@
 
 angular.module('mm.addons.mod_lesson')
 
-.constant('mmaModLessonPasswordStore', 'mod_lesson_password')
+.constant('mmaModLessonPasswordStore', 'mma_mod_lesson_password')
 
 .config(function($mmSitesFactoryProvider, mmaModLessonPasswordStore) {
     var stores = [
@@ -35,23 +35,29 @@ angular.module('mm.addons.mod_lesson')
  * @name $mmaModLesson
  */
 .factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $mmLang, $mmaModLessonOffline,
-            $translate, $mmSite, mmCoreGradeTypeNone) {
+            $translate, $mmSite, mmCoreGradeTypeNone, mmaModLessonTypeQuestion, mmaModLessonTypeStructure, $mmText) {
 
     $log = $log.getInstance('$mmaModLesson');
 
     var self = {};
 
+    // This page.
+    self.LESSON_THISPAGE = 0;
+    // Next page -> any page not seen before.
+    self.LESSON_UNSEENPAGE = 1;
+    // Next page -> any page not answered correctly.
+    self.LESSON_UNANSWEREDPAGE = 2;
+    // Jump to Next Page.
+    self.LESSON_NEXTPAGE = -1;
     // End of Lesson.
     self.LESSON_EOL = -9;
     // Jump to an unseen page within a branch and end of branch or end of lesson.
     self.LESSON_UNSEENBRANCHPAGE = -50;
+    // Jump to a random page within a branch and end of branch or end of lesson.
+    self.LESSON_RANDOMPAGE = -60;
     // Cluster Jump.
     self.LESSON_CLUSTERJUMP = -80;
 
-    // Constants used to identify the type of pages and questions.
-    self.TYPE_QUESTION = 0;
-    self.TYPE_STRUCTURE = 1;
-
     self.LESSON_PAGE_SHORTANSWER =  1;
     self.LESSON_PAGE_TRUEFALSE =    2;
     self.LESSON_PAGE_MULTICHOICE =  3;
@@ -63,17 +69,31 @@ angular.module('mm.addons.mod_lesson')
     self.LESSON_PAGE_CLUSTER =      30;
     self.LESSON_PAGE_ENDOFCLUSTER = 31;
 
+    /**
+     * Add a message to a list of messages, following the format of the messages returned by WS.
+     *
+     * @param {String[]} messages     List of messages where to add the message.
+     * @param {String} stringName     The ID of the message to be translated. E.g. 'mma.mod_lesson.numberofpagesviewednotice'.
+     * @param {Object} [stringParams] The params of the message (if any).
+     */
+    function addMessage(messages, stringName, stringParams) {
+        messages.push({
+            message: $translate.instant(stringName, stringParams)
+        });
+    }
+
     /**
      * Calculate some offline data like progress and ongoingscore.
      *
-     * @param  {Object} lesson     Lesson.
-     * @param  {Object} accessInfo Result of get access info.
-     * @param  {String} [password] Lesson password (if any).
-     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
-     * @param  {String} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise}           Promise resolved with the calculated data.
+     * @param  {Object} lesson      Lesson.
+     * @param  {Object} accessInfo  Result of get access info.
+     * @param  {String} [password]  Lesson password (if any).
+     * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} [pageIndex] Object containing all the pages indexed by ID. If not defined, it will be calculated.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with the calculated data.
      */
-    function calculateOfflineData(lesson, accessInfo, password, review, siteId) {
+    function calculateOfflineData(lesson, accessInfo, password, review, pageIndex, siteId) {
         accessInfo = accessInfo || {};
 
         var reviewMode = review || accessInfo.reviewmode,
@@ -86,7 +106,7 @@ angular.module('mm.addons.mod_lesson')
                 ongoingMessage = self.getOngoingScoreMessage(lesson, accessInfo, review);
             }
             if (lesson.progressbar) {
-                promises.push(self.calculateProgress(lesson.id, accessInfo, password, review, false, siteId).then(function(p) {
+                promises.push(self.calculateProgress(lesson.id, accessInfo, password, review, pageIndex, siteId).then(function(p) {
                     progress = p;
                 }));
             }
@@ -108,15 +128,15 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#calculateProgress
-     * @param  {Number} lessonId   Lesson ID.
-     * @param  {Object} accessInfo Result of get access info.
-     * @param  {String} [password] Lesson password (if any).
-     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
-     * @param  {Object[]} [pages]  Result of getPages. If not defined, it will be calculated.
-     * @param  {String} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise}           Promise resolved with a number: the progress (scale 0-100).
+     * @param  {Number} lessonId    Lesson ID.
+     * @param  {Object} accessInfo  Result of get access info.
+     * @param  {String} [password]  Lesson password (if any).
+     * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} [pageIndex] Object containing all the pages indexed by ID. If not defined, it will be calculated.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with a number: the progress (scale 0-100).
      */
-    self.calculateProgress = function(lessonId, accessInfo, password, review, pages, siteId) {
+    self.calculateProgress = function(lessonId, accessInfo, password, review, pageIndex, siteId) {
         siteId = siteId || $mmSite.getId();
 
         // Check if the user is reviewing the attempt.
@@ -124,12 +144,16 @@ angular.module('mm.addons.mod_lesson')
             return 100;
         }
 
-        var promise = pages ? $q.when(pages) : self.getPages(lessonId, password, true, false, siteId),
-            pageIndex;
-
-        return promise.then(function(pages) {
-            pageIndex = createPagesIndex(pages);
+        var promise;
+        if (pageIndex) {
+            promise = $q.when();
+        } else {
+            promise = self.getPages(lessonId, password, true, false, siteId).then(function(pages) {
+                pageIndex = createPagesIndex(pages);
+            });
+        }
 
+        return promise.then(function() {
             // @todo Question pages.
 
             // Get the list of viewed content pages.
@@ -153,6 +177,549 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if an answer is correct or not and return the result object.
+     * This method is based on the check_answer implementation of all page types (Moodle).
+     *
+     * @param  {Object} lesson    Lesson.
+     * @param  {Object} pageData  Result of getPageData for the page to process.
+     * @param  {Object} data      Data containing the user answer.
+     * @param  {Object} jumps     Result of get pages possible jumps.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID.
+     * @return {Object}           Result.
+     */
+    function checkAnswer(lesson, pageData, data, jumps, pageIndex) {
+        // Default result.
+        var result = {
+            answerid: 0,
+            noanswer: false,
+            correctanswer: false,
+            isessayquestion: false,
+            response: '',
+            newpageid: 0,
+            studentanswer: '',
+            userresponse: null,
+            feedback: '',
+            nodefaultresponse: false,
+            inmediatejump: false
+        };
+
+        switch (pageData.page.qtype) {
+            case self.LESSON_PAGE_BRANCHTABLE:
+                // Load the new page immediately.
+                result.inmediatejump = true;
+                result.newpageid = getNewPageId(pageData.page.id, data.jumpto, jumps);
+                break;
+
+            case self.LESSON_PAGE_ESSAY:
+                checkAnswerEssay(pageData, data, result);
+                break;
+
+            case self.LESSON_PAGE_MATCHING:
+                checkAnswerMatching(pageData, data, result);
+                break;
+
+            case self.LESSON_PAGE_MULTICHOICE:
+                checkAnswerMultichoice(lesson, pageData, data, pageIndex, result);
+                break;
+
+            case self.LESSON_PAGE_NUMERICAL:
+                checkAnswerNumerical(lesson, pageData, data, pageIndex, result);
+                break;
+
+            case self.LESSON_PAGE_SHORTANSWER:
+                checkAnswerShort(lesson, pageData, data, pageIndex, result);
+                break;
+
+            case self.LESSON_PAGE_TRUEFALSE:
+                checkAnswerTruefalse(lesson, pageData, data, pageIndex, result);
+                break;
+        }
+
+
+        return result;
+    }
+
+    /**
+     * Check an essay answer.
+     *
+     * @param  {Object} pageData Result of getPageData for the page to process.
+     * @param  {Object} data     Data containing the user answer.
+     * @param  {Object} result   Object where to store the result.
+     * @return {Void}
+     */
+    function checkAnswerEssay(pageData, data, result) {
+        var studentAnswer;
+
+        result.isessayquestion = true;
+
+        if (!data) {
+            result.inmediatejump = true;
+            result.newpageid = pageData.page.id;
+            return result;
+        }
+
+        if (angular.isObject(data.answer)) {
+            studentAnswer = data.answer.text;
+        } else {
+            studentAnswer = data.answer;
+        }
+
+        if (!studentAnswer || studentAnswer.trim() === '') {
+            result.noanswer = true;
+            return;
+        }
+
+        // Essays should only have 1 answer.
+        angular.forEach(pageData.answers, function(answer) {
+            result.answerid = answer.id;
+            result.newpageid = answer.jumpto;
+        });
+
+        // Don't store userresponse because it contains a PHP serialization so it shouldn't be used by the app.
+        result.studentanswerformat = 1;
+        result.studentanswer = studentAnswer;
+    }
+
+    /**
+     * Check a matching answer.
+     *
+     * @param  {Object} pageData  Result of getPageData for the page to process.
+     * @param  {Object} data      Data containing the user answer.
+     * @param  {Object} result    Object where to store the result.
+     * @return {Void}
+     */
+    function checkAnswerMatching(pageData, data, result) {
+        if (!data) {
+            result.inmediatejump = true;
+            result.newpageid = pageData.page.id;
+            return;
+        }
+
+        var response = getResponse(),
+            getAnswers = angular.copy(pageData.answers),
+            correct = getAnswers.shift(),
+            wrong = getAnswers.shift(),
+            answers = {};
+
+        angular.forEach(getAnswers, function(answer) {
+            if (answer.answer !== '' || answer.response !== '') {
+                answers[answer.id] = answer;
+            }
+        });
+
+        // Get the user's exact responses for record keeping.
+        var hits = 0,
+            userResponse = [];
+        result.studentanswer = '';
+        result.studentanswerformat = 1;
+
+        for (var id in response) {
+            var value = response[id];
+            if (!value) {
+                result.noanswer = true;
+                return;
+            }
+
+            value = $mmText.decodeHTML(value);
+            userResponse.push(value);
+            if (typeof answers[id] != 'undefined') {
+                var answer = answers[id];
+                result.studentanswer += '<br />' + answer.answer + ' = ' + value;
+                if (answer.response && answer.response.trim() == value.trim()) {
+                    hits++;
+                }
+            }
+        }
+
+        result.userresponse = userResponse.join(',');
+
+        if (hits == Object.keys(answers).length) {
+            result.correctanswer = true;
+            result.response = correct.answer;
+            result.answerid = correct.id;
+            result.newpageid = correct.jumpto;
+        } else {
+            result.correctanswer = false;
+            result.response = wrong.answer;
+            result.answerid = wrong.id;
+            result.newpageid = wrong.jumpto;
+        }
+
+        // Get the user's response.
+        function getResponse() {
+            if (data.response) {
+                // The data is already stored as expected. Return it.
+                return data.response;
+            }
+
+            // Data is stored in properties like 'response[379]'. Recreate the response object.
+            var response = {};
+            for (var key in data) {
+                var match = key.match(/^response\[(\d+)\]/);
+                if (match && match.length > 1) {
+                    response[match[1]] = data[key];
+                }
+            }
+            return response;
+        }
+    }
+
+    /**
+     * Check a multichoice answer.
+     *
+     * @param  {Object} lesson    Lesson.
+     * @param  {Object} pageData  Result of getPageData for the page to process.
+     * @param  {Object} data      Data containing the user answer.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID.
+     * @param  {Object} result    Object where to store the result.
+     * @return {Void}
+     */
+    function checkAnswerMultichoice(lesson, pageData, data, pageIndex, result) {
+        if (!data) {
+            result.inmediatejump = true;
+            result.newpageid = pageData.page.id;
+            return;
+        }
+
+        var answers = getUsedAnswers();
+
+        if (pageData.page.qoption) {
+            // Multianswer allowed, user's answer is an array.
+            var studentAnswers = getUserAnswersMulti();
+
+            if (!studentAnswers || !angular.isArray(studentAnswers)) {
+                result.noanswer = true;
+                return;
+            }
+
+            // Get what the user answered.
+            result.userresponse = studentAnswers.join(',');
+
+            // Get the answers in a set order, the id order.
+            var ncorrect = 0,
+                nhits = 0,
+                responses = [],
+                correctAnswerId = 0,
+                wrongAnswerId = 0,
+                correctPageId,
+                wrongPageId;
+
+            // Store student's answers for displaying on feedback page.
+            result.studentanswer = '';
+            result.studentanswerformat = 1;
+            angular.forEach(answers, function(answer) {
+                for (var i in studentAnswers) {
+                    var answerId = studentAnswers[i];
+                    if (answerId == answer.id) {
+                        result.studentanswer += '<br />' + answer.answer;
+                        if ($mmText.cleanTags(answer.response).trim()) {
+                            responses.push(answer.response);
+                        }
+                        break;
+                    }
+                }
+            });
+
+            // Iterate over all the possible answers.
+            angular.forEach(answers, function(answer) {
+                var correctAnswer = isAnswerCorrect(lesson, pageData.page.id, answer, pageIndex);
+
+                // Iterate over all the student answers to check if he selected the current possible answer.
+                angular.forEach(studentAnswers, function(answerId) {
+                    if (answerId == answer.id) {
+                        if (correctAnswer) {
+                            nhits++;
+                        } else {
+                            // Always use the first student wrong answer.
+                            if (typeof wrongPageId == 'undefined') {
+                                wrongPageId = answer.jumpto;
+                            }
+                            // Save the answer id for scoring.
+                            if (!wrongAnswerId) {
+                                wrongAnswerId = answer.id;
+                            }
+                        }
+                    }
+                });
+
+                if (correctAnswer) {
+                    ncorrect++;
+
+                    // Save the first jumpto.
+                    if (typeof correctPageId == 'undefined') {
+                        correctPageId = answer.jumpto;
+                    }
+                    // Save the answer id for scoring.
+                    if (!correctAnswerId) {
+                        correctAnswerId = answer.id;
+                    }
+                }
+            });
+
+            if (studentAnswers.length == ncorrect && nhits == ncorrect) {
+                result.correctanswer = true;
+                result.response = responses.join('<br />');
+                result.newpageid = correctPageId;
+                result.answerid = correctAnswerId;
+            } else {
+                result.correctanswer = false;
+                result.response = responses.join('<br />');
+                result.newpageid = wrongPageId;
+                result.answerid = wrongAnswerId;
+            }
+        } else {
+            // Only one answer allowed.
+            if (typeof data.answerid == 'undefined' || (!data.answerid && !angular.isNumber(data.answerid))) {
+                result.noanswer = true;
+                return;
+            }
+
+            result.answerid = data.answerid;
+
+            // Search the answer.
+            for (var i in pageData.answers) {
+                var answer = pageData.answers[i];
+                if (answer.id == data.answerid) {
+                    result.correctanswer = isAnswerCorrect(lesson, pageData.page.id, answer, pageIndex);
+                    result.newpageid = answer.jumpto;
+                    result.response = answer.response;
+                    result.userresponse = result.studentanswer = answer.answer;
+                    break;
+                }
+            }
+        }
+
+        // Get the list of used answers (with valid answer).
+        function getUsedAnswers() {
+            var answers = angular.copy(pageData.answers);
+            return answers.filter(function(entry) {
+                return entry.answer !== '';
+            });
+        }
+
+        // Get the user's answer if multiple answers are allowed.
+        function getUserAnswersMulti() {
+            if (data.answer) {
+                // The data is already stored as expected. If it's valid, parse the values to int.
+                if (angular.isArray(data.answer)) {
+                    return data.answer.map(function(value) {
+                        return parseInt(value, 10);
+                    });
+                }
+                return data.answer;
+            }
+
+            // Data is stored in properties like 'answer[379]'. Recreate the answer array.
+            var answer = [];
+            for (var key in data) {
+                var match = key.match(/^answer\[(\d+)\]/);
+                if (match && match.length > 1) {
+                    answer.push(parseInt(match[1], 10));
+                }
+            }
+            return answer;
+        }
+    }
+
+    /**
+     * Check a numerical answer.
+     *
+     * @param  {Object} lesson    Lesson.
+     * @param  {Object} pageData  Result of getPageData for the page to process.
+     * @param  {Object} data      Data containing the user answer.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID.
+     * @param  {Object} result    Object where to store the result.
+     * @return {Void}
+     */
+    function checkAnswerNumerical(lesson, pageData, data, pageIndex, result) {
+        var parsedAnswer = parseFloat(data.answer);
+
+        // Set defaults.
+        result.response = '';
+        result.newpageid = 0;
+
+        if (!data.answer || isNaN(parsedAnswer)) {
+            result.noanswer = true;
+            return;
+        } else {
+            result.useranswer = parsedAnswer;
+        }
+
+        result.studentanswer = result.userresponse = result.useranswer;
+
+        // Find the answer.
+        for (var i in pageData.answers) {
+            var answer = pageData.answers[i],
+                max, min;
+
+            if (answer.answer && answer.answer.indexOf(':') != -1) {
+                // There's a pair of values.
+                var split = answer.answer.split(':');
+                min = parseFloat(split[0]);
+                max = parseFloat(split[1]);
+            } else {
+                // Only one value.
+                min = parseFloat(answer.answer);
+                max = min;
+            }
+
+            if (result.useranswer >= min && result.useranswer <= max) {
+                result.newpageid = answer.jumpto;
+                result.response = answer.response;
+                result.correctanswer = isAnswerCorrect(lesson, pageData.page.id, answer, pageIndex);
+                result.answerid = answer.id;
+                break;
+            }
+        }
+    }
+
+    /**
+     * Check a short answer.
+     *
+     * @param  {Object} lesson    Lesson.
+     * @param  {Object} pageData  Result of getPageData for the page to process.
+     * @param  {Object} data      Data containing the user answer.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID.
+     * @param  {Object} result    Object where to store the result.
+     * @return {Void}
+     */
+    function checkAnswerShort(lesson, pageData, data, pageIndex, result) {
+        var studentAnswer = data.answer && data.answer.trim ? data.answer.trim() : false;
+        if (!studentAnswer) {
+            result.noanswer = true;
+            return;
+        }
+
+        // Search the answer in the list of possible answers.
+        for (var i in pageData.answers) {
+            var answer = pageData.answers[i],
+                expectedAnswer = answer.answer, // @todo Applying PARAM_TEXT as it is applied to the answer submitted by the user.
+                isMatch = false,
+                markIt = false,
+                useRegExp = pageData.page.qoption,
+                ignoreCase;
+
+            if (useRegExp) {
+                ignoreCase = '';
+                if (expectedAnswer.substr(-2) == '/i') {
+                    expectedAnswer = expectedAnswer.substr(0, expectedAnswer.length - 2);
+                    ignoreCase = 'i';
+                }
+            } else {
+                expectedAnswer = expectedAnswer.replace('*', '#####');
+                expectedAnswer = $mmText.escapeForRegex(expectedAnswer);
+                expectedAnswer = expectedAnswer.replace('#####', '.*');
+            }
+
+            // See if user typed in any of the correct answers.
+            if (isAnswerCorrect(lesson, pageData.page.id, answer, pageIndex)) {
+                if (!useRegExp) { // We are using 'normal analysis', which ignores case.
+                    if (studentAnswer.match(new RegExp('^' + expectedAnswer + '$', 'i'))) {
+                        isMatch = true;
+                    }
+                } else {
+                    if (studentAnswer.match(new RegExp('^' + expectedAnswer + '$', ignoreCase))) {
+                        isMatch = true;
+                    }
+                }
+                if (isMatch) {
+                    result.correctanswer = true;
+                }
+            } else {
+               if (!useRegExp) { // We are using 'normal analysis'.
+                    // See if user typed in any of the wrong answers; don't worry about case.
+                    if (studentAnswer.match(new RegExp('^' + expectedAnswer + '$', 'i'))) {
+                        isMatch = true;
+                    }
+                } else { // We are using regular expressions analysis.
+                    var startCode = expectedAnswer.substr(0, 2);
+                    switch (startCode){
+                        // 1- Check for absence of required string in studentAnswer (coded by initial '--').
+                        case "--":
+                            expectedAnswer = expectedAnswer.substr(2);
+                            if (!studentAnswer.match(new RegExp('^' + expectedAnswer + '$', ignoreCase))) {
+                                isMatch = true;
+                            }
+                            break;
+
+                        // 2- Check for code for marking wrong strings (coded by initial '++').
+                        case "++":
+                            expectedAnswer = expectedAnswer.substr(2);
+                            markIt = true;
+                            // Check for one or several matches.
+                            var matches = studentAnswer.match(new RegExp(expectedAnswer, 'g' + ignoreCase));
+                            if (matches) {
+                                isMatch   = true;
+                                var nb = matches[0].length,
+                                    original = [],
+                                    marked = [];
+
+                                for (var j = 0; j < nb; j++) {
+                                    original.push(matches[0][j]);
+                                    marked.push('<span class="incorrect matches">' + matches[0][j] + '</span>');
+                                }
+
+                                studentAnswer = studentAnswer.replace(original, marked);
+                            }
+                            break;
+
+                        // 3- Check for wrong answers belonging neither to -- nor to ++ categories.
+                        default:
+                            if (studentAnswer.match(new RegExp('^' + expectedAnswer + '$', ignoreCase))) {
+                                isMatch = true;
+                            }
+                            break;
+                    }
+
+                    result.correctanswer = false;
+                }
+            }
+
+            if (isMatch) {
+                result.newpageid = answer.jumpto;
+                result.response = answer.response;
+                result.answerid = answer.id;
+                break; // Quit answer analysis immediately after a match has been found.
+            }
+        }
+
+        result.userresponse = studentAnswer;
+        result.studentanswer = $mmText.s(studentAnswer); // Clean student answer as it goes to output.
+    }
+
+    /**
+     * Check a truefalse answer.
+     *
+     * @param  {Object} lesson    Lesson.
+     * @param  {Object} pageData  Result of getPageData for the page to process.
+     * @param  {Object} data      Data containing the user answer.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID.
+     * @param  {Object} result    Object where to store the result.
+     * @return {Void}
+     */
+    function checkAnswerTruefalse(lesson, pageData, data, pageIndex, result) {
+        if (!data.answerid) {
+            result.noanswer = true;
+            return;
+        }
+
+        result.answerid = data.answerid;
+
+        // Get the answer.
+        for (var i in pageData.answers) {
+            var answer = pageData.answers[i];
+            if (answer.id == data.answerid) {
+                // Answer found.
+                result.correctanswer = isAnswerCorrect(lesson, pageData.page.id, answer, pageIndex);
+                result.newpageid = answer.jumpto;
+                result.response  = answer.response;
+                result.studentanswer = result.userresponse = answer.answer;
+                break;
+            }
+        }
+    }
+
     /**
      * Create a list of pages indexed by page ID based on a list of pages.
      *
@@ -198,6 +765,7 @@ angular.module('mm.addons.mod_lesson')
                         warnings: []
                     },
                     messageParams,
+                    entryData,
                     promises = [];
 
                 addResultValue(result, 'offline', true); // Mark the result as offline.
@@ -217,7 +785,7 @@ angular.module('mm.addons.mod_lesson')
                             nquestions: gradeInfo.nquestions,
                             minquestions: lesson.minquestions
                         };
-                        messages.push($translate.instant('mma.mod_lesson.numberofpagesviewednotice'), {$a: data});
+                        addMessage(messages, 'mma.mod_lesson.numberofpagesviewednotice', {$a: data});
                     }
                 }
 
@@ -228,9 +796,40 @@ angular.module('mm.addons.mod_lesson')
                             addResultValue(result, 'progresscompleted', progress);
                         }));
 
-                        if (false) {
-                            // @todo Handle questions.
+                        if (gradeInfo.attempts) {
+                            // User has answered questions.
+                            if (!lesson.custom) {
+                                addResultValue(result, 'numberofpagesviewed', gradeInfo.nquestions, true);
+                                if (lesson.minquestions) {
+                                    if (gradeInfo.nquestions < lesson.minquestions) {
+                                        addResultValue(result, 'youshouldview', lesson.minquestions, true);
+                                    }
+                                }
+                                addResultValue(result, 'numberofcorrectanswers', gradeInfo.earned, true);
+                            }
+
+                            entryData = {
+                                score: gradeInfo.earned,
+                                grade: gradeInfo.total
+                            };
+                            if (gradeInfo.nmanual) {
+                                entryData.tempmaxgrade = gradeInfo.total - gradeInfo.manualpoints;
+                                entryData.essayquestions = gradeInfo.manual;
+                                addResultValue(result, 'displayscorewithessays', entryData, true);
+                            } else {
+                                addResultValue(result, 'displayscorewithoutessays', entryData, true);
+                            }
+
+                            if (lesson.grade != mmCoreGradeTypeNone) {
+                                entryData = {
+                                    grade: $mmUtil.roundToDecimals(gradeInfo.grade * lesson.grade / 100, 1),
+                                    total: lesson.grade
+                                };
+                                addResultValue(result, 'yourcurrentgradeisoutof', entryData, true);
+                            }
+
                         } else {
+                            // User hasn't answered any question, only content pages.
                             if (lesson.timelimit) {
                                 if (outOfTime) {
                                     addResultValue(result, 'eolstudentoutoftimenoanswers', true, true);
@@ -316,6 +915,25 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Given a page ID, a jumpto and all the possible jumps, calcualate the new page ID.
+     *
+     * @param  {Number} pageId Current page ID.
+     * @param  {Number} jumpTo The jumpto.
+     * @param  {Object} jumps  Result of get pages possible jumps.
+     * @return {Number}        New page ID.
+     */
+    function getNewPageId(pageId, jumpTo, jumps) {
+        // If jump not found, return current jumpTo.
+        if (jumps && jumps[pageId] && jumps[pageId][jumpTo]) {
+            return jumps[pageId][jumpTo].calculatedjump;
+        } else if (!jumpTo) {
+            // Return current page.
+            return pageId;
+        }
+        return jumpTo;
+    }
+
     /**
      * Get cache key for access information WS calls.
      *
@@ -371,7 +989,7 @@ angular.module('mm.addons.mod_lesson')
      */
     self.getContentPagesViewed = function(lessonId, attempt, siteId) {
         var promises = [],
-            type = self.TYPE_STRUCTURE,
+            type = mmaModLessonTypeStructure,
             result = {
                 online: [],
                 offline: []
@@ -526,21 +1144,32 @@ angular.module('mm.addons.mod_lesson')
      * @return {Promise}         Promise resolved with the last page seen.
      */
     self.getLastPageSeen = function(lessonId, attempt, siteId) {
+        siteId = siteId || $mmSite.getId();
+
         var lastPageSeen = false;
 
-        // @todo Check question answers.
+        // Get the last question answered.
+        return $mmaModLessonOffline.getLastQuestionPageAnswer(lessonId, attempt, siteId).then(function(answer) {
+            if (answer) {
+                lastPageSeen = answer.newpageid;
+            }
 
-        return self.getLastContentPageViewed(lessonId, attempt, siteId).then(function(page) {
-            if (page) {
-                if (false) {
-                    // @todo Check if the page was seen after the last question answer.
-                } else {
-                    // Has not answered any questions but has viewed a branch table.
-                    lastPageSeen = page.newpageid || page.pageid;
+            // Now get the last content page viewed.
+            return self.getLastContentPageViewed(lessonId, attempt, siteId).then(function(page) {
+                if (page) {
+                    if (answer) {
+                        if (page.timemodified > answer.timemodified) {
+                            // This branch table was viewed more recently than the question page.
+                            lastPageSeen = page.newpageid || page.pageid;
+                        }
+                    } else {
+                        // Has not answered any questions but has viewed a branch table.
+                        lastPageSeen = page.newpageid || page.pageid;
+                    }
                 }
-            }
 
-            return lastPageSeen;
+                return lastPageSeen;
+            });
         });
     };
 
@@ -794,9 +1423,9 @@ angular.module('mm.addons.mod_lesson')
             }
 
             return site.read('mod_lesson_get_page_data', params, preSets).then(function(data) {
-                if (forceCache && accessInfo) {
-                    // Offline mode. Calculate the data that might be affected.
-                    return calculateOfflineData(lesson, accessInfo, password, review, siteId).then(function(calculatedData) {
+                if (forceCache && accessInfo && data.page) {
+                    // Offline mode and valid page. Calculate the data that might be affected.
+                    return calculateOfflineData(lesson, accessInfo, password, review, false, siteId).then(function(calculatedData) {
                         data.messages = self.getPageViewMessages(lesson, accessInfo, data.page, review, jumps);
                         return angular.extend(data, calculatedData);
                     });
@@ -938,22 +1567,50 @@ angular.module('mm.addons.mod_lesson')
                     cluster: $translate.instant('mma.mod_lesson.clusterjump'),
                     unseen: $translate.instant('mma.mod_lesson.unseenpageinbranch')
                 };
-                messages.push($translate.instant('mma.mod_lesson.teacherjumpwarning'), {$a: data});
+                addMessage(messages, 'mma.mod_lesson.teacherjumpwarning', {$a: data});
             }
 
             // Inform teacher that s/he will not see the timer.
             if (lesson.timelimit) {
-                messages.push($translate.instant('mma.mod_lesson.teachertimerwarning'));
+                addMessage(messages, 'mma.mod_lesson.teachertimerwarning');
             }
         }
         // Report attempts remaining.
         if (result.attemptsremaining > 0 && lesson.review && !review) {
-            messages.push($translate.instant('mma.mod_lesson.attemptsremaining'), {$a: result.attemptsremaining});
+            addMessage(messages, 'mma.mod_lesson.attemptsremaining', {$a: result.attemptsremaining});
         }
 
         return messages;
     };
 
+    /**
+     * Get the IDs of all the pages that have at least 1 question attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getPagesIdsWithQuestionAttempts
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {Boolean} correct True to only fetch correct attempts, false to get them all.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @param  {Number} [userId] User ID. If not defined, site's user.
+     * @return {Promise}         Promise resolved with the IDs.
+     */
+    self.getPagesIdsWithQuestionAttempts = function(lessonId, attempt, correct, siteId, userId) {
+        return self.getQuestionsAttempts(lessonId, attempt, correct, undefined, siteId, userId).then(function(result) {
+            var ids = {},
+                answers = result.online.concat(result.offline);
+
+            angular.forEach(answers, function(answer) {
+                if (!ids[answer.pageid]) {
+                    ids[answer.pageid] = true;
+                }
+            });
+
+            return Object.keys(ids);
+        });
+    };
+
     /**
      * Get different informative messages when viewing a lesson page.
      * Please try to use WS response messages instead of this function if possible.
@@ -985,24 +1642,24 @@ angular.module('mm.addons.mod_lesson')
                             nquestions: gradeInfo.nquestions,
                             minquestions: lesson.minquestions
                         };
-                        messages.push($translate.instant('mma.mod_lesson.numberofpagesviewednotice'), {$a: data});
+                        addMessage(messages, 'mma.mod_lesson.numberofpagesviewednotice', {$a: data});
                     }
 
                     if (!review && !lesson.retake) {
-                        messages.push($translate.instant('mma.mod_lesson.numberofcorrectanswers'), {$a: gradeInfo.earned});
+                        addMessage(messages, 'mma.mod_lesson.numberofcorrectanswers', {$a: gradeInfo.earned});
                         if (lesson.grade != mmCoreGradeTypeNone) {
                             data = {
                                 grade: $mmUtil.roundToDecimals(gradeInfo.grade * lesson.grade / 100, 1),
                                 total: lesson.grade
                             };
-                            messages.push($translate.instant('mma.mod_lesson.yourcurrentgradeisoutof'), {$a: data});
+                            addMessage(messages, 'mma.mod_lesson.yourcurrentgradeisoutof', {$a: data});
                         }
                     }
                 }
             }
         } else {
             if (lesson.timelimit) {
-                messages.push($translate.instant('mma.mod_lesson.teachertimerwarning'));
+                addMessage(messages, 'mma.mod_lesson.teachertimerwarning');
             }
 
             if (self.lessonDisplayTeacherWarning(jumps)) {
@@ -1012,13 +1669,130 @@ angular.module('mm.addons.mod_lesson')
                     cluster: $translate.instant('mma.mod_lesson.clusterjump'),
                     unseen: $translate.instant('mma.mod_lesson.unseenpageinbranch')
                 };
-                messages.push($translate.instant('mma.mod_lesson.teacherjumpwarning'), {$a: data});
+                addMessage(messages, 'mma.mod_lesson.teacherjumpwarning', {$a: data});
             }
         }
 
         return messages;
     };
 
+    /**
+     * Get questions attempts, including offline attempts.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getQuestionsAttempts
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} attempt        Attempt number.
+     * @param  {Boolean} correct       True to only fetch correct attempts, false to get them all.
+     * @param  {Number} [pageId]       If defined, only get attempts on this page.
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @param  {Number} [userId]       User ID. If not defined, site's user.
+     * @return {Promise}               Promise resolved with the questions attempts.
+     */
+    self.getQuestionsAttempts = function(lessonId, attempt, correct, pageId, siteId, userId) {
+        var promises = [],
+            result = {
+                online: [],
+                offline: []
+            };
+
+        promises.push(self.getQuestionsAttemptsOnline(lessonId, attempt, correct, pageId, false, false, siteId, userId)
+                .then(function(attempts) {
+            result.online = attempts;
+        }));
+
+        promises.push($mmaModLessonOffline.getQuestionsAttempts(lessonId, attempt, correct, pageId, siteId).catch(function() {
+            // Error, assume no answers.
+            return [];
+        }).then(function(attempts) {
+            result.offline = attempts;
+        }));
+
+        return $q.all(promises).then(function() {
+            return result;
+        });
+    };
+
+    /**
+     * Get cache key for get questions attempts WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} userId   User ID.
+     * @return {String}          Cache key.
+     */
+    function getQuestionsAttemptsCacheKey(lessonId, attempt, userId) {
+        return getQuestionsAttemptsCommonCacheKey(lessonId) + ':' + userId + ':' + attempt;
+    }
+
+    /**
+     * Get common cache key for get questions attempts WS calls.
+     *
+     * @param {Number} lessonId Lesson ID.
+     * @return {String}         Cache key.
+     */
+    function getQuestionsAttemptsCommonCacheKey(lessonId) {
+        return 'mmaModLesson:questionsAttempts:' + lessonId;
+    }
+
+    /**
+     * Get questions attempts from the site.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getQuestionsAttemptsOnline
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} attempt        Attempt number.
+     * @param  {Boolean} correct       True to only fetch correct attempts, false to get them all.
+     * @param  {Number} [pageId]       If defined, only get attempts on this page.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @param  {Number} [userId]       User ID. If not defined, site's user.
+     * @return {Promise}               Promise resolved with the questions attempts.
+     */
+    self.getQuestionsAttemptsOnline = function(lessonId, attempt, correct, pageId, forceCache, ignoreCache, siteId, userId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+
+            // Don't pass "pageId" and "correct" params, they will be filtered locally.
+            var params = {
+                    lessonid: lessonId,
+                    attempt: attempt,
+                    userid: userId
+                },
+                preSets = {
+                    cacheKey: getQuestionsAttemptsCacheKey(lessonId, attempt, userId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_questions_attempts', params, preSets).then(function(response) {
+                if (pageId || correct) {
+                    // Filter the attempts.
+                    return response.attempts.filter(function(attempt) {
+                        var include = true;
+                        if (correct) {
+                            include = !!attempt.correct;
+                        }
+                        if (pageId && include) {
+                            include = attempt.pageid == pageId;
+                        }
+                        return include;
+                    });
+                }
+
+                return response.attempts;
+            });
+        });
+    };
+
     /**
      * Finds all pages that appear to be a subtype of the provided pageid until
      * an end point specified within "ends" is encountered or no more pages exist.
@@ -1128,6 +1902,45 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if a jump is correct.
+     * Based in Moodle's jumpto_is_correct.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#jumptoIsCorrect
+     * @param  {Number} pageId    ID of the page from which you are jumping from.
+     * @param  {Number} jumpTo    The jumpto number.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID. See createPagesIndex.
+     * @return {Boolean}          Whether jump is correct.
+     */
+    self.jumptoIsCorrect = function(pageId, jumpTo, pageIndex) {
+        // First test the special values.
+        if (!jumpTo) {
+            // Same page
+            return false;
+        } else if (jumpTo == self.LESSON_NEXTPAGE) {
+            return true;
+        } else if (jumpTo == self.LESSON_UNSEENBRANCHPAGE) {
+            return true;
+        } else if (jumpTo == self.LESSON_RANDOMPAGE) {
+            return true;
+        } else if (jumpTo == self.LESSON_CLUSTERJUMP) {
+            return true;
+        } else if (jumpTo == self.LESSON_EOL) {
+            return true;
+        }
+
+        var aPageId = pageIndex[pageId].nextpageid;
+        while (aPageId) {
+            if (jumpTo == aPageId) {
+                return true;
+            }
+            aPageId = pageIndex[aPageId].nextpageid;
+        }
+        return false;
+    };
+
     /**
      * Invalidates Lesson data.
      *
@@ -1274,6 +2087,41 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates questions attempts for all attempts.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateQuestionsAttempts
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateQuestionsAttempts = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getQuestionsAttemptsCommonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates question answers for a certain attempt and user.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateQuestionsAttemptsForAttempt
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {String} [siteId] Site ID. If not defined, current site..
+     * @param  {Number} [userId] User ID. If not defined, site's user.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateQuestionsAttemptsForAttempt = function(lessonId, attempt, siteId, userId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.invalidateWsCacheForKey(getQuestionsAttemptsCacheKey(lessonId, attempt, userId));
+        });
+    };
+
     /**
      * Invalidates timers for all users in a lesson.
      *
@@ -1308,6 +2156,24 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if an answer is correct.
+     *
+     * @param  {Object} lesson    Lesson.
+     * @param  {Number} pageId    The page ID.
+     * @param  {Object} answer    The answer to check.
+     * @param  {Object} pageIndex Object containing all the pages indexed by ID.
+     * @return {Boolean}          Whether the answer is correct.
+     */
+    function isAnswerCorrect(lesson, pageId, answer, pageIndex) {
+        if (lesson.custom) {
+            // Custom scores. If score on answer is positive, it is correct.
+            return answer.score > 0;
+        } else {
+            return jumptoIsCorrect(pageId, answer.jumpto, pageIndex);
+        }
+    }
+
     /**
      * Check if a lesson is enabled to be used in offline.
      *
@@ -1369,7 +2235,7 @@ angular.module('mm.addons.mod_lesson')
      * @return {Boolean}     True if question page, false if content page.
      */
     self.isQuestionPage = function(type) {
-        return type == self.TYPE_QUESTION;
+        return type == mmaModLessonTypeQuestion;
     };
 
     /**
@@ -1532,36 +2398,34 @@ angular.module('mm.addons.mod_lesson')
         siteId = siteId || $mmSite.getId();
 
         var page = pageData.page,
-            pageId = page.id;
+            pageId = page.id,
+            result,
+            pageIndex;
 
         if (offline) {
-            // Calculate and store the new page id so it can be stored in offline.
-            var attempt = accessInfo.attemptscount,
-                newPageId = jumps[pageId] && jumps[pageId][data.jumpto] ? jumps[pageId][data.jumpto].calculatedjump : pageId;
+            // Get the list of pages of the lesson.
+            return self.getPages(lesson.id, password, true, false, siteId).then(function(pages) {
+                pageIndex = createPagesIndex(pages);
 
-            return $mmaModLessonOffline.processPage(lesson.id, courseId, attempt, page, data, newPageId, siteId).then(function() {
-                // Data stored, now it must return the data. Calculate some needed offline data.
-                return calculateOfflineData(lesson, accessInfo, password, review, siteId);
-            }).then(function(calculatedData) {
-                // @todo Handle question pages.
-                var result = {
-                    newpageid: newPageId,
-                    inmediatejump: true,
-                    answerid: 0,
-                    noanswer: false,
-                    correctanswer: false,
-                    isessayquestion: false,
-                    response: '',
-                    studentanswer: '',
-                    userresponse: null,
-                    feedback: '',
-                    nodefaultresponse: false,
-                    attemptsremaining: null,
-                    maxattemptsreached: false,
-                    displaymenu: pageData.displaymenu, // Keep the same value since we can't calculate it in offline.
-                    warnings: []
-                };
+                if (pageData.answers.length) {
+                    return recordAttempt(lesson, courseId, pageData, data, review, accessInfo, jumps, pageIndex, siteId);
+                } else {
+                    // The page has no answers so we will just progress to the next page.
+                   return {
+                        nodefaultresponse: true,
+                        newpageid: self.LESSON_NEXTPAGE
+                    };
+                }
+            }).then(function(res) {
+                result = res;
+                result.newpageid = getNewPageId(pageData.page.id, result.newpageid, jumps);
 
+                // Calculate some needed offline data.
+                return calculateOfflineData(lesson, accessInfo, password, review, pageIndex, siteId);
+            }).then(function(calculatedData) {
+                // Add some default data to match the WS response.
+                result.warnings = [];
+                result.displaymenu = pageData.displaymenu; // Keep the same value since we can't calculate it in offline.
                 result.messages = self.getPageProcessMessages(lesson, accessInfo, result, review, jumps);
                 angular.extend(result, calculatedData);
 
@@ -1603,6 +2467,167 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Records an attempt on a certain page.
+     * Based on Moodle's record_attempt.
+     *
+     * @param  {Object} lesson     Lesson.
+     * @param  {Number} courseId   Course ID the lesson belongs to.
+     * @param  {Object} pageData   Result of getPageData for the page to process.
+     * @param  {Object} data       Data to save.
+     * @param  {Boolean} review    If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} accessInfo Result of get access info.
+     * @param  {Object} jumps      Result of get pages possible jumps.
+     * @param  {Object} pageIndex  Object containing all the pages indexed by ID.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with the result.
+     */
+    function recordAttempt(lesson, courseId, pageData, data, review, accessInfo, jumps, pageIndex, siteId) {
+        // Check the answer. Each page type has its own implementation.
+        var result = checkAnswer(lesson, pageData, data, jumps, pageIndex),
+            nretakes = accessInfo.attemptscount;
+
+        // Processes inmediate jumps.
+        if (result.inmediatejump) {
+            if (pageData.page.qtype == self.LESSON_PAGE_BRANCHTABLE) {
+                // Store the content page data. In Moodle this is stored in a separate table, during checkAnswer.
+                return $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes, pageData.page, data,
+                            result.newpageid, false, siteId).then(function() {
+                    return result;
+                });
+            }
+            return $q.when(result);
+        }
+
+        var promise = $q.when(),
+            stop = false,
+            nattempts;
+
+        result.attemptsremaining  = 0;
+        result.maxattemptsreached = false;
+
+        if (result.noanswer) {
+            result.newpageid = pageData.page.id; // Display same page again.
+            result.feedback = $translate.instant('mma.mod_lesson.noanswer');
+        } else {
+            if (!accessInfo.canmanage) {
+                // Get the number of attempts that have been made on this question for this student and retake.
+                promise = self.getQuestionsAttempts(lesson.id, nretakes, false, pageData.page.id, siteId).then(function(attempts) {
+                    var subPromise;
+
+                    nattempts = attempts.online.length + attempts.offline.length;
+
+                    // Check if they have reached (or exceeded) the maximum number of attempts allowed.
+                    if (nattempts >= lesson.maxattempts) {
+                        result.maxattemptsreached = true;
+                        result.feedback = $translate.instant('mma.mod_lesson.maximumnumberofattemptsreached');
+                        result.newpageid = self.LESSON_NEXTPAGE;
+                        stop = true; // Set stop to true to prevent further calculations.
+                        return;
+                    }
+
+                    // Only insert a record if we are not reviewing the lesson.
+                    if (!review) {
+                        if (lesson.retake || (!lesson.retake && !nretakes)) {
+                            // Store the student's attempt and increase the number of attempts made.
+                            // Calculate and store the new page ID to prevent having to recalculate it later.
+                            var newPageId = getNewPageId(pageData.page.id, result.newpageid, jumps);
+                            subPromise = $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes,
+                                        pageData.page, data, newPageId, result.correctanswer, siteId);
+                            nattempts++;
+                        }
+                    }
+
+                    // "number of attempts remaining" message if lesson.maxattempts > 1
+                    // Displaying of message(s) is at the end of page for more ergonomic display.
+                    if (!result.correctanswer && !result.newpageid) {
+                        // Retreive the number of attempts left counter for displaying at bottom of feedback page
+                        if (nattempts >= lesson.maxattempts) {
+                            if (lesson.maxattempts > 1) { // Don't bother with message if only one attempt
+                                result.maxattemptsreached = true;
+                            }
+                            result.newpageid =  self.LESSON_NEXTPAGE;
+                        } else if (lesson.maxattempts > 1) { // Don't bother with message if only one attempt
+                            result.attemptsremaining = lesson.maxattempts - nattempts;
+                        }
+                    }
+
+                    return subPromise;
+                });
+            }
+
+            promise.then(function() {
+                if (stop) {
+                    return;
+                }
+
+                var subPromise;
+
+                // Determine default feedback if necessary.
+                if (!result.response) {
+                    if (!lesson.feedback && !result.noanswer &&
+                            !(lesson.review && !result.correctanswer && !result.isessayquestion)) {
+                        // These conditions have been met:
+                        //  1. The lesson manager has not supplied feedback to the student.
+                        //  2. Not displaying default feedback.
+                        //  3. The user did provide an answer.
+                        //  4. We are not reviewing with an incorrect answer (and not reviewing an essay question).
+
+                        result.nodefaultresponse = true;
+                    } else if (result.isessayquestion) {
+                        result.response = $translate.instant('mma.mod_lesson.defaultessayresponse');
+                    } else if (result.correctanswer) {
+                        result.response = $translate.instant('mma.mod_lesson.thatsthecorrectanswer');
+                    } else {
+                        result.response = $translate.instant('mma.mod_lesson.thatsthewronganswer');
+                    }
+                }
+
+                if (result.response) {
+                    if (lesson.review && !result.correctanswer && !result.isessayquestion) {
+                        // Calculate the number of question attempt in the page if it isn't calculated already.
+                        if (typeof nattempts == 'undefined') {
+                            subPromise = self.getQuestionsAttempts(lesson.id, nretakes, false, pageData.page.id, siteId)
+                                    .then(function(result) {
+                                nattempts = result.online.length + result.offline.length;
+                            });
+                        } else {
+                            subPromise = $q.when();
+                        }
+
+                        subPromise.then(function() {
+                            var messageId = nattempts == 1 ? 'firstwrong' : 'secondpluswrong';
+                            result.feedback = '<div class="box feedback">' +
+                                    $translate.instant('mma.mod_lesson.' + messageId) + '</div>';
+                        });
+                    } else {
+                        result.feedback = '';
+                        subPromise = $q.when();
+                    }
+
+                    var className = 'response';
+                    if (result.correctanswer) {
+                        className += ' correct';
+                    } else if (!result.isessayquestion) {
+                        className += ' incorrect';
+                    }
+
+                    return subPromise.then(function() {
+                        result.feedback += '<div class="box generalbox boxaligncenter">' + pageData.page.contents + '</div>';
+                        result.feedback += '<div class="correctanswer generalbox"><em>' +
+                                $translate.instant('mma.mod_lesson.youranswer') + '</em> : ' +
+                                (result.studentanswerformat ? result.studentanswer : $mmText.cleanTags(result.studentanswer)) +
+                                '<div class="box ' + className + '">' + result.response + '</div></div>';
+                    });
+                }
+            });
+        }
+
+        return promise.then(function() {
+            return result;
+        });
+    }
+
     /**
      * Remove a password stored in DB.
      *
diff --git a/www/addons/mod/lesson/services/lesson_sync.js b/www/addons/mod/lesson/services/lesson_sync.js
index 36029057a62..a6e4feb8fdc 100644
--- a/www/addons/mod/lesson/services/lesson_sync.js
+++ b/www/addons/mod/lesson/services/lesson_sync.js
@@ -309,6 +309,7 @@ angular.module('mm.addons.mod_lesson')
                 var promises = [];
                 promises.push($mmaModLesson.invalidateAccessInformation(lessonId, siteId));
                 promises.push($mmaModLesson.invalidateContentPagesViewed(lessonId, siteId));
+                promises.push($mmaModLesson.invalidateQuestionsAttempts(lessonId, siteId));
                 promises.push($mmaModLesson.invalidatePagesPossibleJumps(lessonId, siteId));
                 promises.push($mmaModLesson.invalidateTimers(lessonId, siteId));
 
@@ -317,7 +318,14 @@ angular.module('mm.addons.mod_lesson')
                 }).then(function() {
                     // Sync successful, update some data that might have been modified.
                     return $mmaModLesson.getAccessInformation(lessonId, false, false, siteId).then(function(info) {
-                        return $mmaModLesson.getContentPagesViewedOnline(lessonId, info.attemptscount, false, false, siteId);
+                        var promises = [],
+                            attempt = info.attemptscount;
+
+                        promises.push($mmaModLesson.getContentPagesViewedOnline(lessonId, attempt, false, false, siteId));
+                        promises.push($mmaModLesson.getQuestionsAttemptsOnline(
+                                    lessonId, attempt, false, undefined, false, false, siteId));
+
+                        return $q.all(promises);
                     }).catch(function() {
                         // Ignore errors.
                     });
@@ -351,12 +359,12 @@ angular.module('mm.addons.mod_lesson')
         return $mmaModLesson.processPageOnline(lesson.id, answer.pageid, answer.data, password, false, siteId).then(function() {
             result.updated = true;
 
-            return $mmaModLessonOffline.deleteAttemptAnswerForPage(lesson.id, answer.attempt, answer.pageid, siteId);
+            return $mmaModLessonOffline.deleteAttemptAnswersForPage(lesson.id, answer.attempt, answer.pageid, siteId);
         }).catch(function(error) {
             if (error && $mmUtil.isWebServiceError(error)) {
                 // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
                 result.updated = true;
-                return $mmaModLessonOffline.deleteAttemptAnswerForPage(lesson.id, answer.attempt, answer.pageid, siteId)
+                return $mmaModLessonOffline.deleteAttemptAnswersForPage(lesson.id, answer.attempt, answer.pageid, siteId)
                         .then(function() {
                     // Responses deleted, add a warning.
                     result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 134d9daf7de..64a6b9f3710 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -406,14 +406,17 @@ angular.module('mm.addons.mod_lesson')
                     promises.push($mmFilepool.updatePackageDownloadTime(siteId, self.component, module.id).catch(function() {
                         // Ignore errors.
                     }));
-                    promises.push($mmaModLesson.getAccessInformation(lesson.id, false, true, siteId));
+                    promises.push($mmaModLesson.getAccessInformation(lesson.id, false, true, siteId).then(function(info) {
+                        accessInfo = info;
+                    }));
 
                     return $q.all(promises);
                 });
             }
         }).then(function() {
             var promises = [],
-                files;
+                files,
+                attempt = accessInfo.attemptscount;
 
             // Download intro files and media files.
             files = lesson.mediafiles || [];
@@ -467,7 +470,10 @@ angular.module('mm.addons.mod_lesson')
             promises.push($mmaModLesson.getPagesPossibleJumps(lesson.id, false, true, siteId));
 
             // Prefetch viewed pages in last attempt to calculate progress.
-            promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, accessInfo.attemptscount, false, true, siteId));
+            promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, attempt, false, true, siteId));
+
+            // Prefetch question attempts in last attempt for offline calculations.
+            promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, attempt, false, undefined, false, true, siteId));
 
             return $q.all(promises);
         }).then(function() {
diff --git a/www/core/lib/text.js b/www/core/lib/text.js
index 645dbfbabbf..27df20f5dbd 100644
--- a/www/core/lib/text.js
+++ b/www/core/lib/text.js
@@ -93,6 +93,10 @@ angular.module('mm.core')
         if (!text) {
             return '';
         }
+        if (!text.replace) {
+            // Not a string, leave it as it is.
+            return text;
+        }
 
         // First, we use a regexpr.
         text = text.replace(/(<([^>]+)>)/ig,"");
@@ -701,5 +705,25 @@ angular.module('mm.core')
         return json;
     };
 
+    /**
+     * Add quotes to HTML characters.
+     *
+     * Returns text with HTML characters (like "<", ">", etc.) properly quoted.
+     * Based on Moodle's s() function.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmText#s
+     * @param  {String} text Text to treat.
+     * @return {String}      Treated text.
+     */
+    self.s = function(text) {
+        if (!text && text !== '') {
+            return '0';
+        }
+
+        return self.escapeHTML(text).replace(/&amp;#(\d+|x[0-9a-f]+);/i, '&#$1;');
+    };
+
     return self;
 });

From 4c5001e1390d83c0eb985e82003655cd525cdec6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 20 Apr 2017 14:08:05 +0200
Subject: [PATCH 114/218] MOBILE-2016 lesson: Handle questions without answers

---
 www/addons/mod/lesson/controllers/player.js | 5 +++++
 www/addons/mod/lesson/services/helper.js    | 6 +++---
 www/addons/mod/lesson/services/lesson.js    | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 41d0afa92b6..3cade6224f4 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -151,6 +151,11 @@ angular.module('mm.addons.mod_lesson')
 
     // Load a certain page.
     function loadPage(pageId) {
+        if (pageId == $mmaModLesson.LESSON_EOL) {
+            // End of lesson reached.
+            return finishAttempt();
+        }
+
         var args = [lesson, pageId, password, $scope.review, true, offline, true, accessInfo, jumps];
         return callFunction($mmaModLesson.getPageData, args, 5).then(function(data) {
             if (data.newpageid == $mmaModLesson.LESSON_EOL) {
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 7dd2c890ee4..1d0ca8a09c5 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -156,7 +156,7 @@ angular.module('mm.addons.mod_lesson')
 
                     if (!inputs || !inputs.length) {
                         // No checkbox found either. Stop.
-                        return false;
+                        return question;
                     }
                 }
 
@@ -190,7 +190,7 @@ angular.module('mm.addons.mod_lesson')
                 // Get the input.
                 var input = fieldContainer.querySelector('input[type="text"], input[type="number"]');
                 if (!input) {
-                    return false;
+                    return question;
                 }
 
                 question.input = {
@@ -218,7 +218,7 @@ angular.module('mm.addons.mod_lesson')
                     var answerEl = fieldContainer.querySelector('.reviewessay');
                     if (!answerEl) {
                         // Answer not found, stop.
-                        return false;
+                        return question;
                     }
                     question.useranswer = answerEl.innerHTML;
                 } else {
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 20ec8834ac2..8be8cb99287 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -2170,7 +2170,7 @@ angular.module('mm.addons.mod_lesson')
             // Custom scores. If score on answer is positive, it is correct.
             return answer.score > 0;
         } else {
-            return jumptoIsCorrect(pageId, answer.jumpto, pageIndex);
+            return self.jumptoIsCorrect(pageId, answer.jumpto, pageIndex);
         }
     }
 
@@ -2410,10 +2410,10 @@ angular.module('mm.addons.mod_lesson')
                 if (pageData.answers.length) {
                     return recordAttempt(lesson, courseId, pageData, data, review, accessInfo, jumps, pageIndex, siteId);
                 } else {
-                    // The page has no answers so we will just progress to the next page.
+                    // The page has no answers so we will just progress to the next page (as set by newpageid).
                    return {
                         nodefaultresponse: true,
-                        newpageid: self.LESSON_NEXTPAGE
+                        newpageid: data.newpageid
                     };
                 }
             }).then(function(res) {

From a3262ac19e0b4641c79563bab9605ec6e28282da Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 21 Apr 2017 09:00:34 +0200
Subject: [PATCH 115/218] MOBILE-2016 lesson: Check questions in calculate
 progress

---
 www/addons/mod/lesson/services/lesson.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 8be8cb99287..e8940252043 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -144,7 +144,10 @@ angular.module('mm.addons.mod_lesson')
             return 100;
         }
 
-        var promise;
+        var promise,
+            ntries = accessInfo.attemptscount,
+            viewedPagesIds = [];
+
         if (pageIndex) {
             promise = $q.when();
         } else {
@@ -154,14 +157,19 @@ angular.module('mm.addons.mod_lesson')
         }
 
         return promise.then(function() {
-            // @todo Question pages.
+            // Get the list of question pages answered.
+            return self.getPagesIdsWithQuestionAttempts(lessonId, ntries, false, siteId);
+        }).then(function(ids) {
+            viewedPagesIds = ids;
 
             // Get the list of viewed content pages.
-            return self.getContentPagesViewedIds(lessonId, accessInfo.attemptscount, siteId);
-        }).then(function(viewedPagesIds) {
+            return self.getContentPagesViewedIds(lessonId, ntries, siteId);
+        }).then(function(viewedContentPagesIds) {
             var pageId = accessInfo.firstpageid,
                 validPages = {};
 
+            viewedPagesIds = $mmUtil.mergeArraysWithoutDuplicates(viewedPagesIds, viewedContentPagesIds);
+
             // Filter out the following pages:
             // - End of Cluster
             // - End of Branch

From 17cd9bcba8ecb6d544938ef911fcfe319a5ab51c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Apr 2017 11:56:50 +0200
Subject: [PATCH 116/218] MOBILE-2016 lesson: Handle questions in lessonGrade

---
 www/addons/mod/lesson/lang/en.json            |   7 +-
 www/addons/mod/lesson/services/lesson.js      | 340 ++++++++++++++----
 .../mod/lesson/services/lesson_offline.js     |  24 +-
 3 files changed, 284 insertions(+), 87 deletions(-)

diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 69ebdd7c0c3..c46a8cefd34 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -6,6 +6,8 @@
     "continuetonextpage": "Continue to next page.",
     "defaultessayresponse": "Your essay will be graded by your teacher.",
     "displayofgrade": "Display of grade (for students only)",
+    "displayscorewithessays": "<p>You earned {{$a.score}} out of {{$a.tempmaxgrade}} for the automatically graded questions.</p><p>Your {{$a.essayquestions}} essay question(s) will be graded and added into your final score at a later date.</p><p>Your current grade without the essay question(s) is {{$a.score}} out of {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "Your score is {{$a.score}} (out of {{$a.grade}}).",
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
     "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
@@ -22,6 +24,7 @@
     "modattemptsnoteacher": "Student review only works for students.",
     "noanswer": "One or more questions have no answer given.  Please go back and submit an answer.",
     "numberofcorrectanswers": "Number of correct answers: {{$a}}",
+    "numberofpagesviewed": "Number of questions answered: {{$a}}",
     "numberofpagesviewednotice": "Number of questions answered: {{$a.nquestions}} (You should answer at least {{$a.minquestions}})",
     "ongoingcustom": "You have earned {{$a.score}} point(s) out of {{$a.currenthigh}} point(s) thus far.",
     "ongoingnormal": "You have answered {{$a.correct}} correctly out of {{$a.viewed}} attempts.",
@@ -42,5 +45,7 @@
     "unseenpageinbranch": "Unseen question within a content page",
     "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
-    "youranswer": "Your answer"
+    "youranswer": "Your answer",
+    "yourcurrentgradeisoutof": "Your current grade is {{$a.grade}} out of {{$a.total}}",
+    "youshouldview": "You should answer at least: {{$a}}"
 }
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index e8940252043..10be72909cd 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -103,7 +103,10 @@ angular.module('mm.addons.mod_lesson')
 
         if (!accessInfo.canmanage) {
             if (lesson.ongoing && !reviewMode) {
-                ongoingMessage = self.getOngoingScoreMessage(lesson, accessInfo, review);
+                promises.push(self.getOngoingScoreMessage(lesson, accessInfo, password, review, pageIndex, siteId)
+                        .then(function(message) {
+                    ongoingMessage = message;
+                }));
             }
             if (lesson.progressbar) {
                 promises.push(self.calculateProgress(lesson.id, accessInfo, password, review, pageIndex, siteId).then(function(p) {
@@ -284,7 +287,16 @@ angular.module('mm.addons.mod_lesson')
             result.newpageid = answer.jumpto;
         });
 
-        // Don't store userresponse because it contains a PHP serialization so it shouldn't be used by the app.
+        var userResponse = {
+            sent: 0,
+            graded: 0,
+            score: 0,
+            answer: studentAnswer,
+            answerformat: 1,
+            response: '',
+            responseformat: 1
+        };
+        result.userresponse = userResponse;
         result.studentanswerformat = 1;
         result.studentanswer = studentAnswer;
     }
@@ -763,10 +775,15 @@ angular.module('mm.addons.mod_lesson')
         if (offline) {
             var attempt = accessInfo.attemptscount;
             return $mmaModLessonOffline.finishAttempt(lesson.id, courseId, attempt, true, outOfTime, siteId).then(function() {
+                // Get the lesson grade.
+                return self.lessonGrade(lesson, accessInfo.attemptscount, password, review, undefined, siteId).catch(function() {
+                    // Ignore errors.
+                    return {};
+                });
+            }).then(function(gradeInfo) {
                 // Attempt marked, now return the response. We won't return all the possible data.
                 // This code is based in Moodle's process_eol_page.
-                var gradeInfo = self.lessonGrade(),
-                    gradeLesson = true,
+                var gradeLesson = true,
                     result = {
                         data: {},
                         messages: [],
@@ -822,7 +839,7 @@ angular.module('mm.addons.mod_lesson')
                             };
                             if (gradeInfo.nmanual) {
                                 entryData.tempmaxgrade = gradeInfo.total - gradeInfo.manualpoints;
-                                entryData.essayquestions = gradeInfo.manual;
+                                entryData.essayquestions = gradeInfo.nmanual;
                                 addResultValue(result, 'displayscorewithessays', entryData, true);
                             } else {
                                 addResultValue(result, 'displayscorewithoutessays', entryData, true);
@@ -870,10 +887,16 @@ angular.module('mm.addons.mod_lesson')
 
         // Add a property to the offline result.
         function addResultValue(result, name, value, addMessage) {
+            var message = '';
+            if (addMessage) {
+                var params = typeof value != 'boolean' ? {$a: value} : undefined;
+                message = $translate.instant('mma.mod_lesson.' + name, params);
+            }
+
             result.data[name] = {
                 name: name,
                 value: value,
-                message: addMessage ? $translate.instant('mma.mod_lesson.' + name) : ''
+                message: message
             };
         }
     };
@@ -1335,37 +1358,85 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getOngoingScoreMessage
-     * @param  {Object} lesson     Lesson.
-     * @param  {Object} accessInfo Result of get access info.
-     * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
-     * @return {String}            Ongoing score message.
+     * @param  {Object} lesson      Lesson.
+     * @param  {Object} accessInfo  Result of get access info.
+     * @param  {String} [password]  Lesson password (if any).
+     * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} [pageIndex] Object containing all the pages indexed by ID. If not provided, it will be calculated.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with the ongoing score message.
      */
-    self.getOngoingScoreMessage = function(lesson, accessInfo, review) {
+    self.getOngoingScoreMessage = function(lesson, accessInfo, password, review, pageIndex, siteId) {
         if (accessInfo.canmanage) {
-            return $translate.instant('mma.mod_lesson.teacherongoingwarning');
+            return $q.when($translate.instant('mma.mod_lesson.teacherongoingwarning'));
         } else {
             var ntries = accessInfo.attemptscount;
             if (review) {
                 ntries--;
             }
 
-            var gradeInfo = self.lessonGrade(),
-                data = {};
+            return self.lessonGrade(lesson, ntries, password, review, pageIndex, siteId).then(function(gradeInfo) {
+                var data = {};
 
-            if (lesson.custom) {
-                data.score = gradeInfo.earned;
-                data.currenthigh = gradeInfo.total;
-                return $translate.instant('mma.mod_lesson.ongoingcustom', {$a: data});
-            } else {
-                data.correct = gradeInfo.earned;
-                data.viewed = gradeInfo.attempts;
-                return $translate.instant('mma.mod_lesson.ongoingnormal', {$a: data});
-            }
+                if (lesson.custom) {
+                    data.score = gradeInfo.earned;
+                    data.currenthigh = gradeInfo.total;
+                    return $translate.instant('mma.mod_lesson.ongoingcustom', {$a: data});
+                } else {
+                    data.correct = gradeInfo.earned;
+                    data.viewed = gradeInfo.attempts;
+                    return $translate.instant('mma.mod_lesson.ongoingnormal', {$a: data});
+                }
+            });
         }
-
-        return '';
     };
 
+    /**
+     * Get the answers from a page.
+     *
+     * @param  {Object} lesson      Lesson.
+     * @param  {Number} pageId      Page ID the answer belongs to.
+     * @param  {String} [password]  Lesson password (if any).
+     * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with the list of answers.
+     */
+    function getPageAnswers(lesson, pageId, password, review, siteId) {
+        return self.getPageData(lesson, pageId, password, review, true, true, false, undefined, undefined, siteId)
+                .then(function(data) {
+            return data.answers;
+        });
+    }
+
+    /**
+     * Get all the answers from a list of pages, indexed by answerId.
+     *
+     * @param  {Object} lesson      Lesson.
+     * @param  {Number[]} pageIds   List of page IDs.
+     * @param  {String} [password]  Lesson password (if any).
+     * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with the list of answers.
+     */
+    function getPagesAnswers(lesson, pageIds, password, review, siteId) {
+        var answers = {},
+            promises = [];
+
+        angular.forEach(pageIds, function(pageId) {
+            promises.push(getPageAnswers(lesson, pageId, password, review, siteId).then(function(pageAnswers) {
+                angular.forEach(pageAnswers, function(answer) {
+                    // Include the pageid in each answer and add them to the final list.
+                    answer.pageid = pageId;
+                    answers[answer.id] = answer;
+                });
+            }));
+        });
+
+        return $q.all(promises).then(function() {
+            return answers;
+        });
+    }
+
     /**
      * Get cache key for get page data WS calls.
      *
@@ -1405,13 +1476,14 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [siteId]           Site ID. If not defined, current site.
      * @return {Promise}                   Promise resolved with the page data.
      */
-    self.getPageData = function(lesson, pageId, password, review, includeContents, forceCache, ignoreCache, accessInfo, jumps, siteId) {
+    self.getPageData = function(lesson, pageId, password, review, includeContents, forceCache, ignoreCache, accessInfo, jumps,
+                siteId) {
         siteId = siteId || $mmSite.getId();
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     lessonid: lesson.id,
-                    pageid: pageId,
+                    pageid: parseInt(pageId, 10),
                     review: review ? 1 : 0,
                     returncontents: includeContents ? 1 : 0
                 },
@@ -1434,8 +1506,11 @@ angular.module('mm.addons.mod_lesson')
                 if (forceCache && accessInfo && data.page) {
                     // Offline mode and valid page. Calculate the data that might be affected.
                     return calculateOfflineData(lesson, accessInfo, password, review, false, siteId).then(function(calculatedData) {
-                        data.messages = self.getPageViewMessages(lesson, accessInfo, data.page, review, jumps);
-                        return angular.extend(data, calculatedData);
+                        angular.extend(data, calculatedData);
+                        return self.getPageViewMessages(lesson, accessInfo, data.page, review, jumps, password, siteId);
+                    }).then(function(messages) {
+                        data.messages = messages;
+                        return data;
                     });
                 }
 
@@ -1632,38 +1707,44 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Object} page       Page loaded.
      * @param  {Boolean} review    If the user wants to review just after finishing (1 hour margin).
      * @param  {Object} jumps      Result of get pages possible jumps.
-     * @return {String[]}          Messages.
+     * @param  {String} [password] Lesson password (if any).
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with the list of messages.
      */
-    self.getPageViewMessages = function(lesson, accessInfo, page, review, jumps) {
+    self.getPageViewMessages = function(lesson, accessInfo, page, review, jumps, password, siteId) {
         var messages = [],
-            data;
+            data,
+            promise = $q.when();
 
         if (!accessInfo.canmanage) {
             if (page.qtype == self.LESSON_PAGE_BRANCHTABLE && lesson.minquestions) {
                 // Tell student how many questions they have seen, how many are required and their grade.
-                var ntries = accessInfo.attemptscount,
-                    gradeInfo = self.lessonGrade();
-
-                if (gradeInfo.attempts) {
-                    if (gradeInfo.nquestions < lesson.minquestions) {
-                        data = {
-                            nquestions: gradeInfo.nquestions,
-                            minquestions: lesson.minquestions
-                        };
-                        addMessage(messages, 'mma.mod_lesson.numberofpagesviewednotice', {$a: data});
-                    }
+                var ntries = accessInfo.attemptscount;
 
-                    if (!review && !lesson.retake) {
-                        addMessage(messages, 'mma.mod_lesson.numberofcorrectanswers', {$a: gradeInfo.earned});
-                        if (lesson.grade != mmCoreGradeTypeNone) {
+                promise = self.lessonGrade(lesson, ntries, password, review, undefined, siteId).then(function(gradeInfo) {
+                    if (gradeInfo.attempts) {
+                        if (gradeInfo.nquestions < lesson.minquestions) {
                             data = {
-                                grade: $mmUtil.roundToDecimals(gradeInfo.grade * lesson.grade / 100, 1),
-                                total: lesson.grade
+                                nquestions: gradeInfo.nquestions,
+                                minquestions: lesson.minquestions
                             };
-                            addMessage(messages, 'mma.mod_lesson.yourcurrentgradeisoutof', {$a: data});
+                            addMessage(messages, 'mma.mod_lesson.numberofpagesviewednotice', {$a: data});
+                        }
+
+                        if (!review && !lesson.retake) {
+                            addMessage(messages, 'mma.mod_lesson.numberofcorrectanswers', {$a: gradeInfo.earned});
+                            if (lesson.grade != mmCoreGradeTypeNone) {
+                                data = {
+                                    grade: $mmUtil.roundToDecimals(gradeInfo.grade * lesson.grade / 100, 1),
+                                    total: lesson.grade
+                                };
+                                addMessage(messages, 'mma.mod_lesson.yourcurrentgradeisoutof', {$a: data});
+                            }
                         }
                     }
-                }
+                }).catch(function() {
+                    // Ignore errors.
+                });
             }
         } else {
             if (lesson.timelimit) {
@@ -1681,7 +1762,9 @@ angular.module('mm.addons.mod_lesson')
             }
         }
 
-        return messages;
+        return promise.then(function() {
+            return messages;
+        });
     };
 
     /**
@@ -2319,39 +2402,144 @@ angular.module('mm.addons.mod_lesson')
 
     /**
      * Calculates a user's grade for a lesson.
+     * Based on Moodle's lesson_grade.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#lessonGrade
-     * @return {Object} Object with the grade data.
+     * @param  {Object} lesson      Lesson.
+     * @param  {Number} retry       Retry number.
+     * @param  {String} [password]  Lesson password (if any).
+     * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
+     * @param  {Object} [pageIndex] Object containing all the pages indexed by ID. If not provided, it will be calculated.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @param  {Number} [userId]    User ID. If not defined, site's user.
+     * @return {Promise}            Promise resolved with an object with the grade data.
      */
-    self.lessonGrade = function() {
+    self.lessonGrade = function(lesson, retry, password, review, pageIndex, siteId, userId) {
         // Initialize all variables.
-        var ncorrect     = 0,
-            nviewed      = 0,
-            score        = 0,
-            nmanual      = 0,
-            manualpoints = 0,
-            thegrade     = 0,
-            nquestions   = 0,
+        var nViewed      = 0,
+            nManual      = 0,
+            manualPoints = 0,
+            theGrade     = 0,
+            nQuestions   = 0,
             total        = 0,
             earned       = 0;
 
-        // @todo Handle questions.
+        // Get the questions attempts for the user.
+        return self.getQuestionsAttempts(lesson.id, retry, false, undefined, siteId, userId).then(function(attempts) {
+            attempts = attempts.online.concat(attempts.offline);
 
-        if (total) { // Not zero.
-            thegrade = $mmUtil.roundToDecimals(100 * earned / total, 5);
-        }
+            if (!attempts.length) {
+                // No attempts.
+                return;
+            }
 
-        return {
-            nquestions: nquestions,
-            attempts: nviewed,
-            total: total,
-            earned: earned,
-            grade: thegrade,
-            nmanual: nmanual,
-            manualpoints: manualpoints
-        };
+            var promise,
+                attemptSet = {};
+
+            // Create the pageIndex if it isn't provided.
+            if (!pageIndex) {
+                promise = self.getPages(lesson.id, password, true, false, siteId).then(function(pages) {
+                    pageIndex = createPagesIndex(pages);
+                });
+            } else {
+                promise = $q.when();
+            }
+
+            return promise.then(function() {
+
+                // Group each try with its page
+                angular.forEach(attempts, function(attempt) {
+                    if (!attemptSet[attempt.pageid]) {
+                        attemptSet[attempt.pageid] = [];
+                    }
+                    attemptSet[attempt.pageid].push(attempt);
+                });
+
+                // Drop all attempts that go beyond max attempts for the lesson
+                angular.forEach(attemptSet, function(set, pageId) {
+                    // Sort the list by time in ascending order.
+                    set = set.sort(function(a, b) {
+                        return (a.timeseen || a.timemodified) > (b.timeseen || b.timemodified) ? 1 : -1;
+                    });
+                    attemptSet[pageId] = set.slice(0, lesson.maxattempts);
+                });
+
+                // Get all the answers from the pages the user answered.
+                return getPagesAnswers(lesson, Object.keys(attemptSet), password, review, siteId);
+            }).then(function(answers) {
+                // Number of pages answered.
+                nQuestions = Object.keys(attemptSet).length;
+
+                angular.forEach(attemptSet, function(attempts) {
+                    var lastAttempt = attempts[attempts.length - 1];
+                    if (lesson.custom) {
+                        // If essay question, handle it, otherwise add to score.
+                        if (pageIndex[lastAttempt.pageid].qtype == self.LESSON_PAGE_ESSAY) {
+                            if (lastAttempt.useranswer && typeof lastAttempt.useranswer.score != 'undefined') {
+                                earned += lastAttempt.useranswer.score;
+                            }
+                            nManual++;
+                            manualPoints += answers[lastAttempt.answerid].score;
+                        } else if (lastAttempt.answerid) {
+                            earned += answers[lastAttempt.answerid].score;
+                        }
+                    } else {
+                        angular.forEach(attempts, function(attempt) {
+                            earned += attempt.correct ? 1 : 0;
+                        });
+                        // If essay question, increase numbers.
+                        if (pageIndex[lastAttempt.pageid].qtype == self.LESSON_PAGE_ESSAY) {
+                            nManual++;
+                            manualPoints++;
+                        }
+                    }
+
+                    // Number of times answered.
+                    nViewed += attempts.length;
+                });
+
+                if (lesson.custom) {
+                    var bestScores = {};
+                    // Find the highest possible score per page to get our total.
+                    angular.forEach(answers, function(answer) {
+                        if (typeof bestScores[answer.pageid] == 'undefined') {
+                            bestScores[answer.pageid] = answer.score;
+                        } else if (bestScores[answer.pageid] < answer.score) {
+                            bestScores[answer.pageid] = answer.score;
+                        }
+                    });
+
+                    // Sum all the scores.
+                    angular.forEach(bestScores, function(score) {
+                        total += score;
+                    });
+                } else {
+                    // Check to make sure the student has answered the minimum questions.
+                    if (lesson.minquestions && nQuestions < lesson.minquestions) {
+                        // Nope, increase number viewed by the amount of unanswered questions.
+                        total = nViewed + (lesson.minquestions - nQuestions);
+                    } else {
+                        total = nViewed;
+                    }
+                }
+            });
+        }).then(function() {
+            if (total) { // Not zero.
+                theGrade = $mmUtil.roundToDecimals(100 * earned / total, 5);
+            }
+
+            return {
+                nquestions: nQuestions,
+                attempts: nViewed,
+                total: total,
+                earned: earned,
+                grade: theGrade,
+                nmanual: nManual,
+                manualpoints: manualPoints
+            };
+        });
     };
 
     /**
@@ -2500,7 +2688,7 @@ angular.module('mm.addons.mod_lesson')
             if (pageData.page.qtype == self.LESSON_PAGE_BRANCHTABLE) {
                 // Store the content page data. In Moodle this is stored in a separate table, during checkAnswer.
                 return $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes, pageData.page, data,
-                            result.newpageid, false, siteId).then(function() {
+                            result.newpageid, result.answerid, false, result.userresponse, siteId).then(function() {
                     return result;
                 });
             }
@@ -2540,8 +2728,8 @@ angular.module('mm.addons.mod_lesson')
                             // Store the student's attempt and increase the number of attempts made.
                             // Calculate and store the new page ID to prevent having to recalculate it later.
                             var newPageId = getNewPageId(pageData.page.id, result.newpageid, jumps);
-                            subPromise = $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes,
-                                        pageData.page, data, newPageId, result.correctanswer, siteId);
+                            subPromise = $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes, pageData.page, data,
+                                        newPageId, result.answerid, result.correctanswer, result.userresponse, siteId);
                             nattempts++;
                         }
                     }
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index c5a778dae0b..a4d8a59d95f 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -496,17 +496,19 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLessonOffline#processPage
-     * @param  {Number} lessonId   Lesson ID.
-     * @param  {Number} courseId   Course ID the lesson belongs to.
-     * @param  {Number} attempt    Attempt number.
-     * @param  {Object} page       Page.
-     * @param  {Object} data       Data to save.
-     * @param  {Number} newPageId  New page ID (calculated).
-     * @param  {Boolean} [correct] If answer is correct. Only for question pages.
-     * @param  {String} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise}           Promise resolved in success, rejected otherwise.
+     * @param  {Number} lessonId    Lesson ID.
+     * @param  {Number} courseId    Course ID the lesson belongs to.
+     * @param  {Number} attempt     Attempt number.
+     * @param  {Object} page        Page.
+     * @param  {Object} data        Data to save.
+     * @param  {Number} newPageId   New page ID (calculated).
+     * @param  {Number} [answerId]  The answer ID that the user answered.
+     * @param  {Boolean} [correct]  If answer is correct. Only for question pages.
+     * @param  {Mixed} [userAnswer] The user's answer (userresponse from checkAnswer).
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved in success, rejected otherwise.
      */
-    self.processPage = function(lessonId, courseId, attempt, page, data, newPageId, correct, siteId) {
+    self.processPage = function(lessonId, courseId, attempt, page, data, newPageId, answerId, correct, userAnswer, siteId) {
         siteId = siteId || $mmSite.getId();
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -519,6 +521,8 @@ angular.module('mm.addons.mod_lesson')
                 type: page.type,
                 newpageid: newPageId,
                 correct: !!correct,
+                answerid: parseInt(answerId, 10),
+                userAnswer: userAnswer,
                 timemodified: $mmUtil.timestamp()
             };
 

From c4a8ac9f19be543681d53ee0b534b1341be81d6c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Apr 2017 12:10:47 +0200
Subject: [PATCH 117/218] MOBILE-2016 lesson: Update cached data when data sent
 in online

---
 www/addons/mod/lesson/controllers/player.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 3cade6224f4..0a8f4b6a684 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -298,9 +298,17 @@ angular.module('mm.addons.mod_lesson')
     function processPage(data) {
         showLoading();
 
-        // @todo Refresh contentpagesviewed and questionsattempts after online process.
         var args = [lesson, courseId, $scope.pageData, data, password, $scope.review, offline, accessInfo, jumps];
         return callFunction($mmaModLesson.processPage, args, 6).then(function(result) {
+            if (!offline && !$scope.review && $mmaModLesson.isLessonOffline(lesson)) {
+                // Lesson allows offline and the user changed some data in server. Update cached data.
+                if ($mmaModLesson.isQuestionPage($scope.pageData.page.type)) {
+                    $mmaModLesson.getQuestionsAttemptsOnline(lesson.id, accessInfo.attemptscount, false, undefined, false, true);
+                } else {
+                    $mmaModLesson.getContentPagesViewedOnline(lesson.id, accessInfo.attemptscount, false, true);
+                }
+            }
+
             if (result.nodefaultresponse || result.inmediatejump) {
                 // Don't display feedback or force a redirect to a new page. Load the new page.
                 return jumpToPage(result.newpageid);

From 31f8bdc2f7cd8c3af64045e87af62395f38cefd0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Apr 2017 13:54:52 +0200
Subject: [PATCH 118/218] MOBILE-2016 lesson: Adapt sync to new data model and
 send in order

---
 www/addons/mod/lesson/lang/en.json            |  1 +
 www/addons/mod/lesson/services/lesson.js      |  2 +-
 .../mod/lesson/services/lesson_offline.js     | 19 ++++++++
 www/addons/mod/lesson/services/lesson_sync.js | 48 +++++++++++--------
 4 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index c46a8cefd34..6032cd51868 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -43,6 +43,7 @@
     "thatsthewronganswer": "That's the wrong answer",
     "timeremaining": "Time remaining",
     "unseenpageinbranch": "Unseen question within a content page",
+    "warningattemptfinished": "The attempt was finished in the site.",
     "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
     "youranswer": "Your answer",
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 10be72909cd..a75f85a4b6e 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -2461,7 +2461,7 @@ angular.module('mm.addons.mod_lesson')
                 angular.forEach(attemptSet, function(set, pageId) {
                     // Sort the list by time in ascending order.
                     set = set.sort(function(a, b) {
-                        return (a.timeseen || a.timemodified) > (b.timeseen || b.timemodified) ? 1 : -1;
+                        return (a.timeseen || a.timemodified) - (b.timeseen || b.timemodified);
                     });
                     attemptSet[pageId] = set.slice(0, lesson.maxattempts);
                 });
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index a4d8a59d95f..8c4056a347c 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -98,6 +98,25 @@ angular.module('mm.addons.mod_lesson')
 
     var self = {};
 
+    /**
+     * Delete offline answer.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#deleteAnswer
+     * @param  {Number} lessonId     Lesson ID.
+     * @param  {Number} attempt      Attempt number.
+     * @param  {Number} pageId       Page ID.
+     * @param  {Number} timemodified The time modified of the answer.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved when done.
+     */
+    self.deleteAnswer = function(lessonId, attempt, pageId, timemodified, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().remove(mmaModLessonAnswersStore, [lessonId, attempt, pageId, timemodified]);
+        });
+    };
+
     /**
      * Delete offline attempt.
      *
diff --git a/www/addons/mod/lesson/services/lesson_sync.js b/www/addons/mod/lesson/services/lesson_sync.js
index a6e4feb8fdc..45f170d2bca 100644
--- a/www/addons/mod/lesson/services/lesson_sync.js
+++ b/www/addons/mod/lesson/services/lesson_sync.js
@@ -191,17 +191,24 @@ angular.module('mm.addons.mod_lesson')
 
                 return $mmaModLessonPrefetchHandler.gatherLessonPassword(lessonId, false, true, askPassword, siteId);
             }).then(function(data) {
-                var answersLength = answers.length,
-                    lastAnswer,
-                    promises = [];
+                var answersLength = answers.length;
 
                 accessInfo = data.accessinfo;
                 password = data.password;
                 lesson = data.lesson || lesson;
 
+                var promises = [];
+
                 // Filter the answers, get only the ones that belong to the current attempt.
                 answers = answers.filter(function(answer) {
-                    return answer.attempt == accessInfo.attemptscount;
+                    if (answer.attempt != accessInfo.attemptscount) {
+                        promises.push($mmaModLessonOffline.deleteAnswer(lesson.id, answer.attempt, answer.pageid,
+                                answer.timemodified, siteId).catch(function() {
+                            // Ignore errors.
+                        }));
+                        return false;
+                    }
+                    return true;
                 });
 
                 if (answers.length != answersLength) {
@@ -209,29 +216,30 @@ angular.module('mm.addons.mod_lesson')
                     result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                         component: $mmCourse.translateModuleName('lesson'),
                         name: lesson.name,
-                        error: ''
+                        error: $translate.instant('mma.mod_lesson.warningattemptfinished')
                     }));
                 }
 
+                return $q.all(promises);
+            }).then(function() {
                 if (!answers.length) {
                     return;
                 }
 
-                // Sort the answers by timemodified.
+                // Send the answers in the same order they were answered.
                 answers.sort(function(a, b) {
-                    return a.timemodified > b.timemodified;
+                    return a.timemodified - b.timemodified;
                 });
-                lastAnswer = answers.pop();
 
-                // Send all the answers except the last page (so last page seen is calculated right).
-                angular.forEach(answers, function(answer) {
-                    promises.push(sendAnswer(lesson, password, answer, result, siteId));
+                answers = answers.map(function(answer) {
+                    return {
+                        func: sendAnswer,
+                        params: [lesson, password, answer, result, siteId],
+                        blocking: true
+                    };
                 });
 
-                return $q.all(promises).then(function() {
-                    // Now send the last page.
-                    return sendAnswer(lesson, password, lastAnswer, result, siteId);
-                });
+                return $mmUtil.executeOrderedPromises(answers);
             });
         }).then(function() {
             // Answers sent or there was none. If there is a finished attempt, send it.
@@ -270,7 +278,7 @@ angular.module('mm.addons.mod_lesson')
                             result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                                 component: $mmCourse.translateModuleName('lesson'),
                                 name: lesson.name,
-                                error: ''
+                                error: $translate.instant('mma.mod_lesson.warningattemptfinished')
                             }));
                         }
 
@@ -359,14 +367,14 @@ angular.module('mm.addons.mod_lesson')
         return $mmaModLesson.processPageOnline(lesson.id, answer.pageid, answer.data, password, false, siteId).then(function() {
             result.updated = true;
 
-            return $mmaModLessonOffline.deleteAttemptAnswersForPage(lesson.id, answer.attempt, answer.pageid, siteId);
+            return $mmaModLessonOffline.deleteAnswer(lesson.id, answer.attempt, answer.pageid, answer.timemodified, siteId);
         }).catch(function(error) {
             if (error && $mmUtil.isWebServiceError(error)) {
-                // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
+                // The WebService has thrown an error, this means that the answer cannot be submitted. Delete it.
                 result.updated = true;
-                return $mmaModLessonOffline.deleteAttemptAnswersForPage(lesson.id, answer.attempt, answer.pageid, siteId)
+                return $mmaModLessonOffline.deleteAnswer(lesson.id, answer.attempt, answer.pageid, answer.timemodified, siteId)
                         .then(function() {
-                    // Responses deleted, add a warning.
+                    // Answer deleted, add a warning.
                     result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                         component: $mmCourse.translateModuleName('lesson'),
                         name: lesson.name,

From 3ffc92b4afb3590d7d32aee05a363b5b16b4a9a5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Apr 2017 09:21:01 +0200
Subject: [PATCH 119/218] MOBILE-2016 lesson: Allow reviewing attempts finished
 in synchronization

---
 www/addons/mod/lesson/controllers/index.js    | 30 ++++++
 www/addons/mod/lesson/controllers/player.js   | 51 +++++++---
 www/addons/mod/lesson/lang/en.json            |  3 +
 www/addons/mod/lesson/main.js                 |  4 +-
 www/addons/mod/lesson/services/lesson.js      |  7 ++
 www/addons/mod/lesson/services/lesson_sync.js | 94 ++++++++++++++++++-
 www/addons/mod/lesson/templates/index.html    |  7 ++
 7 files changed, 181 insertions(+), 15 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index a31e74db5e6..e52e15e1439 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -83,6 +83,19 @@ angular.module('mm.addons.mod_lesson')
                     $scope.hasOffline = hasOffline;
                 }));
 
+                // Check if there is an attempt finished in a synchronization.
+                promises.push($mmaModLessonSync.getAttemptFinishedInSync(lesson.id).then(function(attempt) {
+                    if (attempt && attempt.attempt == accessInfo.attemptscount - 1) {
+                        // The attempt finished is still the last attempt. Allow reviewing it.
+                        $scope.attemptToReview = attempt;
+                    } else {
+                        $scope.attemptToReview = undefined;
+                        if (attempt) {
+                            $mmaModLessonSync.deleteAttemptFinishedInSync(lesson.id);
+                        }
+                    }
+                }));
+
                 // Update the list of content pages viewed and question attempts.
                 promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, accessInfo.attemptscount));
                 promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, accessInfo.attemptscount));
@@ -316,6 +329,23 @@ angular.module('mm.addons.mod_lesson')
         }
     };
 
+    // Review the lesson.
+    $scope.review = function() {
+        if (!$scope.attemptToReview) {
+            // No attempt to review, stop.
+            return;
+        }
+
+        $state.go('site.mod_lesson-player', {
+            courseid: courseId,
+            lessonid: lesson.id,
+            pageid: $scope.attemptToReview.pageid,
+            password: password,
+            review: true,
+            attempt: $scope.attemptToReview.attempt
+        });
+    };
+
     // Submit password for password protected lessons.
     $scope.submitPassword = function(pwd) {
         if (!pwd) {
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 0a8f4b6a684..5fdccd635ad 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_lesson')
  * @name mmaModLessonPlayerCtrl
  */
 .controller('mmaModLessonPlayerCtrl', function($scope, $stateParams, $mmaModLesson, $q, $ionicScrollDelegate, $mmUtil, $mmApp,
-            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate, $mmaModLessonOffline,
+            mmaModLessonComponent, $mmSyncBlock, $mmaModLessonHelper, $mmSideMenu, $translate, $mmaModLessonOffline, $mmLang,
             $mmaModLessonSync) {
 
     var lessonId = $stateParams.lessonid,
@@ -42,7 +42,7 @@ angular.module('mm.addons.mod_lesson')
     // Block leaving the view, we want to save changes before leaving.
     blockData = $mmUtil.blockLeaveView($scope, leavePlayer);
 
-    $scope.review = false;
+    $scope.review = $stateParams.review;
     $scope.LESSON_EOL = $mmaModLesson.LESSON_EOL;
     $scope.component = mmaModLessonComponent;
     $scope.currentPage = $stateParams.pageid;
@@ -62,7 +62,7 @@ angular.module('mm.addons.mod_lesson')
             return $mmaModLessonOffline.hasOfflineData(lessonId);
         }).then(function(offlineMode) {
             offline = offlineMode;
-            if (!offline && !$mmApp.isOnline() && $mmaModLesson.isLessonOffline(lesson)) {
+            if (!offline && !$mmApp.isOnline() && $mmaModLesson.isLessonOffline(lesson) && !$scope.review) {
                 // Lesson doesn't have offline data, but it allows offline and the device is offline. Use offline mode.
                 offline = true;
             }
@@ -80,6 +80,11 @@ angular.module('mm.addons.mod_lesson')
                 }
             }
 
+            if ($scope.review && $stateParams.attempt != accessInfo.attemptscount - 1) {
+                // Reviewing an attempt that isn't the last one. Error.
+                return $mmLang.translateAndReject('mma.mod_lesson.errorreviewattemptnotlast');
+            }
+
             if (password) {
                 // Lesson uses password, get the whole lesson object.
                 var args = [lesson.id, password, true, offline, true];
@@ -105,9 +110,21 @@ angular.module('mm.addons.mod_lesson')
 
             return launchAttempt($scope.currentPage);
         }).catch(function(message) {
-            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
-            blockData && blockData.back();
-            return $q.reject();
+            // An error occurred.
+            var promise;
+
+            if ($scope.review && $stateParams.attempt && $mmUtil.isWebServiceError(message)) {
+                // The user cannot review the attempt. Unmark the attempt as being finished in sync.
+                promise = $mmaModLessonSync.deleteAttemptFinishedInSync(lessonId);
+            } else {
+                promise = $q.when();
+            }
+
+            return promise.then(function() {
+                $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+                blockData && blockData.back();
+                return $q.reject();
+            });
         });
     }
 
@@ -115,7 +132,10 @@ angular.module('mm.addons.mod_lesson')
     function launchAttempt(pageId) {
         var promise;
 
-        if (!offline) {
+        if ($scope.review) {
+            // Review mode, no need to launch the attempt
+            promise = $q.when({});
+        } else if (!offline) {
             // Not in offline mode, launch the attempt.
             promise = $mmaModLesson.launchAttempt(lesson.id, password, pageId);
         } else {
@@ -157,7 +177,7 @@ angular.module('mm.addons.mod_lesson')
         }
 
         var args = [lesson, pageId, password, $scope.review, true, offline, true, accessInfo, jumps];
-        return callFunction($mmaModLesson.getPageData, args, 5).then(function(data) {
+        return callFunction($mmaModLesson.getPageData, args, 5, 8).then(function(data) {
             if (data.newpageid == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
                 return finishAttempt();
@@ -299,7 +319,7 @@ angular.module('mm.addons.mod_lesson')
         showLoading();
 
         var args = [lesson, courseId, $scope.pageData, data, password, $scope.review, offline, accessInfo, jumps];
-        return callFunction($mmaModLesson.processPage, args, 6).then(function(result) {
+        return callFunction($mmaModLesson.processPage, args, 6, 8).then(function(result) {
             if (!offline && !$scope.review && $mmaModLesson.isLessonOffline(lesson)) {
                 // Lesson allows offline and the user changed some data in server. Update cached data.
                 if ($mmaModLesson.isQuestionPage($scope.pageData.page.type)) {
@@ -372,9 +392,10 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Function} func          Function to call.
      * @param  {Mixed[]} args           Arguments to pass to the function.
      * @param  {Number} offlineParamPos Position of the offline parameter in the args.
+     * @param  {Number} [jumpsParamPos] Position of the jumps parameter in the args.
      * @return {Promise}                Promise resolved in success, rejected otherwise.
      */
-    function callFunction(func, args, offlineParamPos) {
+    function callFunction(func, args, offlineParamPos, jumpsParamPos) {
         return func.apply(this, args).catch(function(error) {
             if (!offline && !$scope.review && $mmaModLesson.isLessonOffline(lesson) && !$mmUtil.isWebServiceError(error)) {
                 // If it fails, go offline.
@@ -384,8 +405,11 @@ angular.module('mm.addons.mod_lesson')
                 return $mmaModLesson.getPagesPossibleJumps(lesson.id, offline).then(function(jumpList) {
                     jumps = jumpList;
 
-                    // Call the function again with offline set to true.
+                    // Call the function again with offline set to true and the new jumps.
                     args[offlineParamPos] = true;
+                    if (typeof jumpsParamPos != 'undefined') {
+                        args[jumpsParamPos] = jumps;
+                    }
                     return func.apply(this, args);
                 });
             }
@@ -394,7 +418,10 @@ angular.module('mm.addons.mod_lesson')
     }
 
     // Fetch the Lesson data.
-    fetchLessonData().finally(function() {
+    fetchLessonData().then(function() {
+        // Review data loaded or new attempt started, remove any attempt being finished in sync.
+        $mmaModLessonSync.deleteAttemptFinishedInSync(lessonId);
+    }).finally(function() {
         $scope.pageLoaded = true;
     });
 
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 6032cd51868..fce83d6048d 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,4 +1,5 @@
 {
+    "attemptfinishedinsync": "An offline attempt was synchronized. Do you want to review it?",
     "attemptsremaining": "You have {{$a}} attempt(s) remaining",
     "clusterjump": "Unseen question within a cluster",
     "congratulations": "Congratulations - end of lesson reached",
@@ -11,6 +12,7 @@
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
     "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
+    "errorreviewattemptnotlast": "This attempt cannot be reviewed anymore because another attempt was finished.",
     "finish": "Finish",
     "finishattemptoffline": "This attempt has been finished in offline.",
     "firstwrong": "You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)",
@@ -30,6 +32,7 @@
     "ongoingnormal": "You have answered {{$a.correct}} correctly out of {{$a.viewed}} attempts.",
     "or": "OR",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
+    "review": "Review",
     "reviewlesson": "Review lesson",
     "reviewquestionback": "Yes, I'd like to try again",
     "reviewquestioncontinue": "No, I just want to go on to the next question",
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index a406fb8d19c..5921604b97c 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -46,7 +46,9 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
         courseid: null,
         lessonid: null,
         pageid: null,
-        password: null
+        password: null,
+        review: false,
+        attempt: null // Only if review=true. To verify that the attempt can be reviewed.
       },
       views: {
         'site': {
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index a75f85a4b6e..78838d0fbaa 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -1502,6 +1502,13 @@ angular.module('mm.addons.mod_lesson')
                 preSets.emergencyCache = 0;
             }
 
+            if (review) {
+                // Force online mode in review.
+                preSets.getFromCache = 0;
+                preSets.saveToCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
             return site.read('mod_lesson_get_page_data', params, preSets).then(function(data) {
                 if (forceCache && accessInfo && data.page) {
                     // Offline mode and valid page. Calculate the data that might be affected.
diff --git a/www/addons/mod/lesson/services/lesson_sync.js b/www/addons/mod/lesson/services/lesson_sync.js
index 45f170d2bca..842c3f4bb70 100644
--- a/www/addons/mod/lesson/services/lesson_sync.js
+++ b/www/addons/mod/lesson/services/lesson_sync.js
@@ -14,6 +14,26 @@
 
 angular.module('mm.addons.mod_lesson')
 
+.constant('mmaModLessonAttemptsFinishedSyncStore', 'mma_mod_lesson_attempts_finished_sync')
+
+.config(function($mmSitesFactoryProvider, mmaModLessonAttemptsFinishedSyncStore) {
+    var stores = [
+        {
+            name: mmaModLessonAttemptsFinishedSyncStore,
+            keyPath: 'lessonid', // Only 1 attempt per lesson.
+            indexes: [
+                {
+                    name: 'attempt'
+                },
+                {
+                    name: 'timefinished'
+                }
+            ]
+        }
+    ];
+    $mmSitesFactoryProvider.registerStores(stores);
+})
+
 /**
  * Lesson synchronization service.
  *
@@ -23,13 +43,49 @@ angular.module('mm.addons.mod_lesson')
  */
 .factory('$mmaModLessonSync', function($log, $mmaModLesson, $mmSite, $mmSitesManager, $q, $mmaModLessonOffline, $mmUtil,
             $mmLang, $mmApp, $mmEvents, $translate, mmaModLessonSyncTime, $mmSync, mmaModLessonAutomSyncedEvent,
-            mmaModLessonComponent, $mmaModLessonPrefetchHandler, $mmCourse, $mmSyncBlock) {
+            mmaModLessonComponent, $mmaModLessonPrefetchHandler, $mmCourse, $mmSyncBlock, mmaModLessonAttemptsFinishedSyncStore) {
 
     $log = $log.getInstance('$mmaModLessonSync');
 
     // Inherit self from $mmSync.
     var self = $mmSync.createChild(mmaModLessonComponent, mmaModLessonSyncTime);
 
+    /**
+     * Unmark an attempt as finished in a synchronization.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#deleteAttemptFinishedInSync
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.deleteAttemptFinishedInSync = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().remove(mmaModLessonAttemptsFinishedSyncStore, lessonId);
+        }).catch(function() {
+            // Ignore errors, maybe there is none.
+        });
+    };
+
+    /**
+     * Get the number of an attempt finished in a synchronization for a certain lesson (if any).
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#getAttemptFinishedInSync
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempt entry (undefined if no attempt).
+     */
+    self.getAttemptFinishedInSync = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmaModLessonAttemptsFinishedSyncStore, lessonId);
+        }).catch(function() {
+            // Ignore errors, return undefined.
+        });
+    };
+
     /**
      * Check if a lesson has data to synchronize.
      *
@@ -60,6 +116,29 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Mark an attempt as finished in a synchronization.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonSync#setAttemptFinishedInSync
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  The attempt number.
+     * @param  {Number} pageId   The page ID to start reviewing from.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when done.
+     */
+    self.setAttemptFinishedInSync = function(lessonId, attempt, pageId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().insert(mmaModLessonAttemptsFinishedSyncStore, {
+                lessonid: lessonId,
+                attempt: parseInt(attempt, 10),
+                pageid: parseInt(pageId, 10),
+                timefinished: $mmUtil.timestamp()
+            });
+        });
+    };
+
     /**
      * Try to synchronize all lessons that need it and haven't been synchronized in a while.
      *
@@ -286,9 +365,20 @@ angular.module('mm.addons.mod_lesson')
                     }
 
                     // All good, finish the attempt.
-                    return $mmaModLesson.finishAttemptOnline(lessonId, password, false, false, siteId).then(function() {
+                    return $mmaModLesson.finishAttemptOnline(lessonId, password, false, false, siteId).then(function(response) {
                         result.updated = true;
 
+                        if (!ignoreBlock) {
+                            // Mark the attempt as finished in a sync if it can be reviewed.
+                            if (response.data && response.data.reviewlesson) {
+                                var params = $mmUtil.extractUrlParams(response.data.reviewlesson.value);
+                                if (params && params.pageid) {
+                                    // The attempt can be reviewed, mark it as finished. Don't block the user for this.
+                                    self.setAttemptFinishedInSync(lessonId, attempt.attempt, params.pageid, siteId);
+                                }
+                            }
+                        }
+
                         return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
                     }).catch(function(error) {
                         if (error && $mmUtil.isWebServiceError(error)) {
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 0cdaed48ccf..470f3f908d7 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -36,6 +36,13 @@
             </form>
 
             <div ng-if="lesson && (!preventMessages || !preventMessages.length) && !showSpinner">
+                <div ng-if="attemptToReview" class="card">
+                    <!-- An attempt was finished in a synchronization, allow reviewing it. -->
+                    <p class="item item-text-wrap">{{ 'mma.mod_lesson.attemptfinishedinsync' | translate }}</p>
+                    <div class="item">
+                        <button class="button button-block" ng-click="review()">{{ 'mma.mod_lesson.review' | translate }}</button>
+                    </div>
+                </div>
                 <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
                     <!-- User left during the session and there is no time limit, ask to continue. -->
                     <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>

From 6ce8b3c68776503f4b9922456167316965bfd062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 4 May 2017 16:57:35 +0200
Subject: [PATCH 120/218] MOBILE-2098 login: Show spinner while checking site

---
 .../login/controllers/credentials.js          |  8 ++-
 .../login/templates/credentials.html          | 71 ++++++++++---------
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/www/core/components/login/controllers/credentials.js b/www/core/components/login/controllers/credentials.js
index d935c02173b..3ab1519ac05 100644
--- a/www/core/components/login/controllers/credentials.js
+++ b/www/core/components/login/controllers/credentials.js
@@ -41,9 +41,10 @@ angular.module('mm.core.login')
     // Function to check if a site uses local_mobile, requires SSO login, etc.
     // This should be used only if a fixed URL is set, otherwise this check is already performed in mmLoginSiteCtrl.
     function checkSite(siteurl) {
+        $scope.pageLoaded = false;
+
         // If the site is configured with http:// protocol we force that one, otherwise we use default mode.
-        var checkmodal = $mmUtil.showModalLoading(),
-            protocol = siteurl.indexOf('http://') === 0 ? 'http://' : undefined;
+        var protocol = siteurl.indexOf('http://') === 0 ? 'http://' : undefined;
         return $mmSitesManager.checkSite(siteurl, protocol).then(function(result) {
 
             $scope.siteChecked = true;
@@ -73,7 +74,7 @@ angular.module('mm.core.login')
             $mmUtil.showErrorModal(error);
             return $q.reject();
         }).finally(function() {
-            checkmodal.dismiss();
+            $scope.pageLoaded = true;
         });
     }
 
@@ -106,6 +107,7 @@ angular.module('mm.core.login')
         checkSite($scope.siteurl);
     } else {
         $scope.siteChecked = true;
+        $scope.pageLoaded = true;
     }
 
     $scope.login = function() {
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 1f2559cec9c..842b31123a7 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -1,43 +1,46 @@
 <ion-view view-title="{{ 'mm.login.login' | translate }}">
     <ion-content mm-state-class padding="true">
-        <div class="card">
-            <div class="item item-text-wrap item-avatar-center">
-                <!-- Show site logo or a default image. -->
-                <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
+        <mm-loading hide-until="pageLoaded">
+            <div class="card">
+                <div class="item item-text-wrap item-avatar-center">
+                    <!-- Show site logo or a default image. -->
+                    <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
 
-                <!-- If no sitename show big siteurl. -->
-                <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
-                <!-- If sitename, show big sitename and small siteurl. -->
-                <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
-                <p ng-if="sitename">{{siteurl}}</p>
+                    <!-- If no sitename show big siteurl. -->
+                    <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
+                    <!-- If sitename, show big sitename and small siteurl. -->
+                    <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
+                    <p ng-if="sitename">{{siteurl}}</p>
+                </div>
             </div>
-        </div>
-        <form>
-            <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
-                <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
-            </ion-input>
-            <ion-input class="list item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
-                <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
-            </ion-input>
-            <button class="button button-block button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
-        </form>
+            <form>
+                <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
+                    <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
+                </ion-input>
+                <ion-input class="list item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
+                    <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
+                </ion-input>
+                <button class="button button-block button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+            </form>
 
-        <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
-            <p>{{ 'mm.login.potentialidps' | translate }}</p>
-            <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
-                <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
-                <span>{{provider.name}}</span>
-                <i class="icon icon-accessory ion-chevron-right"></i>
-            </a>
-        </div>
-        <div ng-if="canSignup">
-            <div class="card">
-                <div class="item item-text-wrap">
-                    <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
-                    <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
+            <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
+                <p>{{ 'mm.login.potentialidps' | translate }}</p>
+                <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
+                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                    <span>{{provider.name}}</span>
+                    <i class="icon icon-accessory ion-chevron-right"></i>
+                </a>
+            </div>
+
+            <div ng-if="canSignup">
+                <div class="card">
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
+                        <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
+                    </div>
                 </div>
+                <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
             </div>
-            <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
-        </div>
+        </mm-loading>
     </ion-content>
 </ion-view>

From 3c3989d31dd6e0d98a617c56c7ef44f20b73ed5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 5 May 2017 12:30:24 +0200
Subject: [PATCH 121/218] MOBILE-2098 login: Remove autofocus during login and
 reconnect

---
 www/core/components/login/templates/credentials.html | 2 +-
 www/core/components/login/templates/reconnect.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 842b31123a7..8417b203e65 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -15,7 +15,7 @@
             </div>
             <form>
                 <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
-                    <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off" mm-auto-focus>
+                    <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off">
                 </ion-input>
                 <ion-input class="list item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
                     <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index 4eff2e7d8e7..c92a3719553 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -13,7 +13,7 @@ <h2>{{ 'mm.login.username' | translate }}</h2>
         </div>
         <form>
             <ion-input class="list item item-input mm-ioninput-password">
-                <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-auto-focus mm-show-password>
+                <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
             </ion-input>
             <div class="button-bar">
                 <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>

From 02a86abe7241094543328ac844b37ff9ceeb6207 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 May 2017 08:58:30 +0200
Subject: [PATCH 122/218] MOBILE-2077 files: Download media from external sites

---
 www/core/directives/external_content.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/core/directives/external_content.js b/www/core/directives/external_content.js
index 7e8ad0d1cba..f9317ed6c53 100644
--- a/www/core/directives/external_content.js
+++ b/www/core/directives/external_content.js
@@ -94,7 +94,7 @@ angular.module('mm.core')
             };
         }
 
-        if (!url || !$mmUtil.isDownloadableUrl(url)) {
+        if (!url || !url.match(/^https?:\/\//i) || (dom.tagName === 'A' && !$mmUtil.isDownloadableUrl(url))) {
             $log.debug('Ignoring non-downloadable URL: ' + url);
             if (dom.tagName === 'SOURCE') {
                 // Restoring original src.

From 7c0385a3de08820af75f039a6b1cc9dd6c96669c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 4 May 2017 15:53:32 +0200
Subject: [PATCH 123/218] MOBILE-2077 files: Detect right extension in GDrive
 files

---
 www/core/lib/ws.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/www/core/lib/ws.js b/www/core/lib/ws.js
index 6b300053d97..84b5f214d1e 100644
--- a/www/core/lib/ws.js
+++ b/www/core/lib/ws.js
@@ -324,7 +324,7 @@ angular.module('mm.core')
      * @return {Promise}                The success returns the fileEntry, the reject will contain the error object.
      */
     self.downloadFile = function(url, path, addExtension) {
-        $log.debug('Downloading file ' + url, path, addExtension);
+        $log.debug('Downloading file', url, path, addExtension);
 
         // Use a tmp path to download the file and then move it to final location.This is because if the download fails,
         // the local file is deleted.
@@ -338,17 +338,24 @@ angular.module('mm.core')
                 if (addExtension) {
                     ext = $mmFS.getFileExtension(path);
 
-                    if (!ext) {
+                    // Google Drive extensions will be considered invalid since Moodle usually converts them.
+                    if (!ext || ext == 'gdoc' || ext == 'gsheet' || ext == 'gslides' || ext == 'gdraw') {
                         promise = self.getRemoteFileMimeType(url).then(function(mime) {
-                            var ext;
+                            var remoteExt;
                             if (mime) {
-                                ext = $mmFS.getExtension(mime, url);
-                                if (ext) {
-                                    path += '.' + ext;
+                                remoteExt = $mmFS.getExtension(mime, url);
+                                // If the file is from Google Drive, ignore mimetype application/json (sometimes pluginfile
+                                // returns an invalid mimetype for files).
+                                if (remoteExt && (!ext || mime != 'application/json')) {
+                                    if (ext) {
+                                        // Remove existing extension since we will use another one.
+                                        path = $mmFS.removeExtension(path);
+                                    }
+                                    path += '.' + remoteExt;
+                                    return remoteExt;
                                 }
-                                return ext;
                             }
-                            return false;
+                            return ext;
                         });
                     } else {
                         promise = $q.when(ext);

From 5a81921c6f8d690672557aaecf749a2154b2f312 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 8 May 2017 10:41:52 +0200
Subject: [PATCH 124/218] MOBILE-2077 http: Fix error when checking RTF file in
 iOS

---
 www/core/main.js | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/www/core/main.js b/www/core/main.js
index 64b2e2ba88d..ae654b9846e 100644
--- a/www/core/main.js
+++ b/www/core/main.js
@@ -145,6 +145,46 @@ angular.module('mm.core', ['pascalprecht.translate'])
         return angular.isObject(data) && String(data) !== '[object File]' ? $mmUtilProvider.param(data) : data;
     }];
 
+    // Angular's default transform detects RTF format as JSON, throwing an error when trying to parse it.
+    // This custom transform fixes this problem.
+    $httpProvider.defaults.transformResponse = [function(data, headers) {
+        if (angular.isString(data)) {
+            // Strip json vulnerability protection prefix and trim whitespace
+            var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/,
+                tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
+
+            if (tempData) {
+                var contentType = headers('Content-Type');
+                if ((contentType && (contentType.indexOf('application/json') === 0)) || isJsonLike(tempData, contentType)) {
+                    try {
+                        data = angular.fromJson(tempData);
+                    } catch(ex) {
+                        // Error parsing data, leave the data as it is.
+                    }
+                }
+            }
+        }
+
+        return data;
+
+        // Check if the returned data is JSON.
+        function isJsonLike(str, contentType) {
+            if (contentType && contentType.indexOf('text/rtf') != -1) {
+                // RTF files can be mistaken as JSON since they start and end with {}.
+                return false;
+            }
+
+            var JSON_START = /^\[|^\{(?!\{)/,
+                JSON_ENDS = {
+                  '[': /]$/,
+                  '{': /}$/
+                },
+                jsonStart = str.match(JSON_START);
+
+            return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
+        }
+    }];
+
     // Add some protocols to safe protocols.
     function addProtocolIfMissing(list, protocol) {
         if (list.indexOf(protocol) == -1) {

From ed9d8b9d48734bc0183304d1379a060a1076eee2 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Mon, 8 May 2017 14:38:25 +0200
Subject: [PATCH 125/218] MOBILE-2102 cordova: Append MoodleMobile to UserAgent

---
 config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.xml b/config.xml
index dbb1c9ab999..ab278951601 100644
--- a/config.xml
+++ b/config.xml
@@ -19,6 +19,7 @@
   <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
   <preference name="android-minSdkVersion" value="14" />
   <preference name="android-targetSdkVersion" value="19" />
+  <preference name="AppendUserAgent" value="MoodleMobile" />
   <feature name="StatusBar">
     <param name="ios-package" value="CDVStatusBar" onload="true"/>
   </feature>

From 6d8da11842da5da05cf0b1f7772ba57ec741ae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 5 May 2017 13:37:19 +0200
Subject: [PATCH 126/218] MOBILE-2092 course: Support activities access
 restriction

---
 www/core/components/course/lang/en.json            | 1 +
 www/core/components/course/services/helper.js      | 3 ++-
 www/core/components/course/templates/module.html   | 6 +++++-
 www/core/components/course/templates/section.html  | 2 +-
 www/core/components/course/templates/sections.html | 6 +++++-
 www/core/scss/styles.scss                          | 6 ++++++
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/www/core/components/course/lang/en.json b/www/core/components/course/lang/en.json
index cd1ae4737ad..921b2c49491 100644
--- a/www/core/components/course/lang/en.json
+++ b/www/core/components/course/lang/en.json
@@ -14,6 +14,7 @@
     "couldnotloadsectioncontent": "Could not load the section content, please try again later.",
     "errordownloadingsection": "Error downloading section.",
     "errorgetmodule": "Error getting module data.",
+    "hiddenfromstudents": "Hidden from students",
     "nocontentavailable": "No content available at the moment.",
     "overriddennotice": "Your final grade from this activity was manually adjusted.",
     "useactivityonbrowser": "You can still use it using your devices browser.",
diff --git a/www/core/components/course/services/helper.js b/www/core/components/course/services/helper.js
index 1f6e4b7f5b3..67ac9522f35 100644
--- a/www/core/components/course/services/helper.js
+++ b/www/core/components/course/services/helper.js
@@ -638,7 +638,8 @@ angular.module('mm.core.course')
      * @return {Boolean}       True if the section has content.
      */
     self.sectionHasContent = function(section) {
-        return !section.hiddenbynumsections  && (section.summary != '' || section.modules.length);
+        return !section.hiddenbynumsections && ((typeof section.availabilityinfo != "undefined" && section.availabilityinfo != '') ||
+            section.summary != '' || section.modules.length);
     };
 
     /**
diff --git a/www/core/components/course/templates/module.html b/www/core/components/course/templates/module.html
index 07feac6480b..01037997d48 100644
--- a/www/core/components/course/templates/module.html
+++ b/www/core/components/course/templates/module.html
@@ -1,4 +1,4 @@
-<a id="mm-course-module-{{module.id}}" class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-click="action && action($event)" ng-class="{'item-media': icon, 'mm-not-clickable': !action}" ng-controller="module._controller" title="{{ module.name }}" ng-if="module.visibleoncoursepage !== 0">
+<a id="mm-course-module-{{module.id}}" class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-click="action && action($event)" ng-class="{'item-media': icon, 'mm-not-clickable': !action, 'item-dimmed': module.visible === 0 || module.uservisible === false}" ng-controller="module._controller" title="{{ module.name }}" ng-if="module.visibleoncoursepage !== 0">
 
     <img ng-src="{{ icon }}" alt="" role="presentation" ng-if="icon">
 
@@ -13,5 +13,9 @@
     </div>
 
     <mm-format-text watch="true">{{ title }}</mm-format-text>
+    <div class="padding-vertical" ng-if="module.visible === 0 || module.availabilityinfo">
+        <p class="badge badge-calm badge-inline" ng-if="module.visible === 0">{{ 'mm.course.hiddenfromstudents' | translate }}</p>
+        <p class="badge badge-calm badge-inline" ng-if="module.availabilityinfo"><mm-format-text watch="true">{{ module.availabilityinfo }}</mm-format-text></p>
+    </div>
     <mm-format-text watch="true" max-height="80" ng-if="module.description">{{ module.description }}</mm-format-text>
 </a>
\ No newline at end of file
diff --git a/www/core/components/course/templates/section.html b/www/core/components/course/templates/section.html
index 10260c99ec2..156e7cbcf04 100644
--- a/www/core/components/course/templates/section.html
+++ b/www/core/components/course/templates/section.html
@@ -22,7 +22,7 @@ <h2><mm-format-text watch="true">{{ section.name }}</mm-format-text></h2>
                     <mm-format-text>{{ section.summary }}</mm-format-text>
                 </div>
 
-                <mm-course-module class="item item-complex" ng-repeat="module in section.modules" module="module" completion-changed="completionChanged"></mm-course-module>
+                <mm-course-module ng-if="module.visibleoncoursepage !== 0" class="item item-complex" ng-repeat="module in section.modules" module="module" completion-changed="completionChanged"></mm-course-module>
 
                 <!-- When there is nothing in the section. -->
                 <div class="item item-text-wrap" ng-if="section.modules.length < 1 && sections.length == 1">
diff --git a/www/core/components/course/templates/sections.html b/www/core/components/course/templates/sections.html
index 984aab625f8..82eaddf9fdc 100644
--- a/www/core/components/course/templates/sections.html
+++ b/www/core/components/course/templates/sections.html
@@ -11,7 +11,7 @@
            <ion-refresher on-refresh="doRefresh()" pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="sectionsLoaded"></ion-refresher>
             <mm-loading hide-until="sectionsLoaded">
                 <ul class="list">
-                    <li ng-repeat="section in sections" ng-if="sectionHasContent(section)">
+                    <li ng-repeat="section in sections" ng-if="sectionHasContent(section)" ng-class="{'item-dimmed': section.visible === 0 || section.uservisible === false}">
                         <a class="item item-text-wrap item-button-right" mm-split-view-link="site.mm_course-section({cid: courseId, sectionid: section.id, mid: moduleId})" title="{{section.name}}">
                             <mm-format-text watch="true">{{section.name}}</mm-format-text>
 
@@ -24,6 +24,10 @@
 
                             <ion-spinner ng-if="downloadSectionsEnabled && ((section.isDownloading && section.total > 0) || section.isCalculating)"></ion-spinner>
                             <span class="badge mm-course-download" ng-if="downloadSectionsEnabled && section.isDownloading && section.total > 0 && section.count < section.total">{{section.count}} / {{section.total}}</span>
+                            <div class="padding-vertical" ng-if="section.visible === 0 || section.availabilityinfo">
+                                <p class="badge badge-calm badge-inline" ng-if="section.visible === 0">{{ 'mm.course.nocontentavailable' | translate }}</p>
+                                <p class="badge badge-calm badge-inline" ng-if="section.availabilityinfo"><mm-format-text watch="true">{{ section.availabilityinfo }}</mm-format-text></p>
+                            </div>
                         </a>
                     </li>
                 </ul>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index b8357b6eca2..5f3656848c8 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -286,6 +286,10 @@ p.item-text-wrap {
   border-top: 0;
 }
 
+.item-dimmed {
+  opacity: 0.6;
+}
+
 /* Show buttons as tabs */
 @include tabs-striped-color('mm-tabs-color', $mm-color);
 @include tabs-color('mm-tabs-color', $mm-color);
@@ -783,12 +787,14 @@ p.mm-error { // Deprecated, use one of the above mm-error classes.
   border-radius: 50%;
 }
 
+.item.item-button-right .badge.badge-inline,
 .badge.badge-inline {
   display: inline-block;
   position: relative;
   top: initial;
   right: initial;
   white-space: normal;
+  text-align: left;
 }
 
 // Timer.

From 2d0c17c1b0626823d6c69ec84b499c523dac2629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 May 2017 15:49:29 +0200
Subject: [PATCH 127/218] MOBILE-2098 login: Center page

---
 .../login/templates/credentials.html          |  4 +-
 .../components/login/templates/reconnect.html | 54 ++++++++++---------
 www/core/components/login/templates/site.html |  5 +-
 www/core/scss/styles.scss                     | 12 +++++
 4 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 8417b203e65..73c21086d49 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -1,6 +1,6 @@
 <ion-view view-title="{{ 'mm.login.login' | translate }}">
-    <ion-content mm-state-class padding="true">
-        <mm-loading hide-until="pageLoaded">
+    <ion-content mm-state-class padding="true" class="mm-center-view">
+        <mm-loading hide-until="pageLoaded" class="mm-view-content">
             <div class="card">
                 <div class="item item-text-wrap item-avatar-center">
                     <!-- Show site logo or a default image. -->
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index c92a3719553..6427908b2e8 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -1,32 +1,34 @@
 <ion-view view-title="{{ 'mm.login.reconnect' | translate }}">
-    <ion-content mm-state-class padding="true">
-        <div class="card">
-            <div class="item item-text-wrap item-avatar-center">
-                <img ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
-                <h2 class="padding">{{siteurl}}</h2>
-                <p ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
+    <ion-content mm-state-class padding="true" class="mm-center-view">
+        <div class="mm-view-content">
+            <div class="card">
+                <div class="item item-text-wrap item-avatar-center">
+                    <img ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
+                    <h2 class="padding">{{siteurl}}</h2>
+                    <p ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
+                </div>
             </div>
-        </div>
-        <div class="list item padding">
-            <h2>{{ 'mm.login.username' | translate }}</h2>
-            <p>{{credentials.username}}</p>
-        </div>
-        <form>
-            <ion-input class="list item item-input mm-ioninput-password">
-                <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
-            </ion-input>
-            <div class="button-bar">
-                <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
-                <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+            <div class="list item padding">
+                <h2>{{ 'mm.login.username' | translate }}</h2>
+                <p>{{credentials.username}}</p>
+            </div>
+            <form>
+                <ion-input class="list item item-input mm-ioninput-password">
+                    <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
+                </ion-input>
+                <div class="button-bar">
+                    <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
+                    <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+                </div>
+            </form>
+            <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
+                <p>{{ 'mm.login.potentialidps' | translate }}</p>
+                <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
+                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                    <span>{{provider.name}}</span>
+                    <i class="icon icon-accessory ion-chevron-right"></i>
+                </a>
             </div>
-        </form>
-        <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
-            <p>{{ 'mm.login.potentialidps' | translate }}</p>
-            <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
-                <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
-                <span>{{provider.name}}</span>
-                <i class="icon icon-accessory ion-chevron-right"></i>
-            </a>
         </div>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/login/templates/site.html b/www/core/components/login/templates/site.html
index 27532924a48..0d46ee9c345 100644
--- a/www/core/components/login/templates/site.html
+++ b/www/core/components/login/templates/site.html
@@ -2,7 +2,8 @@
   <ion-nav-buttons side="secondary">
       <button class="button button-icon ion-help-circled" ng-click="showHelp()" aria-label="{{ 'mm.core.help' | translate }}"></button>
   </ion-nav-buttons>
-  <ion-content padding="true" id="mm-login-site" mm-state-class>
+  <ion-content padding="true" id="mm-login-site" mm-state-class class="mm-center-view">
+    <div class="mm-view-content">
       <h2 class="padding-top">{{ 'mm.login.siteaddress' | translate }}</h2>
       <div class="card">
         <div class="item item-text-wrap">{{ 'mm.login.newsitedescription' | translate }}</div>
@@ -11,6 +12,6 @@ <h2 class="padding-top">{{ 'mm.login.siteaddress' | translate }}</h2>
         <input type="url" placeholder="moodle.org" ng-model="siteurl" mm-no-input-validation mm-auto-focus >
       </div>
       <button class="button button-block button-positive" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
-    </form>
+    </div>
   </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index b8357b6eca2..8e17f112a68 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1470,3 +1470,15 @@ progress {
 h2.invert {
   color: $white;
 }
+
+.mm-center-view .scroll {
+  margin: 0 auto;
+  max-width: 600px;
+  display: table !important;
+  width: 100% !important;
+  height: 100% !important;
+  .mm-view-content {
+    display: table-cell;
+    vertical-align: middle;
+  }
+}

From 008ab174ce1f1ab90e82d13fa1f2569264f899d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 5 May 2017 14:37:49 +0200
Subject: [PATCH 128/218] MOBILE-2038 db: Do not register stores with invalid
 keyPath

---
 www/core/lib/app.js          | 7 +++++--
 www/core/lib/sitesfactory.js | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/www/core/lib/app.js b/www/core/lib/app.js
index abbc80f365e..5a2884c2594 100644
--- a/www/core/lib/app.js
+++ b/www/core/lib/app.js
@@ -53,10 +53,13 @@ angular.module('mm.core')
      */
     this.registerStore = function(store) {
         if (typeof(store.name) === 'undefined') {
-            console.log('$mmApp: Error: store name is undefined.');
+            console.error('$mmApp: Error: store name is undefined.');
+            return;
+        } else if (typeof store.keyPath  === 'undefined' || !store.keyPath) {
+            console.error('$mmApp: Error: store ' + store.name + ' keyPath is invalid.');
             return;
         } else if (storeExists(store.name)) {
-            console.log('$mmApp: Error: store ' + store.name + ' is already defined.');
+            console.error('$mmApp: Error: store ' + store.name + ' is already defined.');
             return;
         }
         dbschema.stores.push(store);
diff --git a/www/core/lib/sitesfactory.js b/www/core/lib/sitesfactory.js
index bc21a16042d..d35de285e0c 100644
--- a/www/core/lib/sitesfactory.js
+++ b/www/core/lib/sitesfactory.js
@@ -77,10 +77,13 @@ angular.module('mm.core')
      */
     this.registerStore = function(store) {
         if (typeof(store.name) === 'undefined') {
-            console.log('$mmSite: Error: store name is undefined.');
+            console.error('$mmSite: Error: store name is undefined.');
+            return;
+        } else if (typeof store.keyPath  === 'undefined' || !store.keyPath) {
+            console.error('$mmSite: Error: store ' + store.name + ' keyPath is invalid.');
             return;
         } else if (storeExists(store.name)) {
-            console.log('$mmSite: Error: store ' + store.name + ' is already defined.');
+            console.error('$mmSite: Error: store ' + store.name + ' is already defined.');
             return;
         }
         store.indexes = getIndexes(store.indexes);

From d1d5da5ee694fc893525b85c5d6a5d4425e6ff00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 May 2017 10:07:30 +0200
Subject: [PATCH 129/218] MOBILE-2038 db: Check keypath before inserting

---
 www/core/lib/db.js | 68 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/www/core/lib/db.js b/www/core/lib/db.js
index f38324498d8..e3b73c95818 100644
--- a/www/core/lib/db.js
+++ b/www/core/lib/db.js
@@ -228,29 +228,64 @@ angular.module('mm.core')
         return deferred.promise;
     }
 
+    /**
+     * Convenience function that returns the store object for a given store name and db.
+     *
+     * @param  {Object} db        Database to get the schema.
+     * @param  {String} storeName The store to found.
+     * @return {Object|false}     Store object or false if not found.
+     */
+    function getStoreFromName(db, storeName) {
+        var stores = db.getSchema().stores;
+        for (var x in stores) {
+            if (stores[x].name == storeName) {
+                return stores[x];
+            }
+        }
+        return false;
+    }
+
     /**
      * Convenience function that returns the Compound Index for a given store and db.
+     *
      * @param  {Object} db        Database to get the schema.
      * @param  {String} storeName The store where to find the index.
      * @param  {String} index     Index to get.
      * @return {Mixed}            KeyPath of the index found or false.
      */
     function getCompoundIndex(db, storeName, index) {
-        var stores = db.getSchema().stores;
-        for (var x in stores) {
-            if (stores[x].name == storeName) {
-                var indexes = stores[x].indexes;
-                for (var y in indexes) {
-                    if (indexes[y].name == index) {
-                        return indexes[y].keyPath;
-                    }
+        var store = getStoreFromName(db, storeName);
+        if (store) {
+            var indexes = store.indexes;
+            for (var y in indexes) {
+                if (indexes[y].name == index) {
+                    return indexes[y].keyPath;
                 }
-                return false;
             }
         }
         return false;
     }
 
+    /**
+     * Convenience function that checks if a value has all required fields of the key path store.
+     *
+     * @param  {Object} db        Database to get the schema.
+     * @param  {String} storeName The store to be found.
+     * @param  {Object} value     Value to be stored.
+     */
+    function checkKeyPathIsPresent(db, storeName, value) {
+        var store = getStoreFromName(db, storeName);
+        if (store) {
+            keyPath = Array.isArray(store.keyPath) ? store.keyPath : [store.keyPath];
+            for (var x in keyPath) {
+                var val = value[keyPath[x]];
+                if (typeof val == "undefined" || val === null || (typeof val == "number" && isNaN(val))) {
+                    throw new Error("Value inserted does not have key " + keyPath[x] + " required on store " + storeName);
+                }
+            }
+        }
+    }
+
     /**
      * Convenience function to filter results by a list of fields and values. Recursive.
      *
@@ -344,6 +379,7 @@ angular.module('mm.core')
             query;
 
         try {
+            checkKeyPathIsPresent(db, store, values);
             query = db.from(store);
             query = applyWhere(query, where);
             query.patch(values).then(deferred.resolve, deferred.reject);
@@ -435,7 +471,14 @@ angular.module('mm.core')
                  * @return {Promise}     Promise resolved when the entry is inserted. Resolve param: new entry's primary key.
                  */
                 insert: function(store, value, id) {
-                    return callDBFunction(db, 'put', store, value, id);
+                    try {
+                        checkKeyPathIsPresent(db, store, value);
+                        return callDBFunction(db, 'put', store, value, id);
+                    } catch(ex) {
+                        $log.error('Error executing function put to DB ' + db.getName());
+                        $log.error(ex.name + ': ' + ex.message);
+                    }
+                    return false;
                 },
                 /**
                  * Add an entry to a store, returning a synchronous value.
@@ -451,11 +494,12 @@ angular.module('mm.core')
                 insertSync: function(store, value) {
                     if (db) {
                         try {
+                            checkKeyPathIsPresent(db, store, value);
                             db.put(store, value);
                             return true;
                         } catch(ex) {
-                            $log.error('Error executing function sync put to DB '+db.getName());
-                            $log.error(ex.name+': '+ex.message);
+                            $log.error('Error executing function sync put to DB ' + db.getName());
+                            $log.error(ex.name + ': ' + ex.message);
                         }
                     }
 

From 17fda51efbf781f97f448610b06dab5b9fa34d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 8 May 2017 10:35:51 +0200
Subject: [PATCH 130/218] MOBILE-2038 db: Send error reports on demand

---
 www/core/lib/db.js |   6 +-
 www/errorreport.js | 166 +++++++++++++++++++++++----------------------
 2 files changed, 91 insertions(+), 81 deletions(-)

diff --git a/www/core/lib/db.js b/www/core/lib/db.js
index e3b73c95818..74a0d407bd8 100644
--- a/www/core/lib/db.js
+++ b/www/core/lib/db.js
@@ -280,7 +280,11 @@ angular.module('mm.core')
             for (var x in keyPath) {
                 var val = value[keyPath[x]];
                 if (typeof val == "undefined" || val === null || (typeof val == "number" && isNaN(val))) {
-                    throw new Error("Value inserted does not have key " + keyPath[x] + " required on store " + storeName);
+                    var error = "Value inserted does not have key " + keyPath[x] + " required on store " + storeName;
+                    if (typeof sendErrorReport == 'function') {
+                        sendErrorReport(error);
+                    }
+                    throw new Error(error);
                 }
             }
         }
diff --git a/www/errorreport.js b/www/errorreport.js
index cf5a3039ba9..a773fffef53 100644
--- a/www/errorreport.js
+++ b/www/errorreport.js
@@ -19,7 +19,8 @@
 var appVersion = '3.2.1 (2017)',
     reportInBackgroundName = 'mmCoreReportInBackground',
     errors = [],
-    ignoredFiles = ['www/index.html#/site/mod_page', 'www/index.html#/site/mod_resource', 'www/index.html#/site/mm_course-section'];
+    ignoredFiles = ['www/index.html#/site/mod_page', 'www/index.html#/site/mod_resource', 'www/index.html#/site/mm_course-section'],
+    reportedOnDBReady = false;
 
 /**
  * Check if error should be reported in background. If setting is not set, a confirm modal will be shown.
@@ -34,92 +35,97 @@ function shouldReportInBackground() {
     return false;
 }
 
-window.onerror = function(msg, url, lineNumber) {
-    try {
-        var errorReported = false,
-            reportedOnDBReady = false;
-
-        /**
-         * Add the storage type to the error report and send it.
-         *
-         * @param  {String} reportUrl URL to report the error.
-         * @param  {Object} db        DB.
-         */
-        function getStorageAndReport(reportUrl, db) {
-            if (!reportedOnDBReady) {
-                reportedOnDBReady = true;
-                reportUrl = reportUrl + '&storage=' + encodeURIComponent(db.getType());
-                sendError(reportUrl);
-            }
-        }
+/**
+ * Add the storage type to the error report and send it.
+ *
+ * @param  {String} reportUrl URL to report the error.
+ * @param  {Object} db        DB.
+ */
+function getStorageAndReport(reportUrl, db) {
+    if (!reportedOnDBReady) {
+        reportedOnDBReady = true;
+        reportUrl = reportUrl + '&storage=' + encodeURIComponent(db.getType());
+        sendError(reportUrl);
+    }
+}
 
-        /**
-         * Gather the needed data to report an error and reports it.
-         */
-        function reportError() {
-            if (!errorReported) {
-                errorReported = true;
-                var reportUrl = 'http://prototype.moodle.net/mobile/feedback/mmfeedback.php?message=' + encodeURIComponent(msg) +
-                                '&file=' + encodeURIComponent(url) + '&line=' + encodeURIComponent(lineNumber) + '&appv=' +
-                                encodeURIComponent(appVersion) + '&bg=1';
-
-                if (window.device) {
-                    reportUrl = reportUrl + '&platform=' + encodeURIComponent(window.device.platform) +
-                                        '&model=' + encodeURIComponent(window.device.model) +
-                                        '&osversion=' + encodeURIComponent(window.device.version) +
-                                        '&cordova=' + encodeURIComponent(window.device.cordova);
-                }
-                if (window.location) {
-                    reportUrl = reportUrl + '&localurl=' + encodeURIComponent(window.location.href);
-                }
-                if (navigator.userAgent) {
-                    reportUrl = reportUrl + '&useragent=' + encodeURIComponent(navigator.userAgent);
-                }
-                if (typeof ydn != 'undefined' && ydn.db && ydn.db.Storage) {
-                    // Detect Storage type by default.
-                    var db = new ydn.db.Storage('test', {}, {});
-                    if (db && db.getType && db.onReady) {
-                        db.onReady(function() {
-                            getStorageAndReport(reportUrl, db);
-                        });
-                        setTimeout(function() {
-                            getStorageAndReport(reportUrl, db);
-                        }, 1000);
-                        return;
-                    }
-                }
-
-                sendError(reportUrl);
-            }
+/**
+ * Gather the needed data to report an error and reports it.
+ */
+function sendErrorReport(msg, url, lineNumber) {
+    url = url || "";
+    lineNumber = lineNumber || 0;
+    var reportUrl = 'http://prototype.moodle.net/mobile/feedback/mmfeedback.php?message=' + encodeURIComponent(msg) +
+                    '&file=' + encodeURIComponent(url) + '&line=' + encodeURIComponent(lineNumber) + '&appv=' +
+                    encodeURIComponent(appVersion) + '&bg=1';
+
+    if (window.device) {
+        reportUrl = reportUrl + '&platform=' + encodeURIComponent(window.device.platform) +
+                            '&model=' + encodeURIComponent(window.device.model) +
+                            '&osversion=' + encodeURIComponent(window.device.version) +
+                            '&cordova=' + encodeURIComponent(window.device.cordova);
+    }
+    if (window.location) {
+        reportUrl = reportUrl + '&localurl=' + encodeURIComponent(window.location.href);
+    }
+    if (navigator.userAgent) {
+        reportUrl = reportUrl + '&useragent=' + encodeURIComponent(navigator.userAgent);
+    }
+    if (typeof ydn != 'undefined' && ydn.db && ydn.db.Storage) {
+        // Detect Storage type by default.
+        var db = new ydn.db.Storage('test', {}, {});
+        if (db && db.getType && db.onReady) {
+            db.onReady(function() {
+                getStorageAndReport(reportUrl, db);
+            });
+            setTimeout(function() {
+                getStorageAndReport(reportUrl, db);
+            }, 1000);
+            return;
         }
+    }
+
+    sendError(reportUrl);
+}
+
+/**
+ * Send error to the server.
+ *
+ * @param  {String} reportUrl URL to report the error.
+ */
+function sendError(reportUrl) {
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', reportUrl, true);
+    xhr.send();
+}
+
+/**
+ * Check if an error should be ignored.
+ *
+ * @return {Boolean} True if error should be ignored, false otherwise.
+ */
+function shouldBeIgnored() {
+    if (!url) {
+        return false;
+    }
 
-        /**
-         * Send error to the server.
-         *
-         * @param  {String} reportUrl URL to report the error.
-         */
-        function sendError(reportUrl) {
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', reportUrl, true);
-            xhr.send();
+    for (var i = 0; i < ignoredFiles.length; i++) {
+        if (url.indexOf(ignoredFiles[i]) > -1) {
+            return true;
         }
+    }
+    return false;
+}
 
-        /**
-         * Check if an error should be ignored.
-         *
-         * @return {Boolean} True if error should be ignored, false otherwise.
-         */
-        function shouldBeIgnored() {
-            if (!url) {
-                return false;
-            }
+window.onerror = function(msg, url, lineNumber) {
+    try {
+        var errorReported;
 
-            for (var i = 0; i < ignoredFiles.length; i++) {
-                if (url.indexOf(ignoredFiles[i]) > -1) {
-                    return true;
-                }
+        function reportError() {
+            if (!errorReported) {
+                errorReported = true;
+                sendErrorReport(msg, url, lineNumber);
             }
-            return false;
         }
 
         if (typeof msg == "string" && errors.indexOf(msg) == -1 && !shouldBeIgnored()) {

From 1574f4b6338f99f618bd14255080dc2fcdb74b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 9 May 2017 14:09:39 +0200
Subject: [PATCH 131/218] MOBILE-2106 feedback: Merge analysis and overview
 tabs

---
 .../mod/feedback/controllers/analysis.js      | 250 ------------------
 www/addons/mod/feedback/controllers/form.js   |  45 ++--
 www/addons/mod/feedback/controllers/index.js  | 224 ++++++++++++++--
 www/addons/mod/feedback/main.js               |  20 +-
 www/addons/mod/feedback/scss/styles.scss      |  16 +-
 www/addons/mod/feedback/services/handlers.js  |   5 +-
 www/addons/mod/feedback/services/helper.js    |  19 +-
 .../mod/feedback/templates/analysis.html      |  72 -----
 www/addons/mod/feedback/templates/form.html   |   2 +-
 www/addons/mod/feedback/templates/index.html  | 161 ++++++-----
 10 files changed, 352 insertions(+), 462 deletions(-)
 delete mode 100644 www/addons/mod/feedback/controllers/analysis.js
 delete mode 100644 www/addons/mod/feedback/templates/analysis.html

diff --git a/www/addons/mod/feedback/controllers/analysis.js b/www/addons/mod/feedback/controllers/analysis.js
deleted file mode 100644
index 028bc016675..00000000000
--- a/www/addons/mod/feedback/controllers/analysis.js
+++ /dev/null
@@ -1,250 +0,0 @@
-// (C) Copyright 2015 Martin Dougiamas
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-angular.module('mm.addons.mod_feedback')
-
-/**
- * Feedback analysis controller.
- *
- * @module mm.addons.mod_feedback
- * @ngdoc controller
- * @name mmaModFeedbackAnalysisCtrl
- */
-.controller('mmaModFeedbackAnalysisCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmCourse, $mmText, $mmApp,
-            mmaModFeedbackComponent, $mmEvents, $translate, $mmGroups, mmCoreEventOnlineStatusChanged, $mmaModFeedbackHelper,
-            $ionicHistory) {
-    var feedbackId = $stateParams.feedbackid,
-        module = $stateParams.module || {},
-        courseId = $stateParams.courseid,
-        feedback;
-
-    $scope.title = $stateParams.title;
-    $scope.moduleUrl = module.url;
-    $scope.moduleName = $mmCourse.translateModuleName('feedback');
-    $scope.courseId = courseId;
-    $scope.refreshIcon = 'spinner';
-    $scope.component = mmaModFeedbackComponent;
-    $scope.componentId = module.id;
-    $scope.selectedGroup = $stateParams.group || 0;
-    $scope.chartOptions = {
-        'legend': {
-            'display': true,
-            'position': 'bottom',
-            'labels': {
-                'generateLabels': function(chart) {
-                    var data = chart.data;
-                    if (data.labels.length && data.labels.length) {
-                        var datasets = data.datasets[0];
-                        return data.labels.map(function(label, i) {
-                            return {
-                                text: label + ': ' + datasets.data[i],
-                                fillStyle: datasets.backgroundColor[i],
-                                // Below is extra data used for toggling the datasets
-                                datasetIndex: i
-                            };
-                        });
-                    } else {
-                        return [];
-                    }
-                }
-            }
-        }
-    };
-
-    // Convenience function to get feedback data.
-    function fetchFeedbackAnalysisData(refresh, showErrors) {
-        $scope.isOnline = $mmApp.isOnline();
-        return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
-            feedback = feedbackData;
-
-            $scope.title = feedback.name || $scope.title;
-            $scope.description = feedback.intro;
-
-            $scope.feedback = feedback;
-
-            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
-        }).then(function(accessData) {
-            $scope.access = accessData;
-
-            if (accessData.canviewanalysis) {
-                // Get groups (only for teachers).
-                return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
-                    $scope.groupInfo = groupInfo;
-                    return $scope.setGroup($scope.selectedGroup);
-                });
-            } else {
-                $ionicHistory.goBack();
-            }
-        }).catch(function(message) {
-            if (!refresh) {
-                // Some call failed, retry without using cache since it might be a new activity.
-                return refreshAllData();
-            }
-
-            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
-            return $q.reject();
-        }).finally(function(){
-            $scope.feedbackLoaded = true;
-        });
-    }
-
-    // Set group to see the analysis.
-    $scope.setGroup = function(groupId) {
-        $scope.selectedGroup = groupId;
-
-        return $mmaModFeedback.getAnalysis(feedback.id, groupId).then(function(analysis) {
-            var number = 1;
-            $scope.items = analysis.itemsdata.map(function(item) {
-                // Move data inside item.
-                item.item.data = item.data;
-                item = item.item;
-                item.number = number++;
-                if (item.data && item.data.length) {
-                    return parseAnalysisInfo(item);
-                }
-                return false;
-            }).filter(function(item) {
-                return item;
-            });
-
-            $scope.warning = "";
-            if (analysis.warnings.length) {
-                for (var x in analysis.warnings) {
-                    var warning = analysis.warnings[x];
-                    if (warning.warningcode == 'insufficientresponsesforthisgroup') {
-                        $scope.warning = warning.message;
-                    }
-                }
-            }
-
-            $scope.feedback.completedCount = analysis.completedcount;
-            $scope.feedback.itemsCount = analysis.itemscount;
-        });
-    };
-
-    // Parse the analysis info to show the info correctly formatted.
-    function parseAnalysisInfo(item) {
-        switch (item.typ) {
-            case 'numeric':
-                item.average = item.data.reduce(function (prev, current) {
-                    return prev + current;
-                }) / item.data.length;
-                item.template = 'numeric';
-                break;
-
-            case 'info':
-                item.data = item.data.map(function(dataItem) {
-                    dataItem = $mmText.parseJSON(dataItem);
-                    return typeof dataItem.show != "undefined" ? dataItem.show : false;
-                }).filter(function(dataItem) {
-                    // Filter false entries.
-                    return dataItem;
-                });
-            case 'textfield':
-            case 'textarea':
-                item.template = 'list';
-                break;
-
-            case 'multichoicerated':
-            case 'multichoice':
-                item.data = item.data.map(function(dataItem) {
-                    dataItem = $mmText.parseJSON(dataItem);
-                    return typeof dataItem.answertext != "undefined" ? dataItem : false;
-                }).filter(function(dataItem) {
-                    // Filter false entries.
-                    return dataItem;
-                });
-
-                // Format labels.
-                item.labels = item.data.map(function(dataItem) {
-                    dataItem.quotient = parseFloat(dataItem.quotient * 100).toFixed(2);
-                    var label = "";
-
-                    if (typeof dataItem.value != "undefined") {
-                        label = '(' + dataItem.value + ') ';
-                    }
-                    label += dataItem.answertext;
-                    label += dataItem.quotient > 0 ? ' (' + dataItem.quotient + '%)' : "";
-                    return label;
-                });
-                item.chartData = item.data.map(function(dataItem) {
-                    return dataItem.answercount;
-                });
-
-                if (item.typ == 'multichoicerated') {
-                    item.average = item.data.reduce(function (prev, current) {
-                        return prev + current.avg;
-                    }, 0.0);
-                }
-
-                var subtype = item.presentation.charAt(0);
-                item.single = subtype != 'c';
-
-                item.template = 'chart';
-                break;
-        }
-
-        return item;
-    }
-
-    // Convenience function to refresh all the data.
-    function refreshAllData(showErrors) {
-        var promises = [];
-        promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
-        if (feedback) {
-            promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
-            promises.push($mmaModFeedback.invalidateAnalysisData(feedback.id));
-            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
-            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
-        }
-
-        return $q.all(promises).finally(function() {
-            return fetchFeedbackAnalysisData(true, showErrors);
-        });
-    }
-
-    fetchFeedbackAnalysisData().finally(function() {
-        $scope.refreshIcon = 'ion-refresh';
-    });
-
-    // Context Menu Description action.
-    $scope.expandDescription = function() {
-        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModFeedbackComponent, module.id);
-    };
-
-    // Pull to refresh.
-    $scope.refreshFeedback = function(showErrors) {
-        if ($scope.feedbackLoaded) {
-            $scope.refreshIcon = 'spinner';
-            return refreshAllData(showErrors).finally(function() {
-                $scope.refreshIcon = 'ion-refresh';
-                $scope.$broadcast('scroll.refreshComplete');
-            });
-        }
-    };
-
-    // Function to link implemented features.
-    $scope.openFeature = function(feature) {
-        $mmaModFeedbackHelper.openFeature(feature, module, courseId, $scope.selectedGroup);
-    };
-
-    // Refresh online status when changes.
-    onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
-        $scope.isOnline = online;
-    });
-
-    $scope.$on('$destroy', function() {
-        onlineObserver && onlineObserver.off && onlineObserver.off();
-    });
-});
\ No newline at end of file
diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index d8c645327f8..fd9df8ee4bb 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -56,17 +56,8 @@ angular.module('mm.addons.mod_feedback')
             $scope.title = feedback.name || $scope.title;
             $scope.feedback = feedback;
 
-            return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, $scope.offline, true).catch(function(error) {
-                if (!$scope.offline && !$mmUtil.isWebServiceError(error)) {
-                    // If it fails, go offline.
-                    $scope.offline = true;
-                    return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, true);
-                }
-                return $q.reject(error);
-            });
+            return fetchAccessData();
         }).then(function(accessData) {
-            $scope.access = accessData;
-
             if (!$scope.preview && accessData.cansubmit && !accessData.isempty) {
                 return typeof currentPage == "undefined" ? $mmaModFeedback.getResumePage(feedback.id, $scope.offline, true) :
                     $q.when(currentPage);
@@ -93,6 +84,22 @@ angular.module('mm.addons.mod_feedback')
         });
     }
 
+    // Fetch access information.
+    function fetchAccessData() {
+        return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, $scope.offline, true).catch(function(error) {
+            if (!$scope.offline && !$mmUtil.isWebServiceError(error)) {
+                // If it fails, go offline.
+                $scope.offline = true;
+                return $mmaModFeedback.getFeedbackAccessInformation(feedback.id, true);
+            }
+            return $q.reject(error);
+         }).then(function(accessData) {
+            $scope.access = accessData;
+
+            return accessData;
+         });
+    }
+
     function fetchFeedbackPageData(page) {
         var promise;
         $scope.items = [];
@@ -162,9 +169,13 @@ angular.module('mm.addons.mod_feedback')
                     submitted = true;
 
                     // Invalidate access information so user will see home page updated (continue form or completion messages).
-                    // No need to wait the promises to finish.
-                    $mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id);
-                    $mmaModFeedback.invalidateResumePageData(feedback.id);
+                    var promises = [];
+                    promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
+                    promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
+
+                    return $q.all(promises).then(function () {
+                        return fetchAccessData();
+                    });
                 } else if (isNaN(jumpTo) || jumpTo == currentPage) {
                     // Errors on questions, stay in page.
                     return $q.when();
@@ -238,8 +249,9 @@ angular.module('mm.addons.mod_feedback')
     };
 
     // Function to link implemented features.
-    $scope.openFeature = function(feature) {
-        $mmaModFeedbackHelper.openFeature(feature, module, courseId);
+    $scope.showAnalysis = function(feature) {
+        submitted = 'analysis';
+        $mmaModFeedbackHelper.openFeature('analysis', module, courseId);
     };
 
     fetchFeedbackFormData();
@@ -260,8 +272,9 @@ angular.module('mm.addons.mod_feedback')
 
     $scope.$on('$destroy', function() {
         if (submitted) {
+            var tab = submitted = 'analysis' ? 'analysis' : 'overview';
             // If form has been submitted, the info has been already invalidated but we should update index view.
-            $mmEvents.trigger(mmaModFeedbackEventFormSubmitted, {feedbackId: feedback.id});
+            $mmEvents.trigger(mmaModFeedbackEventFormSubmitted, {feedbackId: feedback.id, tab: tab});
         }
         onlineObserver && onlineObserver.off && onlineObserver.off();
     });
diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index 92b1f3aacef..ff493e94a8c 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -28,7 +28,9 @@ angular.module('mm.addons.mod_feedback')
         courseId = $stateParams.courseid,
         feedback,
         onlineObserver,
-        obsSubmitted;
+        obsSubmitted,
+        analysisLoaded = false,
+        overviewLoaded = false;
 
     $scope.title = module.name;
     $scope.description = module.description;
@@ -40,10 +42,44 @@ angular.module('mm.addons.mod_feedback')
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
     $scope.selectedGroup = $stateParams.group || 0;
+    $scope.selectedTab = $stateParams.tab || 'overview';
+    $scope.overview = {};
+    $scope.tabSwitched = false;
+    $scope.chartOptions = {
+        'legend': {
+            'display': true,
+            'position': 'bottom',
+            'labels': {
+                'generateLabels': function(chart) {
+                    var data = chart.data;
+                    if (data.labels.length && data.labels.length) {
+                        var datasets = data.datasets[0];
+                        return data.labels.map(function(label, i) {
+                            return {
+                                text: label + ': ' + datasets.data[i],
+                                fillStyle: datasets.backgroundColor[i],
+                                // Below is extra data used for toggling the datasets
+                                datasetIndex: i
+                            };
+                        });
+                    } else {
+                        return [];
+                    }
+                }
+            }
+        }
+    };
+
+    function fetchGroupInfo(module) {
+        return $mmaModFeedbackHelper.getFeedbackGroupInfo(module).then(function(groupInfo) {
+            $scope.groupInfo = groupInfo;
+            return $scope.setGroup($scope.selectedGroup);
+        });
+    }
 
-    // Convenience function to get feedback data.
     function fetchFeedbackData(refresh, sync, showErrors) {
         $scope.isOnline = $mmApp.isOnline();
+
         return $mmaModFeedback.getFeedback(courseId, module.id).then(function(feedbackData) {
             feedback = feedbackData;
 
@@ -61,30 +97,12 @@ angular.module('mm.addons.mod_feedback')
         }).then(function() {
             return $mmaModFeedback.getFeedbackAccessInformation(feedback.id);
         }).then(function(accessData) {
-            var promises = [];
-
             $scope.access = accessData;
 
-            if (accessData.cancomplete && accessData.cansubmit && accessData.isopen) {
-                promises.push($mmaModFeedback.getResumePage(feedback.id).then(function(goPage) {
-                    $scope.goPage = goPage > 0 ? goPage : false;
-                }));
-            }
-
-            if (accessData.canedititems) {
-                feedback.timeopen = parseInt(feedback.timeopen) * 1000 || false;
-                feedback.openTimeReadable = feedback.timeopen ? moment(feedback.timeopen).format('LLL') : false;
-                feedback.timeclose = parseInt(feedback.timeclose) * 1000 || false;
-                feedback.closeTimeReadable = feedback.timeclose ? moment(feedback.timeclose).format('LLL') : false;
-
-                // Get groups (only for teachers).
-                promises.push($mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
-                    $scope.groupInfo = groupInfo;
-                    return $scope.setGroup($scope.selectedGroup);
-                }));
+            if ($scope.selectedTab == 'analysis') {
+                return fetchFeedbackAnalysisData(accessData);
             }
-
-            return $q.all(promises);
+            return fetchFeedbackOverviewData(accessData);
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModFeedbackComponent);
@@ -103,6 +121,50 @@ angular.module('mm.addons.mod_feedback')
             return $q.reject();
         }).finally(function(){
             $scope.feedbackLoaded = true;
+            $scope.tabSwitched = true;
+        });
+    }
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackOverviewData(accessData) {
+        var promises = [];
+
+        if (accessData.cancomplete && accessData.cansubmit && accessData.isopen) {
+            promises.push($mmaModFeedback.getResumePage(feedback.id).then(function(goPage) {
+                $scope.goPage = goPage > 0 ? goPage : false;
+            }));
+        }
+
+        if (accessData.canedititems) {
+            $scope.overview.timeopen = parseInt(feedback.timeopen) * 1000 || false;
+            $scope.overview.openTimeReadable = $scope.overview.timeopen ?
+                moment($scope.overview.timeopen).format('LLL') : false;
+            $scope.overview.timeclose = parseInt(feedback.timeclose) * 1000 || false;
+            $scope.overview.closeTimeReadable = $scope.overview.timeclose ?
+                moment($scope.overview.timeclose).format('LLL') : false;
+
+            // Get groups (only for teachers).
+            promises.push(fetchGroupInfo(feedback.coursemodule));
+        }
+
+        return $q.all(promises).finally(function(){
+            overviewLoaded = true;
+        });
+    }
+
+    // Convenience function to get feedback data.
+    function fetchFeedbackAnalysisData(accessData) {
+        var promise;
+        if (accessData.canviewanalysis) {
+            // Get groups (only for teachers).
+            promise = fetchGroupInfo(feedback.coursemodule);
+        } else {
+            $scope.setTab('overview');
+            promise = $q.when();
+        }
+
+        return promise.finally(function(){
+            analysisLoaded = true;
         });
     }
 
@@ -113,21 +175,126 @@ angular.module('mm.addons.mod_feedback')
         return $mmaModFeedback.getAnalysis(feedback.id, groupId).then(function(analysis) {
             $scope.feedback.completedCount = analysis.completedcount;
             $scope.feedback.itemsCount = analysis.itemscount;
+
+            if ($scope.selectedTab == 'analysis') {
+                var number = 1;
+                $scope.items = analysis.itemsdata.map(function(item) {
+                    // Move data inside item.
+                    item.item.data = item.data;
+                    item = item.item;
+                    item.number = number++;
+                    if (item.data && item.data.length) {
+                        return parseAnalysisInfo(item);
+                    }
+                    return false;
+                }).filter(function(item) {
+                    return item;
+                });
+
+                $scope.warning = "";
+                if (analysis.warnings.length) {
+                    for (var x in analysis.warnings) {
+                        var warning = analysis.warnings[x];
+                        if (warning.warningcode == 'insufficientresponsesforthisgroup') {
+                            $scope.warning = warning.message;
+                        }
+                    }
+                }
+            }
         });
     };
 
+    // Set group to see the analysis.
+    $scope.setTab = function(tab) {
+        $scope.selectedTab = tab == 'overview' ? 'overview' : 'analysis';
+
+        if (($scope.selectedTab == 'overview' && !overviewLoaded) || ($scope.selectedTab == 'analysis' && !analysisLoaded)) {
+            $scope.tabSwitched = false;
+            return fetchFeedbackData(false, false, true);
+        }
+    };
+
+        // Parse the analysis info to show the info correctly formatted.
+    function parseAnalysisInfo(item) {
+        switch (item.typ) {
+            case 'numeric':
+                item.average = item.data.reduce(function (prev, current) {
+                    return prev + current;
+                }) / item.data.length;
+                item.template = 'numeric';
+                break;
+
+            case 'info':
+                item.data = item.data.map(function(dataItem) {
+                    dataItem = $mmText.parseJSON(dataItem);
+                    return typeof dataItem.show != "undefined" ? dataItem.show : false;
+                }).filter(function(dataItem) {
+                    // Filter false entries.
+                    return dataItem;
+                });
+            case 'textfield':
+            case 'textarea':
+                item.template = 'list';
+                break;
+
+            case 'multichoicerated':
+            case 'multichoice':
+                item.data = item.data.map(function(dataItem) {
+                    dataItem = $mmText.parseJSON(dataItem);
+                    return typeof dataItem.answertext != "undefined" ? dataItem : false;
+                }).filter(function(dataItem) {
+                    // Filter false entries.
+                    return dataItem;
+                });
+
+                // Format labels.
+                item.labels = item.data.map(function(dataItem) {
+                    dataItem.quotient = parseFloat(dataItem.quotient * 100).toFixed(2);
+                    var label = "";
+
+                    if (typeof dataItem.value != "undefined") {
+                        label = '(' + dataItem.value + ') ';
+                    }
+                    label += dataItem.answertext;
+                    label += dataItem.quotient > 0 ? ' (' + dataItem.quotient + '%)' : "";
+                    return label;
+                });
+                item.chartData = item.data.map(function(dataItem) {
+                    return dataItem.answercount;
+                });
+
+                if (item.typ == 'multichoicerated') {
+                    item.average = item.data.reduce(function (prev, current) {
+                        return prev + current.avg;
+                    }, 0.0);
+                }
+
+                var subtype = item.presentation.charAt(0);
+                item.single = subtype != 'c';
+
+                item.template = 'chart';
+                break;
+        }
+
+        return item;
+    }
+
     // Convenience function to refresh all the data.
     function refreshAllData(sync, showErrors) {
         var promises = [];
+
         promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
         if (feedback) {
             promises.push($mmaModFeedback.invalidateFeedbackAccessInformationData(feedback.id));
             promises.push($mmaModFeedback.invalidateAnalysisData(feedback.id));
-            promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
             promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
             promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+            promises.push($mmaModFeedback.invalidateResumePageData(feedback.id));
         }
 
+        analysisLoaded = false;
+        overviewLoaded = false;
+
         return $q.all(promises).finally(function() {
             return fetchFeedbackData(true, sync, showErrors);
         });
@@ -205,7 +372,14 @@ angular.module('mm.addons.mod_feedback')
     obsSubmitted = $mmEvents.on(mmaModFeedbackEventFormSubmitted, function(data) {
         // Go to review attempt if an attempt in this quiz was finished and synced.
         if (data.feedbackId === feedback.id) {
-            fetchFeedbackData(true);
+            analysisLoaded = false;
+            overviewLoaded = false;
+            $scope.feedbackLoaded = false;
+            if (data.tab != $scope.selectedTab) {
+                $scope.setTab(data.tab);
+            } else {
+                fetchFeedbackData(true);
+            }
         }
     });
 
diff --git a/www/addons/mod/feedback/main.js b/www/addons/mod/feedback/main.js
index 0ad4c15abb8..8b20b30cd66 100644
--- a/www/addons/mod/feedback/main.js
+++ b/www/addons/mod/feedback/main.js
@@ -29,7 +29,8 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
             module: null,
             moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
             courseid: null,
-            group: null
+            group: null,
+            tab: null
         },
         views: {
             'site': {
@@ -56,23 +57,6 @@ angular.module('mm.addons.mod_feedback', ["chart.js"])
         }
     })
 
-    .state('site.mod_feedback-analysis', {
-        url: '/mod_feedback-analysis',
-        params: {
-            feedbackid: null,
-            courseid: null,
-            module: null,
-            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
-            group: null
-        },
-        views: {
-            'site': {
-                controller: 'mmaModFeedbackAnalysisCtrl',
-                templateUrl: 'addons/mod/feedback/templates/analysis.html'
-            }
-        }
-    })
-
     .state('site.mod_feedback-respondents', {
         url: '/mod_feedback-respondents',
         params: {
diff --git a/www/addons/mod/feedback/scss/styles.scss b/www/addons/mod/feedback/scss/styles.scss
index 3bd49d60a88..ef473630008 100644
--- a/www/addons/mod/feedback/scss/styles.scss
+++ b/www/addons/mod/feedback/scss/styles.scss
@@ -1,10 +1,12 @@
-.mm-site_mod_feedback-analysis {
-  ul {
-    font-size: $font-size-base;
-  }
-  .item .chart {
-    max-width: 500px;
-    margin: 0 auto;
+.mm-site_mod_feedback {
+  .mm-analysis {
+    ul {
+      font-size: $font-size-base;
+    }
+    .item .chart {
+      max-width: 500px;
+      margin: 0 auto;
+    }
   }
 }
 
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index 24d7f685f6f..48661bcd919 100644
--- a/www/addons/mod/feedback/services/handlers.js
+++ b/www/addons/mod/feedback/services/handlers.js
@@ -186,9 +186,10 @@ angular.module('mm.addons.mod_feedback')
                         module: module,
                         moduleid: module.id,
                         feedbackid: module.instance,
-                        courseid: module.course
+                        courseid: module.course,
+                        tab: 'analysis'
                     };
-                    return $mmContentLinksHelper.goInSite('site.mod_feedback-analysis', stateParams, siteId);
+                    return $mmContentLinksHelper.goInSite('site.mod_feedback', stateParams, siteId);
                 }).finally(function() {
                     modal.dismiss();
                 });
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 5936f20d4ed..203f5ed7216 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -73,11 +73,19 @@ angular.module('mm.addons.mod_feedback')
      * @param {Number}  group            Course module activity object.
      */
     self.openFeature = function(feature, module, courseId, group) {
-        var pageName = feature ? 'site.mod_feedback-' + feature : 'site.mod_feedback',
+        var pageName = feature && feature != "analysis" ? 'site.mod_feedback-' + feature : 'site.mod_feedback';
             backTimes = 0;
 
+        var stateParams = {
+            module: module,
+            moduleid: module.id,
+            courseid: courseId,
+            feedbackid: module.instance,
+            group: group || 0
+        };
         // Only check history if navigating through tabs.
-        if (!feature || feature == "analysis") {
+        if (pageName == 'site.mod_feedback') {
+            stateParams.tab = feature == "analysis" ? 'analysis' : 'overview';
             backTimes = getHistoryBackCounter(pageName, module.instance);
         }
 
@@ -86,13 +94,6 @@ angular.module('mm.addons.mod_feedback')
             $ionicHistory.goBack(backTimes);
         } else {
             // Not found, open new state.
-            var stateParams = {
-                module: module,
-                moduleid: module.id,
-                courseid: courseId,
-                feedbackid: module.instance,
-                group: group || 0
-            };
             $state.go(pageName, stateParams);
         }
 
diff --git a/www/addons/mod/feedback/templates/analysis.html b/www/addons/mod/feedback/templates/analysis.html
deleted file mode 100644
index 3114aa6fa0c..00000000000
--- a/www/addons/mod/feedback/templates/analysis.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<ion-view>
-    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
-    <ion-nav-buttons side="secondary">
-        <mm-context-menu>
-            <mm-context-menu-item priority="900" ng-if="moduleUrl" href="moduleUrl" content="'mm.core.openinbrowser' | translate" icon-action="'ion-share'"></mm-context-menu-item>
-            <mm-context-menu-item priority="800" ng-if="description" content="'mm.core.moduleintro' | translate" action="expandDescription()" icon-action="'ion-arrow-right-c'"></mm-context-menu-item>
-            <mm-context-menu-item priority="700" ng-if="feedbackLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshFeedback(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
-        </mm-context-menu>
-    </ion-nav-buttons>
-    <ion-content mm-state-class>
-        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="feedbackLoaded" on-refresh="refreshFeedback(false)"></ion-refresher>
-        <mm-loading hide-until="feedbackLoaded">
-            <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="access.canviewreports">
-                <a class="tab-item" ng-click="openFeature()">{{ 'mma.mod_feedback.overview' | translate }}</a>
-                <a class="tab-item active">{{ 'mma.mod_feedback.analysis' | translate }}</a>
-            </div>
-            <section class="list" ng-if="access.canedititems || !access.isempty">
-                <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
-                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
-                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
-                    <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
-                    </select>
-                </div>
-                <div ng-if="access.canviewreports || access.canedititems" class="item item-text-wrap" ng-class="{'item-icon-right': access.canviewreports}"   ng-click="access.canviewreports && openFeature('respondents')">
-                    <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
-                    <span class="badge badge-positive">{{feedback.completedCount}}</span>
-                    <i ng-if="access.canviewreports" class="icon icon-accessory ion-chevron-right"></i>
-                </div>
-                <div ng-if="!access.isanonymous && access.canviewreports" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
-                    <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
-                    <i class="icon icon-accessory ion-chevron-right"></i>
-                </div>
-                <div ng-if="access.canedititems" class="item item-text-wrap item-icon-right">
-                    <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
-                    <span class="badge badge-positive">{{feedback.itemsCount}}</span>
-                </div>
-                <div class="mm-warning-card-icon" ng-if="warning">
-                    <i class="icon ion-close-circled padding"></i> {{ warning }}
-                </div>
-                <div class="list" ng-if="items && items.length">
-                    <div ng-repeat="item in items track by $index" class="item item-text-wrap">
-                        <p class="item-heading">{{item.number}}. {{ item.name }}</p>
-                        <p>{{ item.label }}</p>
-                        <div ng-if="item.template" ng-include="item.template"></div>
-                    </div>
-
-
-                    <script type="text/ng-template" id="numeric">
-                        <ul>
-                            <li ng-repeat="data in item.data track by $index"><i class="icon ion-minus-round"></i> {{ data }}</li>
-                        </ul>
-                        <p>{{ 'mma.mod_feedback.average' | translate }}: {{item.average | number : 2}}</p>
-                    </script>
-                    <script type="text/ng-template" id="list">
-                        <ul>
-                            <li ng-repeat="data in item.data track by $index" ng-if="data">
-                                <i class="icon ion-minus-round"></i> <mm-format-text watch="true">{{ data }}</mm-format-text>
-                            </li>
-                        </ul>
-                    </script>
-                    <script type="text/ng-template" id="chart">
-                        <canvas ng-if="item.labels.length <= 5 && !item.single" class="chart chart-bar" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
-                        <canvas ng-if="item.labels.length > 5 && !item.single" class="chart chart-horizontal-bar" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
-                        <canvas ng-if="item.single" class="chart chart-doughnut" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
-                        <p ng-if="item.average">{{ 'mma.mod_feedback.average' | translate }}: {{item.average | number : 2}}</p>
-                    </script>
-                </div>
-                </div>
-            </section>
-        </mm-loading>
-    </ion-content>
-</ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index c3b5701cc41..0f4382816b2 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -78,7 +78,7 @@
                 <p ng-if="completionPageContents"><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ completionPageContents }}</mm-format-text></p>
             </div>
             <div class="item item-text-wrap row-buttons responsive-sm" ng-if="completed">
-                <button ng-if="access.canviewanalysis" class="button button-block icon-left ion-stats-bars" ng-click="openFeature('analysis')">
+                <button ng-if="access.canviewanalysis" class="button button-block icon-left ion-stats-bars" ng-click="showAnalysis()">
                     {{ 'mma.mod_feedback.completed_feedbacks' | translate }}
                 </button>
                 <button class="button button-block button-positive icon-right ion-chevron-right" ng-click="continue()">
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 0f7013df685..69e1e16f031 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -16,76 +16,113 @@
 
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
-            <!-- Feedback responses found to be synchronized -->
-            <div class="mm-warning-card-icon" ng-if="hasOffline">
-                <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
+            <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="(access.canviewreports || access.canviewanalysis) && !access.isempty">
+                <a class="tab-item" ng-class="{'active': selectedTab == 'overview'}" ng-click="setTab('overview')">{{ 'mma.mod_feedback.overview' | translate }}</a>
+                <a ng-if="access.canviewreports" class="tab-item" ng-class="{'active': selectedTab == 'analysis'}" ng-click="setTab('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
+                <a ng-if="!access.canviewreports" class="tab-item" ng-class="{'active': selectedTab == 'analysis'}" ng-click="setTab('analysis')">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</a>
             </div>
 
-            <div class="mm-warning-card-icon" ng-if="access.cancomplete && !access.isopen">
-                <i class="icon ion-close-circled padding"></i> {{ 'mma.mod_feedback.feedback_is_not_open' | translate }}
-            </div>
+            <mm-loading hide-until="tabSwitched">
+                <section class="list" ng-if="(access.canedititems || access.canviewreports) && !access.isempty">
+                    <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                        <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                        </select>
+                    </div>
+                    <div ng-if="access.canviewreports || access.canedititems" class="item item-text-wrap" ng-class="{'item-icon-right': access.canviewreports}" ng-click="access.canviewreports && openFeature('respondents')">
+                        <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
+                        <span class="badge badge-positive">{{feedback.completedCount}}</span>
+                        <i ng-if="access.canviewreports" class="icon icon-accessory ion-chevron-right"></i>
+                    </div>
+                    <div ng-if="!access.isanonymous && access.canviewreports" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
+                        <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
+                    </div>
+                    <div ng-if="access.canedititems" class="item item-text-wrap item-icon-right">
+                        <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
+                        <span class="badge badge-positive">{{feedback.itemsCount}}</span>
+                    </div>
+                </section>
 
-            <div class="mm-success-card-icon" ng-if="access.cancomplete && access.isopen && !access.cansubmit">
-                <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
-            </div>
+                <div ng-if="selectedTab == 'overview'">
+                    <!-- Feedback responses found to be synchronized -->
+                    <div class="mm-warning-card-icon" ng-if="hasOffline">
+                        <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
+                    </div>
 
-            <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="access.canviewreports">
-                <a class="tab-item active">{{ 'mma.mod_feedback.overview' | translate }}</a>
-                <a class="tab-item" ng-click="openFeature('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
-            </div>
+                    <div class="mm-info-card-icon" ng-if="access.cancomplete && !access.isopen">
+                        <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_feedback.feedback_is_not_open' | translate }}
+                    </div>
 
-            <section class="list" ng-if="access.canedititems || access.canviewreports || !access.isempty">
-                <div ng-if="access.canedititems && (groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
-                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
-                    <ion-label id="mma-feedback-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
-                    <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-feedback-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
-                    </select>
-                </div>
-                <div ng-if="access.canviewreports || access.canedititems" class="item item-text-wrap" ng-class="{'item-icon-right': access.canviewreports}" ng-click="access.canviewreports && openFeature('respondents')">
-                    <p class="item-heading">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</p>
-                    <span class="badge badge-positive">{{feedback.completedCount}}</span>
-                    <i ng-if="access.canviewreports" class="icon icon-accessory ion-chevron-right"></i>
-                </div>
-                <div ng-if="!access.isanonymous && access.canviewreports" class="item item-text-wrap item-icon-right" ng-click="openFeature('nonrespondents')">
-                    <p class="item-heading">{{ 'mma.mod_feedback.show_nonrespondents' | translate }}</p>
-                    <i class="icon icon-accessory ion-chevron-right"></i>
-                </div>
-                <div ng-if="access.canedititems" class="item item-text-wrap item-icon-right">
-                    <p class="item-heading">{{ 'mma.mod_feedback.questions' | translate }}</p>
-                    <span class="badge badge-positive">{{feedback.itemsCount}}</span>
-                </div>
-                <div ng-if="access.canedititems && feedback.timeopen" class="item item-text-wrap">
-                    <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
-                    <p>{{feedback.openTimeReadable}}</p>
-                </div>
-                <div ng-if="access.canedititems && feedback.timeclose" class="item item-text-wrap">
-                    <p class="item-heading">{{ 'mma.mod_feedback.feedbackclose' | translate }}</p>
-                    <p>{{feedback.closeTimeReadable}}</p>
-                </div>
-                <div ng-if="access.canedititems && feedback.page_after_submit" class="item item-text-wrap">
-                    <p class="item-heading">{{ 'mma.mod_feedback.page_after_submit' | translate }}</p>
-                    <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ feedback.page_after_submit }}</mm-format-text>
+                    <div class="mm-success-card-icon" ng-if="access.cancomplete && access.isopen && !access.cansubmit">
+                        <i class="icon ion-checkmark-round padding"></i> {{ 'mma.mod_feedback.this_feedback_is_already_submitted' | translate }}
+                    </div>
                 </div>
-                <div ng-if="!access.isempty">
-                    <div class="item item-text-wrap">
-                        <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
-                        <p ng-if="access.isanonymous">{{ 'mma.mod_feedback.anonymous' | translate }}</p>
-                        <p ng-if="!access.isanonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
+
+                <section class="list" ng-if="selectedTab == 'overview' && (access.canedititems || access.canviewreports || !access.isempty)">
+                    <div ng-if="access.canedititems && overview.timeopen" class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
+                        <p>{{overview.openTimeReadable}}</p>
                     </div>
-                    <div class="item item-text-wrap row-buttons responsive-sm">
-                        <button class="button button-block icon-left ion-search" ng-click="gotoAnswerQuestions(true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
-                        <button ng-if="!access.canviewreports && access.canviewanalysis" class="button button-block icon-left ion-stats-bars" ng-click="openFeature('analysis')">
-                            {{ 'mma.mod_feedback.completed_feedbacks' | translate }}
-                        </button>
-                        <button ng-if="access.cancomplete && access.cansubmit && !goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
-                            {{ 'mma.mod_feedback.complete_the_form' | translate }}
-                        </button>
-                        <button ng-if="access.cancomplete && access.cansubmit && goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
-                            {{ 'mma.mod_feedback.continue_the_form' | translate }}
-                        </button>
+                    <div ng-if="access.canedititems && overview.timeclose" class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_feedback.feedbackclose' | translate }}</p>
+                        <p>{{overview.closeTimeReadable}}</p>
                     </div>
-                </div>
-            </section>
+                    <div ng-if="access.canedititems && feedback.page_after_submit" class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_feedback.page_after_submit' | translate }}</p>
+                        <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ feedback.page_after_submit }}</mm-format-text>
+                    </div>
+                    <div ng-if="!access.isempty">
+                        <div class="item item-text-wrap">
+                            <p class="item-heading">{{ 'mma.mod_feedback.mode' | translate }}</p>
+                            <p ng-if="access.isanonymous">{{ 'mma.mod_feedback.anonymous' | translate }}</p>
+                            <p ng-if="!access.isanonymous">{{ 'mma.mod_feedback.non_anonymous' | translate }}</p>
+                        </div>
+                        <div class="item item-text-wrap row-buttons responsive-sm">
+                            <button class="button button-block icon-left ion-search" ng-click="gotoAnswerQuestions(true)">{{ 'mma.mod_feedback.preview' | translate }}</button>
+                            <button ng-if="access.cancomplete && access.cansubmit && !goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
+                                {{ 'mma.mod_feedback.complete_the_form' | translate }}
+                            </button>
+                            <button ng-if="access.cancomplete && access.cansubmit && goPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoAnswerQuestions()">
+                                {{ 'mma.mod_feedback.continue_the_form' | translate }}
+                            </button>
+                        </div>
+                    </div>
+                </section>
+                <section class="list mm-analysis" ng-if="selectedTab == 'analysis' && (access.canedititems || !access.isempty)">
+                    <div class="mm-warning-card-icon" ng-if="warning">
+                        <i class="icon ion-information-circled padding"></i> {{ warning }}
+                    </div>
+                    <div class="list" ng-if="items && items.length">
+                        <div ng-repeat="item in items track by $index" class="item item-text-wrap">
+                            <p class="item-heading">{{item.number}}. {{ item.name }}</p>
+                            <p>{{ item.label }}</p>
+                            <div ng-if="item.template" ng-include="item.template"></div>
+                        </div>
+
+                        <script type="text/ng-template" id="numeric">
+                            <ul>
+                                <li ng-repeat="data in item.data track by $index"><i class="icon ion-minus-round"></i> {{ data }}</li>
+                            </ul>
+                            <p>{{ 'mma.mod_feedback.average' | translate }}: {{item.average | number : 2}}</p>
+                        </script>
+                        <script type="text/ng-template" id="list">
+                            <ul>
+                                <li ng-repeat="data in item.data track by $index" ng-if="data">
+                                    <i class="icon ion-minus-round"></i> <mm-format-text watch="true">{{ data }}</mm-format-text>
+                                </li>
+                            </ul>
+                        </script>
+                        <script type="text/ng-template" id="chart">
+                            <canvas ng-if="item.labels.length <= 5 && !item.single" class="chart chart-bar" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
+                            <canvas ng-if="item.labels.length > 5 && !item.single" class="chart chart-horizontal-bar" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
+                            <canvas ng-if="item.single" class="chart chart-doughnut" chart-data="item.chartData" chart-labels="item.labels" chart-options="chartOptions" height="300"></canvas>
+                            <p ng-if="item.average">{{ 'mma.mod_feedback.average' | translate }}: {{item.average | number : 2}}</p>
+                        </script>
+                    </div>
+                </section>
+            </mm-loading>
         </mm-loading>
     </ion-content>
 </ion-view>

From 0bf5b495ed7c77712ad68c886cf4cded8456bff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 9 May 2017 14:12:53 +0200
Subject: [PATCH 132/218] MOBILE-2106 feedback: Fix captcha message

---
 www/addons/mod/feedback/lang/en.json       | 2 +-
 www/addons/mod/feedback/services/helper.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index e0dc3905876..51913affb96 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -3,7 +3,7 @@
     "anonymous": "Anonymous",
     "anonymous_entries": "Anonymous entries ({{$a}})",
     "average": "Average",
-    "captchaofflinewarning" : "Feedback with captcha cannot be completed in offline mode or with the server down.",
+    "captchaofflinewarning" : "Feedback with captcha cannot be completed if not configured, offline mode or with the server down.",
     "complete_the_form": "Answer the questions...",
     "completed_feedbacks": "Submitted answers",
     "continue_the_form": "Continue the form",
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 203f5ed7216..63933aee7f3 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -345,7 +345,7 @@ angular.module('mm.addons.mod_feedback')
 
                 answered = !!value;
                 responses[name] = 1;
-                responses.recaptcha_challenge_field = itemData.captcha.challengehash;
+                responses.recaptcha_challenge_field = itemData.captcha && itemData.captcha.challengehash;
                 responses.recaptcha_response_field = value;
                 responses.recaptcha_element = 'dummyvalue';
 

From 7392ad6d751053757100fad46a0256739e48b31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 9 May 2017 14:13:16 +0200
Subject: [PATCH 133/218] MOBILE-2106 feedback: Fix group fetching

---
 www/addons/mod/feedback/services/helper.js    |  7 +++---
 .../mod/feedback/services/prefetch_handler.js | 23 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 63933aee7f3..73f8cea6a52 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -35,16 +35,17 @@ angular.module('mm.addons.mod_feedback')
      * @ngdoc method
      * @name $mmaModFeedbackHelper#getFeedbackGroupInfo
      * @param  {Number} cmId        Course Module Id of the feedback.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
      * @return {Object}             Containing the group info related to the activity.
      */
-    self.getFeedbackGroupInfo = function(cmId) {
+    self.getFeedbackGroupInfo = function(cmId, siteId) {
         var groupInfo = {};
 
-        return $mmGroups.getActivityGroupMode(cmId).then(function(groupMode) {
+        return $mmGroups.getActivityGroupMode(cmId, siteId).then(function(groupMode) {
             if (groupMode === $mmGroups.SEPARATEGROUPS || groupMode === $mmGroups.VISIBLEGROUPS) {
                 groupInfo.separateGroups = groupMode === $mmGroups.SEPARATEGROUPS;
                 groupInfo.visibleGroups = groupMode === $mmGroups.VISIBLEGROUPS;
-                return $mmGroups.getActivityAllowedGroups(cmId);
+                return $mmGroups.getActivityAllowedGroups(cmId, undefined, siteId);
             }
             return [];
         }).then(function (groups) {
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 524c8ad1de7..135d1118652 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_feedback')
  * @name $mmaModFeedbackPrefetchHandler
  */
 .factory('$mmaModFeedbackPrefetchHandler', function($mmaModFeedback, mmaModFeedbackComponent, $mmFilepool, $q, $mmUtil, $mmGroups,
-            $mmPrefetchFactory, $mmUser) {
+            $mmPrefetchFactory, $mmUser, $mmaModFeedbackHelper) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModFeedbackComponent);
 
@@ -201,17 +201,26 @@ angular.module('mm.addons.mod_feedback')
                 if (accessData.canedititems || accessData.canviewreports) {
                     // Get all groups analysis.
                     p2.push($mmaModFeedback.getAnalysis(feedback.id, undefined, siteId));
-                    p2.push($mmGroups.getActivityAllowedGroupsIfEnabled(feedback.coursemodule, undefined, siteId).then(function(groups) {
+                    p2.push($mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule, siteId).then(function(groupInfo) {
                         var p3 = [],
                             userIds = [];
-                        angular.forEach(groups, function(group) {
+                        if (!groupInfo.groups || groupInfo.groups.length == 0) {
+                            groupInfo.groups = [{id: 0}];
+                        }
+                        angular.forEach(groupInfo.groups, function(group) {
                             p3.push($mmaModFeedback.getAnalysis(feedback.id, group.id, siteId));
                             p3.push($mmaModFeedback.getAllResponsesAnalysis(feedback.id, group.id, siteId).then(function(responses) {
-                                userIds.push(responses.userid);
-                            }));
-                            p3.push($mmaModFeedback.getAllNonRespondents(feedback.id, group.id, siteId).then(function(responses) {
-                                userIds.push(responses.userid);
+                                angular.forEach(responses.attempts, function(attempt) {
+                                    userIds.push(attempt.userid);
+                                });
                             }));
+                            if (!accessData.isanonymous) {
+                                p3.push($mmaModFeedback.getAllNonRespondents(feedback.id, group.id, siteId).then(function(responses) {
+                                    angular.forEach(responses.users, function(user) {
+                                        userIds.push(user.userid);
+                                    });
+                                }));
+                            }
                         });
 
                         return $q.all(p3).then(function() {

From 088642f9b6d0fb393ef72307e67e406fccc67251 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 8 May 2017 15:08:18 +0200
Subject: [PATCH 134/218] MOBILE-2106 groups: Move group helper function to
 core

---
 www/addons/mod/feedback/controllers/index.js  | 21 +++--
 .../feedback/controllers/nonrespondents.js    |  5 +-
 .../mod/feedback/controllers/respondents.js   |  5 +-
 www/addons/mod/feedback/services/helper.js    | 34 -------
 .../mod/feedback/services/prefetch_handler.js | 11 ++-
 www/addons/mod/feedback/templates/index.html  | 12 +--
 www/core/lib/groups.js                        | 92 ++++++++++++++++---
 7 files changed, 111 insertions(+), 69 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index ff493e94a8c..b363eeff375 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -32,6 +32,10 @@ angular.module('mm.addons.mod_feedback')
         analysisLoaded = false,
         overviewLoaded = false;
 
+    // Constants for display modes.
+    $scope.DISPLAY_OVERVIEW = 'overview';
+    $scope.DISPLAY_ANALYSIS = 'analysis';
+
     $scope.title = module.name;
     $scope.description = module.description;
     $scope.moduleUrl = module.url;
@@ -42,7 +46,7 @@ angular.module('mm.addons.mod_feedback')
     $scope.component = mmaModFeedbackComponent;
     $scope.componentId = module.id;
     $scope.selectedGroup = $stateParams.group || 0;
-    $scope.selectedTab = $stateParams.tab || 'overview';
+    $scope.selectedTab = $stateParams.tab || $scope.DISPLAY_OVERVIEW;
     $scope.overview = {};
     $scope.tabSwitched = false;
     $scope.chartOptions = {
@@ -71,7 +75,7 @@ angular.module('mm.addons.mod_feedback')
     };
 
     function fetchGroupInfo(module) {
-        return $mmaModFeedbackHelper.getFeedbackGroupInfo(module).then(function(groupInfo) {
+        return $mmGroups.getActivityGroupInfo(module).then(function(groupInfo) {
             $scope.groupInfo = groupInfo;
             return $scope.setGroup($scope.selectedGroup);
         });
@@ -99,7 +103,7 @@ angular.module('mm.addons.mod_feedback')
         }).then(function(accessData) {
             $scope.access = accessData;
 
-            if ($scope.selectedTab == 'analysis') {
+            if ($scope.selectedTab == $scope.DISPLAY_ANALYSIS) {
                 return fetchFeedbackAnalysisData(accessData);
             }
             return fetchFeedbackOverviewData(accessData);
@@ -159,7 +163,7 @@ angular.module('mm.addons.mod_feedback')
             // Get groups (only for teachers).
             promise = fetchGroupInfo(feedback.coursemodule);
         } else {
-            $scope.setTab('overview');
+            $scope.setTab($scope.DISPLAY_OVERVIEW);
             promise = $q.when();
         }
 
@@ -176,7 +180,7 @@ angular.module('mm.addons.mod_feedback')
             $scope.feedback.completedCount = analysis.completedcount;
             $scope.feedback.itemsCount = analysis.itemscount;
 
-            if ($scope.selectedTab == 'analysis') {
+            if ($scope.selectedTab == $scope.DISPLAY_ANALYSIS) {
                 var number = 1;
                 $scope.items = analysis.itemsdata.map(function(item) {
                     // Move data inside item.
@@ -206,15 +210,16 @@ angular.module('mm.addons.mod_feedback')
 
     // Set group to see the analysis.
     $scope.setTab = function(tab) {
-        $scope.selectedTab = tab == 'overview' ? 'overview' : 'analysis';
+        $scope.selectedTab = tab == $scope.DISPLAY_OVERVIEW ? $scope.DISPLAY_OVERVIEW : $scope.DISPLAY_ANALYSIS;
 
-        if (($scope.selectedTab == 'overview' && !overviewLoaded) || ($scope.selectedTab == 'analysis' && !analysisLoaded)) {
+        if (($scope.selectedTab == $scope.DISPLAY_OVERVIEW && !overviewLoaded) ||
+                ($scope.selectedTab == $scope.DISPLAY_ANALYSIS && !analysisLoaded)) {
             $scope.tabSwitched = false;
             return fetchFeedbackData(false, false, true);
         }
     };
 
-        // Parse the analysis info to show the info correctly formatted.
+    // Parse the analysis info to show the info correctly formatted.
     function parseAnalysisInfo(item) {
         switch (item.typ) {
             case 'numeric':
diff --git a/www/addons/mod/feedback/controllers/nonrespondents.js b/www/addons/mod/feedback/controllers/nonrespondents.js
index d42539eeb9d..0c39c5a6480 100644
--- a/www/addons/mod/feedback/controllers/nonrespondents.js
+++ b/www/addons/mod/feedback/controllers/nonrespondents.js
@@ -50,7 +50,7 @@ angular.module('mm.addons.mod_feedback')
             $scope.users = [];
 
             // Get groups (only for teachers).
-            return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+            return $mmGroups.getActivityGroupInfo(feedback.coursemodule).then(function(groupInfo) {
                 $scope.groupInfo = groupInfo;
                 return loadGroupUsers($scope.selectedGroup);
             });
@@ -112,8 +112,7 @@ angular.module('mm.addons.mod_feedback')
         promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
         if (feedback) {
             promises.push($mmaModFeedback.invalidateNonRespondentsData(feedback.id));
-            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
-            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+            promises.push($mmGroups.invalidateActivityGroupInfo(feedback.coursemodule));
         }
         return $q.all(promises).finally(function() {
             return fetchFeedbackRespondentsData(true);
diff --git a/www/addons/mod/feedback/controllers/respondents.js b/www/addons/mod/feedback/controllers/respondents.js
index 3b1889132e0..342c32d60f4 100644
--- a/www/addons/mod/feedback/controllers/respondents.js
+++ b/www/addons/mod/feedback/controllers/respondents.js
@@ -57,7 +57,7 @@ angular.module('mm.addons.mod_feedback')
             $scope.responses.anonattempts = [];
 
             // Get groups (only for teachers).
-            return $mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule).then(function(groupInfo) {
+            return $mmGroups.getActivityGroupInfo(feedback.coursemodule).then(function(groupInfo) {
                 $scope.groupInfo = groupInfo;
                 return loadGroupAttempts($scope.selectedGroup);
             });
@@ -126,8 +126,7 @@ angular.module('mm.addons.mod_feedback')
         promises.push($mmaModFeedback.invalidateFeedbackData(courseId));
         if (feedback) {
             promises.push($mmaModFeedback.invalidateResponsesAnalysisData(feedback.id));
-            promises.push($mmGroups.invalidateActivityAllowedGroups(feedback.coursemodule));
-            promises.push($mmGroups.invalidateActivityGroupMode(feedback.coursemodule));
+            promises.push($mmGroups.invalidateActivityGroupInfo(feedback.coursemodule));
         }
         return $q.all(promises).finally(function() {
             return fetchFeedbackRespondentsData(true);
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 73f8cea6a52..0d2470497cf 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -28,40 +28,6 @@ angular.module('mm.addons.mod_feedback')
         MODE_COURSE = 2,
         MODE_CATEGORY = 3;
 
-    /**
-     * Get activity feedback group info to be shown on templates.
-     *
-     * @module mm.addons.mod_feedback
-     * @ngdoc method
-     * @name $mmaModFeedbackHelper#getFeedbackGroupInfo
-     * @param  {Number} cmId        Course Module Id of the feedback.
-     * @param  {String} [siteId]    Site ID. If not defined, current site.
-     * @return {Object}             Containing the group info related to the activity.
-     */
-    self.getFeedbackGroupInfo = function(cmId, siteId) {
-        var groupInfo = {};
-
-        return $mmGroups.getActivityGroupMode(cmId, siteId).then(function(groupMode) {
-            if (groupMode === $mmGroups.SEPARATEGROUPS || groupMode === $mmGroups.VISIBLEGROUPS) {
-                groupInfo.separateGroups = groupMode === $mmGroups.SEPARATEGROUPS;
-                groupInfo.visibleGroups = groupMode === $mmGroups.VISIBLEGROUPS;
-                return $mmGroups.getActivityAllowedGroups(cmId, undefined, siteId);
-            }
-            return [];
-        }).then(function (groups) {
-            if (groups.length <= 0) {
-                groupInfo.separateGroups = false;
-                groupInfo.visibleGroups = false;
-            } else {
-                groupInfo.groups = [
-                    {'id': 0, 'name': $translate.instant('mm.core.allparticipants')}
-                ];
-                groupInfo.groups = groupInfo.groups.concat(groups);
-            }
-            return groupInfo;
-        });
-    };
-
     /**
      * Helper function to open a feature in the app.
      *
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 135d1118652..f133f21fcb6 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_feedback')
  * @name $mmaModFeedbackPrefetchHandler
  */
 .factory('$mmaModFeedbackPrefetchHandler', function($mmaModFeedback, mmaModFeedbackComponent, $mmFilepool, $q, $mmUtil, $mmGroups,
-            $mmPrefetchFactory, $mmUser, $mmaModFeedbackHelper) {
+            $mmPrefetchFactory, $mmUser) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModFeedbackComponent);
 
@@ -201,7 +201,8 @@ angular.module('mm.addons.mod_feedback')
                 if (accessData.canedititems || accessData.canviewreports) {
                     // Get all groups analysis.
                     p2.push($mmaModFeedback.getAnalysis(feedback.id, undefined, siteId));
-                    p2.push($mmaModFeedbackHelper.getFeedbackGroupInfo(feedback.coursemodule, siteId).then(function(groupInfo) {
+                    p2.push($mmGroups.getActivityGroupInfo(feedback.coursemodule, true, undefined, siteId)
+                            .then(function(groupInfo) {
                         var p3 = [],
                             userIds = [];
                         if (!groupInfo.groups || groupInfo.groups.length == 0) {
@@ -209,13 +210,15 @@ angular.module('mm.addons.mod_feedback')
                         }
                         angular.forEach(groupInfo.groups, function(group) {
                             p3.push($mmaModFeedback.getAnalysis(feedback.id, group.id, siteId));
-                            p3.push($mmaModFeedback.getAllResponsesAnalysis(feedback.id, group.id, siteId).then(function(responses) {
+                            p3.push($mmaModFeedback.getAllResponsesAnalysis(feedback.id, group.id, siteId)
+                                    .then(function(responses) {
                                 angular.forEach(responses.attempts, function(attempt) {
                                     userIds.push(attempt.userid);
                                 });
                             }));
                             if (!accessData.isanonymous) {
-                                p3.push($mmaModFeedback.getAllNonRespondents(feedback.id, group.id, siteId).then(function(responses) {
+                                p3.push($mmaModFeedback.getAllNonRespondents(feedback.id, group.id, siteId)
+                                        .then(function(responses) {
                                     angular.forEach(responses.users, function(user) {
                                         userIds.push(user.userid);
                                     });
diff --git a/www/addons/mod/feedback/templates/index.html b/www/addons/mod/feedback/templates/index.html
index 69e1e16f031..2f8ecc74b26 100644
--- a/www/addons/mod/feedback/templates/index.html
+++ b/www/addons/mod/feedback/templates/index.html
@@ -17,9 +17,9 @@
             <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
             <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="(access.canviewreports || access.canviewanalysis) && !access.isempty">
-                <a class="tab-item" ng-class="{'active': selectedTab == 'overview'}" ng-click="setTab('overview')">{{ 'mma.mod_feedback.overview' | translate }}</a>
-                <a ng-if="access.canviewreports" class="tab-item" ng-class="{'active': selectedTab == 'analysis'}" ng-click="setTab('analysis')">{{ 'mma.mod_feedback.analysis' | translate }}</a>
-                <a ng-if="!access.canviewreports" class="tab-item" ng-class="{'active': selectedTab == 'analysis'}" ng-click="setTab('analysis')">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</a>
+                <a class="tab-item" ng-class="{'active': selectedTab == DISPLAY_OVERVIEW}" ng-click="setTab(DISPLAY_OVERVIEW)">{{ 'mma.mod_feedback.overview' | translate }}</a>
+                <a ng-if="access.canviewreports" class="tab-item" ng-class="{'active': selectedTab == DISPLAY_ANALYSIS}" ng-click="setTab(DISPLAY_ANALYSIS)">{{ 'mma.mod_feedback.analysis' | translate }}</a>
+                <a ng-if="!access.canviewreports" class="tab-item" ng-class="{'active': selectedTab == DISPLAY_ANALYSIS}" ng-click="setTab(DISPLAY_ANALYSIS)">{{ 'mma.mod_feedback.completed_feedbacks' | translate }}</a>
             </div>
 
             <mm-loading hide-until="tabSwitched">
@@ -45,7 +45,7 @@
                     </div>
                 </section>
 
-                <div ng-if="selectedTab == 'overview'">
+                <div ng-if="selectedTab == DISPLAY_OVERVIEW">
                     <!-- Feedback responses found to be synchronized -->
                     <div class="mm-warning-card-icon" ng-if="hasOffline">
                         <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
@@ -60,7 +60,7 @@
                     </div>
                 </div>
 
-                <section class="list" ng-if="selectedTab == 'overview' && (access.canedititems || access.canviewreports || !access.isempty)">
+                <section class="list" ng-if="selectedTab == DISPLAY_OVERVIEW && (access.canedititems || access.canviewreports || !access.isempty)">
                     <div ng-if="access.canedititems && overview.timeopen" class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_feedback.feedbackopen' | translate }}</p>
                         <p>{{overview.openTimeReadable}}</p>
@@ -90,7 +90,7 @@
                         </div>
                     </div>
                 </section>
-                <section class="list mm-analysis" ng-if="selectedTab == 'analysis' && (access.canedititems || !access.isempty)">
+                <section class="list mm-analysis" ng-if="selectedTab == DISPLAY_ANALYSIS && (access.canedititems || !access.isempty)">
                     <div class="mm-warning-card-icon" ng-if="warning">
                         <i class="icon ion-information-circled padding"></i> {{ warning }}
                     </div>
diff --git a/www/core/lib/groups.js b/www/core/lib/groups.js
index 0c5ffaac698..651af503e29 100644
--- a/www/core/lib/groups.js
+++ b/www/core/lib/groups.js
@@ -21,7 +21,7 @@ angular.module('mm.core')
  * @ngdoc service
  * @name $mmGroups
  */
-.factory('$mmGroups', function($log, $q, $mmSite, $mmSitesManager) {
+.factory('$mmGroups', function($log, $q, $mmSite, $mmSitesManager, $translate) {
 
     $log = $log.getInstance('$mmGroups');
 
@@ -85,6 +85,52 @@ angular.module('mm.core')
         return 'mmGroups:allowedgroups:' + cmId + ':' + userId;
     }
 
+    /**
+     * Helper function to get activity group info (group mode and list of groups).
+     *
+     * @module mm.core.groups
+     * @ngdoc method
+     * @name $mmGroups#getActivityGroupInfo
+     * @param  {Number} cmId                Course Module Id of the feedback.
+     * @param  {Boolean} [addAllParts=true] True to add the all participants option, false otherwise.
+     * @param  {Number} [userId]            User ID. If not defined, use current user.
+     * @param  {String} [siteId]            Site ID. If not defined, current site.
+     * @return {Object}                     Containing the group info related to the activity.
+     * @since 3.3
+     */
+    self.getActivityGroupInfo = function(cmId, addAllParts, userId, siteId) {
+        if (typeof addAllParts == 'undefined') {
+            addAllParts = true;
+        }
+
+        var groupInfo = {
+            groups: []
+        };
+
+        return self.getActivityGroupMode(cmId, siteId).then(function(groupMode) {
+            groupInfo.separateGroups = groupMode === self.SEPARATEGROUPS;
+            groupInfo.visibleGroups = groupMode === self.VISIBLEGROUPS;
+
+            if (groupInfo.separateGroups || groupInfo.visibleGroups) {
+                return self.getActivityAllowedGroups(cmId, userId, siteId);
+            }
+            return [];
+        }).then(function (groups) {
+            if (groups.length <= 0) {
+                groupInfo.separateGroups = false;
+                groupInfo.visibleGroups = false;
+            } else {
+                if (addAllParts) {
+                    groupInfo.groups = [
+                        {'id': 0, 'name': $translate.instant('mm.core.allparticipants')}
+                    ];
+                }
+                groupInfo.groups = groupInfo.groups.concat(groups);
+            }
+            return groupInfo;
+        });
+    };
+
     /**
      * Get the group mode of an activity.
      *
@@ -241,13 +287,16 @@ angular.module('mm.core')
      * @module mm.core.groups
      * @ngdoc method
      * @name $mmGroups#invalidateActivityAllowedGroups
-     * @param {Number} cmid     Course module ID.
-     * @param {Number} [userid] User ID. If not defined, use current user.
-     * @return {Promise}        Promise resolved when the data is invalidated.
+     * @param  {Number} cmId     Course module ID.
+     * @param  {Number} [userId] User ID. If not defined, use current user.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateActivityAllowedGroups = function(cmid, userid) {
-        userid = userid || $mmSite.getUserId();
-        return $mmSite.invalidateWsCacheForKey(getActivityAllowedGroupsCacheKey(cmid, userid));
+    self.invalidateActivityAllowedGroups = function(cmId, userId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.invalidateWsCacheForKey(getActivityAllowedGroupsCacheKey(cmId, userId));
+        });
     };
 
     /**
@@ -256,11 +305,32 @@ angular.module('mm.core')
      * @module mm.core.groups
      * @ngdoc method
      * @name $mmGroups#invalidateActivityGroupMode
-     * @param {Number} cmid Course module ID.
-     * @return {Promise}    Promise resolved when the data is invalidated.
+     * @param  {Number} cmId     Course module ID.
+     * @param  {Number} [userId] User ID. If not defined, use current user.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateActivityGroupMode = function(cmId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getActivityGroupModeCacheKey(cmId));
+        });
+    };
+
+    /**
+     * Invalidates all activity group info: mode and allowed groups.
+     *
+     * @module mm.core.groups
+     * @ngdoc method
+     * @name $mmGroups#invalidateActivityGroupInfo
+     * @param  {Number} cmId     Course module ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateActivityGroupMode = function(cmid) {
-        return $mmSite.invalidateWsCacheForKey(getActivityGroupModeCacheKey(cmid));
+    self.invalidateActivityGroupInfo = function(cmId, userId, siteId) {
+        var promises = [];
+        promises.push(self.invalidateActivityAllowedGroups(cmId, userId, siteId));
+        promises.push(self.invalidateActivityGroupMode(cmId, siteId));
+        return $q.all(promises);
     };
 
     return self;

From e4c9e4137353eece0c817561335cb56464bd0d90 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 12 May 2017 09:46:04 +0200
Subject: [PATCH 135/218] MOBILE-2096 oauth: Always open oauth in browser

---
 www/core/components/login/services/helper.js | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/www/core/components/login/services/helper.js b/www/core/components/login/services/helper.js
index a6a1f85bc1c..78ef26832e6 100644
--- a/www/core/components/login/services/helper.js
+++ b/www/core/components/login/services/helper.js
@@ -369,19 +369,10 @@ angular.module('mm.core.login')
 
         loginUrl += '&oauthsso=' + params.id;
 
-        // Google will be opened in browser, others will be opened in InAppBrowser.
-        // There's no reliable attribute to check if it's google (ID is not reliable), search for "google" in icon and name.
-        if ((provider.name && provider.name.match(/google/i)) || (provider.iconurl && provider.iconurl.match(/google/i))) {
-            $mmUtil.openInBrowser(loginUrl);
-            if (navigator.app) {
-                navigator.app.exitApp();
-            }
-        } else {
-            var options = {
-                clearsessioncache: 'yes', // Clear the session cache to allow for multiple logins.
-                closebuttoncaption: $translate.instant('mm.login.cancel'),
-            };
-            $mmUtil.openInApp(loginUrl, options);
+        // Always open it in browser because the user might have the session stored in there.
+        $mmUtil.openInBrowser(loginUrl);
+        if (navigator.app) {
+            navigator.app.exitApp();
         }
 
         return true;

From 29b1e02ec348297ca77a0a6e97b8da5c023fc543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 9 May 2017 16:20:44 +0200
Subject: [PATCH 136/218] MOBILE-2105 login: Improve site adding pages

---
 www/core/components/login/scss/styles.scss    | 16 ++++++-
 .../login/templates/credentials.html          | 47 +++++++++----------
 .../components/login/templates/reconnect.html | 44 ++++++++---------
 www/core/components/login/templates/site.html | 18 +++----
 www/core/scss/styles.scss                     |  2 +-
 5 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/www/core/components/login/scss/styles.scss b/www/core/components/login/scss/styles.scss
index 568c7f79c1a..da71e1e5ff1 100644
--- a/www/core/components/login/scss/styles.scss
+++ b/www/core/components/login/scss/styles.scss
@@ -39,9 +39,21 @@
   }
 }
 
-.mm-mm_login_credentials, .mm-mm_login_reconnect {
+.mm-mm_login_credentials, .mm-mm_login_reconnect, .mm-mm_login_site {
   .mm-ioninput-password {
     padding-top: 0;
     padding-bottom: 0;
   }
-}
\ No newline at end of file
+  background: -webkit-radial-gradient(white, $gray-light);
+  background: radial-gradient(white, $gray-light);
+
+  img {
+    max-width: 100%;
+  }
+
+  .box {
+    padding: 16px;
+    background: $white;
+    border: 1px solid $item-default-border;
+  }
+}
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 73c21086d49..64229f2a7e0 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -1,10 +1,11 @@
 <ion-view view-title="{{ 'mm.login.login' | translate }}">
     <ion-content mm-state-class padding="true" class="mm-center-view">
         <mm-loading hide-until="pageLoaded" class="mm-view-content">
-            <div class="card">
-                <div class="item item-text-wrap item-avatar-center">
+            <div class="box">
+                <div class="item item-text-wrap text-center item-borderless">
                     <!-- Show site logo or a default image. -->
                     <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
+                    <img ng-if="!logourl" ng-src="img/moodle.png" class="avatar-full" role="presentation">
 
                     <!-- If no sitename show big siteurl. -->
                     <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
@@ -12,34 +13,32 @@
                     <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
                     <p ng-if="sitename">{{siteurl}}</p>
                 </div>
-            </div>
-            <form>
-                <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
-                    <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off">
-                </ion-input>
-                <ion-input class="list item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
-                    <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
-                </ion-input>
-                <button class="button button-block button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
-            </form>
+                <form>
+                    <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
+                        <input type="text" placeholder="{{ 'mm.login.username' | translate }}" ng-model="credentials.username" autocapitalize="none" autocorrect="off">
+                    </ion-input>
+                    <ion-input class="list item item-input mm-ioninput-password" ng-if="siteChecked && !isBrowserSSO">
+                        <input id="mm-login-credentials-password-input" name="password" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
+                    </ion-input>
+                    <button class="button button-block button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+                </form>
 
-            <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
-                <p>{{ 'mm.login.potentialidps' | translate }}</p>
-                <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
-                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
-                    <span>{{provider.name}}</span>
-                    <i class="icon icon-accessory ion-chevron-right"></i>
-                </a>
-            </div>
+                <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
+                    <p>{{ 'mm.login.potentialidps' | translate }}</p>
+                    <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
+                        <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                        <span>{{provider.name}}</span>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
+                    </a>
+                </div>
 
-            <div ng-if="canSignup">
-                <div class="card">
-                    <div class="item item-text-wrap">
+                <div ng-if="canSignup">
+                    <div class="item item-text-wrap item-borderless">
                         <p class="item-heading">{{ 'mm.login.firsttime' | translate }}</p>
                         <p ng-if="authInstructions"><mm-format-text>{{authInstructions}}</mm-format-text></p>
                     </div>
+                    <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
                 </div>
-                <button class="button button-block" ui-sref="mm_login.email_signup({siteurl: siteurl})">{{ 'mm.login.startsignup' | translate }}</button>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index 6427908b2e8..d7b22919ad4 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -1,33 +1,33 @@
 <ion-view view-title="{{ 'mm.login.reconnect' | translate }}">
     <ion-content mm-state-class padding="true" class="mm-center-view">
         <div class="mm-view-content">
-            <div class="card">
-                <div class="item item-text-wrap item-avatar-center">
+            <div class="box">
+                <div class="item item-text-wrap item-avatar-center item-borderless">
                     <img ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
                     <h2 class="padding">{{siteurl}}</h2>
                     <p ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
                 </div>
-            </div>
-            <div class="list item padding">
-                <h2>{{ 'mm.login.username' | translate }}</h2>
-                <p>{{credentials.username}}</p>
-            </div>
-            <form>
-                <ion-input class="list item item-input mm-ioninput-password">
-                    <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
-                </ion-input>
-                <div class="button-bar">
-                    <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
-                    <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+                <div class="list item padding">
+                    <h2>{{ 'mm.login.username' | translate }}</h2>
+                    <p>{{credentials.username}}</p>
+                </div>
+                <form>
+                    <ion-input class="list item item-input mm-ioninput-password">
+                        <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
+                    </ion-input>
+                    <div class="button-bar">
+                        <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
+                        <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
+                    </div>
+                </form>
+                <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
+                    <p>{{ 'mm.login.potentialidps' | translate }}</p>
+                    <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
+                        <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
+                        <span>{{provider.name}}</span>
+                        <i class="icon icon-accessory ion-chevron-right"></i>
+                    </a>
                 </div>
-            </form>
-            <div ng-if="identityProviders && identityProviders.length" class="padding-top list">
-                <p>{{ 'mm.login.potentialidps' | translate }}</p>
-                <a ng-repeat="provider in identityProviders" class="item item-icon-right item-text-wrap mm-oauth-icon" ng-click="oauthClicked(provider)" title="{{provider.name}}">
-                    <img ng-src="{{provider.iconurl}}" alt="{{provider.name}}">
-                    <span>{{provider.name}}</span>
-                    <i class="icon icon-accessory ion-chevron-right"></i>
-                </a>
             </div>
         </div>
     </ion-content>
diff --git a/www/core/components/login/templates/site.html b/www/core/components/login/templates/site.html
index 0d46ee9c345..de996099557 100644
--- a/www/core/components/login/templates/site.html
+++ b/www/core/components/login/templates/site.html
@@ -4,14 +4,16 @@
   </ion-nav-buttons>
   <ion-content padding="true" id="mm-login-site" mm-state-class class="mm-center-view">
     <div class="mm-view-content">
-      <h2 class="padding-top">{{ 'mm.login.siteaddress' | translate }}</h2>
-      <div class="card">
-        <div class="item item-text-wrap">{{ 'mm.login.newsitedescription' | translate }}</div>
+      <div class="box">
+        <div class="text-center padding">
+          <img ng-src="img/moodle.png" class="avatar-full" role="presentation">
+        </div>
+        <p class="padding">{{ 'mm.login.newsitedescription' | translate }}</p>
+        <div class="list item item-input">
+          <input type="url" placeholder="{{ 'mm.login.siteaddress' | translate }}" ng-model="siteurl" mm-no-input-validation mm-auto-focus >
+        </div>
+        <button class="button button-block button-positive" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
       </div>
-      <div class="list item item-input">
-        <input type="url" placeholder="moodle.org" ng-model="siteurl" mm-no-input-validation mm-auto-focus >
-      </div>
-      <button class="button button-block button-positive" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
     </div>
   </ion-content>
-</ion-view>
\ No newline at end of file
+</ion-view>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 7d85f7d5ee6..f0df59bd659 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -31,7 +31,7 @@ $item-message-note-font-size: $font-size-small !default;
 $item-message-mine-bg: $turquoise-light !default;
 
 // Disabled items.
-$item-disabled-color: #999 !default;
+$item-disabled-color: $gray-medium !default;
 
 // Messages boxes.
 $mm-warning-color: $energized !default; // Energized / yellow.

From 0943bbdf20106c6e75146f064d52e5bbf3aff972 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 12 May 2017 13:32:58 +0200
Subject: [PATCH 137/218] MOBILE-2107 resource: Open GDocs and OneDrive docs in
 browser

---
 www/addons/mod/resource/services/resource.js | 64 +++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/resource/services/resource.js b/www/addons/mod/resource/services/resource.js
index 2f1ef522068..bac18e09095 100644
--- a/www/addons/mod/resource/services/resource.js
+++ b/www/addons/mod/resource/services/resource.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_resource')
  * @ngdoc service
  * @name $mmaModResource
  */
-.factory('$mmaModResource', function($mmFilepool, $mmSite, $mmUtil, $mmFS, $http, $log, $q, $sce, $mmApp, $mmSitesManager,
+.factory('$mmaModResource', function($mmFilepool, $mmSite, $mmUtil, $mmFS, $http, $log, $q, $sce, $mmApp, $mmSitesManager, $mmLang,
             $mmText, mmaModResourceComponent, mmCoreNotDownloaded, mmCoreDownloading, mmCoreDownloaded, $mmCourse) {
     $log = $log.getInstance('$mmaModResource');
 
@@ -307,7 +307,37 @@ angular.module('mm.addons.mod_resource')
 
         var siteId = $mmSite.getId(),
             file = contents[0],
-            files = [file];
+            files = [file],
+            component = mmaModResourceComponent,
+            revision,
+            timeMod;
+
+        if (self.shouldOpenInBrowser(contents[0])) {
+            if ($mmApp.isOnline()) {
+                // Open in browser.
+                var fixedUrl = $mmSite.fixPluginfileURL(file.fileurl).replace('&offline=1', '');
+                fixedUrl = fixedUrl.replace(/forcedownload=\d+&/, ''); // Remove forcedownload when followed by another param.
+                fixedUrl = fixedUrl.replace(/[\?|\&]forcedownload=\d+/, ''); // Remove forcedownload when not followed by any param.
+                $mmUtil.openInBrowser(fixedUrl);
+
+                if ($mmFS.isAvailable()) {
+                    // Download the file if needed (file outdated or not downloaded).
+                    // Download will be in background, don't return the promise.
+                    revision = $mmFilepool.getRevisionFromFileList(files);
+                    timeMod = $mmFilepool.getTimemodifiedFromFileList(files);
+                    $mmFilepool.downloadPackage(siteId, files, component, moduleId, revision, timeMod);
+                }
+
+                return $q.when();
+            } else {
+                // Not online, get the offline file. It will fail if not found.
+                return $mmFilepool.getInternalUrlByUrl(siteId, file.fileurl).then(function(path) {
+                    return $mmUtil.openFile(path);
+                }).catch(function() {
+                    return $mmLang.translateAndReject('mm.core.networkerrormsg');
+                });
+            }
+        }
 
         return treatResourceMainFile(file, moduleId).then(function(result) {
             if (result.path.indexOf('http') === 0) {
@@ -454,6 +484,36 @@ angular.module('mm.addons.mod_resource')
         return $mmUtil.allPromises(promises);
     };
 
+    /**
+     * Whether the resource has to be opened in browser.
+     *
+     * @module mm.addons.mod_resource
+     * @ngdoc method
+     * @name $mmaModResource#shouldOpenInBrowser
+     * @param {Object} file Module's main file.
+     * @return {Boolean}    Whether the resource should be opened in browser.
+     * @since 3.3
+     */
+    self.shouldOpenInBrowser = function(file) {
+        if (!file || !file.isexternalfile || !file.mimetype) {
+            return false;
+        }
+
+        var mimetype = file.mimetype;
+        if (mimetype.indexOf('application/vnd.google-apps.') != -1) {
+            // Google Docs file, always open in browser.
+            return true;
+        }
+
+        if (file.repositorytype == 'onedrive') {
+            // In OneDrive, open in browser the office docs
+            return mimetype.indexOf('application/vnd.openxmlformats-officedocument') != -1 ||
+                    mimetype == 'text/plain' || mimetype == 'document/unknown';
+        }
+
+        return false;
+    };
+
     /**
      * Treat the main file of a resource, downloading it if needed and returning the URL to use and the status of the resource.
      *

From 93152afb3f62c368c0217bbf0034ee480191bd9e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Apr 2017 16:06:55 +0200
Subject: [PATCH 138/218] MOBILE-2052 lesson: Adapt preview for teachers

---
 www/addons/mod/lesson/controllers/index.js  | 1 +
 www/addons/mod/lesson/controllers/player.js | 4 +++-
 www/addons/mod/lesson/lang/en.json          | 2 ++
 www/addons/mod/lesson/templates/index.html  | 3 ++-
 www/addons/mod/lesson/templates/player.html | 5 ++++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index e52e15e1439..81ee185621c 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -72,6 +72,7 @@ angular.module('mm.addons.mod_lesson')
                 promise;
 
             accessInfo = info;
+            $scope.canManage = info.canmanage;
 
             if ($mmaModLesson.isLessonOffline(lesson)) {
                 // Handle status.
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 5fdccd635ad..0c7ae348b84 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -72,6 +72,8 @@ angular.module('mm.addons.mod_lesson')
             var promises = [];
 
             accessInfo = info;
+            $scope.canManage = info.canmanage;
+
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
                 // If it's a password protected lesson and we have the password, allow attempting it.
                 if (!password || info.preventaccessreasons.length > 1 || !$mmaModLesson.isPasswordProtected(info)) {
@@ -153,7 +155,7 @@ angular.module('mm.addons.mod_lesson')
             $scope.currentPage = pageId || accessInfo.firstpageid;
             $scope.messages = data.messages || [];
 
-            if (lesson.timelimit) {
+            if (lesson.timelimit && !accessInfo.canmanage) {
                 // Get the last lesson timer.
                 return $mmaModLesson.getTimers(lesson.id, false, true).then(function(timers) {
                     var lastTimer = timers[timers.length - 1];
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index fce83d6048d..cddc24ff29f 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -31,6 +31,8 @@
     "ongoingcustom": "You have earned {{$a.score}} point(s) out of {{$a.currenthigh}} point(s) thus far.",
     "ongoingnormal": "You have answered {{$a.correct}} correctly out of {{$a.viewed}} attempts.",
     "or": "OR",
+    "preview": "Preview",
+    "progressbarteacherwarning2": "You will not see the progress bar because you can edit this lesson",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
     "review": "Review",
     "reviewlesson": "Review lesson",
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 470f3f908d7..7245ce3dd1f 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -65,7 +65,8 @@
                 <div ng-if="!leftDuringTimed" class="card">
                     <!-- User hasn't left during the session, show a start button. -->
                     <div class="item">
-                        <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
+                        <button ng-if="!canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
+                        <button ng-if="canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.preview' | translate }}</button>
                     </div>
                 </div>
             </div>
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 95359d8ba35..feae7faa435 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -27,10 +27,13 @@
                     <div ng-if="pageButtons && pageButtons.length" class="item">
                         <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button.data)">{{button.content}}</button>
                     </div>
-                    <div ng-if="lesson.progressbar" class="item">
+                    <div ng-if="lesson.progressbar && !canManage" class="item">
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: pageData.progress} }}</p>
                         <progress max="100" value="{{pageData.progress}}"></progress>
                     </div>
+                    <div ng-if="lesson.progressbar && canManage" class="mm-info-card">
+                        <i class="icon ion-information-circled padding"></i>{{ 'mma.mod_lesson.progressbarteacherwarning2' | translate }}
+                    </div>
                 </div>
 
                 <!-- End of lesson reached. -->

From c0be4a9028df19cd946d154810bf06d267999bb3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 9 May 2017 10:19:41 +0200
Subject: [PATCH 139/218] MOBILE-2052 lesson: Implement view attempts overview

---
 www/addons/mod/lesson/controllers/index.js    | 124 ++++++++++++++++-
 www/addons/mod/lesson/lang/en.json            |  12 ++
 www/addons/mod/lesson/scss/styles.scss        |  14 ++
 www/addons/mod/lesson/services/lesson.js      |  92 +++++++++++++
 .../mod/lesson/services/prefetch_handler.js   |  18 ++-
 www/addons/mod/lesson/templates/index.html    |  64 +--------
 www/addons/mod/lesson/templates/reports.html  | 127 ++++++++++++++++++
 www/addons/mod/lesson/templates/view.html     |  62 +++++++++
 www/core/scss/styles.scss                     |   6 +
 9 files changed, 458 insertions(+), 61 deletions(-)
 create mode 100644 www/addons/mod/lesson/templates/reports.html
 create mode 100644 www/addons/mod/lesson/templates/view.html

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index 81ee185621c..c2966265179 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -24,7 +24,7 @@ angular.module('mm.addons.mod_lesson')
 .controller('mmaModLessonIndexCtrl', function($scope, $stateParams, $mmaModLesson, $mmCourse, $q, $translate, $ionicScrollDelegate,
             $mmEvents, $mmText, $mmUtil, $mmCourseHelper, mmaModLessonComponent, $mmApp, $state, mmCoreEventOnlineStatusChanged,
             $ionicHistory, mmCoreEventPackageStatusChanged, mmCoreDownloading, mmCoreDownloaded, $mmCoursePrefetchDelegate,
-            $mmaModLessonPrefetchHandler, $mmSite, $mmaModLessonSync, mmaModLessonAutomSyncedEvent) {
+            $mmaModLessonPrefetchHandler, $mmSite, $mmaModLessonSync, mmaModLessonAutomSyncedEvent, $mmGroups, $mmUser) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -36,7 +36,12 @@ angular.module('mm.addons.mod_lesson')
         currentStatus,
         statusObserver, syncObserver;
 
+    // Constants for display modes.
+    $scope.DISPLAY_VIEW = 'view';
+    $scope.DISPLAY_REPORTS = 'reports';
+
     $scope.title = module.name;
+    $scope.courseId = courseId;
     $scope.moduleUrl = module.url;
     $scope.refreshIcon = 'spinner';
     $scope.syncIcon = 'spinner';
@@ -46,6 +51,8 @@ angular.module('mm.addons.mod_lesson')
     $scope.data = {
         password: ''
     };
+    $scope.display = $scope.DISPLAY_VIEW;
+    $scope.selectedGroup = 0;
 
     // Convenience function to get Lesson data.
     function fetchLessonData(refresh, sync, showErrors) {
@@ -73,6 +80,7 @@ angular.module('mm.addons.mod_lesson')
 
             accessInfo = info;
             $scope.canManage = info.canmanage;
+            $scope.canViewReports = info.canviewreports;
 
             if ($mmaModLesson.isLessonOffline(lesson)) {
                 // Handle status.
@@ -122,6 +130,10 @@ angular.module('mm.addons.mod_lesson')
                 }
             }
 
+            if ($scope.display == $scope.DISPLAY_REPORTS) {
+                promises.push(fetchReportData());
+            }
+
             return $q.all(promises).then(function() {
                 // Lesson can be attempted, don't ask the password and don't show prevent messages.
                 fetchDataFinished(refresh);
@@ -170,6 +182,87 @@ angular.module('mm.addons.mod_lesson')
         $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModLessonComponent);
     }
 
+    // Fetch the reports data.
+    function fetchReportData() {
+        return $mmGroups.getActivityGroupInfo(module.id).then(function(groupInfo) {
+            $scope.groupInfo = groupInfo;
+
+            return setGroup($scope.selectedGroup);
+        }).finally(function() {
+            $scope.reportLoaded = true;
+        });
+    }
+
+    // Set a group to view the reports.
+    function setGroup(groupId) {
+        $scope.selectedGroup = groupId;
+        $scope.selectedGroupName = false;
+
+        // Search the name of the group if it's not participants.
+        if (groupId) {
+            for (var i = 0; i < $scope.groupInfo.groups.length; i++) {
+                var group = $scope.groupInfo.groups[i];
+                if (groupId == group.id) {
+                    $scope.selectedGroupName = group.name;
+                    break;
+                }
+            }
+        }
+
+        return $mmaModLesson.getAttemptsOverview(lesson.id, groupId).then(function(data) {
+            var promises = [];
+
+            // Format times and grades.
+            if (data && data.avetime != null && data.numofattempts) {
+                data.avetime = parseInt(data.avetime / data.numofattempts, 10);
+                promises.push($mmUtil.formatTime(data.avetime).then(function(formatted) {
+                    data.avetimeReadable = formatted;
+                }));
+            }
+
+            if (data && data.hightime != null) {
+                promises.push($mmUtil.formatTime(data.hightime).then(function(formatted) {
+                    data.hightimeReadable = formatted;
+                }));
+            }
+
+            if (data && data.lowtime != null) {
+                promises.push($mmUtil.formatTime(data.lowtime).then(function(formatted) {
+                    data.lowtimeReadable = formatted;
+                }));
+            }
+
+            if (data && data.lessonscored) {
+                if (data.numofattempts) {
+                    data.avescore = $mmUtil.roundToDecimals(data.avescore, 2);
+                }
+                if (data.highscore != null) {
+                    data.highscore = $mmUtil.roundToDecimals(data.highscore, 2);
+                }
+                if (data.lowscore != null) {
+                    data.lowscore = $mmUtil.roundToDecimals(data.lowscore, 2);
+                }
+            }
+
+            // Get the user data for each student returned.
+            angular.forEach(data && data.students, function(student) {
+                student.bestgrade = $mmUtil.roundToDecimals(student.bestgrade, 2);
+
+                promises.push($mmUser.getProfile(student.id, courseId, true).then(function(user) {
+                    student.profileimageurl = user.profileimageurl;
+                }).catch(function() {
+                    // Error getting profile, resolve promise without adding any extra data.
+                }));
+            });
+
+            return $mmUtil.allPromises(promises).catch(function() {
+                // Shouldn't happen.
+            }).then(function() {
+                $scope.overview = data;
+            });
+        });
+    }
+
     // Validate a password and retrieve extra data.
     function validatePassword(pwd, refresh) {
         return $mmaModLesson.getLessonWithPassword(lesson.id, pwd).then(function(lessonData) {
@@ -198,6 +291,8 @@ angular.module('mm.addons.mod_lesson')
             promises.push($mmaModLesson.invalidateTimers(lesson.id));
             promises.push($mmaModLesson.invalidateContentPagesViewed(lesson.id));
             promises.push($mmaModLesson.invalidateQuestionsAttempts(lesson.id));
+            promises.push($mmaModLesson.invalidateAttemptsOverview(lesson.id));
+            promises.push($mmGroups.invalidateActivityGroupInfo(module.id));
         }
 
         return $q.all(promises).finally(function() {
@@ -381,6 +476,33 @@ angular.module('mm.addons.mod_lesson')
         }
     };
 
+    // Change the display mode.
+    $scope.changeDisplay = function(type) {
+        if ($scope.display == type) {
+            // Hasn't changed, stop.
+            return;
+        }
+
+        $scope.display = type;
+        if (type == $scope.DISPLAY_REPORTS && !$scope.groupInfo) {
+            fetchReportData().catch(function(message) {
+                $mmUtil.showErrorModalDefault(message, 'Error getting report.');
+                return $q.reject();
+            });
+        }
+    };
+
+    // Change the group displayed.
+    $scope.setGroup = function(groupId) {
+        $scope.reportLoaded = false;
+        return setGroup(groupId).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error getting report.');
+            return $q.reject();
+        }).finally(function() {
+            $scope.reportLoaded = true;
+        });
+    };
+
     // Confirm and Remove action.
     $scope.removeFiles = function() {
         $mmCourseHelper.confirmAndRemove(module, courseId);
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index cddc24ff29f..88216876d35 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,6 +1,8 @@
 {
     "attemptfinishedinsync": "An offline attempt was synchronized. Do you want to review it?",
     "attemptsremaining": "You have {{$a}} attempt(s) remaining",
+    "averagescore": "Average score",
+    "averagetime": "Average time",
     "clusterjump": "Unseen question within a cluster",
     "congratulations": "Congratulations - end of lesson reached",
     "continue": "Continue",
@@ -17,23 +19,33 @@
     "finishattemptoffline": "This attempt has been finished in offline.",
     "firstwrong": "You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)",
     "gotoendoflesson": "Go to the end of the lesson",
+    "highscore": "High score",
+    "hightime": "High time",
     "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
     "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
     "lessonmenu": "Lesson menu",
+    "lessonstats": "Lesson statistics",
     "linkedmedia": "Linked media",
     "loginfail": "Login failed, please try again...",
+    "lowscore": "Low score",
+    "lowtime": "Low time",
     "maximumnumberofattemptsreached": "Maximum number of attempts reached - Moving to next page",
     "modattemptsnoteacher": "Student review only works for students.",
     "noanswer": "One or more questions have no answer given.  Please go back and submit an answer.",
+    "nolessonattempts": "No attempts have been made on this lesson.",
+    "nolessonattemptsgroup": "No attempts have been made by {{$a}} group members on this lesson.",
+    "notcompleted": "Not completed",
     "numberofcorrectanswers": "Number of correct answers: {{$a}}",
     "numberofpagesviewed": "Number of questions answered: {{$a}}",
     "numberofpagesviewednotice": "Number of questions answered: {{$a.nquestions}} (You should answer at least {{$a.minquestions}})",
     "ongoingcustom": "You have earned {{$a.score}} point(s) out of {{$a.currenthigh}} point(s) thus far.",
     "ongoingnormal": "You have answered {{$a.correct}} correctly out of {{$a.viewed}} attempts.",
     "or": "OR",
+    "overview": "Overview",
     "preview": "Preview",
     "progressbarteacherwarning2": "You will not see the progress bar because you can edit this lesson",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
+    "reports": "Reports",
     "review": "Review",
     "reviewlesson": "Review lesson",
     "reviewquestionback": "Yes, I'd like to try again",
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
index 1aa226a3ebb..5ea22d3a22a 100644
--- a/www/addons/mod/lesson/scss/styles.scss
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -16,3 +16,17 @@
   color: #666;
   font-size: 14px;
 }
+
+.mma-mod_lesson-lessonstats {
+  .item.row {
+    padding: 0;
+
+    .col-33, .col-50 {
+      border-color: $item-default-border;
+      border-style: solid;
+      &:not(:first-child) {
+        border-left-width: $item-border-width;
+      }
+    }
+  }
+}
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 78838d0fbaa..506859be48e 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -1007,6 +1007,65 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get cache key for get attempts overview WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} groupId  Group ID.
+     * @return {String}          Cache key.
+     */
+    function getAttemptsOverviewCacheKey(lessonId, groupId) {
+        return getAttemptsOverviewCommonCacheKey(lessonId) + ':' + groupId;
+    }
+
+    /**
+     * Get common cache key for get attempts overview WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}          Cache key.
+     */
+    function getAttemptsOverviewCommonCacheKey(lessonId) {
+        return 'mmaModLesson:attemptsOverview:' + lessonId;
+    }
+
+    /**
+     * Get the overview of attempts in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getAttemptsOverview
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} [groupId]      The group to get. If not defined, all participants.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the access information.
+     */
+    self.getAttemptsOverview = function(lessonId, groupId, forceCache, ignoreCache, siteId) {
+        groupId = groupId || 0;
+
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId,
+                    groupid: groupId
+                },
+                preSets = {
+                    cacheKey: getAttemptsOverviewCacheKey(lessonId, groupId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_attempts_overview', params, preSets).then(function(response) {
+                return response.data;
+            });
+        });
+    };
+
     /**
      * Get content pages viewed in online and offline.
      *
@@ -2055,6 +2114,39 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates attempts overview for all groups in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateAttemptsOverview
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateAttemptsOverview = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getAttemptsOverviewCommonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates attempts overview for a certain group in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateAttemptsOverviewForGroup
+     * @param  {Number} lessonId Attempt ID.
+     * @param  {Number} groupId  Group ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateAttemptsOverviewForGroup = function(lessonId, groupId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getPageDataCacheKey(lessonId, groupId));
+        });
+    };
+
     /**
      * Invalidates content pages viewed for all attempts.
      *
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 742e6c0d25c..93b2f766434 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonPrefetchHandler
  */
-.factory('$mmaModLessonPrefetchHandler', function($mmaModLesson, $q, $mmPrefetchFactory, mmaModLessonComponent, $mmUtil,
+.factory('$mmaModLessonPrefetchHandler', function($mmaModLesson, $q, $mmPrefetchFactory, mmaModLessonComponent, $mmUtil, $mmGroups,
     $mmSite, $mmFilepool, $rootScope, $timeout, $ionicModal, mmCoreDontShowError) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModLessonComponent, false);
@@ -466,6 +466,22 @@ angular.module('mm.addons.mod_lesson')
             // Prefetch question attempts in last attempt for offline calculations.
             promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, attempt, false, undefined, false, true, siteId));
 
+            if (accessInfo.canviewreports) {
+                // Prefetch reports data.
+                promises.push($mmGroups.getActivityAllowedGroupsIfEnabled(module.id, undefined, siteId).then(function(groups) {
+                    var subPromises = [];
+
+                    angular.forEach(groups, function(group) {
+                        subPromises.push($mmaModLesson.getAttemptsOverview(lesson.id, group.id, false, true, siteId));
+                    });
+
+                    // Always get group 0, even if there are no groups.
+                    subPromises.push($mmaModLesson.getAttemptsOverview(lesson.id, 0, false, true, siteId));
+
+                    return $q.all(subPromises);
+                }));
+            }
+
             return $q.all(promises);
         }).then(function() {
             // Return revision and timemodified.
diff --git a/www/addons/mod/lesson/templates/index.html b/www/addons/mod/lesson/templates/index.html
index 7245ce3dd1f..7ae5da8153d 100644
--- a/www/addons/mod/lesson/templates/index.html
+++ b/www/addons/mod/lesson/templates/index.html
@@ -13,68 +13,14 @@
     <ion-content mm-state-class delegate-handle="mmaModLessonIndexScroll" >
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="lessonLoaded" on-refresh="refreshLesson(false)"></ion-refresher>
         <mm-loading hide-until="lessonLoaded">
-            <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
-
-            <!-- Prevent access messages. Only show the first one. -->
-            <div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length">
-                <!-- The messages can have html, use format-text. -->
-                <i class="icon ion-information-circled padding"></i> <mm-format-text watch="true">{{ preventMessages[0].message }}</mm-format-text>
-            </div>
-
-            <!-- Lesson has data to be synchronized -->
-            <div class="mm-warning" ng-if="hasOffline">
-                <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
+            <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="canViewReports">
+                <a class="tab-item" ng-class="{'active': display == DISPLAY_VIEW}" ng-click="changeDisplay(DISPLAY_VIEW)">{{ 'mma.mod_lesson.preview' | translate }}</a>
+                <a class="tab-item" ng-class="{'active': display == DISPLAY_REPORTS}" ng-click="changeDisplay(DISPLAY_REPORTS)">{{ 'mma.mod_lesson.reports' | translate }}</a>
             </div>
 
-            <!-- Input password for protected lessons. -->
-            <form ng-if="askPassword" class="card">
-                <ion-input class="item item-input item-stacked-label">
-                    <ion-label>{{ 'mma.mod_lesson.enterpassword' | translate }}</ion-label>
-                    <input id="mma-mod-lesson-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="data.password" mm-show-password>
-                    <button class="button button-block" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
-                </ion-input>
-            </form>
+            <ng-include ng-if="display == DISPLAY_VIEW" src="'addons/mod/lesson/templates/view.html'"></ng-include>
 
-            <div ng-if="lesson && (!preventMessages || !preventMessages.length) && !showSpinner">
-                <div ng-if="attemptToReview" class="card">
-                    <!-- An attempt was finished in a synchronization, allow reviewing it. -->
-                    <p class="item item-text-wrap">{{ 'mma.mod_lesson.attemptfinishedinsync' | translate }}</p>
-                    <div class="item">
-                        <button class="button button-block" ng-click="review()">{{ 'mma.mod_lesson.review' | translate }}</button>
-                    </div>
-                </div>
-                <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
-                    <!-- User left during the session and there is no time limit, ask to continue. -->
-                    <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
-                    <div class="item button-bar">
-                        <button class="button" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
-                        <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
-                    </div>
-                </div>
-                <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="card">
-                    <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
-                    <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
-                    <div class="item">
-                        <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.continue' | translate }}</button>
-                    </div>
-                </div>
-                <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="card">
-                    <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
-                    <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
-                </div>
-                <div ng-if="!leftDuringTimed" class="card">
-                    <!-- User hasn't left during the session, show a start button. -->
-                    <div class="item">
-                        <button ng-if="!canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
-                        <button ng-if="canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.preview' | translate }}</button>
-                    </div>
-                </div>
-            </div>
-            <div class="card" ng-if="showSpinner">
-                <div class="item text-center">
-                    <ion-spinner></ion-spinner>
-                </div>
-            </div>
+            <ng-include ng-if="display == DISPLAY_REPORTS" src="'addons/mod/lesson/templates/reports.html'"></ng-include>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/lesson/templates/reports.html b/www/addons/mod/lesson/templates/reports.html
new file mode 100644
index 00000000000..2bfddc9d553
--- /dev/null
+++ b/www/addons/mod/lesson/templates/reports.html
@@ -0,0 +1,127 @@
+<mm-loading hide-until="reportLoaded">
+    <!-- Group selector if the activity uses groups. -->
+    <div ng-if="groupInfo.separateGroups || groupInfo.visibleGroups" class="item item-text-wrap item-input item-select">
+        <ion-label id="mma-mod_lesson-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+        <ion-label id="mma-mod_lesson-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+        <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-mod_lesson-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+        </select>
+    </div>
+
+    <!-- No lesson attempts. -->
+    <div ng-if="!overview" class="mm-empty-box block">
+        <i class="icon ion-stats-bars"></i>
+        <p ng-if="selectedGroupName">{{ 'mma.mod_lesson.nolessonattemptsgroup' | translate:{$a: selectedGroupName} }}</p>
+        <p ng-if="!selectedGroupName">{{ 'mma.mod_lesson.nolessonattempts' | translate }}</p>
+    </div>
+
+    <!-- General statistics for the current group. -->
+    <div class="card mma-mod_lesson-lessonstats" ng-if="overview">
+        <div class="item item-divider">
+            <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
+        </div>
+
+        <!-- In tablet, max 2 rows with 3 columns. -->
+        <div class="hidden-phone">
+            <div class="item item-text-wrap row" ng-if="overview.lessonscored">
+                <div class="col-33 text-center padding">
+                    <p class="item-heading">{{ 'mma.mod_lesson.averagescore' | translate }}</p>
+                    <p ng-if="overview.numofattempts > 0">{{ 'mm.core.percentagenumber' | translate:{$a: overview.avescore} }}</p>
+                    <p ng-if="overview.numofattempts <= 0">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="col-33 text-center padding">
+                    <p class="item-heading">{{ 'mma.mod_lesson.highscore' | translate }}</p>
+                    <p ng-if="overview.highscore != null">{{ 'mm.core.percentagenumber' | translate:{$a: overview.highscore} }}</p>
+                    <p ng-if="overview.highscore == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="col-33 text-center padding">
+                    <p class="item-heading">{{ 'mma.mod_lesson.lowscore' | translate }}</p>
+                    <p ng-if="overview.lowscore != null">{{ 'mm.core.percentagenumber' | translate:{$a: overview.lowscore} }}</p>
+                    <p ng-if="overview.lowscore == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+            </div>
+
+            <div class="item item-text-wrap row">
+                <div class="col-33 text-center padding">
+                    <p class="item-heading">{{ 'mma.mod_lesson.averagetime' | translate }}</p>
+                    <p ng-if="overview.avetime != null && overview.numofattempts">{{ overview.avetimeReadable }}</p>
+                    <p ng-if="overview.avetime == null || !overview.numofattempts">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="col-33 text-center padding">
+                    <p class="item-heading">{{ 'mma.mod_lesson.hightime' | translate }}</p>
+                    <p ng-if="overview.hightime != null">{{ overview.hightimeReadable }}</p>
+                    <p ng-if="overview.hightime == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="col-33 text-center padding">
+                    <p class="item-heading">{{ 'mma.mod_lesson.lowtime' | translate }}</p>
+                    <p ng-if="overview.lowtime != null">{{ overview.lowtimeReadable }}</p>
+                    <p ng-if="overview.lowtime == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+            </div>
+        </div>
+
+        <!-- In phone, 3 rows with 1 or 2 columns. -->
+        <div class="hidden-tablet">
+            <div class="item item-text-wrap row">
+                <div class="col-50 text-center padding" ng-if="overview.lessonscored">
+                    <p class="item-heading">{{ 'mma.mod_lesson.averagescore' | translate }}</p>
+                    <p ng-if="overview.numofattempts > 0">{{ 'mm.core.percentagenumber' | translate:{$a: overview.avescore} }}</p>
+                    <p ng-if="overview.numofattempts <= 0">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="padding" ng-class="{'text-center col-50': overview.lessonscored}">
+                    <p class="item-heading">{{ 'mma.mod_lesson.averagetime' | translate }}</p>
+                    <p ng-if="overview.avetime != null && overview.numofattempts">{{ overview.avetimeReadable }}</p>
+                    <p ng-if="overview.avetime == null || !overview.numofattempts">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+            </div>
+
+            <div class="item item-text-wrap row">
+                <div class="col-50 text-center padding" ng-if="overview.lessonscored">
+                    <p class="item-heading">{{ 'mma.mod_lesson.highscore' | translate }}</p>
+                    <p ng-if="overview.highscore != null">{{ 'mm.core.percentagenumber' | translate:{$a: overview.highscore} }}</p>
+                    <p ng-if="overview.highscore == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="padding" ng-class="{'text-center col-50': overview.lessonscored}">
+                    <p class="item-heading">{{ 'mma.mod_lesson.hightime' | translate }}</p>
+                    <p ng-if="overview.hightime != null">{{ overview.hightimeReadable }}</p>
+                    <p ng-if="overview.hightime == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+            </div>
+
+            <div class="item item-text-wrap row">
+                <div class="col-50 text-center padding" ng-if="overview.lessonscored">
+                    <p class="item-heading">{{ 'mma.mod_lesson.lowscore' | translate }}</p>
+                    <p ng-if="overview.lowscore != null">{{ 'mm.core.percentagenumber' | translate:{$a: overview.lowscore} }}</p>
+                    <p ng-if="overview.lowscore == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+
+                <div class="padding" ng-class="{'text-center col-50': overview.lessonscored}">
+                    <p class="item-heading">{{ 'mma.mod_lesson.lowtime' | translate }}</p>
+                    <p ng-if="overview.lowtime != null">{{ overview.lowtimeReadable }}</p>
+                    <p ng-if="overview.lowtime == null">{{ 'mma.mod_lesson.notcompleted' | translate }}</p>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- List of students that have attempts. -->
+    <div class="card" ng-if="overview">
+        <div class="item item-divider">
+            <h2>{{ 'mma.mod_lesson.overview' | translate }}</h2>
+        </div>
+
+        <div ng-repeat="student in overview.students">
+            <a class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}">
+                <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" mm-user-link userid="{{student.id}}" courseid="{{courseId}}">
+                <h2>{{student.fullname}}</h2>
+                <p>{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</p>
+                <i class="icon icon-accessory ion-chevron-right"></i>
+            </a>
+        </div>
+    </div>
+</mm-loading>
\ No newline at end of file
diff --git a/www/addons/mod/lesson/templates/view.html b/www/addons/mod/lesson/templates/view.html
new file mode 100644
index 00000000000..0b77f23ba01
--- /dev/null
+++ b/www/addons/mod/lesson/templates/view.html
@@ -0,0 +1,62 @@
+<mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
+
+<!-- Prevent access messages. Only show the first one. -->
+<div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length">
+    <!-- The messages can have html, use format-text. -->
+    <i class="icon ion-information-circled padding"></i> <mm-format-text watch="true">{{ preventMessages[0].message }}</mm-format-text>
+</div>
+
+<!-- Lesson has data to be synchronized -->
+<div class="mm-warning" ng-if="hasOffline">
+    <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
+</div>
+
+<!-- Input password for protected lessons. -->
+<form ng-if="askPassword" class="card">
+    <ion-input class="item item-input item-stacked-label">
+        <ion-label>{{ 'mma.mod_lesson.enterpassword' | translate }}</ion-label>
+        <input id="mma-mod-lesson-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="data.password" mm-show-password>
+        <button class="button button-block" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+    </ion-input>
+</form>
+
+<div ng-if="lesson && (!preventMessages || !preventMessages.length) && !showSpinner">
+    <div ng-if="attemptToReview" class="card">
+        <!-- An attempt was finished in a synchronization, allow reviewing it. -->
+        <p class="item item-text-wrap">{{ 'mma.mod_lesson.attemptfinishedinsync' | translate }}</p>
+        <div class="item">
+            <button class="button button-block" ng-click="review()">{{ 'mma.mod_lesson.review' | translate }}</button>
+        </div>
+    </div>
+    <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
+        <!-- User left during the session and there is no time limit, ask to continue. -->
+        <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
+        <div class="item button-bar">
+            <button class="button" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
+            <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
+        </div>
+    </div>
+    <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="card">
+        <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
+        <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
+        <div class="item">
+            <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+        </div>
+    </div>
+    <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="card">
+        <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
+        <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
+    </div>
+    <div ng-if="!leftDuringTimed" class="card">
+        <!-- User hasn't left during the session, show a start button. -->
+        <div class="item">
+            <button ng-if="!canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
+            <button ng-if="canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.preview' | translate }}</button>
+        </div>
+    </div>
+</div>
+<div class="card" ng-if="showSpinner">
+    <div class="item text-center">
+        <ion-spinner></ion-spinner>
+    </div>
+</div>
\ No newline at end of file
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 7d85f7d5ee6..28b16b2148e 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1148,6 +1148,12 @@ input[type="radio"].mm-radio {
   }
 }
 
+@media only screen and (min-width: 769px) {
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
 // Disable input copy to prevent errors in iOS.
 
 .previous-input-focus, .previous-input-focus.mm-textarea, .cloned-text-input + input, .cloned-text-input + textarea.mm-textarea {

From 73467337fb807194380a74a036f7e656e0f2a85c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 10 May 2017 14:58:02 +0200
Subject: [PATCH 140/218] MOBILE-2052 core: Implement $mmUtil#formatTimeInstant

---
 www/addons/mod/chat/controllers/index.js   |   4 +-
 www/addons/mod/lesson/controllers/index.js |  12 +-
 www/addons/mod/quiz/controllers/player.js  |   4 +-
 www/addons/mod/quiz/controllers/review.js  |   8 +-
 www/core/lib/util.js                       | 131 +++++++++++----------
 5 files changed, 77 insertions(+), 82 deletions(-)

diff --git a/www/addons/mod/chat/controllers/index.js b/www/addons/mod/chat/controllers/index.js
index 36297b74d4f..6b5f4fe294d 100644
--- a/www/addons/mod/chat/controllers/index.js
+++ b/www/addons/mod/chat/controllers/index.js
@@ -48,9 +48,7 @@ angular.module('mm.addons.mod_chat')
             var span = chat.chattime - now;
 
             if (chat.chattime && chat.schedule > 0 && span > 0) {
-                $mmUtil.formatTime(span).then(function(time) {
-                    $scope.chatScheduled = time;
-                });
+                $scope.chatScheduled = $mmUtil.formatTimeInstant(span);
             }
 
         }, function(error) {
diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index c2966265179..cc5667e080d 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -215,21 +215,15 @@ angular.module('mm.addons.mod_lesson')
             // Format times and grades.
             if (data && data.avetime != null && data.numofattempts) {
                 data.avetime = parseInt(data.avetime / data.numofattempts, 10);
-                promises.push($mmUtil.formatTime(data.avetime).then(function(formatted) {
-                    data.avetimeReadable = formatted;
-                }));
+                data.avetimeReadable = $mmUtil.formatTimeInstant(data.avetime);
             }
 
             if (data && data.hightime != null) {
-                promises.push($mmUtil.formatTime(data.hightime).then(function(formatted) {
-                    data.hightimeReadable = formatted;
-                }));
+                data.hightimeReadable = $mmUtil.formatTimeInstant(data.hightime);
             }
 
             if (data && data.lowtime != null) {
-                promises.push($mmUtil.formatTime(data.lowtime).then(function(formatted) {
-                    data.lowtimeReadable = formatted;
-                }));
+                data.lowtimeReadable = $mmUtil.formatTimeInstant(data.lowtime);
             }
 
             if (data && data.lessonscored) {
diff --git a/www/addons/mod/quiz/controllers/player.js b/www/addons/mod/quiz/controllers/player.js
index 2b55c2faaba..1104e642a90 100644
--- a/www/addons/mod/quiz/controllers/player.js
+++ b/www/addons/mod/quiz/controllers/player.js
@@ -94,9 +94,7 @@ angular.module('mm.addons.mod_quiz')
 
             if (quiz.timelimit > 0) {
                 $scope.isTimed = true;
-                $mmUtil.formatTime(quiz.timelimit).then(function(time) {
-                    quiz.readableTimeLimit = time;
-                });
+                quiz.readableTimeLimit = $mmUtil.formatTimeInstant(quiz.timelimit);
             }
 
             $scope.quiz = quiz;
diff --git a/www/addons/mod/quiz/controllers/review.js b/www/addons/mod/quiz/controllers/review.js
index 9b18e1e9f91..ab6ea57a41c 100644
--- a/www/addons/mod/quiz/controllers/review.js
+++ b/www/addons/mod/quiz/controllers/review.js
@@ -111,14 +111,10 @@ angular.module('mm.addons.mod_quiz')
             timeTaken = attempt.timefinish - attempt.timestart;
             if (timeTaken) {
                 // Format timeTaken.
-                $mmUtil.formatTime(timeTaken).then(function(takenTime) {
-                    attempt.timeTaken = takenTime;
-                });
+                attempt.timeTaken = $mmUtil.formatTimeInstant(timeTaken);
                 // Calculate overdue time.
                 if (quiz.timelimit && timeTaken > quiz.timelimit + 60) {
-                    $mmUtil.formatTime(timeTaken - quiz.timelimit).then(function(overTime) {
-                        attempt.overTime = overTime;
-                    });
+                    attempt.overTime = $mmUtil.formatTimeInstant(timeTaken - quiz.timelimit);
                 }
             }
 
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index e051cba61e0..3c52cc174f7 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -980,70 +980,79 @@ angular.module('mm.core')
          * @ngdoc method
          * @name $mmUtil#formatTime
          * @param  {Integer} seconds A number of seconds
-         * @return {String}         Human readable seconds formatted
+         * @return {Promise}         Promise resolved with human readable seconds formatted
+         * @deprecated since 3.3. Please use $mmUtil#formatTimeInstant instead.
          */
         self.formatTime = function(seconds) {
-            var langKeys = ['mm.core.day', 'mm.core.days', 'mm.core.hour', 'mm.core.hours', 'mm.core.min', 'mm.core.mins',
-                            'mm.core.sec', 'mm.core.secs', 'mm.core.year', 'mm.core.years', 'mm.core.now'];
-
-            return $translate(langKeys).then(function(translations) {
-
-                totalSecs = Math.abs(seconds);
-
-                var years     = Math.floor(totalSecs / mmCoreSecondsYear);
-                var remainder = totalSecs - (years * mmCoreSecondsYear);
-                var days      = Math.floor(remainder / mmCoreSecondsDay);
-                remainder = totalSecs - (days * mmCoreSecondsDay);
-                var hours     = Math.floor(remainder / mmCoreSecondsHour);
-                remainder = remainder - (hours * mmCoreSecondsHour);
-                var mins      = Math.floor(remainder / mmCoreSecondsMinute);
-                var secs      = remainder - (mins * mmCoreSecondsMinute);
-
-                var ss = (secs == 1)  ? translations['mm.core.sec']  : translations['mm.core.secs'];
-                var sm = (mins == 1)  ? translations['mm.core.min']  : translations['mm.core.mins'];
-                var sh = (hours == 1) ? translations['mm.core.hour'] : translations['mm.core.hours'];
-                var sd = (days == 1)  ? translations['mm.core.day']  : translations['mm.core.days'];
-                var sy = (years == 1) ? translations['mm.core.year'] : translations['mm.core.years'];
-
-                var oyears = '',
-                    odays = '',
-                    ohours = '',
-                    omins = '',
-                    osecs = '';
-
-                if (years) {
-                    oyears  = years + ' ' + sy;
-                }
-                if (days) {
-                    odays  = days + ' ' + sd;
-                }
-                if (hours) {
-                    ohours = hours + ' ' + sh;
-                }
-                if (mins) {
-                    omins  = mins + ' ' + sm;
-                }
-                if (secs) {
-                    osecs  = secs + ' ' + ss;
-                }
+            return $q.when(self.formatTimeInstant(seconds));
+        };
 
-                if (years) {
-                    return oyears + ' ' + odays;
-                }
-                if (days) {
-                    return odays + ' ' + ohours;
-                }
-                if (hours) {
-                    return ohours + ' ' + omins;
-                }
-                if (mins) {
-                    return omins + ' ' + osecs;
-                }
-                if (secs) {
-                    return osecs;
-                }
-                return translations['mm.core.now'];
-            });
+        /**
+         * Returns hours, minutes and seconds in a human readable format.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#formatTimeInstant
+         * @param  {Integer} seconds A number of seconds
+         * @return {String}          Human readable seconds formatted
+         * @since 3.3
+         */
+        self.formatTimeInstant = function(seconds) {
+            var totalSecs = Math.abs(seconds);
+            var years     = Math.floor(totalSecs / mmCoreSecondsYear);
+            var remainder = totalSecs - (years * mmCoreSecondsYear);
+            var days      = Math.floor(remainder / mmCoreSecondsDay);
+            remainder = totalSecs - (days * mmCoreSecondsDay);
+            var hours     = Math.floor(remainder / mmCoreSecondsHour);
+            remainder = remainder - (hours * mmCoreSecondsHour);
+            var mins      = Math.floor(remainder / mmCoreSecondsMinute);
+            var secs      = remainder - (mins * mmCoreSecondsMinute);
+
+            var ss = $translate.instant('mm.core.' + (secs == 1 ? 'sec' : 'secs'));
+            var sm = $translate.instant('mm.core.' + (mins == 1 ? 'min' : 'mins'));
+            var sh = $translate.instant('mm.core.' + (hours == 1 ? 'hour' : 'hours'));
+            var sd = $translate.instant('mm.core.' + (days == 1 ? 'day' : 'days'));
+            var sy = $translate.instant('mm.core.' + (years == 1 ? 'year' : 'years'));
+
+            var oyears = '',
+                odays = '',
+                ohours = '',
+                omins = '',
+                osecs = '';
+
+            if (years) {
+                oyears  = years + ' ' + sy;
+            }
+            if (days) {
+                odays  = days + ' ' + sd;
+            }
+            if (hours) {
+                ohours = hours + ' ' + sh;
+            }
+            if (mins) {
+                omins  = mins + ' ' + sm;
+            }
+            if (secs) {
+                osecs  = secs + ' ' + ss;
+            }
+
+            if (years) {
+                return oyears + ' ' + odays;
+            }
+            if (days) {
+                return odays + ' ' + ohours;
+            }
+            if (hours) {
+                return ohours + ' ' + omins;
+            }
+            if (mins) {
+                return omins + ' ' + osecs;
+            }
+            if (secs) {
+                return osecs;
+            }
+
+            return $translate.instant('mm.core.now');
         };
 
         /**

From babe67e87d9f0c3e560105922e151faf3f6789dd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 11 May 2017 15:49:07 +0200
Subject: [PATCH 141/218] MOBILE-2052 lesson: Implement view user attempt

---
 .../mod/lesson/controllers/userattempt.js     | 166 ++++++++++++++++
 www/addons/mod/lesson/lang/en.json            |  15 ++
 www/addons/mod/lesson/main.js                 |  16 ++
 www/addons/mod/lesson/scss/styles.scss        |  11 +-
 www/addons/mod/lesson/services/helper.js      | 133 +++++++++++++
 www/addons/mod/lesson/services/lesson.js      | 187 ++++++++++++++++++
 .../mod/lesson/services/prefetch_handler.js   |  21 +-
 www/addons/mod/lesson/templates/reports.html  |   2 +-
 .../mod/lesson/templates/userattempt.html     | 125 ++++++++++++
 9 files changed, 673 insertions(+), 3 deletions(-)
 create mode 100644 www/addons/mod/lesson/controllers/userattempt.js
 create mode 100644 www/addons/mod/lesson/templates/userattempt.html

diff --git a/www/addons/mod/lesson/controllers/userattempt.js b/www/addons/mod/lesson/controllers/userattempt.js
new file mode 100644
index 00000000000..b2a74913d86
--- /dev/null
+++ b/www/addons/mod/lesson/controllers/userattempt.js
@@ -0,0 +1,166 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.addons.mod_lesson')
+
+/**
+ * View user attempt controller.
+ *
+ * @module mm.addons.mod_lesson
+ * @ngdoc controller
+ * @name mmaModLessonUserAttemptCtrl
+ */
+.controller('mmaModLessonUserAttemptCtrl', function($scope, $stateParams, $mmaModLesson, $q, $mmLang, $mmUtil, $mmSite, $mmUser,
+    $mmaModLessonHelper, mmaModLessonComponent) {
+
+    var lessonId = $stateParams.lessonid,
+        courseId = $stateParams.courseid,
+        userId = $stateParams.userid || $mmSite.getUserId(),
+        attemptNumber = $stateParams.attempt,
+        lesson;
+
+    $scope.courseId = courseId;
+    $scope.component = mmaModLessonComponent;
+
+    // Convenience function to get Lesson data.
+    function fetchData() {
+        return $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
+            lesson = lessonData;
+            $scope.lesson = lesson;
+
+            // Get the attempts overview for all participants.
+            return $mmaModLesson.getAttemptsOverview(lesson.id);
+        }).then(function(data) {
+            // Search the student.
+            var student;
+
+            if (!data || !data.students.length) {
+                return $mmLang.translateAndReject('mma.mod_lesson.cannotfinduser');
+            }
+
+            for (var i = 0; i < data.students.length; i++) {
+                if (data.students[i].id == userId) {
+                    student = data.students[i];
+                    break;
+                }
+            }
+
+            if (!student) {
+                return $mmLang.translateAndReject('mma.mod_lesson.cannotfinduser');
+            }
+            if (!student.attempts || !student.attempts.length) {
+                return $mmLang.translateAndReject('mma.mod_lesson.cannotfindattempt');
+            }
+
+            student.bestgrade = $mmUtil.roundToDecimals(student.bestgrade, 2);
+            angular.forEach(student.attempts, function(attempt) {
+                if (attemptNumber == attempt.try) {
+                    // The attempt specified as parameter exists. Use it.
+                    $scope.selectedAttempt = attemptNumber;
+                }
+
+                attempt.label = $mmaModLessonHelper.getAttemptLabel(attempt);
+            });
+
+            if (!$scope.selectedAttempt) {
+                // Attempt number not specified or not valid, use the last attempt.
+                $scope.selectedAttempt = student.attempts[student.attempts.length - 1].try;
+            }
+
+           return $mmUser.getProfile(student.id, courseId, true).then(function(user) {
+                student.profileimageurl = user.profileimageurl;
+                return student;
+            }).catch(function() {
+                // Error getting profile, resolve promise without adding any extra data.
+                return student;
+            });
+        }).then(function(student) {
+            $scope.student = student;
+            return setAttempt($scope.selectedAttempt);
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error getting data.', true);
+            return $q.reject();
+        });
+    }
+
+    // Set a group to view the reports.
+    function setAttempt(attemptNumber) {
+        $scope.selectedAttempt = attemptNumber;
+
+        return $mmaModLesson.getUserAttempt(lesson.id, attemptNumber, userId).then(function(data) {
+
+            if (data && data.completed != -1) {
+                // Completed.
+                data.userstats.grade = $mmUtil.roundToDecimals(data.userstats.grade, 2);
+                data.userstats.timetakenReadable = $mmUtil.formatTimeInstant(data.userstats.timetotake);
+            }
+
+            angular.forEach(data && data.answerpages, function(page) {
+                if ($mmaModLesson.answerPageIsContent(page)) {
+                    page.isContent = true;
+                    angular.forEach(page.answerdata && page.answerdata.answers, function(answer) {
+                        // Content pages only have 1 valid field in the answer array.
+                        answer[0] = $mmaModLessonHelper.getContentPageAnswerDataFromHtml(answer[0]);
+                    });
+                } else if ($mmaModLesson.answerPageIsQuestion(page)) {
+                    page.isQuestion = true;
+                    angular.forEach(page.answerdata && page.answerdata.answers, function(answer) {
+                        // Only the first field of the answer array requires to be parsed.
+                        answer[0] = $mmaModLessonHelper.getQuestionPageAnswerDataFromHtml(answer[0]);
+                    });
+                }
+            });
+
+            $scope.attempt = data;
+        });
+    }
+
+    // Refreshes data.
+    function refreshData() {
+        var promises = [];
+
+        promises.push($mmaModLesson.invalidateLessonData(courseId));
+        if (lesson) {
+            promises.push($mmaModLesson.invalidateAttemptsOverview(lesson.id));
+            promises.push($mmaModLesson.invalidateUserAttemptsForUser(lesson.id, userId));
+        }
+
+        return $q.all(promises).finally(function() {
+            return fetchData();
+        });
+    }
+
+    // Fetch the data.
+    fetchData().finally(function() {
+        $scope.attemptLoaded = true;
+    });
+
+    // Pull to refresh.
+    $scope.refreshData = function() {
+        return refreshData().finally(function() {
+            $scope.$broadcast('scroll.refreshComplete');
+        });
+    };
+
+    // Change the attempt displayed.
+    $scope.setAttempt = function(attemptNumber) {
+        $scope.attemptLoaded = false;
+        return setAttempt(attemptNumber).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error getting attempt.');
+            return $q.reject();
+        }).finally(function() {
+            $scope.attemptLoaded = true;
+        });
+    };
+});
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 88216876d35..589aa6f01c9 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,13 +1,23 @@
 {
+    "answer": "Answer",
     "attemptfinishedinsync": "An offline attempt was synchronized. Do you want to review it?",
+    "attemptheader": "Attempt",
+    "attemptlabelshort": "{{attempt}}: {{grade}} {{timestart}}",
+    "attemptlabelfull": "{{attempt}}: {{grade}} {{timestart}} ({{duration}})",
     "attemptsremaining": "You have {{$a}} attempt(s) remaining",
     "averagescore": "Average score",
     "averagetime": "Average time",
+    "branchtable": "Content",
+    "cannotfindattempt": "Error: could not find attempt",
+    "cannotfinduser": "Error: could not find users",
     "clusterjump": "Unseen question within a cluster",
+    "completed": "Completed",
     "congratulations": "Congratulations - end of lesson reached",
     "continue": "Continue",
     "continuetonextpage": "Continue to next page.",
     "defaultessayresponse": "Your essay will be graded by your teacher.",
+    "detailedstats": "Detailed statistics",
+    "didnotanswerquestion": "Did not answer this question.",
     "displayofgrade": "Display of grade (for students only)",
     "displayscorewithessays": "<p>You earned {{$a.score}} out of {{$a.tempmaxgrade}} for the automatically graded questions.</p><p>Your {{$a.essayquestions}} essay question(s) will be graded and added into your final score at a later date.</p><p>Your current grade without the essay question(s) is {{$a.score}} out of {{$a.grade}}.</p>",
     "displayscorewithoutessays": "Your score is {{$a.score}} (out of {{$a.grade}}).",
@@ -19,6 +29,7 @@
     "finishattemptoffline": "This attempt has been finished in offline.",
     "firstwrong": "You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)",
     "gotoendoflesson": "Go to the end of the lesson",
+    "grade": "Grade",
     "highscore": "High score",
     "hightime": "High time",
     "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
@@ -45,7 +56,10 @@
     "preview": "Preview",
     "progressbarteacherwarning2": "You will not see the progress bar because you can edit this lesson",
     "progresscompleted": "You have completed {{$a}}% of the lesson",
+    "question": "Question",
+    "rawgrade": "Raw grade",
     "reports": "Reports",
+    "response": "Response",
     "review": "Review",
     "reviewlesson": "Review lesson",
     "reviewquestionback": "Yes, I'd like to try again",
@@ -59,6 +73,7 @@
     "thatsthecorrectanswer": "That's the correct answer",
     "thatsthewronganswer": "That's the wrong answer",
     "timeremaining": "Time remaining",
+    "timetaken": "Time taken",
     "unseenpageinbranch": "Unseen question within a content page",
     "warningattemptfinished": "The attempt was finished in the site.",
     "welldone": "Well done!",
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 5921604b97c..64bc2e33933 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -56,6 +56,22 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
           templateUrl: 'addons/mod/lesson/templates/player.html'
         }
       }
+    })
+
+    .state('site.mod_lesson-userattempt', {
+      url: '/mod_lesson-userattempt',
+      params: {
+        courseid: null,
+        lessonid: null,
+        userid: null,
+        attempt: null
+      },
+      views: {
+        'site': {
+          controller: 'mmaModLessonUserAttemptCtrl',
+          templateUrl: 'addons/mod/lesson/templates/userattempt.html'
+        }
+      }
     });
 
 })
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
index 5ea22d3a22a..1c48b860bd7 100644
--- a/www/addons/mod/lesson/scss/styles.scss
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -17,7 +17,7 @@
   font-size: 14px;
 }
 
-.mma-mod_lesson-lessonstats {
+.mma-mod_lesson-lessonstats, .mma-mod_lesson-userstats {
   .item.row {
     padding: 0;
 
@@ -30,3 +30,12 @@
     }
   }
 }
+
+.mm-site_mod_lesson-userattempt {
+  .mma-mod_lesson-contentpage {
+    padding: 0;
+    .row {
+      padding: 0;
+    }
+  }
+}
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 1d0ca8a09c5..6aa3cfe5c2e 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -51,6 +51,74 @@ angular.module('mm.addons.mod_lesson')
         return rootElement.innerHTML;
     };
 
+    /**
+     * Get a label to identify an attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getAttemptLabel
+     * @param  {Object} attempt          Attempt.
+     * @param  {Boolean} includeDuration Whether to include the duration of the attempt.
+     * @return {String}                  Attempt label.
+     */
+    self.getAttemptLabel = function(attempt, includeDuration) {
+        var data = {
+                attempt: attempt.try + 1,
+                grade: '',
+                timestart: '',
+                duration: ''
+            },
+            hasGrade = attempt.grade != null;
+
+        if (hasGrade || attempt.end) {
+            // Attempt finished with or without grade (if the lesson only has content pages, it has no grade).
+            if (hasGrade) {
+                data.grade = $translate.instant('mm.core.percentagenumber', {$a: attempt.grade});
+            }
+            data.timestart = moment(attempt.timestart * 1000).format('LLL');
+            if (includeDuration) {
+                data.duration = $mmUtil.formatTimeInstant(attempt.timeend - attempt.timestart);
+            }
+        } else {
+            // This is what the link does/looks like when the user has not completed the attempt.
+            data.grade = $translate.instant('mma.mod_lesson.notcompleted');
+            if (attempt.timestart) {
+                data.timestart = moment(attempt.timestart * 1000).format('LLL');
+            }
+        }
+
+        return $translate.instant('mma.mod_lesson.attemptlabel' + (includeDuration ? 'full' : 'short'), data);
+    };
+
+    /**
+     * Given the HTML of an answer from a content page, extract the data to render the answer.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getContentPageAnswerDataFromHtml
+     * @param  {String} html Answer's HTML.
+     * @return {Object}      Object with buttonText and content.
+     */
+    self.getContentPageAnswerDataFromHtml = function(html) {
+        var data = {},
+            button,
+            rootElement = document.createElement('div');
+
+        // Search the input button.
+        rootElement.innerHTML = html;
+        button = rootElement.querySelector('input[type="button"]');
+
+        if (button) {
+            // Extract the button content and remove it from the HTML.
+            data.buttonText = button.value;
+            angular.element(button).remove();
+        }
+
+        data.content = rootElement.innerHTML.trim();
+
+        return data;
+    };
+
     /**
      * Get the buttons to change pages.
      *
@@ -103,6 +171,71 @@ angular.module('mm.addons.mod_lesson')
         return buttons;
     };
 
+    /**
+     * Given the HTML of an answer from a question page, extract the data to render the answer.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getQuestionPageAnswerDataFromHtml
+     * @param  {String} html Answer's HTML.
+     * @return {Mixed}       Object with the data to render the answer.
+     *                       If the answer doesn't require any parsing, return a string with the HTML.
+     */
+    self.getQuestionPageAnswerDataFromHtml = function(html) {
+        var data = {},
+            input,
+            select,
+            rootElement = document.createElement('div');
+
+        rootElement.innerHTML = html;
+
+        // Check if it has a checkbox.
+        input = rootElement.querySelector('input[type="checkbox"][name*="answer"]');
+
+        if (input) {
+            // Truefalse or multichoice.
+            data.isCheckbox = true;
+            data.checked = input.checked;
+            data.name = input.name;
+            data.value = input.value;
+            data.highlight = !!rootElement.querySelector('.highlight');
+
+            angular.element(input).remove();
+            data.content = rootElement.innerHTML.trim();
+            return data;
+        }
+
+        // Check if it has an input text or number.
+        input = rootElement.querySelector('input[type="number"],input[type="text"]');
+        if (input) {
+            // Short answer or numeric.
+            data.isText = true;
+            data.value = input.value;
+            return data;
+        }
+
+        // Check if it has a select.
+        select = rootElement.querySelector('select');
+        if (select && select.options) {
+            // Matching.
+            var selectedOption = select.options[select.selectedIndex];
+            data.isSelect = true;
+            data.id = select.id;
+            if (selectedOption) {
+                data.value = selectedOption.value;
+            } else {
+                data.value = '';
+            }
+
+            angular.element(select).remove();
+            data.content = rootElement.innerHTML.trim();
+            return data;
+        }
+
+        // The answer doesn't need any parsing, return the HTML as it is.
+        return html;
+    };
+
     /**
      * Get a question and all the data required to render it from the page data (result of $mmaModLesson#getPageData).
      *
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 506859be48e..29bcf771c00 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -82,6 +82,69 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    /**
+     * Check if an answer page (from getUserAttempt) is a content page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#answerPageIsContent
+     * @param  {Object} page Answer page.
+     * @return {Boolean}     True if content page.
+     */
+    self.answerPageIsContent = function(page) {
+        // The page doesn't have any reliable field to use for checking this. Check qtype first (translated string).
+        if (page.qtype == $translate.instant('mma.mod_lesson.branchtable')) {
+            return true;
+        }
+
+        // qtype doesn't match, but that doesn't mean it's not a content page, maybe the language is different.
+        // Check it's not a question page.
+        if (page.answerdata && !self.answerPageIsQuestion(page)) {
+            // It isn't a question page, but it can be an end of branch, etc. Check if the first answer has a button.
+            // Check if the first answer has a button.
+            if (page.answerdata.answers && page.answerdata.answers[0]) {
+                var rootElement = document.createElement('div');
+                rootElement.innerHTML = page.answerdata.answers[0][0];
+
+                return !!rootElement.querySelector('input[type="button"]');
+            }
+        }
+
+        return false;
+    };
+
+    /**
+     * Check if an answer page (from getUserAttempt) is a question page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#answerPageIsQuestion
+     * @param  {Object} page Answer page.
+     * @return {Boolean}     True if question page.
+     */
+    self.answerPageIsQuestion = function(page) {
+        if (!page.answerdata) {
+            return false;
+        }
+
+        if (page.answerdata.score) {
+            // Only question pages have a score.
+            return true;
+        }
+
+        if (page.answerdata.answers) {
+            for (var i = 0; i < page.answerdata.answers.length; i++) {
+                var answer = page.answerdata.answers[i];
+                if (answer[1]) {
+                    // Only question pages have a statistic.
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    };
+
     /**
      * Calculate some offline data like progress and ongoingscore.
      *
@@ -2059,6 +2122,77 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get cache key for get user attempt WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} userId   User ID.
+     * @param  {Number} attempt  Attempt number
+     * @return {String}          Cache key.
+     */
+    function getUserAttemptCacheKey(lessonId, userId, attempt) {
+        return getUserAttemptUserCacheKey(lessonId, userId) + ':' + attempt;
+    }
+
+    /**
+     * Get user cache key for get user attempt WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} userId   User ID.
+     * @return {String}          Cache key.
+     */
+    function getUserAttemptUserCacheKey(lessonId, userId) {
+        return getUserAttemptLessonCacheKey(lessonId) + ':' + userId;
+    }
+
+    /**
+     * Get lesson cache key for get user attempts WS calls.
+     *
+     * @param {Number} lessonId Lesson ID.
+     * @return {String}         Cache key.
+     */
+    function getUserAttemptLessonCacheKey(lessonId) {
+        return 'mmaModLesson:userAttempt:' + lessonId;
+    }
+
+    /**
+     * Get a user's attempt.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getUserAttempt
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} attempt        Attempt number
+     * @param  {Number} [userId]       User ID. Undefined for current user.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the pages.
+     */
+    self.getUserAttempt = function(lessonId, attempt, userId, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+
+            var params = {
+                    lessonid: lessonId,
+                    userid: userId,
+                    lessonattempt: attempt
+                },
+                preSets = {
+                    cacheKey: getUserAttemptCacheKey(lessonId, userId, attempt)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_user_attempt', params, preSets);
+        });
+    };
+
     /**
      * Check if a jump is correct.
      * Based in Moodle's jumpto_is_correct.
@@ -2346,6 +2480,59 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates all attempts for all users in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateUserAttempts
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateUserAttemptsForLesson = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getUserAttemptLessonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates all attempts for a certain user in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateUserAttempts
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} [userId] User ID. Undefined for current user.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateUserAttemptsForUser = function(lessonId, userId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.invalidateWsCacheForKeyStartingWith(getUserAttemptUserCacheKey(lessonId, userId));
+        });
+    };
+
+    /**
+     * Invalidates a certain attempt for a certain user.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateUserAttempt
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} [userId] User ID. Undefined for current user.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateUserAttempt = function(lessonId, attempt, userId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            userId = userId || site.getUserId();
+            return site.invalidateWsCacheForKey(getUserAttemptCacheKey(lessonId, userId, attempt));
+        });
+    };
+
     /**
      * Check if an answer is correct.
      *
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 93b2f766434..47c526b4b7b 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -476,7 +476,26 @@ angular.module('mm.addons.mod_lesson')
                     });
 
                     // Always get group 0, even if there are no groups.
-                    subPromises.push($mmaModLesson.getAttemptsOverview(lesson.id, 0, false, true, siteId));
+                    subPromises.push($mmaModLesson.getAttemptsOverview(lesson.id, 0, false, true, siteId).then(function(data) {
+                        // Prefetch the last attempt for each user.
+                        var attemptPromises = [];
+
+                        angular.forEach(data && data.students, function(student) {
+                            if (!student.attempts || !student.attempts.length) {
+                                return;
+                            }
+
+                            var lastAttempt = student.attempts[student.attempts.length - 1];
+                            if (!lastAttempt) {
+                                return;
+                            }
+
+                            attemptPromises.push($mmaModLesson.getUserAttempt(
+                                    lesson.id, lastAttempt.try, student.id, false, true, siteId));
+                        });
+
+                        return $q.all(attemptPromises);
+                    }));
 
                     return $q.all(subPromises);
                 }));
diff --git a/www/addons/mod/lesson/templates/reports.html b/www/addons/mod/lesson/templates/reports.html
index 2bfddc9d553..21d1da98347 100644
--- a/www/addons/mod/lesson/templates/reports.html
+++ b/www/addons/mod/lesson/templates/reports.html
@@ -116,7 +116,7 @@ <h2>{{ 'mma.mod_lesson.overview' | translate }}</h2>
         </div>
 
         <div ng-repeat="student in overview.students">
-            <a class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}">
+            <a class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}" ui-sref="site.mod_lesson-userattempt({courseid: courseId, lessonid: lesson.id, userid: student.id})">
                 <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" mm-user-link userid="{{student.id}}" courseid="{{courseId}}">
                 <h2>{{student.fullname}}</h2>
                 <p>{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</p>
diff --git a/www/addons/mod/lesson/templates/userattempt.html b/www/addons/mod/lesson/templates/userattempt.html
new file mode 100644
index 00000000000..648a68447bf
--- /dev/null
+++ b/www/addons/mod/lesson/templates/userattempt.html
@@ -0,0 +1,125 @@
+<ion-view view-title="{{ 'mma.mod_lesson.detailedstats' | translate }}">
+    <ion-content mm-state-class delegate-handle="mmaModLessonUserAttemptScroll">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="attemptLoaded" on-refresh="refreshData()"></ion-refresher>
+        <mm-loading hide-until="attemptLoaded">
+            <div class="list" ng-if="student">
+                <a class="item item-text-wrap" ng-class="{'item-avatar': student.profileimageurl}" mm-user-link userid="{{student.id}}" courseid="{{courseId}}" title="{{student.fullname}}">
+                    <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" >
+                    <h2>{{student.fullname}}</h2>
+                    <p>{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</p>
+                </a>
+
+                <!-- Attempt selector if there is more than one attempt. -->
+                <div ng-if="student.attempts && student.attempts.length > 1" class="item item-text-wrap item-input item-select">
+                    <ion-label id="mma-mod_lesson-attemptslabel">{{ 'mma.mod_lesson.attemptheader' | translate }}</ion-label>
+                    <select ng-model="selectedAttempt" ng-change="setAttempt(selectedAttempt)" aria-labelledby="mma-mod_lesson-attemptslabel" ng-options="attempt.try as attempt.label for attempt in student.attempts" mm-ios-select-fix>
+                    </select>
+                </div>
+
+                <!-- Attempt stats. -->
+                <div ng-if="attempt && attempt.userstats && attempt.userstats.gradeinfo" class="mma-mod_lesson-userstats">
+                    <div class="item item-text-wrap row">
+                        <div class="item col-50">
+                            <p class="item-heading">{{ 'mma.mod_lesson.grade' | translate }}</p>
+                            <p>{{ 'mm.core.percentagenumber' | translate:{$a: attempt.userstats.grade} }}</p>
+                        </div>
+
+                        <div class="item col-50">
+                            <p class="item-heading">{{ 'mma.mod_lesson.rawgrade' | translate }}</p>
+                            <p>{{ attempt.userstats.gradeinfo.earned }} / {{ attempt.userstats.gradeinfo.total }}</p>
+                        </div>
+                    </div>
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_lesson.timetaken' | translate }}</p>
+                        <p>{{ attempt.userstats.timetakenReadable }}</p>
+                    </div>
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_lesson.completed' | translate }}</p>
+                        <p>{{ attempt.userstats.completed * 1000 | mmFormatDate:"dfmediumdate" }}</p>
+                    </div>
+                </div>
+
+                <!-- Not completed, no stats. -->
+                <div ng-if="attempt && (!attempt.userstats || !attempt.userstats.gradeinfo)" class="item item-text-wrap">
+                    {{ 'mma.mod_lesson.notcompleted' | translate }}
+                </div>
+
+                <!-- Pages. -->
+                <div ng-if="attempt" ng-repeat="page in attempt.answerpages" class="mma-mod_lesson-answerpage" ng-class="{'dimmed': page.grayout}">
+                    <div class="item item-divider item-text-wrap">
+                        <h2>{{page.qtype}}: {{page.title}}</h2>
+                    </div>
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_lesson.question' | translate }}</p>
+                        <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}" max-height="50">{{page.contents}}</mm-format-text></p>
+                    </div>
+                    <div class="item item-text-wrap">
+                        <p class="item-heading">{{ 'mma.mod_lesson.answer' | translate }}</p>
+                    </div>
+                    <div class="item item-text-wrap" ng-if="!page.answerdata || !page.answerdata.answers || !page.answerdata.answers.length">
+                        <p>{{ 'mma.mod_lesson.didnotanswerquestion' | translate }}</p>
+                    </div>
+                    <div ng-if="page.answerdata && page.answerdata.answers && page.answerdata.answers.length">
+                        <div ng-repeat="answer in page.answerdata.answers" ng-class="{'mma-mod_lesson-contentpage': page.isContent}">
+                            <div ng-if="page.isContent" class="item item-text-wrap row">
+                                <!-- Content page, display a button and the content. -->
+                                <div class="col-50 padding">
+                                    <button class="button button-block" disabled="disabled">{{ answer[0].buttonText }}</button>
+                                </div>
+                                <div class="col-50 padding">
+                                    <p ng-bind-html="answer[0].content"></p>
+                                </div>
+                            </div>
+                            <div ng-if="page.isQuestion">
+                                <!-- Question page, show the right input for the answer. -->
+
+                                <!-- Truefalse or matching. -->
+                                <ion-checkbox ng-if="answer[0].isCheckbox" name="{{answer[0].name}}" value="{{answer[0].value}}" ng-disabled="true" readonly="readonly" class="item-text-wrap item-checkbox-right" ng-checked="answer[0].checked" ng-class="{'highlight': answer[0].highlight}">
+                                    <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0].content}}</mm-format-text></p>
+                                    <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                </ion-checkbox>
+
+                                <!-- Short answer or numeric. -->
+                                <div ng-if="answer[0].isText" class="item item-text-wrap">
+                                    <p>{{ answer[0].value }}</p>
+                                    <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                </div>
+
+                                <!-- Matching. -->
+                                <div ng-if="answer[0].isSelect" class="item item-text-wrap row mm-item-padding">
+                                    <div class="col">
+                                        <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{ answer[0].content }}</mm-format-text></p>
+                                    </div>
+                                    <div class="col">
+                                        <p class="mm-select-fix">
+                                            {{answer[0].value}}
+                                        </p>
+                                    </div>
+                                    <span ng-if="answer[1]" class="badge"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                </div>
+
+                                <!-- Essay or couldn't determine. -->
+                                <div ng-if="!answer[0].isCheckbox && !answer[0].isText && !answer[0].isSelect" class="item item-text-wrap">
+                                    <mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0]}}</mm-format-text>
+                                    <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                </div>
+                            </div>
+                            <div ng-if="!page.isContent && !page.isQuestion" class="item item-text-wrap">
+                                <!-- Another page (end of branch, ...). -->
+                                <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0]}}</mm-format-text></p>
+                                <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                            </div>
+                        </div>
+                        <div ng-if="page.answerdata.response" class="item item-text-wrap">
+                            <p class="item-heading">{{ 'mma.mod_lesson.response' | translate }}</p>
+                            <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{page.answerdata.response}}</mm-format-text></p>
+                        </div>
+                        <div ng-if="page.answerdata.score" class="item item-text-wrap">
+                            <p>{{page.answerdata.score}}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </mm-loading>
+    </ion-content>
+</ion-view>
\ No newline at end of file

From 59748342976ac593a62f8893104a2b7befd80dbb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 12 May 2017 08:56:33 +0200
Subject: [PATCH 142/218] MOBILE-2052 lesson: Don't show question text in
 feedback

---
 www/addons/mod/lesson/controllers/player.js |  4 +++-
 www/addons/mod/lesson/services/helper.js    | 25 +++++++++++++++++++++
 www/addons/mod/lesson/services/lesson.js    |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 0c7ae348b84..a48a4fd3bf4 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -334,8 +334,10 @@ angular.module('mm.addons.mod_lesson')
             if (result.nodefaultresponse || result.inmediatejump) {
                 // Don't display feedback or force a redirect to a new page. Load the new page.
                 return jumpToPage(result.newpageid);
-            } else{
+            } else {
+
                 // Not inmediate jump, show the feedback.
+                result.feedback = $mmaModLessonHelper.removeQuestionFromFeedback(result.feedback);
                 $scope.messages = result.messages;
                 $scope.processData = result;
                 $scope.processData.buttons = [];
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 6aa3cfe5c2e..9865323cf86 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -458,5 +458,30 @@ angular.module('mm.addons.mod_lesson')
         return $q.when(model);
     };
 
+    /**
+     * Given the feedback of a process page in HTML, remove the question text.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#removeQuestionFromFeedback
+     * @param  {String} html Feedback's HTML.
+     * @return {String}      Feedback without the question text.
+     */
+    self.removeQuestionFromFeedback = function(html) {
+        var questionContainer,
+            rootElement = document.createElement('div');
+
+        // Search the container of the question.
+        rootElement.innerHTML = html;
+        questionContainer = rootElement.querySelector('.generalbox:not(.feedback):not(.correctanswer)');
+
+        if (questionContainer) {
+            // Remove it from the HTML.
+            angular.element(questionContainer).remove();
+        }
+
+        return rootElement.innerHTML.trim();
+    };
+
     return self;
 });
\ No newline at end of file
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 29bcf771c00..8d0fdb10414 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -3038,7 +3038,7 @@ angular.module('mm.addons.mod_lesson')
                 });
             }
 
-            promise.then(function() {
+            promise = promise.then(function() {
                 if (stop) {
                     return;
                 }

From a557a50679d93c0e787bdd4cc0f21e7d49eef523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2017 12:55:54 +0200
Subject: [PATCH 143/218] MOBILE-2105 core: Fix empty boxes

---
 www/addons/myoverview/templates/eventlist.html |  2 +-
 www/addons/myoverview/templates/index.html     |  6 +++---
 www/core/scss/styles.scss                      | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index e0348ab0f31..aee4711a6d4 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -36,7 +36,7 @@ <h5 ng-if="future.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.future
     <button ng-if="!loadingMore" class="button button-block" ng-click="loadMoreEvents()">{{ 'mm.core.loadmore' | translate }}</button>
     <ion-spinner ng-if="loadingMore"></ion-spinner>
 </div>
-<div ng-if="empty" class="mm-empty-box block">
+<div ng-if="empty" class="mm-empty-box block" ng-class="{'mm-empty-box-inline': !showCourse}">
     <img ng-if="showCourse" src="addons/myoverview/img/activities.svg">
     <p>{{ 'mma.myoverview.noevents' | translate }}</p>
 </div>
\ No newline at end of file
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index 8c50a17d3c5..b9f7c82ef56 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -16,10 +16,10 @@
                     <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
                 </select>
             </div>
-            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbydates'">
+            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbydates'" class="mm-loading-centered">
                 <mma-my-overview-event-list events="timeline.events" show-course="true" can-load-more="timeline.canLoadMore" load-more="loadMoreTimeline()"></mma-my-overview-event-list>
             </mm-loading>
-            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'" class="block">
+            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'" class="block mm-loading-centered">
                 <div class="block mm-course-grid">
                     <mm-course-list-progress ng-repeat="course in timelineCourses.courses" course="course" round-progress="true" show-summary="true">
                         <mma-my-overview-event-list events="course.events" can-load-more="course.canLoadMore" load-more="loadMoreCourse(course)"></mma-my-overview-event-list>
@@ -30,7 +30,7 @@
                     <p>{{ 'mma.myoverview.nocourses' | translate }}</p>
                 </div>
             </mm-loading>
-            <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'">
+            <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'" class="mm-loading-centered">
                 <div class="row row-no-padding">
                     <div class="col-10 text-left">
                         <a ng-if="courses[courses.selected] && courses[courses.selected].length > 5" ng-class="{'ion-funnel': !showFilter, 'ion-close-round': showFilter}" class="button button-dark button-icon icon" ng-click="switchFilter()"></a>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index f0df59bd659..4abb27568c5 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -444,7 +444,8 @@ button.item.item-button-right {
 }
 
 .scroll > .padding > mm-loading > .mm-loading-container,
-.scroll > mm-loading > .mm-loading-container {
+.scroll > mm-loading > .mm-loading-container,
+.mm-loading-centered .mm-loading-container {
   position: absolute;
   top: 50%;
   left: 0;
@@ -1433,6 +1434,14 @@ i, cite, em, var, address, dfn {
   right: 0;
   transform: translateY(-65%);
 
+  &.mm-empty-box-inline {
+    transform: none;
+    position: relative;
+    top: initial;
+    left: initial;
+    right: initial;
+  }
+
   .icon {
     font-size: 120px;
   }
@@ -1452,6 +1461,8 @@ progress {
   -webkit-appearance: none;
   appearance: none;
   height: 5px;
+  margin: 15px 0;
+  padding: 0;
 
   &[value]::-webkit-progress-bar {
     background-color: $gray-light;

From 6d1d15cbf9e6d456070fb33f4eaeb51c69407ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2017 15:17:33 +0200
Subject: [PATCH 144/218] MOBILE-2105 core: Fix all centered on page items

---
 www/addons/badges/templates/userbadges.html   |  5 +-
 www/addons/calendar/templates/list.html       |  5 +-
 .../templates/coursecompetencies.html         |  5 +-
 www/addons/competency/templates/planlist.html |  5 +-
 www/addons/files/templates/list.html          |  5 +-
 www/addons/frontpage/templates/frontpage.html |  5 +-
 www/addons/grades/templates/courses.html      |  5 +-
 www/addons/messages/templates/contacts.html   |  8 +--
 www/addons/messages/templates/discussion.html |  5 +-
 .../messages/templates/discussions.html       | 11 +---
 .../mod/assign/templates/submissionlist.html  |  5 +-
 www/addons/mod/folder/templates/index.html    |  5 +-
 .../mod/forum/templates/discussions.html      |  6 +--
 www/addons/mod/glossary/templates/index.html  |  5 +-
 www/addons/mod/wiki/templates/page.html       |  5 +-
 .../myoverview/templates/eventlist.html       |  7 ++-
 www/addons/myoverview/templates/index.html    | 21 +++-----
 www/addons/notes/templates/list.html          |  5 +-
 www/addons/notifications/templates/list.html  |  9 ++--
 www/addons/participants/templates/list.html   |  5 +-
 .../comments/templates/commentviewer.html     |  5 +-
 .../components/course/templates/section.html  |  5 +-
 www/core/components/courses/scss/styles.scss  |  9 ++--
 .../courses/templates/availablecourses.html   |  5 +-
 .../courses/templates/coursecategories.html   |  5 +-
 .../components/courses/templates/list.html    |  6 +--
 .../components/courses/templates/search.html  |  5 +-
 .../sharedfiles/templates/list.html           |  7 +--
 www/core/components/user/templates/about.html |  5 +-
 www/core/directives/emptybox.js               | 50 +++++++++++++++++
 www/core/scss/styles.scss                     | 54 +++++++++++--------
 www/core/templates/emptybox.html              |  9 ++++
 www/core/templates/loading.html               |  8 +--
 33 files changed, 144 insertions(+), 161 deletions(-)
 create mode 100644 www/core/directives/emptybox.js
 create mode 100644 www/core/templates/emptybox.html

diff --git a/www/addons/badges/templates/userbadges.html b/www/addons/badges/templates/userbadges.html
index a604c8c6342..369817cd6b3 100644
--- a/www/addons/badges/templates/userbadges.html
+++ b/www/addons/badges/templates/userbadges.html
@@ -13,10 +13,7 @@ <h2><mm-format-text>{{badge.name}}</mm-format-text></h2>
                         </a>
                     </li>
                 </ul>
-                <div ng-if="badges && badges.length == 0" class="mm-empty-box block">
-                    <i class="icon ion-trophy"></i>
-                    <p>{{ 'mma.badges.nobadges' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="badges && badges.length == 0" icon="ion-trophy" message="{{ 'mma.badges.nobadges' | translate }}"></mm-empty-box>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/calendar/templates/list.html b/www/addons/calendar/templates/list.html
index 6e063799e23..7ec4466f335 100644
--- a/www/addons/calendar/templates/list.html
+++ b/www/addons/calendar/templates/list.html
@@ -19,10 +19,7 @@ <h2><mm-format-text watch="true">{{event.name}}</mm-format-text></h2>
                         </a>
                     </li>
                 </ul>
-                <div ng-if="filtered.length == 0" class="mm-empty-box block">
-                    <i class="icon ion-calendar"></i>
-                    <p>{{ 'mma.calendar.noevents' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="filtered.length == 0" icon="ion-calendar" message="{{ 'mma.calendar.noevents' | translate }}"></mm-empty-box>
 
                 <ion-infinite-scroll ng-if="canLoadMore" on-infinite="loadMoreEvents()" >
                 </ion-infinite-scroll>
diff --git a/www/addons/competency/templates/coursecompetencies.html b/www/addons/competency/templates/coursecompetencies.html
index 161f9bbf20d..2d296c6ca94 100644
--- a/www/addons/competency/templates/coursecompetencies.html
+++ b/www/addons/competency/templates/coursecompetencies.html
@@ -39,10 +39,7 @@ <h3 ng-if="competencies.statistics.competencycount > 0">{{ 'mma.competency.compe
                     <span ng-if="user.profileimageurl === true" class="button button-icon icon ion-person"></span>
                     <mm-format-text>{{ user.fullname }}</mm-format-text>
                 </p>
-                <div ng-if="competencies.statistics.competencycount == 0" class="mm-empty-box block">
-                    <i class="icon ion-ribbon-a"></i>
-                    <p>{{ 'mma.competency.nocompetencies' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="competencies.statistics.competencycount == 0" icon="ion-ribbon-a" message="{{ 'mma.competency.nocompetencies' | translate }}"></mm-empty-box>
 
                 <div class="list card" ng-repeat="competency in competencies.competencies">
                     <a ng-click="gotoCompetency(competency.competency.id)" title="{{competency.competency.shortname}}" class="item item-heading item-text-wrap clearfix">
diff --git a/www/addons/competency/templates/planlist.html b/www/addons/competency/templates/planlist.html
index 53d12d3ba66..cbbe44bae6b 100644
--- a/www/addons/competency/templates/planlist.html
+++ b/www/addons/competency/templates/planlist.html
@@ -12,10 +12,7 @@ <h2>{{plan.name}}</h2>
                         </a>
                     </li>
                 </ul>
-                <div ng-if="plans.length == 0" class="mm-empty-box block">
-                    <i class="icon ion-map"></i>
-                    <p>{{ 'mma.competency.noplanswerecreated' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="plans.length == 0" icon="ion-map" message="{{ 'mma.competency.noplanswerecreated' | translate }}"></mm-empty-box>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/files/templates/list.html b/www/addons/files/templates/list.html
index 4aec5b47306..f2c0ac3365c 100644
--- a/www/addons/files/templates/list.html
+++ b/www/addons/files/templates/list.html
@@ -15,10 +15,7 @@
                     <mm-file ng-if="!file.isdir" file="file" component="{{component}}" component-id="{{file.contextid}}" timemodified="{{file.timemodified}}"></mm-file>
                 </li>
             </ul>
-            <div ng-if="count == 0" class="mm-empty-box block">
-                <i class="icon ion-folder"></i>
-                <p>{{ 'mma.files.emptyfilelist' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="count == 0" icon="ion-folder" message="{{ 'mma.files.emptyfilelist' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/addons/frontpage/templates/frontpage.html b/www/addons/frontpage/templates/frontpage.html
index 349daf09258..7d17fcc88c1 100644
--- a/www/addons/frontpage/templates/frontpage.html
+++ b/www/addons/frontpage/templates/frontpage.html
@@ -23,10 +23,7 @@
                 <mm-course-module class="item item-complex" ng-repeat="module in block.modules" module="module"></mm-course-module>
             </section>
 
-            <div ng-if="!hasContent" class="mm-empty-box block">
-                <i class="icon ion-qr-scanner"></i>
-                <p>{{ 'mm.course.nocontentavailable' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!hasContent" icon="ion-qr-scanner" message="{{ 'mm.course.nocontentavailable' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/addons/grades/templates/courses.html b/www/addons/grades/templates/courses.html
index 6078fa0caa8..cb60bdce402 100644
--- a/www/addons/grades/templates/courses.html
+++ b/www/addons/grades/templates/courses.html
@@ -12,10 +12,7 @@
                         </a>
                     </li>
                 </ul>
-                <div ng-if="grades.length == 0" class="mm-empty-box block">
-                    <i class="icon ion-stats-bars"></i>
-                    <p>{{ 'mma.grades.nogradesreturned' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="grades.length == 0" icon="ion-stats-bars" message="{{ 'mma.grades.nogradesreturned' | translate }}"></mm-empty-box>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/messages/templates/contacts.html b/www/addons/messages/templates/contacts.html
index 1de6c5cfb2c..f2adde0fbb4 100644
--- a/www/addons/messages/templates/contacts.html
+++ b/www/addons/messages/templates/contacts.html
@@ -22,11 +22,7 @@ <h2>{{ 'mma.messages.type_' + contactType | translate }}</h2>
             </li>
         </ul>
 
-        <div ng-if="!hasContacts" class="mm-empty-box block">
-            <i class="icon ion-person-stalker"></i>
-            <p ng-if="!contacts[searchType]">{{ 'mma.messages.contactlistempty' | translate}}</p>
-            <p ng-if="contacts[searchType]">{{ 'mma.messages.nousersfound' | translate}}</p>
-        </div>
-
+        <mm-empty-box ng-if="!hasContacts && !contacts[searchType]" icon="ion-person-stalker" message="{{ 'mma.messages.contactlistempty' | translate}}"></mm-empty-box>
+        <mm-empty-box ng-if="!hasContacts && contacts[searchType]" icon="ion-person-stalker" message="{{ 'mma.messages.nousersfound' | translate}}"></mm-empty-box>
     </mm-loading>
 </ion-content>
diff --git a/www/addons/messages/templates/discussion.html b/www/addons/messages/templates/discussion.html
index aa732a4295f..3779884e3d7 100644
--- a/www/addons/messages/templates/discussion.html
+++ b/www/addons/messages/templates/discussion.html
@@ -38,10 +38,7 @@
                     <div class="clearfix"></div>
                 </ion-list>
 
-                <div ng-if="!messages || messages.length <= 0" class="mm-empty-box block">
-                    <i class="icon ion-chatboxes"></i>
-                    <p>{{ 'mma.messages.nomessages' | translate}}</p>
-                </div>
+                <mm-empty-box ng-if="!messages || messages.length <= 0" icon="ion-chatboxes" message="{{ 'mma.messages.nomessages' | translate}}"></mm-empty-box>
             </section>
         </mm-loading>
     </ion-content>
diff --git a/www/addons/messages/templates/discussions.html b/www/addons/messages/templates/discussions.html
index c8dcd2acbc7..0dfeced2b3c 100644
--- a/www/addons/messages/templates/discussions.html
+++ b/www/addons/messages/templates/discussions.html
@@ -44,14 +44,7 @@ <h2>{{ 'mm.core.searchresults' | translate }}</h2>
             </li>
         </ul>
 
-        <div ng-if="(!discussions || discussions.length <= 0) && !showSearchResults" class="mm-empty-box block">
-            <i class="icon ion-chatboxes"></i>
-            <p>{{ 'mma.messages.nomessages' | translate}}</p>
-        </div>
-
-        <div ng-if="(!results || results.length <= 0) && showSearchResults" class="mm-empty-box block">
-            <i class="icon ion-ios-search-strong"></i>
-            <p>{{ 'mm.core.noresults' | translate}}</p>
-        </div>
+        <mm-empty-box ng-if="(!discussions || discussions.length <= 0) && !showSearchResults" icon="ion-chatboxes" message="{{ 'mma.messages.nomessages' | translate}}"></mm-empty-box>
+        <mm-empty-box ng-if="(!results || results.length <= 0) && showSearchResults" icon="ion-ios-search-strong" message="{{ 'mm.core.noresults' | translate}}"></mm-empty-box>
     </mm-loading>
 </ion-content>
diff --git a/www/addons/mod/assign/templates/submissionlist.html b/www/addons/mod/assign/templates/submissionlist.html
index 990a07e5364..9ed6fec1ab8 100644
--- a/www/addons/mod/assign/templates/submissionlist.html
+++ b/www/addons/mod/assign/templates/submissionlist.html
@@ -24,10 +24,7 @@ <h2 ng-if="!submission.userfullname">{{ 'mma.mod_assign.hiddenuser' | translate
                         <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_assign.notallparticipantsareshown' | translate }}
                     </li>
                 </ul>
-                <div ng-if="!submissions || submissions.length == 0" class="mm-empty-box block">
-                    <i class="icon ion-archive"></i>
-                    <p>{{ 'mma.mod_assign.submissionstatus_' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="!submissions || submissions.length == 0" icon="ion-archive" message="{{ 'mma.mod_assign.submissionstatus_' | translate }}"></mm-empty-box>
             </mm-loading>
         </ion-content>
     </mm-split-view>
diff --git a/www/addons/mod/folder/templates/index.html b/www/addons/mod/folder/templates/index.html
index 3f4a959ca4d..cc85ef52496 100644
--- a/www/addons/mod/folder/templates/index.html
+++ b/www/addons/mod/folder/templates/index.html
@@ -22,10 +22,7 @@
                     </a>
                 </li>
             </ul>
-            <div ng-if="!contents || contents.length == 0" class="mm-empty-box block">
-                <i class="icon ion-folder"></i>
-                <p>{{ 'mma.mod_folder.emptyfilelist' | translate}}</p>
-            </div>
+            <mm-empty-box ng-if="!contents || contents.length == 0" icon="ion-folder" message="{{ 'mma.mod_folder.emptyfilelist' | translate}}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/mod/forum/templates/discussions.html b/www/addons/mod/forum/templates/discussions.html
index 8bc7c25f3c6..014fd1e4d3b 100644
--- a/www/addons/mod/forum/templates/discussions.html
+++ b/www/addons/mod/forum/templates/discussions.html
@@ -83,15 +83,13 @@ <h2>
                         </a>
                     </li>
                 </ul>
-                <div ng-if="forum && count == 0" class="mm-empty-box block">
-                    <i class="icon ion-chatboxes"></i>
-                    <p>{{ 'mma.mod_forum.forumnodiscussionsyet' | translate }}</p>
+                <mm-empty-box ng-if="forum && count == 0" icon="ion-chatboxes" message="{{ 'mma.mod_forum.forumnodiscussionsyet' | translate }}">
                     <div class="padding-top" ng-if="isCreateEnabled && forum.cancreatediscussions">
                         <button class="button button-block" mm-split-view-link="site.mod_forum-newdiscussion({forumid: forum.id, cmid: forum.cmid, cid: courseid})">
                             {{ 'mma.mod_forum.addanewdiscussion' | translate }}
                         </button>
                     </div>
-                </div>
+                </mm-empty-box>
                 <ion-infinite-scroll ng-if="canLoadMore"
                         immediate-check="false"
                         on-infinite="loadMoreDiscussions()" >
diff --git a/www/addons/mod/glossary/templates/index.html b/www/addons/mod/glossary/templates/index.html
index f366fd3cb19..6c6f1c8afa0 100644
--- a/www/addons/mod/glossary/templates/index.html
+++ b/www/addons/mod/glossary/templates/index.html
@@ -51,10 +51,7 @@ <h2>{{getDivider(entries[$index])}}</h2>
                     </div>
                 </div>
 
-                <div ng-if="showNoEntries" class="mm-empty-box block">
-                    <i class="icon ion-ios-list"></i>
-                    <p>{{ 'mma.mod_glossary.noentriesfound' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="showNoEntries" icon="ion-ios-list" message="{{ 'mma.mod_glossary.noentriesfound' | translate }}"></mm-empty-box>
 
                 <ion-infinite-scroll ng-if="canLoadMore" immediate-check="false" on-infinite="loadMoreEntries()"></ion-infinite-scroll>
 
diff --git a/www/addons/mod/wiki/templates/page.html b/www/addons/mod/wiki/templates/page.html
index 46b8bf1c561..49ee0a16219 100644
--- a/www/addons/mod/wiki/templates/page.html
+++ b/www/addons/mod/wiki/templates/page.html
@@ -19,10 +19,7 @@
 
         <article ng-class="{'mma-mod_wiki-noedit': !canEdit}">
             <mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}" ng-if="pageContent">{{ pageContent }}</mm-format-text>
-            <div ng-if="!pageContent" class="mm-empty-box block">
-                <i class="icon ion-document"></i>
-                <p>{{ 'mma.mod_wiki.nocontent' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!pageContent" icon="ion-document" message="{{ 'mma.mod_wiki.nocontent' | translate }}"></mm-empty-box>
         </article>
     </mm-loading>
 </ion-content>
\ No newline at end of file
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index aee4711a6d4..da580bed1e8 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -36,7 +36,6 @@ <h5 ng-if="future.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.future
     <button ng-if="!loadingMore" class="button button-block" ng-click="loadMoreEvents()">{{ 'mm.core.loadmore' | translate }}</button>
     <ion-spinner ng-if="loadingMore"></ion-spinner>
 </div>
-<div ng-if="empty" class="mm-empty-box block" ng-class="{'mm-empty-box-inline': !showCourse}">
-    <img ng-if="showCourse" src="addons/myoverview/img/activities.svg">
-    <p>{{ 'mma.myoverview.noevents' | translate }}</p>
-</div>
\ No newline at end of file
+
+<mm-empty-box ng-if="empty && showCourse" icon="addons/myoverview/img/activities.svg" message="{{ 'mma.myoverview.noevents' | translate }}"></mm-empty-box>
+<mm-empty-box ng-if="empty && !showCourse" message="{{ 'mma.myoverview.noevents' | translate }}"></mm-empty-box>
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index b9f7c82ef56..b5b8ee941a6 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -16,21 +16,18 @@
                     <option value="sortbycourses">{{ 'mma.myoverview.sortbycourses' | translate }}</option>
                 </select>
             </div>
-            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbydates'" class="mm-loading-centered">
+            <mm-loading hide-until="timeline.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbydates'" class="mm-loading-center">
                 <mma-my-overview-event-list events="timeline.events" show-course="true" can-load-more="timeline.canLoadMore" load-more="loadMoreTimeline()"></mma-my-overview-event-list>
             </mm-loading>
-            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'" class="block mm-loading-centered">
+            <mm-loading hide-until="timelineCourses.loaded" ng-show="tabShown == 'timeline' && timeline.sort == 'sortbycourses'" class="block mm-loading-center">
                 <div class="block mm-course-grid">
                     <mm-course-list-progress ng-repeat="course in timelineCourses.courses" course="course" round-progress="true" show-summary="true">
                         <mma-my-overview-event-list events="course.events" can-load-more="course.canLoadMore" load-more="loadMoreCourse(course)"></mma-my-overview-event-list>
                     </mm-course-list-progress>
                 </div>
-                <div ng-if="timelineCourses.courses.length == 0" class="mm-empty-box block">
-                    <img src="addons/myoverview/img/courses.svg">
-                    <p>{{ 'mma.myoverview.nocourses' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="timelineCourses.courses.length == 0" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocourses' | translate }}"></mm-empty-box>
             </mm-loading>
-            <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'" class="mm-loading-centered">
+            <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'" class="mm-loading-center">
                 <div class="row row-no-padding">
                     <div class="col-10 text-left">
                         <a ng-if="courses[courses.selected] && courses[courses.selected].length > 5" ng-class="{'ion-funnel': !showFilter, 'ion-close-round': showFilter}" class="button button-dark button-icon icon" ng-click="switchFilter()"></a>
@@ -57,12 +54,10 @@
                 <div ng-class="{'mm-course-grid': showGrid}">
                     <mm-course-list-progress ng-repeat="course in courses[courses.selected] | filter:{fullname: courses.filter}" course="course" round-progress="showGrid" show-summary="showGrid"></mm-course-list-progress>
                 </div>
-                <div ng-if="courses[courses.selected].length == 0" class="mm-empty-box">
-                    <img src="addons/myoverview/img/courses.svg">
-                    <p ng-if="courses.selected == 'inprogress'">{{ 'mma.myoverview.nocoursesinprogress' | translate }}</p>
-                    <p ng-if="courses.selected == 'future'">{{ 'mma.myoverview.nocoursesfuture' | translate }}</p>
-                    <p ng-if="courses.selected == 'past'">{{ 'mma.myoverview.nocoursespast' | translate }}</p>
-                </div>
+
+                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'inprogress'" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursesinprogress' | translate }}"></mm-empty-box>
+                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'future'" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursesfuture' | translate }}"></mm-empty-box>
+                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'past'" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursespast' | translate }}"></mm-empty-box>
             </mm-loading>
         </div>
     </ion-content>
diff --git a/www/addons/notes/templates/list.html b/www/addons/notes/templates/list.html
index 5db33a7f75c..2bdffc80e58 100644
--- a/www/addons/notes/templates/list.html
+++ b/www/addons/notes/templates/list.html
@@ -30,10 +30,7 @@
                     </div>
                 </article>
             </div>
-            <div ng-if="notes.length == 0" class="mm-empty-box block">
-                <i class="icon ion-ios-list"></i>
-                <p>{{ 'mma.notes.nonotes' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="notes.length == 0" icon="ion-ios-list" message="{{ 'mma.notes.nonotes' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/notifications/templates/list.html b/www/addons/notifications/templates/list.html
index fc9ba0ae18e..fb79317440e 100644
--- a/www/addons/notifications/templates/list.html
+++ b/www/addons/notifications/templates/list.html
@@ -1,5 +1,5 @@
 <ion-view view-title="{{ 'mma.notifications.notifications' | translate }}">
-    <ion-content padding="true" mm-state-class>
+    <ion-content padding="{{notifications.length > 0}}" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="notificationsLoaded" on-refresh="refreshNotifications()">
         </ion-refresher>
         <mm-loading hide-until="notificationsLoaded">
@@ -17,15 +17,12 @@ <h2>{{notification.userfromfullname}}</h2>
                 <mma-notifications-actions contexturl="notification.contexturl" courseid="notification.courseid"></mma-notifications-actions>
             </article>
 
+            <mm-empty-box ng-if="!notifications || notifications.length <= 0" icon="ion-ios-bell" message="{{ 'mma.notifications.therearentnotificationsyet' | translate }}"></mm-empty-box>
+
             <ion-infinite-scroll ng-if="canLoadMore"
                     immediate-check="false"
                     on-infinite="loadMoreNotifications()" >
             </ion-infinite-scroll>
-
-            <div ng-if="!notifications || notifications.length <= 0" class="mm-empty-box block">
-                <i class="icon ion-ios-bell"></i>
-                <p>{{ 'mma.notifications.therearentnotificationsyet' | translate }}</p>
-            </div>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/addons/participants/templates/list.html b/www/addons/participants/templates/list.html
index f72dbc72a07..f1c04efbf5b 100644
--- a/www/addons/participants/templates/list.html
+++ b/www/addons/participants/templates/list.html
@@ -13,10 +13,7 @@
                     </li>
                 </ul>
 
-                <div ng-if="participants && participants.length == 0" class="mm-empty-box block">
-                    <i class="icon ion-person-stalker"></i>
-                    <p>{{ 'mma.participants.noparticipants' | translate }}</p>
-                </div>
+                <mm-empty-box ng-if="participants && participants.length == 0" icon="ion-person-stalker" message="{{ 'mma.participants.noparticipants' | translate }}"></mm-empty-box>
 
                 <ion-infinite-scroll ng-if="canLoadMore"
                         immediate-check="false"
diff --git a/www/core/components/comments/templates/commentviewer.html b/www/core/components/comments/templates/commentviewer.html
index a96f6a3a91d..61f3eb85e2b 100644
--- a/www/core/components/comments/templates/commentviewer.html
+++ b/www/core/components/comments/templates/commentviewer.html
@@ -13,10 +13,7 @@ <h2>{{ comment.fullname }}</h2>
                     <mm-format-text watch="true" clean="true">{{comment.content}}</mm-format-text>
                 </div>
             </div>
-            <div ng-if="!comments || !comments.length" class="mm-empty-box block">
-                <i class="icon ion-chatbubble-working"></i>
-                <p>{{ 'mm.core.nocomments' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!comments || !comments.length" icon="ion-chatbubble-working" message="{{ 'mm.core.nocomments' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/course/templates/section.html b/www/core/components/course/templates/section.html
index 156e7cbcf04..fb5baee0897 100644
--- a/www/core/components/course/templates/section.html
+++ b/www/core/components/course/templates/section.html
@@ -29,10 +29,7 @@ <h2><mm-format-text watch="true">{{ section.name }}</mm-format-text></h2>
                     {{ 'mm.course.nocontentavailable' | translate }}
                 </div>
             </section>
-            <div ng-if="!hasContent" class="mm-empty-box block">
-                <i class="icon ion-qr-scanner"></i>
-                <p>{{ 'mm.course.nocontentavailable' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!hasContent" icon="ion-qr-scanner" message="{{ 'mm.course.nocontentavailable' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index a0c4da75dbd..1ac0d602575 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -45,13 +45,12 @@ $doughnut-text-colour: $gray-dark;
     border: $doughnut-border-size solid $doughnut-empty-colour;
     border-radius: 50%;
     box-sizing: border-box;
+    display: table;
 
     .progress-text {
-      position: absolute;
-      top: 50%;
-      /*rtl:ignore*/
-      left: 50%;
-      transform: translate(-50%, -50%);
+      display: table-cell;
+      text-align: center;
+      vertical-align: middle;
       color: $doughnut-text-colour;
     }
 
diff --git a/www/core/components/courses/templates/availablecourses.html b/www/core/components/courses/templates/availablecourses.html
index e262b41e6cc..53c7705959d 100644
--- a/www/core/components/courses/templates/availablecourses.html
+++ b/www/core/components/courses/templates/availablecourses.html
@@ -6,10 +6,7 @@
             <div ng-if="courses.length > 0">
                 <mm-course-list-item ng-repeat="course in courses track by course.id" course="course"></mm-course-list-item>
             </div>
-            <div ng-if="!courses.length" class="mm-empty-box block">
-                <i class="icon ion-ionic"></i>
-                <p>{{ 'mm.courses.nocourses' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!courses.length" icon="ion-ionic" message="{{ 'mm.courses.nocourses' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/courses/templates/coursecategories.html b/www/core/components/courses/templates/coursecategories.html
index c9dff8a4a3f..ebbe272f4d6 100644
--- a/www/core/components/courses/templates/coursecategories.html
+++ b/www/core/components/courses/templates/coursecategories.html
@@ -28,10 +28,7 @@ <h2><mm-format-text watch="true">{{category.name}}</mm-format-text></h2>
                 <p class="item item-divider">{{ 'mm.courses.courses' | translate }}</p>
                 <mm-course-list-item ng-repeat="course in courses" course="course"></mm-course-list-item>
             </div>
-            <div ng-if="!categories.length && !courses.length" class="mm-empty-box block">
-                <i class="icon ion-ionic"></i>
-                <p>{{ 'mm.courses.nocoursesyet' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!categories.length && !courses.length" icon="ion-ionic" message="{{ 'mm.courses.nocoursesyet' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/courses/templates/list.html b/www/core/components/courses/templates/list.html
index 91b151ab137..79023787c65 100644
--- a/www/core/components/courses/templates/list.html
+++ b/www/core/components/courses/templates/list.html
@@ -14,11 +14,9 @@
                 </ion-input>
             </div>
             <mm-course-list-progress ng-repeat="course in courses | filter:{fullname: filter.filterText}" course="course" show-summary="true"></mm-course-list-progress>
-            <div ng-if="!courses || !courses.length" class="mm-empty-box block">
-                <i class="icon ion-ionic"></i>
-                <p>{{ 'mm.courses.nocourses' | translate }}</p>
+            <mm-empty-box ng-if="!courses || !courses.length" icon="ion-ionic" message="{{ 'mm.courses.nocourses' | translate }}">
                 <p ng-if="searchEnabled">{{ 'mm.courses.searchcoursesadvice' | translate }}</p>
-            </div>
+            </mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/courses/templates/search.html b/www/core/components/courses/templates/search.html
index 5bf0116d3cd..1d0cfe1006b 100644
--- a/www/core/components/courses/templates/search.html
+++ b/www/core/components/courses/templates/search.html
@@ -3,10 +3,7 @@
         <mm-searchbox submit-action="search" placeholder="{{ 'mm.courses.search' | translate }}" initial-value="{{searchText}}" search-label="{{ 'mm.courses.search' | translate}}" autofocus="true"></mm-searchbox>
         <div ng-if="courses">
             <p class="item item-divider">{{ 'mm.courses.totalcoursesearchresults' | translate:{$a: total} }}</p>
-            <div ng-if="total == 0" class="mm-empty-box block">
-                <i class="icon ion-ios-search-strong"></i>
-                <p>{{ 'mm.courses.nosearchresults' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="total == 0" icon="ion-ios-search-strong" message="{{ 'mm.courses.nosearchresults' | translate }}"></mm-empty-box>
             <mm-course-list-item ng-repeat="course in courses track by course.id" course="course"></mm-course-list-item>
             <ion-infinite-scroll ng-if="canLoadMore" immediate-check="false" on-infinite="loadMoreResults()">
             </ion-infinite-scroll>
diff --git a/www/core/components/sharedfiles/templates/list.html b/www/core/components/sharedfiles/templates/list.html
index c890613d14e..e61bc8849d7 100644
--- a/www/core/components/sharedfiles/templates/list.html
+++ b/www/core/components/sharedfiles/templates/list.html
@@ -14,11 +14,8 @@
                     </a>
                 </li>
             </ul>
-            <div ng-if="files && !files.length" class="mm-empty-box block">
-                <i class="icon ion-folder"></i>
-                <p ng-if="manage">{{ 'mm.sharedfiles.nosharedfiles' | translate }}</p>
-                <p ng-if="!manage">{{ 'mm.sharedfiles.nosharedfilestoupload' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="files && !files.length && manage" icon="ion-folder" message="{{ 'mm.sharedfiles.nosharedfiles' | translate }}"></mm-empty-box>
+            <mm-empty-box ng-if="files && !files.length && !manage" icon="ion-folder" message="{{ 'mm.sharedfiles.nosharedfilestoupload' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/user/templates/about.html b/www/core/components/user/templates/about.html
index b94162f9c15..141cb2aa667 100644
--- a/www/core/components/user/templates/about.html
+++ b/www/core/components/user/templates/about.html
@@ -87,10 +87,7 @@ <h2>{{ 'mm.user.description' | translate}}</h2>
                 </div>
             </div>
 
-            <div ng-if="!user || !hasContact || !hasDetails || !user.description" class="mm-empty-box block">
-                <i class="icon ion-person"></i>
-                <p>{{ 'mm.user.detailsnotavailable' | translate }}</p>
-            </div>
+            <mm-empty-box ng-if="!user || !hasContact || !hasDetails || !user.description" icon="ion-person" message="{{ 'mm.user.detailsnotavailable' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/directives/emptybox.js b/www/core/directives/emptybox.js
new file mode 100644
index 00000000000..5259b407b24
--- /dev/null
+++ b/www/core/directives/emptybox.js
@@ -0,0 +1,50 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.core')
+
+/**
+ * Directive to show an empty box message.
+ *
+ * @module mm.core
+ * @ngdoc directive
+ * @name mmEmptyBox
+ * @description
+ * Usage:
+ * <mm-empty-box ng-if="empty" icon="ion-ios-bell" message="{{ 'mma.notifications.therearentnotificationsyet' | translate }}"/>
+ *
+ * This directive will show an optional icon or image and a text centered on page.
+ *
+ * @param {String} message       Static message to show on the page.
+ * @param {String} [icon]        Ion Icon or image source.
+ */
+.directive('mmEmptyBox', function($translate) {
+
+    return {
+        restrict: 'E',
+        templateUrl: 'core/templates/emptybox.html',
+        transclude: true,
+        scope: {
+            message: '@',
+            icon: '@?'
+        },
+        link: function(scope) {
+            console.log(scope.icon);
+            if (scope.icon && !scope.icon.startsWith('ion')) {
+                scope.image = scope.icon;
+                scope.icon = false;
+            }
+        }
+    };
+});
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 4abb27568c5..32af4b08c0b 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -350,6 +350,7 @@ p.item-text-wrap {
   width: 100%;
   height: 100%;
   position: relative;
+  margin-right: 2px;
 }
 
 .mm-split-pane-content {
@@ -445,12 +446,21 @@ button.item.item-button-right {
 
 .scroll > .padding > mm-loading > .mm-loading-container,
 .scroll > mm-loading > .mm-loading-container,
-.mm-loading-centered .mm-loading-container {
+.mm-loading-center .mm-loading-container {
   position: absolute;
-  top: 50%;
+  top: 0;
+  bottom: 0;
   left: 0;
   right: 0;
-  transform: translateY(-50%);
+  height: 100%;
+  display: table;
+  z-index: -1;
+
+  .mm-loading-spinner {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+  }
 }
 
 .mm-loading-content {
@@ -461,19 +471,6 @@ mm-loading.mm-loading-noheight .mm-loading-content {
   height: auto;
 }
 
-mm-loading.mm-loading-center {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  display: inline-block;
-
-  .mm-loading-container {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-  }
-}
-
 // Align ion-spinner right
 .spinner-right {
   position: absolute;
@@ -1425,21 +1422,34 @@ i, cite, em, var, address, dfn {
 
 
 .mm-empty-box {
-  padding: $item-padding;
-  text-align: center;
-  color: $dark;
   position: absolute;
-  top: 50%;
+  top: 0;
+  bottom: 0;
   left: 0;
   right: 0;
-  transform: translateY(-65%);
+  display: table;
+  height: 100%;
+  width: 100%;
+  z-index: -1;
+  margin: 0;
+  padding: 0;
+  clear: both;
+
+  .mm-empty-box-content {
+    color: $dark;
+    margin: 0;
+    padding: $item-padding;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+  }
 
   &.mm-empty-box-inline {
-    transform: none;
     position: relative;
     top: initial;
     left: initial;
     right: initial;
+    z-index: initial;
   }
 
   .icon {
diff --git a/www/core/templates/emptybox.html b/www/core/templates/emptybox.html
new file mode 100644
index 00000000000..d196cbb5af9
--- /dev/null
+++ b/www/core/templates/emptybox.html
@@ -0,0 +1,9 @@
+<div class="mm-empty-box" ng-class="{'mm-empty-box-inline': !image && !icon}">
+    <div class="mm-empty-box-content">
+        <img ng-if="image" ng-src="{{image}}" role="presentation">
+        <i ng-if="icon" class="icon {{icon}}"></i>
+        <p ng-if="message">{{ message }}</p>
+        <div ng-transclude>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/www/core/templates/loading.html b/www/core/templates/loading.html
index bb6a1a61e40..17fd3a345fe 100644
--- a/www/core/templates/loading.html
+++ b/www/core/templates/loading.html
@@ -1,7 +1,9 @@
 <div class="mm-loading-container" ng-if="!hideUntil">
-    <ion-spinner></ion-spinner>
-    <p class="mm-loading-message" ng-if="dynMessage">{{dynMessage}}</p>
-    <p class="mm-loading-message" ng-if="message && !dynMessage">{{message}}</p>
+    <span class="mm-loading-spinner">
+        <ion-spinner></ion-spinner>
+        <p class="mm-loading-message" ng-if="dynMessage">{{dynMessage}}</p>
+        <p class="mm-loading-message" ng-if="message && !dynMessage">{{message}}</p>
+    </span>
 </div>
 <div class="mm-loading-content" ng-if="hideUntil" ng-transclude>
 </div>
\ No newline at end of file

From e19c22069d2825f1bcd9184a667b303c6214ce93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 10 May 2017 12:57:17 +0200
Subject: [PATCH 145/218] MOBILE-2105 login: Improve init page

---
 www/core/components/login/templates/init.html |   1 +
 www/core/scss/styles.scss                     |  45 ++++++++++--------
 www/img/moodle_white.png                      | Bin 0 -> 18080 bytes
 3 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 www/img/moodle_white.png

diff --git a/www/core/components/login/templates/init.html b/www/core/components/login/templates/init.html
index c5d0afb79b7..eea30ac01a2 100644
--- a/www/core/components/login/templates/init.html
+++ b/www/core/components/login/templates/init.html
@@ -1,6 +1,7 @@
 <ion-view hide-nav-bar="true">
     <div class="mm-bglogo">
         <div class="mm-logo">
+            <img src="img/moodle_white.png"/>
             <ion-spinner></ion-spinner>
         </div>
     </div>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 32af4b08c0b..86c68299fcb 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -60,32 +60,39 @@ $item-input-padding: 16px !default;
  * App Branding
  */
 .mm-bglogo {
-  background-color: white; /* Change this to add a bg image or change color */
+  background-color: #ff5c00; /* Change this to add a bg image or change color */
+  background: -webkit-radial-gradient(#ff7600, #ff5c00);
+  background: radial-gradient(#ff7600, #ff5c00);
   background-repeat: no-repeat;
   background-position: center center;
-  width: 100%;
   position: absolute;
   top: 0;
   bottom: 0;
-}
-
-.mm-logo {
-  background-image: url('../img/moodle.png'); /* Change logo here */
-  background-repeat: no-repeat;
-  background-position: center center;
+  left: 0;
+  right: 0;
+  height: 100%;
   width: 100%;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  text-align: center;
-}
+  display: table;
 
-.mm-logo:before {
-  content: '';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle;
-  margin-top: 120px; /* Change this to place spinner under the logo (usually double of the logo size) */
+  .mm-logo {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+  }
+
+  img {
+    width: 60%;
+    max-width: 300px;
+    display: block;
+    margin: 0 auto;
+    margin-bottom: 30px;
+  }
+
+  .spinner {
+    color: white;
+    stroke: white;
+    fill: white;
+  }
 }
 
 /**
diff --git a/www/img/moodle_white.png b/www/img/moodle_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..280aa87f0e2c2540998139de37315ea7fb7c9da1
GIT binary patch
literal 18080
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
Z{{zQ%*N*p}dItai002ovPDHLkV1kT1LU;fG

literal 0
HcmV?d00001


From 5ef44170248ed653813722327f6aac0a1bc35b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 11 May 2017 11:17:17 +0200
Subject: [PATCH 146/218] MOBILE-2105 core: Apply new palette

---
 scss/app.scss                                 | 138 +++++++-----------
 www/addons/frontpage/scss/styles.scss         |   4 +
 www/addons/messages/scss/styles.scss          |   2 +
 www/addons/mod/assign/scss/style.scss         |  29 ++--
 www/addons/mod/choice/templates/index.html    |   2 +-
 www/addons/mod/quiz/scss/styles.scss          |  17 ++-
 www/addons/mod/quiz/templates/index.html      |  12 +-
 www/addons/mod/scorm/scss/styles.scss         |   2 +-
 www/addons/mod/scorm/templates/index.html     |   2 +-
 www/addons/mod/wiki/scss/styles.scss          |   4 +-
 .../myoverview/templates/eventlist.html       |   2 +-
 www/addons/myoverview/templates/index.html    |   8 +-
 .../qbehaviour/deferredcbm/scss/styles.scss   |   6 +-
 .../qtype/ddimageortext/scss/styles.scss      |  14 +-
 www/addons/qtype/ddmarker/scss/styles.scss    |  12 +-
 www/addons/qtype/ddwtos/scss/styles.scss      |  18 +--
 www/addons/qtype/gapselect/scss/styles.scss   |   3 +-
 www/core/components/courses/scss/styles.scss  |  11 +-
 www/core/components/login/scss/styles.scss    |   2 +-
 .../components/login/templates/reconnect.html |   2 +-
 www/core/components/login/templates/site.html |   4 +-
 www/core/components/question/scss/styles.scss |  16 +-
 .../settings/templates/space-usage.html       |   2 +-
 www/core/directives/emptybox.js               |  12 +-
 www/core/scss/formattext.scss                 |  11 +-
 www/core/scss/styles.scss                     |  61 ++++----
 26 files changed, 191 insertions(+), 205 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 1367b867627..3508481e093 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -6,67 +6,71 @@
 
 // Color palette
 $black:           #3a3a3a; // Headings, standard text.
-$gray-dark:       #626262; // Text (emphasis-detail), placeholder, background.
-$gray-medium:     #9e9e9e; // Borders (never text).
+$gray-darker:     #626262; // Text (emphasis-detail), placeholder, background.
+$gray-dark:       #9e9e9e; // Borders (never text).
+$gray:            #dddddd;
 $gray-light:      #eeeeee; // Background.
 $gray-lighter:    #f5f5f5;
 $white:           #ffffff; // Background, reversed text.
 
 $blue:            #0064d2; // Link, background.
-$blue-light:      lighten($blue, 10%);
+$blue-light:      mix($blue, white, 20%); // Background.
 $blue-dark:       darken($blue, 10%);
-$blue-lighter:    #eaf4ff; // Background.
-$blue-darker:     mix($blue, black, 20%);
 
-$turquoise:           #007982; // Accent.
-$turquoise-light:     #edfafb; // Background.
-$turquoise-dark:      darken($turquoise, 10%);
-$turquoise-lighter:   mix($turquoise, white, 20%);
-$turquoise-darker:    mix($turquoise, black, 20%);
+$turquoise:       #007982; // Accent.
+$turquoise-light: mix($turquoise, white, 20%); // Background.
+$turquoise-dark:  darken($turquoise, 10%);
 
-$green:           #739500; // Accent.
-$green-light:     lighten($green, 10%);
+$green:           #5e8100; // Accent.
+$green-light:     mix($green, white, 20%);
 $green-dark:      darken($green, 10%);
-$green-lighter:   mix($green, white, 20%);
-$green-darker:    mix($green, black, 20%);
 
-$red:             #a22b38;
-$red-light:       lighten($red, 10%);
+$red:             #cb3d4d;
+$red-light:       mix($red, white, 20%);
 $red-dark:        darken($red, 10%);
-$red-lighter:     mix($red, white, 20%);
-$red-darker:      mix($red, black, 20%);
 
-$orange:          #e07627; // Accent (never text).
+$orange:          #f98012; // Accent (never text).
 $orange-light:    lighten($orange, 10%);
-$orange-dark:     darken($orange, 10%);
-$orange-lighter:  mix($orange, white, 20%);
-$orange-darker:   mix($orange, black, 20%);
 
 $yellow:          #fbad1a; // Accent (never text).
-$yellow-light:    lighten($yellow, 10%);
-$yellow-dark:     darken($yellow, 10%);
-$yellow-lighter:  mix($yellow, white, 20%);
-$yellow-darker:   mix($yellow, black, 40%);
+$yellow-light:    mix($yellow, white, 20%);
+$yellow-dark:     mix($yellow, black, 40%);
 
 // Change Ionic default colors.
 $dark: $black !default;
 $positive: $blue !default;
 $balanced: $green !default;
-$assertive: $red-light !default;
+$assertive: $red !default;
 $energized: $yellow !default;
 $stable: $gray-lighter !default;
+$royal: $orange !default;
+$calm: $turquoise !default;
 
 $mm-color:          $orange;
 $mm-color-light:    lighten($mm-color, 10%);
 $mm-color-dark:     darken($mm-color, 10%);
-$mm-color-lighter:  mix($mm-color, white, 20%);
-$mm-color-darker:   mix($mm-color, black, 20%);
 
 $mm-buttons-color: $positive;
 
-$base-background-color: $gray-light;
-$item-default-bg: white;
-$item-divider-bg: #f1f1f1;
+// Change Ionic default elements colors.
+$base-color: $black !default;
+$base-background-color: $gray-light !default;
+
+// Header.
+$bar-content-bg: $mm-color !default;
+$bar-content-border: transparent !default;
+$bar-content-text: $white !default;
+
+$item-default-bg: $white;
+$item-divider-bg: $gray-lighter;
+$item-disabled-color: $gray-dark !default;
+
+$button-light-border: $gray;
+
+$toggle-on-default-bg: $blue;
+
+$tabs-off-opacity:                0.6;
+$tabs-striped-off-opacity:        $tabs-off-opacity;
 
 // Setting the default button to button-outline.
 $button-default-bg: $white !default;
@@ -75,68 +79,36 @@ $button-default-border: $mm-buttons-color !default;
 $button-default-active-bg: $mm-buttons-color !default;
 $button-default-active-border: $mm-buttons-color !default;
 
-$tabs-off-opacity:                0.6;
-$tabs-striped-off-opacity:        $tabs-off-opacity;
-
 // The path to the font icons.
 $ionicons-font-path: "../lib/ionic/release/fonts" !default;
 
 // Include all of Ionic.
 @import "www/lib/ionic/scss/ionic";
 
-// Tmp fix until Ionic adds !default to $button-default-border and $button-default-active-border.
-$button-default-bg: $white;
-$button-default-text: $mm-buttons-color;
-$button-default-border: $mm-buttons-color;
-$button-default-active-bg: $mm-buttons-color;
-$button-default-active-border: $mm-buttons-color;
-
-// Setting the default button to button-outline.
-.button.active, .button.activated {
-  background-color: $button-default-active-bg;
-  box-shadow: none;
-  color: $button-default-bg;
-}
-
-.button, .button.button-light, .button.button-stable, .button.button-positive, .button.button-calm, .button.button-assertive,
-.button.button-balanced, .button.button-energized, .button.button-royal {
-  border-color: $button-default-border;
-
-  &.activated, &.active  {
-    border-color: $button-default-active-border;
+// Setting the default button to button-outline positive.
+.button {
+  &.button-light,
+  &.button-stable,
+  &.button-calm,
+  &.button-assertive,
+  &.button-balanced,
+  &.button-energized,
+  &.button-royal {
+    @include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $button-default-text);
+    @include button-clear($button-default-border);
+    @include button-outline($button-default-border);
   }
-}
 
-.button.button-light, .button.button-stable, .button.button-calm, .button.button-assertive, .button.button-balanced,
-.button.button-energized, .button.button-royal {
-  color: $button-default-text;
-}
+  &.button-dark {
+    @include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $button-default-text);
+    @include button-clear($button-dark-bg);
+    @include button-outline($button-default-border);
 
-.button-clear, .button.button-clear {
-  color: $button-default-text;
-
-  &.activated, &.active  {
-    background: none;
+    &.button-icon {
+      color: $dark;
+    }
   }
 }
 
-.button-outline, .button.button-outline {
-  border-color: $button-default-border;
-
-  &.activated, &.active  {
-    background-color: $button-default-active-bg;
-  }
-}
-
-.button.button-icon, .button-icon {
-  border-color: transparent;
-  color: $mm-buttons-color;
-  background-color: transparent;
-}
-
-.button.button-icon.button-dark, .button-icon.button-dark {
-  color: $gray-dark;
-}
-
 // Include all of Moodle Mobile.
 @import "www/build/mm.bundle.scss";
diff --git a/www/addons/frontpage/scss/styles.scss b/www/addons/frontpage/scss/styles.scss
index c7982b35c00..4929bfb6a1c 100644
--- a/www/addons/frontpage/scss/styles.scss
+++ b/www/addons/frontpage/scss/styles.scss
@@ -9,6 +9,10 @@
         }
     }
 
+    .mma-frontpage-item-container {
+        color: $black;
+    }
+
     .mm-frontpageitemnews {
         img {
             max-width: 30px;
diff --git a/www/addons/messages/scss/styles.scss b/www/addons/messages/scss/styles.scss
index e026151f7db..31d00fd5f3d 100644
--- a/www/addons/messages/scss/styles.scss
+++ b/www/addons/messages/scss/styles.scss
@@ -52,6 +52,8 @@ $mma-messages-date-badge: "stable" !default;
   width: 100%;
 }
 .mm-site_messages-discussion {
+  background: $white;
+
   .list-left-editing .item-message.item-left-editable,
   .item-left-editing.item-message.item-left-editable {
     max-width: calc(80% + 35px);
diff --git a/www/addons/mod/assign/scss/style.scss b/www/addons/mod/assign/scss/style.scss
index 50175a6eeb5..3a3b2ca5344 100644
--- a/www/addons/mod/assign/scss/style.scss
+++ b/www/addons/mod/assign/scss/style.scss
@@ -1,5 +1,5 @@
 
-$mma-mod-assign-warning-color:      #c00 !default;
+$mma-mod-assign-warning-color: $red !default;
 
 .mm-site_mod_assign,
 .mm-site_mod_assign-submission {
@@ -13,8 +13,8 @@ $mma-mod-assign-warning-color:      #c00 !default;
     @extend .mm-success-item;
   }
 
-  div.submissioneditable {
-    color: red;
+  div.submissioneditable p {
+    color: $red;
   }
 }
 
@@ -32,11 +32,11 @@ p.mma-mod-assign-warning {
   padding-bottom: 1.5em;
 
   .criterion {
-    border: 1px solid #DDD;
+    border: 1px solid $item-default-border;
     overflow: hidden;
 
     &.even {
-      background: #F0F0F0;
+      background: $gray-lighter;
     }
 
     .description,
@@ -70,7 +70,7 @@ p.mma-mod-assign-warning {
     }
 
     .levels .level {
-      border-left: 1px solid #DDD;
+      border-left: 1px solid $item-default-border;
       max-width: 150px;
     }
 
@@ -79,12 +79,12 @@ p.mma-mod-assign-warning {
     }
 
     .levels .level.last {
-      border-right: 1px solid #DDD;
+      border-right: 1px solid $item-default-border;
     }
 
     .levels .level .score {
       font-style: italic;
-      color: #575;
+      color: $green-dark;
       font-weight: bold;
       margin-top: 5px;
       white-space: nowrap;
@@ -99,7 +99,7 @@ p.mma-mod-assign-warning {
     }
 
     .levels .level.checked {
-      background: #d0ffd0;
+      background: $green-light;
     }
 
     .description.error,
@@ -109,7 +109,7 @@ p.mma-mod-assign-warning {
     }
 
     .levels.error {
-      border: 1px solid red;
+      border: 1px solid $red;
     }
   }
 
@@ -136,13 +136,14 @@ p.mma-mod-assign-warning {
 
   .criteria {
     height:100%;
+    background: $white;
   }
 }
 
 .gradingform_rubric-regrade {
   padding: 10px;
   background: #FFDDDD;
-  border: 1px solid #F00;
+  border: 1px solid $red;
   margin-bottom: 10px;
 }
 .gradingform_rubric-restored {
@@ -152,7 +153,7 @@ p.mma-mod-assign-warning {
   margin-bottom: 10px;
 }
 .gradingform_rubric-error {
-  color: red;
+  color: $red;
   font-weight: bold;
 }
 
@@ -171,7 +172,7 @@ p.mma-mod-assign-warning {
   }
 
   .criterion {
-    border: 1px solid #DDD;
+    border: 1px solid $item-default-border;
     overflow: hidden;
 
     .description,
@@ -180,7 +181,7 @@ p.mma-mod-assign-warning {
     }
 
     &.even {
-      background: #F0F0F0;
+      background: $gray-lighter;
     }
 
     .description {
diff --git a/www/addons/mod/choice/templates/index.html b/www/addons/mod/choice/templates/index.html
index aeb84f1bd0e..4b73bd293b6 100644
--- a/www/addons/mod/choice/templates/index.html
+++ b/www/addons/mod/choice/templates/index.html
@@ -45,7 +45,7 @@
                     </ion-radio>
                 </div>
                 <div class="item" ng-if="canEdit">
-                    <button class="button button-block" ng-click="save()" ng-disabled="(!choice.allowmultiple && selectedOption.id == -1) || (choice.allowmultiple && (options | filter:{checked: true}).length == 0)">{{ 'mma.mod_choice.savemychoice' | translate }}</button>
+                    <button class="button button-block button-positive" ng-click="save()" ng-disabled="(!choice.allowmultiple && selectedOption.id == -1) || (choice.allowmultiple && (options | filter:{checked: true}).length == 0)">{{ 'mma.mod_choice.savemychoice' | translate }}</button>
                 </div>
                 <div class="item" ng-if="canDelete">
                     <button class="button button-block" ng-click="delete()">{{ 'mma.mod_choice.removemychoice' | translate }}</button>
diff --git a/www/addons/mod/quiz/scss/styles.scss b/www/addons/mod/quiz/scss/styles.scss
index 792acc0bdee..f7381465017 100644
--- a/www/addons/mod/quiz/scss/styles.scss
+++ b/www/addons/mod/quiz/scss/styles.scss
@@ -1,9 +1,10 @@
 
 $mma-mod-quiz-warning-color:      $red !default;
-$mma-mod-quiz-highlight-color:    $blue-lighter !default;
-$mma-mod-quiz-alternate-color:    #fbfbfb !default;
-$mma-mod-quiz-conecterr-color:    $red-lighter !default;
-$mma-mod-quiz-selected-color:     $blue-lighter !default;
+$mma-mod-quiz-highlight-bgcolor:  $blue-light !default;
+$mma-mod-quiz-highlight-color:    $blue-dark !default;
+$mma-mod-quiz-alternate-color:    $gray-lighter !default;
+$mma-mod-quiz-conecterr-color:    $red-light !default;
+$mma-mod-quiz-selected-color:     $blue-light !default;
 
 // Deprecated use mm-error-item instead.
 p.mma-mod-quiz-warning {
@@ -23,8 +24,10 @@ p.mma-mod-quiz-warning {
 .item.mma-mod-quiz-highlighted,
 .platform-android .item.mma-mod-quiz-highlighted,
 .platform-ios .item.mma-mod-quiz-highlighted,
-.mma-mod-quiz-table .item.row.mma-mod-quiz-highlighted {
-  background-color: $mma-mod-quiz-highlight-color;
+.mma-mod-quiz-table .item.row.mma-mod-quiz-highlighted,
+.item.mma-mod-quiz-highlighted p {
+  background-color: $mma-mod-quiz-highlight-bgcolor;
+  color: $mma-mod-quiz-highlight-color;
 }
 
 .mma-quiz-textarea {
@@ -71,5 +74,5 @@ p.mma-mod-quiz-warning {
 }
 
 #mma-mod-quiz-toc .item {
-  border-color: $gray-medium;
+  border-color: $gray-dark;
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/templates/index.html b/www/addons/mod/quiz/templates/index.html
index 23bad655f3d..beafeb30b6c 100644
--- a/www/addons/mod/quiz/templates/index.html
+++ b/www/addons/mod/quiz/templates/index.html
@@ -36,16 +36,16 @@
                     <h2>{{ 'mma.mod_quiz.summaryofattempts' | translate }}</h2>
                 </div>
                 <div class="item item-text-wrap row row-center">
-                    <p class="col text-center col-10" ng-if="quiz.showAttemptColumn"><b>{{ 'mma.mod_quiz.attemptnumber' | translate }}</b></p>
-                    <p class="col"><b>{{ 'mma.mod_quiz.attemptstate' | translate }}</b></p>
+                    <p class="col text-center" ng-if="quiz.showAttemptColumn"><b>{{ 'mma.mod_quiz.attemptnumber' | translate }}</b></p>
+                    <p class="col col-65"><b>{{ 'mma.mod_quiz.attemptstate' | translate }}</b></p>
                     <p class="col text-center hidden-phone" ng-if="quiz.showMarkColumn"><b>{{ 'mma.mod_quiz.marks' | translate }} / {{ quiz.sumGradesFormatted }}</b></p>
                     <p class="col text-center" ng-if="quiz.showGradeColumn"><b>{{ 'mma.mod_quiz.grade' | translate }} / {{ quiz.gradeFormatted }}</b></p>
                     <p class="col col-10"></p>
                 </div>
                 <a class="item item-text-wrap row row-center" ng-repeat="attempt in attempts" ng-class='{"mma-mod-quiz-highlighted": attempt.highlightGrade}' ui-sref="site.mod_quiz-attempt({courseid: courseId, quizid: quiz.id, attemptid: attempt.id})" aria-label="{{ 'mm.core.seemoredetail' | translate }}">
-                    <p class="col text-center col-10" ng-if="quiz.showAttemptColumn && attempt.preview">{{ 'mma.mod_quiz.preview' | translate }}</p>
-                    <p class="col text-center col-10" ng-if="quiz.showAttemptColumn && !attempt.preview">{{ attempt.attempt }}</p>
-                    <div class="col">
+                    <p class="col text-center" ng-if="quiz.showAttemptColumn && attempt.preview">{{ 'mma.mod_quiz.preview' | translate }}</p>
+                    <p class="col text-center" ng-if="quiz.showAttemptColumn && !attempt.preview">{{ attempt.attempt }}</p>
+                    <div class="col col-65">
                         <p ng-repeat="sentence in attempt.readableState">{{ sentence }}</p>
                     </div>
                     <p class="col text-center hidden-phone" ng-if="quiz.showMarkColumn">{{ attempt.readableMark }}</p>
@@ -94,7 +94,7 @@ <h2>{{ 'mma.mod_quiz.summaryofattempts' | translate }}</h2>
                     <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
                 </div>
                 <div class="item" ng-if="buttonText && !showSpinner">
-                    <a class="button button-block" ng-click="attemptQuiz()">{{ buttonText | translate }}</a>
+                    <a class="button button-block button-positive" ng-click="attemptQuiz()">{{ buttonText | translate }}</a>
                 </div>
                 <div class="item" ng-if="!buttonText && ((unsupportedQuestions && unsupportedQuestions.length) || (unsupportedRules && unsupportedRules.length) || behaviourSupported === false)">
                     <a class="button button-block icon-right ion-share" ng-href="{{moduleUrl}}" mm-link>{{ 'mm.core.openinbrowser' | translate }}</a>
diff --git a/www/addons/mod/scorm/scss/styles.scss b/www/addons/mod/scorm/scss/styles.scss
index 570aced9324..ed39edfb45b 100644
--- a/www/addons/mod/scorm/scss/styles.scss
+++ b/www/addons/mod/scorm/scss/styles.scss
@@ -1,6 +1,6 @@
 
 $mma-mod-scorm-level-margin:		25px !default;
-$mma-mod-scorm-warning-color:		#c00 !default;
+$mma-mod-scorm-warning-color:		$red !default;
 
 @for $i from 0 through 15 {
   .mma-scorm-level-#{$i} {
diff --git a/www/addons/mod/scorm/templates/index.html b/www/addons/mod/scorm/templates/index.html
index ce3e4fa12d5..f18d92e0a20 100644
--- a/www/addons/mod/scorm/templates/index.html
+++ b/www/addons/mod/scorm/templates/index.html
@@ -116,7 +116,7 @@
                     </ion-checkbox>
                 	<div class="item item-text-wrap" ng-if="!downloading">
                 		<p ng-if="statusMessage">{{ statusMessage | translate }}</p>
-	                    <button class="button button-block">{{ 'mma.mod_scorm.enter' | translate }}</button>
+	                    <button class="button button-block button-positive">{{ 'mma.mod_scorm.enter' | translate }}</button>
                 	</div>
                 	<div class="item text-center" ng-if="downloading">
 	                	<ion-spinner></ion-spinner>
diff --git a/www/addons/mod/wiki/scss/styles.scss b/www/addons/mod/wiki/scss/styles.scss
index 5e6be36214c..0cea5b1f240 100644
--- a/www/addons/mod/wiki/scss/styles.scss
+++ b/www/addons/mod/wiki/scss/styles.scss
@@ -1,7 +1,7 @@
 $mma-mod-wiki-toc-level-padding:    12px !default;
 $mma-mod-wiki-newentry-link-color:  $red !default;
-$mma-mod-wiki-toc-title-color:      $gray-dark !default;
-$mma-mod-wiki-toc-border-color:     $gray-medium !default;
+$mma-mod-wiki-toc-title-color:      $gray-darker !default;
+$mma-mod-wiki-toc-border-color:     $gray-dark !default;
 $mma-mod-wiki-toc-background-color: $gray-light !default;
 $mma-mod-wiki-subwiki-selected-background-color:   $gray-light !default;
 
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index da580bed1e8..0d0e044c5b3 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -37,5 +37,5 @@ <h5 ng-if="future.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.future
     <ion-spinner ng-if="loadingMore"></ion-spinner>
 </div>
 
-<mm-empty-box ng-if="empty && showCourse" icon="addons/myoverview/img/activities.svg" message="{{ 'mma.myoverview.noevents' | translate }}"></mm-empty-box>
+<mm-empty-box ng-if="empty && showCourse" image="addons/myoverview/img/activities.svg" message="{{ 'mma.myoverview.noevents' | translate }}"></mm-empty-box>
 <mm-empty-box ng-if="empty && !showCourse" message="{{ 'mma.myoverview.noevents' | translate }}"></mm-empty-box>
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index b5b8ee941a6..33e2883736a 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -25,7 +25,7 @@
                         <mma-my-overview-event-list events="course.events" can-load-more="course.canLoadMore" load-more="loadMoreCourse(course)"></mma-my-overview-event-list>
                     </mm-course-list-progress>
                 </div>
-                <mm-empty-box ng-if="timelineCourses.courses.length == 0" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocourses' | translate }}"></mm-empty-box>
+                <mm-empty-box ng-if="timelineCourses.courses.length == 0" image="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocourses' | translate }}"></mm-empty-box>
             </mm-loading>
             <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'" class="mm-loading-center">
                 <div class="row row-no-padding">
@@ -55,9 +55,9 @@
                     <mm-course-list-progress ng-repeat="course in courses[courses.selected] | filter:{fullname: courses.filter}" course="course" round-progress="showGrid" show-summary="showGrid"></mm-course-list-progress>
                 </div>
 
-                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'inprogress'" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursesinprogress' | translate }}"></mm-empty-box>
-                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'future'" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursesfuture' | translate }}"></mm-empty-box>
-                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'past'" icon="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursespast' | translate }}"></mm-empty-box>
+                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'inprogress'" image="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursesinprogress' | translate }}"></mm-empty-box>
+                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'future'" image="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursesfuture' | translate }}"></mm-empty-box>
+                <mm-empty-box ng-if="courses[courses.selected].length == 0 && courses.selected == 'past'" image="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocoursespast' | translate }}"></mm-empty-box>
             </mm-loading>
         </div>
     </ion-content>
diff --git a/www/addons/qbehaviour/deferredcbm/scss/styles.scss b/www/addons/qbehaviour/deferredcbm/scss/styles.scss
index da2e99eb98e..4be588bce45 100644
--- a/www/addons/qbehaviour/deferredcbm/scss/styles.scss
+++ b/www/addons/qbehaviour/deferredcbm/scss/styles.scss
@@ -1,7 +1,7 @@
 
-$mma-qbehaviour-deferredcbm-judgementok-color:  #080 !default;
-$mma-qbehaviour-deferredcbm-slightly-color:     #600 !default;
-$mma-qbehaviour-deferredcbm-confident-color:    #c00 !default;
+$mma-qbehaviour-deferredcbm-judgementok-color:  $green-dark !default;
+$mma-qbehaviour-deferredcbm-slightly-color:     $red-dark !default;
+$mma-qbehaviour-deferredcbm-confident-color:    $red !default;
 
 .qbehaviour_deferredcbm_actual_percentage {
   font-weight: bold;
diff --git a/www/addons/qtype/ddimageortext/scss/styles.scss b/www/addons/qtype/ddimageortext/scss/styles.scss
index 8480a545dc0..4c0a852380d 100644
--- a/www/addons/qtype/ddimageortext/scss/styles.scss
+++ b/www/addons/qtype/ddimageortext/scss/styles.scss
@@ -11,7 +11,7 @@
   }
 
   div.droparea img {
-    border: 1px solid $gray-dark;
+    border: 1px solid $gray-darker;
     max-width: 100%;
   }
 
@@ -25,7 +25,7 @@
   }
 
   div.draghome {
-    border: 1px solid $gray-dark;
+    border: 1px solid $gray-darker;
     cursor: pointer;
     background-color: #B0C4DE;
     display:inline-block;
@@ -35,10 +35,10 @@
   }
 
   .group1 {
-    background-color: #FFFFFF;
+    background-color: $white;
   }
   .group2 {
-    background-color: #B0C4DE;
+    background-color: $blue-light;
   }
   .group3 {
     background-color: #DCDCDC;
@@ -59,7 +59,7 @@
     background-color: #F0E68C;
   }
   .drag {
-    border: 1px solid $gray-dark;
+    border: 1px solid $gray-darker;
     cursor: pointer;
     z-index: 2;
   }
@@ -87,7 +87,7 @@
     margin:0 auto;
   }
   .dropzone {
-    border: 1px solid $gray-dark;
+    border: 1px solid $gray-darker;
     position: absolute;
     z-index: 1;
     cursor: pointer;
@@ -101,6 +101,6 @@
   }
   .drag.beingdragged {
     z-index: 3;
-    box-shadow: 3px 3px 4px $gray-dark;
+    box-shadow: 3px 3px 4px $gray-darker;
   }
 }
\ No newline at end of file
diff --git a/www/addons/qtype/ddmarker/scss/styles.scss b/www/addons/qtype/ddmarker/scss/styles.scss
index caa5bff960a..d08323fb2c6 100644
--- a/www/addons/qtype/ddmarker/scss/styles.scss
+++ b/www/addons/qtype/ddmarker/scss/styles.scss
@@ -11,7 +11,7 @@
   }
 
   div.droparea img  {
-    border: 1px solid $gray-dark;
+    border: 1px solid $gray-darker;
     max-width: 100%;
   }
 
@@ -34,7 +34,7 @@
 
   .dragitem.beingdragged .markertext {
     z-index: 5;
-    box-shadow: 3px 3px 4px $gray-dark;
+    box-shadow: 3px 3px 4px $gray-darker;
   }
   .dragitems .draghome {
     margin: 10px;
@@ -64,8 +64,8 @@
   div.markertexts span.markertext{
     margin: 0 5px;
     z-index: 2;
-    background-color: white;
-    border: 2px solid $gray-dark;
+    background-color: $white;
+    border: 2px solid $gray-darker;
     padding: 5px;
     display: inline-block;
     zoom: 1;
@@ -73,14 +73,14 @@
   }
   div.markertexts span.markertext {
     z-index: 3;
-    background-color: $yellow-lighter;
+    background-color: $yellow-light;
     border-style: solid;
     border-width: 2px;
     border-color: $yellow;
     position: absolute;
   }
   span.wrongpart {
-    background-color: $yellow-lighter;
+    background-color: $yellow-light;
     border-style: solid;
     border-width: 2px;
     border-color: $yellow;
diff --git a/www/addons/qtype/ddwtos/scss/styles.scss b/www/addons/qtype/ddwtos/scss/styles.scss
index 244152c659f..42b156d095f 100644
--- a/www/addons/qtype/ddwtos/scss/styles.scss
+++ b/www/addons/qtype/ddwtos/scss/styles.scss
@@ -16,7 +16,7 @@
   .drop {
       display: inline-block;
       text-align: center;
-      border: 1px solid $gray-dark;
+      border: 1px solid $gray-darker;
       margin-bottom: 2px;
       border-radius: 5px;
   }
@@ -27,7 +27,7 @@
       border: 0;
   }
   .draghome, .drag.unplaced{
-      border: 1px solid $gray-dark;
+      border: 1px solid $gray-darker;
       border-radius: 5px;
   }
   .draghome {
@@ -39,12 +39,12 @@
   }
   .drag.selected {
       z-index: 3;
-      box-shadow: 3px 3px 4px $gray-dark;
+      box-shadow: 3px 3px 4px $gray-darker;
   }
 
   .drop.selected {
-      border-color: $yellow-lighter;
-      box-shadow: 0 0 5px 5px $yellow-lighter;
+      border-color: $yellow-light;
+      box-shadow: 0 0 5px 5px $yellow-light;
   }
 
   &.notreadonly .drag,
@@ -63,20 +63,20 @@
   }
 
   span.incorrect {
-      background-color: $red-lighter;
+      background-color: $red-light;
   }
   span.correct {
-      background-color: $green-lighter;
+      background-color: $green-light;
   }
 
   .group1 {
-      background-color: #FFFFFF;
+      background-color: $white;
   }
   .group2 {
       background-color: #DCDCDC;
   }
   .group3 {
-      background-color: #B0C4DE;
+      background-color: $blue-light;
   }
   .group4 {
       background-color: #D8BFD8;
diff --git a/www/addons/qtype/gapselect/scss/styles.scss b/www/addons/qtype/gapselect/scss/styles.scss
index 67d79404c22..6536f42a307 100644
--- a/www/addons/qtype/gapselect/scss/styles.scss
+++ b/www/addons/qtype/gapselect/scss/styles.scss
@@ -8,12 +8,13 @@
     height: 30px;
     line-height: 30px;
     display: inline-block;
-    border: 1px solid #ccc;
+    border: 1px solid $gray-dark;
     padding: 4px 6px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     margin-bottom: 10px;
+    background: $gray-lighter;
   }
 }
 
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index 1ac0d602575..609f9c97dd8 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -3,8 +3,8 @@ $doughnut-border-size: 15px;
 $doughnut-dasharray: 173;
 $doughnut-empty-colour: $gray-light;
 $doughnut-fill-colour: $orange-light;
-$doughnut-border-colour:  $gray-medium;
-$doughnut-text-colour: $gray-dark;
+$doughnut-border-colour:  $gray-dark;
+$doughnut-text-colour: $gray-darker;
 
 .item-course {
   >.icon, >ion-spinner {
@@ -101,10 +101,15 @@ $doughnut-text-colour: $gray-dark;
       left: 50%;
       margin: 0;
       transform: translate(-42%, -50%);
-      color: #fff;
+      color: $white;
       height: ($chart-size / 2) + 10px;
       width: ($chart-size / 2) + 10px;
       font-size: ($chart-size / 2) + 10px;
     }
   }
 }
+
+.mm-site_mm_coursescategories .item-icon-left,
+mm-course-list-item .item-icon-left {
+  color: $black;
+}
\ No newline at end of file
diff --git a/www/core/components/login/scss/styles.scss b/www/core/components/login/scss/styles.scss
index da71e1e5ff1..22346f91235 100644
--- a/www/core/components/login/scss/styles.scss
+++ b/www/core/components/login/scss/styles.scss
@@ -35,7 +35,7 @@
   }
   > span {
     margin-left: 5px;
-    color: $gray-dark;
+    color: $gray-darker;
   }
 }
 
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index d7b22919ad4..2aee6e4f386 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -16,7 +16,7 @@ <h2>{{ 'mm.login.username' | translate }}</h2>
                         <input id="mm-login-reconnect-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="credentials.password" mm-show-password>
                     </ion-input>
                     <div class="button-bar">
-                        <button class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</button>
+                        <a class="button" ng-click="cancel()">{{ 'mm.login.cancel' | translate }}</a>
                         <button class="button button-positive" ng-click="login()">{{ 'mm.login.loginbutton' | translate }}</button>
                     </div>
                 </form>
diff --git a/www/core/components/login/templates/site.html b/www/core/components/login/templates/site.html
index de996099557..1a17cdc00b4 100644
--- a/www/core/components/login/templates/site.html
+++ b/www/core/components/login/templates/site.html
@@ -3,7 +3,7 @@
       <button class="button button-icon ion-help-circled" ng-click="showHelp()" aria-label="{{ 'mm.core.help' | translate }}"></button>
   </ion-nav-buttons>
   <ion-content padding="true" id="mm-login-site" mm-state-class class="mm-center-view">
-    <div class="mm-view-content">
+    <form class="mm-view-content">
       <div class="box">
         <div class="text-center padding">
           <img ng-src="img/moodle.png" class="avatar-full" role="presentation">
@@ -14,6 +14,6 @@
         </div>
         <button class="button button-block button-positive" ng-click="connect(siteurl)" ng-disabled="!siteurl">{{ 'mm.login.connect' | translate }}</button>
       </div>
-    </div>
+    </form>
   </ion-content>
 </ion-view>
diff --git a/www/core/components/question/scss/styles.scss b/www/core/components/question/scss/styles.scss
index 7f395dde56f..47ee9dcb3cc 100644
--- a/www/core/components/question/scss/styles.scss
+++ b/www/core/components/question/scss/styles.scss
@@ -1,14 +1,14 @@
 
 $mm-question-correct-color:         $green-dark !default;
-$mm-question-correct-color-bg:      $green-lighter !default;
+$mm-question-correct-color-bg:      $green-light !default;
 $mm-question-incorrect-color:       $red !default;
-$mm-question-incorrect-color-bg:    $red-lighter !default;
-$mm-question-feedback-color:        $yellow-darker !default;
-$mm-question-feedback-color-bg:     $yellow-lighter !default;
+$mm-question-incorrect-color-bg:    $red-light !default;
+$mm-question-feedback-color:        $yellow-dark !default;
+$mm-question-feedback-color-bg:     $yellow-light !default;
 
-$mm-question-state-correct-color:   $green-lighter !default;
-$mm-question-state-partial-color:   $yellow-lighter !default;
-$mm-question-state-incorrect-color: $red-lighter !default;
+$mm-question-state-correct-color:   $green-light !default;
+$mm-question-state-partial-color:   $yellow-light !default;
+$mm-question-state-incorrect-color: $red-light !default;
 
 $mm-question-warning-color:         $red !default;
 
@@ -91,7 +91,7 @@ li.mm-question-answer-incorrect,
     line-height: 14px;
     color: $white;
     text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
-    background-color: $gray-medium;
+    background-color: $gray-dark;
     -webkit-border-radius: 3px;
     border-radius: 3px;
 
diff --git a/www/core/components/settings/templates/space-usage.html b/www/core/components/settings/templates/space-usage.html
index 9cc959fd4b8..3d12c6383db 100644
--- a/www/core/components/settings/templates/space-usage.html
+++ b/www/core/components/settings/templates/space-usage.html
@@ -8,7 +8,7 @@
                     <h2><mm-format-text>{{site.sitename}}</mm-format-text></h2>
                     <p>{{site.fullname}}</p>
                     <button class="button button-icon" ng-click="deleteSiteFiles(site)" ng-show="site.spaceusage > '0'" aria-label="{{ 'mm.settings.deletesitefilestitle' | translate }}">
-                        <i class="icon ion-trash-a positive"></i>
+                        <i class="icon ion-trash-a assertive"></i>
                     </button>
                 </li>
                 <li class="item item-divider">
diff --git a/www/core/directives/emptybox.js b/www/core/directives/emptybox.js
index 5259b407b24..80e8265630f 100644
--- a/www/core/directives/emptybox.js
+++ b/www/core/directives/emptybox.js
@@ -27,7 +27,8 @@ angular.module('mm.core')
  * This directive will show an optional icon or image and a text centered on page.
  *
  * @param {String} message       Static message to show on the page.
- * @param {String} [icon]        Ion Icon or image source.
+ * @param {String} [icon]        Icon class to use.
+ * @param {String} [image]       Image source. If an icon is provided. Image won't be used.
  */
 .directive('mmEmptyBox', function($translate) {
 
@@ -37,13 +38,12 @@ angular.module('mm.core')
         transclude: true,
         scope: {
             message: '@',
-            icon: '@?'
+            icon: '@?',
+            image: '@?'
         },
         link: function(scope) {
-            console.log(scope.icon);
-            if (scope.icon && !scope.icon.startsWith('ion')) {
-                scope.image = scope.icon;
-                scope.icon = false;
+            if (scope.icon && scope.icon != "") {
+                scope.image = false;
             }
         }
     };
diff --git a/www/core/scss/formattext.scss b/www/core/scss/formattext.scss
index a3cc5f14ddb..dd6cf4d0182 100644
--- a/www/core/scss/formattext.scss
+++ b/www/core/scss/formattext.scss
@@ -28,7 +28,7 @@ mm-format-text[max-height], *[mm-format-text][max-height] {
     }
 
     &.mm-shortened {
-      color: #777;
+      color: $gray-darker;
       overflow: hidden;
       min-height: 50px;
 
@@ -41,7 +41,7 @@ mm-format-text[max-height], *[mm-format-text][max-height] {
         bottom: 0;
         right: 0;
         z-index: 1001;
-        background-color: white;
+        background-color: $white;
         padding-left: 10px;
 
         &:after {
@@ -128,10 +128,3 @@ mm-format-text, *[mm-format-text] {
     display: inline;
   }
 }
-
-.item mm-format-text,
-.item *[mm-format-text] {
-  p {
-    color: inherit;
-  }
-}
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 86c68299fcb..1fae74e0e82 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -15,23 +15,15 @@
  * Variables
  */
 
-// Bar content.
-$bar-content-bg: $mm-color !default;
-$bar-content-border: transparent !default;
-$bar-content-text: $white !default;
-
 // Small avatar ideal for icons.
 $item-media-width: 32px !default;
 $item-media-height: 32px !default;
 
 // Messages.
-$item-message-bg: $white !default;
-$item-message-note-text: $gray-dark !default;
+$item-message-bg: $gray-lighter !default;
+$item-message-note-text: $gray-darker !default;
 $item-message-note-font-size: $font-size-small !default;
-$item-message-mine-bg: $turquoise-light !default;
-
-// Disabled items.
-$item-disabled-color: $gray-medium !default;
+$item-message-mine-bg: $blue-light !default;
 
 // Messages boxes.
 $mm-warning-color: $energized !default; // Energized / yellow.
@@ -107,6 +99,10 @@ em {
  * Styles.
  */
 
+a.button {
+  line-height: $button-height + 5px - ($button-border-width * 2);
+}
+
 .mm-big   { font-size: 115%; }
 
 .item-stacked-label {
@@ -125,7 +121,7 @@ em {
   @include bar-style($bar-content-bg, $bar-content-border, $bar-content-text);
   .button {
     @include button-style($bar-content-bg, $bar-content-border, $bar-content-bg, $bar-content-border, $bar-content-text);
-    @include button-clear($white, $bar-title-font-size);
+    @include button-clear($bar-content-text, $bar-title-font-size);
   }
 }
 
@@ -310,7 +306,7 @@ p.item-text-wrap {
   box-shadow: 0px 6px 6px -3px rgba(0, 0, 0, 0.2);
 
   .tab-item {
-    color: $gray-dark;
+    color: $gray-darker;
     margin-top: 0;
     max-width: initial;
     font-size: 120%;
@@ -357,7 +353,6 @@ p.item-text-wrap {
   width: 100%;
   height: 100%;
   position: relative;
-  margin-right: 2px;
 }
 
 .mm-split-pane-content {
@@ -370,6 +365,7 @@ p.item-text-wrap {
   .mm-split-pane-menu {
     @include flex(0, 0, $menu-width);
     width: $menu-width;
+    margin-right: 2px;
   }
   .mm-split-pane-content {
     display: block;
@@ -802,6 +798,12 @@ p.mm-error { // Deprecated, use one of the above mm-error classes.
   text-align: left;
 }
 
+.badge-positive, .badge-calm, .badge-balanced, .badge-energize, .badge-assertive, .badge-royal, badge-dark {
+  a {
+    color: white;
+  }
+}
+
 // Timer.
 mm-timer {
   display: block;
@@ -1067,14 +1069,14 @@ input[type="radio"].mm-radio {
   padding: 0;
 }
 
-.padding .mm-searchbox .item-input-inset {
+.padding mm-searchbox .item-input-inset {
   padding-top: 0;
   padding-left: 0;
   padding-right: 0;
+}
 
-  .item-input-wrapper {
-    background: white;
-  }
+mm-searchbox .item-input-inset .item-input-wrapper {
+  background: white;
 }
 
 .item.mm-not-clickable {
@@ -1424,7 +1426,7 @@ i, cite, em, var, address, dfn {
 }
 
 .item-divider .item-note {
-  color: $gray-dark;
+  color: $gray-darker;
 }
 
 
@@ -1505,14 +1507,17 @@ h2.invert {
   color: $white;
 }
 
-.mm-center-view .scroll {
-  margin: 0 auto;
-  max-width: 600px;
-  display: table !important;
-  width: 100% !important;
-  height: 100% !important;
-  .mm-view-content {
-    display: table-cell;
-    vertical-align: middle;
+
+@media only screen and (min-width: 430px) {
+  .mm-center-view .scroll {
+    margin: 0 auto;
+    max-width: 600px;
+    display: table !important;
+    width: 100% !important;
+    height: 100% !important;
+    .mm-view-content {
+      display: table-cell;
+      vertical-align: middle;
+    }
   }
 }

From 72c625c2253b0579d23eb99be0c58f555fad6431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 May 2017 11:41:01 +0200
Subject: [PATCH 147/218] MOBILE-2078 overview: Add event action button

---
 www/addons/myoverview/controllers/index.js    |  2 +-
 www/addons/myoverview/directives/eventlist.js | 20 ++++++++++++++++++-
 .../myoverview/templates/eventlist.html       |  4 ++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
index 6edd3f619c2..822d28cf15b 100644
--- a/www/addons/myoverview/controllers/index.js
+++ b/www/addons/myoverview/controllers/index.js
@@ -167,7 +167,7 @@ angular.module('mm.addons.myoverview')
                     switch ($scope.timeline.sort) {
                         case 'sortbydates':
                             $scope.timeline.events = [];
-                            promise = fetchMyOverviewTimesort();
+                            promise = fetchMyOverviewTimeline();
                             break;
                         case 'sortbycourses':
                             $scope.timeline.courses = [];
diff --git a/www/addons/myoverview/directives/eventlist.js b/www/addons/myoverview/directives/eventlist.js
index 2fb5020db3e..c74e80025b8 100644
--- a/www/addons/myoverview/directives/eventlist.js
+++ b/www/addons/myoverview/directives/eventlist.js
@@ -27,7 +27,7 @@ angular.module('mm.addons.myoverview')
  * @param {Array} events        Array of event items to show.
  * @param {Boolean} showCourse  Whether of not show course name.
  */
-.directive('mmaMyOverviewEventList', function($mmCourse, $mmUtil) {
+.directive('mmaMyOverviewEventList', function($mmCourse, $mmUtil, $mmText, $mmContentLinksHelper, $mmSite) {
 
     function filterEventsByTime(events, start, end) {
         start = moment().add(start, 'days').unix();
@@ -79,6 +79,24 @@ angular.module('mm.addons.myoverview')
                     scope.loadingMore = false;
                 });
             };
+
+            scope.action = function(e, url) {
+                e.preventDefault();
+                e.stopPropagation();
+
+                // Fix URL format.
+                url = $mmText.decodeHTMLEntities(url);
+
+                var modal = $mmUtil.showModalLoading();
+                $mmContentLinksHelper.handleLink(url).then(function(treated) {
+                    if (!treated) {
+                        return $mmSite.openInBrowserWithAutoLoginIfSameSite(url);
+                    }
+                }).finally(function() {
+                    modal.dismiss();
+                });
+                return false;
+            }
         }
     };
 });
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index 0d0e044c5b3..a36c0f91970 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -1,6 +1,10 @@
 <script type="text/ng-template" id="event">
     <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
         <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
+        <button class="button button-clear item-note hidden-phone text-right" ng-click="action($event, event.action.url)" title="{{ event.action.name }}" ng-disabled="!event.action.actionable" ng-if="event.action">
+            {{event.action.name}}
+            <span class="badge badge-inline badge-dark" ng-if="event.action.showitemcount">{{event.action.itemcount}}</span>
+        </button>
         <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
         <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
     </a>

From 995fae63acd4561f9f6c97fc87325c3520ea38f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 May 2017 11:45:08 +0200
Subject: [PATCH 148/218] MOBILE-2078 overview: Show tab courses by default

---
 www/addons/myoverview/controllers/index.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
index 822d28cf15b..44069166e6e 100644
--- a/www/addons/myoverview/controllers/index.js
+++ b/www/addons/myoverview/controllers/index.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.myoverview')
  */
 .controller('mmaMyOverviewCtrl', function($scope, $mmaMyOverview, $mmUtil, $q, $mmCourses, $mmCoursesDelegate) {
 
-    $scope.tabShown = 'timeline';
+    $scope.tabShown = 'courses';
     $scope.timeline = {
         sort: 'sortbydates',
         events: [],
@@ -227,11 +227,7 @@ angular.module('mm.addons.myoverview')
         }
     };
 
-    $scope.switchTab('timeline').finally(function() {
-        if ($scope.timeline.events.length == 0) {
-            $scope.switchTab('courses');
-        }
-    });
+    $scope.switchTab($scope.tabShown);
 
     // Load more events.
     $scope.loadMoreTimeline = function() {

From 8e8cd0bd90ce87d16d9c22a5457d51e88c27a8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 May 2017 12:25:09 +0200
Subject: [PATCH 149/218] MOBILE-2105 splitview: Show message when right panel
 is empty

---
 www/core/lang/en.json             | 1 +
 www/core/templates/splitview.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 7bd8309bb93..a740742ef26 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -55,6 +55,7 @@
     "download": "Download",
     "downloading": "Downloading",
     "edit": "Edit",
+    "emptysplit": "This page will appear blank if the left panel is empty or is loading.",
     "error": "Error",
     "errorchangecompletion": "An error occurred while changing the completion status. Please try again.",
     "errordeletefile": "Error deleting the file. Please try again.",
diff --git a/www/core/templates/splitview.html b/www/core/templates/splitview.html
index d762b978c64..f4ae2a2352e 100644
--- a/www/core/templates/splitview.html
+++ b/www/core/templates/splitview.html
@@ -2,5 +2,6 @@
     <div class="mm-split-pane-menu" ng-transclude>
     </div>
     <div ui-view="{{component}}" class="mm-split-pane-content">
+        <mm-empty-box icon="ion-arrow-left-c" message="{{ 'mm.core.emptysplit' | translate}}"></mm-empty-box>
     </div>
 </div>
\ No newline at end of file

From db72faae5a0e7f25e172e14f14688f9e01b15b7a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 16 May 2017 08:52:35 +0200
Subject: [PATCH 150/218] MOBILE-2108 img: Remove ionic icon

---
 www/img/ionic.png | Bin 4757 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 www/img/ionic.png

diff --git a/www/img/ionic.png b/www/img/ionic.png
deleted file mode 100644
index 21c7f375997e6443b05e5fd50815271da1e2c3ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4757
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
V)A2w7aX)_)nHgO`RT#L({STJyPAvcc


From cc78a1327fc7ad1ca3dfcb03fe1e4dc00dffe11c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 16 May 2017 09:19:10 +0200
Subject: [PATCH 151/218] MOBILE-2108 calendar: Sort events by timestart

---
 www/addons/calendar/controllers/list.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/www/addons/calendar/controllers/list.js b/www/addons/calendar/controllers/list.js
index 65b568f2b9e..13e135bb82e 100644
--- a/www/addons/calendar/controllers/list.js
+++ b/www/addons/calendar/controllers/list.js
@@ -74,6 +74,11 @@ angular.module('mm.addons.calendar')
                     return fetchEvents();
                 }
             } else {
+                // Sort the events by timestart, they're ordered by id.
+                events.sort(function(a, b) {
+                    return a.timestart - b.timestart;
+                });
+
                 angular.forEach(events, $mmaCalendar.formatEventData);
                 if (refresh) {
                     $scope.events = events;
@@ -90,11 +95,7 @@ angular.module('mm.addons.calendar')
             // Resize the scroll view so infinite loading is able to calculate if it should load more items or not.
             scrollView.resize();
         }, function(error) {
-            if (error) {
-                $mmUtil.showErrorModal(error);
-            } else {
-                $mmUtil.showErrorModal('mma.calendar.errorloadevents', true);
-            }
+            $mmUtil.showErrorModalDefault(error, 'mma.calendar.errorloadevents', true);
             $scope.eventsLoaded = true;
             $scope.canLoadMore = false; // Set to false to prevent infinite calls with infinite-loading.
         });

From db069b98423d61f2a2ed469e9cbd0e816de3d641 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 16 May 2017 09:51:54 +0200
Subject: [PATCH 152/218] MOBILE-2108 calendar: Don't show empty box while PTR

---
 www/addons/calendar/controllers/list.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/www/addons/calendar/controllers/list.js b/www/addons/calendar/controllers/list.js
index 13e135bb82e..0cd5f0af77a 100644
--- a/www/addons/calendar/controllers/list.js
+++ b/www/addons/calendar/controllers/list.js
@@ -37,6 +37,8 @@ angular.module('mm.addons.calendar')
             fullname: $translate.instant('mm.core.fulllistofcourses')
         };
 
+    $scope.events = [];
+
     if ($stateParams.eventid) {
         // We arrived here via notification click, let's clear history and redirect to event details.
         $ionicHistory.clearHistory();
@@ -47,7 +49,6 @@ angular.module('mm.addons.calendar')
     function initVars() {
         daysLoaded = 0;
         emptyEventsTimes = 0;
-        $scope.events = [];
     }
 
     // Fetch all the data required for the view.
@@ -69,9 +70,12 @@ angular.module('mm.addons.calendar')
                 if (emptyEventsTimes > 5) { // Stop execution if we retrieve empty list 6 consecutive times.
                     $scope.canLoadMore = false;
                     $scope.eventsLoaded = true;
+                    if (refresh) {
+                        $scope.events = [];
+                    }
                 } else {
                     // No events returned, load next events.
-                    return fetchEvents();
+                    return fetchEvents(refresh);
                 }
             } else {
                 // Sort the events by timestart, they're ordered by id.
@@ -150,9 +154,7 @@ angular.module('mm.addons.calendar')
         promises.push($mmaCalendar.invalidateEventsList());
 
         return $q.all(promises).finally(function() {
-            fetchData(true).finally(function() {
-                $scope.$broadcast('scroll.refreshComplete');
-            });
+            return fetchData(true);
         });
     };
 

From f7facc7f7dd18898f4dfae4c75d9990a66c7b744 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 16 May 2017 11:31:36 +0200
Subject: [PATCH 153/218] MOBILE-2063 filepool: Only invalidate files external
 or unknow rev/time

---
 upgrade.txt              |  1 +
 www/core/lib/filepool.js | 48 ++++++++++++++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index 3a68a11e53c..26d478051a5 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -13,6 +13,7 @@ information provided here is intended especially for developers.
  * The promise returned by $mmaModForum#canAddDiscussion is now resolved with an object (WS response) instead of a boolean.
  * The parameters of the following functions have changed to match the WS behaviour: $mmaModForum#addNewDiscussion, $mmaModForum#addNewDiscussionOnline, $mmaModForumOffline#addNewDiscussion, $mmaModForum#replyPost, $mmaModForum#replyPostOnline, $mmaModForumOffline#replyPost.
  * The function $mmUtil#getMimeType has been deprecated. Please use $mmUtil#getMimeTypeFromUrl instead.
+ * The functions $mmFilepool#invalidateAllFiles and $mmFilepool#invalidateFilesByComponent now accept a new param onlyUnknown which defaults to true, so it only invalidates some of the files. It is advised to use onlyUnknown=true to decrease the network usage and improve the app's performance.
 
 === 3.2.1 ===
 
diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index 3110d845a40..651aa8980ed 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -2059,16 +2059,26 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#invalidateAllFiles
-     * @param {String} siteId The site ID.
-     * @return {Promise} Resolved on success. Rejected on failure. It is advised to ignore a failure.
+     * @param {String}  siteId             The site ID.
+     * @param {Boolean} [onlyUnknown=true] True to only invalidate files from external repos or without revision/timemodified.
+     *                                     It is advised to set it to true to reduce the performance and data usage of the app.
+     * @return {Promise}                   Resolved on success. Rejected on failure. It is advised to ignore a failure.
      * @description
      * Invalidates all files by marking it stale. See {@link $mmFilepool#invalidateFileByUrl} for more details.
      */
-    self.invalidateAllFiles = function(siteId) {
+    self.invalidateAllFiles = function(siteId, onlyUnknown) {
+        if (typeof onlyUnknown == 'undefined') {
+            onlyUnknown = true;
+        }
+
         return getSiteDb(siteId).then(function(db) {
             return db.getAll(mmFilepoolStore).then(function(items) {
                 var promises = [];
                 angular.forEach(items, function(item) {
+                    if (onlyUnknown && !isFileUpdateUnknown(item)) {
+                        // It doesn't need to be invalidated.
+                        return;
+                    }
                     item.stale = true;
                     promises.push(db.insert(mmFilepoolStore, item));
                 });
@@ -2116,14 +2126,20 @@ angular.module('mm.core')
      * @module mm.core
      * @ngdoc method
      * @name $mmFilepool#invalidateFilesByComponent
-     * @param {String} siteId The site ID.
-     * @param {String} component The component to link the file to.
-     * @param {Mixed} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise} Resolved on success. Rejected on failure. It is advised to ignore a failure.
+     * @param {String} siteId              The site ID.
+     * @param {String} component           The component to invalidate.
+     * @param {Mixed} [componentId]        An ID to use in conjunction with the component.
+     * @param {Boolean} [onlyUnknown=true] True to only invalidate files from external repos or without revision/timemodified.
+     *                                     It is advised to set it to true to reduce the performance and data usage of the app.
+     * @return {Promise}                   Resolved on success. Rejected on failure. It is advised to ignore a failure.
      * @description
-     * Invalidates a file by marking it stale. See {@link $mmFilepool#invalidateFileByUrl} for more details.
+     * Invalidates files by marking them stale. See {@link $mmFilepool#invalidateFileByUrl} for more details.
      */
-    self.invalidateFilesByComponent = function(siteId, component, componentId) {
+    self.invalidateFilesByComponent = function(siteId, component, componentId, onlyUnknown) {
+        if (typeof onlyUnknown == 'undefined') {
+            onlyUnknown = true;
+        }
+
         return getSiteDb(siteId).then(function(db) {
             return getComponentFiles(db, component, componentId).then(function(items) {
                 var promise,
@@ -2134,6 +2150,10 @@ angular.module('mm.core')
                         if (!fileEntry) {
                             return;
                         }
+                        if (onlyUnknown && !isFileUpdateUnknown(fileEntry)) {
+                            // It doesn't need to be invalidated.
+                            return;
+                        }
                         fileEntry.stale = true;
                         return db.insert(mmFilepoolStore, fileEntry);
                     });
@@ -2177,6 +2197,16 @@ angular.module('mm.core')
         return fileObject.stale || revision > fileObject.revision || timemodified > fileObject.timemodified;
     };
 
+    /**
+     * Check if cannot determine if a file has been updated.
+     *
+     * @param  {Object}  entry Filepool object.
+     * @return {Boolean}       True if cannot determine updates.
+     */
+    function isFileUpdateUnknown(entry) {
+        return entry.isexternalfile || (!entry.revision && !entry.timemodified);
+    }
+
     /**
      * Notify a file has been deleted.
      *

From 03fceec838f43b428d2651c304b2886e01b7b40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 15 May 2017 16:39:31 +0200
Subject: [PATCH 154/218] MOBILE-2087 lesson: Refurbish lesson styles

---
 scss/app.scss                                 | 12 ++++
 www/addons/mod/lesson/scss/styles.scss        | 35 +++++-----
 .../mod/lesson/templates/password-modal.html  |  2 +-
 www/addons/mod/lesson/templates/player.html   | 64 ++++++++++---------
 www/addons/mod/lesson/templates/reports.html  | 36 +++++------
 .../mod/lesson/templates/userattempt.html     | 41 ++++++------
 www/addons/mod/lesson/templates/view.html     | 63 ++++++++----------
 www/addons/mod/quiz/templates/player.html     |  2 +-
 www/core/scss/styles.scss                     | 46 ++++++++-----
 www/core/templates/timer.html                 |  7 +-
 10 files changed, 166 insertions(+), 142 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 3508481e093..6b1309317c8 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -97,6 +97,18 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
     @include button-style($button-default-bg, $button-default-border, $button-default-active-bg, $button-default-active-border, $button-default-text);
     @include button-clear($button-default-border);
     @include button-outline($button-default-border);
+
+    &.active,
+    &.activated {
+      box-shadow: none;
+      color: $white;
+    }
+  }
+
+  &.active,
+  &.activated {
+    box-shadow: none;
+    color: $white;
   }
 
   &.button-dark {
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
index 1c48b860bd7..2b2acf967e5 100644
--- a/www/addons/mod/lesson/scss/styles.scss
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -1,6 +1,5 @@
-
 .item.mma-mod-lesson-selected {
-  font-weight: bold;
+  @extend .mm-menu-selected;
 }
 
 .mma-mod-lesson-slideshow {
@@ -13,29 +12,33 @@
 .mma-mod-lesson-ongoingscore span,
 .item.mma-mod-lesson-ongoingscore span {
   // Same styles as .item p.
-  color: #666;
+  color: $gray-darker;
   font-size: 14px;
 }
 
 .mma-mod_lesson-lessonstats, .mma-mod_lesson-userstats {
-  .item.row {
-    padding: 0;
-
-    .col-33, .col-50 {
-      border-color: $item-default-border;
-      border-style: solid;
-      &:not(:first-child) {
-        border-left-width: $item-border-width;
-      }
+  .item.row .col-33,
+  .item.row .col-50 {
+    border-color: $item-default-border;
+    border-style: solid;
+    &:not(:first-child) {
+      border-left-width: $item-border-width;
     }
   }
 }
 
 .mm-site_mod_lesson-userattempt {
-  .mma-mod_lesson-contentpage {
-    padding: 0;
-    .row {
-      padding: 0;
+  .mma-mod_lesson-answer {
+    .item {
+      border-top: 1px solid $item-default-border;
+      border-radius: 0;
+    }
+  }
+
+  .highlight {
+    background-color: $blue-light;
+    p {
+      color: $blue-dark;
     }
   }
 }
diff --git a/www/addons/mod/lesson/templates/password-modal.html b/www/addons/mod/lesson/templates/password-modal.html
index c8a0b9873af..09948643533 100644
--- a/www/addons/mod/lesson/templates/password-modal.html
+++ b/www/addons/mod/lesson/templates/password-modal.html
@@ -8,7 +8,7 @@ <h1 class="title">{{ 'mm.login.password' | translate}}</h1>
             <ion-input class="item item-input item-stacked-label">
                 <ion-label>{{ 'mma.mod_lesson.enterpassword' | translate }}</ion-label>
                 <input id="mma-mod-lesson-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="data.password" mm-show-password>
-                <button class="button button-block" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+                <button class="button button-block button-positive icon-right ion-chevron-right" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
             </ion-input>
         </form>
     </ion-content>
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index feae7faa435..7447562bcc3 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -11,20 +11,22 @@
             </div>
 
             <div ng-class='{"mma-mod-lesson-slideshow": lesson.slideshow}' ng-style="{'width': lessonWidth, 'height': lessonHeight}">
+
                 <mm-timer ng-if="endTime" end-time="endTime" finished="timeUp()" timer-text="{{ 'mma.mod_lesson.timeremaining' | translate }}"></mm-timer>
 
                 <!-- Page content, including questions and buttons. -->
+                <mm-format-text ng-if="pageData.ongoingscore && !eolData && !processData" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{pageData.ongoingscore}}</mm-format-text>
+                <form ng-if="!eolData && !processData" name="mma-mod_lesson-player-form" class="card">
+                    <p class="item item-text-wrap" ng-class="{'item-divider': question}"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text></p>
+
+                    <input ng-if="question" ng-repeat="input in question.hiddenInputs" type="hidden" name="{{input.name}}" value="{{input.value}}" />
+                    <div ng-if="question" class="mm-lesson-questions" ng-include="question.template"></div>
+                    <div ng-if="question" class="item">
+                        <button class="button button-block button-positive" ng-click="submitQuestion()">{{ question.submitLabel }}</button>
+                    </div>
+                </form>
                 <div ng-if="!eolData && !processData" class="list">
-                    <mm-format-text ng-if="pageData.ongoingscore" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{pageData.ongoingscore}}</mm-format-text>
-                    <p class="item item-text-wrap"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text></p>
-                    <form ng-if="question" name="mma-mod_lesson-player-form">
-                        <input ng-repeat="input in question.hiddenInputs" type="hidden" name="{{input.name}}" value="{{input.value}}" />
-                        <div ng-include="question.template"></div>
-                        <div class="item">
-                            <button class="button button-block" ng-click="submitQuestion()">{{ question.submitLabel }}</button>
-                        </div>
-                    </form>
-                    <div ng-if="pageButtons && pageButtons.length" class="item">
+                    <div ng-if="pageButtons && pageButtons.length" class="item item-text-wrap row-buttons responsive-sm">
                         <button ng-repeat="button in pageButtons track by button.id" class="button button-block" id="{{button.id}}" title="{{button.title}}" ng-click="buttonClicked(button.data)">{{button.content}}</button>
                     </div>
                     <div ng-if="lesson.progressbar && !canManage" class="item">
@@ -37,28 +39,28 @@
                 </div>
 
                 <!-- End of lesson reached. -->
-                <div ng-if="eolData && !processData" class="padding">
+                <div ng-if="eolData && !processData" class="card">
                     <div class="mm-warning" ng-if="eolData.offline && eolData.offline.value">
                         <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_lesson.finishattemptoffline' | translate }}
                     </div>
-                    <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
-                    <p ng-if="eolData.notenoughtimespent"><mm-format-text>{{ eolData.notenoughtimespent.message }}</mm-format-text></p>
-                    <p ng-if="eolData.numberofpagesviewed"><mm-format-text>{{ eolData.numberofpagesviewed.message }}</mm-format-text></p>
-                    <p ng-if="eolData.youshouldview"><mm-format-text>{{ eolData.youshouldview.message }}</mm-format-text></p>
-                    <p ng-if="eolData.numberofcorrectanswers"><mm-format-text>{{ eolData.numberofcorrectanswers.message }}</mm-format-text></p>
-                    <p ng-if="eolData.displayscorewithessays"><mm-format-text>{{ eolData.displayscorewithessays.message }}</mm-format-text></p>
-                    <p ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays"><mm-format-text>{{ eolData.displayscorewithoutessays.message }}</mm-format-text></p>
-                    <p ng-if="eolData.yourcurrentgradeisoutof"><mm-format-text>{{ eolData.yourcurrentgradeisoutof.message }}</mm-format-text></p>
-                    <p ng-if="eolData.eolstudentoutoftimenoanswers"><mm-format-text>{{ eolData.eolstudentoutoftimenoanswers.message }}</mm-format-text></p>
-                    <p ng-if="eolData.welldone"><mm-format-text>{{ eolData.welldone.message }}</mm-format-text></p>
-                    <div ng-if="lesson.progressbar && eolData.progresscompleted">
+                    <h3 class="padding" ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
+                    <p class="item item-text-wrap" ng-if="eolData.notenoughtimespent"><mm-format-text>{{ eolData.notenoughtimespent.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.numberofpagesviewed"><mm-format-text>{{ eolData.numberofpagesviewed.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.youshouldview"><mm-format-text>{{ eolData.youshouldview.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.numberofcorrectanswers"><mm-format-text>{{ eolData.numberofcorrectanswers.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.displayscorewithessays"><mm-format-text>{{ eolData.displayscorewithessays.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="!eolData.displayscorewithessays && eolData.displayscorewithoutessays"><mm-format-text>{{ eolData.displayscorewithoutessays.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.yourcurrentgradeisoutof"><mm-format-text>{{ eolData.yourcurrentgradeisoutof.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.eolstudentoutoftimenoanswers"><mm-format-text>{{ eolData.eolstudentoutoftimenoanswers.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.welldone"><mm-format-text>{{ eolData.welldone.message }}</mm-format-text></p>
+                    <div class="item item-text-wrap" ng-if="lesson.progressbar && eolData.progresscompleted">
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: eolData.progresscompleted.value} }}</p>
                         <progress max="100" value="{{eolData.progresscompleted.value}}"></progress>
                     </div>
-                    <p ng-if="eolData.displayofgrade"><mm-format-text>{{ eolData.displayofgrade.message }}</mm-format-text></p>
-                    <button ng-if="eolData.reviewlesson" class="button button-block" ng-click="reviewLesson(eolData.reviewlesson.pageid)"><mm-format-text>{{ 'mma.mod_lesson.reviewlesson' | translate }}</mm-format-text></button>
-                    <p ng-if="eolData.modattemptsnoteacher"><mm-format-text>{{ eolData.modattemptsnoteacher.message }}</mm-format-text></p>
-                    <mm-format-text ng-if="eolData.activitylink" watch="true">{{ eolData.activitylink.value }}</mm-format-text>
+                    <p class="item item-text-wrap" ng-if="eolData.displayofgrade"><mm-format-text>{{ eolData.displayofgrade.message }}</mm-format-text></p>
+                    <div class="item item-text-wrap" ng-if="eolData.reviewlesson"><button class="button button-block" ng-click="reviewLesson(eolData.reviewlesson.pageid)"><mm-format-text>{{ 'mma.mod_lesson.reviewlesson' | translate }}</mm-format-text></button></div>
+                    <p class="item item-text-wrap" ng-if="eolData.modattemptsnoteacher"><mm-format-text>{{ eolData.modattemptsnoteacher.message }}</mm-format-text></p>
+                    <p class="item item-text-wrap" ng-if="eolData.activitylink"><mm-format-text watch="true">{{ eolData.activitylink.value }}</mm-format-text></p>
                 </div>
 
                 <!-- Feedback returned when processing an action. -->
@@ -81,22 +83,22 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
 
             <!-- List of questions templates. -->
             <script type="text/ng-template" id="multichoice">
-                <ion-radio ng-if="!question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" ng-disabled="option.disabled">
+                <ion-radio class="item-border" ng-if="!question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" ng-disabled="option.disabled">
                     <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{option.text}}</mm-format-text></p>
                 </ion-radio>
-                <ion-checkbox ng-if="question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" ng-disabled="option.disabled" class="item-text-wrap item-checkbox-right">
+                <ion-checkbox class="item-border" ng-if="question.multi" ng-repeat="option in question.options" id="{{option.id}}" name="{{option.name}}" ng-value="option.value" ng-model="question.model[option.name]" ng-disabled="option.disabled" class="item-text-wrap item-checkbox-right">
                     <p><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{option.text}}</mm-format-text></p>
                 </ion-checkbox>
             </script>
 
             <script type="text/ng-template" id="shortanswer">
-                <ion-input class="item item-input">
+                <ion-input class="item item-input item-border ">
                     <input type="{{question.input.type}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" id="{{question.input.id}}" name="{{question.input.name}}" autocorrect="off" ng-model="question.model[question.input.name]" maxlength="{{question.input.maxlength}}" ng-disabled="question.input.readonly">
                 </ion-input>
             </script>
 
             <script type="text/ng-template" id="essay">
-                <ion-input ng-if="question.textarea" class="item item-input mm-item-has-rich-text-editor">
+                <ion-input ng-if="question.textarea" class="item item-border item-input mm-item-has-rich-text-editor">
                     <mm-rich-text-editor model="question.model[question.textarea.name]" property="{{question.textarea.property}}" placeholder="{{ 'mma.mod_lesson.youranswer' | translate }}" name="{{question.textarea.name}}" scroll-handle="mmaModLessonPlayerScroll" component="{{component}}" component-id="{{lesson.coursemodule}}" first-render="firstRender()"></mm-rich-text-editor>
                 </ion-input>
                 <div ng-if="!question.textarea && question.useranswer" class="item item-text-wrap">
@@ -106,7 +108,7 @@ <h3 ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate
             </script>
 
             <script type="text/ng-template" id="matching">
-                <div class="item item-text-wrap row mm-item-padding" ng-repeat="row in question.rows">
+                <div class="item item-border item-text-wrap row mm-item-padding" ng-repeat="row in question.rows">
                     <div class="col">
                         <p><mm-format-text id="mma-mod_lesson-{{row.id}}" watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{ row.text }}</mm-format-text></p>
                     </div>
diff --git a/www/addons/mod/lesson/templates/reports.html b/www/addons/mod/lesson/templates/reports.html
index 21d1da98347..3934e3a8fe6 100644
--- a/www/addons/mod/lesson/templates/reports.html
+++ b/www/addons/mod/lesson/templates/reports.html
@@ -8,11 +8,10 @@
     </div>
 
     <!-- No lesson attempts. -->
-    <div ng-if="!overview" class="mm-empty-box block">
-        <i class="icon ion-stats-bars"></i>
-        <p ng-if="selectedGroupName">{{ 'mma.mod_lesson.nolessonattemptsgroup' | translate:{$a: selectedGroupName} }}</p>
-        <p ng-if="!selectedGroupName">{{ 'mma.mod_lesson.nolessonattempts' | translate }}</p>
-    </div>
+    <mm-empty-box ng-if="!overview && selectedGroupName" icon="ion-stats-bars" message="{{ 'mma.mod_lesson.nolessonattemptsgroup' | translate:{$a: selectedGroupName} }}">
+    </mm-empty-box>
+    <mm-empty-box ng-if="!overview && !selectedGroupName" icon="ion-stats-bars" message="{{ 'mma.mod_lesson.nolessonattempts' | translate }}">
+    </mm-empty-box>
 
     <!-- General statistics for the current group. -->
     <div class="card mma-mod_lesson-lessonstats" ng-if="overview">
@@ -22,7 +21,7 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
 
         <!-- In tablet, max 2 rows with 3 columns. -->
         <div class="hidden-phone">
-            <div class="item item-text-wrap row" ng-if="overview.lessonscored">
+            <div class="item item-text-wrap row row-no-padding" ng-if="overview.lessonscored">
                 <div class="col-33 text-center padding">
                     <p class="item-heading">{{ 'mma.mod_lesson.averagescore' | translate }}</p>
                     <p ng-if="overview.numofattempts > 0">{{ 'mm.core.percentagenumber' | translate:{$a: overview.avescore} }}</p>
@@ -42,7 +41,7 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
                 </div>
             </div>
 
-            <div class="item item-text-wrap row">
+            <div class="item item-text-wrap row row-no-padding">
                 <div class="col-33 text-center padding">
                     <p class="item-heading">{{ 'mma.mod_lesson.averagetime' | translate }}</p>
                     <p ng-if="overview.avetime != null && overview.numofattempts">{{ overview.avetimeReadable }}</p>
@@ -65,7 +64,7 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
 
         <!-- In phone, 3 rows with 1 or 2 columns. -->
         <div class="hidden-tablet">
-            <div class="item item-text-wrap row">
+            <div class="item item-text-wrap row row-no-padding">
                 <div class="col-50 text-center padding" ng-if="overview.lessonscored">
                     <p class="item-heading">{{ 'mma.mod_lesson.averagescore' | translate }}</p>
                     <p ng-if="overview.numofattempts > 0">{{ 'mm.core.percentagenumber' | translate:{$a: overview.avescore} }}</p>
@@ -79,7 +78,7 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
                 </div>
             </div>
 
-            <div class="item item-text-wrap row">
+            <div class="item item-text-wrap row row-no-padding">
                 <div class="col-50 text-center padding" ng-if="overview.lessonscored">
                     <p class="item-heading">{{ 'mma.mod_lesson.highscore' | translate }}</p>
                     <p ng-if="overview.highscore != null">{{ 'mm.core.percentagenumber' | translate:{$a: overview.highscore} }}</p>
@@ -93,7 +92,7 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
                 </div>
             </div>
 
-            <div class="item item-text-wrap row">
+            <div class="item item-text-wrap row row-no-padding">
                 <div class="col-50 text-center padding" ng-if="overview.lessonscored">
                     <p class="item-heading">{{ 'mma.mod_lesson.lowscore' | translate }}</p>
                     <p ng-if="overview.lowscore != null">{{ 'mm.core.percentagenumber' | translate:{$a: overview.lowscore} }}</p>
@@ -115,13 +114,14 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
             <h2>{{ 'mma.mod_lesson.overview' | translate }}</h2>
         </div>
 
-        <div ng-repeat="student in overview.students">
-            <a class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}" ui-sref="site.mod_lesson-userattempt({courseid: courseId, lessonid: lesson.id, userid: student.id})">
-                <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" mm-user-link userid="{{student.id}}" courseid="{{courseId}}">
-                <h2>{{student.fullname}}</h2>
-                <p>{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</p>
-                <i class="icon icon-accessory ion-chevron-right"></i>
-            </a>
-        </div>
+        <a ng-repeat="student in overview.students" class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}" ui-sref="site.mod_lesson-userattempt({courseid: courseId, lessonid: lesson.id, userid: student.id})">
+            <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" mm-user-link userid="{{student.id}}" courseid="{{courseId}}">
+            <h2>{{student.fullname}}</h2>
+            <div class="row row-no-padding">
+                <progress class="col-80" max="100" value="{{ student.bestgrade }}"></progress>
+                <div class="col col-center mm-progress-text">{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</div>
+            </div>
+            <i class="icon icon-accessory ion-chevron-right"></i>
+        </a>
     </div>
 </mm-loading>
\ No newline at end of file
diff --git a/www/addons/mod/lesson/templates/userattempt.html b/www/addons/mod/lesson/templates/userattempt.html
index 648a68447bf..72a221e35e9 100644
--- a/www/addons/mod/lesson/templates/userattempt.html
+++ b/www/addons/mod/lesson/templates/userattempt.html
@@ -6,7 +6,10 @@
                 <a class="item item-text-wrap" ng-class="{'item-avatar': student.profileimageurl}" mm-user-link userid="{{student.id}}" courseid="{{courseId}}" title="{{student.fullname}}">
                     <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" >
                     <h2>{{student.fullname}}</h2>
-                    <p>{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</p>
+                    <div class="row row-no-padding">
+                        <progress class="col-80" max="100" value="{{ student.bestgrade }}"></progress>
+                        <div class="col col-center mm-progress-text">{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</div>
+                    </div>
                 </a>
 
                 <!-- Attempt selector if there is more than one attempt. -->
@@ -18,13 +21,13 @@ <h2>{{student.fullname}}</h2>
 
                 <!-- Attempt stats. -->
                 <div ng-if="attempt && attempt.userstats && attempt.userstats.gradeinfo" class="mma-mod_lesson-userstats">
-                    <div class="item item-text-wrap row">
-                        <div class="item col-50">
+                    <div class="item item-text-wrap row mm-item-padding">
+                        <div class="col col-50">
                             <p class="item-heading">{{ 'mma.mod_lesson.grade' | translate }}</p>
                             <p>{{ 'mm.core.percentagenumber' | translate:{$a: attempt.userstats.grade} }}</p>
                         </div>
 
-                        <div class="item col-50">
+                        <div class="col col-50">
                             <p class="item-heading">{{ 'mma.mod_lesson.rawgrade' | translate }}</p>
                             <p>{{ attempt.userstats.gradeinfo.earned }} / {{ attempt.userstats.gradeinfo.total }}</p>
                         </div>
@@ -45,7 +48,7 @@ <h2>{{student.fullname}}</h2>
                 </div>
 
                 <!-- Pages. -->
-                <div ng-if="attempt" ng-repeat="page in attempt.answerpages" class="mma-mod_lesson-answerpage" ng-class="{'dimmed': page.grayout}">
+                <div ng-if="attempt" ng-repeat="page in attempt.answerpages" class="mma-mod_lesson-answerpage card" ng-class="{'dimmed': page.grayout}">
                     <div class="item item-divider item-text-wrap">
                         <h2>{{page.qtype}}: {{page.title}}</h2>
                     </div>
@@ -59,14 +62,14 @@ <h2>{{page.qtype}}: {{page.title}}</h2>
                     <div class="item item-text-wrap" ng-if="!page.answerdata || !page.answerdata.answers || !page.answerdata.answers.length">
                         <p>{{ 'mma.mod_lesson.didnotanswerquestion' | translate }}</p>
                     </div>
-                    <div ng-if="page.answerdata && page.answerdata.answers && page.answerdata.answers.length">
-                        <div ng-repeat="answer in page.answerdata.answers" ng-class="{'mma-mod_lesson-contentpage': page.isContent}">
+                    <div ng-if="page.answerdata && page.answerdata.answers && page.answerdata.answers.length" class="mma-mod_lesson-answer">
+                        <div ng-repeat="answer in page.answerdata.answers">
                             <div ng-if="page.isContent" class="item item-text-wrap row">
                                 <!-- Content page, display a button and the content. -->
-                                <div class="col-50 padding">
+                                <div class="col col-50 padding">
                                     <button class="button button-block" disabled="disabled">{{ answer[0].buttonText }}</button>
                                 </div>
-                                <div class="col-50 padding">
+                                <div class="col col-50 padding">
                                     <p ng-bind-html="answer[0].content"></p>
                                 </div>
                             </div>
@@ -76,38 +79,36 @@ <h2>{{page.qtype}}: {{page.title}}</h2>
                                 <!-- Truefalse or matching. -->
                                 <ion-checkbox ng-if="answer[0].isCheckbox" name="{{answer[0].name}}" value="{{answer[0].value}}" ng-disabled="true" readonly="readonly" class="item-text-wrap item-checkbox-right" ng-checked="answer[0].checked" ng-class="{'highlight': answer[0].highlight}">
                                     <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0].content}}</mm-format-text></p>
-                                    <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                    <div ng-if="answer[1]" class="badge badge-inline badge-dark"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></div>
                                 </ion-checkbox>
 
                                 <!-- Short answer or numeric. -->
                                 <div ng-if="answer[0].isText" class="item item-text-wrap">
                                     <p>{{ answer[0].value }}</p>
-                                    <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                    <div ng-if="answer[1]" class="badge badge-inline badge-dark"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></div>
                                 </div>
 
                                 <!-- Matching. -->
                                 <div ng-if="answer[0].isSelect" class="item item-text-wrap row mm-item-padding">
-                                    <div class="col">
+                                    <div class="col col-50">
                                         <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{ answer[0].content }}</mm-format-text></p>
                                     </div>
-                                    <div class="col">
-                                        <p class="mm-select-fix">
-                                            {{answer[0].value}}
-                                        </p>
+                                    <div class="col  col-50">
+                                        <p>{{answer[0].value}}</p>
+                                        <div ng-if="answer[1]" class="badge badge-inline badge-dark"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></div>
                                     </div>
-                                    <span ng-if="answer[1]" class="badge"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
                                 </div>
 
                                 <!-- Essay or couldn't determine. -->
                                 <div ng-if="!answer[0].isCheckbox && !answer[0].isText && !answer[0].isSelect" class="item item-text-wrap">
-                                    <mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0]}}</mm-format-text>
-                                    <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                    <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0]}}</mm-format-text></p>
+                                    <div ng-if="answer[1]" class="badge badge-inline badge-dark"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></div>
                                 </div>
                             </div>
                             <div ng-if="!page.isContent && !page.isQuestion" class="item item-text-wrap">
                                 <!-- Another page (end of branch, ...). -->
                                 <p><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[0]}}</mm-format-text></p>
-                                <span ng-if="answer[1]" class="badge badge-inline"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></span>
+                                <div ng-if="answer[1]" class="badge badge-inline badge-dark"><mm-format-text component="{{component}}" component-id="{{lesson.coursemodule}}">{{answer[1]}}</mm-format-text></div>
                             </div>
                         </div>
                         <div ng-if="page.answerdata.response" class="item item-text-wrap">
diff --git a/www/addons/mod/lesson/templates/view.html b/www/addons/mod/lesson/templates/view.html
index 0b77f23ba01..13d0e5dbfe4 100644
--- a/www/addons/mod/lesson/templates/view.html
+++ b/www/addons/mod/lesson/templates/view.html
@@ -16,47 +16,38 @@
     <ion-input class="item item-input item-stacked-label">
         <ion-label>{{ 'mma.mod_lesson.enterpassword' | translate }}</ion-label>
         <input id="mma-mod-lesson-password-input" type="password" placeholder="{{ 'mm.login.password' | translate }}" ng-model="data.password" mm-show-password>
-        <button class="button button-block" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+        <button class="button button-block button-positive icon-right ion-chevron-right" ng-click="submitPassword(data.password)">{{ 'mma.mod_lesson.continue' | translate }}</button>
     </ion-input>
 </form>
 
-<div ng-if="lesson && (!preventMessages || !preventMessages.length) && !showSpinner">
-    <div ng-if="attemptToReview" class="card">
-        <!-- An attempt was finished in a synchronization, allow reviewing it. -->
-        <p class="item item-text-wrap">{{ 'mma.mod_lesson.attemptfinishedinsync' | translate }}</p>
-        <div class="item">
+<mm-loading hide-until="!showSpinner">
+    <section class="list" ng-if="lesson && (!preventMessages || !preventMessages.length)">
+        <div ng-if="attemptToReview" class="item item-text-wrap">
+            <!-- An attempt was finished in a synchronization, allow reviewing it. -->
+            <p>{{ 'mma.mod_lesson.attemptfinishedinsync' | translate }}</p>
             <button class="button button-block" ng-click="review()">{{ 'mma.mod_lesson.review' | translate }}</button>
         </div>
-    </div>
-    <div ng-if="leftDuringTimed && !lesson.timelimit" class="card">
-        <!-- User left during the session and there is no time limit, ask to continue. -->
-        <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
-        <div class="item button-bar">
-            <button class="button" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
-            <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
+        <div ng-if="leftDuringTimed && !lesson.timelimit" class="item item-text-wrap">
+            <!-- User left during the session and there is no time limit, ask to continue. -->
+            <p ng-bind-html="'mma.mod_lesson.youhaveseen' | translate"></p>
+            <div class="button-bar padding-top">
+                <button class="button button-positive" ng-click="start(true)">{{ 'mm.core.yes' | translate }}</button>
+                <button class="button" ng-click="start(false)">{{ 'mm.core.no' | translate }}</button>
+            </div>
         </div>
-    </div>
-    <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="card">
-        <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
-        <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
-        <div class="item">
-            <button class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.continue' | translate }}</button>
+        <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="item item-text-wrap">
+            <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
+            <p ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
+            <button class="button button-block" ng-click="start(false) button-positive icon-right ion-chevron-right">{{ 'mma.mod_lesson.continue' | translate }}</button>
         </div>
-    </div>
-    <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="card">
-        <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
-        <p class="item item-text-wrap" ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
-    </div>
-    <div ng-if="!leftDuringTimed" class="card">
-        <!-- User hasn't left during the session, show a start button. -->
-        <div class="item">
-            <button ng-if="!canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
-            <button ng-if="canManage" class="button button-block" ng-click="start(false)">{{ 'mma.mod_lesson.preview' | translate }}</button>
+        <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="item item-text-wrap">
+            <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->
+            <p ng-bind-html="'mma.mod_lesson.leftduringtimednoretake' | translate"></p>
         </div>
-    </div>
-</div>
-<div class="card" ng-if="showSpinner">
-    <div class="item text-center">
-        <ion-spinner></ion-spinner>
-    </div>
-</div>
\ No newline at end of file
+        <div ng-if="!leftDuringTimed" class="item item-text-wrap">
+            <!-- User hasn't left during the session, show a start button. -->
+            <button ng-if="!canManage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
+            <button ng-if="canManage" class="button button-block icon-left ion-search" ng-click="start(false)">{{ 'mma.mod_lesson.preview' | translate }}</button>
+        </div>
+    </section>
+</mm-loading>
diff --git a/www/addons/mod/quiz/templates/player.html b/www/addons/mod/quiz/templates/player.html
index 3602efdd5c4..d2189cf3dd5 100644
--- a/www/addons/mod/quiz/templates/player.html
+++ b/www/addons/mod/quiz/templates/player.html
@@ -71,7 +71,7 @@ <h2>{{ 'mma.mod_quiz.summaryofattempt' | translate }}</h2>
                 <div class="item item-text-wrap" ng-if="attempt.dueDateWarning">
                     {{ attempt.dueDateWarning }}
                 </div>
-                <mm-timer ng-if="endTime" class="item item-text-wrap" end-time="endTime" finished="timeUp()" timer-text="{{ 'mma.mod_quiz.timeleft' | translate }}"></mm-timer>
+                <mm-timer ng-if="endTime" end-time="endTime" finished="timeUp()" timer-text="{{ 'mma.mod_quiz.timeleft' | translate }}"></mm-timer>
                 <div class="item item-text-wrap" ng-if="preventSubmitMessages.length">
                     <p class="item-heading">{{ 'mma.mod_quiz.cannotsubmitquizdueto' | translate }}</p>
                     <p ng-repeat="message in preventSubmitMessages">{{message}}</p>
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 40b552e5b11..5550300d4ae 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -320,6 +320,20 @@ p.item-text-wrap {
   }
 }
 
+.mm-menu-selected:not(.button) {
+  background-color: $gray-lighter;
+  border-left: 5px solid $mm-color-light;
+  padding-left: $item-padding - 4;
+
+  &.item-avatar,
+  &.item-avatar-left {
+    padding-left: $item-avatar-width + ($item-padding * 2) - 4;
+    > img:first-child {
+      left: $item-padding - 4;
+    }
+  }
+}
+
 .user-with-avatar {
   position: relative;
   z-index: 2;
@@ -481,19 +495,9 @@ mm-loading.mm-loading-noheight .mm-loading-content {
   right: 16px;
 }
 
-.mm-split-item-selected:not(.button),
-.mm-split-item-selected.item:not(.button) {
-  background-color: $gray-lighter;
-  border-left: 5px solid $mm-color-light;
-  padding-left: $item-padding - 4;
-
-  &.item-avatar,
-  &.item-avatar-left {
-    padding-left: $item-avatar-width + ($item-padding * 2) - 4;
-    > img:first-child {
-      left: $item-padding - 4;
-    }
-  }
+.mm-split-item-selected,
+.mm-split-item-selected.item {
+  @extend .mm-menu-selected;
 }
 
 .mm-module-buttons {
@@ -584,6 +588,7 @@ mm-navigation-bar {
 // When using .item and .row in the same element, .row's padding prevails. Use this class to keep .item's padding.
 .item.row.mm-item-padding {
   padding: $item-padding / 2;
+  width: initial;
 }
 
 .row-buttons {
@@ -810,17 +815,26 @@ mm-timer {
 }
 
 // Style timer in items.
-.item mm-timer.mm-timer, mm-timer.mm-timer.item {
-  p, span, label {
+mm-timer.mm-timer .item {
+  span, label {
     color: $item-default-text;
     font-size: $item-font-size;
   }
+  span {
+    font-weight: bold;
+  }
 }
 
 // Create the timer warning colors. Go from $mm-timer-color to $mm-timer-warn-color.
 @for $i from 0 through $mm-timer-iterations {
-  mm-timer.mm-timer.mm-timer-timeleft-#{$i} {
+  mm-timer.mm-timer.mm-timer-timeleft-#{$i} .item {
     background-color: mix($mm-timer-color, $mm-timer-warn-color, ($i / $mm-timer-iterations) * 100);
+    @if $i <= $mm-timer-iterations / 2 {
+      label, span, i {
+        color: $white;
+      }
+    }
+
   }
 }
 
diff --git a/www/core/templates/timer.html b/www/core/templates/timer.html
index bae2fc614b8..6ee19584c0f 100644
--- a/www/core/templates/timer.html
+++ b/www/core/templates/timer.html
@@ -1,5 +1,6 @@
-<label ng-if="text">{{text}} </label>
-<b>
+<div class="item item-text-wrap item-icon-left">
+    <i class="icon ion-clock"></i>
+    <label ng-if="text">{{text}} </label>
 	<span ng-if="timeLeft > 0">{{ timeLeft | mmSecondsToHMS }}</span>
 	<span ng-if="timeLeft <= 0">{{ 'mm.core.timesup' | translate }}</span>
-</b>
\ No newline at end of file
+</div>
\ No newline at end of file

From 2d81a4c0093d39410d77b352a2a7a361e8be9ddc Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 27 Mar 2017 12:01:05 +0200
Subject: [PATCH 155/218] MOBILE-2017 lesson: Capture view links

---
 www/addons/mod/lesson/main.js                 |  3 +-
 www/addons/mod/lesson/services/handlers.js    | 66 ++++++++++++++++++-
 .../mod/lesson/services/prefetch_handler.js   |  3 +
 .../contentlinks/services/helper.js           |  2 +-
 4 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 64bc2e33933..dc77e242c93 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -76,9 +76,10 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
 
 })
 
-.config(function($mmCourseDelegateProvider, $mmCoursePrefetchDelegateProvider) {
+.config(function($mmCourseDelegateProvider, $mmCoursePrefetchDelegateProvider, $mmContentLinksDelegateProvider) {
     $mmCourseDelegateProvider.registerContentHandler('mmaModLesson', 'lesson', '$mmaModLessonHandlers.courseContentHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModLesson', 'lesson', '$mmaModLessonPrefetchHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModLesson:view', '$mmaModLessonHandlers.viewLinksHandler');
 })
 
 .run(function($mmCronDelegate) {
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index 8c64ac1ef6d..49bf72f267d 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -23,7 +23,8 @@ angular.module('mm.addons.mod_lesson')
  */
 .factory('$mmaModLessonHandlers', function($mmCourse, $mmaModLesson, $state, $mmaModLessonPrefetchHandler, $mmUtil, $mmEvents,
             $mmSite, $mmCoursePrefetchDelegate, mmCoreEventPackageStatusChanged, mmaModLessonComponent, mmCoreDownloading,
-            mmCoreNotDownloaded, mmCoreOutdated, $mmaModLessonSync) {
+            mmCoreNotDownloaded, mmCoreOutdated, $mmaModLessonSync, $mmCourseHelper, $mmContentLinksHelper, $q,
+            $mmContentLinkHandlerFactory) {
 
     var self = {};
 
@@ -197,5 +198,68 @@ angular.module('mm.addons.mod_lesson')
         return self;
     };
 
+    /**
+     * Content links handler for lesson view.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHandlers#viewLinksHandler
+     */
+    self.viewLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/lesson\/view\.php.*([\&\?]id=\d+)/, '$mmCourseDelegate_mmaModLesson');
+
+    // Check if the handler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.viewLinksHandler.isEnabled = function(siteId, url, params, courseId) {
+        courseId = courseId || params.courseid || params.cid;
+        return $mmContentLinksHelper.isModuleIndexEnabled($mmaModLesson, siteId, courseId);
+    };
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.viewLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        courseId = courseId || params.courseid || params.cid;
+
+        return [{
+            action: function(siteId) {
+                // Ignore the pageid param. If we open the lesson player with a certain page and the user hasn't started
+                // the lesson, an error is thrown: could not find lesson_timer records.
+                if (params.userpassword) {
+                    navigateToModuleWithPassword(parseInt(params.id, 10), courseId, params.userpassword, siteId);
+                } else {
+                    $mmCourseHelper.navigateToModule(parseInt(params.id, 10), siteId, courseId);
+                }
+            }
+        }];
+    };
+
+    /**
+     * Navigate to a lesson module (index page) with a fixed password.
+     *
+     * @param  {Number} moduleId   Module ID.
+     * @param  {Number} [courseId] Course ID.
+     * @param  {String} [password] Password.
+     * @param  {String} siteId     Site ID.
+     * @return {Promise}           Promise resolved when navigated.
+     */
+    function navigateToModuleWithPassword(moduleId, courseId, password, siteId) {
+        var modal = $mmUtil.showModalLoading();
+
+        // Get the module.
+        return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
+            courseId = courseId || module.course;
+
+            // Store the password so it's automatically used.
+            return $mmaModLesson.storePassword(parseInt(module.instance, 10), password).catch(function() {
+                // Ignore errors.
+            }).then(function() {
+                return $mmCourseHelper.navigateToModule(moduleId, siteId, courseId, module.section);
+            });
+        }).catch(function() {
+            // Error, go to index page.
+            return $mmCourseHelper.navigateToModule(moduleId, siteId, courseId);
+        }).finally(function() {
+            modal.dismiss();
+        });
+    }
+
     return self;
 });
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 47c526b4b7b..99053c22a4d 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -466,6 +466,9 @@ angular.module('mm.addons.mod_lesson')
             // Prefetch question attempts in last attempt for offline calculations.
             promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, attempt, false, undefined, false, true, siteId));
 
+            // Get module info to be able to handle links.
+            promises.push($mmCourse.getModuleBasicInfo(module.id, siteId));
+
             if (accessInfo.canviewreports) {
                 // Prefetch reports data.
                 promises.push($mmGroups.getActivityAllowedGroupsIfEnabled(module.id, undefined, siteId).then(function(groups) {
diff --git a/www/core/components/contentlinks/services/helper.js b/www/core/components/contentlinks/services/helper.js
index f93fec07c69..a9b83428c04 100644
--- a/www/core/components/contentlinks/services/helper.js
+++ b/www/core/components/contentlinks/services/helper.js
@@ -34,7 +34,7 @@ angular.module('mm.core.contentlinks')
      *
      * @module mm.core.contentlinks
      * @ngdoc method
-     * @name $mmContentLinksHelper#createModuleIndexLinkHandler
+     * @name $mmContentLinksHelper#createModuleGradeLinkHandler
      * @param  {String} addon          Name of the addon as it's registered in $mmCourseDelegateProvider.
      * @param  {String} modName        Name of the module (assign, book, ...)
      * @param  {Object} service        Module's service. Should implement a 'isPluginEnabled(siteId)' function.

From f4770a3e470e0cfe5da831d388657ce89d58fe4b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 15 May 2017 11:13:29 +0200
Subject: [PATCH 156/218] MOBILE-2017 lesson: Capture reports links

---
 www/addons/mod/lesson/controllers/index.js |   4 +-
 www/addons/mod/lesson/main.js              |   5 +-
 www/addons/mod/lesson/services/handlers.js | 102 +++++++++++++++++++++
 3 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index cc5667e080d..b4eff301a2c 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -51,8 +51,8 @@ angular.module('mm.addons.mod_lesson')
     $scope.data = {
         password: ''
     };
-    $scope.display = $scope.DISPLAY_VIEW;
-    $scope.selectedGroup = 0;
+    $scope.display = $stateParams.action == 'report' ? $scope.DISPLAY_REPORTS : $scope.DISPLAY_VIEW;
+    $scope.selectedGroup = $stateParams.group || 0;
 
     // Convenience function to get Lesson data.
     function fetchLessonData(refresh, sync, showErrors) {
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index dc77e242c93..08bb0614888 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -30,7 +30,9 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
       url: '/mod_lesson',
       params: {
         module: null,
-        courseid: null
+        courseid: null,
+        action: null,
+        group: null // Only if action == 'report'.
       },
       views: {
         'site': {
@@ -80,6 +82,7 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
     $mmCourseDelegateProvider.registerContentHandler('mmaModLesson', 'lesson', '$mmaModLessonHandlers.courseContentHandler');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModLesson', 'lesson', '$mmaModLessonPrefetchHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModLesson:view', '$mmaModLessonHandlers.viewLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModLesson:overview', '$mmaModLessonHandlers.overviewLinksHandler');
 })
 
 .run(function($mmCronDelegate) {
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index 49bf72f267d..77cab278f81 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -261,5 +261,107 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    /**
+     * Content links handler for report overview.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHandlers#overviewLinksHandler
+     */
+    self.overviewLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/lesson\/report\.php.*([\&\?]id=\d+)/, '$mmCourseDelegate_mmaModLesson');
+
+    // Check if the handler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.overviewLinksHandler.isEnabled = function(siteId, url, params, courseId) {
+        courseId = courseId || params.courseid || params.cid;
+        if (params.action == 'reportdetail' && !params.userid) {
+            // Individual details are only available if the teacher is seeing a certain user.
+            return false;
+        }
+
+        return $mmContentLinksHelper.isModuleIndexEnabled($mmaModLesson, siteId, courseId);
+    };
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.overviewLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        courseId = courseId || params.courseid || params.cid;
+
+        return [{
+            action: function(siteId) {
+                if (!params.action || params.action == 'reportoverview') {
+                    // Go to overview.
+                    openReportOverview(parseInt(params.id, 10), courseId, parseInt(params.group, 10), siteId);
+                } else if (params.action == 'reportdetail') {
+                    openUserAttempt(parseInt(params.id, 10), parseInt(params.userid, 10), courseId,
+                            parseInt(params.try, 10), siteId);
+                }
+            }
+        }];
+    };
+
+    /**
+     * Open report overview.
+     *
+     * @param  {Number} moduleId   Module ID.
+     * @param  {Number} [courseId] Course ID.
+     * @param  {String} [groupId]  Group ID.
+     * @param  {String} siteId     Site ID.
+     * @return {Promise}           Promise resolved when navigated.
+     */
+    function openReportOverview(moduleId, courseId, groupId, siteId) {
+        var modal = $mmUtil.showModalLoading();
+
+        // Get the module object.
+        return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
+            courseId = courseId || module.course;
+
+            var stateParams = {
+                module: module,
+                courseid: courseId ? parseInt(courseId, 10) : courseId,
+                action: 'report',
+                group: groupId
+            };
+            $mmContentLinksHelper.goInSite('site.mod_lesson', stateParams, siteId);
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error processing link.');
+            return $q.reject();
+        }).finally(function() {
+            modal.dismiss();
+        });
+    }
+
+    /**
+     * Open a user's attempt.
+     *
+     * @param  {Number} moduleId   Module ID.
+     * @param  {Number} userId     User ID.
+     * @param  {Number} [courseId] Course ID.
+     * @param  {Number} [attempt]  Attempt to open.
+     * @param  {String} [groupId]  Group ID.
+     * @param  {String} siteId     Site ID.
+     * @return {Promise}           Promise resolved when navigated.
+     */
+    function openUserAttempt(moduleId, userId, courseId, attempt, siteId) {
+        var modal = $mmUtil.showModalLoading();
+
+        // Get the module object.
+        return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(module) {
+            courseId = courseId || module.course;
+
+            var stateParams = {
+                lessonid: module.instance,
+                courseid: courseId ? parseInt(courseId, 10) : courseId,
+                userid: userId,
+                attempt: attempt || 0
+            };
+            $mmContentLinksHelper.goInSite('site.mod_lesson-userattempt', stateParams, siteId);
+        }).catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'Error processing link.');
+            return $q.reject();
+        }).finally(function() {
+            modal.dismiss();
+        });
+    }
+
     return self;
 });

From 097b37106651499d2c2be534cc0ec2a2d69091eb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 May 2017 09:23:45 +0200
Subject: [PATCH 157/218] MOBILE-2017 lesson: Review lesson terminology (code)

---
 www/addons/mod/lesson/controllers/index.js    |  34 +-
 www/addons/mod/lesson/controllers/player.js   |  62 +--
 .../{userattempt.js => userretake.js}         |  55 +--
 www/addons/mod/lesson/lang/en.json            |  12 +-
 www/addons/mod/lesson/main.js                 |  12 +-
 www/addons/mod/lesson/scss/styles.scss        |   2 +-
 www/addons/mod/lesson/services/handlers.js    |  12 +-
 www/addons/mod/lesson/services/helper.js      |  34 +-
 www/addons/mod/lesson/services/lesson.js      | 364 +++++++++---------
 .../mod/lesson/services/lesson_offline.js     | 297 +++++++-------
 www/addons/mod/lesson/services/lesson_sync.js | 154 ++++----
 .../mod/lesson/services/prefetch_handler.js   |  38 +-
 www/addons/mod/lesson/templates/player.html   |   2 +-
 www/addons/mod/lesson/templates/reports.html  |   6 +-
 .../{userattempt.html => userretake.html}     |  28 +-
 www/addons/mod/lesson/templates/view.html     |   6 +-
 16 files changed, 564 insertions(+), 554 deletions(-)
 rename www/addons/mod/lesson/controllers/{userattempt.js => userretake.js} (74%)
 rename www/addons/mod/lesson/templates/{userattempt.html => userretake.html} (85%)

diff --git a/www/addons/mod/lesson/controllers/index.js b/www/addons/mod/lesson/controllers/index.js
index b4eff301a2c..266e70248b0 100644
--- a/www/addons/mod/lesson/controllers/index.js
+++ b/www/addons/mod/lesson/controllers/index.js
@@ -92,15 +92,15 @@ angular.module('mm.addons.mod_lesson')
                     $scope.hasOffline = hasOffline;
                 }));
 
-                // Check if there is an attempt finished in a synchronization.
-                promises.push($mmaModLessonSync.getAttemptFinishedInSync(lesson.id).then(function(attempt) {
-                    if (attempt && attempt.attempt == accessInfo.attemptscount - 1) {
-                        // The attempt finished is still the last attempt. Allow reviewing it.
-                        $scope.attemptToReview = attempt;
+                // Check if there is a retake finished in a synchronization.
+                promises.push($mmaModLessonSync.getRetakeFinishedInSync(lesson.id).then(function(retake) {
+                    if (retake && retake.retake == accessInfo.attemptscount - 1) {
+                        // The retake finished is still the last retake. Allow reviewing it.
+                        $scope.retakeToReview = retake;
                     } else {
-                        $scope.attemptToReview = undefined;
-                        if (attempt) {
-                            $mmaModLessonSync.deleteAttemptFinishedInSync(lesson.id);
+                        $scope.retakeToReview = undefined;
+                        if (retake) {
+                            $mmaModLessonSync.deleteRetakeFinishedInSync(lesson.id);
                         }
                     }
                 }));
@@ -124,7 +124,7 @@ angular.module('mm.addons.mod_lesson')
                         $scope.preventMessages = info.preventaccessreasons;
                     });
                 } else  {
-                    // Lesson cannot be attempted, stop.
+                    // Lesson cannot be started, stop.
                     $scope.preventMessages = info.preventaccessreasons;
                     return;
                 }
@@ -135,7 +135,7 @@ angular.module('mm.addons.mod_lesson')
             }
 
             return $q.all(promises).then(function() {
-                // Lesson can be attempted, don't ask the password and don't show prevent messages.
+                // Lesson can be started, don't ask the password and don't show prevent messages.
                 fetchDataFinished(refresh);
             });
         }).catch(function(message) {
@@ -209,7 +209,7 @@ angular.module('mm.addons.mod_lesson')
             }
         }
 
-        return $mmaModLesson.getAttemptsOverview(lesson.id, groupId).then(function(data) {
+        return $mmaModLesson.getRetakesOverview(lesson.id, groupId).then(function(data) {
             var promises = [];
 
             // Format times and grades.
@@ -285,7 +285,7 @@ angular.module('mm.addons.mod_lesson')
             promises.push($mmaModLesson.invalidateTimers(lesson.id));
             promises.push($mmaModLesson.invalidateContentPagesViewed(lesson.id));
             promises.push($mmaModLesson.invalidateQuestionsAttempts(lesson.id));
-            promises.push($mmaModLesson.invalidateAttemptsOverview(lesson.id));
+            promises.push($mmaModLesson.invalidateRetakesOverview(lesson.id));
             promises.push($mmGroups.invalidateActivityGroupInfo(module.id));
         }
 
@@ -376,7 +376,7 @@ angular.module('mm.addons.mod_lesson')
     // Fetch the Lesson data.
     fetchLessonData(false, true).then(function() {
         if (!$scope.preventMessages || !$scope.preventMessages.length) {
-            // Lesson can be attempted, log viewing it.
+            // Lesson can be started, log viewing it.
             logView();
         }
     }).finally(function() {
@@ -421,18 +421,18 @@ angular.module('mm.addons.mod_lesson')
 
     // Review the lesson.
     $scope.review = function() {
-        if (!$scope.attemptToReview) {
-            // No attempt to review, stop.
+        if (!$scope.retakeToReview) {
+            // No retake to review, stop.
             return;
         }
 
         $state.go('site.mod_lesson-player', {
             courseid: courseId,
             lessonid: lesson.id,
-            pageid: $scope.attemptToReview.pageid,
+            pageid: $scope.retakeToReview.pageid,
             password: password,
             review: true,
-            attempt: $scope.attemptToReview.attempt
+            retake: $scope.retakeToReview.retake
         });
     };
 
diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index a48a4fd3bf4..24932b52fe2 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -75,16 +75,16 @@ angular.module('mm.addons.mod_lesson')
             $scope.canManage = info.canmanage;
 
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
-                // If it's a password protected lesson and we have the password, allow attempting it.
+                // If it's a password protected lesson and we have the password, allow playing it.
                 if (!password || info.preventaccessreasons.length > 1 || !$mmaModLesson.isPasswordProtected(info)) {
-                    // Lesson cannot be attempted, show message and go back.
+                    // Lesson cannot be played, show message and go back.
                     return $q.reject(info.preventaccessreasons[0].message);
                 }
             }
 
-            if ($scope.review && $stateParams.attempt != accessInfo.attemptscount - 1) {
-                // Reviewing an attempt that isn't the last one. Error.
-                return $mmLang.translateAndReject('mma.mod_lesson.errorreviewattemptnotlast');
+            if ($scope.review && $stateParams.retake != accessInfo.attemptscount - 1) {
+                // Reviewing a retake that isn't the last one. Error.
+                return $mmLang.translateAndReject('mma.mod_lesson.errorreviewretakenotlast');
             }
 
             if (password) {
@@ -110,14 +110,14 @@ angular.module('mm.addons.mod_lesson')
             $scope.lessonWidth = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediawidth) : '';
             $scope.lessonHeight = lesson.slideshow ?  $mmUtil.formatPixelsSize(lesson.mediaheight) : '';
 
-            return launchAttempt($scope.currentPage);
+            return launchRetake($scope.currentPage);
         }).catch(function(message) {
             // An error occurred.
             var promise;
 
-            if ($scope.review && $stateParams.attempt && $mmUtil.isWebServiceError(message)) {
-                // The user cannot review the attempt. Unmark the attempt as being finished in sync.
-                promise = $mmaModLessonSync.deleteAttemptFinishedInSync(lessonId);
+            if ($scope.review && $stateParams.retake && $mmUtil.isWebServiceError(message)) {
+                // The user cannot review the retake. Unmark the retake as being finished in sync.
+                promise = $mmaModLessonSync.deleteRetakeFinishedInSync(lessonId);
             } else {
                 promise = $q.when();
             }
@@ -130,19 +130,19 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
-    // Start or continue an attempt.
-    function launchAttempt(pageId) {
+    // Start or continue a retake.
+    function launchRetake(pageId) {
         var promise;
 
         if ($scope.review) {
-            // Review mode, no need to launch the attempt
+            // Review mode, no need to launch the retake.
             promise = $q.when({});
         } else if (!offline) {
-            // Not in offline mode, launch the attempt.
-            promise = $mmaModLesson.launchAttempt(lesson.id, password, pageId);
+            // Not in offline mode, launch the retake.
+            promise = $mmaModLesson.launchRetake(lesson.id, password, pageId);
         } else {
-            // Check if there is a finished offline attempt.
-            promise = $mmaModLessonOffline.hasFinishedAttempt(lesson.id).then(function(finished) {
+            // Check if there is a finished offline retake.
+            promise = $mmaModLessonOffline.hasFinishedRetake(lesson.id).then(function(finished) {
                 if (finished) {
                     // Always show EOL page.
                     pageId = $mmaModLesson.LESSON_EOL;
@@ -165,7 +165,7 @@ angular.module('mm.addons.mod_lesson')
         }).then(function() {
             if ($scope.currentPage == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
-                return finishAttempt();
+                return finishRetake();
             }
             return loadPage($scope.currentPage);
         });
@@ -175,14 +175,14 @@ angular.module('mm.addons.mod_lesson')
     function loadPage(pageId) {
         if (pageId == $mmaModLesson.LESSON_EOL) {
             // End of lesson reached.
-            return finishAttempt();
+            return finishRetake();
         }
 
         var args = [lesson, pageId, password, $scope.review, true, offline, true, accessInfo, jumps];
         return callFunction($mmaModLesson.getPageData, args, 5, 8).then(function(data) {
             if (data.newpageid == $mmaModLesson.LESSON_EOL) {
                 // End of lesson reached.
-                return finishAttempt();
+                return finishRetake();
             }
 
             $scope.pageData = data;
@@ -213,8 +213,8 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
-    // Finish the attempt.
-    function finishAttempt(outOfTime) {
+    // Finish the retake.
+    function finishRetake(outOfTime) {
         var promise;
 
         $scope.messages = [];
@@ -225,15 +225,15 @@ angular.module('mm.addons.mod_lesson')
                 if (result.warnings && result.warnings.length) {
                     var error = result.warnings[0];
 
-                    // Some data was deleted. Check if the attempt has changed.
+                    // Some data was deleted. Check if the retake has changed.
                     return $mmaModLesson.getAccessInformation(lesson.id).then(function(info) {
                         if (info.attemptscount != accessInfo.attemptscount) {
-                            // The attempt has changed. Leave the view and show the error.
+                            // The retake has changed. Leave the view and show the error.
                             blockData && blockData.back();
                             return $q.reject(error);
                         }
 
-                        // Attempt hasn't changed, show the warning and finish the attempt in online.
+                        // Retake hasn't changed, show the warning and finish the retake in online.
                         offline = false;
                         $mmUtil.showErrorModal(error);
                     });
@@ -248,9 +248,9 @@ angular.module('mm.addons.mod_lesson')
         }
 
         return promise.then(function() {
-            // Now finish the attempt.
+            // Now finish the retake.
             var args = [lesson, courseId, password, outOfTime, $scope.review, offline, accessInfo];
-            return callFunction($mmaModLesson.finishAttempt, args, 5);
+            return callFunction($mmaModLesson.finishRetake, args, 5);
         }).then(function(data) {
             $scope.title = lesson.name;
             $scope.eolData = data.data;
@@ -285,7 +285,7 @@ angular.module('mm.addons.mod_lesson')
         $scope.pageLoaded = false;
     }
 
-    // Function called when the user wants to leave the player. Save the attempt before leaving.
+    // Function called when the user wants to leave the player. Save the data before leaving.
     function leavePlayer() {
         if ($scope.question && !$scope.eolData && !$scope.processData && originalData) {
             // Question shown. Check if there is any change.
@@ -382,7 +382,7 @@ angular.module('mm.addons.mod_lesson')
             return;
         } else if (pageId == $mmaModLesson.LESSON_EOL) {
             // End of lesson reached.
-            return finishAttempt();
+            return finishRetake();
         }
 
         // Load new page.
@@ -423,8 +423,8 @@ angular.module('mm.addons.mod_lesson')
 
     // Fetch the Lesson data.
     fetchLessonData().then(function() {
-        // Review data loaded or new attempt started, remove any attempt being finished in sync.
-        $mmaModLessonSync.deleteAttemptFinishedInSync(lessonId);
+        // Review data loaded or new retake started, remove any retake being finished in sync.
+        $mmaModLessonSync.deleteRetakeFinishedInSync(lessonId);
     }).finally(function() {
         $scope.pageLoaded = true;
     });
@@ -468,7 +468,7 @@ angular.module('mm.addons.mod_lesson')
         $scope.endTime = false;
         showLoading();
 
-        return finishAttempt(true).catch(function(error) {
+        return finishRetake(true).catch(function(error) {
             $mmUtil.showErrorModalDefault(error, 'Error finishing attempt');
             return $q.reject();
         }).finally(function() {
diff --git a/www/addons/mod/lesson/controllers/userattempt.js b/www/addons/mod/lesson/controllers/userretake.js
similarity index 74%
rename from www/addons/mod/lesson/controllers/userattempt.js
rename to www/addons/mod/lesson/controllers/userretake.js
index b2a74913d86..4a7bcca39e9 100644
--- a/www/addons/mod/lesson/controllers/userattempt.js
+++ b/www/addons/mod/lesson/controllers/userretake.js
@@ -15,19 +15,19 @@
 angular.module('mm.addons.mod_lesson')
 
 /**
- * View user attempt controller.
+ * View user retake controller.
  *
  * @module mm.addons.mod_lesson
  * @ngdoc controller
- * @name mmaModLessonUserAttemptCtrl
+ * @name mmaModLessonUserRetakeCtrl
  */
-.controller('mmaModLessonUserAttemptCtrl', function($scope, $stateParams, $mmaModLesson, $q, $mmLang, $mmUtil, $mmSite, $mmUser,
+.controller('mmaModLessonUserRetakeCtrl', function($scope, $stateParams, $mmaModLesson, $q, $mmLang, $mmUtil, $mmSite, $mmUser,
     $mmaModLessonHelper, mmaModLessonComponent) {
 
     var lessonId = $stateParams.lessonid,
         courseId = $stateParams.courseid,
         userId = $stateParams.userid || $mmSite.getUserId(),
-        attemptNumber = $stateParams.attempt,
+        retakeNumber = $stateParams.retake,
         lesson;
 
     $scope.courseId = courseId;
@@ -39,8 +39,8 @@ angular.module('mm.addons.mod_lesson')
             lesson = lessonData;
             $scope.lesson = lesson;
 
-            // Get the attempts overview for all participants.
-            return $mmaModLesson.getAttemptsOverview(lesson.id);
+            // Get the retakes overview for all participants.
+            return $mmaModLesson.getRetakesOverview(lesson.id);
         }).then(function(data) {
             // Search the student.
             var student;
@@ -60,22 +60,23 @@ angular.module('mm.addons.mod_lesson')
                 return $mmLang.translateAndReject('mma.mod_lesson.cannotfinduser');
             }
             if (!student.attempts || !student.attempts.length) {
+                // No retakes.
                 return $mmLang.translateAndReject('mma.mod_lesson.cannotfindattempt');
             }
 
             student.bestgrade = $mmUtil.roundToDecimals(student.bestgrade, 2);
-            angular.forEach(student.attempts, function(attempt) {
-                if (attemptNumber == attempt.try) {
-                    // The attempt specified as parameter exists. Use it.
-                    $scope.selectedAttempt = attemptNumber;
+            angular.forEach(student.attempts, function(retake) {
+                if (retakeNumber == retake.try) {
+                    // The retake specified as parameter exists. Use it.
+                    $scope.selectedRetake = retakeNumber;
                 }
 
-                attempt.label = $mmaModLessonHelper.getAttemptLabel(attempt);
+                retake.label = $mmaModLessonHelper.getRetakeLabel(retake);
             });
 
-            if (!$scope.selectedAttempt) {
-                // Attempt number not specified or not valid, use the last attempt.
-                $scope.selectedAttempt = student.attempts[student.attempts.length - 1].try;
+            if (!$scope.selectedRetake) {
+                // Retake number not specified or not valid, use the last retake.
+                $scope.selectedRetake = student.attempts[student.attempts.length - 1].try;
             }
 
            return $mmUser.getProfile(student.id, courseId, true).then(function(user) {
@@ -87,7 +88,7 @@ angular.module('mm.addons.mod_lesson')
             });
         }).then(function(student) {
             $scope.student = student;
-            return setAttempt($scope.selectedAttempt);
+            return setRetake($scope.selectedRetake);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'Error getting data.', true);
             return $q.reject();
@@ -95,10 +96,10 @@ angular.module('mm.addons.mod_lesson')
     }
 
     // Set a group to view the reports.
-    function setAttempt(attemptNumber) {
-        $scope.selectedAttempt = attemptNumber;
+    function setRetake(retakeNumber) {
+        $scope.selectedRetake = retakeNumber;
 
-        return $mmaModLesson.getUserAttempt(lesson.id, attemptNumber, userId).then(function(data) {
+        return $mmaModLesson.getUserRetake(lesson.id, retakeNumber, userId).then(function(data) {
 
             if (data && data.completed != -1) {
                 // Completed.
@@ -122,7 +123,7 @@ angular.module('mm.addons.mod_lesson')
                 }
             });
 
-            $scope.attempt = data;
+            $scope.retake = data;
         });
     }
 
@@ -132,8 +133,8 @@ angular.module('mm.addons.mod_lesson')
 
         promises.push($mmaModLesson.invalidateLessonData(courseId));
         if (lesson) {
-            promises.push($mmaModLesson.invalidateAttemptsOverview(lesson.id));
-            promises.push($mmaModLesson.invalidateUserAttemptsForUser(lesson.id, userId));
+            promises.push($mmaModLesson.invalidateRetakesOverview(lesson.id));
+            promises.push($mmaModLesson.invalidateUserRetakesForUser(lesson.id, userId));
         }
 
         return $q.all(promises).finally(function() {
@@ -143,7 +144,7 @@ angular.module('mm.addons.mod_lesson')
 
     // Fetch the data.
     fetchData().finally(function() {
-        $scope.attemptLoaded = true;
+        $scope.retakeLoaded = true;
     });
 
     // Pull to refresh.
@@ -153,14 +154,14 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
-    // Change the attempt displayed.
-    $scope.setAttempt = function(attemptNumber) {
-        $scope.attemptLoaded = false;
-        return setAttempt(attemptNumber).catch(function(message) {
+    // Change the retake displayed.
+    $scope.setRetake = function(retakeNumber) {
+        $scope.retakeLoaded = false;
+        return setRetake(retakeNumber).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'Error getting attempt.');
             return $q.reject();
         }).finally(function() {
-            $scope.attemptLoaded = true;
+            $scope.retakeLoaded = true;
         });
     };
 });
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 589aa6f01c9..eefeadc5f2c 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,9 +1,6 @@
 {
     "answer": "Answer",
-    "attemptfinishedinsync": "An offline attempt was synchronized. Do you want to review it?",
     "attemptheader": "Attempt",
-    "attemptlabelshort": "{{attempt}}: {{grade}} {{timestart}}",
-    "attemptlabelfull": "{{attempt}}: {{grade}} {{timestart}} ({{duration}})",
     "attemptsremaining": "You have {{$a}} attempt(s) remaining",
     "averagescore": "Average score",
     "averagetime": "Average time",
@@ -24,9 +21,9 @@
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
     "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
-    "errorreviewattemptnotlast": "This attempt cannot be reviewed anymore because another attempt was finished.",
+    "errorreviewretakenotlast": "This attempt cannot be reviewed anymore because another attempt was finished.",
     "finish": "Finish",
-    "finishattemptoffline": "This attempt has been finished in offline.",
+    "finishretakeoffline": "This attempt has been finished in offline.",
     "firstwrong": "You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)",
     "gotoendoflesson": "Go to the end of the lesson",
     "grade": "Grade",
@@ -60,6 +57,9 @@
     "rawgrade": "Raw grade",
     "reports": "Reports",
     "response": "Response",
+    "retakefinishedinsync": "An offline attempt was synchronized. Do you want to review it?",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "review": "Review",
     "reviewlesson": "Review lesson",
     "reviewquestionback": "Yes, I'd like to try again",
@@ -75,7 +75,7 @@
     "timeremaining": "Time remaining",
     "timetaken": "Time taken",
     "unseenpageinbranch": "Unseen question within a content page",
-    "warningattemptfinished": "The attempt was finished in the site.",
+    "warningretakefinished": "The attempt was finished in the site.",
     "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
     "youranswer": "Your answer",
diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index 08bb0614888..e786c188432 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -50,7 +50,7 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
         pageid: null,
         password: null,
         review: false,
-        attempt: null // Only if review=true. To verify that the attempt can be reviewed.
+        retake: null // Only if review=true. To verify that the retake can be reviewed.
       },
       views: {
         'site': {
@@ -60,18 +60,18 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
       }
     })
 
-    .state('site.mod_lesson-userattempt', {
-      url: '/mod_lesson-userattempt',
+    .state('site.mod_lesson-userretake', {
+      url: '/mod_lesson-userretake',
       params: {
         courseid: null,
         lessonid: null,
         userid: null,
-        attempt: null
+        retake: null
       },
       views: {
         'site': {
-          controller: 'mmaModLessonUserAttemptCtrl',
-          templateUrl: 'addons/mod/lesson/templates/userattempt.html'
+          controller: 'mmaModLessonUserRetakeCtrl',
+          templateUrl: 'addons/mod/lesson/templates/userretake.html'
         }
       }
     });
diff --git a/www/addons/mod/lesson/scss/styles.scss b/www/addons/mod/lesson/scss/styles.scss
index 2b2acf967e5..889d6748f58 100644
--- a/www/addons/mod/lesson/scss/styles.scss
+++ b/www/addons/mod/lesson/scss/styles.scss
@@ -27,7 +27,7 @@
   }
 }
 
-.mm-site_mod_lesson-userattempt {
+.mm-site_mod_lesson-userretake {
   .mma-mod_lesson-answer {
     .item {
       border-top: 1px solid $item-default-border;
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index 77cab278f81..cf3e3fadb5b 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -292,7 +292,7 @@ angular.module('mm.addons.mod_lesson')
                     // Go to overview.
                     openReportOverview(parseInt(params.id, 10), courseId, parseInt(params.group, 10), siteId);
                 } else if (params.action == 'reportdetail') {
-                    openUserAttempt(parseInt(params.id, 10), parseInt(params.userid, 10), courseId,
+                    openUserRetake(parseInt(params.id, 10), parseInt(params.userid, 10), courseId,
                             parseInt(params.try, 10), siteId);
                 }
             }
@@ -331,17 +331,17 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Open a user's attempt.
+     * Open a user's retake.
      *
      * @param  {Number} moduleId   Module ID.
      * @param  {Number} userId     User ID.
      * @param  {Number} [courseId] Course ID.
-     * @param  {Number} [attempt]  Attempt to open.
+     * @param  {Number} [retake]   Retake to open.
      * @param  {String} [groupId]  Group ID.
      * @param  {String} siteId     Site ID.
      * @return {Promise}           Promise resolved when navigated.
      */
-    function openUserAttempt(moduleId, userId, courseId, attempt, siteId) {
+    function openUserRetake(moduleId, userId, courseId, retake, siteId) {
         var modal = $mmUtil.showModalLoading();
 
         // Get the module object.
@@ -352,9 +352,9 @@ angular.module('mm.addons.mod_lesson')
                 lessonid: module.instance,
                 courseid: courseId ? parseInt(courseId, 10) : courseId,
                 userid: userId,
-                attempt: attempt || 0
+                retake: retake || 0
             };
-            $mmContentLinksHelper.goInSite('site.mod_lesson-userattempt', stateParams, siteId);
+            $mmContentLinksHelper.goInSite('site.mod_lesson-userretake', stateParams, siteId);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'Error processing link.');
             return $q.reject();
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 9865323cf86..b1310bcfa1a 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -52,42 +52,42 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Get a label to identify an attempt.
+     * Get a label to identify a retake (lesson attempt).
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonHelper#getAttemptLabel
-     * @param  {Object} attempt          Attempt.
-     * @param  {Boolean} includeDuration Whether to include the duration of the attempt.
-     * @return {String}                  Attempt label.
+     * @name $mmaModLessonHelper#getRetakeLabel
+     * @param  {Object} retake           Retake.
+     * @param  {Boolean} includeDuration Whether to include the duration of the retake.
+     * @return {String}                  Retake label.
      */
-    self.getAttemptLabel = function(attempt, includeDuration) {
+    self.getRetakeLabel = function(retake, includeDuration) {
         var data = {
-                attempt: attempt.try + 1,
+                retake: retake.try + 1,
                 grade: '',
                 timestart: '',
                 duration: ''
             },
-            hasGrade = attempt.grade != null;
+            hasGrade = retake.grade != null;
 
-        if (hasGrade || attempt.end) {
-            // Attempt finished with or without grade (if the lesson only has content pages, it has no grade).
+        if (hasGrade || retake.end) {
+            // Retake finished with or without grade (if the lesson only has content pages, it has no grade).
             if (hasGrade) {
-                data.grade = $translate.instant('mm.core.percentagenumber', {$a: attempt.grade});
+                data.grade = $translate.instant('mm.core.percentagenumber', {$a: retake.grade});
             }
-            data.timestart = moment(attempt.timestart * 1000).format('LLL');
+            data.timestart = moment(retake.timestart * 1000).format('LLL');
             if (includeDuration) {
-                data.duration = $mmUtil.formatTimeInstant(attempt.timeend - attempt.timestart);
+                data.duration = $mmUtil.formatTimeInstant(retake.timeend - retake.timestart);
             }
         } else {
-            // This is what the link does/looks like when the user has not completed the attempt.
+            // The user has not completed the retake.
             data.grade = $translate.instant('mma.mod_lesson.notcompleted');
-            if (attempt.timestart) {
-                data.timestart = moment(attempt.timestart * 1000).format('LLL');
+            if (retake.timestart) {
+                data.timestart = moment(retake.timestart * 1000).format('LLL');
             }
         }
 
-        return $translate.instant('mma.mod_lesson.attemptlabel' + (includeDuration ? 'full' : 'short'), data);
+        return $translate.instant('mma.mod_lesson.retakelabel' + (includeDuration ? 'full' : 'short'), data);
     };
 
     /**
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 8d0fdb10414..992411b73c1 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -33,6 +33,15 @@ angular.module('mm.addons.mod_lesson')
  * @module mm.addons.mod_lesson
  * @ngdoc service
  * @name $mmaModLesson
+ * @description
+ * Lesson terminology is a bit confusing and ambiguous in Moodle. For that reason, in the app it has been decided to use
+ * the following terminology:
+ *     - Retake: An attempt in a lesson. In Moodle it's sometimes called "attempt", "try" or "retry".
+ *     - Attempt: An attempt in a page inside a retake. In the app, this includes content pages.
+ *     - Content page: A page with only content (no question). In Moodle it's sometimes called "branch table".
+ *     - Page answers: List of possible answers for a page (configured by the teacher). NOT the student answer for the page.
+ *
+ * This terminology sometimes won't match with WebServices names, params or responses.
  */
 .factory('$mmaModLesson', function($log, $mmSitesManager, $q, $mmUtil, mmaModLessonPasswordStore, $mmLang, $mmaModLessonOffline,
             $translate, $mmSite, mmCoreGradeTypeNone, mmaModLessonTypeQuestion, mmaModLessonTypeStructure, $mmText) {
@@ -64,7 +73,7 @@ angular.module('mm.addons.mod_lesson')
     self.LESSON_PAGE_MATCHING =     5;
     self.LESSON_PAGE_NUMERICAL =    8;
     self.LESSON_PAGE_ESSAY =        10;
-    self.LESSON_PAGE_BRANCHTABLE =  20;
+    self.LESSON_PAGE_BRANCHTABLE =  20; // Content page.
     self.LESSON_PAGE_ENDOFBRANCH =  21;
     self.LESSON_PAGE_CLUSTER =      30;
     self.LESSON_PAGE_ENDOFCLUSTER = 31;
@@ -83,7 +92,7 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Check if an answer page (from getUserAttempt) is a content page.
+     * Check if an answer page (from getUserRetake) is a content page.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
@@ -114,7 +123,7 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Check if an answer page (from getUserAttempt) is a question page.
+     * Check if an answer page (from getUserRetake) is a question page.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
@@ -159,7 +168,7 @@ angular.module('mm.addons.mod_lesson')
     function calculateOfflineData(lesson, accessInfo, password, review, pageIndex, siteId) {
         accessInfo = accessInfo || {};
 
-        var reviewMode = review || accessInfo.reviewmode,
+        var reviewMode = review || accessInfo.reviewmode,
             ongoingMessage = '',
             progress,
             promises = [];
@@ -211,7 +220,7 @@ angular.module('mm.addons.mod_lesson')
         }
 
         var promise,
-            ntries = accessInfo.attemptscount,
+            retake = accessInfo.attemptscount,
             viewedPagesIds = [];
 
         if (pageIndex) {
@@ -223,13 +232,13 @@ angular.module('mm.addons.mod_lesson')
         }
 
         return promise.then(function() {
-            // Get the list of question pages answered.
-            return self.getPagesIdsWithQuestionAttempts(lessonId, ntries, false, siteId);
+            // Get the list of question pages attempted.
+            return self.getPagesIdsWithQuestionAttempts(lessonId, retake, false, siteId);
         }).then(function(ids) {
             viewedPagesIds = ids;
 
             // Get the list of viewed content pages.
-            return self.getContentPagesViewedIds(lessonId, ntries, siteId);
+            return self.getContentPagesViewedIds(lessonId, retake, siteId);
         }).then(function(viewedContentPagesIds) {
             var pageId = accessInfo.firstpageid,
                 validPages = {};
@@ -252,7 +261,7 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Check if an answer is correct or not and return the result object.
+     * Check if the answer provided by the user is correct or not and return the result object.
      * This method is based on the check_answer implementation of all page types (Moodle).
      *
      * @param  {Object} lesson    Lesson.
@@ -344,7 +353,7 @@ angular.module('mm.addons.mod_lesson')
             return;
         }
 
-        // Essays should only have 1 answer.
+        // Essay pages should only have 1 possible answer.
         angular.forEach(pageData.answers, function(answer) {
             result.answerid = answer.id;
             result.newpageid = answer.jumpto;
@@ -480,8 +489,8 @@ angular.module('mm.addons.mod_lesson')
             result.userresponse = studentAnswers.join(',');
 
             // Get the answers in a set order, the id order.
-            var ncorrect = 0,
-                nhits = 0,
+            var nCorrect = 0,
+                nHits = 0,
                 responses = [],
                 correctAnswerId = 0,
                 wrongAnswerId = 0,
@@ -512,7 +521,7 @@ angular.module('mm.addons.mod_lesson')
                 angular.forEach(studentAnswers, function(answerId) {
                     if (answerId == answer.id) {
                         if (correctAnswer) {
-                            nhits++;
+                            nHits++;
                         } else {
                             // Always use the first student wrong answer.
                             if (typeof wrongPageId == 'undefined') {
@@ -527,7 +536,7 @@ angular.module('mm.addons.mod_lesson')
                 });
 
                 if (correctAnswer) {
-                    ncorrect++;
+                    nCorrect++;
 
                     // Save the first jumpto.
                     if (typeof correctPageId == 'undefined') {
@@ -540,7 +549,7 @@ angular.module('mm.addons.mod_lesson')
                 }
             });
 
-            if (studentAnswers.length == ncorrect && nhits == ncorrect) {
+            if (studentAnswers.length == nCorrect && nHits == nCorrect) {
                 result.correctanswer = true;
                 result.response = responses.join('<br />');
                 result.newpageid = correctPageId;
@@ -677,7 +686,7 @@ angular.module('mm.addons.mod_lesson')
         // Search the answer in the list of possible answers.
         for (var i in pageData.answers) {
             var answer = pageData.answers[i],
-                expectedAnswer = answer.answer, // @todo Applying PARAM_TEXT as it is applied to the answer submitted by the user.
+                expectedAnswer = answer.answer,
                 isMatch = false,
                 markIt = false,
                 useRegExp = pageData.page.qoption,
@@ -819,11 +828,11 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Finishes an attempt.
+     * Finishes a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#finishAttempt
+     * @name $mmaModLesson#finishRetake
      * @param  {Object} lesson       Lesson.
      * @param  {Number} courseId     Course ID the lesson belongs to.
      * @param  {String} [password]   Lesson password (if any).
@@ -834,17 +843,17 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [siteId]     Site ID. If not defined, current site.
      * @return {Promise}             Promise resolved in success, rejected otherwise.
      */
-    self.finishAttempt = function(lesson, courseId, password, outOfTime, review, offline, accessInfo, siteId) {
+    self.finishRetake = function(lesson, courseId, password, outOfTime, review, offline, accessInfo, siteId) {
         if (offline) {
-            var attempt = accessInfo.attemptscount;
-            return $mmaModLessonOffline.finishAttempt(lesson.id, courseId, attempt, true, outOfTime, siteId).then(function() {
+            var retake = accessInfo.attemptscount;
+            return $mmaModLessonOffline.finishRetake(lesson.id, courseId, retake, true, outOfTime, siteId).then(function() {
                 // Get the lesson grade.
-                return self.lessonGrade(lesson, accessInfo.attemptscount, password, review, undefined, siteId).catch(function() {
+                return self.lessonGrade(lesson, retake, password, review, undefined, siteId).catch(function() {
                     // Ignore errors.
                     return {};
                 });
             }).then(function(gradeInfo) {
-                // Attempt marked, now return the response. We won't return all the possible data.
+                // Retake marked, now return the response. We won't return all the possible data.
                 // This code is based in Moodle's process_eol_page.
                 var gradeLesson = true,
                     result = {
@@ -946,7 +955,7 @@ angular.module('mm.addons.mod_lesson')
             });
         }
 
-        return self.finishAttemptOnline(lesson.id, password, outOfTime, review, siteId);
+        return self.finishRetakeOnline(lesson.id, password, outOfTime, review, siteId);
 
         // Add a property to the offline result.
         function addResultValue(result, name, value, addMessage) {
@@ -965,11 +974,11 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Finishes an attempt. It will fail if offline or cannot connect.
+     * Finishes a retake. It will fail if offline or cannot connect.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#finishAttemptOnline
+     * @name $mmaModLesson#finishRetakeOnline
      * @param  {Number} lessonId     Lesson ID.
      * @param  {String} [password]   Lesson password (if any).
      * @param  {Boolean} [outOfTime] If the user ran out of time.
@@ -977,7 +986,7 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [siteId]     Site ID. If not defined, current site.
      * @return {Promise}             Promise resolved in success, rejected otherwise.
      */
-    self.finishAttemptOnline = function(lessonId, password, outOfTime, review, siteId) {
+    self.finishRetakeOnline = function(lessonId, password, outOfTime, review, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 lessonid: lessonId,
@@ -1071,40 +1080,40 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Get cache key for get attempts overview WS calls.
+     * Get cache key for get retakes overview WS calls.
      *
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} groupId  Group ID.
      * @return {String}          Cache key.
      */
-    function getAttemptsOverviewCacheKey(lessonId, groupId) {
-        return getAttemptsOverviewCommonCacheKey(lessonId) + ':' + groupId;
+    function getRetakesOverviewCacheKey(lessonId, groupId) {
+        return getRetakesOverviewCommonCacheKey(lessonId) + ':' + groupId;
     }
 
     /**
-     * Get common cache key for get attempts overview WS calls.
+     * Get common cache key for get retakes overview WS calls.
      *
      * @param  {Number} lessonId Lesson ID.
      * @return {String}          Cache key.
      */
-    function getAttemptsOverviewCommonCacheKey(lessonId) {
-        return 'mmaModLesson:attemptsOverview:' + lessonId;
+    function getRetakesOverviewCommonCacheKey(lessonId) {
+        return 'mmaModLesson:retakesOverview:' + lessonId;
     }
 
     /**
-     * Get the overview of attempts in a lesson.
+     * Get the overview of retakes in a lesson (named "attempts overview" in Moodle).
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#getAttemptsOverview
+     * @name $mmaModLesson#getRetakesOverview
      * @param  {Number} lessonId       Lesson ID.
      * @param  {Number} [groupId]      The group to get. If not defined, all participants.
      * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
      * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]       Site ID. If not defined, current site.
-     * @return {Promise}               Promise resolved with the access information.
+     * @return {Promise}               Promise resolved with the retakes overview.
      */
-    self.getAttemptsOverview = function(lessonId, groupId, forceCache, ignoreCache, siteId) {
+    self.getRetakesOverview = function(lessonId, groupId, forceCache, ignoreCache, siteId) {
         groupId = groupId || 0;
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -1113,7 +1122,7 @@ angular.module('mm.addons.mod_lesson')
                     groupid: groupId
                 },
                 preSets = {
-                    cacheKey: getAttemptsOverviewCacheKey(lessonId, groupId)
+                    cacheKey: getRetakesOverviewCacheKey(lessonId, groupId)
                 };
 
             if (forceCache) {
@@ -1136,11 +1145,11 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#getContentPagesViewed
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with an object with the online and offline viewed pages.
      */
-    self.getContentPagesViewed = function(lessonId, attempt, siteId) {
+    self.getContentPagesViewed = function(lessonId, retake, siteId) {
         var promises = [],
             type = mmaModLessonTypeStructure,
             result = {
@@ -1149,12 +1158,12 @@ angular.module('mm.addons.mod_lesson')
             };
 
         // Get the online pages.
-        promises.push(self.getContentPagesViewedOnline(lessonId, attempt, false, false, siteId).then(function(pages) {
+        promises.push(self.getContentPagesViewedOnline(lessonId, retake, false, false, siteId).then(function(pages) {
             result.online = pages;
         }));
 
         // Get the offline pages.
-        promises.push($mmaModLessonOffline.getAttemptAnswersForType(lessonId, attempt, type, siteId).catch(function() {
+        promises.push($mmaModLessonOffline.getRetakeAttemptsForType(lessonId, retake, type, siteId).catch(function() {
             return [];
         }).then(function(pages) {
             result.offline = pages;
@@ -1172,12 +1181,12 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#getContentPagesViewedIds
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with list of IDs.
      */
-    self.getContentPagesViewedIds = function(lessonId, attempt, siteId) {
-        return self.getContentPagesViewed(lessonId, attempt, siteId).then(function(result) {
+    self.getContentPagesViewedIds = function(lessonId, retake, siteId) {
+        return self.getContentPagesViewed(lessonId, retake, siteId).then(function(result) {
             var ids = {},
                 pages = result.online.concat(result.offline);
 
@@ -1195,11 +1204,11 @@ angular.module('mm.addons.mod_lesson')
      * Get cache key for get content pages viewed WS calls.
      *
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
-     * @return {String}         Cache key.
+     * @param  {Number} retake   Retake number.
+     * @return {String}          Cache key.
      */
-    function getContentPagesViewedCacheKey(lessonId, attempt) {
-        return getContentPagesViewedCommonCacheKey(lessonId) + ':' + attempt;
+    function getContentPagesViewedCacheKey(lessonId, retake) {
+        return getContentPagesViewedCommonCacheKey(lessonId) + ':' + retake;
     }
 
     /**
@@ -1213,26 +1222,26 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Get the list of content pages viewed in the site for a certain attempt.
+     * Get the list of content pages viewed in the site for a certain retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getContentPagesViewedOnline
      * @param  {Number} lessonId       Lesson ID.
-     * @param  {Number} attempt        Attempt number.
+     * @param  {Number} retake         Retake number.
      * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
      * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]       Site ID. If not defined, current site.
      * @return {Promise}               Promise resolved with the access information.
      */
-    self.getContentPagesViewedOnline = function(lessonId, attempt, forceCache, ignoreCache, siteId) {
+    self.getContentPagesViewedOnline = function(lessonId, retake, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     lessonid: lessonId,
-                    lessonattempt: attempt
+                    lessonattempt: retake
                 },
                 preSets = {
-                    cacheKey: getContentPagesViewedCacheKey(lessonId, attempt)
+                    cacheKey: getContentPagesViewedCacheKey(lessonId, retake)
                 };
 
             if (forceCache) {
@@ -1255,12 +1264,12 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#getLastContentPageViewed
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with the last content page viewed.
      */
-    self.getLastContentPageViewed = function(lessonId, attempt, siteId) {
-        return self.getContentPagesViewed(lessonId, attempt, siteId).then(function(data) {
+    self.getLastContentPageViewed = function(lessonId, retake, siteId) {
+        return self.getContentPagesViewed(lessonId, retake, siteId).then(function(data) {
             var lastPage,
                 maxTime = 0;
 
@@ -1292,31 +1301,31 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#getLastPageSeen
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with the last page seen.
      */
-    self.getLastPageSeen = function(lessonId, attempt, siteId) {
+    self.getLastPageSeen = function(lessonId, retake, siteId) {
         siteId = siteId || $mmSite.getId();
 
         var lastPageSeen = false;
 
         // Get the last question answered.
-        return $mmaModLessonOffline.getLastQuestionPageAnswer(lessonId, attempt, siteId).then(function(answer) {
+        return $mmaModLessonOffline.getLastQuestionPageAttempt(lessonId, retake, siteId).then(function(answer) {
             if (answer) {
                 lastPageSeen = answer.newpageid;
             }
 
             // Now get the last content page viewed.
-            return self.getLastContentPageViewed(lessonId, attempt, siteId).then(function(page) {
+            return self.getLastContentPageViewed(lessonId, retake, siteId).then(function(page) {
                 if (page) {
                     if (answer) {
                         if (page.timemodified > answer.timemodified) {
-                            // This branch table was viewed more recently than the question page.
+                            // This content page was viewed more recently than the question page.
                             lastPageSeen = page.newpageid || page.pageid;
                         }
                     } else {
-                        // Has not answered any questions but has viewed a branch table.
+                        // Has not answered any questions but has viewed a content page.
                         lastPageSeen = page.newpageid || page.pageid;
                     }
                 }
@@ -1492,12 +1501,12 @@ angular.module('mm.addons.mod_lesson')
         if (accessInfo.canmanage) {
             return $q.when($translate.instant('mma.mod_lesson.teacherongoingwarning'));
         } else {
-            var ntries = accessInfo.attemptscount;
+            var retake = accessInfo.attemptscount;
             if (review) {
-                ntries--;
+                retake--;
             }
 
-            return self.lessonGrade(lesson, ntries, password, review, pageIndex, siteId).then(function(gradeInfo) {
+            return self.lessonGrade(lesson, retake, password, review, pageIndex, siteId).then(function(gradeInfo) {
                 var data = {};
 
                 if (lesson.custom) {
@@ -1514,14 +1523,14 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Get the answers from a page.
+     * Get the possible answers from a page.
      *
      * @param  {Object} lesson      Lesson.
-     * @param  {Number} pageId      Page ID the answer belongs to.
+     * @param  {Number} pageId      Page ID.
      * @param  {String} [password]  Lesson password (if any).
      * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
      * @param  {String} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise}            Promise resolved with the list of answers.
+     * @return {Promise}            Promise resolved with the list of possible answers.
      */
     function getPageAnswers(lesson, pageId, password, review, siteId) {
         return self.getPageData(lesson, pageId, password, review, true, true, false, undefined, undefined, siteId)
@@ -1531,14 +1540,14 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Get all the answers from a list of pages, indexed by answerId.
+     * Get all the possible answers from a list of pages, indexed by answerId.
      *
      * @param  {Object} lesson      Lesson.
      * @param  {Number[]} pageIds   List of page IDs.
      * @param  {String} [password]  Lesson password (if any).
      * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
      * @param  {String} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise}            Promise resolved with the list of answers.
+     * @return {Promise}            Promise resolved with the list of possible answers.
      */
     function getPagesAnswers(lesson, pageIds, password, review, siteId) {
         var answers = {},
@@ -1802,20 +1811,20 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#getPagesIdsWithQuestionAttempts
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {Boolean} correct True to only fetch correct attempts, false to get them all.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @param  {Number} [userId] User ID. If not defined, site's user.
      * @return {Promise}         Promise resolved with the IDs.
      */
-    self.getPagesIdsWithQuestionAttempts = function(lessonId, attempt, correct, siteId, userId) {
-        return self.getQuestionsAttempts(lessonId, attempt, correct, undefined, siteId, userId).then(function(result) {
+    self.getPagesIdsWithQuestionAttempts = function(lessonId, retake, correct, siteId, userId) {
+        return self.getQuestionsAttempts(lessonId, retake, correct, undefined, siteId, userId).then(function(result) {
             var ids = {},
-                answers = result.online.concat(result.offline);
+                attempts = result.online.concat(result.offline);
 
-            angular.forEach(answers, function(answer) {
-                if (!ids[answer.pageid]) {
-                    ids[answer.pageid] = true;
+            angular.forEach(attempts, function(attempt) {
+                if (!ids[attempt.pageid]) {
+                    ids[attempt.pageid] = true;
                 }
             });
 
@@ -1848,9 +1857,9 @@ angular.module('mm.addons.mod_lesson')
         if (!accessInfo.canmanage) {
             if (page.qtype == self.LESSON_PAGE_BRANCHTABLE && lesson.minquestions) {
                 // Tell student how many questions they have seen, how many are required and their grade.
-                var ntries = accessInfo.attemptscount;
+                var retake = accessInfo.attemptscount;
 
-                promise = self.lessonGrade(lesson, ntries, password, review, undefined, siteId).then(function(gradeInfo) {
+                promise = self.lessonGrade(lesson, retake, password, review, undefined, siteId).then(function(gradeInfo) {
                     if (gradeInfo.attempts) {
                         if (gradeInfo.nquestions < lesson.minquestions) {
                             data = {
@@ -1902,28 +1911,28 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#getQuestionsAttempts
-     * @param  {Number} lessonId       Lesson ID.
-     * @param  {Number} attempt        Attempt number.
-     * @param  {Boolean} correct       True to only fetch correct attempts, false to get them all.
-     * @param  {Number} [pageId]       If defined, only get attempts on this page.
-     * @param  {String} [siteId]       Site ID. If not defined, current site.
-     * @param  {Number} [userId]       User ID. If not defined, site's user.
-     * @return {Promise}               Promise resolved with the questions attempts.
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} retake   Retake number.
+     * @param  {Boolean} correct True to only fetch correct attempts, false to get them all.
+     * @param  {Number} [pageId] If defined, only get attempts on this page.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @param  {Number} [userId] User ID. If not defined, site's user.
+     * @return {Promise}         Promise resolved with the questions attempts.
      */
-    self.getQuestionsAttempts = function(lessonId, attempt, correct, pageId, siteId, userId) {
+    self.getQuestionsAttempts = function(lessonId, retake, correct, pageId, siteId, userId) {
         var promises = [],
             result = {
                 online: [],
                 offline: []
             };
 
-        promises.push(self.getQuestionsAttemptsOnline(lessonId, attempt, correct, pageId, false, false, siteId, userId)
+        promises.push(self.getQuestionsAttemptsOnline(lessonId, retake, correct, pageId, false, false, siteId, userId)
                 .then(function(attempts) {
             result.online = attempts;
         }));
 
-        promises.push($mmaModLessonOffline.getQuestionsAttempts(lessonId, attempt, correct, pageId, siteId).catch(function() {
-            // Error, assume no answers.
+        promises.push($mmaModLessonOffline.getQuestionsAttempts(lessonId, retake, correct, pageId, siteId).catch(function() {
+            // Error, assume no attempts.
             return [];
         }).then(function(attempts) {
             result.offline = attempts;
@@ -1938,12 +1947,12 @@ angular.module('mm.addons.mod_lesson')
      * Get cache key for get questions attempts WS calls.
      *
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {Number} userId   User ID.
      * @return {String}          Cache key.
      */
-    function getQuestionsAttemptsCacheKey(lessonId, attempt, userId) {
-        return getQuestionsAttemptsCommonCacheKey(lessonId) + ':' + userId + ':' + attempt;
+    function getQuestionsAttemptsCacheKey(lessonId, retake, userId) {
+        return getQuestionsAttemptsCommonCacheKey(lessonId) + ':' + userId + ':' + retake;
     }
 
     /**
@@ -1963,7 +1972,7 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#getQuestionsAttemptsOnline
      * @param  {Number} lessonId       Lesson ID.
-     * @param  {Number} attempt        Attempt number.
+     * @param  {Number} retake         Retake number.
      * @param  {Boolean} correct       True to only fetch correct attempts, false to get them all.
      * @param  {Number} [pageId]       If defined, only get attempts on this page.
      * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
@@ -1972,18 +1981,18 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Number} [userId]       User ID. If not defined, site's user.
      * @return {Promise}               Promise resolved with the questions attempts.
      */
-    self.getQuestionsAttemptsOnline = function(lessonId, attempt, correct, pageId, forceCache, ignoreCache, siteId, userId) {
+    self.getQuestionsAttemptsOnline = function(lessonId, retake, correct, pageId, forceCache, ignoreCache, siteId, userId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
 
             // Don't pass "pageId" and "correct" params, they will be filtered locally.
             var params = {
                     lessonid: lessonId,
-                    attempt: attempt,
+                    attempt: retake,
                     userid: userId
                 },
                 preSets = {
-                    cacheKey: getQuestionsAttemptsCacheKey(lessonId, attempt, userId)
+                    cacheKey: getQuestionsAttemptsCacheKey(lessonId, retake, userId)
                 };
 
             if (forceCache) {
@@ -2123,63 +2132,63 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Get cache key for get user attempt WS calls.
+     * Get cache key for get user retake WS calls.
      *
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} userId   User ID.
-     * @param  {Number} attempt  Attempt number
+     * @param  {Number} retake   Retake number
      * @return {String}          Cache key.
      */
-    function getUserAttemptCacheKey(lessonId, userId, attempt) {
-        return getUserAttemptUserCacheKey(lessonId, userId) + ':' + attempt;
+    function getUserRetakeCacheKey(lessonId, userId, retake) {
+        return getUserRetakeUserCacheKey(lessonId, userId) + ':' + retake;
     }
 
     /**
-     * Get user cache key for get user attempt WS calls.
+     * Get user cache key for get user retake WS calls.
      *
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} userId   User ID.
      * @return {String}          Cache key.
      */
-    function getUserAttemptUserCacheKey(lessonId, userId) {
-        return getUserAttemptLessonCacheKey(lessonId) + ':' + userId;
+    function getUserRetakeUserCacheKey(lessonId, userId) {
+        return getUserRetakeLessonCacheKey(lessonId) + ':' + userId;
     }
 
     /**
-     * Get lesson cache key for get user attempts WS calls.
+     * Get lesson cache key for get user retake WS calls.
      *
      * @param {Number} lessonId Lesson ID.
      * @return {String}         Cache key.
      */
-    function getUserAttemptLessonCacheKey(lessonId) {
-        return 'mmaModLesson:userAttempt:' + lessonId;
+    function getUserRetakeLessonCacheKey(lessonId) {
+        return 'mmaModLesson:userRetake:' + lessonId;
     }
 
     /**
-     * Get a user's attempt.
+     * Get a user's retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#getUserAttempt
+     * @name $mmaModLesson#getUserRetake
      * @param  {Number} lessonId       Lesson ID.
-     * @param  {Number} attempt        Attempt number
+     * @param  {Number} retake         Retake number
      * @param  {Number} [userId]       User ID. Undefined for current user.
      * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
      * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {String} [siteId]       Site ID. If not defined, current site.
      * @return {Promise}               Promise resolved with the pages.
      */
-    self.getUserAttempt = function(lessonId, attempt, userId, forceCache, ignoreCache, siteId) {
+    self.getUserRetake = function(lessonId, retake, userId, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
 
             var params = {
                     lessonid: lessonId,
                     userid: userId,
-                    lessonattempt: attempt
+                    lessonattempt: retake
                 },
                 preSets = {
-                    cacheKey: getUserAttemptCacheKey(lessonId, userId, attempt)
+                    cacheKey: getUserRetakeCacheKey(lessonId, userId, retake)
                 };
 
             if (forceCache) {
@@ -2249,40 +2258,40 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Invalidates attempts overview for all groups in a lesson.
+     * Invalidates retakes overview for all groups in a lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateAttemptsOverview
+     * @name $mmaModLesson#invalidateRetakesOverview
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateAttemptsOverview = function(lessonId, siteId) {
+    self.invalidateRetakesOverview = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKeyStartingWith(getAttemptsOverviewCommonCacheKey(lessonId));
+            return site.invalidateWsCacheForKeyStartingWith(getRetakesOverviewCommonCacheKey(lessonId));
         });
     };
 
     /**
-     * Invalidates attempts overview for a certain group in a lesson.
+     * Invalidates retakes overview for a certain group in a lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateAttemptsOverviewForGroup
-     * @param  {Number} lessonId Attempt ID.
+     * @name $mmaModLesson#invalidateRetakesOverviewForGroup
+     * @param  {Number} lessonId Lesson ID.
      * @param  {Number} groupId  Group ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateAttemptsOverviewForGroup = function(lessonId, groupId, siteId) {
+    self.invalidateRetakesOverviewForGroup = function(lessonId, groupId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKey(getPageDataCacheKey(lessonId, groupId));
+            return site.invalidateWsCacheForKey(getRetakesOverviewCacheKey(lessonId, groupId));
         });
     };
 
     /**
-     * Invalidates content pages viewed for all attempts.
+     * Invalidates content pages viewed for all retakes.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
@@ -2298,19 +2307,19 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Invalidates content pages viewed for a certain attempts.
+     * Invalidates content pages viewed for a certain retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateContentPagesViewedForAttempt
+     * @name $mmaModLesson#invalidateContentPagesViewedForRetake
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateContentPagesViewedForAttempt = function(lessonId, attempt, siteId) {
+    self.invalidateContentPagesViewedForRetake = function(lessonId, retake, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKey(getContentPagesViewedCacheKey(lessonId, attempt));
+            return site.invalidateWsCacheForKey(getContentPagesViewedCacheKey(lessonId, retake));
         });
     };
 
@@ -2368,7 +2377,7 @@ angular.module('mm.addons.mod_lesson')
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLesson#invalidatePageDataForPage
-     * @param  {Number} lessonId Attempt ID.
+     * @param  {Number} lessonId Lesson ID.
      * @param  {Number} pageId   Page ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
@@ -2412,7 +2421,7 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Invalidates questions attempts for all attempts.
+     * Invalidates questions attempts for all retakes.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
@@ -2428,21 +2437,21 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Invalidates question answers for a certain attempt and user.
+     * Invalidates question attempts for a certain retake and user.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateQuestionsAttemptsForAttempt
+     * @name $mmaModLesson#invalidateQuestionsAttemptsForRetake
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site..
      * @param  {Number} [userId] User ID. If not defined, site's user.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateQuestionsAttemptsForAttempt = function(lessonId, attempt, siteId, userId) {
+    self.invalidateQuestionsAttemptsForRetake = function(lessonId, retake, siteId, userId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
-            return site.invalidateWsCacheForKey(getQuestionsAttemptsCacheKey(lessonId, attempt, userId));
+            return site.invalidateWsCacheForKey(getQuestionsAttemptsCacheKey(lessonId, retake, userId));
         });
     };
 
@@ -2481,60 +2490,60 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Invalidates all attempts for all users in a lesson.
+     * Invalidates all retakes for all users in a lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateUserAttempts
+     * @name $mmaModLesson#invalidateUserRetakesForLesson
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateUserAttemptsForLesson = function(lessonId, siteId) {
+    self.invalidateUserRetakesForLesson = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKeyStartingWith(getUserAttemptLessonCacheKey(lessonId));
+            return site.invalidateWsCacheForKeyStartingWith(getUserRetakeLessonCacheKey(lessonId));
         });
     };
 
     /**
-     * Invalidates all attempts for a certain user in a lesson.
+     * Invalidates all retakes for a certain user in a lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateUserAttempts
+     * @name $mmaModLesson#invalidateUserRetakesForUser
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} [userId] User ID. Undefined for current user.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateUserAttemptsForUser = function(lessonId, userId, siteId) {
+    self.invalidateUserRetakesForUser = function(lessonId, userId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
-            return site.invalidateWsCacheForKeyStartingWith(getUserAttemptUserCacheKey(lessonId, userId));
+            return site.invalidateWsCacheForKeyStartingWith(getUserRetakeUserCacheKey(lessonId, userId));
         });
     };
 
     /**
-     * Invalidates a certain attempt for a certain user.
+     * Invalidates a certain retake for a certain user.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#invalidateUserAttempt
+     * @name $mmaModLesson#invalidateUserRetake
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {Number} [userId] User ID. Undefined for current user.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when the data is invalidated.
      */
-    self.invalidateUserAttempt = function(lessonId, attempt, userId, siteId) {
+    self.invalidateUserRetake = function(lessonId, retake, userId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
-            return site.invalidateWsCacheForKey(getUserAttemptCacheKey(lessonId, userId, attempt));
+            return site.invalidateWsCacheForKey(getUserRetakeCacheKey(lessonId, userId, retake));
         });
     };
 
     /**
-     * Check if an answer is correct.
+     * Check if a page answer is correct.
      *
      * @param  {Object} lesson    Lesson.
      * @param  {Number} pageId    The page ID.
@@ -2616,19 +2625,19 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Start or continue an attempt.
+     * Start or continue a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLesson#launchAttempt
+     * @name $mmaModLesson#launchRetake
      * @param  {String} id         Lesson ID.
      * @param  {String} [password] Lesson password (if any).
-     * @param  {Number} [pageId]   Page id to continue from (only when continuing an attempt).
+     * @param  {Number} [pageId]   Page id to continue from (only when continuing a retake).
      * @param  {Boolean} [review]  If the user wants to review just after finishing (1 hour margin).
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved when the WS call is successful.
      */
-    self.launchAttempt = function(id, password, pageId, review, siteId) {
+    self.launchRetake = function(id, password, pageId, review, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 lessonid: id,
@@ -2674,7 +2683,7 @@ angular.module('mm.addons.mod_lesson')
             return false;
         }
 
-        // Check if any jump is to cluster or unseen branch.
+        // Check if any jump is to cluster or unseen content page.
         for (var pageId in jumps) {
             for (var jumpto in jumps[pageId]) {
                 if (jumpto == self.LESSON_CLUSTERJUMP || jumpto == self.LESSON_UNSEENBRANCHPAGE) {
@@ -2694,7 +2703,7 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLesson#lessonGrade
      * @param  {Object} lesson      Lesson.
-     * @param  {Number} retry       Retry number.
+     * @param  {Number} retake      Retake number.
      * @param  {String} [password]  Lesson password (if any).
      * @param  {Boolean} [review]   If the user wants to review just after finishing (1 hour margin).
      * @param  {Object} [pageIndex] Object containing all the pages indexed by ID. If not provided, it will be calculated.
@@ -2702,7 +2711,7 @@ angular.module('mm.addons.mod_lesson')
      * @param  {Number} [userId]    User ID. If not defined, site's user.
      * @return {Promise}            Promise resolved with an object with the grade data.
      */
-    self.lessonGrade = function(lesson, retry, password, review, pageIndex, siteId, userId) {
+    self.lessonGrade = function(lesson, retake, password, review, pageIndex, siteId, userId) {
         // Initialize all variables.
         var nViewed      = 0,
             nManual      = 0,
@@ -2713,7 +2722,7 @@ angular.module('mm.addons.mod_lesson')
             earned       = 0;
 
         // Get the questions attempts for the user.
-        return self.getQuestionsAttempts(lesson.id, retry, false, undefined, siteId, userId).then(function(attempts) {
+        return self.getQuestionsAttempts(lesson.id, retake, false, undefined, siteId, userId).then(function(attempts) {
             attempts = attempts.online.concat(attempts.offline);
 
             if (!attempts.length) {
@@ -2965,15 +2974,15 @@ angular.module('mm.addons.mod_lesson')
      * @return {Promise}           Promise resolved with the result.
      */
     function recordAttempt(lesson, courseId, pageData, data, review, accessInfo, jumps, pageIndex, siteId) {
-        // Check the answer. Each page type has its own implementation.
+        // Check the user answer. Each page type has its own implementation.
         var result = checkAnswer(lesson, pageData, data, jumps, pageIndex),
-            nretakes = accessInfo.attemptscount;
+            retake = accessInfo.attemptscount;
 
         // Processes inmediate jumps.
         if (result.inmediatejump) {
             if (pageData.page.qtype == self.LESSON_PAGE_BRANCHTABLE) {
                 // Store the content page data. In Moodle this is stored in a separate table, during checkAnswer.
-                return $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes, pageData.page, data,
+                return $mmaModLessonOffline.processPage(lesson.id, courseId, retake, pageData.page, data,
                             result.newpageid, result.answerid, false, result.userresponse, siteId).then(function() {
                     return result;
                 });
@@ -2983,7 +2992,7 @@ angular.module('mm.addons.mod_lesson')
 
         var promise = $q.when(),
             stop = false,
-            nattempts;
+            nAttempts;
 
         result.attemptsremaining  = 0;
         result.maxattemptsreached = false;
@@ -2994,13 +3003,13 @@ angular.module('mm.addons.mod_lesson')
         } else {
             if (!accessInfo.canmanage) {
                 // Get the number of attempts that have been made on this question for this student and retake.
-                promise = self.getQuestionsAttempts(lesson.id, nretakes, false, pageData.page.id, siteId).then(function(attempts) {
+                promise = self.getQuestionsAttempts(lesson.id, retake, false, pageData.page.id, siteId).then(function(attempts) {
                     var subPromise;
 
-                    nattempts = attempts.online.length + attempts.offline.length;
+                    nAttempts = attempts.online.length + attempts.offline.length;
 
                     // Check if they have reached (or exceeded) the maximum number of attempts allowed.
-                    if (nattempts >= lesson.maxattempts) {
+                    if (nAttempts >= lesson.maxattempts) {
                         result.maxattemptsreached = true;
                         result.feedback = $translate.instant('mma.mod_lesson.maximumnumberofattemptsreached');
                         result.newpageid = self.LESSON_NEXTPAGE;
@@ -3010,27 +3019,26 @@ angular.module('mm.addons.mod_lesson')
 
                     // Only insert a record if we are not reviewing the lesson.
                     if (!review) {
-                        if (lesson.retake || (!lesson.retake && !nretakes)) {
+                        if (lesson.retake || (!lesson.retake && !retake)) {
                             // Store the student's attempt and increase the number of attempts made.
                             // Calculate and store the new page ID to prevent having to recalculate it later.
                             var newPageId = getNewPageId(pageData.page.id, result.newpageid, jumps);
-                            subPromise = $mmaModLessonOffline.processPage(lesson.id, courseId, nretakes, pageData.page, data,
+                            subPromise = $mmaModLessonOffline.processPage(lesson.id, courseId, retake, pageData.page, data,
                                         newPageId, result.answerid, result.correctanswer, result.userresponse, siteId);
-                            nattempts++;
+                            nAttempts++;
                         }
                     }
 
-                    // "number of attempts remaining" message if lesson.maxattempts > 1
-                    // Displaying of message(s) is at the end of page for more ergonomic display.
+                    // Check if "number of attempts remaining" message is needed.
                     if (!result.correctanswer && !result.newpageid) {
-                        // Retreive the number of attempts left counter for displaying at bottom of feedback page
-                        if (nattempts >= lesson.maxattempts) {
-                            if (lesson.maxattempts > 1) { // Don't bother with message if only one attempt
+                        // Retreive the number of attempts left counter.
+                        if (nAttempts >= lesson.maxattempts) {
+                            if (lesson.maxattempts > 1) { // Don't bother with message if only one attempt.
                                 result.maxattemptsreached = true;
                             }
                             result.newpageid =  self.LESSON_NEXTPAGE;
                         } else if (lesson.maxattempts > 1) { // Don't bother with message if only one attempt
-                            result.attemptsremaining = lesson.maxattempts - nattempts;
+                            result.attemptsremaining = lesson.maxattempts - nAttempts;
                         }
                     }
 
@@ -3068,17 +3076,17 @@ angular.module('mm.addons.mod_lesson')
                 if (result.response) {
                     if (lesson.review && !result.correctanswer && !result.isessayquestion) {
                         // Calculate the number of question attempt in the page if it isn't calculated already.
-                        if (typeof nattempts == 'undefined') {
-                            subPromise = self.getQuestionsAttempts(lesson.id, nretakes, false, pageData.page.id, siteId)
+                        if (typeof nAttempts == 'undefined') {
+                            subPromise = self.getQuestionsAttempts(lesson.id, retake, false, pageData.page.id, siteId)
                                     .then(function(result) {
-                                nattempts = result.online.length + result.offline.length;
+                                nAttempts = result.online.length + result.offline.length;
                             });
                         } else {
                             subPromise = $q.when();
                         }
 
                         subPromise.then(function() {
-                            var messageId = nattempts == 1 ? 'firstwrong' : 'secondpluswrong';
+                            var messageId = nAttempts == 1 ? 'firstwrong' : 'secondpluswrong';
                             result.feedback = '<div class="box feedback">' +
                                     $translate.instant('mma.mod_lesson.' + messageId) + '</div>';
                         });
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index 8c4056a347c..2f07226a1aa 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -14,17 +14,17 @@
 
 angular.module('mm.addons.mod_lesson')
 
-.constant('mmaModLessonAttemptsStore', 'mma_mod_lesson_attempts')
-.constant('mmaModLessonAnswersStore', 'mma_mod_lesson_answers')
+.constant('mmaModLessonRetakesStore', 'mma_mod_lesson_retakes')
+.constant('mmaModLessonPageAttemptsStore', 'mma_mod_lesson_page_attempts')
 
-.config(function($mmSitesFactoryProvider, mmaModLessonAttemptsStore, mmaModLessonAnswersStore) {
+.config(function($mmSitesFactoryProvider, mmaModLessonRetakesStore, mmaModLessonPageAttemptsStore) {
     var stores = [
         {
-            name: mmaModLessonAttemptsStore,
-            keyPath: 'lessonid', // Only 1 offline attempt per lesson.
+            name: mmaModLessonRetakesStore,
+            keyPath: 'lessonid', // Only 1 offline retake per lesson.
             indexes: [
                 {
-                    name: 'attempt'
+                    name: 'retake'
                 },
                 {
                     name: 'lessonid'
@@ -41,8 +41,8 @@ angular.module('mm.addons.mod_lesson')
             ]
         },
         {
-            name: mmaModLessonAnswersStore,
-            keyPath: ['lessonid', 'attempt', 'pageid', 'timemodified'], // A user can answer several times per page and attempt.
+            name: mmaModLessonPageAttemptsStore,
+            keyPath: ['lessonid', 'retake', 'pageid', 'timemodified'], // A user can attempt several times per page and retake.
             indexes: [
                 {
                     name: 'lessonid'
@@ -51,7 +51,7 @@ angular.module('mm.addons.mod_lesson')
                     name: 'courseid'
                 },
                 {
-                    name: 'attempt'
+                    name: 'retake'
                 },
                 {
                     name: 'pageid'
@@ -67,16 +67,16 @@ angular.module('mm.addons.mod_lesson')
                     keyPath: ['lessonid', 'pageid']
                 },
                 {
-                    name: 'lessonAndAttempt',
-                    keyPath: ['lessonid', 'attempt']
+                    name: 'lessonAndRetake',
+                    keyPath: ['lessonid', 'retake']
                 },
                 {
-                    name: 'lessonAndAttemptAndType',
-                    keyPath: ['lessonid', 'attempt', 'type']
+                    name: 'lessonAndRetakeAndType',
+                    keyPath: ['lessonid', 'retake', 'type']
                 },
                 {
-                    name: 'lessonAndAttemptAndPage',
-                    keyPath: ['lessonid', 'attempt', 'pageid']
+                    name: 'lessonAndRetakeAndPage',
+                    keyPath: ['lessonid', 'retake', 'pageid']
                 }
             ]
         }
@@ -91,68 +91,69 @@ angular.module('mm.addons.mod_lesson')
  * @ngdoc service
  * @name $mmaModLessonOffline
  */
-.factory('$mmaModLessonOffline', function($log, $mmSitesManager, $mmUtil, $q, mmaModLessonAttemptsStore, mmaModLessonAnswersStore,
-            $mmSite, mmaModLessonTypeQuestion) {
+.factory('$mmaModLessonOffline', function($log, $mmSitesManager, $mmUtil, $q, $mmSite, mmaModLessonRetakesStore,
+             mmaModLessonPageAttemptsStore, mmaModLessonTypeQuestion) {
 
     $log = $log.getInstance('$mmaModLessonOffline');
 
     var self = {};
 
     /**
-     * Delete offline answer.
+     * Delete an offline attempt.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#deleteAnswer
+     * @name $mmaModLessonOffline#deleteAttempt
      * @param  {Number} lessonId     Lesson ID.
-     * @param  {Number} attempt      Attempt number.
+     * @param  {Number} retake       Lesson retake number.
      * @param  {Number} pageId       Page ID.
-     * @param  {Number} timemodified The time modified of the answer.
+     * @param  {Number} timemodified The timemodified of the attempt.
      * @param  {String} [siteId]     Site ID. If not defined, current site.
      * @return {Promise}             Promise resolved when done.
      */
-    self.deleteAnswer = function(lessonId, attempt, pageId, timemodified, siteId) {
+    self.deleteAttempt = function(lessonId, retake, pageId, timemodified, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().remove(mmaModLessonAnswersStore, [lessonId, attempt, pageId, timemodified]);
+            return site.getDb().remove(mmaModLessonPageAttemptsStore, [lessonId, retake, pageId, timemodified]);
         });
     };
 
     /**
-     * Delete offline attempt.
+     * Delete offline lesson retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#deleteAttempt
+     * @name $mmaModLessonOffline#deleteRetake
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when done.
      */
-    self.deleteAttempt = function(lessonId, siteId) {
+    self.deleteRetake = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().remove(mmaModLessonAttemptsStore, lessonId);
+            return site.getDb().remove(mmaModLessonRetakesStore, lessonId);
         });
     };
 
     /**
-     * Delete offline answers for an attempt and page.
+     * Delete offline attempts for a retake and page.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#deleteAttemptAnswersForPage
+     * @name $mmaModLessonOffline#deleteRetakeAttemptsForPage
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Lesson retake number.
      * @param  {Number} pageId   Page ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when done.
      */
-    self.deleteAttemptAnswersForPage = function(lessonId, attempt, pageId, siteId) {
+    self.deleteRetakeAttemptsForPage = function(lessonId, retake, pageId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            // Get the answers and delete them.
-            return self.getAttemptAnswersForPage(lessonId, attempt, pageId, siteId).then(function(answers) {
+            // Get the attempts and delete them.
+            return self.getRetakeAttemptsForPage(lessonId, retake, pageId, siteId).then(function(attempts) {
                 var promises = [];
 
-                angular.forEach(answers, function(answer) {
-                    promises.push(site.getDb().remove(mmaModLessonAnswersStore, [lessonId, attempt, pageId, answer.timemodified]));
+                angular.forEach(attempts, function(attempt) {
+                    var timeMod = attempt.timemodified;
+                    promises.push(site.getDb().remove(mmaModLessonPageAttemptsStore, [lessonId, retake, pageId, timeMod]));
                 });
 
                 return $q.all(promises);
@@ -161,69 +162,69 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Mark an attempt as finished.
+     * Mark a retake as finished.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#finishAttempt
+     * @name $mmaModLessonOffline#finishRetake
      * @param  {Number} lessonId   Lesson ID.
      * @param  {Number} courseId   Course ID the lesson belongs to.
-     * @param  {Number} attempt    Attempt number.
-     * @param  {Boolean} finished  Whether attempt is finished.
+     * @param  {Number} retake     Retake number.
+     * @param  {Boolean} finished  Whether retake is finished.
      * @param  {Boolean} outOfTime If the user ran out of time.
      * @param  {String} [siteId]   Site ID. If not defined, current site.
      * @return {Promise}           Promise resolved in success, rejected otherwise.
      */
-    self.finishAttempt = function(lessonId, courseId, attempt, finished, outOfTime, siteId) {
+    self.finishRetake = function(lessonId, courseId, retake, finished, outOfTime, siteId) {
         siteId = siteId || $mmSite.getId();
 
-        // Get current stored attempt.
-        return getAttemptWithFallback(lessonId, courseId, attempt, siteId).then(function(entry) {
+        // Get current stored retake.
+        return getRetakeWithFallback(lessonId, courseId, retake, siteId).then(function(entry) {
             return $mmSitesManager.getSite(siteId).then(function(site) {
                 entry.finished = !!finished;
                 entry.outoftime = !!outOfTime;
                 entry.timemodified = $mmUtil.timestamp();
 
-                return site.getDb().insert(mmaModLessonAttemptsStore, entry);
+                return site.getDb().insert(mmaModLessonRetakesStore, entry);
             });
         });
     };
 
     /**
-     * Get all the offline answers in a certain site.
+     * Get all the offline page attempts in a certain site.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAllAnswers
+     * @name $mmaModLessonOffline#getAllAttempts
      * @param {String} [siteId] Site ID. If not set, use current site.
-     * @return {Promise}        Promise resolved when the offline answers are retrieved.
+     * @return {Promise}        Promise resolved when the offline attempts are retrieved.
      */
-    self.getAllAnswers = function(siteId) {
+    self.getAllAttempts = function(siteId) {
         return $mmSitesManager.getSiteDb(siteId).then(function(db) {
             if (!db) {
                 return $q.reject();
             }
 
-            return db.getAll(mmaModLessonAnswersStore);
+            return db.getAll(mmaModLessonPageAttemptsStore);
         });
     };
 
     /**
-     * Get all the offline attempts in a certain site.
+     * Get all the offline retakes in a certain site.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAllAttempts
+     * @name $mmaModLessonOffline#getAllRetakes
      * @param {String} [siteId] Site ID. If not set, use current site.
-     * @return {Promise}        Promise resolved when the offline attempts are retrieved.
+     * @return {Promise}        Promise resolved when the offline retakes are retrieved.
      */
-    self.getAllAttempts = function(siteId) {
+    self.getAllRetakes = function(siteId) {
         return $mmSitesManager.getSiteDb(siteId).then(function(db) {
             if (!db) {
                 return $q.reject();
             }
 
-            return db.getAll(mmaModLessonAttemptsStore);
+            return db.getAll(mmaModLessonRetakesStore);
         });
     };
 
@@ -241,7 +242,7 @@ angular.module('mm.addons.mod_lesson')
             lessons = {};
 
         promises.push(getLessons(self.getAllAttempts(siteId)));
-        promises.push(getLessons(self.getAllAnswers(siteId)));
+        promises.push(getLessons(self.getAllRetakes(siteId)));
 
         return $q.all(promises).then(function() {
             return lessons;
@@ -264,95 +265,95 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Retrieve an attempt from site DB.
+     * Retrieve a retake from site DB.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAttempt
+     * @name $mmaModLessonOffline#getRetake
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the attempt.
+     * @return {Promise}         Promise resolved with the retake.
      */
-    self.getAttempt = function(lessonId, siteId) {
+    self.getRetake = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().get(mmaModLessonAttemptsStore, lessonId);
+            return site.getDb().get(mmaModLessonRetakesStore, lessonId);
         });
     };
 
     /**
-     * Retrieve all offline answers for an attempt.
+     * Retrieve all offline attempts for a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAttemptAnswers
+     * @name $mmaModLessonOffline#getRetakeAttempts
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the attempt answers.
+     * @return {Promise}         Promise resolved with the retake attempts.
      */
-    self.getAttemptAnswers = function(lessonId, attempt, siteId) {
+    self.getRetakeAttempts = function(lessonId, retake, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttempt', [lessonId, attempt]);
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetake', [lessonId, retake]);
         });
     };
 
     /**
-     * Retrieve offline answers for an attempt and page.
+     * Retrieve offline attempts for a retake and page.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAttemptAnswersForPage
+     * @name $mmaModLessonOffline#getRetakeAttemptsForPage
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Lesson retake number.
      * @param  {Number} pageId   Page ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the attempt answers.
+     * @return {Promise}         Promise resolved with the retake attempts.
      */
-    self.getAttemptAnswersForPage = function(lessonId, attempt, pageId, siteId) {
+    self.getRetakeAttemptsForPage = function(lessonId, retake, pageId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttemptAndPage', [lessonId, attempt, pageId]);
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetakeAndPage', [lessonId, retake, pageId]);
         });
     };
 
     /**
-     * Retrieve offline answers for certain pages for an attempt.
+     * Retrieve offline attempts for certain pages for a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getAttemptAnswersForType
+     * @name $mmaModLessonOffline#getRetakeAttemptsForType
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {Number} type     Type of the pages to get: mmaModLessonTypeQuestion or mmaModLessonTypeStructure.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the attempt answers.
+     * @return {Promise}         Promise resolved with the retake attempts.
      */
-    self.getAttemptAnswersForType = function(lessonId, attempt, type, siteId) {
+    self.getRetakeAttemptsForType = function(lessonId, retake, type, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttemptAndType', [lessonId, attempt, type]);
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetakeAndType', [lessonId, retake, type]);
         });
     };
     /**
-     * Get stored attempt. If not found or doesn't match the attempt number, return a new one.
+     * Get stored retake. If not found or doesn't match the retake number, return a new one.
      *
      * @param  {Number} lessonId  Lesson ID.
      * @param  {Number} courseId  Course ID the lesson belongs to.
-     * @param  {Number} attempt   Attempt number.
+     * @param  {Number} retake    Retake number.
      * @param  {String} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise}          Promise resolved with the attempt.
+     * @return {Promise}          Promise resolved with the retake.
      */
-    function getAttemptWithFallback(lessonId, courseId, attempt, siteId) {
-        // Get current stored attempt.
-        return self.getAttempt(lessonId, siteId).then(function(attemptData) {
-            if (attemptData.attempt != attempt) {
-                // The stored attempt doesn't match the attempt number, create a new one.
+    function getRetakeWithFallback(lessonId, courseId, retake, siteId) {
+        // Get current stored retake.
+        return self.getRetake(lessonId, siteId).then(function(retakeData) {
+            if (retakeData.retake != retake) {
+                // The stored retake doesn't match the retake number, create a new one.
                 return $q.reject();
             }
-            return attemptData;
+            return retakeData;
         }).catch(function() {
-            // No attempt, create a new one.
+            // No retake, create a new one.
             return {
                 lessonid: lessonId,
-                attempt: attempt,
+                retake: retake,
                 courseid: courseId,
                 finished: false
             };
@@ -360,28 +361,28 @@ angular.module('mm.addons.mod_lesson')
     }
 
     /**
-     * Retrieve the last offline answer stored in an attempt.
+     * Retrieve the last offline attempt stored in a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getLastQuestionPageAnswer
+     * @name $mmaModLessonOffline#getLastQuestionPageAttempt
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with the attempt (undefined if no attempts).
      */
-    self.getLastQuestionPageAnswer = function(lessonId, attempt, siteId) {
+    self.getLastQuestionPageAttempt = function(lessonId, retake, siteId) {
         siteId = siteId || $mmSite.getId();
 
-        return getAttemptWithFallback(lessonId, 0, attempt, siteId).then(function(attemptData) {
-            if (!attemptData.lastquestionpage) {
-                // No question page answered.
+        return getRetakeWithFallback(lessonId, 0, retake, siteId).then(function(retakeData) {
+            if (!retakeData.lastquestionpage) {
+                // No question page attempted.
                 return;
             }
 
-            return self.getAttemptAnswersForPage(lessonId, attempt, attemptData.lastquestionpage, siteId).then(function(answers) {
-                // Return the answer with highest timemodified.
-                return answers.reduce(function(a, b) {
+            return self.getRetakeAttemptsForPage(lessonId, retake, retakeData.lastquestionpage, siteId).then(function(attempts) {
+                // Return the attempt with highest timemodified.
+                return attempts.reduce(function(a, b) {
                     return a.timemodified > b.timemodified ? a : b;
                 });
             });
@@ -391,88 +392,88 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Retrieve all offline answers for a lesson.
+     * Retrieve all offline attempts for a lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getLessonAnswers
+     * @name $mmaModLessonOffline#getLessonAttempts
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the answers.
+     * @return {Promise}         Promise resolved with the attempts.
      */
-    self.getLessonAnswers = function(lessonId, siteId) {
+    self.getLessonAttempts = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonid', lessonId);
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonid', lessonId);
         });
     };
 
     /**
-     * Get questions attempts for a lesson and attempt.
+     * Get attempts for question pages and retake in a lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
      * @name $mmaModLessonOffline#getQuestionsAttempts
-     * @param  {Number} lessonId       Lesson ID.
-     * @param  {Number} attempt        Attempt number.
-     * @param  {Boolean} correct       True to only fetch correct attempts, false to get them all.
-     * @param  {Number} [pageId]       If defined, only get attempts on this page.
-     * @param  {String} [siteId]       Site ID. If not defined, current site.
-     * @return {Promise}               Promise resolved with the questions attempts.
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} retake   Retake number.
+     * @param  {Boolean} correct True to only fetch correct attempts, false to get them all.
+     * @param  {Number} [pageId] If defined, only get attempts on this page.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the attempts.
      */
-    self.getQuestionsAttempts = function(lessonId, attempt, correct, pageId, siteId) {
+    self.getQuestionsAttempts = function(lessonId, retake, correct, pageId, siteId) {
         var promise;
         if (pageId) {
-            // Page ID is set, only get the answers for that page.
-            promise = self.getAttemptAnswersForPage(lessonId, attempt, pageId, siteId);
+            // Page ID is set, only get the attempts for that page.
+            promise = self.getRetakeAttemptsForPage(lessonId, retake, pageId, siteId);
         } else {
-            // Page ID not specified, get all the question answers.
-            promise = self.getAttemptAnswersForType(lessonId, attempt, mmaModLessonTypeQuestion, siteId);
+            // Page ID not specified, get all the attempts.
+            promise = self.getRetakeAttemptsForType(lessonId, retake, mmaModLessonTypeQuestion, siteId);
         }
 
-        return promise.then(function(answers) {
+        return promise.then(function(attempts) {
             if (correct) {
-                return answers.filter(function(answer) {
-                    return !!answer.correct;
+                return attempts.filter(function(attempt) {
+                    return !!attempt.correct;
                 });
             }
-            return answers;
+            return attempts;
         });
     };
 
     /**
-     * Check if there are offline answers for an attempt.
+     * Check if there are offline attempts for a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#hasAttemptAnswers
+     * @name $mmaModLessonOffline#hasRetakeAttempts
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with a boolean.
      */
-    self.hasAttemptAnswers = function(lessonId, attempt, siteId) {
+    self.hasRetakeAttempts = function(lessonId, retake, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonAnswersStore, 'lessonAndAttempt', [lessonId, attempt]).then(function(list) {
-                return !!list.length;
-            });
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetake', [lessonId, retake]);
+        }).then(function(list) {
+            return !!list.length;
         }).catch(function() {
             return false;
         });
     };
 
     /**
-     * Check if there is a finished attempt for a certain lesson.
+     * Check if there is a finished retake for a certain lesson.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#hasFinishedAttempt
+     * @name $mmaModLessonOffline#hasFinishedRetake
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with boolean.
      */
-    self.hasFinishedAttempt = function(lessonId, siteId) {
-        return self.getAttempt(lessonId, siteId).then(function(attempt) {
-            return !!attempt.finished;
+    self.hasFinishedRetake = function(lessonId, siteId) {
+        return self.getRetake(lessonId, siteId).then(function(retake) {
+            return !!retake.finished;
         }).catch(function() {
             return false;
         });
@@ -492,14 +493,14 @@ angular.module('mm.addons.mod_lesson')
         var promises = [],
             hasData = false;
 
-        promises.push(self.getAttempt(lessonId, siteId).then(function() {
+        promises.push(self.getRetake(lessonId, siteId).then(function() {
             hasData = true;
         }).catch(function() {
             // Ignore errors.
         }));
 
-        promises.push(self.getLessonAnswers(lessonId, siteId).then(function(answers) {
-            hasData = hasData || !!answers.length;
+        promises.push(self.getLessonAttempts(lessonId, siteId).then(function(attempts) {
+            hasData = hasData || !!attempts.length;
         }).catch(function() {
             // Ignore errors.
         }));
@@ -517,7 +518,7 @@ angular.module('mm.addons.mod_lesson')
      * @name $mmaModLessonOffline#processPage
      * @param  {Number} lessonId    Lesson ID.
      * @param  {Number} courseId    Course ID the lesson belongs to.
-     * @param  {Number} attempt     Attempt number.
+     * @param  {Number} retake      Retake number.
      * @param  {Object} page        Page.
      * @param  {Object} data        Data to save.
      * @param  {Number} newPageId   New page ID (calculated).
@@ -527,13 +528,13 @@ angular.module('mm.addons.mod_lesson')
      * @param  {String} [siteId]    Site ID. If not defined, current site.
      * @return {Promise}            Promise resolved in success, rejected otherwise.
      */
-    self.processPage = function(lessonId, courseId, attempt, page, data, newPageId, answerId, correct, userAnswer, siteId) {
+    self.processPage = function(lessonId, courseId, retake, page, data, newPageId, answerId, correct, userAnswer, siteId) {
         siteId = siteId || $mmSite.getId();
 
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var entry = {
                 lessonid: lessonId,
-                attempt: attempt,
+                retake: retake,
                 pageid: page.id,
                 courseid: courseId,
                 data: data,
@@ -545,38 +546,38 @@ angular.module('mm.addons.mod_lesson')
                 timemodified: $mmUtil.timestamp()
             };
 
-            return site.getDb().insert(mmaModLessonAnswersStore, entry);
+            return site.getDb().insert(mmaModLessonPageAttemptsStore, entry);
         }).then(function() {
             if (page.type == mmaModLessonTypeQuestion) {
-                // It's a question page, set it as last question page answered.
-                return self.setLastQuestionPageAnswered(lessonId, courseId, attempt, page.id, siteId);
+                // It's a question page, set it as last question page attempted.
+                return self.setLastQuestionPageAttempted(lessonId, courseId, retake, page.id, siteId);
             }
         });
     };
 
     /**
-     * Set the last question page answered in an attempt.
+     * Set the last question page attempted in a retake.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#setLastQuestionPageAnswered
+     * @name $mmaModLessonOffline#setLastQuestionPageAttempted
      * @param  {Number} lessonId  Lesson ID.
      * @param  {Number} courseId  Course ID the lesson belongs to.
-     * @param  {Number} attempt   Attempt number.
-     * @param  {Number} lastPage  ID of the last question page answered.
+     * @param  {Number} retake    Retake number.
+     * @param  {Number} lastPage  ID of the last question page attempted.
      * @param  {String} [siteId]  Site ID. If not defined, current site.
      * @return {Promise}          Promise resolved in success, rejected otherwise.
      */
-    self.setLastQuestionPageAnswered = function(lessonId, courseId, attempt, lastPage, siteId) {
+    self.setLastQuestionPageAttempted = function(lessonId, courseId, retake, lastPage, siteId) {
         siteId = siteId || $mmSite.getId();
 
-        // Get current stored attempt.
-        return getAttemptWithFallback(lessonId, courseId, attempt, siteId).then(function(entry) {
+        // Get current stored retake.
+        return getRetakeWithFallback(lessonId, courseId, retake, siteId).then(function(entry) {
             return $mmSitesManager.getSite(siteId).then(function(site) {
                 entry.lastquestionpage = lastPage;
                 entry.timemodified = $mmUtil.timestamp();
 
-                return site.getDb().insert(mmaModLessonAttemptsStore, entry);
+                return site.getDb().insert(mmaModLessonRetakesStore, entry);
             });
         });
     };
diff --git a/www/addons/mod/lesson/services/lesson_sync.js b/www/addons/mod/lesson/services/lesson_sync.js
index 842c3f4bb70..4b4dc791417 100644
--- a/www/addons/mod/lesson/services/lesson_sync.js
+++ b/www/addons/mod/lesson/services/lesson_sync.js
@@ -14,16 +14,16 @@
 
 angular.module('mm.addons.mod_lesson')
 
-.constant('mmaModLessonAttemptsFinishedSyncStore', 'mma_mod_lesson_attempts_finished_sync')
+.constant('mmaModLessonRetakesFinishedSyncStore', 'mma_mod_lesson_retakes_finished_sync')
 
-.config(function($mmSitesFactoryProvider, mmaModLessonAttemptsFinishedSyncStore) {
+.config(function($mmSitesFactoryProvider, mmaModLessonRetakesFinishedSyncStore) {
     var stores = [
         {
-            name: mmaModLessonAttemptsFinishedSyncStore,
-            keyPath: 'lessonid', // Only 1 attempt per lesson.
+            name: mmaModLessonRetakesFinishedSyncStore,
+            keyPath: 'lessonid', // Only 1 retake per lesson.
             indexes: [
                 {
-                    name: 'attempt'
+                    name: 'retake'
                 },
                 {
                     name: 'timefinished'
@@ -43,7 +43,7 @@ angular.module('mm.addons.mod_lesson')
  */
 .factory('$mmaModLessonSync', function($log, $mmaModLesson, $mmSite, $mmSitesManager, $q, $mmaModLessonOffline, $mmUtil,
             $mmLang, $mmApp, $mmEvents, $translate, mmaModLessonSyncTime, $mmSync, mmaModLessonAutomSyncedEvent,
-            mmaModLessonComponent, $mmaModLessonPrefetchHandler, $mmCourse, $mmSyncBlock, mmaModLessonAttemptsFinishedSyncStore) {
+            mmaModLessonComponent, $mmaModLessonPrefetchHandler, $mmCourse, $mmSyncBlock, mmaModLessonRetakesFinishedSyncStore) {
 
     $log = $log.getInstance('$mmaModLessonSync');
 
@@ -51,36 +51,36 @@ angular.module('mm.addons.mod_lesson')
     var self = $mmSync.createChild(mmaModLessonComponent, mmaModLessonSyncTime);
 
     /**
-     * Unmark an attempt as finished in a synchronization.
+     * Unmark a retake as finished in a synchronization.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonSync#deleteAttemptFinishedInSync
+     * @name $mmaModLessonSync#deleteRetakeFinishedInSync
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when done.
      */
-    self.deleteAttemptFinishedInSync = function(lessonId, siteId) {
+    self.deleteRetakeFinishedInSync = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().remove(mmaModLessonAttemptsFinishedSyncStore, lessonId);
+            return site.getDb().remove(mmaModLessonRetakesFinishedSyncStore, lessonId);
         }).catch(function() {
             // Ignore errors, maybe there is none.
         });
     };
 
     /**
-     * Get the number of an attempt finished in a synchronization for a certain lesson (if any).
+     * Get a retake finished in a synchronization for a certain lesson (if any).
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonSync#getAttemptFinishedInSync
+     * @name $mmaModLessonSync#getRetakeFinishedInSync
      * @param  {Number} lessonId Lesson ID.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the attempt entry (undefined if no attempt).
+     * @return {Promise}         Promise resolved with the retake entry (undefined if no retake).
      */
-    self.getAttemptFinishedInSync = function(lessonId, siteId) {
+    self.getRetakeFinishedInSync = function(lessonId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().get(mmaModLessonAttemptsFinishedSyncStore, lessonId);
+            return site.getDb().get(mmaModLessonRetakesFinishedSyncStore, lessonId);
         }).catch(function() {
             // Ignore errors, return undefined.
         });
@@ -93,21 +93,21 @@ angular.module('mm.addons.mod_lesson')
      * @ngdoc method
      * @name $mmaModLessonSync#hasDataToSync
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  Attempt number.
+     * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved with boolean: true if has data to sync, false otherwise.
      */
-    self.hasDataToSync = function(lessonId, attempt, siteId) {
+    self.hasDataToSync = function(lessonId, retake, siteId) {
         var promises = [],
             hasDataToSync = false;
 
-        promises.push($mmaModLessonOffline.hasAttemptAnswers(lessonId, attempt, siteId).then(function(hasAnswers) {
-            hasDataToSync = hasDataToSync || hasAnswers;
+        promises.push($mmaModLessonOffline.hasRetakeAttempts(lessonId, retake, siteId).then(function(hasAttempts) {
+            hasDataToSync = hasDataToSync || hasAttempts;
         }).catch(function() {
             // Ignore errors.
         }));
 
-        promises.push($mmaModLessonOffline.hasFinishedAttempt(lessonId, siteId).then(function(hasFinished) {
+        promises.push($mmaModLessonOffline.hasFinishedRetake(lessonId, siteId).then(function(hasFinished) {
             hasDataToSync = hasDataToSync || hasFinished;
         }));
 
@@ -117,22 +117,22 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Mark an attempt as finished in a synchronization.
+     * Mark a retake as finished in a synchronization.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonSync#setAttemptFinishedInSync
+     * @name $mmaModLessonSync#setRetakeFinishedInSync
      * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} attempt  The attempt number.
+     * @param  {Number} retake   The retake number.
      * @param  {Number} pageId   The page ID to start reviewing from.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when done.
      */
-    self.setAttemptFinishedInSync = function(lessonId, attempt, pageId, siteId) {
+    self.setRetakeFinishedInSync = function(lessonId, retake, pageId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().insert(mmaModLessonAttemptsFinishedSyncStore, {
+            return site.getDb().insert(mmaModLessonRetakesFinishedSyncStore, {
                 lessonid: lessonId,
-                attempt: parseInt(attempt, 10),
+                retake: parseInt(retake, 10),
                 pageid: parseInt(pageId, 10),
                 timefinished: $mmUtil.timestamp()
             });
@@ -253,16 +253,16 @@ angular.module('mm.addons.mod_lesson')
 
         $log.debug('Try to sync lesson ' + lessonId + ' in site ' + siteId);
 
-        // Try to synchronize the answers first.
-        syncPromise = $mmaModLessonOffline.getLessonAnswers(lessonId, siteId).then(function(answers) {
-            if (!answers.length) {
+        // Try to synchronize the attempts first.
+        syncPromise = $mmaModLessonOffline.getLessonAttempts(lessonId, siteId).then(function(attempts) {
+            if (!attempts.length) {
                 return;
             } else if (!$mmApp.isOnline()) {
                 // Cannot sync in offline.
                 return $q.reject();
             }
 
-            courseId = answers[0].courseid;
+            courseId = attempts[0].courseid;
 
             // Get the info, access info and the lesson password if needed.
             return $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
@@ -270,7 +270,7 @@ angular.module('mm.addons.mod_lesson')
 
                 return $mmaModLessonPrefetchHandler.gatherLessonPassword(lessonId, false, true, askPassword, siteId);
             }).then(function(data) {
-                var answersLength = answers.length;
+                var attemptsLength = attempts.length;
 
                 accessInfo = data.accessinfo;
                 password = data.password;
@@ -278,11 +278,11 @@ angular.module('mm.addons.mod_lesson')
 
                 var promises = [];
 
-                // Filter the answers, get only the ones that belong to the current attempt.
-                answers = answers.filter(function(answer) {
-                    if (answer.attempt != accessInfo.attemptscount) {
-                        promises.push($mmaModLessonOffline.deleteAnswer(lesson.id, answer.attempt, answer.pageid,
-                                answer.timemodified, siteId).catch(function() {
+                // Filter the attempts, get only the ones that belong to the current retake.
+                attempts = attempts.filter(function(attempt) {
+                    if (attempt.retake != accessInfo.attemptscount) {
+                        promises.push($mmaModLessonOffline.deleteAttempt(lesson.id, attempt.retake, attempt.pageid,
+                                attempt.timemodified, siteId).catch(function() {
                             // Ignore errors.
                         }));
                         return false;
@@ -290,42 +290,42 @@ angular.module('mm.addons.mod_lesson')
                     return true;
                 });
 
-                if (answers.length != answersLength) {
-                    // Some answers won't be sent, add a warning.
+                if (attempts.length != attemptsLength) {
+                    // Some attempts won't be sent, add a warning.
                     result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                         component: $mmCourse.translateModuleName('lesson'),
                         name: lesson.name,
-                        error: $translate.instant('mma.mod_lesson.warningattemptfinished')
+                        error: $translate.instant('mma.mod_lesson.warningretakefinished')
                     }));
                 }
 
                 return $q.all(promises);
             }).then(function() {
-                if (!answers.length) {
+                if (!attempts.length) {
                     return;
                 }
 
-                // Send the answers in the same order they were answered.
-                answers.sort(function(a, b) {
+                // Send the attempts in the same order they were answered.
+                attempts.sort(function(a, b) {
                     return a.timemodified - b.timemodified;
                 });
 
-                answers = answers.map(function(answer) {
+                attempts = attempts.map(function(attempt) {
                     return {
-                        func: sendAnswer,
-                        params: [lesson, password, answer, result, siteId],
+                        func: sendAttempt,
+                        params: [lesson, password, attempt, result, siteId],
                         blocking: true
                     };
                 });
 
-                return $mmUtil.executeOrderedPromises(answers);
+                return $mmUtil.executeOrderedPromises(attempts);
             });
         }).then(function() {
-            // Answers sent or there was none. If there is a finished attempt, send it.
-            return $mmaModLessonOffline.getAttempt(lessonId, siteId).then(function(attempt) {
-                if (!attempt.finished) {
-                    // The attempt isn't marked as finished, nothing to send. Delete the attempt.
-                    return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
+            // Attempts sent or there was none. If there is a finished retake, send it.
+            return $mmaModLessonOffline.getRetake(lessonId, siteId).then(function(retake) {
+                if (!retake.finished) {
+                    // The retake isn't marked as finished, nothing to send. Delete the retake.
+                    return $mmaModLessonOffline.deleteRetake(lessonId, siteId);
                 } else if (!$mmApp.isOnline()) {
                     // Cannot sync in offline.
                     return $q.reject();
@@ -333,10 +333,10 @@ angular.module('mm.addons.mod_lesson')
 
                 var promise;
 
-                courseId = attempt.courseid;
+                courseId = retake.courseid;
 
                 if (lesson) {
-                    // Data already retrieved when syncing answers.
+                    // Data already retrieved when syncing attempts.
                     promise = $q.when();
                 } else {
                     promise = $mmaModLesson.getLessonById(courseId, lessonId).then(function(lessonData) {
@@ -351,41 +351,41 @@ angular.module('mm.addons.mod_lesson')
                 }
 
                 return promise.then(function() {
-                    if (attempt.attempt != accessInfo.attemptscount) {
-                        // The attempt changed, add a warning if it isn't there already.
+                    if (retake.retake != accessInfo.attemptscount) {
+                        // The retake changed, add a warning if it isn't there already.
                         if (!result.warnings.length) {
                             result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                                 component: $mmCourse.translateModuleName('lesson'),
                                 name: lesson.name,
-                                error: $translate.instant('mma.mod_lesson.warningattemptfinished')
+                                error: $translate.instant('mma.mod_lesson.warningretakefinished')
                             }));
                         }
 
-                        return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
+                        return $mmaModLessonOffline.deleteRetake(lessonId, siteId);
                     }
 
-                    // All good, finish the attempt.
-                    return $mmaModLesson.finishAttemptOnline(lessonId, password, false, false, siteId).then(function(response) {
+                    // All good, finish the retake.
+                    return $mmaModLesson.finishRetakeOnline(lessonId, password, false, false, siteId).then(function(response) {
                         result.updated = true;
 
                         if (!ignoreBlock) {
-                            // Mark the attempt as finished in a sync if it can be reviewed.
+                            // Mark the retake as finished in a sync if it can be reviewed.
                             if (response.data && response.data.reviewlesson) {
                                 var params = $mmUtil.extractUrlParams(response.data.reviewlesson.value);
                                 if (params && params.pageid) {
-                                    // The attempt can be reviewed, mark it as finished. Don't block the user for this.
-                                    self.setAttemptFinishedInSync(lessonId, attempt.attempt, params.pageid, siteId);
+                                    // The retake can be reviewed, mark it as finished. Don't block the user for this.
+                                    self.setRetakeFinishedInSync(lessonId, retake.retake, params.pageid, siteId);
                                 }
                             }
                         }
 
-                        return $mmaModLessonOffline.deleteAttempt(lessonId, siteId);
+                        return $mmaModLessonOffline.deleteRetake(lessonId, siteId);
                     }).catch(function(error) {
                         if (error && $mmUtil.isWebServiceError(error)) {
                             // The WebService has thrown an error, this means that responses cannot be submitted. Delete them.
                             result.updated = true;
-                            return $mmaModLessonOffline.deleteAttempt(lessonId, siteId).then(function() {
-                                // Attempt deleted, add a warning.
+                            return $mmaModLessonOffline.deleteRetake(lessonId, siteId).then(function() {
+                                // Retake deleted, add a warning.
                                 result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                                     component: $mmCourse.translateModuleName('lesson'),
                                     name: lesson.name,
@@ -399,7 +399,7 @@ angular.module('mm.addons.mod_lesson')
                     });
                 });
             }, function() {
-                // No attempt stored, nothing to do.
+                // No retake stored, nothing to do.
             });
         }).then(function() {
             if (result.updated && courseId) {
@@ -417,11 +417,11 @@ angular.module('mm.addons.mod_lesson')
                     // Sync successful, update some data that might have been modified.
                     return $mmaModLesson.getAccessInformation(lessonId, false, false, siteId).then(function(info) {
                         var promises = [],
-                            attempt = info.attemptscount;
+                            retake = info.attemptscount;
 
-                        promises.push($mmaModLesson.getContentPagesViewedOnline(lessonId, attempt, false, false, siteId));
+                        promises.push($mmaModLesson.getContentPagesViewedOnline(lessonId, retake, false, false, siteId));
                         promises.push($mmaModLesson.getQuestionsAttemptsOnline(
-                                    lessonId, attempt, false, undefined, false, false, siteId));
+                                    lessonId, retake, false, undefined, false, false, siteId));
 
                         return $q.all(promises);
                     }).catch(function() {
@@ -444,27 +444,27 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Send an answer to the site and delete it afterwards.
+     * Send an attempt to the site and delete it afterwards.
      *
      * @param  {Object} lesson   Lesson.
      * @param  {String} password Password (if any).
-     * @param  {Object} answer   Answer to send.
+     * @param  {Object} attempt  Attempt to send.
      * @param  {Object} result   Result where to store the data.
      * @param  {String} [siteId] Site ID. If not defined, current site.
      * @return {Promise}         Promise resolved when done.
      */
-    function sendAnswer(lesson, password, answer, result, siteId) {
-        return $mmaModLesson.processPageOnline(lesson.id, answer.pageid, answer.data, password, false, siteId).then(function() {
+    function sendAttempt(lesson, password, attempt, result, siteId) {
+        return $mmaModLesson.processPageOnline(lesson.id, attempt.pageid, attempt.data, password, false, siteId).then(function() {
             result.updated = true;
 
-            return $mmaModLessonOffline.deleteAnswer(lesson.id, answer.attempt, answer.pageid, answer.timemodified, siteId);
+            return $mmaModLessonOffline.deleteAttempt(lesson.id, attempt.retake, attempt.pageid, attempt.timemodified, siteId);
         }).catch(function(error) {
             if (error && $mmUtil.isWebServiceError(error)) {
-                // The WebService has thrown an error, this means that the answer cannot be submitted. Delete it.
+                // The WebService has thrown an error, this means that the attempt cannot be submitted. Delete it.
                 result.updated = true;
-                return $mmaModLessonOffline.deleteAnswer(lesson.id, answer.attempt, answer.pageid, answer.timemodified, siteId)
+                return $mmaModLessonOffline.deleteAttempt(lesson.id, attempt.retake, attempt.pageid, attempt.timemodified, siteId)
                         .then(function() {
-                    // Answer deleted, add a warning.
+                    // Attempt deleted, add a warning.
                     result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                         component: $mmCourse.translateModuleName('lesson'),
                         name: lesson.name,
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 99053c22a4d..38df02df9bb 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_lesson')
  * @name $mmaModLessonPrefetchHandler
  */
 .factory('$mmaModLessonPrefetchHandler', function($mmaModLesson, $q, $mmPrefetchFactory, mmaModLessonComponent, $mmUtil, $mmGroups,
-    $mmSite, $mmFilepool, $rootScope, $timeout, $ionicModal, mmCoreDontShowError) {
+    $mmSite, $mmFilepool, $rootScope, $timeout, $ionicModal, mmCoreDontShowError, $mmCourse) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModLessonComponent, false);
 
@@ -83,7 +83,7 @@ angular.module('mm.addons.mod_lesson')
                         return $q.reject(info.preventaccessreasons[0].message);
                     });
                 } else  {
-                    // Lesson cannot be attempted, reject.
+                    // Lesson cannot be played, reject.
                     return $q.reject(info.preventaccessreasons[0].message);
                 }
             }
@@ -261,7 +261,7 @@ angular.module('mm.addons.mod_lesson')
             // Get the list of pages.
             promises.push($mmaModLesson.getPages(lesson.id, password, false, false, siteId).then(function(pages) {
                 // Check the timemodified of each page. Don't check the files in each page because it requires a WS call
-                // per page and it will fail if the user hasn't attempted the lesson yet.
+                // per page and it will fail if the user hasn't started the lesson yet.
                 angular.forEach(pages, function(data) {
                     timemodified = Math.max(timemodified, data.page.timemodified || data.page.timecreated || 0);
                 });
@@ -398,8 +398,8 @@ angular.module('mm.addons.mod_lesson')
             accessInfo = data.accessinfo;
 
             if (!$mmaModLesson.leftDuringTimed(accessInfo)) {
-                // The user didn't left during a timed session. Call launch attempt to make sure there is a started attempt.
-                return $mmaModLesson.launchAttempt(lesson.id, password, false, false, siteId).then(function() {
+                // The user didn't left during a timed session. Call launch retake to make sure there is a started retake.
+                return $mmaModLesson.launchRetake(lesson.id, password, false, false, siteId).then(function() {
                     var promises = [];
 
                     // New data generated, update the download time and refresh the access info.
@@ -416,7 +416,7 @@ angular.module('mm.addons.mod_lesson')
         }).then(function() {
             var promises = [],
                 files,
-                attempt = accessInfo.attemptscount;
+                retake = accessInfo.attemptscount;
 
             // Download intro files and media files.
             files = lesson.mediafiles || [];
@@ -460,11 +460,11 @@ angular.module('mm.addons.mod_lesson')
             // Prefetch the list of possible jumps for offline navigation.
             promises.push($mmaModLesson.getPagesPossibleJumps(lesson.id, false, true, siteId));
 
-            // Prefetch viewed pages in last attempt to calculate progress.
-            promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, attempt, false, true, siteId));
+            // Prefetch viewed pages in last retake to calculate progress.
+            promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, retake, false, true, siteId));
 
-            // Prefetch question attempts in last attempt for offline calculations.
-            promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, attempt, false, undefined, false, true, siteId));
+            // Prefetch question attempts in last retake for offline calculations.
+            promises.push($mmaModLesson.getQuestionsAttemptsOnline(lesson.id, retake, false, undefined, false, true, siteId));
 
             // Get module info to be able to handle links.
             promises.push($mmCourse.getModuleBasicInfo(module.id, siteId));
@@ -475,29 +475,29 @@ angular.module('mm.addons.mod_lesson')
                     var subPromises = [];
 
                     angular.forEach(groups, function(group) {
-                        subPromises.push($mmaModLesson.getAttemptsOverview(lesson.id, group.id, false, true, siteId));
+                        subPromises.push($mmaModLesson.getRetakesOverview(lesson.id, group.id, false, true, siteId));
                     });
 
                     // Always get group 0, even if there are no groups.
-                    subPromises.push($mmaModLesson.getAttemptsOverview(lesson.id, 0, false, true, siteId).then(function(data) {
-                        // Prefetch the last attempt for each user.
-                        var attemptPromises = [];
+                    subPromises.push($mmaModLesson.getRetakesOverview(lesson.id, 0, false, true, siteId).then(function(data) {
+                        // Prefetch the last retake for each user.
+                        var retakePromises = [];
 
                         angular.forEach(data && data.students, function(student) {
                             if (!student.attempts || !student.attempts.length) {
                                 return;
                             }
 
-                            var lastAttempt = student.attempts[student.attempts.length - 1];
-                            if (!lastAttempt) {
+                            var lastRetake = student.attempts[student.attempts.length - 1];
+                            if (!lastRetake) {
                                 return;
                             }
 
-                            attemptPromises.push($mmaModLesson.getUserAttempt(
-                                    lesson.id, lastAttempt.try, student.id, false, true, siteId));
+                            retakePromises.push($mmaModLesson.getUserRetake(
+                                    lesson.id, lastRetake.try, student.id, false, true, siteId));
                         });
 
-                        return $q.all(attemptPromises);
+                        return $q.all(retakePromises);
                     }));
 
                     return $q.all(subPromises);
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 7447562bcc3..ff78ef22fdc 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -41,7 +41,7 @@
                 <!-- End of lesson reached. -->
                 <div ng-if="eolData && !processData" class="card">
                     <div class="mm-warning" ng-if="eolData.offline && eolData.offline.value">
-                        <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_lesson.finishattemptoffline' | translate }}
+                        <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_lesson.finishretakeoffline' | translate }}
                     </div>
                     <h3 class="padding" ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
                     <p class="item item-text-wrap" ng-if="eolData.notenoughtimespent"><mm-format-text>{{ eolData.notenoughtimespent.message }}</mm-format-text></p>
diff --git a/www/addons/mod/lesson/templates/reports.html b/www/addons/mod/lesson/templates/reports.html
index 3934e3a8fe6..36290c177e2 100644
--- a/www/addons/mod/lesson/templates/reports.html
+++ b/www/addons/mod/lesson/templates/reports.html
@@ -7,7 +7,7 @@
         </select>
     </div>
 
-    <!-- No lesson attempts. -->
+    <!-- No lesson retakes. -->
     <mm-empty-box ng-if="!overview && selectedGroupName" icon="ion-stats-bars" message="{{ 'mma.mod_lesson.nolessonattemptsgroup' | translate:{$a: selectedGroupName} }}">
     </mm-empty-box>
     <mm-empty-box ng-if="!overview && !selectedGroupName" icon="ion-stats-bars" message="{{ 'mma.mod_lesson.nolessonattempts' | translate }}">
@@ -108,13 +108,13 @@ <h2>{{ 'mma.mod_lesson.lessonstats' | translate }}</h2>
         </div>
     </div>
 
-    <!-- List of students that have attempts. -->
+    <!-- List of students that have retakes. -->
     <div class="card" ng-if="overview">
         <div class="item item-divider">
             <h2>{{ 'mma.mod_lesson.overview' | translate }}</h2>
         </div>
 
-        <a ng-repeat="student in overview.students" class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}" ui-sref="site.mod_lesson-userattempt({courseid: courseId, lessonid: lesson.id, userid: student.id})">
+        <a ng-repeat="student in overview.students" class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}" ui-sref="site.mod_lesson-userretake({courseid: courseId, lessonid: lesson.id, userid: student.id})">
             <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" mm-user-link userid="{{student.id}}" courseid="{{courseId}}">
             <h2>{{student.fullname}}</h2>
             <div class="row row-no-padding">
diff --git a/www/addons/mod/lesson/templates/userattempt.html b/www/addons/mod/lesson/templates/userretake.html
similarity index 85%
rename from www/addons/mod/lesson/templates/userattempt.html
rename to www/addons/mod/lesson/templates/userretake.html
index 72a221e35e9..a9f7f22ab93 100644
--- a/www/addons/mod/lesson/templates/userattempt.html
+++ b/www/addons/mod/lesson/templates/userretake.html
@@ -1,7 +1,7 @@
 <ion-view view-title="{{ 'mma.mod_lesson.detailedstats' | translate }}">
-    <ion-content mm-state-class delegate-handle="mmaModLessonUserAttemptScroll">
-        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="attemptLoaded" on-refresh="refreshData()"></ion-refresher>
-        <mm-loading hide-until="attemptLoaded">
+    <ion-content mm-state-class delegate-handle="mmaModLessonUserRetakeScroll">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="retakeLoaded" on-refresh="refreshData()"></ion-refresher>
+        <mm-loading hide-until="retakeLoaded">
             <div class="list" ng-if="student">
                 <a class="item item-text-wrap" ng-class="{'item-avatar': student.profileimageurl}" mm-user-link userid="{{student.id}}" courseid="{{courseId}}" title="{{student.fullname}}">
                     <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" >
@@ -12,43 +12,43 @@ <h2>{{student.fullname}}</h2>
                     </div>
                 </a>
 
-                <!-- Attempt selector if there is more than one attempt. -->
+                <!-- Retake selector if there is more than one retake. -->
                 <div ng-if="student.attempts && student.attempts.length > 1" class="item item-text-wrap item-input item-select">
-                    <ion-label id="mma-mod_lesson-attemptslabel">{{ 'mma.mod_lesson.attemptheader' | translate }}</ion-label>
-                    <select ng-model="selectedAttempt" ng-change="setAttempt(selectedAttempt)" aria-labelledby="mma-mod_lesson-attemptslabel" ng-options="attempt.try as attempt.label for attempt in student.attempts" mm-ios-select-fix>
+                    <ion-label id="mma-mod_lesson-retakeslabel">{{ 'mma.mod_lesson.attemptheader' | translate }}</ion-label>
+                    <select ng-model="selectedRetake" ng-change="setRetake(selectedRetake)" aria-labelledby="mma-mod_lesson-retakeslabel" ng-options="retake.try as retake.label for retake in student.attempts" mm-ios-select-fix>
                     </select>
                 </div>
 
-                <!-- Attempt stats. -->
-                <div ng-if="attempt && attempt.userstats && attempt.userstats.gradeinfo" class="mma-mod_lesson-userstats">
+                <!-- Retake stats. -->
+                <div ng-if="retake && retake.userstats && retake.userstats.gradeinfo" class="mma-mod_lesson-userstats">
                     <div class="item item-text-wrap row mm-item-padding">
                         <div class="col col-50">
                             <p class="item-heading">{{ 'mma.mod_lesson.grade' | translate }}</p>
-                            <p>{{ 'mm.core.percentagenumber' | translate:{$a: attempt.userstats.grade} }}</p>
+                            <p>{{ 'mm.core.percentagenumber' | translate:{$a: retake.userstats.grade} }}</p>
                         </div>
 
                         <div class="col col-50">
                             <p class="item-heading">{{ 'mma.mod_lesson.rawgrade' | translate }}</p>
-                            <p>{{ attempt.userstats.gradeinfo.earned }} / {{ attempt.userstats.gradeinfo.total }}</p>
+                            <p>{{ retake.userstats.gradeinfo.earned }} / {{ retake.userstats.gradeinfo.total }}</p>
                         </div>
                     </div>
                     <div class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_lesson.timetaken' | translate }}</p>
-                        <p>{{ attempt.userstats.timetakenReadable }}</p>
+                        <p>{{ retake.userstats.timetakenReadable }}</p>
                     </div>
                     <div class="item item-text-wrap">
                         <p class="item-heading">{{ 'mma.mod_lesson.completed' | translate }}</p>
-                        <p>{{ attempt.userstats.completed * 1000 | mmFormatDate:"dfmediumdate" }}</p>
+                        <p>{{ retake.userstats.completed * 1000 | mmFormatDate:"dfmediumdate" }}</p>
                     </div>
                 </div>
 
                 <!-- Not completed, no stats. -->
-                <div ng-if="attempt && (!attempt.userstats || !attempt.userstats.gradeinfo)" class="item item-text-wrap">
+                <div ng-if="retake && (!retake.userstats || !retake.userstats.gradeinfo)" class="item item-text-wrap">
                     {{ 'mma.mod_lesson.notcompleted' | translate }}
                 </div>
 
                 <!-- Pages. -->
-                <div ng-if="attempt" ng-repeat="page in attempt.answerpages" class="mma-mod_lesson-answerpage card" ng-class="{'dimmed': page.grayout}">
+                <div ng-if="retake" ng-repeat="page in retake.answerpages" class="mma-mod_lesson-answerpage card" ng-class="{'dimmed': page.grayout}">
                     <div class="item item-divider item-text-wrap">
                         <h2>{{page.qtype}}: {{page.title}}</h2>
                     </div>
diff --git a/www/addons/mod/lesson/templates/view.html b/www/addons/mod/lesson/templates/view.html
index 13d0e5dbfe4..67b2b38b87c 100644
--- a/www/addons/mod/lesson/templates/view.html
+++ b/www/addons/mod/lesson/templates/view.html
@@ -22,9 +22,9 @@
 
 <mm-loading hide-until="!showSpinner">
     <section class="list" ng-if="lesson && (!preventMessages || !preventMessages.length)">
-        <div ng-if="attemptToReview" class="item item-text-wrap">
-            <!-- An attempt was finished in a synchronization, allow reviewing it. -->
-            <p>{{ 'mma.mod_lesson.attemptfinishedinsync' | translate }}</p>
+        <div ng-if="retakeToReview" class="item item-text-wrap">
+            <!-- A retake was finished in a synchronization, allow reviewing it. -->
+            <p>{{ 'mma.mod_lesson.retakefinishedinsync' | translate }}</p>
             <button class="button button-block" ng-click="review()">{{ 'mma.mod_lesson.review' | translate }}</button>
         </div>
         <div ng-if="leftDuringTimed && !lesson.timelimit" class="item item-text-wrap">

From 69fda2acf480fa2be803522824baf800886dc55a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 May 2017 09:52:26 +0200
Subject: [PATCH 158/218] MOBILE-2017 lesson: Reorder functions with new
 terminology

---
 www/addons/mod/lesson/services/helper.js      |  78 +++---
 www/addons/mod/lesson/services/lesson.js      | 184 +++++++-------
 .../mod/lesson/services/lesson_offline.js     | 228 +++++++++---------
 3 files changed, 245 insertions(+), 245 deletions(-)

diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index b1310bcfa1a..2a1a0a09fef 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -51,45 +51,6 @@ angular.module('mm.addons.mod_lesson')
         return rootElement.innerHTML;
     };
 
-    /**
-     * Get a label to identify a retake (lesson attempt).
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLessonHelper#getRetakeLabel
-     * @param  {Object} retake           Retake.
-     * @param  {Boolean} includeDuration Whether to include the duration of the retake.
-     * @return {String}                  Retake label.
-     */
-    self.getRetakeLabel = function(retake, includeDuration) {
-        var data = {
-                retake: retake.try + 1,
-                grade: '',
-                timestart: '',
-                duration: ''
-            },
-            hasGrade = retake.grade != null;
-
-        if (hasGrade || retake.end) {
-            // Retake finished with or without grade (if the lesson only has content pages, it has no grade).
-            if (hasGrade) {
-                data.grade = $translate.instant('mm.core.percentagenumber', {$a: retake.grade});
-            }
-            data.timestart = moment(retake.timestart * 1000).format('LLL');
-            if (includeDuration) {
-                data.duration = $mmUtil.formatTimeInstant(retake.timeend - retake.timestart);
-            }
-        } else {
-            // The user has not completed the retake.
-            data.grade = $translate.instant('mma.mod_lesson.notcompleted');
-            if (retake.timestart) {
-                data.timestart = moment(retake.timestart * 1000).format('LLL');
-            }
-        }
-
-        return $translate.instant('mma.mod_lesson.retakelabel' + (includeDuration ? 'full' : 'short'), data);
-    };
-
     /**
      * Given the HTML of an answer from a content page, extract the data to render the answer.
      *
@@ -423,6 +384,45 @@ angular.module('mm.addons.mod_lesson')
         return question;
     };
 
+    /**
+     * Get a label to identify a retake (lesson attempt).
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getRetakeLabel
+     * @param  {Object} retake           Retake.
+     * @param  {Boolean} includeDuration Whether to include the duration of the retake.
+     * @return {String}                  Retake label.
+     */
+    self.getRetakeLabel = function(retake, includeDuration) {
+        var data = {
+                retake: retake.try + 1,
+                grade: '',
+                timestart: '',
+                duration: ''
+            },
+            hasGrade = retake.grade != null;
+
+        if (hasGrade || retake.end) {
+            // Retake finished with or without grade (if the lesson only has content pages, it has no grade).
+            if (hasGrade) {
+                data.grade = $translate.instant('mm.core.percentagenumber', {$a: retake.grade});
+            }
+            data.timestart = moment(retake.timestart * 1000).format('LLL');
+            if (includeDuration) {
+                data.duration = $mmUtil.formatTimeInstant(retake.timeend - retake.timestart);
+            }
+        } else {
+            // The user has not completed the retake.
+            data.grade = $translate.instant('mma.mod_lesson.notcompleted');
+            if (retake.timestart) {
+                data.timestart = moment(retake.timestart * 1000).format('LLL');
+            }
+        }
+
+        return $translate.instant('mma.mod_lesson.retakelabel' + (includeDuration ? 'full' : 'short'), data);
+    };
+
     /**
      * Prepare the question model to be sent to server.
      *
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 992411b73c1..29e784c81da 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -1079,65 +1079,6 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
-    /**
-     * Get cache key for get retakes overview WS calls.
-     *
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} groupId  Group ID.
-     * @return {String}          Cache key.
-     */
-    function getRetakesOverviewCacheKey(lessonId, groupId) {
-        return getRetakesOverviewCommonCacheKey(lessonId) + ':' + groupId;
-    }
-
-    /**
-     * Get common cache key for get retakes overview WS calls.
-     *
-     * @param  {Number} lessonId Lesson ID.
-     * @return {String}          Cache key.
-     */
-    function getRetakesOverviewCommonCacheKey(lessonId) {
-        return 'mmaModLesson:retakesOverview:' + lessonId;
-    }
-
-    /**
-     * Get the overview of retakes in a lesson (named "attempts overview" in Moodle).
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLesson#getRetakesOverview
-     * @param  {Number} lessonId       Lesson ID.
-     * @param  {Number} [groupId]      The group to get. If not defined, all participants.
-     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
-     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {String} [siteId]       Site ID. If not defined, current site.
-     * @return {Promise}               Promise resolved with the retakes overview.
-     */
-    self.getRetakesOverview = function(lessonId, groupId, forceCache, ignoreCache, siteId) {
-        groupId = groupId || 0;
-
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            var params = {
-                    lessonid: lessonId,
-                    groupid: groupId
-                },
-                preSets = {
-                    cacheKey: getRetakesOverviewCacheKey(lessonId, groupId)
-                };
-
-            if (forceCache) {
-                preSets.omitExpires = true;
-            } else if (ignoreCache) {
-                preSets.getFromCache = 0;
-                preSets.emergencyCache = 0;
-            }
-
-            return site.read('mod_lesson_get_attempts_overview', params, preSets).then(function(response) {
-                return response.data;
-            });
-        });
-    };
-
     /**
      * Get content pages viewed in online and offline.
      *
@@ -2022,6 +1963,65 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Get cache key for get retakes overview WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} groupId  Group ID.
+     * @return {String}          Cache key.
+     */
+    function getRetakesOverviewCacheKey(lessonId, groupId) {
+        return getRetakesOverviewCommonCacheKey(lessonId) + ':' + groupId;
+    }
+
+    /**
+     * Get common cache key for get retakes overview WS calls.
+     *
+     * @param  {Number} lessonId Lesson ID.
+     * @return {String}          Cache key.
+     */
+    function getRetakesOverviewCommonCacheKey(lessonId) {
+        return 'mmaModLesson:retakesOverview:' + lessonId;
+    }
+
+    /**
+     * Get the overview of retakes in a lesson (named "attempts overview" in Moodle).
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#getRetakesOverview
+     * @param  {Number} lessonId       Lesson ID.
+     * @param  {Number} [groupId]      The group to get. If not defined, all participants.
+     * @param  {Boolean} [forceCache]  True if it should return cached data. Has priority over ignoreCache.
+     * @param  {Boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String} [siteId]       Site ID. If not defined, current site.
+     * @return {Promise}               Promise resolved with the retakes overview.
+     */
+    self.getRetakesOverview = function(lessonId, groupId, forceCache, ignoreCache, siteId) {
+        groupId = groupId || 0;
+
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    lessonid: lessonId,
+                    groupid: groupId
+                },
+                preSets = {
+                    cacheKey: getRetakesOverviewCacheKey(lessonId, groupId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_lesson_get_attempts_overview', params, preSets).then(function(response) {
+                return response.data;
+            });
+        });
+    };
+
     /**
      * Finds all pages that appear to be a subtype of the provided pageid until
      * an end point specified within "ends" is encountered or no more pages exist.
@@ -2257,39 +2257,6 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
-    /**
-     * Invalidates retakes overview for all groups in a lesson.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLesson#invalidateRetakesOverview
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved when the data is invalidated.
-     */
-    self.invalidateRetakesOverview = function(lessonId, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKeyStartingWith(getRetakesOverviewCommonCacheKey(lessonId));
-        });
-    };
-
-    /**
-     * Invalidates retakes overview for a certain group in a lesson.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLesson#invalidateRetakesOverviewForGroup
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} groupId  Group ID.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved when the data is invalidated.
-     */
-    self.invalidateRetakesOverviewForGroup = function(lessonId, groupId, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKey(getRetakesOverviewCacheKey(lessonId, groupId));
-        });
-    };
-
     /**
      * Invalidates content pages viewed for all retakes.
      *
@@ -2455,6 +2422,39 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Invalidates retakes overview for all groups in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateRetakesOverview
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateRetakesOverview = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getRetakesOverviewCommonCacheKey(lessonId));
+        });
+    };
+
+    /**
+     * Invalidates retakes overview for a certain group in a lesson.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLesson#invalidateRetakesOverviewForGroup
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} groupId  Group ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved when the data is invalidated.
+     */
+    self.invalidateRetakesOverviewForGroup = function(lessonId, groupId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getRetakesOverviewCacheKey(lessonId, groupId));
+        });
+    };
+
     /**
      * Invalidates timers for all users in a lesson.
      *
diff --git a/www/addons/mod/lesson/services/lesson_offline.js b/www/addons/mod/lesson/services/lesson_offline.js
index 2f07226a1aa..88fa5e1189c 100644
--- a/www/addons/mod/lesson/services/lesson_offline.js
+++ b/www/addons/mod/lesson/services/lesson_offline.js
@@ -209,25 +209,6 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
-    /**
-     * Get all the offline retakes in a certain site.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLessonOffline#getAllRetakes
-     * @param {String} [siteId] Site ID. If not set, use current site.
-     * @return {Promise}        Promise resolved when the offline retakes are retrieved.
-     */
-    self.getAllRetakes = function(siteId) {
-        return $mmSitesManager.getSiteDb(siteId).then(function(db) {
-            if (!db) {
-                return $q.reject();
-            }
-
-            return db.getAll(mmaModLessonRetakesStore);
-        });
-    };
-
     /**
      * Get all the lessons that have offline data in a certain site.
      *
@@ -265,100 +246,23 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Retrieve a retake from site DB.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLessonOffline#getRetake
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the retake.
-     */
-    self.getRetake = function(lessonId, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().get(mmaModLessonRetakesStore, lessonId);
-        });
-    };
-
-    /**
-     * Retrieve all offline attempts for a retake.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLessonOffline#getRetakeAttempts
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} retake   Retake number.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the retake attempts.
-     */
-    self.getRetakeAttempts = function(lessonId, retake, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetake', [lessonId, retake]);
-        });
-    };
-
-    /**
-     * Retrieve offline attempts for a retake and page.
-     *
-     * @module mm.addons.mod_lesson
-     * @ngdoc method
-     * @name $mmaModLessonOffline#getRetakeAttemptsForPage
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} retake   Lesson retake number.
-     * @param  {Number} pageId   Page ID.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the retake attempts.
-     */
-    self.getRetakeAttemptsForPage = function(lessonId, retake, pageId, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetakeAndPage', [lessonId, retake, pageId]);
-        });
-    };
-
-    /**
-     * Retrieve offline attempts for certain pages for a retake.
+     * Get all the offline retakes in a certain site.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#getRetakeAttemptsForType
-     * @param  {Number} lessonId Lesson ID.
-     * @param  {Number} retake   Retake number.
-     * @param  {Number} type     Type of the pages to get: mmaModLessonTypeQuestion or mmaModLessonTypeStructure.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with the retake attempts.
-     */
-    self.getRetakeAttemptsForType = function(lessonId, retake, type, siteId) {
-        return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetakeAndType', [lessonId, retake, type]);
-        });
-    };
-    /**
-     * Get stored retake. If not found or doesn't match the retake number, return a new one.
-     *
-     * @param  {Number} lessonId  Lesson ID.
-     * @param  {Number} courseId  Course ID the lesson belongs to.
-     * @param  {Number} retake    Retake number.
-     * @param  {String} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise}          Promise resolved with the retake.
+     * @name $mmaModLessonOffline#getAllRetakes
+     * @param {String} [siteId] Site ID. If not set, use current site.
+     * @return {Promise}        Promise resolved when the offline retakes are retrieved.
      */
-    function getRetakeWithFallback(lessonId, courseId, retake, siteId) {
-        // Get current stored retake.
-        return self.getRetake(lessonId, siteId).then(function(retakeData) {
-            if (retakeData.retake != retake) {
-                // The stored retake doesn't match the retake number, create a new one.
+    self.getAllRetakes = function(siteId) {
+        return $mmSitesManager.getSiteDb(siteId).then(function(db) {
+            if (!db) {
                 return $q.reject();
             }
-            return retakeData;
-        }).catch(function() {
-            // No retake, create a new one.
-            return {
-                lessonid: lessonId,
-                retake: retake,
-                courseid: courseId,
-                finished: false
-            };
+
+            return db.getAll(mmaModLessonRetakesStore);
         });
-    }
+    };
 
     /**
      * Retrieve the last offline attempt stored in a retake.
@@ -441,26 +345,101 @@ angular.module('mm.addons.mod_lesson')
     };
 
     /**
-     * Check if there are offline attempts for a retake.
+     * Retrieve a retake from site DB.
      *
      * @module mm.addons.mod_lesson
      * @ngdoc method
-     * @name $mmaModLessonOffline#hasRetakeAttempts
+     * @name $mmaModLessonOffline#getRetake
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the retake.
+     */
+    self.getRetake = function(lessonId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmaModLessonRetakesStore, lessonId);
+        });
+    };
+
+    /**
+     * Retrieve all offline attempts for a retake.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getRetakeAttempts
      * @param  {Number} lessonId Lesson ID.
      * @param  {Number} retake   Retake number.
      * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}         Promise resolved with a boolean.
+     * @return {Promise}         Promise resolved with the retake attempts.
      */
-    self.hasRetakeAttempts = function(lessonId, retake, siteId) {
+    self.getRetakeAttempts = function(lessonId, retake, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetake', [lessonId, retake]);
-        }).then(function(list) {
-            return !!list.length;
-        }).catch(function() {
-            return false;
         });
     };
 
+    /**
+     * Retrieve offline attempts for a retake and page.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getRetakeAttemptsForPage
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} retake   Lesson retake number.
+     * @param  {Number} pageId   Page ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the retake attempts.
+     */
+    self.getRetakeAttemptsForPage = function(lessonId, retake, pageId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetakeAndPage', [lessonId, retake, pageId]);
+        });
+    };
+
+    /**
+     * Retrieve offline attempts for certain pages for a retake.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#getRetakeAttemptsForType
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} retake   Retake number.
+     * @param  {Number} type     Type of the pages to get: mmaModLessonTypeQuestion or mmaModLessonTypeStructure.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with the retake attempts.
+     */
+    self.getRetakeAttemptsForType = function(lessonId, retake, type, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetakeAndType', [lessonId, retake, type]);
+        });
+    };
+    /**
+     * Get stored retake. If not found or doesn't match the retake number, return a new one.
+     *
+     * @param  {Number} lessonId  Lesson ID.
+     * @param  {Number} courseId  Course ID the lesson belongs to.
+     * @param  {Number} retake    Retake number.
+     * @param  {String} [siteId]  Site ID. If not defined, current site.
+     * @return {Promise}          Promise resolved with the retake.
+     */
+    function getRetakeWithFallback(lessonId, courseId, retake, siteId) {
+        // Get current stored retake.
+        return self.getRetake(lessonId, siteId).then(function(retakeData) {
+            if (retakeData.retake != retake) {
+                // The stored retake doesn't match the retake number, create a new one.
+                return $q.reject();
+            }
+            return retakeData;
+        }).catch(function() {
+            // No retake, create a new one.
+            return {
+                lessonid: lessonId,
+                retake: retake,
+                courseid: courseId,
+                finished: false
+            };
+        });
+    }
+
     /**
      * Check if there is a finished retake for a certain lesson.
      *
@@ -510,6 +489,27 @@ angular.module('mm.addons.mod_lesson')
         });
     };
 
+    /**
+     * Check if there are offline attempts for a retake.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonOffline#hasRetakeAttempts
+     * @param  {Number} lessonId Lesson ID.
+     * @param  {Number} retake   Retake number.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with a boolean.
+     */
+    self.hasRetakeAttempts = function(lessonId, retake, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModLessonPageAttemptsStore, 'lessonAndRetake', [lessonId, retake]);
+        }).then(function(list) {
+            return !!list.length;
+        }).catch(function() {
+            return false;
+        });
+    };
+
     /**
      * Process a lesson page, saving its data.
      *

From 84112a2cb752e659b0915502d106d25ddaf0633e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 May 2017 15:13:39 +0200
Subject: [PATCH 159/218] MOBILE-1789 loading: Remove margin top from
 mm-loading

---
 www/core/scss/styles.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 5550300d4ae..a0f7eb8af96 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -457,7 +457,7 @@ button.item.item-button-right {
 .mm-loading-container {
   width: 100%;
   text-align: center;
-  margin-top: 10px;
+  padding-top: 10px;
   clear: both;
 }
 
@@ -472,6 +472,7 @@ button.item.item-button-right {
   height: 100%;
   display: table;
   z-index: -1;
+  padding-top: 0px;
 
   .mm-loading-spinner {
     display: table-cell;

From 43b7e1ed883bb5538472f8c42116785f430efb03 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 17 May 2017 15:23:28 +0200
Subject: [PATCH 160/218] MOBILE-1789 notifications: Fix console error caused
 by padding

---
 www/addons/notifications/templates/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/notifications/templates/list.html b/www/addons/notifications/templates/list.html
index fb79317440e..99979999c24 100644
--- a/www/addons/notifications/templates/list.html
+++ b/www/addons/notifications/templates/list.html
@@ -1,5 +1,5 @@
 <ion-view view-title="{{ 'mma.notifications.notifications' | translate }}">
-    <ion-content padding="{{notifications.length > 0}}" mm-state-class>
+    <ion-content padding="notifications.length > 0" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="notificationsLoaded" on-refresh="refreshNotifications()">
         </ion-refresher>
         <mm-loading hide-until="notificationsLoaded">

From 7bb68c47373de602dad9840cfe4f17a7850c118b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 May 2017 13:33:59 +0200
Subject: [PATCH 161/218] MOBILE-2105 course: Reduce padding on section badges

---
 www/core/components/course/templates/sections.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/core/components/course/templates/sections.html b/www/core/components/course/templates/sections.html
index 82eaddf9fdc..abb0829c921 100644
--- a/www/core/components/course/templates/sections.html
+++ b/www/core/components/course/templates/sections.html
@@ -12,7 +12,7 @@
             <mm-loading hide-until="sectionsLoaded">
                 <ul class="list">
                     <li ng-repeat="section in sections" ng-if="sectionHasContent(section)" ng-class="{'item-dimmed': section.visible === 0 || section.uservisible === false}">
-                        <a class="item item-text-wrap item-button-right" mm-split-view-link="site.mm_course-section({cid: courseId, sectionid: section.id, mid: moduleId})" title="{{section.name}}">
+                        <a class="item item-text-wrap" mm-split-view-link="site.mm_course-section({cid: courseId, sectionid: section.id, mid: moduleId})" title="{{section.name}}" ng-class="{'item-button-right': downloadSectionsEnabled}">
                             <mm-format-text watch="true">{{section.name}}</mm-format-text>
 
                             <button ng-if="downloadSectionsEnabled && section.showDownload && !section.isDownloading && !section.isCalculating" ng-click="prefetch($event, section)" class="button button-icon" aria-label="{{ 'mm.core.download' | translate }}">
@@ -24,10 +24,8 @@
 
                             <ion-spinner ng-if="downloadSectionsEnabled && ((section.isDownloading && section.total > 0) || section.isCalculating)"></ion-spinner>
                             <span class="badge mm-course-download" ng-if="downloadSectionsEnabled && section.isDownloading && section.total > 0 && section.count < section.total">{{section.count}} / {{section.total}}</span>
-                            <div class="padding-vertical" ng-if="section.visible === 0 || section.availabilityinfo">
-                                <p class="badge badge-calm badge-inline" ng-if="section.visible === 0">{{ 'mm.course.nocontentavailable' | translate }}</p>
-                                <p class="badge badge-calm badge-inline" ng-if="section.availabilityinfo"><mm-format-text watch="true">{{ section.availabilityinfo }}</mm-format-text></p>
-                            </div>
+                            <p class="badge badge-calm badge-inline" ng-if="section.visible === 0">{{ 'mm.course.nocontentavailable' | translate }}</p>
+                            <p class="badge badge-calm badge-inline" ng-if="section.availabilityinfo"><mm-format-text watch="true">{{ section.availabilityinfo }}</mm-format-text></p>
                         </a>
                     </li>
                 </ul>

From d961587050d8d5f4865da6092225694ba474a1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 May 2017 15:30:07 +0200
Subject: [PATCH 162/218] MOBILE-2105 core: Style progress bars

---
 .../templates/coursecompetencies.html         |  2 +-
 www/addons/competency/templates/plan.html     |  7 +--
 www/addons/mod/lesson/templates/player.html   |  4 +-
 www/addons/mod/lesson/templates/reports.html  |  5 +-
 .../mod/lesson/templates/userretake.html      |  5 +-
 .../courses/templates/courselistprogress.html |  5 +-
 www/core/directives/progressbar.js            | 50 +++++++++++++++++++
 www/core/scss/styles.scss                     | 18 ++++++-
 www/core/templates/progressbar.html           |  4 ++
 9 files changed, 78 insertions(+), 22 deletions(-)
 create mode 100644 www/core/directives/progressbar.js
 create mode 100644 www/core/templates/progressbar.html

diff --git a/www/addons/competency/templates/coursecompetencies.html b/www/addons/competency/templates/coursecompetencies.html
index 2d296c6ca94..81922363afc 100644
--- a/www/addons/competency/templates/coursecompetencies.html
+++ b/www/addons/competency/templates/coursecompetencies.html
@@ -17,7 +17,7 @@
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.progress' | translate }}</strong>:
                         {{ 'mma.competency.xcompetenciesproficientoutofyincourse' | translate:{$a: {x: competencies.statistics.proficientcompetencycount, y: competencies.statistics.competencycount} } }} ({{ competencies.statistics.proficientcompetencypercentageformatted }}%)
-                        <progress max="100" value="{{ competencies.statistics.proficientcompetencypercentage }}"></progress>
+                        <mm-progress-bar progress="competencies.statistics.proficientcompetencypercentage"></mm-progress-bar>
                     </li>
                     <li class="item item-text-wrap" ng-if="competencies.statistics.leastproficientcount > 0">
                         <strong>{{ 'mma.competency.competenciesmostoftennotproficientincourse' | translate }}</strong>:
diff --git a/www/addons/competency/templates/plan.html b/www/addons/competency/templates/plan.html
index 28260facc65..bed111e0d37 100644
--- a/www/addons/competency/templates/plan.html
+++ b/www/addons/competency/templates/plan.html
@@ -31,10 +31,7 @@
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.progress' | translate }}</strong>:
                         {{ 'mma.competency.xcompetenciesproficientoutofy' | translate: {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }}
-                        <div class="row row-no-padding">
-                            <progress class="col-80" max="100" value="{{ plan.proficientcompetencypercentage }}"></progress>
-                            <div class="col col-center text-right mm-progress-text">{{plan.proficientcompetencypercentageformatted}}&#37;</div>
-                        </div>
+                        <mm-progress-bar progress="plan.proficientcompetencypercentage" text="plan.proficientcompetencypercentageformatted"></mm-progress-bar>
                     </li>
                 </ul>
             </article>
@@ -49,7 +46,7 @@ <h2>{{ 'mma.competency.learningplancompetencies' | translate }}</h2>
                     </li>
                     <a ng-repeat="competency in plan.competencies" class="item item-text-wrap clearfix" ng-click="gotoCompetency(competency.competency.id)" title="{{competency.competency.shortname}}">
                         {{competency.competency.shortname}} <small>{{competency.competency.idnumber}}</small>
-                        <span ng-class="{'badge-balanced': competency.usercompetency.proficiency, 'badge-assertive': !competency.usercompetency.proficiency}" class="badge badge-inline item-note">{{ competency.usercompetency.gradename }}</span><br>
+                        <span ng-class="{'badge-balanced': competency.usercompetency.proficiency, 'badge-assertive': !competency.usercompetency.proficiency}" class="badge badge-inline item-note text-center">{{ competency.usercompetency.gradename }}</span><br>
 
                     </a>
                 </ul>
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index ff78ef22fdc..5d1a979800d 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -31,7 +31,7 @@
                     </div>
                     <div ng-if="lesson.progressbar && !canManage" class="item">
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: pageData.progress} }}</p>
-                        <progress max="100" value="{{pageData.progress}}"></progress>
+                        <mm-progress-bar progress="pageData.progress"></mm-progress-bar>
                     </div>
                     <div ng-if="lesson.progressbar && canManage" class="mm-info-card">
                         <i class="icon ion-information-circled padding"></i>{{ 'mma.mod_lesson.progressbarteacherwarning2' | translate }}
@@ -55,7 +55,7 @@ <h3 class="padding" ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulatio
                     <p class="item item-text-wrap" ng-if="eolData.welldone"><mm-format-text>{{ eolData.welldone.message }}</mm-format-text></p>
                     <div class="item item-text-wrap" ng-if="lesson.progressbar && eolData.progresscompleted">
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: eolData.progresscompleted.value} }}</p>
-                        <progress max="100" value="{{eolData.progresscompleted.value}}"></progress>
+                        <mm-progress-bar progress="eolData.progresscompleted.value"></mm-progress-bar>
                     </div>
                     <p class="item item-text-wrap" ng-if="eolData.displayofgrade"><mm-format-text>{{ eolData.displayofgrade.message }}</mm-format-text></p>
                     <div class="item item-text-wrap" ng-if="eolData.reviewlesson"><button class="button button-block" ng-click="reviewLesson(eolData.reviewlesson.pageid)"><mm-format-text>{{ 'mma.mod_lesson.reviewlesson' | translate }}</mm-format-text></button></div>
diff --git a/www/addons/mod/lesson/templates/reports.html b/www/addons/mod/lesson/templates/reports.html
index 36290c177e2..eece5131c11 100644
--- a/www/addons/mod/lesson/templates/reports.html
+++ b/www/addons/mod/lesson/templates/reports.html
@@ -117,10 +117,7 @@ <h2>{{ 'mma.mod_lesson.overview' | translate }}</h2>
         <a ng-repeat="student in overview.students" class="item item-text-wrap item-icon-right" ng-class="{'item-avatar': student.profileimageurl}" ui-sref="site.mod_lesson-userretake({courseid: courseId, lessonid: lesson.id, userid: student.id})">
             <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" mm-user-link userid="{{student.id}}" courseid="{{courseId}}">
             <h2>{{student.fullname}}</h2>
-            <div class="row row-no-padding">
-                <progress class="col-80" max="100" value="{{ student.bestgrade }}"></progress>
-                <div class="col col-center mm-progress-text">{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</div>
-            </div>
+            <mm-progress-bar progress="student.bestgrade"></mm-progress-bar>
             <i class="icon icon-accessory ion-chevron-right"></i>
         </a>
     </div>
diff --git a/www/addons/mod/lesson/templates/userretake.html b/www/addons/mod/lesson/templates/userretake.html
index a9f7f22ab93..25a46fd05e2 100644
--- a/www/addons/mod/lesson/templates/userretake.html
+++ b/www/addons/mod/lesson/templates/userretake.html
@@ -6,10 +6,7 @@
                 <a class="item item-text-wrap" ng-class="{'item-avatar': student.profileimageurl}" mm-user-link userid="{{student.id}}" courseid="{{courseId}}" title="{{student.fullname}}">
                     <img ng-if="student.profileimageurl" ng-src="{{student.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: student.fullname} }}" role="presentation" >
                     <h2>{{student.fullname}}</h2>
-                    <div class="row row-no-padding">
-                        <progress class="col-80" max="100" value="{{ student.bestgrade }}"></progress>
-                        <div class="col col-center mm-progress-text">{{ 'mm.core.percentagenumber' | translate:{$a: student.bestgrade} }}</div>
-                    </div>
+                    <mm-progress-bar progress="student.bestgrade"></mm-progress-bar>
                 </a>
 
                 <!-- Retake selector if there is more than one retake. -->
diff --git a/www/core/components/courses/templates/courselistprogress.html b/www/core/components/courses/templates/courselistprogress.html
index 6818a2573d1..d24594c6712 100644
--- a/www/core/components/courses/templates/courselistprogress.html
+++ b/www/core/components/courses/templates/courselistprogress.html
@@ -17,10 +17,7 @@
             </div>
         </div>
         <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
-        <div ng-if="!roundProgress && course.progress !== false" class="row row-no-padding">
-            <progress class="col-90" max="100" value="{{ course.progress }}"></progress>
-            <div class="col col-center text-right mm-progress-text">{{course.progress}}&#37;</div>
-        </div>
+        <mm-progress-bar ng-if="!roundProgress && course.progress !== false" progress="course.progress"></mm-progress-bar>
         <i ng-if="showActions && loaded" class="icon ion-android-more-vertical" ng-click="showCourseActions($event)"></i>
         <ion-spinner ng-if="!loaded"></ion-spinner>
     </a>
diff --git a/www/core/directives/progressbar.js b/www/core/directives/progressbar.js
new file mode 100644
index 00000000000..5c3c3654fd9
--- /dev/null
+++ b/www/core/directives/progressbar.js
@@ -0,0 +1,50 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+angular.module('mm.core')
+
+/**
+ * This directive shows a progress bar and its value.
+ *
+ * @module mm.core
+ * @ngdoc directive
+ * @name mmProgressBar
+ * @description
+ * Given a percentage, this directive will show progress bar and its value.
+ *
+ * @param {Number} progress        Percentage from 0 to 100.
+ * @param {String} text            Percentage in text form to be shown at the right. If not defined progress will be used.
+ *
+ * Example usage:
+ * <mm-progress-bar progress="percentage" text=""></mm-progress-bar>
+ */
+.directive('mmProgressBar', function() {
+    return {
+        restrict: 'E',
+        scope: {
+            progress: '=',
+            text: '=?'
+        },
+        templateUrl: 'core/templates/progressbar.html',
+        link: function(scope) {
+
+            scope.progress = parseInt(scope.progress, 10);
+            if (scope.progress < 0 || isNaN(scope.progress)) {
+                scope.progress = false;
+            } else if (!scope.text) {
+                scope.text = scope.progress;
+            }
+        }
+    };
+});
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index a0f7eb8af96..fe668aa5ac2 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1516,8 +1516,22 @@ progress {
   }
 }
 
-.mm-progress-text {
-  margin-left: 10px;
+
+mm-progress-bar {
+  padding-right: 55px;
+  position: relative;
+  display: block;
+  @extend .clearfix;
+
+  .mm-progress-text {
+    margin-left: 10px;
+    line-height: 35px;
+    color: $gray-darker;
+    right: 0;
+    top: 0;
+    color: #626262;
+    position: absolute;
+  }
 }
 
 .padding > .button.button-block:only-child {
diff --git a/www/core/templates/progressbar.html b/www/core/templates/progressbar.html
new file mode 100644
index 00000000000..352af91cf53
--- /dev/null
+++ b/www/core/templates/progressbar.html
@@ -0,0 +1,4 @@
+<div ng-if="progress !== false && progress >= 0">
+    <progress max="100" value="{{ progress }}"></progress>
+    <span class="mm-progress-text">{{ 'mm.core.percentagenumber' | translate: {$a: text} }}</span>
+</div>

From 8ba5ae14293f6cd8dab3195acdeecf96e7c1c23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 May 2017 15:57:51 +0200
Subject: [PATCH 163/218] MOBILE-2105 core: Center short inline badges

---
 www/addons/competency/templates/competencies.html    |  4 ++--
 www/addons/competency/templates/competency.html      |  8 ++++----
 .../competency/templates/coursecompetencies.html     |  2 +-
 www/addons/mod/assign/templates/submission.html      | 12 ++++++------
 www/addons/mod/assign/templates/submissionlist.html  |  4 ++--
 .../mod/feedback/templates/nonrespondents.html       |  4 ++--
 www/addons/myoverview/templates/eventlist.html       |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/www/addons/competency/templates/competencies.html b/www/addons/competency/templates/competencies.html
index 4e5b7accc3a..1467799878c 100644
--- a/www/addons/competency/templates/competencies.html
+++ b/www/addons/competency/templates/competencies.html
@@ -9,8 +9,8 @@
                     <li ng-repeat="competency in competencies">
                         <a class="item item-text-wrap clearfix" mm-split-view-link="site.competency({ {{idname}}: id, competencyid: competency.competency.id, userid: userId})" title="{{competency.competency.shortname}}">
                             {{competency.competency.shortname}} <small>{{competency.competency.idnumber}}</small>
-                            <span ng-if="competency.usercompetency" ng-class="{'badge-balanced': competency.usercompetency.proficiency, 'badge-assertive': !competency.usercompetency.proficiency}" class="badge badge-inline item-note">{{ competency.usercompetency.gradename }}</span>
-                            <span ng-if="competency.usercompetencycourse" ng-class="{'badge-balanced': competency.usercompetencycourse.proficiency, 'badge-assertive': !competency.usercompetencycourse.proficiency}" class="badge badge-inline item-note">{{ competency.usercompetencycourse.gradename }}</span>
+                            <span ng-if="competency.usercompetency" ng-class="{'badge-balanced': competency.usercompetency.proficiency, 'badge-assertive': !competency.usercompetency.proficiency}" class="badge badge-inline text-center item-note">{{ competency.usercompetency.gradename }}</span>
+                            <span ng-if="competency.usercompetencycourse" ng-class="{'badge-balanced': competency.usercompetencycourse.proficiency, 'badge-assertive': !competency.usercompetencycourse.proficiency}" class="badge badge-inline text-center item-note">{{ competency.usercompetencycourse.gradename }}</span>
                         </a>
                     </li>
                 </ul>
diff --git a/www/addons/competency/templates/competency.html b/www/addons/competency/templates/competency.html
index 206c5a5cbf6..201e96b7d91 100644
--- a/www/addons/competency/templates/competency.html
+++ b/www/addons/competency/templates/competency.html
@@ -54,16 +54,16 @@
                     </li>
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.proficient' | translate }}</strong>:
-                        <span class="badge badge-inline badge-balanced" ng-if="competency.usercompetency.proficiency">
+                        <span class="badge badge-inline text-center badge-balanced" ng-if="competency.usercompetency.proficiency">
                             {{ 'mm.core.yes' | translate }}
                         </span>
-                        <span class="badge badge-inline badge-assertive" ng-if="!competency.usercompetency.proficiency">
+                        <span class="badge badge-inline text-center badge-assertive" ng-if="!competency.usercompetency.proficiency">
                             {{ 'mm.core.no' | translate }}
                         </span>
                     </li>
                     <li class="item item-text-wrap">
                         <strong>{{ 'mma.competency.rating' | translate }}</strong>:
-                        <span class="badge badge-inline badge-dark">{{ competency.usercompetency.gradename }}</span>
+                        <span class="badge badge-inline text-center badge-dark">{{ competency.usercompetency.gradename }}</span>
                     </li>
                 </ul>
             </article>
@@ -80,7 +80,7 @@ <h2>{{ evidence.actionuser.fullname }}</h2>
                         <p>{{ evidence.timemodified | mmToLocaleString }}</p>
                     </a>
                     <div class="item item-body">
-                        <div><span class="badge badge-inline badge-dark">{{ evidence.gradename }}</span></div>
+                        <div><span class="badge badge-inline text-center badge-dark">{{ evidence.gradename }}</span></div>
                         <p ng-if="evidence.description">{{ evidence.description }}</p>
                         <blockquote ng-if="evidence.note"><mm-format-text watch="true">{{ evidence.note }}</mm-format-text></blockquote>
                     </div>
diff --git a/www/addons/competency/templates/coursecompetencies.html b/www/addons/competency/templates/coursecompetencies.html
index 81922363afc..106bfc35edc 100644
--- a/www/addons/competency/templates/coursecompetencies.html
+++ b/www/addons/competency/templates/coursecompetencies.html
@@ -44,7 +44,7 @@ <h3 ng-if="competencies.statistics.competencycount > 0">{{ 'mma.competency.compe
                 <div class="list card" ng-repeat="competency in competencies.competencies">
                     <a ng-click="gotoCompetency(competency.competency.id)" title="{{competency.competency.shortname}}" class="item item-heading item-text-wrap clearfix">
                         {{competency.competency.shortname}} <small>{{competency.competency.idnumber}}</small>
-                        <span ng-if="competency.usercompetencycourse.gradename" ng-class="{'badge-balanced': competency.usercompetencycourse.proficiency, 'badge-assertive': !competency.usercompetencycourse.proficiency}" class="badge badge-inline item-note">{{ competency.usercompetencycourse.gradename }}</span><br>
+                        <span ng-if="competency.usercompetencycourse.gradename" ng-class="{'badge-balanced': competency.usercompetencycourse.proficiency, 'badge-assertive': !competency.usercompetencycourse.proficiency}" class="badge badge-inline text-center item-note">{{ competency.usercompetencycourse.gradename }}</span><br>
                     </a>
                     <div class="item item-body">
                         <div ng-if="competency.competency.description">
diff --git a/www/addons/mod/assign/templates/submission.html b/www/addons/mod/assign/templates/submission.html
index 24c1f9d3ea3..d1c85dc87e5 100644
--- a/www/addons/mod/assign/templates/submission.html
+++ b/www/addons/mod/assign/templates/submission.html
@@ -9,8 +9,8 @@ <h2>{{user.fullname}}</h2>
             <span ng-if="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups">{{ 'mma.mod_assign.multipleteams' | translate }}</span>
             <span ng-if="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">{{ 'mma.mod_assign.defaultteam' | translate }}</span>
         </p>
-        <p ng-if="statusTranslated" class="badge badge-inline {{statusClass}}">{{statusTranslated}}</p>
-        <p ng-if="gradingStatusTranslationId" class="badge badge-inline {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
+        <p ng-if="statusTranslated" class="badge badge-inline text-center {{statusClass}}">{{statusTranslated}}</p>
+        <p ng-if="gradingStatusTranslationId" class="badge badge-inline text-center {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
     </a>
     <div ng-if="blindMarking && !user" class="item item-text-wrap">
         <h2>{{ 'mma.mod_assign.hiddenuser' | translate }}{{blindId}}</h2>
@@ -20,8 +20,8 @@ <h2>{{ 'mma.mod_assign.hiddenuser' | translate }}{{blindId}}</h2>
             <span ng-if="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups">{{ 'mma.mod_assign.multipleteams' | translate }}</span>
             <span ng-if="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">{{ 'mma.mod_assign.defaultteam' | translate }}</span>
         </p>
-        <p ng-if="statusTranslated" class="badge badge-inline {{statusClass}}">{{statusTranslated}}</p>
-        <p ng-if="gradingStatusTranslationId" class="badge badge-inline {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
+        <p ng-if="statusTranslated" class="badge badge-inline text-center {{statusClass}}">{{statusTranslated}}</p>
+        <p ng-if="gradingStatusTranslationId" class="badge badge-inline text-center {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
     </div>
     <div ng-if="(blindMarking && user) || (!blindMarking && !user)" class="item item-text-wrap">
         <h2>{{ 'mma.mod_assign.submissionstatus' | translate }}</h2>
@@ -31,8 +31,8 @@ <h2>{{ 'mma.mod_assign.submissionstatus' | translate }}</h2>
             <span ng-if="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups">{{ 'mma.mod_assign.multipleteams' | translate }}</span>
             <span ng-if="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">{{ 'mma.mod_assign.defaultteam' | translate }}</span>
         </p>
-        <p ng-if="statusTranslated" class="badge badge-inline {{statusClass}}">{{statusTranslated}}</p>
-        <p ng-if="gradingStatusTranslationId" class="badge badge-inline {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
+        <p ng-if="statusTranslated" class="badge badge-inline text-center {{statusClass}}">{{statusTranslated}}</p>
+        <p ng-if="gradingStatusTranslationId" class="badge badge-inline text-center {{gradingClass}}">{{gradingStatusTranslationId |translate}}</p>
     </div>
 
     <div class="tabs tabs-striped tabs-free mm-tabs-color" ng-if="feedback || isGrading">
diff --git a/www/addons/mod/assign/templates/submissionlist.html b/www/addons/mod/assign/templates/submissionlist.html
index 9ed6fec1ab8..e720115e507 100644
--- a/www/addons/mod/assign/templates/submissionlist.html
+++ b/www/addons/mod/assign/templates/submissionlist.html
@@ -15,8 +15,8 @@ <h2 ng-if="!submission.userfullname">{{ 'mma.mod_assign.hiddenuser' | translate
                                 <span ng-if="assign.preventsubmissionnotingroup && !submission.groupname && submission.manyGroups && !submission.blindid">{{ 'mma.mod_assign.multipleteams' | translate }}</span>
                                 <span ng-if="!assign.preventsubmissionnotingroup && !submission.groupname">{{ 'mma.mod_assign.defaultteam' | translate }}</span>
                             </p>
-                            <p ng-if="submission.statusTranslated" class="badge badge-inline {{submission.statusClass}}">{{submission.statusTranslated}}</p>
-                            <p ng-if="submission.gradingStatusTranslationId" class="badge badge-inline {{submission.gradingClass}}">{{submission.gradingStatusTranslationId | translate}}</p>
+                            <p ng-if="submission.statusTranslated" class="badge badge-inline text-center {{submission.statusClass}}">{{submission.statusTranslated}}</p>
+                            <p ng-if="submission.gradingStatusTranslationId" class="badge badge-inline text-center {{submission.gradingClass}}">{{submission.gradingStatusTranslationId | translate}}</p>
                             <i class="icon icon-accessory ion-chevron-right"></i>
                         </a>
                     </li>
diff --git a/www/addons/mod/feedback/templates/nonrespondents.html b/www/addons/mod/feedback/templates/nonrespondents.html
index 4e874eb32af..aacf3997d19 100644
--- a/www/addons/mod/feedback/templates/nonrespondents.html
+++ b/www/addons/mod/feedback/templates/nonrespondents.html
@@ -23,8 +23,8 @@
                     <div ng-class="{'item-avatar': user.profileimageurl}" class="item item-text-wrap item-icon-right">
                         <img ng-if="user.profileimageurl" ng-src="{{user.profileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: user.fullname} }}" role="presentation">
                         <h2>{{user.fullname}}</h2>
-                        <p ng-if="user.started" class="badge badge-inline badge-balanced">{{ 'mma.mod_feedback.started' | translate}}</p>
-                        <p ng-if="!user.started" class="badge badge-inline badge-balanced">{{ 'mma.mod_feedback.not_started' | translate}}</p>
+                        <p ng-if="user.started" class="badge badge-inline text-center badge-balanced">{{ 'mma.mod_feedback.started' | translate}}</p>
+                        <p ng-if="!user.started" class="badge badge-inline text-center badge-balanced">{{ 'mma.mod_feedback.not_started' | translate}}</p>
                     </div>
                 </div>
                 <div class="item padding text-center" ng-if="canLoadMore">
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index a36c0f91970..705c63a36c1 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -3,7 +3,7 @@
         <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
         <button class="button button-clear item-note hidden-phone text-right" ng-click="action($event, event.action.url)" title="{{ event.action.name }}" ng-disabled="!event.action.actionable" ng-if="event.action">
             {{event.action.name}}
-            <span class="badge badge-inline badge-dark" ng-if="event.action.showitemcount">{{event.action.itemcount}}</span>
+            <span class="badge badge-inline badge-dark text-center" ng-if="event.action.showitemcount">{{event.action.itemcount}}</span>
         </button>
         <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
         <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>

From 81aeb037019afbdbe2c8e4376efa64dffd4fe778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 17 May 2017 10:03:41 +0200
Subject: [PATCH 164/218] MOBILE-2105 overview: Fix overview styles

---
 scss/app.scss                                 | 31 ++++++++++++++-
 www/addons/messages/scss/styles.scss          |  4 ++
 www/addons/myoverview/controllers/index.js    | 17 ++++-----
 www/addons/myoverview/scss/styles.scss        |  1 +
 .../myoverview/templates/eventlist.html       |  5 ++-
 www/addons/myoverview/templates/index.html    | 27 +++++++------
 www/core/components/courses/scss/styles.scss  |  3 +-
 .../components/courses/templates/list.html    |  4 +-
 www/core/lang/en.json                         |  1 +
 www/core/scss/styles.scss                     | 38 +++++++++++++++++--
 10 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 6b1309317c8..a0dfe126621 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -56,6 +56,9 @@ $mm-buttons-color: $positive;
 $base-color: $black !default;
 $base-background-color: $gray-light !default;
 
+$item-default-text: $black;
+$sheet-options-text-color: $positive;
+
 // Header.
 $bar-content-bg: $mm-color !default;
 $bar-content-border: transparent !default;
@@ -85,6 +88,32 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
 // Include all of Ionic.
 @import "www/lib/ionic/scss/ionic";
 
+.icon {
+  color: $gray-darker;
+
+  &.positive {
+    color: $positive;
+  }
+  &.assertive {
+    color: $assertive;
+  }
+  &.dark {
+    color: $dark;
+  }
+}
+
+.action-sheet .button .icon {
+  color: $sheet-options-text-color;
+}
+
+.platform-android .action-sheet .button .icon {
+  color: inherit;
+}
+
+.bar-content .icon , .bar-side-menu .icon{
+  color: $bar-content-text;
+}
+
 // Setting the default button to button-outline positive.
 .button {
   &.button-light,
@@ -117,7 +146,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
     @include button-outline($button-default-border);
 
     &.button-icon {
-      color: $dark;
+      color: $gray-darker;
     }
   }
 }
diff --git a/www/addons/messages/scss/styles.scss b/www/addons/messages/scss/styles.scss
index 31d00fd5f3d..76eeaf95080 100644
--- a/www/addons/messages/scss/styles.scss
+++ b/www/addons/messages/scss/styles.scss
@@ -91,6 +91,10 @@ $mma-messages-date-badge: "stable" !default;
   }
 }
 
+.tab-content .mm-site_messages-discussion {
+  background: $base-background-color;
+}
+
 .mma-messages-showprevious-spinner-container {
   width: 100%;
   text-align: center;
diff --git a/www/addons/myoverview/controllers/index.js b/www/addons/myoverview/controllers/index.js
index 44069166e6e..3e4e9bac05d 100644
--- a/www/addons/myoverview/controllers/index.js
+++ b/www/addons/myoverview/controllers/index.js
@@ -28,12 +28,12 @@ angular.module('mm.addons.myoverview')
         sort: 'sortbydates',
         events: [],
         loaded: false,
-        canLoadMore: false,
+        canLoadMore: false
     };
     $scope.timelineCourses = {
         courses: [],
         loaded: false,
-        canLoadMore: false,
+        canLoadMore: false
     };
     $scope.courses = {
         selected: 'inprogress',
@@ -45,8 +45,9 @@ angular.module('mm.addons.myoverview')
 
     $scope.searchEnabled = $mmCourses.isSearchCoursesAvailable() && !$mmCourses.isSearchCoursesDisabledInSite();
 
-    function fetchMyOverviewTimeline(afterEventId) {
+    function fetchMyOverviewTimeline(afterEventId, refresh) {
         return $mmaMyOverview.getActionEventsByTimesort(afterEventId).then(function(events) {
+            $scope.timeline.events = [];
             $scope.timeline.events = $scope.timeline.events.concat(events.events);
             $scope.timeline.canLoadMore = events.canLoadMore;
         }).catch(function(message) {
@@ -159,18 +160,16 @@ angular.module('mm.addons.myoverview')
         promises.push($mmCourses.invalidateUserCourses());
         promises.push($mmCoursesDelegate.clearAndInvalidateCoursesOptions());
 
-        $q.all(promises).finally(function() {
+        return $q.all(promises).finally(function() {
             var promise;
 
             switch ($scope.tabShown) {
                 case 'timeline':
                     switch ($scope.timeline.sort) {
                         case 'sortbydates':
-                            $scope.timeline.events = [];
-                            promise = fetchMyOverviewTimeline();
+                            promise = fetchMyOverviewTimeline(undefined, true);
                             break;
                         case 'sortbycourses':
-                            $scope.timeline.courses = [];
                             promise = fetchMyOverviewTimelineByCourses();
                             break;
                     }
@@ -180,9 +179,7 @@ angular.module('mm.addons.myoverview')
                     break;
             }
 
-            promise.finally(function() {
-                $scope.$broadcast('scroll.refreshComplete');
-            });
+            return promise;
         });
     };
 
diff --git a/www/addons/myoverview/scss/styles.scss b/www/addons/myoverview/scss/styles.scss
index 9acfc1afbdc..bfce878c7eb 100644
--- a/www/addons/myoverview/scss/styles.scss
+++ b/www/addons/myoverview/scss/styles.scss
@@ -32,6 +32,7 @@
 
 .mm-timelinetitle {
   float: left;
+  padding: 5px;
 }
 
 .mm-site_myoverview {
diff --git a/www/addons/myoverview/templates/eventlist.html b/www/addons/myoverview/templates/eventlist.html
index 705c63a36c1..41e28302461 100644
--- a/www/addons/myoverview/templates/eventlist.html
+++ b/www/addons/myoverview/templates/eventlist.html
@@ -1,10 +1,11 @@
 <script type="text/ng-template" id="event">
-    <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}">
+    <a mm-link capture-link="true" class="item mm-course-module-handler item-media" href="{{ event.url }}" title="{{ event.name }}" ng-class="{'item-badge-right-phone': event.action && event.action.showitemcount}">
         <img ng-src="{{ event.iconUrl }}" mm-external-content alt="" role="presentation" ng-if="event.iconUrl">
         <button class="button button-clear item-note hidden-phone text-right" ng-click="action($event, event.action.url)" title="{{ event.action.name }}" ng-disabled="!event.action.actionable" ng-if="event.action">
             {{event.action.name}}
             <span class="badge badge-inline badge-dark text-center" ng-if="event.action.showitemcount">{{event.action.itemcount}}</span>
         </button>
+        <span class="badge badge-dark hidden-tablet" ng-if="event.action && event.action.showitemcount">{{event.action.itemcount}}</span>
         <p class="item-heading"><mm-format-text watch="true">{{ event.name }}</mm-format-text></p>
         <p>{{event.timesort * 1000 | mmFormatDate:"dfmediumdate" }} <mm-format-text watch="true" ng-if="showCourse">{{ event.course.fullnamedisplay }}</mm-format-text></p>
     </a>
@@ -15,7 +16,7 @@ <h5 ng-if="recentlyOverdue.length > 0" class="assertive mm-timelinetitle">{{ 'mm
     <li ng-repeat="event in recentlyOverdue" ng-include="'event'"></li>
 </ul>
 
-<h5 ng-if="today.length > 0" class="mm-timelinetitle">{{ 'mma.myoverview.today' | translate }}</h5>
+<h5 ng-if="today.length > 0" class="mm-timelinetitle">{{ 'mm.core.today' | translate }}</h5>
 <ul class="list block" ng-if="today.length > 0">
     <li ng-repeat="event in today" ng-include="'event'"></li>
 </ul>
diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index 33e2883736a..526df68160f 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -3,7 +3,7 @@
         <a ui-sref="site.mm_searchcourses" ng-if="searchEnabled" class="button button-icon ion-ios-search-strong"></a>
     </ion-nav-buttons>
     <ion-content mm-state-class>
-        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="timeline.loaded" on-refresh="refreshMyOverview()">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="timeline.loaded || timelineCourses.loaded || courses.loaded" on-refresh="refreshMyOverview()">
         </ion-refresher>
         <div class="tabs tabs-striped tabs-free mm-tabs-color">
             <a class="tab-item" ng-class="{'active': tabShown == 'timeline'}" ng-click="switchTab('timeline')">{{ 'mma.myoverview.timeline' | translate }}</a>
@@ -28,11 +28,11 @@
                 <mm-empty-box ng-if="timelineCourses.courses.length == 0" image="addons/myoverview/img/courses.svg" message="{{ 'mma.myoverview.nocourses' | translate }}"></mm-empty-box>
             </mm-loading>
             <mm-loading hide-until="courses.loaded" ng-show="tabShown == 'courses'" class="mm-loading-center">
-                <div class="row row-no-padding">
+                <div class="row row-no-padding padding-bottom" ng-show="!showFilter">
                     <div class="col-10 text-left">
-                        <a ng-if="courses[courses.selected] && courses[courses.selected].length > 5" ng-class="{'ion-funnel': !showFilter, 'ion-close-round': showFilter}" class="button button-dark button-icon icon" ng-click="switchFilter()"></a>
+                        <a ng-if="courses[courses.selected] && courses[courses.selected].length > 5" class="button button-dark button-icon icon ion-funnel" ng-click="switchFilter()"></a>
                     </div>
-                    <div class="col text-center" ng-show="!showFilter">
+                    <div class="col text-center">
                         <div class="item-select mm-full-width-centered">
                             <select ng-model="courses.selected">
                                 <option value="inprogress">{{ 'mma.myoverview.inprogress' | translate }}</option>
@@ -41,16 +41,19 @@
                             </select>
                         </div>
                     </div>
-                    <div class="col-10 text-right" ng-show="!showFilter">
-                        <a ng-class="{'ion-grid': !showGrid, 'ion-navicon': showGrid}" class="button button-dark button-icon icon" ng-click="switchGrid()"></a>
-                    </div>
-                    <div class="col" ng-show="showFilter">
-                        <ion-input class="item item-input">
-                            <i class="icon ion-funnel placeholder-icon"></i>
-                            <input type="text" placeholder="{{ 'mm.courses.filtermycourses' | translate}}" ng-model="courses.filter">
-                        </ion-input>
+                    <div class="col-10 text-right">
+                        <a ng-class="{'ion-android-apps': !showGrid, 'ion-ios-list-outline': showGrid}" class="button button-dark button-icon icon" ></a>
                     </div>
                 </div>
+                <div ng-show="showFilter" class="item mm-filter-box item-input-inset">
+                    <button type="submit" class="button button-dark button-clear button-icon icon ion-close-circled" ng-click="switchFilter()"></button>
+                    <ion-input class="item-input-wrapper">
+                        <input type="text" placeholder="{{ 'mm.courses.filtermycourses' | translate}}" ng-model="courses.filter">
+                        <i class="icon ion-funnel placeholder-icon"></i>
+                    </ion-input>
+
+                </div>
+
                 <div ng-class="{'mm-course-grid': showGrid}">
                     <mm-course-list-progress ng-repeat="course in courses[courses.selected] | filter:{fullname: courses.filter}" course="course" round-progress="showGrid" show-summary="showGrid"></mm-course-list-progress>
                 </div>
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index 609f9c97dd8..30db6a89b18 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -29,7 +29,7 @@ $doughnut-text-colour: $gray-darker;
     left: $item-padding;
   }
   h2 {
-    font-size: 24px;
+    font-size: 21px;
   }
 }
 
@@ -52,6 +52,7 @@ $doughnut-text-colour: $gray-darker;
       text-align: center;
       vertical-align: middle;
       color: $doughnut-text-colour;
+      font-size: 95%;
     }
 
     .progress-indicator {
diff --git a/www/core/components/courses/templates/list.html b/www/core/components/courses/templates/list.html
index 79023787c65..b8e736c1828 100644
--- a/www/core/components/courses/templates/list.html
+++ b/www/core/components/courses/templates/list.html
@@ -7,8 +7,8 @@
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="coursesLoaded" on-refresh="refreshCourses()">
         </ion-refresher>
         <mm-loading hide-until="coursesLoaded">
-            <div class="list" ng-if="courses && courses.length > 5">
-                <ion-input class="item item-input">
+            <div ng-if="courses && courses.length > 5" class="item item-transparent item-input-inset">
+                <ion-input class="item-input-wrapper">
                     <i class="icon ion-funnel placeholder-icon"></i>
                     <input type="text" placeholder="{{ 'mm.courses.filtermycourses' | translate}}" ng-model="filter.filterText">
                 </ion-input>
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index a740742ef26..fb718c0def9 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -186,6 +186,7 @@
     "thereisdatatosync": "There are offline {{$a}} to be synchronized.",
     "time": "Time",
     "timesup": "Time is up!",
+    "today": "Today",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "tryagain": "Try again",
     "uhoh": "Uh oh!",
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index fe668aa5ac2..6ca8eb8da7f 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -934,11 +934,10 @@ mm-timer.mm-timer .item {
   select {
     max-width: 100%;
     background: transparent;
-    direction: ltr;
     text-indent: 0;
     margin: 0 auto;
-    padding: $item-input-padding ($item-input-padding*3) $item-input-padding $item-input-padding;
-    line-height: 14px;
+    padding: ($item-input-padding - 1) ($item-input-padding/2*5) ($item-input-padding - 1) $item-input-padding;
+    line-height: $font-size-base + 2;
     border: 0;
     position: relative;
   }
@@ -1084,6 +1083,17 @@ input[type="radio"].mm-radio {
   padding: 0;
 }
 
+.item-transparent {
+  border: 0;
+  padding: 0;
+  background-color: transparent;
+
+  &.item-input-inset .item-input-wrapper {
+    background: white;
+    height: 36px;
+  }
+}
+
 .padding mm-searchbox .item-input-inset {
   padding-top: 0;
   padding-left: 0;
@@ -1094,6 +1104,21 @@ mm-searchbox .item-input-inset .item-input-wrapper {
   background: white;
 }
 
+.mm-filter-box {
+  @extend .item-transparent;
+
+  padding-bottom: $item-padding - 4;
+  &.item-input-inset .item-input-wrapper {
+    height: 36px;
+  }
+}
+
+@media only screen and (min-width: 769px) {
+  .mm-filter-box {
+    padding-right: ($item-padding / 2);
+  }
+}
+
 .item.mm-not-clickable {
   cursor: default;
 
@@ -1168,6 +1193,9 @@ mm-searchbox .item-input-inset .item-input-wrapper {
   .hidden-phone {
     display: none !important;
   }
+  .item-badge-right-phone {
+    padding-right: $item-avatar-width + ($item-padding * 2);
+  }
 }
 
 @media only screen and (min-width: 769px) {
@@ -1430,6 +1458,10 @@ i, cite, em, var, address, dfn {
   }
 }
 
+.button.button-icon.icon.ion-funnel:before {
+  font-size: 26px;
+}
+
 // Position modals over action sheet. This means that modals will ALWAYS be over action sheet (in Ionic it's the opposite).
 .action-sheet-open .modal-backdrop.active {
   z-index: 20;

From 5b18a3604e5c49da2d91e7f5ea42a77afd2f9b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 18 May 2017 10:21:38 +0200
Subject: [PATCH 165/218] MOBILE-2105 profile: Hide empty box if page is not
 empty

---
 www/addons/competency/services/competency.js    | 15 +++++++++------
 www/core/components/user/controllers/about.js   |  2 +-
 www/core/components/user/templates/about.html   |  8 ++++----
 www/core/components/user/templates/profile.html |  8 ++------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/www/addons/competency/services/competency.js b/www/addons/competency/services/competency.js
index c0578976284..a7c68204b95 100644
--- a/www/addons/competency/services/competency.js
+++ b/www/addons/competency/services/competency.js
@@ -474,14 +474,17 @@ angular.module('mm.addons.competency')
                 userId = userId || site.getUserId();
 
                 var params = {
-                    planid: planId,
-                    competencyid: competencyId,
-                    userid: userId
-                };
+                        planid: planId,
+                        competencyid: competencyId,
+                        userid: userId
+                    },
+                    preSets = {
+                      typeExpected: 'boolean'
+                    };
                 if (planStatus == mmaCompetencyStatusComplete) {
-                    return site.write('core_competency_user_competency_plan_viewed', params);
+                    return site.write('core_competency_user_competency_plan_viewed', params, preSets);
                 } else {
-                    return site.write('core_competency_user_competency_viewed_in_plan', params);
+                    return site.write('core_competency_user_competency_viewed_in_plan', params, preSets);
                 }
             });
         }
diff --git a/www/core/components/user/controllers/about.js b/www/core/components/user/controllers/about.js
index c4a390a9186..43e5378401d 100644
--- a/www/core/components/user/controllers/about.js
+++ b/www/core/components/user/controllers/about.js
@@ -41,7 +41,7 @@ angular.module('mm.core.user')
             $scope.title = user.fullname;
             $scope.hasContact = user.email || user.phone1 || user.phone2 || user.city || user.country || user.address;
             $scope.hasDetails = user.url || user.interests || (user.customfields && user.customfields.length > 0);
-        }, function(message) {
+        }).catch(function(message) {
             if (message) {
                 $mmUtil.showErrorModal(message);
             }
diff --git a/www/core/components/user/templates/about.html b/www/core/components/user/templates/about.html
index 141cb2aa667..ee4f3579315 100644
--- a/www/core/components/user/templates/about.html
+++ b/www/core/components/user/templates/about.html
@@ -77,17 +77,17 @@ <h2>{{ 'mm.core.userdetails' | translate}}</h2>
                     </div>
                     <mm-user-profile-field ng-repeat="field in user.customfields" field="field"></mm-user-profile-field>
                 </div>
-                <div class="list">
-                    <div class="item item-divider" ng-if="user.description">
+                <div class="list" ng-if="user.description">
+                    <div class="item item-divider">
                         <h2>{{ 'mm.user.description' | translate}}</h2>
                     </div>
-                    <div class="item item-text-wrap" ng-if="user.description">
+                    <div class="item item-text-wrap">
                         <mm-format-text watch="true">{{user.description}}</mm-format-text>
                     </div>
                 </div>
             </div>
 
-            <mm-empty-box ng-if="!user || !hasContact || !hasDetails || !user.description" icon="ion-person" message="{{ 'mm.user.detailsnotavailable' | translate }}"></mm-empty-box>
+            <mm-empty-box ng-if="!user || (!hasContact && !hasDetails && !user.description)" icon="ion-person" message="{{ 'mm.user.detailsnotavailable' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/components/user/templates/profile.html b/www/core/components/user/templates/profile.html
index 8f08a06e570..d965d494769 100644
--- a/www/core/components/user/templates/profile.html
+++ b/www/core/components/user/templates/profile.html
@@ -48,13 +48,9 @@ <h2>{{ title | translate }}</h2>
                 </div>
             </div>
 
-            <div ng-if="!user && !isDeleted">
-                {{ 'mm.user.detailsnotavailable' | translate }}
-            </div>
+            <mm-empty-box ng-if="!user && !isDeleted" icon="ion-person" message="{{ 'mm.user.detailsnotavailable' | translate }}"></mm-empty-box>
 
-            <div ng-if="isDeleted">
-                {{ 'mm.core.userdeleted' | translate }}
-            </div>
+            <mm-empty-box ng-if="isDeleted" icon="ion-person" message="{{ 'mm.core.userdeleted' | translate }}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>

From 16426e8bf5893d136cc79e5f65b361727177099a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 18 May 2017 10:58:09 +0200
Subject: [PATCH 166/218] MOBILE-2105 login: Fix sign up and logo

---
 .../login/controllers/emailsignup.js          |   2 +-
 www/core/components/login/scss/styles.scss    |   5 +++++
 .../login/templates/credentials.html          |   2 +-
 .../login/templates/emailsignup.html          |  10 +++++++---
 www/core/components/login/templates/site.html |   2 +-
 www/core/scss/styles.scss                     |   4 ++++
 www/img/moodle.png                            | Bin 4224 -> 18363 bytes
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/www/core/components/login/controllers/emailsignup.js b/www/core/components/login/controllers/emailsignup.js
index e28619cd2f2..6821a34ca54 100644
--- a/www/core/components/login/controllers/emailsignup.js
+++ b/www/core/components/login/controllers/emailsignup.js
@@ -56,7 +56,7 @@ angular.module('mm.core.login')
     // Treat the site's config, setting scope variables.
     function treatSiteConfig(siteConfig) {
         if (siteConfig && siteConfig.registerauth == 'email' && !$mmLoginHelper.isEmailSignupDisabled(siteConfig)) {
-            $scope.logourl = siteConfig.logourl || siteConfig.compactlogourl;
+            $scope.sitename = siteConfig.sitename;
             $scope.authInstructions = siteConfig.authinstructions;
             initAuthInstructionsModal();
             return true;
diff --git a/www/core/components/login/scss/styles.scss b/www/core/components/login/scss/styles.scss
index 22346f91235..78aa66c1561 100644
--- a/www/core/components/login/scss/styles.scss
+++ b/www/core/components/login/scss/styles.scss
@@ -51,6 +51,11 @@
     max-width: 100%;
   }
 
+  img.moodle-logo {
+    width: 90%;
+    max-width: 300px;
+  }
+
   .box {
     padding: 16px;
     background: $white;
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 64229f2a7e0..053f7bb9865 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -5,7 +5,7 @@
                 <div class="item item-text-wrap text-center item-borderless">
                     <!-- Show site logo or a default image. -->
                     <img ng-if="logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
-                    <img ng-if="!logourl" ng-src="img/moodle.png" class="avatar-full" role="presentation">
+                    <img ng-if="!logourl" ng-src="img/moodle.png" class="avatar-full moodle-logo" role="presentation">
 
                     <!-- If no sitename show big siteurl. -->
                     <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
diff --git a/www/core/components/login/templates/emailsignup.html b/www/core/components/login/templates/emailsignup.html
index 71256e0e742..0c6c8cf2dcd 100644
--- a/www/core/components/login/templates/emailsignup.html
+++ b/www/core/components/login/templates/emailsignup.html
@@ -7,8 +7,12 @@
         </ion-refresher>
         <mm-loading hide-until="settingsLoaded">
             <form name="signupForm" class="list list-inset" ng-if="settings" novalidate="">
-                <div class="item item-text-wrap item-avatar-center" ng-if="logourl">
-                    <img ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
+                <div class="item item-text-wrap text-center">
+                    <!-- If no sitename show big siteurl. -->
+                    <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
+                    <!-- If sitename, show big sitename and small siteurl. -->
+                    <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
+                    <p ng-if="sitename">{{siteurl}}</p>
                 </div>
                 <!-- Username and password. -->
                 <div class="item item-divider item-text-wrap">
@@ -16,7 +20,7 @@
                 </div>
                 <ion-input class="item item-input item-stacked-label item-text-wrap" mm-input-errors error-messages="usernameErrors">
                     <ion-label mm-mark-required="true">{{ 'mm.login.username' | translate }}</ion-label>
-                    <input type="text" name="username" placeholder="{{ 'mm.login.username' | translate }}" ng-model="data.username" autocapitalize="none" autocorrect="off" mm-auto-focus required>
+                    <input type="text" name="username" placeholder="{{ 'mm.login.username' | translate }}" ng-model="data.username" autocapitalize="none" autocorrect="off" required>
                 </ion-input>
                 <ion-input class="item item-input item-stacked-label item-text-wrap" mm-input-errors error-messages="passwordErrors">
                     <ion-label mm-mark-required="true">{{ 'mm.login.password' | translate }}</ion-label>
diff --git a/www/core/components/login/templates/site.html b/www/core/components/login/templates/site.html
index 1a17cdc00b4..cc1310fd9c7 100644
--- a/www/core/components/login/templates/site.html
+++ b/www/core/components/login/templates/site.html
@@ -6,7 +6,7 @@
     <form class="mm-view-content">
       <div class="box">
         <div class="text-center padding">
-          <img ng-src="img/moodle.png" class="avatar-full" role="presentation">
+          <img ng-src="img/moodle.png" class="avatar-full  moodle-logo" role="presentation">
         </div>
         <p class="padding">{{ 'mm.login.newsitedescription' | translate }}</p>
         <div class="list item item-input">
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 6ca8eb8da7f..023c76ed3ec 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -538,6 +538,10 @@ mm-loading.mm-loading-noheight .mm-loading-content {
   max-width: 100%;
 }
 
+audio.mm-media-adapt-width {
+  width: 100%;
+}
+
 .mm-enabled-media-adapt img.mm-media-adapt-width,
 img.mm-media-adapt-width-enabled {
   height: auto;
diff --git a/www/img/moodle.png b/www/img/moodle.png
index 791ad6e6c3099ca92d5ba5a74e8c138c2668ec2a..8a2e142b23deeb742b4f80b89863f409fdeaf395 100644
GIT binary patch
literal 18363
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
O0000<MNUMnLSTYZt(kZL

literal 4224
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
QuM{AbXKl>OO~Ls80=tXY0{{R3


From 401241b44e91c565cd134f2816e9f8c92492160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 18 May 2017 12:13:12 +0200
Subject: [PATCH 167/218] MOBILE-2105 core: Review some warning card icons

---
 www/addons/mod/lesson/templates/player.html | 6 +++---
 www/addons/mod/lesson/templates/view.html   | 4 ++--
 www/addons/mod/wiki/templates/page.html     | 6 ++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 5d1a979800d..71688f8561c 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -6,7 +6,7 @@
     <ion-content mm-state-class delegate-handle="mmaModLessonPlayerScroll">
         <mm-loading hide-until="pageLoaded">
             <!-- Info messages. Only show the first one. -->
-            <div class="mm-info-card" ng-if="lesson && messages && messages.length">
+            <div class="mm-info-card-icon" ng-if="lesson && messages && messages.length">
                 <i class="icon ion-information-circled padding"></i> {{ messages[0].message }}
             </div>
 
@@ -33,14 +33,14 @@
                         <p>{{ 'mma.mod_lesson.progresscompleted' | translate:{$a: pageData.progress} }}</p>
                         <mm-progress-bar progress="pageData.progress"></mm-progress-bar>
                     </div>
-                    <div ng-if="lesson.progressbar && canManage" class="mm-info-card">
+                    <div ng-if="lesson.progressbar && canManage" class="mm-info-card-icon">
                         <i class="icon ion-information-circled padding"></i>{{ 'mma.mod_lesson.progressbarteacherwarning2' | translate }}
                     </div>
                 </div>
 
                 <!-- End of lesson reached. -->
                 <div ng-if="eolData && !processData" class="card">
-                    <div class="mm-warning" ng-if="eolData.offline && eolData.offline.value">
+                    <div class="mm-warning-card-icon" ng-if="eolData.offline && eolData.offline.value">
                         <i class="icon ion-alert-circled padding"></i> {{ 'mma.mod_lesson.finishretakeoffline' | translate }}
                     </div>
                     <h3 class="padding" ng-if="eolData.gradelesson">{{ 'mma.mod_lesson.congratulations' | translate }}</h3>
diff --git a/www/addons/mod/lesson/templates/view.html b/www/addons/mod/lesson/templates/view.html
index 67b2b38b87c..762e998e5ac 100644
--- a/www/addons/mod/lesson/templates/view.html
+++ b/www/addons/mod/lesson/templates/view.html
@@ -1,13 +1,13 @@
 <mm-course-mod-description description="description" watch="true" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
 <!-- Prevent access messages. Only show the first one. -->
-<div class="mm-info-card" ng-if="lesson && preventMessages && preventMessages.length">
+<div class="mm-info-card-icon" ng-if="lesson && preventMessages && preventMessages.length">
     <!-- The messages can have html, use format-text. -->
     <i class="icon ion-information-circled padding"></i> <mm-format-text watch="true">{{ preventMessages[0].message }}</mm-format-text>
 </div>
 
 <!-- Lesson has data to be synchronized -->
-<div class="mm-warning" ng-if="hasOffline">
+<div class="mm-warning-card-icon" ng-if="hasOffline">
     <i class="icon ion-alert-circled padding"></i> {{ 'mm.core.hasdatatosync' | translate:{$a: moduleName} }}
 </div>
 
diff --git a/www/addons/mod/wiki/templates/page.html b/www/addons/mod/wiki/templates/page.html
index 49ee0a16219..1d6a46572f4 100644
--- a/www/addons/mod/wiki/templates/page.html
+++ b/www/addons/mod/wiki/templates/page.html
@@ -11,10 +11,8 @@
         </div>
 
         <!-- Page warning. -->
-        <div class="padding" ng-if="pageWarning">
-            <p class="badge badge-inline badge-assertive padding">
-                <i class="icon ion-alert-circled padding"></i> {{ pageWarning }}
-            </p>
+        <div class="mm-warning-card-icon" ng-if="pageWarning">
+            <i class="icon ion-alert-circled padding"></i> {{ pageWarning }}
         </div>
 
         <article ng-class="{'mma-mod_wiki-noedit': !canEdit}">

From 4d2c0fcdc04fbe7a712a474190cc096085fce80a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 18 May 2017 11:45:28 +0200
Subject: [PATCH 168/218] MOBILE-2103 notificationpopover: Remove ion-content
 It caused problems with $ionicScrollDelegate, it always used the modal scroll
 by default instead of the view scroll

---
 www/core/templates/notificationpopover.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/core/templates/notificationpopover.html b/www/core/templates/notificationpopover.html
index 92f79c5870a..35b2b8a1363 100644
--- a/www/core/templates/notificationpopover.html
+++ b/www/core/templates/notificationpopover.html
@@ -1,9 +1,7 @@
 <ion-popover-view class="mm-inapp-notification">
-    <ion-content>
-        <div class="item item-icon-right">
-            <h2>{{title}}</h2>
-            <p ng-repeat="text in texts track by $index"><mm-format-text watch="true">{{text}}</mm-format-text></p>
-            <a class="button button-icon icon ion-close-round" ng-click="hide()" aria-label="{{ 'mm.core.dismiss' | translate }}"></a>
-        </div>
-    </ion-content>
+    <div class="item item-icon-right">
+        <h2>{{title}}</h2>
+        <p ng-repeat="text in texts track by $index"><mm-format-text watch="true">{{text}}</mm-format-text></p>
+        <a class="button button-icon icon ion-close-round" ng-click="hide()" aria-label="{{ 'mm.core.dismiss' | translate }}"></a>
+    </div>
 </ion-popover-view>

From 675fdac1be9d8854a261142d5bc33e8b6333e896 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 18 May 2017 13:48:31 +0200
Subject: [PATCH 169/218] MOBILE-2103 autofocus: Fix autofocus problem with
 scrolling

---
 www/core/directives/autofocus.js | 12 ++++++++++--
 www/core/main.js                 |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/www/core/directives/autofocus.js b/www/core/directives/autofocus.js
index 3110b642544..d166dc98dce 100644
--- a/www/core/directives/autofocus.js
+++ b/www/core/directives/autofocus.js
@@ -23,7 +23,7 @@ angular.module('mm.core')
  * @ngdoc directive
  * @name mmAutoFocus
  */
-.directive('mmAutoFocus', function($mmUtil) {
+.directive('mmAutoFocus', function($mmUtil, $timeout) {
     return {
         restrict: 'A',
         link: function(scope, el, attrs) {
@@ -35,8 +35,16 @@ angular.module('mm.core')
                     (attrs.mmAutoFocus !== false && attrs.mmAutoFocus !== 'false' && attrs.mmAutoFocus !== '0');
 
                 if (!isActive && showKeyboard) {
-                    $mmUtil.focusElement(el[0]);
+                    // Enable keyboard. This is needed because Ionic doesn't listen for keyboard events until the user taps.
+                    // Calling this will make Ionic listen for keyboard events and resize the view as it should.
+                    ionic.keyboard.enable();
                     unregister(); // Stop watching.
+
+                    // Wait a bit before focusing the element. This is because Ionic closes the keyboard on
+                    // $ionicView.beforeEnter, and it might take a while to close it.
+                    $timeout(function() {
+                        $mmUtil.focusElement(el[0]);
+                    }, 400);
                 }
             });
         }
diff --git a/www/core/main.js b/www/core/main.js
index ae654b9846e..3436248ff2c 100644
--- a/www/core/main.js
+++ b/www/core/main.js
@@ -272,7 +272,7 @@ angular.module('mm.core', ['pascalprecht.translate'])
                                 $ionicScrollDelegate.$getByHandle(delegateHandle) : $ionicScrollDelegate;
 
                         // Scroll to the position.
-                        $ionicScrollDelegate.scrollTo(position[0], position[1]);
+                        scrollView.scrollTo(position[0], position[1]);
                     }
                 }
             }

From 83124def21156aa83d5d34c4eeb8f1890ca6e7e1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 18 May 2017 16:01:44 +0200
Subject: [PATCH 170/218] MOBILE-2103 splitview: Fix empty message in iPad

---
 www/core/templates/splitview.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/core/templates/splitview.html b/www/core/templates/splitview.html
index f4ae2a2352e..9d7f68bffa1 100644
--- a/www/core/templates/splitview.html
+++ b/www/core/templates/splitview.html
@@ -2,6 +2,8 @@
     <div class="mm-split-pane-menu" ng-transclude>
     </div>
     <div ui-view="{{component}}" class="mm-split-pane-content">
-        <mm-empty-box icon="ion-arrow-left-c" message="{{ 'mm.core.emptysplit' | translate}}"></mm-empty-box>
+        <ion-content>
+            <mm-empty-box icon="ion-arrow-left-c" message="{{ 'mm.core.emptysplit' | translate}}"></mm-empty-box>
+        </ion-content>
     </div>
 </div>
\ No newline at end of file

From ae9e9c10575053cf97c17e16f59640e5e5fabb2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 18 May 2017 16:04:40 +0200
Subject: [PATCH 171/218] MOBILE-2103 overview: Fix switch grid button

---
 www/addons/myoverview/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/myoverview/templates/index.html b/www/addons/myoverview/templates/index.html
index 526df68160f..d9c440450a8 100644
--- a/www/addons/myoverview/templates/index.html
+++ b/www/addons/myoverview/templates/index.html
@@ -42,7 +42,7 @@
                         </div>
                     </div>
                     <div class="col-10 text-right">
-                        <a ng-class="{'ion-android-apps': !showGrid, 'ion-ios-list-outline': showGrid}" class="button button-dark button-icon icon" ></a>
+                        <a ng-class="{'ion-android-apps': !showGrid, 'ion-ios-list-outline': showGrid}" class="button button-dark button-icon icon" ng-click="switchGrid()"></a>
                     </div>
                 </div>
                 <div ng-show="showFilter" class="item mm-filter-box item-input-inset">

From d09e3b63c5d421a3c64e096270b7e70e2b0de92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 18 May 2017 15:26:31 +0200
Subject: [PATCH 172/218] MOBILE-2103 completion: Solve completion click

---
 www/core/directives/completion.js  | 9 +++++++--
 www/core/templates/completion.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/core/directives/completion.js b/www/core/directives/completion.js
index 23fd03a4722..68eac72bbee 100644
--- a/www/core/directives/completion.js
+++ b/www/core/directives/completion.js
@@ -79,11 +79,14 @@ angular.module('mm.core')
         link: function(scope, element, attrs) {
             if (scope.completion) {
                 showStatus(scope);
+            }
 
-                element.on('click', function(e) {
+            scope.completionClicked = function (e) {
+                if (scope.completion) {
                     if (typeof scope.completion.cmid == 'undefined' || scope.completion.tracking !== 1) {
                         return;
                     }
+
                     e.preventDefault();
                     e.stopPropagation();
 
@@ -106,7 +109,9 @@ angular.module('mm.core')
                     }).finally(function() {
                         modal.dismiss();
                     });
-                });
+
+                    return false;
+                }
             }
         }
     };
diff --git a/www/core/templates/completion.html b/www/core/templates/completion.html
index 6c48f1d1fa6..e65c6fee43f 100644
--- a/www/core/templates/completion.html
+++ b/www/core/templates/completion.html
@@ -1,3 +1,3 @@
-<a ng-if="completion" class="mm-completion-container">
+<a ng-if="completion" class="mm-completion-container" ng-click="completionClicked($event)">
     <img ng-src="{{completionImage}}" alt="{{completionDescription}}" title="{{completionDescription}}">
 </a>
\ No newline at end of file

From 95166639dad4552b4ad65db41fb4b08e30e339e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 18 May 2017 15:15:10 +0200
Subject: [PATCH 173/218] MOBILE-2103 core: Fix some button colors

---
 scss/app.scss                                   | 11 +++++++++++
 www/addons/mod/assign/templates/submission.html |  8 ++++----
 www/addons/mod/resource/templates/index.html    |  2 +-
 www/addons/mod/url/templates/index.html         |  2 +-
 www/core/templates/localfile.html               |  4 ++--
 www/core/templates/navigationbar.html           |  6 +++---
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index a0dfe126621..aeda7ed1817 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -100,6 +100,17 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   &.dark {
     color: $dark;
   }
+  &.icon-accessory {
+    color: $item-icon-accessory-color;
+  }
+}
+
+.button .icon {
+  color: $positive;
+
+  &.icon-accessory {
+    color: $item-icon-accessory-color;
+  }
 }
 
 .action-sheet .button .icon {
diff --git a/www/addons/mod/assign/templates/submission.html b/www/addons/mod/assign/templates/submission.html
index d1c85dc87e5..51edcc6095a 100644
--- a/www/addons/mod/assign/templates/submission.html
+++ b/www/addons/mod/assign/templates/submission.html
@@ -88,14 +88,14 @@ <h2>{{ 'mma.mod_assign.attemptnumber' | translate }}</h2>
             <!-- Add or edit submission. -->
             <div ng-if="submitSupported && !unsupportedEditPlugins.length && !showErrorStatementEdit">
                 <!-- If has offline data, show edit. -->
-                <a ng-if="hasOffline" class="button button-block" ng-click="goToEdit()">{{ 'mma.mod_assign.editsubmission' | translate }}</a>
+                <a ng-if="hasOffline" class="button button-block button-positive" ng-click="goToEdit()">{{ 'mma.mod_assign.editsubmission' | translate }}</a>
                 <!-- If no submission or is new, show add submission. -->
-                <a ng-if="!hasOffline && (!userSubmission || !userSubmission.status || userSubmission.status == statusNew)" class="button button-block" ng-click="goToEdit()">{{ 'mma.mod_assign.addsubmission' | translate }}</a>
+                <a ng-if="!hasOffline && (!userSubmission || !userSubmission.status || userSubmission.status == statusNew)" class="button button-block button-positive" ng-click="goToEdit()">{{ 'mma.mod_assign.addsubmission' | translate }}</a>
                 <!-- If reopened, show addfromprevious and addnewattempt. -->
                 <a ng-if="!hasOffline && userSubmission && userSubmission.status == statusReopened" class="button button-block" ng-click="copyPrevious()">{{ 'mma.mod_assign.addnewattemptfromprevious' | translate }}</a>
-                <a ng-if="!hasOffline && userSubmission && userSubmission.status == statusReopened" class="button button-block" ng-click="goToEdit()">{{ 'mma.mod_assign.addnewattempt' | translate }}</a>
+                <a ng-if="!hasOffline && userSubmission && userSubmission.status == statusReopened" class="button button-block button-positive" ng-click="goToEdit()">{{ 'mma.mod_assign.addnewattempt' | translate }}</a>
                 <!-- Else show editsubmission. -->
-                <a ng-if="!hasOffline && userSubmission && userSubmission.status && userSubmission.status != statusNew && userSubmission.status != statusReopened" class="button button-block" ng-click="goToEdit()">{{ 'mma.mod_assign.editsubmission' | translate }}</a>
+                <a ng-if="!hasOffline && userSubmission && userSubmission.status && userSubmission.status != statusNew && userSubmission.status != statusReopened" class="button button-block button-positive" ng-click="goToEdit()">{{ 'mma.mod_assign.editsubmission' | translate }}</a>
             </div>
             <div ng-if="unsupportedEditPlugins && unsupportedEditPlugins.length && !showErrorStatementEdit">
                 <p class="mma-mod-assign-warning">{{ 'mma.mod_assign.erroreditpluginsnotsupported' | translate }}</p>
diff --git a/www/addons/mod/resource/templates/index.html b/www/addons/mod/resource/templates/index.html
index 4bc50791d68..06c9ec5476e 100644
--- a/www/addons/mod/resource/templates/index.html
+++ b/www/addons/mod/resource/templates/index.html
@@ -23,7 +23,7 @@
             </div>
 
             <div ng-if="mode == 'external'">
-                <a ng-click="open()" class="button button-block icon-left ion-document">{{ 'mma.mod_resource.openthefile' | translate }}</a>
+                <a ng-click="open()" class="button button-block icon-left ion-document button-positive">{{ 'mma.mod_resource.openthefile' | translate }}</a>
             </div>
         </mm-loading>
     </ion-content>
diff --git a/www/addons/mod/url/templates/index.html b/www/addons/mod/url/templates/index.html
index c4e282c75f2..d74be6137ff 100644
--- a/www/addons/mod/url/templates/index.html
+++ b/www/addons/mod/url/templates/index.html
@@ -15,7 +15,7 @@
                 <h2>{{ 'mma.mod_url.pointingtourl' | translate }}</h2>
                 <p>{{ url }}</p>
             </div>
-            <a ng-click="go()" class="button button-block icon-left ion-link">{{ 'mma.mod_url.accessurl' | translate }}</a>
+            <a ng-click="go()" class="button button-block icon-left ion-link button-positive">{{ 'mma.mod_url.accessurl' | translate }}</a>
         </mm-loading>
     </ion-content>
 </ion-view>
\ No newline at end of file
diff --git a/www/core/templates/localfile.html b/www/core/templates/localfile.html
index 26ad708935d..48150c3c91c 100644
--- a/www/core/templates/localfile.html
+++ b/www/core/templates/localfile.html
@@ -11,7 +11,7 @@
     </form>
     <p ng-if="size">{{ size }}</p>
     <p ng-if="timeModified">{{ timeModified }}</p>
-    <button class="button assertive button-icon" ng-if="manage" ng-click="deleteFile($event)" aria-label="{{ 'mm.core.delete' | translate }}">
-        <i class="icon ion-trash-a"></i>
+    <button class="button button-icon" ng-if="manage" ng-click="deleteFile($event)" aria-label="{{ 'mm.core.delete' | translate }}">
+        <i class="icon assertive ion-trash-a"></i>
     </button>
 </a>
diff --git a/www/core/templates/navigationbar.html b/www/core/templates/navigationbar.html
index faeb3b0fd7a..cfed2718d0e 100644
--- a/www/core/templates/navigationbar.html
+++ b/www/core/templates/navigationbar.html
@@ -1,11 +1,11 @@
 <div class="row" ng-if="previous || info || next">
     <div class="col">
-        <a class="button button-icon icon ion-arrow-left-b" ng-if="previous" ng-click="action(previous)" title="{{ 'mm.core.previous' | translate }}"></a>
+        <a class="button button-icon positive icon ion-arrow-left-b" ng-if="previous" ng-click="action(previous)" title="{{ 'mm.core.previous' | translate }}"></a>
     </div>
     <div class="col text-center">
-        <a class="button button-icon icon ion-ios-information-outline" ng-if="info" ng-click="showInfo()" title="{{title}}"></a>
+        <a class="button button-icon positive icon ion-ios-information-outline" ng-if="info" ng-click="showInfo()" title="{{title}}"></a>
     </div>
     <div class="col text-right">
-        <a class="button button-icon icon ion-arrow-right-b" ng-if="next" ng-click="action(next)" title="{{ 'mm.core.next' | translate }}"></a>
+        <a class="button button-icon positive icon ion-arrow-right-b" ng-if="next" ng-click="action(next)" title="{{ 'mm.core.next' | translate }}"></a>
     </div>
 </div>

From 35392bdebea29e0b5058ff9174698a758279ad5d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 19 May 2017 10:56:25 +0200
Subject: [PATCH 174/218] MOBILE-2103 splitview: Clone state params object in
 split view states If the objects are modified inside the controller, Ionic
 will open the left state again when loading the split view content.

---
 www/addons/mod/feedback/controllers/respondents.js | 2 +-
 www/addons/mod/forum/controllers/discussions.js    | 2 +-
 www/addons/mod/glossary/controllers/index.js       | 2 +-
 www/addons/participants/controllers/list.js        | 5 ++---
 www/core/components/course/controllers/sections.js | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/respondents.js b/www/addons/mod/feedback/controllers/respondents.js
index 342c32d60f4..44bb3113b6d 100644
--- a/www/addons/mod/feedback/controllers/respondents.js
+++ b/www/addons/mod/feedback/controllers/respondents.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_feedback')
  */
 .controller('mmaModFeedbackRespondentsCtrl', function($scope, $stateParams, $mmaModFeedback, $mmUtil, $q, $mmText, $translate,
         mmaModFeedbackComponent, $mmGroups, $mmaModFeedbackHelper, $ionicHistory) {
-    var module = $stateParams.module || {},
+    var module = $stateParams.module ? angular.copy($stateParams.module) : {},
         courseId = $stateParams.courseid,
         page = 0,
         feedback;
diff --git a/www/addons/mod/forum/controllers/discussions.js b/www/addons/mod/forum/controllers/discussions.js
index 87775895d9f..0f908594032 100644
--- a/www/addons/mod/forum/controllers/discussions.js
+++ b/www/addons/mod/forum/controllers/discussions.js
@@ -25,7 +25,7 @@ angular.module('mm.addons.mod_forum')
             $mmEvents, $ionicScrollDelegate, $ionicPlatform, mmUserProfileState, mmaModForumNewDiscussionEvent, $mmSite, $translate,
             mmaModForumReplyDiscussionEvent, $mmText, mmaModForumComponent, $mmaModForumOffline, $mmaModForumSync, $mmCourseHelper,
             mmaModForumAutomSyncedEvent, mmaModForumManualSyncedEvent, $mmApp, mmCoreEventOnlineStatusChanged) {
-    var module = $stateParams.module || {},
+    var module = $stateParams.module ? angular.copy($stateParams.module) : {},
         courseid = $stateParams.courseid,
         forum,
         page = 0,
diff --git a/www/addons/mod/glossary/controllers/index.js b/www/addons/mod/glossary/controllers/index.js
index 6f1330d1299..29913639991 100644
--- a/www/addons/mod/glossary/controllers/index.js
+++ b/www/addons/mod/glossary/controllers/index.js
@@ -26,7 +26,7 @@ angular.module('mm.addons.mod_glossary')
         $mmaModGlossaryOffline, $mmEvents, mmaModGlossaryAddEntryEvent, mmCoreEventOnlineStatusChanged, $mmApp, $mmSite,
         mmaModGlossaryAutomSyncedEvent, $mmaModGlossarySync, mmaModGlossaryShowAllCategories) {
 
-    var module = $stateParams.module || {},
+    var module = $stateParams.module ? angular.copy($stateParams.module) : {},
         courseId = $stateParams.courseid,
         glossary,
         noop = function(){},
diff --git a/www/addons/participants/controllers/list.js b/www/addons/participants/controllers/list.js
index 11bd748a073..373d681ac11 100644
--- a/www/addons/participants/controllers/list.js
+++ b/www/addons/participants/controllers/list.js
@@ -21,9 +21,8 @@ angular.module('mm.addons.participants')
  * @ngdoc controller
  * @name mmaParticipantsListCtrl
  */
-.controller('mmaParticipantsListCtrl', function($scope, $state, $stateParams, $mmUtil, $mmaParticipants, $ionicPlatform, $mmSite,
-            mmUserProfileState) {
-    var course = $stateParams.course,
+.controller('mmaParticipantsListCtrl', function($scope, $stateParams, $mmUtil, $mmaParticipants, $mmSite, mmUserProfileState) {
+    var course = angular.copy($stateParams.course),
         courseid = course.id;
 
     $scope.participants = [];
diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index d70910d82c5..82f9dbd431e 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -27,7 +27,7 @@ angular.module('mm.core.course')
     var courseId = $stateParams.courseid,
         sectionId = $stateParams.sid,
         moduleId = $stateParams.moduleid,
-        course = $stateParams.course || false;
+        course = $stateParams.course ? angular.copy($stateParams.course) : false;
 
     $scope.courseId = courseId;
     $scope.sectionToLoad = 2; // Load "General" section by default.

From 9a1ac95f53c60d457f0ed06ebc0e5805df164e53 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 19 May 2017 11:48:22 +0200
Subject: [PATCH 175/218] MOBILE-2103 course: Show spinner when updating manual
 completion

---
 upgrade.txt                                   |  1 +
 www/addons/frontpage/templates/frontpage.html |  2 +-
 .../components/course/controllers/section.js  | 13 +++++++---
 .../components/course/templates/section.html  |  2 +-
 www/core/directives/loading.js                | 25 ++-----------------
 5 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index 26d478051a5..e6d43bb5c61 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -14,6 +14,7 @@ information provided here is intended especially for developers.
  * The parameters of the following functions have changed to match the WS behaviour: $mmaModForum#addNewDiscussion, $mmaModForum#addNewDiscussionOnline, $mmaModForumOffline#addNewDiscussion, $mmaModForum#replyPost, $mmaModForum#replyPostOnline, $mmaModForumOffline#replyPost.
  * The function $mmUtil#getMimeType has been deprecated. Please use $mmUtil#getMimeTypeFromUrl instead.
  * The functions $mmFilepool#invalidateAllFiles and $mmFilepool#invalidateFilesByComponent now accept a new param onlyUnknown which defaults to true, so it only invalidates some of the files. It is advised to use onlyUnknown=true to decrease the network usage and improve the app's performance.
+ * The directive mm-loading no longer accepts the param loadingPaddingTop since now the spinner is centered vertically.
 
 === 3.2.1 ===
 
diff --git a/www/addons/frontpage/templates/frontpage.html b/www/addons/frontpage/templates/frontpage.html
index 7d17fcc88c1..9b6e13df131 100644
--- a/www/addons/frontpage/templates/frontpage.html
+++ b/www/addons/frontpage/templates/frontpage.html
@@ -3,7 +3,7 @@
     <ion-content mm-state-class padding="true">
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="frontpageLoaded" on-refresh="doRefresh()">
         </ion-refresher>
-        <mm-loading hide-until="frontpageLoaded" loading-padding-top="loadingPaddingTop">
+        <mm-loading hide-until="frontpageLoaded">
 
             <section class="card" ng-if="section && sectionHasContent(section)">
                 <div class="item item-text-wrap clearfix" ng-if="section.summary">
diff --git a/www/core/components/course/controllers/section.js b/www/core/components/course/controllers/section.js
index 82fff925f91..223fc5185ae 100644
--- a/www/core/components/course/controllers/section.js
+++ b/www/core/components/course/controllers/section.js
@@ -142,14 +142,19 @@ angular.module('mm.core.course')
             scrollView = $ionicScrollDelegate.$getByHandle('mmSectionScroll');
         }
 
-        if (scrollView && scrollView.getScrollPosition()) {
-            $scope.loadingPaddingTop = scrollView.getScrollPosition().top;
-        }
+        // Save scroll position to restore it once done.
+        var scrollPosition = scrollView.getScrollPosition() || {};
+
         $scope.sectionLoaded = false;
         $scope.sections = [];
+        scrollView.scrollTop(); // Scroll top so the spinner is seen.
+
         loadContent(sectionId).finally(function() {
             $scope.sectionLoaded = true;
-            $scope.loadingPaddingTop = 0;
+            // Wait for the view to render and scroll back to the user's position.
+            $timeout(function() {
+                scrollView.scrollTo(scrollPosition.left, scrollPosition.top);
+            });
         });
     }
 
diff --git a/www/core/components/course/templates/section.html b/www/core/components/course/templates/section.html
index fb5baee0897..b0e6d8d34f7 100644
--- a/www/core/components/course/templates/section.html
+++ b/www/core/components/course/templates/section.html
@@ -3,7 +3,7 @@
     <ion-content delegate-handle="mmSectionScroll" mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="sectionLoaded" on-refresh="doRefresh()">
         </ion-refresher>
-        <mm-loading hide-until="sectionLoaded" loading-padding-top="loadingPaddingTop">
+        <mm-loading hide-until="sectionLoaded">
 
             <section class="card" ng-if="summary">
                 <!-- Only displayed when 1 section per page. -->
diff --git a/www/core/directives/loading.js b/www/core/directives/loading.js
index e5c76f5e88d..6c36a4c139f 100644
--- a/www/core/directives/loading.js
+++ b/www/core/directives/loading.js
@@ -22,7 +22,7 @@ angular.module('mm.core')
  * @name mmLoading
  * @description
  * Usage:
- * <mm-loading message="{{loadingMessage}}" hide-until="dataLoaded" loading-padding-top="paddingTop">
+ * <mm-loading message="{{loadingMessage}}" hide-until="dataLoaded">
  *     <!-- CONTENT TO HIDE UNTIL LOADED -->
  * </mm-loading>
  * This directive will show a ion-spinner with a message and hide all the content until 'dataLoaded' variable is set to true.
@@ -35,9 +35,6 @@ angular.module('mm.core')
  *                                     to change during execution. Has priority over message.
  * @param {String} hideUntil           Scope variable to determine when should the contents be shown. When the variable is set
  *                                     to true, the loading is hidden and the contents are shown.
- * @param {String} [loadingPaddingTop] Padding top to set to loading view. If not set, no padding top is set. This attribute is
- *                                     meant to be used with dynamic paddings (e.g. to move the loading spinner to the user
- *                                     scrollTop). Static padding-top should be set using CSS.
  */
 .directive('mmLoading', function($translate) {
 
@@ -48,33 +45,15 @@ angular.module('mm.core')
         scope: {
             hideUntil: '=?',
             message: '@?',
-            dynMessage: '=?',
-            loadingPaddingTop: '=?'
+            dynMessage: '=?'
         },
         link: function(scope, element, attrs) {
-            var el = element[0],
-                loading = angular.element(el.querySelector('.mm-loading-container'));
-
             if (!attrs.message) {
                 // Default loading message.
                 $translate('mm.core.loading').then(function(loadingString) {
                     scope.message = loadingString;
                 });
             }
-
-            if (attrs.loadingPaddingTop) {
-                scope.$watch('loadingPaddingTop', function(newValue) {
-                    // parseInt of an invalid string is NaN, but parseInt('a') == NaN is FALSE and typeof NaN = 'number'.
-                    // That's why we use num >= 0 or num < 0 to check if it's a valid number.
-                    var num = parseInt(newValue);
-                    if (num >= 0 || num < 0) {
-                        loading.css('padding-top', newValue + 'px');
-                    } else if(typeof newValue == 'string') {
-                        // Maybe they set a value like '200px'.
-                        loading.css('padding-top', newValue);
-                    }
-                });
-            }
         }
     };
 });

From f422eff4174c65642b4138f53b964fdca3899ba6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 19 May 2017 11:51:29 +0200
Subject: [PATCH 176/218] MOBILE-2103 lesson: Use core string instead of
 specific

---
 www/addons/mod/lesson/lang/en.json        | 1 -
 www/addons/mod/lesson/templates/view.html | 2 +-
 www/core/lang/en.json                     | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index eefeadc5f2c..63e9e2860ab 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -65,7 +65,6 @@
     "reviewquestionback": "Yes, I'd like to try again",
     "reviewquestioncontinue": "No, I just want to go on to the next question",
     "secondpluswrong": "Not quite.  Would you like to try again?",
-    "startattempt": "Start attempt",
     "submit": "Submit",
     "teacherongoingwarning": "Ongoing score is only displayed for student.  Login as a student to test ongoing score",
     "teachertimerwarning": "Timer only works for students.  Test the timer by logging in as a student.",
diff --git a/www/addons/mod/lesson/templates/view.html b/www/addons/mod/lesson/templates/view.html
index 762e998e5ac..f7e94dda626 100644
--- a/www/addons/mod/lesson/templates/view.html
+++ b/www/addons/mod/lesson/templates/view.html
@@ -46,7 +46,7 @@
         </div>
         <div ng-if="!leftDuringTimed" class="item item-text-wrap">
             <!-- User hasn't left during the session, show a start button. -->
-            <button ng-if="!canManage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="start(false)">{{ 'mma.mod_lesson.startattempt' | translate }}</button>
+            <button ng-if="!canManage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="start(false)">{{ 'mm.core.start' | translate }}</button>
             <button ng-if="canManage" class="button button-block icon-left ion-search" ng-click="start(false)">{{ 'mma.mod_lesson.preview' | translate }}</button>
         </div>
     </section>
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index fb718c0def9..3025c70b7df 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -179,6 +179,7 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry...",
+    "start": "Start",
     "submit": "Submit",
     "success": "Success!",
     "tablet": "Tablet",

From 92706f6f2d0a552f4879399bb52fb2aa96339cb4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 19 May 2017 12:21:18 +0200
Subject: [PATCH 177/218] MOBILE-2103 upgrade: Specify Ionic version in npm
 install

---
 upgrade.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upgrade.txt b/upgrade.txt
index e6d43bb5c61..e73d6c358bf 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -5,7 +5,7 @@ information provided here is intended especially for developers.
 
  * The project now supports Ionic CLI v2 and Node 6.9. We recommend updating node, npm, Ionic CLI and project dependencies:
     npm install -g npm@latest
-    npm install -g ionic
+    npm install -g ionic@2.2.1
     npm install
  * mm-error CSS class has been deprecated. Use mm-error-card or similar instead.
  * The function $mmaMessages#isSearchEnabled has been deprecated. Please use $mmaMessages#isSearchContactsEnabled instead.

From 27eb68427c257bdd84825ad719b62961b81cad48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 19 May 2017 12:23:35 +0200
Subject: [PATCH 178/218] MOBILE-2103 feedback: Check feedback numeric range

---
 www/addons/mod/feedback/controllers/form.js  |  2 +-
 www/addons/mod/feedback/lang/en.json         |  1 +
 www/addons/mod/feedback/services/helper.js   | 17 ++++++++++++++---
 www/addons/mod/feedback/templates/form.html  |  5 +++--
 www/core/components/courses/scss/styles.scss |  1 +
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/form.js b/www/addons/mod/feedback/controllers/form.js
index fd9df8ee4bb..c9555b4166c 100644
--- a/www/addons/mod/feedback/controllers/form.js
+++ b/www/addons/mod/feedback/controllers/form.js
@@ -146,7 +146,7 @@ angular.module('mm.addons.mod_feedback')
             formHasErrors = false;
 
         for (var x in $scope.items) {
-            if ($scope.items[x].isEmpty) {
+            if ($scope.items[x].isEmpty || $scope.items[x].hasError) {
                 formHasErrors = true;
                 break;
             }
diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 51913affb96..d9c62317747 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -19,6 +19,7 @@
     "non_respondents_students": "Non respondents students ({{$a}})",
     "not_selected": "Not selected",
     "not_started": "Not started",
+    "numberoutofrange": "Number out of range",
     "overview": "Overview",
     "page_after_submit": "Completion message",
     "preview": "Preview",
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 0d2470497cf..92c5cd1893d 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -268,6 +268,7 @@ angular.module('mm.addons.mod_feedback')
         var responses = {};
 
         angular.forEach(items, function(itemData) {
+            itemData.hasError = false;
             if (itemData.hasvalue) {
                 var name, value,
                     nameTemp = itemData.typ + '_' + itemData.id,
@@ -286,12 +287,22 @@ angular.module('mm.addons.mod_feedback')
                 } else {
                     if (itemData.typ == "multichoice") {
                         name = nameTemp + '[0]';
-                        value = itemData.value || 0;
-                    } else if (itemData.typ == "multichoicerated") {
+                    } else {
                         name = nameTemp;
+                    }
+
+                    if (itemData.typ == "multichoice" || itemData.typ == "multichoicerated") {
                         value = itemData.value || 0;
+                    } else if (itemData.typ == "numeric") {
+                        value = itemData.value || itemData.value  == 0 ? itemData.value : "";
+
+                        if (value != "") {
+                            if ((itemData.rangefrom != "" && value < itemData.rangefrom) ||
+                                    (itemData.rangeto != "" && value > itemData.rangeto)) {
+                                itemData.hasError = true;
+                            }
+                        }
                     } else {
-                        name = nameTemp;
                         value = itemData.value || itemData.value  == 0 ? itemData.value : "";
                     }
 
diff --git a/www/addons/mod/feedback/templates/form.html b/www/addons/mod/feedback/templates/form.html
index 0f4382816b2..61a43c861f9 100644
--- a/www/addons/mod/feedback/templates/form.html
+++ b/www/addons/mod/feedback/templates/form.html
@@ -11,7 +11,7 @@
                     </div>
                 </div>
                 <div class="list" ng-if="items && items.length">
-                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0, 'mm-error-item': item.isEmpty}">
+                    <div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0, 'mm-error-item': item.isEmpty || item.hasError}">
                         <p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
                         <div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
                     </div>
@@ -26,7 +26,8 @@
                 </script>
 
                 <script type="text/ng-template" id="numeric">
-                    <input ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" type="number" ng-model="item.value" min="{{item.rangefrom}}" max="{{item.rangeto}}"/>
+                    <input ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" type="number" ng-model="item.value"/>
+                    <p ng-if="item.hasError" class="assertive">{{ 'mma.mod_feedback.numberoutofrange' |translate }} [{{item.rangefrom}}<span ng-if="item.rangefrom && item.rangeto">, </span>{{item.rangeto}}]</p>
                 </script>
 
                 <script type="text/ng-template" id="textarea">
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index 30db6a89b18..f0f02780920 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -53,6 +53,7 @@ $doughnut-text-colour: $gray-darker;
       vertical-align: middle;
       color: $doughnut-text-colour;
       font-size: 95%;
+      letter-spacing: -1px;
     }
 
     .progress-indicator {

From 73fdf13c75589f51128f69d68890e244646670b0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 19 May 2017 12:38:00 +0200
Subject: [PATCH 179/218] MOBILE-2103 filepool: Stop calling restore old files

---
 www/core/lib/filepool.js | 136 +++++++++++++++++----------------------
 1 file changed, 60 insertions(+), 76 deletions(-)

diff --git a/www/core/lib/filepool.js b/www/core/lib/filepool.js
index 651aa8980ed..005a10f8bac 100644
--- a/www/core/lib/filepool.js
+++ b/www/core/lib/filepool.js
@@ -806,10 +806,6 @@ angular.module('mm.core')
                 options.revision = self.getRevisionFromUrl(fileUrl);
                 fileId = self._getFileIdByUrl(fileUrl);
 
-                // Restore old file if needed.
-                return self._restoreOldFileIfNeeded(siteId, fileId, fileUrl, filePath);
-            }).then(function() {
-
                 return self._hasFileInPool(siteId, fileId).then(function(fileObject) {
 
                     if (typeof fileObject === 'undefined') {
@@ -1460,10 +1456,6 @@ angular.module('mm.core')
             revision = self.getRevisionFromUrl(fileUrl);
             fileId = self._getFileIdByUrl(fileUrl);
 
-            // Restore old file if needed.
-            return self._restoreOldFileIfNeeded(siteId, fileId, fileUrl);
-        }).then(function() {
-
             return self._hasFileInPool(siteId, fileId).then(function(fileObject) {
                 var response,
                     fn;
@@ -1728,9 +1720,6 @@ angular.module('mm.core')
             revision = self.getRevisionFromUrl(fileUrl);
             fileId = self._getFileIdByUrl(fileUrl);
 
-            // Restore old file if needed.
-            return self._restoreOldFileIfNeeded(siteId, fileId, fileUrl);
-        }).then(function() {
             return self._hasFileInQueue(siteId, fileId).then(function() {
                 return mmCoreDownloading;
             }, function() {
@@ -2417,78 +2406,75 @@ angular.module('mm.core')
          * Download helper to avoid code duplication.
          */
         function download(siteId, fileUrl, fileObject, links) {
-            // Restore old file if needed.
-            return self._restoreOldFileIfNeeded(siteId, fileId, fileUrl, filePath).then(function() {
-                return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath, fileObject).then(function() {
-                    var promise;
+            return self._downloadForPoolByUrl(siteId, fileUrl, options, filePath, fileObject).then(function() {
+                var promise;
 
-                    // Success, we add links and remove from queue.
-                    self._addFileLinks(siteId, fileId, links);
-                    promise = self._removeFromQueue(siteId, fileId);
+                // Success, we add links and remove from queue.
+                self._addFileLinks(siteId, fileId, links);
+                promise = self._removeFromQueue(siteId, fileId);
 
-                    self._treatQueueDeferred(siteId, fileId, true);
-                    self._notifyFileDownloaded(siteId, fileId);
+                self._treatQueueDeferred(siteId, fileId, true);
+                self._notifyFileDownloaded(siteId, fileId);
 
-                    // Wait for the item to be removed from queue before resolving the promise.
-                    // If the item could not be removed from queue we still resolve the promise.
-                    return promise.catch(function() {});
-
-                }, function(errorObject) {
-                    // Whoops, we have an error...
-                    var dropFromQueue = false;
-
-                    if (typeof errorObject !== 'undefined' && errorObject.source === fileUrl) {
-                        // This is most likely a $cordovaFileTransfer error.
-
-                        if (errorObject.code === 1) { // FILE_NOT_FOUND_ERR.
-                            // The file was not found, most likely a 404, we remove from queue.
-                            dropFromQueue = true;
-
-                        } else if (errorObject.code === 2) { // INVALID_URL_ERR.
-                            // The URL is invalid, we drop the file from the queue.
-                            dropFromQueue = true;
-
-                        } else if (errorObject.code === 3) { // CONNECTION_ERR.
-                            // If there was an HTTP status, then let's remove from the queue.
-                            dropFromQueue = true;
-                        } else if (errorObject.code === 4) { // ABORTED_ERR.
-                            // The transfer was aborted, we will keep the file in queue.
-                        } else if (errorObject.code === 5) { // NOT_MODIFIED_ERR.
-                            // We have the latest version of the file, HTTP 304 status.
-                            dropFromQueue = true;
-                        } else {
-                            // Unknown error, let's remove the file from the queue to avoid
-                            // locking down the queue because of one file.
-                            dropFromQueue = true;
-                        }
+                // Wait for the item to be removed from queue before resolving the promise.
+                // If the item could not be removed from queue we still resolve the promise.
+                return promise.catch(function() {});
+
+            }, function(errorObject) {
+                // Whoops, we have an error...
+                var dropFromQueue = false;
+
+                if (typeof errorObject !== 'undefined' && errorObject.source === fileUrl) {
+                    // This is most likely a $cordovaFileTransfer error.
+
+                    if (errorObject.code === 1) { // FILE_NOT_FOUND_ERR.
+                        // The file was not found, most likely a 404, we remove from queue.
+                        dropFromQueue = true;
+
+                    } else if (errorObject.code === 2) { // INVALID_URL_ERR.
+                        // The URL is invalid, we drop the file from the queue.
+                        dropFromQueue = true;
+
+                    } else if (errorObject.code === 3) { // CONNECTION_ERR.
+                        // If there was an HTTP status, then let's remove from the queue.
+                        dropFromQueue = true;
+                    } else if (errorObject.code === 4) { // ABORTED_ERR.
+                        // The transfer was aborted, we will keep the file in queue.
+                    } else if (errorObject.code === 5) { // NOT_MODIFIED_ERR.
+                        // We have the latest version of the file, HTTP 304 status.
+                        dropFromQueue = true;
                     } else {
+                        // Unknown error, let's remove the file from the queue to avoid
+                        // locking down the queue because of one file.
                         dropFromQueue = true;
                     }
+                } else {
+                    dropFromQueue = true;
+                }
 
-                    if (dropFromQueue) {
-                        var promise;
+                if (dropFromQueue) {
+                    var promise;
 
-                        $log.debug('Item dropped from queue due to error: ' + fileUrl);
-                        promise = self._removeFromQueue(siteId, fileId);
+                    $log.debug('Item dropped from queue due to error: ' + fileUrl);
+                    promise = self._removeFromQueue(siteId, fileId);
 
-                        // Consider this as a silent error, never reject the promise here.
-                        return promise.catch(function() {}).finally(function() {
-                            self._treatQueueDeferred(siteId, fileId, false);
-                            self._notifyFileDownloadError(siteId, fileId);
-                        });
-                    } else {
-                        // We considered the file as legit but did not get it, failure.
+                    // Consider this as a silent error, never reject the promise here.
+                    return promise.catch(function() {}).finally(function() {
                         self._treatQueueDeferred(siteId, fileId, false);
                         self._notifyFileDownloadError(siteId, fileId);
-                        return $q.reject();
-                    }
+                    });
+                } else {
+                    // We considered the file as legit but did not get it, failure.
+                    self._treatQueueDeferred(siteId, fileId, false);
+                    self._notifyFileDownloadError(siteId, fileId);
+                    return $q.reject();
+                }
 
-                }, function(progress) {
-                    // Send the progress object to the queue deferred.
-                    if (queueDeferreds[siteId] && queueDeferreds[siteId][fileId]) {
-                        queueDeferreds[siteId][fileId].notify(progress);
-                    }
-                });
+            }, function(progress) {
+                // Send the progress object to the queue deferred.
+                if (queueDeferreds[siteId] && queueDeferreds[siteId][fileId]) {
+                    queueDeferreds[siteId][fileId].notify(progress);
+                }
             });
         }
 
@@ -2589,10 +2575,7 @@ angular.module('mm.core')
         return self._fixPluginfileURL(siteId, fileUrl).then(function(fileUrl) {
             var fileId = self._getFileIdByUrl(fileUrl);
 
-            // Restore old file if needed.
-            return self._restoreOldFileIfNeeded(siteId, fileId, fileUrl).then(function() {
-                return self._removeFileById(siteId, fileId);
-            });
+            return self._removeFileById(siteId, fileId);
         });
     };
 
@@ -2745,7 +2728,8 @@ angular.module('mm.core')
      * @param  {String} fileUrl    File URL.
      * @param  {String} [filePath] Filepath to download the file to (for packages).
      * @return {Promise}           Promise resolved when done. It's never rejected.
-     * @protected
+     * @deprecated since 3.3. A year has passed since the file ID changed, so this function isn't used anymore since it slows down
+     *                        the app.
      */
     self._restoreOldFileIfNeeded = function(siteId, fileId, fileUrl, filePath) {
         var fileObject,

From 35e9db02d37e7915c2b9565c7626ee21b92f14ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 19 May 2017 12:45:32 +0200
Subject: [PATCH 180/218] MOBILE-2103 feedback: Fix average calculation

---
 www/addons/mod/feedback/controllers/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/feedback/controllers/index.js b/www/addons/mod/feedback/controllers/index.js
index b363eeff375..06a6280f880 100644
--- a/www/addons/mod/feedback/controllers/index.js
+++ b/www/addons/mod/feedback/controllers/index.js
@@ -224,8 +224,8 @@ angular.module('mm.addons.mod_feedback')
         switch (item.typ) {
             case 'numeric':
                 item.average = item.data.reduce(function (prev, current) {
-                    return prev + current;
-                }) / item.data.length;
+                    return prev + parseInt(current, 10);
+                }, 0) / item.data.length;
                 item.template = 'numeric';
                 break;
 
@@ -270,7 +270,7 @@ angular.module('mm.addons.mod_feedback')
 
                 if (item.typ == 'multichoicerated') {
                     item.average = item.data.reduce(function (prev, current) {
-                        return prev + current.avg;
+                        return prev + parseFloat(current.avg);
                     }, 0.0);
                 }
 

From 0f6674eb2044d645f101c03d37bccd682fde08c9 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 19 May 2017 13:02:58 +0200
Subject: [PATCH 181/218] MOBILE-2103 release: Auto translated strings

---
 www/addons/badges/lang/el.json               |   3 +
 www/addons/badges/lang/lt.json               |  12 +++
 www/addons/competency/lang/ar.json           |   1 -
 www/addons/competency/lang/ca.json           |   1 -
 www/addons/competency/lang/cs.json           |   1 -
 www/addons/competency/lang/da.json           |   1 -
 www/addons/competency/lang/de.json           |   1 -
 www/addons/competency/lang/el.json           |   9 +-
 www/addons/competency/lang/es-mx.json        |   1 -
 www/addons/competency/lang/es.json           |   1 -
 www/addons/competency/lang/eu.json           |   3 +-
 www/addons/competency/lang/fa.json           |   6 +-
 www/addons/competency/lang/fr.json           |   1 -
 www/addons/competency/lang/it.json           |   1 -
 www/addons/competency/lang/lt.json           |  18 +++-
 www/addons/competency/lang/nl.json           |   1 -
 www/addons/competency/lang/pt-br.json        |   1 -
 www/addons/competency/lang/pt.json           |   1 -
 www/addons/competency/lang/tr.json           |  20 +++-
 www/addons/competency/lang/zh-tw.json        |   1 -
 www/addons/coursecompletion/lang/el.json     |   1 +
 www/addons/files/lang/ar.json                |  22 +---
 www/addons/files/lang/bg.json                |   4 -
 www/addons/files/lang/ca.json                |  26 +----
 www/addons/files/lang/cs.json                |  28 +----
 www/addons/files/lang/da.json                |  23 +---
 www/addons/files/lang/de.json                |  26 +----
 www/addons/files/lang/el.json                |  30 +-----
 www/addons/files/lang/es-mx.json             |  26 +----
 www/addons/files/lang/es.json                |  26 +----
 www/addons/files/lang/eu.json                |  26 +----
 www/addons/files/lang/fr.json                |  26 +----
 www/addons/files/lang/he.json                |   4 -
 www/addons/files/lang/it.json                |  28 +----
 www/addons/files/lang/ja.json                |   2 -
 www/addons/files/lang/lt.json                |  29 +----
 www/addons/files/lang/nl.json                |  26 +----
 www/addons/files/lang/pt-br.json             |  26 +----
 www/addons/files/lang/pt.json                |  26 +----
 www/addons/files/lang/ro.json                |   4 -
 www/addons/files/lang/ru.json                |  26 +----
 www/addons/files/lang/sv.json                |   4 -
 www/addons/files/lang/tr.json                |   9 +-
 www/addons/files/lang/zh-tw.json             |  26 +----
 www/addons/frontpage/lang/ar.json            |   1 -
 www/addons/frontpage/lang/bg.json            |   1 -
 www/addons/frontpage/lang/ca.json            |   1 -
 www/addons/frontpage/lang/cs.json            |   1 -
 www/addons/frontpage/lang/da.json            |   1 -
 www/addons/frontpage/lang/de.json            |   1 -
 www/addons/frontpage/lang/el.json            |   4 +-
 www/addons/frontpage/lang/es-mx.json         |   1 -
 www/addons/frontpage/lang/es.json            |   1 -
 www/addons/frontpage/lang/eu.json            |   1 -
 www/addons/frontpage/lang/fr.json            |   1 -
 www/addons/frontpage/lang/he.json            |   1 -
 www/addons/frontpage/lang/it.json            |   1 -
 www/addons/frontpage/lang/ja.json            |   1 -
 www/addons/frontpage/lang/lt.json            |   3 +-
 www/addons/frontpage/lang/nl.json            |   1 -
 www/addons/frontpage/lang/pt-br.json         |   1 -
 www/addons/frontpage/lang/pt.json            |   1 -
 www/addons/frontpage/lang/ro.json            |   1 -
 www/addons/frontpage/lang/ru.json            |   1 -
 www/addons/frontpage/lang/sv.json            |   1 -
 www/addons/frontpage/lang/zh-tw.json         |   1 -
 www/addons/grades/lang/bg.json               |   1 -
 www/addons/grades/lang/ca.json               |   1 -
 www/addons/grades/lang/cs.json               |   1 -
 www/addons/grades/lang/da.json               |   1 -
 www/addons/grades/lang/de.json               |   1 -
 www/addons/grades/lang/el.json               |   3 +-
 www/addons/grades/lang/es-mx.json            |   1 -
 www/addons/grades/lang/es.json               |   1 -
 www/addons/grades/lang/eu.json               |   1 -
 www/addons/grades/lang/fr.json               |   1 -
 www/addons/grades/lang/he.json               |   1 -
 www/addons/grades/lang/it.json               |   1 -
 www/addons/grades/lang/ja.json               |   1 -
 www/addons/grades/lang/lt.json               |   3 +-
 www/addons/grades/lang/nl.json               |   1 -
 www/addons/grades/lang/pt-br.json            |   1 -
 www/addons/grades/lang/pt.json               |   1 -
 www/addons/grades/lang/ro.json               |   1 -
 www/addons/grades/lang/ru.json               |   1 -
 www/addons/grades/lang/tr.json               |   1 -
 www/addons/grades/lang/zh-tw.json            |   1 -
 www/addons/messages/lang/de.json             |   1 -
 www/addons/messages/lang/el.json             |  11 ++
 www/addons/messages/lang/he.json             |   1 +
 www/addons/messages/lang/lt.json             |  11 ++
 www/addons/messages/lang/pt-br.json          |   1 -
 www/addons/messages/lang/pt.json             |   1 -
 www/addons/messages/lang/ro.json             |   1 -
 www/addons/messages/lang/tr.json             |   2 +
 www/addons/mod/assign/lang/ar.json           |  48 ++++++++-
 www/addons/mod/assign/lang/bg.json           |  80 +++++++++++++-
 www/addons/mod/assign/lang/ca.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/cs.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/da.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/de.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/el.json           |  54 ++++++++++
 www/addons/mod/assign/lang/es-mx.json        |  83 ++++++++++++++-
 www/addons/mod/assign/lang/es.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/eu.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/fa.json           |   2 +-
 www/addons/mod/assign/lang/fr.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/he.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/it.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/ja.json           |   6 +-
 www/addons/mod/assign/lang/lt.json           |  80 ++++++++++++++
 www/addons/mod/assign/lang/nl.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/pl.json           |   8 +-
 www/addons/mod/assign/lang/pt-br.json        |  83 ++++++++++++++-
 www/addons/mod/assign/lang/pt.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/ro.json           |  64 ++++++++++-
 www/addons/mod/assign/lang/ru.json           |  83 ++++++++++++++-
 www/addons/mod/assign/lang/sv.json           |  82 ++++++++++++++-
 www/addons/mod/assign/lang/tr.json           |  17 ++-
 www/addons/mod/assign/lang/zh-tw.json        |  83 ++++++++++++++-
 www/addons/mod/chat/lang/el.json             |  12 ++-
 www/addons/mod/chat/lang/lt.json             |  13 ++-
 www/addons/mod/chat/lang/ru.json             |   2 +-
 www/addons/mod/choice/lang/ar.json           |   2 +-
 www/addons/mod/choice/lang/ca.json           |   4 +-
 www/addons/mod/choice/lang/cs.json           |   4 +-
 www/addons/mod/choice/lang/da.json           |   4 +-
 www/addons/mod/choice/lang/de.json           |   4 +-
 www/addons/mod/choice/lang/el.json           |  15 ++-
 www/addons/mod/choice/lang/es-mx.json        |   4 +-
 www/addons/mod/choice/lang/es.json           |   4 +-
 www/addons/mod/choice/lang/eu.json           |   6 +-
 www/addons/mod/choice/lang/fr.json           |   4 +-
 www/addons/mod/choice/lang/it.json           |   4 +-
 www/addons/mod/choice/lang/ja.json           |   2 +-
 www/addons/mod/choice/lang/lt.json           |  19 +++-
 www/addons/mod/choice/lang/nl.json           |   4 +-
 www/addons/mod/choice/lang/pt-br.json        |   4 +-
 www/addons/mod/choice/lang/pt.json           |   4 +-
 www/addons/mod/choice/lang/ro.json           |   4 +-
 www/addons/mod/choice/lang/sv.json           |   4 +-
 www/addons/mod/choice/lang/zh-tw.json        |   4 +-
 www/addons/mod/feedback/lang/ar.json         |  28 +++++
 www/addons/mod/feedback/lang/bg.json         |  32 ++++++
 www/addons/mod/feedback/lang/ca.json         |  33 ++++++
 www/addons/mod/feedback/lang/cs.json         |  33 ++++++
 www/addons/mod/feedback/lang/da.json         |  32 ++++++
 www/addons/mod/feedback/lang/de.json         |  33 ++++++
 www/addons/mod/feedback/lang/el.json         |  29 +++++
 www/addons/mod/feedback/lang/es-mx.json      |  33 ++++++
 www/addons/mod/feedback/lang/es.json         |  33 ++++++
 www/addons/mod/feedback/lang/eu.json         |  33 ++++++
 www/addons/mod/feedback/lang/fa.json         |  32 ++++++
 www/addons/mod/feedback/lang/fr.json         |  33 ++++++
 www/addons/mod/feedback/lang/he.json         |  32 ++++++
 www/addons/mod/feedback/lang/hu.json         |  33 ++++++
 www/addons/mod/feedback/lang/it.json         |  33 ++++++
 www/addons/mod/feedback/lang/ja.json         |  33 ++++++
 www/addons/mod/feedback/lang/lt.json         |  33 ++++++
 www/addons/mod/feedback/lang/nl.json         |  33 ++++++
 www/addons/mod/feedback/lang/pl.json         |  33 ++++++
 www/addons/mod/feedback/lang/pt-br.json      |  32 ++++++
 www/addons/mod/feedback/lang/pt.json         |  33 ++++++
 www/addons/mod/feedback/lang/ro.json         |  25 +++++
 www/addons/mod/feedback/lang/ru.json         |  33 ++++++
 www/addons/mod/feedback/lang/sv.json         |  32 ++++++
 www/addons/mod/feedback/lang/tr.json         |  33 ++++++
 www/addons/mod/feedback/lang/zh-cn.json      |  32 ++++++
 www/addons/mod/feedback/lang/zh-tw.json      |  33 ++++++
 www/addons/mod/forum/lang/bg.json            |   1 +
 www/addons/mod/forum/lang/ca.json            |   3 +-
 www/addons/mod/forum/lang/cs.json            |   3 +-
 www/addons/mod/forum/lang/da.json            |   5 +-
 www/addons/mod/forum/lang/de.json            |   5 +-
 www/addons/mod/forum/lang/el.json            |  21 +++-
 www/addons/mod/forum/lang/es-mx.json         |   5 +-
 www/addons/mod/forum/lang/es.json            |   4 +-
 www/addons/mod/forum/lang/eu.json            |   3 +-
 www/addons/mod/forum/lang/fa.json            |   1 +
 www/addons/mod/forum/lang/fr.json            |   5 +-
 www/addons/mod/forum/lang/he.json            |   3 +-
 www/addons/mod/forum/lang/hu.json            |   1 +
 www/addons/mod/forum/lang/it.json            |   3 +-
 www/addons/mod/forum/lang/ja.json            |   3 +-
 www/addons/mod/forum/lang/lt.json            |  25 ++++-
 www/addons/mod/forum/lang/nl.json            |   5 +-
 www/addons/mod/forum/lang/pl.json            |   1 +
 www/addons/mod/forum/lang/pt-br.json         |   6 +-
 www/addons/mod/forum/lang/pt.json            |   5 +-
 www/addons/mod/forum/lang/ro.json            |   2 +-
 www/addons/mod/forum/lang/ru.json            |   3 +-
 www/addons/mod/forum/lang/sv.json            |   2 +-
 www/addons/mod/forum/lang/tr.json            |   1 +
 www/addons/mod/forum/lang/zh-tw.json         |   5 +-
 www/addons/mod/glossary/lang/el.json         |   3 +
 www/addons/mod/glossary/lang/lt.json         |   3 +
 www/addons/mod/label/lang/ca.json            |   3 +-
 www/addons/mod/label/lang/cs.json            |   3 +-
 www/addons/mod/label/lang/da.json            |   3 +-
 www/addons/mod/label/lang/de.json            |   3 +-
 www/addons/mod/label/lang/el.json            |   3 +-
 www/addons/mod/label/lang/es-mx.json         |   3 +-
 www/addons/mod/label/lang/es.json            |   3 +-
 www/addons/mod/label/lang/eu.json            |   3 +-
 www/addons/mod/label/lang/fr.json            |   3 +-
 www/addons/mod/label/lang/he.json            |   3 +-
 www/addons/mod/label/lang/it.json            |   3 +-
 www/addons/mod/label/lang/lt.json            |   3 +-
 www/addons/mod/label/lang/nl.json            |   3 +-
 www/addons/mod/label/lang/pt-br.json         |   3 +-
 www/addons/mod/label/lang/pt.json            |   3 +-
 www/addons/mod/label/lang/ro.json            |   3 +-
 www/addons/mod/label/lang/ru.json            |   3 +-
 www/addons/mod/label/lang/sv.json            |   3 +-
 www/addons/mod/label/lang/zh-tw.json         |   3 +-
 www/addons/mod/lesson/lang/ar.json           |  47 +++++++++
 www/addons/mod/lesson/lang/bg.json           |  71 +++++++++++++
 www/addons/mod/lesson/lang/ca.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/cs.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/da.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/de.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/el.json           |  71 +++++++++++++
 www/addons/mod/lesson/lang/es-mx.json        |  77 ++++++++++++++
 www/addons/mod/lesson/lang/es.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/eu.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/fa.json           |  72 +++++++++++++
 www/addons/mod/lesson/lang/fr.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/he.json           |  76 ++++++++++++++
 www/addons/mod/lesson/lang/hu.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/it.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/ja.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/lt.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/nl.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/pl.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/pt-br.json        |  77 ++++++++++++++
 www/addons/mod/lesson/lang/pt.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/ro.json           |  60 +++++++++++
 www/addons/mod/lesson/lang/ru.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/sv.json           |  74 +++++++++++++
 www/addons/mod/lesson/lang/tr.json           |  77 ++++++++++++++
 www/addons/mod/lesson/lang/zh-cn.json        |  75 +++++++++++++
 www/addons/mod/lesson/lang/zh-tw.json        |  77 ++++++++++++++
 www/addons/mod/quiz/lang/ar.json             |   1 +
 www/addons/mod/quiz/lang/el.json             |  52 ++++++++-
 www/addons/mod/quiz/lang/eu.json             |   2 +-
 www/addons/mod/quiz/lang/he.json             |   2 +-
 www/addons/mod/quiz/lang/lt.json             |  59 ++++++++++-
 www/addons/mod/quiz/lang/pt-br.json          |   2 +
 www/addons/mod/scorm/lang/ca.json            |   1 -
 www/addons/mod/scorm/lang/cs.json            |   1 -
 www/addons/mod/scorm/lang/da.json            |   1 -
 www/addons/mod/scorm/lang/de.json            |   1 -
 www/addons/mod/scorm/lang/el.json            |  34 +++++-
 www/addons/mod/scorm/lang/es-mx.json         |   1 -
 www/addons/mod/scorm/lang/es.json            |   1 -
 www/addons/mod/scorm/lang/eu.json            |   1 -
 www/addons/mod/scorm/lang/fr.json            |   1 -
 www/addons/mod/scorm/lang/it.json            |   1 -
 www/addons/mod/scorm/lang/lt.json            |  34 +++++-
 www/addons/mod/scorm/lang/nl.json            |   1 -
 www/addons/mod/scorm/lang/pt-br.json         |   1 -
 www/addons/mod/scorm/lang/pt.json            |   1 -
 www/addons/mod/scorm/lang/ro.json            |   1 -
 www/addons/mod/scorm/lang/ru.json            |   2 +-
 www/addons/mod/scorm/lang/sv.json            |   1 -
 www/addons/mod/scorm/lang/tr.json            |   1 -
 www/addons/mod/scorm/lang/zh-tw.json         |   1 -
 www/addons/mod/survey/lang/el.json           |   6 +-
 www/addons/mod/survey/lang/es.json           |   3 +-
 www/addons/mod/survey/lang/lt.json           |   6 +-
 www/addons/mod/wiki/lang/el.json             |   1 +
 www/addons/mod/wiki/lang/lt.json             |  13 ++-
 www/addons/mod/wiki/lang/pl.json             |   2 +-
 www/addons/myoverview/lang/ar.json           |   5 +
 www/addons/myoverview/lang/bg.json           |   5 +
 www/addons/myoverview/lang/ca.json           |   5 +
 www/addons/myoverview/lang/cs.json           |   5 +
 www/addons/myoverview/lang/da.json           |   5 +
 www/addons/myoverview/lang/de.json           |   5 +
 www/addons/myoverview/lang/el.json           |   5 +
 www/addons/myoverview/lang/es-mx.json        |   5 +
 www/addons/myoverview/lang/es.json           |   5 +
 www/addons/myoverview/lang/eu.json           |   5 +
 www/addons/myoverview/lang/fa.json           |   5 +
 www/addons/myoverview/lang/fr.json           |   5 +
 www/addons/myoverview/lang/he.json           |   5 +
 www/addons/myoverview/lang/hu.json           |   5 +
 www/addons/myoverview/lang/it.json           |   5 +
 www/addons/myoverview/lang/ja.json           |   5 +
 www/addons/myoverview/lang/lt.json           |   5 +
 www/addons/myoverview/lang/nl.json           |   5 +
 www/addons/myoverview/lang/pl.json           |   5 +
 www/addons/myoverview/lang/pt-br.json        |   5 +
 www/addons/myoverview/lang/pt.json           |   5 +
 www/addons/myoverview/lang/ro.json           |   5 +
 www/addons/myoverview/lang/ru.json           |   5 +
 www/addons/myoverview/lang/sv.json           |   5 +
 www/addons/myoverview/lang/tr.json           |   5 +
 www/addons/myoverview/lang/zh-cn.json        |   5 +
 www/addons/myoverview/lang/zh-tw.json        |   5 +
 www/addons/notifications/lang/he.json        |   1 +
 www/addons/notifications/lang/tr.json        |   1 +
 www/core/components/course/lang/ar.json      |   1 +
 www/core/components/course/lang/bg.json      |   5 +-
 www/core/components/course/lang/ca.json      |   8 +-
 www/core/components/course/lang/cs.json      |   8 +-
 www/core/components/course/lang/da.json      |   8 +-
 www/core/components/course/lang/de.json      |   8 +-
 www/core/components/course/lang/el.json      |   9 +-
 www/core/components/course/lang/es-mx.json   |   8 +-
 www/core/components/course/lang/es.json      |   8 +-
 www/core/components/course/lang/eu.json      |   8 +-
 www/core/components/course/lang/fa.json      |   1 +
 www/core/components/course/lang/fr.json      |   8 +-
 www/core/components/course/lang/he.json      |   7 +-
 www/core/components/course/lang/hu.json      |   1 +
 www/core/components/course/lang/it.json      |   8 +-
 www/core/components/course/lang/ja.json      |   1 +
 www/core/components/course/lang/lt.json      |   9 +-
 www/core/components/course/lang/nl.json      |   8 +-
 www/core/components/course/lang/pl.json      |   1 +
 www/core/components/course/lang/pt-br.json   |   8 +-
 www/core/components/course/lang/pt.json      |   8 +-
 www/core/components/course/lang/ro.json      |   8 +-
 www/core/components/course/lang/ru.json      |   7 +-
 www/core/components/course/lang/sv.json      |   8 +-
 www/core/components/course/lang/tr.json      |   1 +
 www/core/components/course/lang/zh-cn.json   |   1 +
 www/core/components/course/lang/zh-tw.json   |   8 +-
 www/core/components/courses/lang/cs.json     |   1 -
 www/core/components/courses/lang/el.json     |   6 +-
 www/core/components/courses/lang/it.json     |   1 -
 www/core/components/courses/lang/lt.json     |   8 ++
 www/core/components/courses/lang/sv.json     |   1 -
 www/core/components/grades/lang/el.json      |  15 +++
 www/core/components/grades/lang/fa.json      |   5 +-
 www/core/components/grades/lang/lt.json      |  15 +++
 www/core/components/login/lang/ar.json       |   1 +
 www/core/components/login/lang/bg.json       |   2 +
 www/core/components/login/lang/ca.json       |   3 +-
 www/core/components/login/lang/cs.json       |   3 +-
 www/core/components/login/lang/da.json       |   3 +-
 www/core/components/login/lang/de.json       |   3 +-
 www/core/components/login/lang/el.json       |  32 +++++-
 www/core/components/login/lang/es-mx.json    |   3 +-
 www/core/components/login/lang/es.json       |   3 +-
 www/core/components/login/lang/eu.json       |   3 +-
 www/core/components/login/lang/fa.json       |   2 +
 www/core/components/login/lang/fr.json       |   3 +-
 www/core/components/login/lang/he.json       |   2 +-
 www/core/components/login/lang/hu.json       |   1 +
 www/core/components/login/lang/it.json       |   3 +-
 www/core/components/login/lang/ja.json       |   1 +
 www/core/components/login/lang/lt.json       |  30 +++++-
 www/core/components/login/lang/nl.json       |   3 +-
 www/core/components/login/lang/pl.json       |   1 +
 www/core/components/login/lang/pt-br.json    |   3 +-
 www/core/components/login/lang/pt.json       |   3 +-
 www/core/components/login/lang/ro.json       |   3 +-
 www/core/components/login/lang/ru.json       |   3 +-
 www/core/components/login/lang/sv.json       |   3 +-
 www/core/components/login/lang/tr.json       |   1 +
 www/core/components/login/lang/zh-cn.json    |   1 +
 www/core/components/login/lang/zh-tw.json    |   3 +-
 www/core/components/question/lang/el.json    |  14 +++
 www/core/components/question/lang/lt.json    |  13 +++
 www/core/components/settings/lang/ar.json    |   3 -
 www/core/components/settings/lang/bg.json    |   3 -
 www/core/components/settings/lang/ca.json    |   3 -
 www/core/components/settings/lang/cs.json    |   3 -
 www/core/components/settings/lang/da.json    |   3 -
 www/core/components/settings/lang/de.json    |   3 -
 www/core/components/settings/lang/el.json    |  13 +++
 www/core/components/settings/lang/es-mx.json |   3 -
 www/core/components/settings/lang/es.json    |   3 -
 www/core/components/settings/lang/eu.json    |   4 +-
 www/core/components/settings/lang/fr.json    |   3 -
 www/core/components/settings/lang/he.json    |   2 -
 www/core/components/settings/lang/it.json    |   3 -
 www/core/components/settings/lang/ja.json    |   1 -
 www/core/components/settings/lang/lt.json    |  15 ++-
 www/core/components/settings/lang/nl.json    |   3 -
 www/core/components/settings/lang/pt-br.json |   3 -
 www/core/components/settings/lang/pt.json    |   3 -
 www/core/components/settings/lang/ro.json    |   3 -
 www/core/components/settings/lang/ru.json    |   3 -
 www/core/components/settings/lang/sv.json    |   3 -
 www/core/components/settings/lang/tr.json    |   4 +-
 www/core/components/settings/lang/zh-tw.json |   3 -
 www/core/components/sharedfiles/lang/el.json |   4 +
 www/core/components/sidemenu/lang/el.json    |   5 +
 www/core/components/user/lang/el.json        |  20 ++++
 www/core/components/user/lang/lt.json        |  16 ++-
 www/core/lang/ar.json                        |  21 +++-
 www/core/lang/bg.json                        |  19 +++-
 www/core/lang/ca.json                        |  14 ++-
 www/core/lang/cs.json                        |  11 +-
 www/core/lang/da.json                        |  10 +-
 www/core/lang/de.json                        |  10 +-
 www/core/lang/el.json                        | 103 ++++++++++++++++--
 www/core/lang/es-mx.json                     |  14 ++-
 www/core/lang/es.json                        |  17 ++-
 www/core/lang/eu.json                        |  14 ++-
 www/core/lang/fa.json                        |  23 ++++
 www/core/lang/fr.json                        |  10 +-
 www/core/lang/he.json                        |  19 +++-
 www/core/lang/hu.json                        |  21 ++++
 www/core/lang/it.json                        |   9 +-
 www/core/lang/ja.json                        |  21 ++++
 www/core/lang/lt.json                        | 105 +++++++++++++++++--
 www/core/lang/nl.json                        |  11 +-
 www/core/lang/pl.json                        |  21 ++++
 www/core/lang/pt-br.json                     |  21 ++--
 www/core/lang/pt.json                        |  12 ++-
 www/core/lang/ro.json                        |  15 ++-
 www/core/lang/ru.json                        |  12 ++-
 www/core/lang/sv.json                        |  17 ++-
 www/core/lang/tr.json                        |  16 ++-
 www/core/lang/zh-cn.json                     |  21 ++++
 www/core/lang/zh-tw.json                     |  29 +++--
 420 files changed, 5988 insertions(+), 1012 deletions(-)
 create mode 100644 www/addons/badges/lang/el.json
 create mode 100644 www/addons/badges/lang/lt.json
 create mode 100644 www/addons/mod/feedback/lang/ar.json
 create mode 100644 www/addons/mod/feedback/lang/bg.json
 create mode 100644 www/addons/mod/feedback/lang/ca.json
 create mode 100644 www/addons/mod/feedback/lang/cs.json
 create mode 100644 www/addons/mod/feedback/lang/da.json
 create mode 100644 www/addons/mod/feedback/lang/de.json
 create mode 100644 www/addons/mod/feedback/lang/el.json
 create mode 100644 www/addons/mod/feedback/lang/es-mx.json
 create mode 100644 www/addons/mod/feedback/lang/es.json
 create mode 100644 www/addons/mod/feedback/lang/eu.json
 create mode 100644 www/addons/mod/feedback/lang/fa.json
 create mode 100644 www/addons/mod/feedback/lang/fr.json
 create mode 100644 www/addons/mod/feedback/lang/he.json
 create mode 100644 www/addons/mod/feedback/lang/hu.json
 create mode 100644 www/addons/mod/feedback/lang/it.json
 create mode 100644 www/addons/mod/feedback/lang/ja.json
 create mode 100644 www/addons/mod/feedback/lang/lt.json
 create mode 100644 www/addons/mod/feedback/lang/nl.json
 create mode 100644 www/addons/mod/feedback/lang/pl.json
 create mode 100644 www/addons/mod/feedback/lang/pt-br.json
 create mode 100644 www/addons/mod/feedback/lang/pt.json
 create mode 100644 www/addons/mod/feedback/lang/ro.json
 create mode 100644 www/addons/mod/feedback/lang/ru.json
 create mode 100644 www/addons/mod/feedback/lang/sv.json
 create mode 100644 www/addons/mod/feedback/lang/tr.json
 create mode 100644 www/addons/mod/feedback/lang/zh-cn.json
 create mode 100644 www/addons/mod/feedback/lang/zh-tw.json
 create mode 100644 www/addons/mod/lesson/lang/ar.json
 create mode 100644 www/addons/mod/lesson/lang/bg.json
 create mode 100644 www/addons/mod/lesson/lang/ca.json
 create mode 100644 www/addons/mod/lesson/lang/cs.json
 create mode 100644 www/addons/mod/lesson/lang/da.json
 create mode 100644 www/addons/mod/lesson/lang/de.json
 create mode 100644 www/addons/mod/lesson/lang/el.json
 create mode 100644 www/addons/mod/lesson/lang/es-mx.json
 create mode 100644 www/addons/mod/lesson/lang/es.json
 create mode 100644 www/addons/mod/lesson/lang/eu.json
 create mode 100644 www/addons/mod/lesson/lang/fa.json
 create mode 100644 www/addons/mod/lesson/lang/fr.json
 create mode 100644 www/addons/mod/lesson/lang/he.json
 create mode 100644 www/addons/mod/lesson/lang/hu.json
 create mode 100644 www/addons/mod/lesson/lang/it.json
 create mode 100644 www/addons/mod/lesson/lang/ja.json
 create mode 100644 www/addons/mod/lesson/lang/lt.json
 create mode 100644 www/addons/mod/lesson/lang/nl.json
 create mode 100644 www/addons/mod/lesson/lang/pl.json
 create mode 100644 www/addons/mod/lesson/lang/pt-br.json
 create mode 100644 www/addons/mod/lesson/lang/pt.json
 create mode 100644 www/addons/mod/lesson/lang/ro.json
 create mode 100644 www/addons/mod/lesson/lang/ru.json
 create mode 100644 www/addons/mod/lesson/lang/sv.json
 create mode 100644 www/addons/mod/lesson/lang/tr.json
 create mode 100644 www/addons/mod/lesson/lang/zh-cn.json
 create mode 100644 www/addons/mod/lesson/lang/zh-tw.json
 create mode 100644 www/addons/myoverview/lang/ar.json
 create mode 100644 www/addons/myoverview/lang/bg.json
 create mode 100644 www/addons/myoverview/lang/ca.json
 create mode 100644 www/addons/myoverview/lang/cs.json
 create mode 100644 www/addons/myoverview/lang/da.json
 create mode 100644 www/addons/myoverview/lang/de.json
 create mode 100644 www/addons/myoverview/lang/el.json
 create mode 100644 www/addons/myoverview/lang/es-mx.json
 create mode 100644 www/addons/myoverview/lang/es.json
 create mode 100644 www/addons/myoverview/lang/eu.json
 create mode 100644 www/addons/myoverview/lang/fa.json
 create mode 100644 www/addons/myoverview/lang/fr.json
 create mode 100644 www/addons/myoverview/lang/he.json
 create mode 100644 www/addons/myoverview/lang/hu.json
 create mode 100644 www/addons/myoverview/lang/it.json
 create mode 100644 www/addons/myoverview/lang/ja.json
 create mode 100644 www/addons/myoverview/lang/lt.json
 create mode 100644 www/addons/myoverview/lang/nl.json
 create mode 100644 www/addons/myoverview/lang/pl.json
 create mode 100644 www/addons/myoverview/lang/pt-br.json
 create mode 100644 www/addons/myoverview/lang/pt.json
 create mode 100644 www/addons/myoverview/lang/ro.json
 create mode 100644 www/addons/myoverview/lang/ru.json
 create mode 100644 www/addons/myoverview/lang/sv.json
 create mode 100644 www/addons/myoverview/lang/tr.json
 create mode 100644 www/addons/myoverview/lang/zh-cn.json
 create mode 100644 www/addons/myoverview/lang/zh-tw.json
 create mode 100644 www/core/components/grades/lang/el.json
 create mode 100644 www/core/components/grades/lang/lt.json
 create mode 100644 www/core/components/question/lang/el.json
 create mode 100644 www/core/components/settings/lang/el.json
 create mode 100644 www/core/components/sharedfiles/lang/el.json
 create mode 100644 www/core/components/sidemenu/lang/el.json
 create mode 100644 www/core/components/user/lang/el.json

diff --git a/www/addons/badges/lang/el.json b/www/addons/badges/lang/el.json
new file mode 100644
index 00000000000..8c24bf274f9
--- /dev/null
+++ b/www/addons/badges/lang/el.json
@@ -0,0 +1,3 @@
+{
+    "badges": "Κονκάρδες"
+}
\ No newline at end of file
diff --git a/www/addons/badges/lang/lt.json b/www/addons/badges/lang/lt.json
new file mode 100644
index 00000000000..612308bc8cf
--- /dev/null
+++ b/www/addons/badges/lang/lt.json
@@ -0,0 +1,12 @@
+{
+    "badgedetails": "Pasiekimo detalės",
+    "badges": "Pasiekimai",
+    "contact": "Kontaktas",
+    "dateawarded": "Suteikimo data",
+    "expirydate": "Galiojimo laikas",
+    "issuancedetails": "Pasiekimo galiojimas",
+    "issuerdetails": "Suteikėjo detalesnė informacija",
+    "issuername": "Suteikėjo vardas",
+    "nobadges": "Nėra sukurtų pasiekimų.",
+    "recipientdetails": "Informacija apie gavėją"
+}
\ No newline at end of file
diff --git a/www/addons/competency/lang/ar.json b/www/addons/competency/lang/ar.json
index 90425c007dd..26d04da22a0 100644
--- a/www/addons/competency/lang/ar.json
+++ b/www/addons/competency/lang/ar.json
@@ -2,7 +2,6 @@
     "activities": "أنشطة",
     "duedate": "تاريخ تقديم مهمة",
     "errornocompetenciesfound": "لا يوجد أي قدرات موجودة",
-    "mylearningplans": "خططي للتعلم",
     "myplans": "خططي للتعلم",
     "nocompetencies": "لا يوجد أي قدرات",
     "path": "مسار",
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index 20b5e09e58f..70962efd930 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -8,7 +8,6 @@
     "evidence": "Evidència",
     "learningplancompetencies": "Competències del pla d'aprenentatge",
     "learningplans": "Plans d'aprenentatge",
-    "mylearningplans": "Els meus plans d'aprenentatge",
     "myplans": "Els meus plans d'aprenentatge",
     "noactivities": "Cap activitat",
     "nocompetencies": "Cap competència",
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index 9c3ef7338a3..4bb3a752942 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -10,7 +10,6 @@
     "evidence": "Evidence",
     "learningplancompetencies": "Kompetence studijního plánu",
     "learningplans": "Studijní plány",
-    "mylearningplans": "Můj studijní plán",
     "myplans": "Můj studijní plán",
     "noactivities": "Žádné aktivity",
     "nocompetencies": "Žádné kompetence",
diff --git a/www/addons/competency/lang/da.json b/www/addons/competency/lang/da.json
index 6a8244c24cc..3cb1ed842af 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -9,7 +9,6 @@
     "evidence": "Vidnesbyrd",
     "learningplancompetencies": "Læringsplankompetencer",
     "learningplans": "Læringsplaner",
-    "mylearningplans": "Mine læringsplaner",
     "myplans": "Mine læringsplaner",
     "noactivities": "Ingen aktiviteter",
     "nocompetencies": "Ingen kompetencer",
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index b005d234dec..ffdc80bebc2 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -10,7 +10,6 @@
     "evidence": "Evidenz",
     "learningplancompetencies": "Kompetenzen des Lernplans",
     "learningplans": "Lernpläne",
-    "mylearningplans": "Meine Lernpläne",
     "myplans": "Meine Lernpläne",
     "noactivities": "Keine Aktivitäten",
     "nocompetencies": "Keine Kompetenzen",
diff --git a/www/addons/competency/lang/el.json b/www/addons/competency/lang/el.json
index 75d18979ee3..3a61231a7af 100644
--- a/www/addons/competency/lang/el.json
+++ b/www/addons/competency/lang/el.json
@@ -1,5 +1,10 @@
 {
+    "activities": "Δραστηριότητες",
+    "duedate": "Καταληκτική ημερομηνία",
     "errornocompetenciesfound": "Δεν βρέθηκαν ικανότητες",
-    "mylearningplans": "Το μαθησιακό πλάνο μου",
-    "nocompetencies": "Δεν βρέθηκαν ικανότητες"
+    "nocompetencies": "Δεν βρέθηκαν ικανότητες",
+    "path": "Διαδρομή",
+    "progress": "Πρόοδος μαθητών",
+    "status": "Κατάσταση",
+    "template": "Πρότυπο"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index d924545ee14..276f784e4f3 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -10,7 +10,6 @@
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "Planes de aprendizaje",
-    "mylearningplans": "Mis planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
     "nocompetencies": "Sin competencias",
diff --git a/www/addons/competency/lang/es.json b/www/addons/competency/lang/es.json
index 40406ead3e2..b87c3dda451 100644
--- a/www/addons/competency/lang/es.json
+++ b/www/addons/competency/lang/es.json
@@ -10,7 +10,6 @@
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "Planes de aprendizaje",
-    "mylearningplans": "Mis planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
     "nocompetencies": "Sin competencias",
diff --git a/www/addons/competency/lang/eu.json b/www/addons/competency/lang/eu.json
index 4a69a1f5848..3b4e8511411 100644
--- a/www/addons/competency/lang/eu.json
+++ b/www/addons/competency/lang/eu.json
@@ -1,18 +1,19 @@
 {
     "activities": "Jarduerak",
     "coursecompetencies": "Ikastaroko gaitasunak",
+    "coursecompetencyratingsarepushedtouserplans": "Ikastaro honetan gaitasunen kalifikazioek ikasketa-planak berehala eguneratzen dituzte.",
     "duedate": "Entregatze-data",
     "errornocompetenciesfound": "Ez da gaitasunik aurkitu",
     "evidence": "Ebidentzia",
     "learningplancompetencies": "Ikasketa-planaren gaitasunak",
     "learningplans": "Ikasketa-planak",
-    "mylearningplans": "Nire ikasketa-planak",
     "myplans": "Nire ikasketa-planak",
     "noactivities": "Ez dago jarduerarik",
     "nocompetencies": "Gaitasunik ez",
     "noevidence": "Ez dago ebidentziarik",
     "noplanswerecreated": "Ez da ikasketa-planik sortu.",
     "path": "Bidea",
+    "proficient": "Gai",
     "progress": "Ikaslearen aurrerapena",
     "rating": "Puntuazioa",
     "reviewstatus": "Berrikusi egora",
diff --git a/www/addons/competency/lang/fa.json b/www/addons/competency/lang/fa.json
index 3bf89ed1d6f..958790ed5b6 100644
--- a/www/addons/competency/lang/fa.json
+++ b/www/addons/competency/lang/fa.json
@@ -3,12 +3,15 @@
     "coursecompetencies": "شایستگی‌های درس",
     "coursecompetencyratingsarenotpushedtouserplans": "امتیازهای شایستگی‌ها در این درس تاثیری در برنامه‌های آموزشی ندارند.",
     "coursecompetencyratingsarepushedtouserplans": "امتیازهای شایستگی‌ها در این درس بلافاصله در برنامه‌های آموزشی به‌روز می‌شوند.",
+    "crossreferencedcompetencies": "شایستگی‌های دارای ارجاع متقابل",
     "duedate": "مهلت تحویل",
     "evidence": "مدرک",
     "learningplancompetencies": "شایستگی‌های برنامه آموزشی",
     "learningplans": "برنامه‌های آزموشی",
     "myplans": "برنامه‌های آموزشی من",
+    "nocrossreferencedcompetencies": "هیچ شایستگی دیگری به این شایستگی به‌طور متقابل ارجاع داده نشده است.",
     "noevidence": "بدون مدرک",
+    "noplanswerecreated": "هیچ برنامهٔ یادگیری‌ای ساخته نشده است.",
     "path": "مسیر",
     "proficient": "کسب مهارت",
     "progress": "پیشروی شاگردان",
@@ -16,5 +19,6 @@
     "reviewstatus": "بازبینی وضعیت",
     "status": "وضعیت",
     "template": "الگو",
-    "xcompetenciesproficientoutofy": "در {{$a.x}} شایستگی از مجموع {{$a.y}} شایستگی مهارت کسب شده است"
+    "xcompetenciesproficientoutofy": "در {{$a.x}} شایستگی از مجموع {{$a.y}} شایستگی مهارت کسب شده است",
+    "xcompetenciesproficientoutofyincourse": "شما در {{$a.x}} شایستگی از {{$a.y}} شایستگی ماهر هستید."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index bf16110e08f..54703a62fc1 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -10,7 +10,6 @@
     "evidence": "Preuve",
     "learningplancompetencies": "Compétences du plan de formation",
     "learningplans": "Plans de formation",
-    "mylearningplans": "Mes plans de formation",
     "myplans": "Mes plans de formation",
     "noactivities": "Aucune activité",
     "nocompetencies": "Aucune compétence",
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index 8e2551a9b4f..e34cefd8b4b 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -10,7 +10,6 @@
     "evidence": "Verifica",
     "learningplancompetencies": "Competenze del piano di formazione",
     "learningplans": "Piani di formazione",
-    "mylearningplans": "I miei piani formativi",
     "myplans": "I miei piani formativi",
     "noactivities": "Nessuna attività.",
     "nocompetencies": "Non sono presenti competenze",
diff --git a/www/addons/competency/lang/lt.json b/www/addons/competency/lang/lt.json
index e73999e8244..bfd76f8a42c 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -1,5 +1,19 @@
 {
+    "activities": "Veikla",
+    "coursecompetencies": "Kurso kompetencijos",
+    "coursecompetencyratingsarenotpushedtouserplans": "Kompetencijų reitingai šiame kurse neturi įtakos mokymosi planams.",
+    "duedate": "Data pristatymui",
     "errornocompetenciesfound": "Kompetencijų nerasta",
-    "mylearningplans": "Mano mokymosi planai",
-    "nocompetencies": "Nėra kompetencijų"
+    "evidence": "Įrodymas",
+    "learningplancompetencies": "Mokymosi plano kompetencijos",
+    "learningplans": "Mokymosi planai",
+    "myplans": "Mano mokymosi planai",
+    "noactivities": "Nėra veiklų",
+    "nocompetencies": "Nėra kompetencijų",
+    "noplanswerecreated": "Nebuvo sukurta mokymosi planų.",
+    "path": "Kelias",
+    "progress": "Besimokančiojo pažanga",
+    "rating": "Vertinimas",
+    "status": "Būsena",
+    "template": "Šablonas"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index 896d0dddd81..01e03c53c24 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -10,7 +10,6 @@
     "evidence": "Bewijs",
     "learningplancompetencies": "Studieplan competenties",
     "learningplans": "Studieplannen",
-    "mylearningplans": "Mijn leerplannen",
     "myplans": "Mijn leerplannen",
     "noactivities": "Geen activiteiten",
     "nocompetencies": "Geen competenties",
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index bb9013f1f72..268860975f8 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -10,7 +10,6 @@
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
-    "mylearningplans": "Meus planos de aprendizagem",
     "myplans": "Meus planos de aprendizagem",
     "noactivities": "Sem atividades",
     "nocompetencies": "Nenhuma competência",
diff --git a/www/addons/competency/lang/pt.json b/www/addons/competency/lang/pt.json
index 16d560a1fde..9acc0bd20d8 100644
--- a/www/addons/competency/lang/pt.json
+++ b/www/addons/competency/lang/pt.json
@@ -10,7 +10,6 @@
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
-    "mylearningplans": "Meus planos de aprendizagem",
     "myplans": "Os meus planos de aprendizagem",
     "noactivities": "Nenhuma atividade associada",
     "nocompetencies": "Sem competências",
diff --git a/www/addons/competency/lang/tr.json b/www/addons/competency/lang/tr.json
index 5bf9a9d6d8f..aaf5e15f532 100644
--- a/www/addons/competency/lang/tr.json
+++ b/www/addons/competency/lang/tr.json
@@ -1,11 +1,27 @@
 {
     "activities": "Etkinlikler",
+    "competenciesmostoftennotproficientincourse": "Bu dersi alan  en çok yeterli olmayan yetkinlikler",
+    "coursecompetencies": "Ders yetkinlikleri",
+    "coursecompetencyratingsarenotpushedtouserplans": "Bu dersin yetkinlik dereceleri öğrenme planlarını etkilemez.",
+    "coursecompetencyratingsarepushedtouserplans": "Bu dersin yetkinlik dereceleri öğrenme planlarında anında güncellenir.",
+    "crossreferencedcompetencies": "Çapraz referanslı yetkinlikler",
     "duedate": "Son teslim tarihi",
     "evidence": "Kanıt",
-    "mylearningplans": "Eğitim Planlarım",
+    "learningplancompetencies": "Öğrenme planı yetkinlikleri",
+    "learningplans": "Öğrenme planları",
+    "myplans": "Benim öğrenme planlarım",
+    "noactivities": "Etkinlikler yok",
+    "nocompetencies": "Bu çerçevede hiçbir yetkinlik oluşturulmamıştır.",
+    "nocrossreferencedcompetencies": "Bu yetkinliğe çapraz referanslı başka yetkinlik bulunmamaktadır.",
+    "noevidence": "Öğrenme kanıtı yok",
+    "noplanswerecreated": "Hiçbir öğrenme planı oluşturulmadı.",
     "path": "Yol",
+    "proficient": "Yeterli",
     "progress": "Öğrenci ilerlemesi",
     "rating": "Derecelendirme",
+    "reviewstatus": "İnceleme durumu",
     "status": "Durum",
-    "template": "Şablon"
+    "template": "Şablon",
+    "xcompetenciesproficientoutofy": "{{$a.y}} yetkinliğinden {{$a.x}} dışarıda yeterli",
+    "xcompetenciesproficientoutofyincourse": "Bu derste {{$a.y}} yetkinliğin dışında {{$a.x}} yeterliliğe sahibisiniz."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/zh-tw.json b/www/addons/competency/lang/zh-tw.json
index bbafffe7c4e..fe0b027bb70 100644
--- a/www/addons/competency/lang/zh-tw.json
+++ b/www/addons/competency/lang/zh-tw.json
@@ -10,7 +10,6 @@
     "evidence": "證據",
     "learningplancompetencies": "學習計畫核心能力",
     "learningplans": "學習計畫",
-    "mylearningplans": "我的學習計畫",
     "myplans": "我的學習計畫",
     "noactivities": "沒有活動",
     "nocompetencies": "沒有功能",
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index e021bc57ea6..555b60517bd 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -10,6 +10,7 @@
     "criteriarequiredall": "Όλα τα παρακάτω κριτήρια είναι υποχρεωτικά",
     "criteriarequiredany": "Οποιοδήποτε από τα παρακάτω κριτήρια είναι υποχρεωτικά",
     "inprogress": "Σε εξέλιξη",
+    "manualselfcompletion": "Χειροκίνητη αυτό-ολοκλήρωση",
     "notyetstarted": "Δεν έχει ξεκινήσει ακόμα",
     "pending": "Εκκρεμής",
     "required": "Απαιτείται",
diff --git a/www/addons/files/lang/ar.json b/www/addons/files/lang/ar.json
index 1a2b6a545b5..c9eb7b83d46 100644
--- a/www/addons/files/lang/ar.json
+++ b/www/addons/files/lang/ar.json
@@ -1,28 +1,8 @@
 {
-    "audio": "صوت",
-    "camera": "آلة التصوير",
     "couldnotloadfiles": "لا يمكن تحميل قائمة الملفات",
-    "downloading": "يتم التنزيل",
     "emptyfilelist": "لا يوجد ملفات للعرض",
-    "errorcapturingaudio": "خطأ في إلتقاط الصوت",
-    "errorcapturingimage": "خطأ في إلتقاط الصورة",
-    "errorcapturingvideo": "خطأ في إلتقاط الفيديو",
-    "errorgettingimagealbum": "خطأ في الحصول على الصورة من ألبوم الصور",
-    "errormustbeonlinetoupload": "لابد ان تكون متصل بالأنترنت لكي ترفع الملفات",
-    "errornoapp": "لا يوجود لديك تطبيق مثبت لتنفيذ هذا الإجراء",
-    "errorreadingfile": "خطأ في قراءة الملف",
-    "errorreceivefilenosites": "لا يوجد مواقع مخزنة. من فضلك أضف موقع قبل محاولة رفع ملف",
-    "errorwhileuploading": "حدث خطأ أثناء رفع الملف",
     "files": "ملفاتي الخاصة",
-    "fileuploaded": "تم رفع الملف بنجاح",
-    "myfiles": "ملفاتي",
-    "myprivatefiles": "ملفاتي الخاصة",
-    "photoalbums": "ألبوم صور",
     "privatefiles": "ملفات خاصة",
-    "readingfile": "يتم قراءة الملف",
     "sitefiles": "ملفات الموقع",
-    "success": "تم بنجاح",
-    "uploadfiles": "رفع ملفات",
-    "uploading": "يتم الرفع",
-    "video": "فيديو"
+    "uploadfiles": "رفع ملفات"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/bg.json b/www/addons/files/lang/bg.json
index 8ab069ff1ca..a0e3edebf90 100644
--- a/www/addons/files/lang/bg.json
+++ b/www/addons/files/lang/bg.json
@@ -3,14 +3,10 @@
     "clicktoupload": "Натиснете бутона по-долу за да качите файловете в секция \"Вашите частни файлове\".",
     "couldnotloadfiles": "Списъкът с файлове не можа да бъде зареден.",
     "emptyfilelist": "Няма файлове, които да бъдат показани.",
-    "errorreceivefilenosites": "Няма записани сайтове. Моля добавете сайтове, преди да се опитвате да качите файл.",
     "files": "Моите лични файлове",
-    "myfiles": "Моите файлове",
-    "myprivatefiles": "Моите лични файлове",
     "myprivatefilesdesc": "Файловете, които са налични във Вашата лична област на сайта.",
     "privatefiles": "Лични файлове",
     "sitefiles": "Файлове от сайта",
     "sitefilesdesc": "Други файлоне, които са достъпни за Вас на този Moodle сайт.",
-    "success": "Успех!",
     "uploadfiles": "Качване на файлове"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ca.json b/www/addons/files/lang/ca.json
index 61aed4639aa..7b918b6d4f4 100644
--- a/www/addons/files/lang/ca.json
+++ b/www/addons/files/lang/ca.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Teniu en compte que l'administrador de Moodle ha desactivat la descàrrega d'arxius; podeu visualitzar els arxius, però no descarregar-los.",
-    "audio": "Àudio",
-    "camera": "Càmera",
-    "chooseaccountuploadfile": "Escolliu un compte on pujar el fitxer",
     "clicktoupload": "Feu clic al botó del dessota per pujar arxius a l'àrea del vostres fitxers.",
-    "confirmuploadfile": "Esteu a punt de pujar {{size}}. Voleu continuar?",
     "couldnotloadfiles": "La llista d'arxius no s'ha pogut carregar.",
-    "downloading": "S'està descarregant",
     "emptyfilelist": "No hi ha fitxers per mostrar.",
-    "errorcapturingaudio": "S'ha produït un error en capturar l'àudio.",
-    "errorcapturingimage": "S'ha produït un error en capturar la imatge.",
-    "errorcapturingvideo": "S'ha produït un error en capturar el vídeo.",
-    "errorgettingimagealbum": "S'ha produït un error en recuperar la imatge de l'àlbum.",
-    "errormustbeonlinetoupload": "Heu de tenir connexió a la xarxa per a pujar fitxers.",
-    "errornoapp": "No teniu cap aplicació instal·lada per a realitzar aquesta acció.",
-    "errorreadingfile": "S'ha produït un error en llegir el fitxer.",
-    "errorreceivefilenosites": "No hi ha llocs web emmagatzemats. Afegiu un lloc abans d'intentar pujar un arxiu.",
     "erroruploadnotworking": "No es poden pujar fitxers al vostre lloc ara mateix.",
-    "errorwhiledownloading": "S'ha produït un error durant la descàrrega del fitxer.",
-    "errorwhilerecordingaudio": "S'ha produït un error durant l'enregistrament de l'àudio.",
-    "errorwhileuploading": "S'ha produït un error durant la càrrega del fitxer.",
     "files": "Els meus fitxers privats",
-    "fileuploaded": "S'ha penjat el fitxer amb èxit.",
-    "myfiles": "Els meus fitxers",
-    "myprivatefiles": "Els meus fitxers privats",
     "myprivatefilesdesc": "Els arxius que teniu disponibles a la vostra àrea privada en aquest lloc Moodle.",
-    "photoalbums": "Àlbums de fotos",
     "privatefiles": "Fitxers privats",
-    "readingfile": "S'està llegint un fitxer",
     "sitefiles": "Fitxers del lloc",
     "sitefilesdesc": "Els altres arxius que es troben disponibles en aquest lloc Moodle.",
-    "success": "Èxit!",
-    "uploadfiles": "Puja fitxers",
-    "uploading": "S'està pujant",
-    "video": "Vídeo"
+    "uploadfiles": "Puja fitxers"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/cs.json b/www/addons/files/lang/cs.json
index 51aa687e92e..d9398ec785f 100644
--- a/www/addons/files/lang/cs.json
+++ b/www/addons/files/lang/cs.json
@@ -1,39 +1,13 @@
 {
     "admindisableddownload": "Upozorňujeme, že správce Moodle zakázal stahování souborů, soubory si můžete prohlížet, ale ne stáhnout.",
-    "audio": "Audio",
-    "camera": "Fotoaparát",
-    "chooseaccountuploadfile": "Vyberte účet, pod kterým chcete nahrát soubor.",
     "clicktoupload": "Kliknutím na tlačítko níže nahrát soubory do vašich osobních souborů.",
-    "confirmuploadfile": "Chystáte nahrát {{$a}}. Jste si jisti, že chcete pokračovat?",
     "couldnotloadfiles": "Seznam souborů, které nelze načíst .",
-    "downloading": "Stahování",
     "emptyfilelist": "Žádný soubor k zobrazení.",
-    "errorcapturingaudio": "Chyba snímání zvuku.",
-    "errorcapturingimage": "Chyba snímání obrazu.",
-    "errorcapturingvideo": "Chyba snímání videa.",
-    "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
-    "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
-    "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
-    "errorreadingfile": "Chyba při čtení souboru.",
-    "errorreceivefilenosites": "Nejsou uloženy žádné stránky. Než se pokusíte nahrát soubor, přidejte prosím stránku.",
     "erroruploadnotworking": "Bohužel v současné době není možné nahrávat na stránky vašeho Moodle.",
-    "errorwhiledownloading": "Při pokusu o stahování souboru došlo k chybě .",
-    "errorwhilerecordingaudio": "Při pokusu o nahrání zvuku došlo k chybě .",
-    "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
-    "file": "Soubor",
     "files": "Osobní soubory",
-    "fileuploaded": "Soubor byl úspěšně nahrán.",
-    "myfiles": "Moje soubory",
-    "myprivatefiles": "Osobní soubory",
     "myprivatefilesdesc": "Soubory, které jsou dostupné v soukromé oblasti na těchto stránkách Moodle.",
-    "photoalbums": "Fotoalba",
     "privatefiles": "Osobní soubory",
-    "readingfile": "Čtení souboru",
     "sitefiles": "Soubory stránek",
     "sitefilesdesc": "Další soubory, které jsou dostupné na těchto stránkách Moodle.",
-    "success": "Úspěch!",
-    "uploadafile": "Nahrát soubor",
-    "uploadfiles": "Nahrát soubory",
-    "uploading": "Nahrávání",
-    "video": "Video"
+    "uploadfiles": "Nahrát soubory"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/da.json b/www/addons/files/lang/da.json
index 56ea8289414..58173692d99 100644
--- a/www/addons/files/lang/da.json
+++ b/www/addons/files/lang/da.json
@@ -1,34 +1,13 @@
 {
     "admindisableddownload": "Bemærk venligst at din Moodleadministrator har deaktiveret download af filer. Du kan se filerne men ikke downloade dem.",
-    "audio": "Lyd",
-    "camera": "Kamera",
-    "chooseaccountuploadfile": "Vælg en konto filen skal uploades til",
     "clicktoupload": "Klik på knappen nedenfor for at uploade filer til dine private filer.",
-    "confirmuploadfile": "Du er ved at uploade {{size}}. Er du sikker på at du vil fortsætte",
     "couldnotloadfiles": "Fillisten kunne ikke hentes",
-    "downloading": "Downloader",
     "emptyfilelist": "Der er ingen filer at vise.",
-    "errorgettingimagealbum": "Fejl ved hentning af billede fra album.",
-    "errormustbeonlinetoupload": "Du skal være online for at uploade",
-    "errornoapp": "Du har ikke en app installeret der kan udføre denne handling.",
-    "errorreadingfile": "Fejl ved læsning af filen",
-    "errorreceivefilenosites": "Der er ingen gemte websider. Tilføj en webside inden du prøver at uploade en fil.",
     "erroruploadnotworking": "Desværre er det p.t. ikke muligt at uploade filer til dit site.",
-    "errorwhiledownloading": "Der opstod en fejl ved forsøg på download af filen.",
-    "errorwhilerecordingaudio": "Der opstod en fejl under forsøg på at optage lyd.",
-    "errorwhileuploading": "Der opstod en fejl under upload af fil.",
     "files": "Mine private filer",
-    "fileuploaded": "Filen er uoloadet.",
-    "myfiles": "Mine filer",
-    "myprivatefiles": "Mine private filer",
     "myprivatefilesdesc": "Filerne som er tilgængelige i dit private område på dette Moodlewebsted.",
-    "photoalbums": "Fotoalbum",
     "privatefiles": "Private filer",
-    "readingfile": "Læser fil",
     "sitefiles": "Webside filer",
     "sitefilesdesc": "De andre filer som er tilgængelige for dig på denne Moodlewebside.",
-    "success": "Succes!",
-    "uploadfiles": "Upload filer",
-    "uploading": "Uploader",
-    "video": "Video"
+    "uploadfiles": "Upload filer"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/de.json b/www/addons/files/lang/de.json
index 59be6e84477..40e53824d33 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Sie können nur die Dateiliste sehen.",
-    "audio": "Audio",
-    "camera": "Kamera",
-    "chooseaccountuploadfile": "Wählen Sie ein Nutzerkonto, um die Datei zu speichern.",
     "clicktoupload": "Tippen Sie auf die Taste, um Dateien in 'Meine Dateien' hochzuladen.",
-    "confirmuploadfile": "Möchten Sie wirklich {{size}} hochladen?",
     "couldnotloadfiles": "Die Dateiliste konnte nicht geladen werden.",
-    "downloading": "Herunterladen ...",
     "emptyfilelist": "Keine Dateien",
-    "errorcapturingaudio": "Fehler bei der Audioaufnahme",
-    "errorcapturingimage": "Fehler beim Fotografieren",
-    "errorcapturingvideo": "Fehler bei der Videoaufnahme",
-    "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
-    "errormustbeonlinetoupload": "Sie müssen online sein, um Dateien hochzuladen.",
-    "errornoapp": "Sie haben keine App installiert, um diese Aktion durchzuführen.",
-    "errorreadingfile": "Fehler beim Lesen der Datei",
-    "errorreceivefilenosites": "Keine Website gespeichert. Fügen Sie zuerst eine Website hinzu, bevor Sie das Hochladen einer Datei versuchen.",
     "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
-    "errorwhiledownloading": "Fehler beim Herunterladen der Datei",
-    "errorwhilerecordingaudio": "Fehler bei der Audioaufnahme",
-    "errorwhileuploading": "Fehler beim Hochladen der Datei",
     "files": "Meine Dateien",
-    "fileuploaded": "Die Datei wurde erfolgreich hochgeladen.",
-    "myfiles": "Meine Dateien",
-    "myprivatefiles": "Meine Dateien",
     "myprivatefilesdesc": "Diese Dateien liegen in Ihrem persönlichen Bereich auf dieser Website.",
-    "photoalbums": "Fotoalbum",
     "privatefiles": "Meine Dateien",
-    "readingfile": "Datei lesen",
     "sitefiles": "Dateien der Webseite",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
-    "success": "Fertig!",
-    "uploadfiles": "Dateien hochladen",
-    "uploading": "Hochladen",
-    "video": "Video"
+    "uploadfiles": "Dateien hochladen"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/el.json b/www/addons/files/lang/el.json
index 7a0242a4089..d2c98e03f53 100644
--- a/www/addons/files/lang/el.json
+++ b/www/addons/files/lang/el.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Παρακαλω λάβετε υπόψιν ότι ο διαχειριστής του Moodle site σας απενεργοποίησε τις λήψεις αρχείων, μπορείτε να περιηγηθείτε μέσα στα αρχεία, αλλά όχι να τα κατεβάσετε.",
-    "audio": "Audio",
-    "camera": "Κάμερα",
-    "chooseaccountuploadfile": "Επιλέξτε έναν λογαριασμό για να μεταφορτώσετε το αρχείο",
     "clicktoupload": "Κάντε κλικ στο παρακάτω κουμπί για να μεταφορτώσετε αρχεία στους προσωπικούς σας φακέλους.",
-    "confirmuploadfile": "Πρόκειται να ανεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "couldnotloadfiles": "Η λίστα των αρχείων δεν φορτώθηκε.",
-    "downloading": "Μεταφόρτωση",
     "emptyfilelist": "Δεν υπαρχουν αρχεία.",
-    "errorcapturingaudio": "Σφάλμα καταγραφής ήχου.",
-    "errorcapturingimage": "Σφάλμα λήψης εικόνας.",
-    "errorcapturingvideo": "Σφάλμα καταγραφής βίντεο.",
-    "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από τη συλλογή.",
-    "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
-    "errornoapp": "Δεν έχετε εγκατεστημένη κάποια εφαρμογή για να εκτελεστεί αυτή η ενέργεια.",
-    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
-    "errorreceivefilenosites": "Δεν υπάρχουν αποθηκευμένα sites. Παρακαλώ προσθέστε ένα site πριν προσπαθήσετε να φορτώσετε ένα αρχείο.",
     "erroruploadnotworking": "Δυστυχώς, προσωρινά δεν είναι δυνατό να ανεβάσετε τα αρχεία στο site σας.",
-    "errorwhiledownloading": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια να κατεβάσετε το αρχείο.",
-    "errorwhilerecordingaudio": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια καταγραφής ήχου.",
-    "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά τη μεταφόρτωση αρχείων.",
-    "file": "Αρχείο",
-    "fileuploaded": "Αυτό το αρχείο ανέβηκε επιτυχώς.",
-    "myfiles": "Τα αρχεία μου",
-    "myprivatefiles": "Τα προσωπικά αρχεία μου",
+    "files": "Αρχεία",
     "myprivatefilesdesc": "Τα αρχεία που είναι διαθέσιμα στο προσωπικό χώρο σας σε αυτό το Moodle site.",
-    "photoalbums": "Συλλογή εικόνων",
-    "readingfile": "Διάβασμα αρχείου",
+    "privatefiles": "Προσωπικά αρχεία",
     "sitefiles": "Τα αρχεία του site",
     "sitefilesdesc": "Άλλα αρχεία που είναι στη διάθεσή σας σε αυτό το site Moodle.",
-    "success": "Επιτυχία!",
-    "uploadafile": "Μεταφορτώστε ένα αρχείο",
-    "uploadfiles": "Μεταφορτώστε αρχεία",
-    "uploading": "Μεταφόρτωση",
-    "video": "Βίντεο"
+    "uploadfiles": "Μεταφορτώστε αρχεία"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es-mx.json b/www/addons/files/lang/es-mx.json
index 0da9a6aecc5..1b2e0bb7504 100644
--- a/www/addons/files/lang/es-mx.json
+++ b/www/addons/files/lang/es-mx.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ver los archivos pero no puede descargarlos.",
-    "audio": "Audio",
-    "camera": "Cámara",
-    "chooseaccountuploadfile": "Elija una cuanta a donde subirle el archivo.",
     "clicktoupload": "Haga click en el botón inferior para subir archivos a sus archivos privados.",
-    "confirmuploadfile": "Usted está a punto de subir {{size}}. ¿Está Usted seguro de querer continuar?",
     "couldnotloadfiles": "La lista de archivos no pudo cargarse.",
-    "downloading": "Descargando",
     "emptyfilelist": "No hay archivos para mostrar.",
-    "errorcapturingaudio": "Error al capturar audio.",
-    "errorcapturingimage": "Error al capturar imagen.",
-    "errorcapturingvideo": "Error al capturar video.",
-    "errorgettingimagealbum": "Error al obtener imagen del álbum.",
-    "errormustbeonlinetoupload": "Usted necesita estar conectado en-línea para subir archivos.",
-    "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
-    "errorreadingfile": "Error al leer el archivo.",
-    "errorreceivefilenosites": "No hay archivos almacenados. Por favor, añada un sitio antes de intentar subir un archivo.",
     "erroruploadnotworking": "Desafortunadamente ahorita no es posible subir archivos a su sitio.",
-    "errorwhiledownloading": "Ocurrió un error al intentar descargar el archivo.",
-    "errorwhilerecordingaudio": "Ocurrió un error al intentar grabar audio.",
-    "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
     "files": "Mis archivos privados",
-    "fileuploaded": "El archivo fue subido exitosamente.",
-    "myfiles": "Mis archivos",
-    "myprivatefiles": "Mis archivos privados",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
-    "photoalbums": "Álbum de fotos",
     "privatefiles": "Archivos privados",
-    "readingfile": "Leyendo archivo",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "success": "¡Éxito!",
-    "uploadfiles": "Subir archivos",
-    "uploading": "Subiendo",
-    "video": "Video"
+    "uploadfiles": "Subir archivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es.json b/www/addons/files/lang/es.json
index 741ecf09583..c0a531637c2 100644
--- a/www/addons/files/lang/es.json
+++ b/www/addons/files/lang/es.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ojear los archivos pero no puede descargarlos.",
-    "audio": "Audio",
-    "camera": "Cámara",
-    "chooseaccountuploadfile": "Elija una cuanta donde subir el archivo.",
     "clicktoupload": "Clic en el botón inferior para subir archivos a su zona de archivos privados.",
-    "confirmuploadfile": "Está a punto de subir {{size}}. ¿Está seguro de que desea continuar?",
     "couldnotloadfiles": "La lista de archivos no ha podido cargarse.",
-    "downloading": "Descargando",
     "emptyfilelist": "No hay archivos que mostrar",
-    "errorcapturingaudio": "Error capturando audio.",
-    "errorcapturingimage": "Error capturando imagen.",
-    "errorcapturingvideo": "Error capturando vídeo.",
-    "errorgettingimagealbum": "Error obteniendo imagen del album.",
-    "errormustbeonlinetoupload": "Necesitas tener conexión para subir archivos.",
-    "errornoapp": "No dispone de una app instalada para realizar esta acción.",
-    "errorreadingfile": "Error leyendo archivo.",
-    "errorreceivefilenosites": "No hay archivos almacenados. Por favor, añada un sitio antes de intentar subir un archivo.",
     "erroruploadnotworking": "Desafortunadamente en estos momentos no es posible subir archivos al sitio.",
-    "errorwhiledownloading": "Ocurrió un error al intentar descargar el archivo.",
-    "errorwhilerecordingaudio": "Ocurrió un error al intentar grabar audio.",
-    "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
     "files": "Mis archivos privados",
-    "fileuploaded": "El archivo fue subido correctamente.",
-    "myfiles": "Mis archivos",
-    "myprivatefiles": "Mis archivos privados",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
-    "photoalbums": "Álbum de fotos",
     "privatefiles": "Ficheros privados",
-    "readingfile": "Leyendo archivo",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "success": "Éxito",
-    "uploadfiles": "Subir archivos",
-    "uploading": "Subiendo",
-    "video": "Vídeo"
+    "uploadfiles": "Subir archivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/eu.json b/www/addons/files/lang/eu.json
index 3c92814d15f..1ab5413775e 100644
--- a/www/addons/files/lang/eu.json
+++ b/www/addons/files/lang/eu.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Mesedez ohartu zaitez zure Moodle administratzaileak fitxategien jaitsiera ezgaitu duela, fitxategiak arakatu ditzakezu baina ezin dituzu jaitsi.",
-    "audio": "Audioa",
-    "camera": "Kamera",
-    "chooseaccountuploadfile": "Aukeratu kontu bat fitxategiak bertara igotzeko.",
     "clicktoupload": "Klik egin beheko botoian fitxategiak zure gune pribatura igotzeko.",
-    "confirmuploadfile": "{{size}} igotzera zoaz. Ziur al zaude aurrera egin nahi duzula?",
     "couldnotloadfiles": "Ezin izan da fitxategien zerrenda kargatu.",
-    "downloading": "Jaisten",
     "emptyfilelist": "Ez dago fitxategirik erakusteko.",
-    "errorcapturingaudio": "Errorea audioa atzitzean.",
-    "errorcapturingimage": "Errorea irudia atzitzean.",
-    "errorcapturingvideo": "Errorea bideoa atzitzean.",
-    "errorgettingimagealbum": "Errorea irudia albumetik hartzean.",
-    "errormustbeonlinetoupload": "Online egon behar zara fitxategiak igo ahal izateko.",
-    "errornoapp": "Ez duzu ekintza hau burutzeko app-ik instalatuta.",
-    "errorreadingfile": "Errorea fitxategia irakurtzean.",
-    "errorreceivefilenosites": "Ez dago gordetako gunerik. Mesedez gehitu gune bat fitxategia igotzen saiatu baino lehen.",
     "erroruploadnotworking": "Zoritxarrez une honetan ezin dira fitxategiak zure gunera igo.",
-    "errorwhiledownloading": "Errorea gertatu da fitxategia jaisten saiatzean.",
-    "errorwhilerecordingaudio": "Errorea gertatu da audioa grabatzen saiatzean.",
-    "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
     "files": "Nire fitxategi pribatuak",
-    "fileuploaded": "Fitxategia ondo igo da.",
-    "myfiles": "Nire fitxategiak",
-    "myprivatefiles": "Nire fitxategi pribatuak",
     "myprivatefilesdesc": "Moodle gune honetako zure gune pribatuan eskuragarri dauden fitxategiak.",
-    "photoalbums": "Argazki albumak",
     "privatefiles": "Fitxategi pribatuak",
-    "readingfile": "Fitxategia irakurtzen",
     "sitefiles": "Guneko fitxategiak",
     "sitefilesdesc": "Zure Moodle gunean eskuragarri dauden beste fitxategiak.",
-    "success": "Ondo!",
-    "uploadfiles": "Igo fitxategiak",
-    "uploading": "Igotzen",
-    "video": "Bideoa"
+    "uploadfiles": "Igo fitxategiak"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fr.json b/www/addons/files/lang/fr.json
index 944b62fdd52..66738ab0a4d 100644
--- a/www/addons/files/lang/fr.json
+++ b/www/addons/files/lang/fr.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "L'administrateur de votre Moodle a désactivé le téléchargement des fichiers. Vous pouvez les consulter, mais pas les télécharger.",
-    "audio": "Audio",
-    "camera": "Caméra",
-    "chooseaccountuploadfile": "Sélectionner un compte vers lequel déposer le fichier.",
     "clicktoupload": "Cliquer sur le bouton ci-dessous pour déposer les fichiers dans vos fichiers personnels.",
-    "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
     "couldnotloadfiles": "La liste des fichiers n'a pas pu être chargée.",
-    "downloading": "Téléchargement",
     "emptyfilelist": "Aucun fichier à afficher.",
-    "errorcapturingaudio": "Erreur d'enregistrement audio.",
-    "errorcapturingimage": "Erreur lors de la capture de l'image.",
-    "errorcapturingvideo": "Erreur lors de la capture vidéo.",
-    "errorgettingimagealbum": "Erreur lors de la récupération de l'image dans l'album.",
-    "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
-    "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
-    "errorreadingfile": "Erreur lecture du fichier.",
-    "errorreceivefilenosites": "Aucun site enregistré. Veuillez ajouter un site avant de déposer un fichier.",
     "erroruploadnotworking": "Il n'est actuellement pas possible de déposer des fichiers sur votre site.",
-    "errorwhiledownloading": "Une erreur est survenue lors du téléchargement du fichier.",
-    "errorwhilerecordingaudio": "Une erreur est survenue lors de l'enregistrement du son.",
-    "errorwhileuploading": "Une erreur est survenue durant le dépôt du fichier.",
     "files": "Mes fichiers personnels",
-    "fileuploaded": "Le fichier a été déposé.",
-    "myfiles": "Mes fichiers",
-    "myprivatefiles": "Mes fichiers personnels",
     "myprivatefilesdesc": "Les fichiers disponibles dans votre zone privée sur cette plateforme Moodle.",
-    "photoalbums": "Albums de photos",
     "privatefiles": "Fichiers personnels",
-    "readingfile": "Lecture du fichier",
     "sitefiles": "Fichiers du site",
     "sitefilesdesc": "Les autres fichiers disponibles sur cette plateforme Moodle.",
-    "success": "Succès !",
-    "uploadfiles": "Déposer des fichiers",
-    "uploading": "Dépôt en cours",
-    "video": "Vidéo"
+    "uploadfiles": "Déposer des fichiers"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/he.json b/www/addons/files/lang/he.json
index f650a693ed6..25a48b96070 100644
--- a/www/addons/files/lang/he.json
+++ b/www/addons/files/lang/he.json
@@ -3,14 +3,10 @@
     "clicktoupload": "להעלאת הקבצים לקבצים הפרטיים שלך, יש להקליק על הכפתור למטה.",
     "couldnotloadfiles": "לא ניתן לטעון את רשימת הקבצים.",
     "emptyfilelist": "אין קבצים להצגה.",
-    "errorreceivefilenosites": "לא קיימים אתרים שמורים. יש להוסף אתר לפני הניסיון להעלות קובץ.",
     "files": "הקבצים הפרטיים שלי",
-    "myfiles": "הקבצים שלי",
-    "myprivatefiles": "הקבצים הפרטיים שלי",
     "myprivatefilesdesc": "הקבצים הזמינים לך באזור הפרטי באתר מוודל זה.",
     "privatefiles": "הקבצים שלי",
     "sitefiles": "קבצי האתר",
     "sitefilesdesc": "הקבצים האחרים הזמינים לך באתר מוודל זה.",
-    "success": "הצלחה!",
     "uploadfiles": "העלה קבצים"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/it.json b/www/addons/files/lang/it.json
index 809175680fd..0bc9591947f 100644
--- a/www/addons/files/lang/it.json
+++ b/www/addons/files/lang/it.json
@@ -1,39 +1,13 @@
 {
     "admindisableddownload": "L'amministratore del sito Moodle ha disabilitato il download dei file. Puoi navigare tra i file ma non potrai scaricarli.",
-    "audio": "Audio",
-    "camera": "Camera",
-    "chooseaccountuploadfile": "Scegli l'account dove caricare il file.",
     "clicktoupload": "Fai click sul pulsante sotto per caricare i file nei File personali",
-    "confirmuploadfile": "Stai per caricare {{size}}. Sei sicuro di continuare?",
     "couldnotloadfiles": "Non è stato possibile caricare l'elenco dei file.",
-    "downloading": "Scaricamento in corso",
     "emptyfilelist": "Non ci sono file da visualizzare.",
-    "errorcapturingaudio": "Si è verificato un errore durante la registrazione dell'audio.",
-    "errorcapturingimage": "Si è verificato un errore durante l'acquisizione dell'immagine.",
-    "errorcapturingvideo": "Si è verificato un errore durante l'acquisizione del video.",
-    "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
-    "errormustbeonlinetoupload": "Per caricar file devi essere online.",
-    "errornoapp": "Non hai un'app per svolgere questa azione.",
-    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
-    "errorreceivefilenosites": "Non ci sono siti memorizzati. Devi aggiungere un sito prima di poter caricare file.",
     "erroruploadnotworking": "Al momento non è possibile caricare file sul sito.",
-    "errorwhiledownloading": "Si è verificato un errore durante lo scaricamento del file.",
-    "errorwhilerecordingaudio": "Si è verificato un errore durante la registrazione dell'audio.",
-    "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
-    "file": "File",
     "files": "File personali",
-    "fileuploaded": "Il file è stato caricato correttamente.",
-    "myfiles": "I miei file",
-    "myprivatefiles": "File personali",
     "myprivatefilesdesc": "I file memorizzati nell'omonima area di Moodle",
-    "photoalbums": "Album fotografico",
     "privatefiles": "File personali",
-    "readingfile": "Lettura del file in corso",
     "sitefiles": "File del sito",
     "sitefilesdesc": "Altri file del sito Moodle ai quali puoi accedere.",
-    "success": "Effettuato correttamente!",
-    "uploadafile": "Carica un file",
-    "uploadfiles": "Carica file",
-    "uploading": "Caricamento in corso",
-    "video": "Video"
+    "uploadfiles": "Carica file"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ja.json b/www/addons/files/lang/ja.json
index c744c4a763c..22d47aced87 100644
--- a/www/addons/files/lang/ja.json
+++ b/www/addons/files/lang/ja.json
@@ -1,8 +1,6 @@
 {
     "emptyfilelist": "表示するファイルはありません。",
-    "errorreceivefilenosites": "登録されているサイトがありません。ファイルをアップロードする前にサイトを追加してください。",
     "files": "マイファイル",
-    "myfiles": "マイファイル",
     "privatefiles": "プライベートファイル",
     "sitefiles": "サイトファイル",
     "uploadfiles": "ファイルをアップロードできる"
diff --git a/www/addons/files/lang/lt.json b/www/addons/files/lang/lt.json
index 691e87361b7..82157441c00 100644
--- a/www/addons/files/lang/lt.json
+++ b/www/addons/files/lang/lt.json
@@ -1,34 +1,13 @@
 {
     "admindisableddownload": "Primename, kad Moodle administratorius panaikino galimybę parsisiųsti failus, failų atsisiųsti negalima, galite tik naršyti.",
-    "audio": "Garsas",
-    "camera": "Vaizdas",
-    "chooseaccountuploadfile": "Pasirinkite paskyrą „įkelti failą į“.",
     "clicktoupload": "Paspauskite mygtuką, esantį žemiau, kad galėtumėte atsisiųsti failus į privatų aplanką.",
-    "confirmuploadfile": "Jūs ketinate įkelti {{size}}. Ar norite tęsti?",
     "couldnotloadfiles": "Negalima užkrauti failų sąrašo.",
-    "downloading": "Siunčiama",
     "emptyfilelist": "Nėra ką rodyti.",
-    "errorcapturingaudio": "Klaida fiksuojant garsą.",
-    "errorcapturingimage": "Klaida fiksuojant paveiksliuką.",
-    "errorcapturingvideo": "Klaida fiksuojant vaizdo įrašą.",
-    "errorgettingimagealbum": "Klaida perkeliant paveiksliuką iš albumo.",
-    "errormustbeonlinetoupload": "Norėdamas įkelti failus, turite prisijungti .",
-    "errornoapp": "Norint atlikti šiuos veiksmus, reikia atsisiųsti programėlę.",
-    "errorreadingfile": "Klaida skaitant failą.",
-    "errorreceivefilenosites": "Svetainė nenurodyta. Prašome ją nurodyti prieš keliant failus.",
     "erroruploadnotworking": "Deja, failo į pasirinktą svetainę įkelti negalima.",
-    "errorwhiledownloading": "Klaida atsisiunčiant failą.",
-    "errorwhilerecordingaudio": "Įrašymo klaida.",
-    "errorwhileuploading": "Atsisiuntimo klaida.",
-    "fileuploaded": "Failas sėkmingai atsiųstas.",
-    "myfiles": "Mano failai",
-    "myprivatefiles": "Asmeniniai failai",
+    "files": "Failai",
     "myprivatefilesdesc": "Jūsų privatūs failai Moodle svetainėje.",
-    "photoalbums": "Nuotraukų albumas",
-    "readingfile": "Skaitomas failas",
+    "privatefiles": "Asmeniniai failai",
+    "sitefiles": "Svetainės failai",
     "sitefilesdesc": "Kiti failai Moodle svetainėje",
-    "success": "Sėkmė!",
-    "uploadfiles": "Įkelti failus",
-    "uploading": "Įkeliama",
-    "video": "Vaizdo įrašas"
+    "uploadfiles": "Įkelti failus"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/nl.json b/www/addons/files/lang/nl.json
index a0eca312bb8..ef922199f2d 100644
--- a/www/addons/files/lang/nl.json
+++ b/www/addons/files/lang/nl.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Je Moodle beheerder heeft het downloaden van bestanden uitgeschakeld. Je kunt door de bestandenlijst bladeren, maar ze niet downloaden.",
-    "audio": "Audio",
-    "camera": "Camera",
-    "chooseaccountuploadfile": "Kies een account om dit bestand naar toe te sturen.",
     "clicktoupload": "Klik op onderstaande knop om bestanden naar je privé-bestanden te uploaden.",
-    "confirmuploadfile": "Je gaat {{size}} uploaden. Wil je verder gaan?",
     "couldnotloadfiles": "De bestandenlijst kon niet geladen worden.",
-    "downloading": "Aan het downloaden",
     "emptyfilelist": "Er zijn geen bestanden te tonen.",
-    "errorcapturingaudio": "Fout bij de audio-opname.",
-    "errorcapturingimage": "Fout bij de foto-opname.",
-    "errorcapturingvideo": "Fout bij de video-opname.",
-    "errorgettingimagealbum": "Fout bij het ophalen van een afbeelding uit het album.",
-    "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
-    "errornoapp": "Je hebt geen app geïnstalleerd om deze actie mee uit te voeren.",
-    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
-    "errorreceivefilenosites": "Er zijn geen sites bewaard. Voeg een site toe voor je een bestand probeert te uploaden.",
     "erroruploadnotworking": "Jammer genoeg kun je op dit ogenblik geen bestanden uploaden naar de site.",
-    "errorwhiledownloading": "Er is een fout opgetreden bij het downloaden van het bestand.",
-    "errorwhilerecordingaudio": "Er is een fout opgetreden tijdens het opnemen van audio.",
-    "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
     "files": "Mijn privé-bestanden",
-    "fileuploaded": "Het uploaden van het bestand is gelukt.",
-    "myfiles": "Mijn bestanden",
-    "myprivatefiles": "Mijn privé-bestanden",
     "myprivatefilesdesc": "Jouw bestanden op deze Moodle-site.",
-    "photoalbums": "Foto-albums",
     "privatefiles": "Privébestanden",
-    "readingfile": "Bestand lezen",
     "sitefiles": "Sitebestanden",
     "sitefilesdesc": "Andere bestanden op deze Moodle-site.",
-    "success": "Succes!",
-    "uploadfiles": "Bestanden uploaden",
-    "uploading": "Aan het uploaden",
-    "video": "Video"
+    "uploadfiles": "Bestanden uploaden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt-br.json b/www/addons/files/lang/pt-br.json
index 2560de0dc8d..3bd84a665d5 100644
--- a/www/addons/files/lang/pt-br.json
+++ b/www/addons/files/lang/pt-br.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Por favor note que o administrador do Moodle desativou downloads de arquivos, você pode navegar através dos arquivos, mas não baixá-los.",
-    "audio": "Áudio",
-    "camera": "Câmera",
-    "chooseaccountuploadfile": "Escolha uma conta para a qual enviar o arquivo.",
     "clicktoupload": "Clique no botão abaixo para enviar para seus arquivos privados.",
-    "confirmuploadfile": "Você está prestes a enviar um arquivo de {{size}}. Você tem certeza que quer continuar?",
     "couldnotloadfiles": "A lista de arquivos não pode ser carregada.",
-    "downloading": "Baixando",
     "emptyfilelist": "Não há arquivos para mostrar.",
-    "errorcapturingaudio": "Erro ao capturar áudio.",
-    "errorcapturingimage": "Erro ao capturar imagem.",
-    "errorcapturingvideo": "Erro ao capturar vídeo.",
-    "errorgettingimagealbum": "Erro ao receber a imagem do álbum.",
-    "errormustbeonlinetoupload": "Você tem que estar online para enviar arquivos.",
-    "errornoapp": "Você não tem um aplicativo instalado que possa fazer essa ação.",
-    "errorreadingfile": "Erro ao ler o arquivo.",
-    "errorreceivefilenosites": "Não existem sites armazenados. Por favor adicione um site antes de enviar um arquivo.",
     "erroruploadnotworking": "Infelizmente é impossível enviar arquivos para o seu site.",
-    "errorwhiledownloading": "Ocorreu um erro ao tentar baixar o arquivo.",
-    "errorwhilerecordingaudio": "Ocorreu um erro ao tentar gravar o áudio.",
-    "errorwhileuploading": "Ocorreu um erro durante o envio do arquivo.",
     "files": "Meus arquivos privados",
-    "fileuploaded": "O arquivo foi enviado com sucesso.",
-    "myfiles": "Meus arquivos",
-    "myprivatefiles": "Meus arquivos privados",
     "myprivatefilesdesc": "Os arquivos que estão disponíveis em sua área de arquivos privados nesse site Moodle.",
-    "photoalbums": "Álbum de fotos",
     "privatefiles": "Arquivos privados",
-    "readingfile": "Lendo o arquivo",
     "sitefiles": "Arquivos do site",
     "sitefilesdesc": "Os outros arquivos que estão disponíveis a você neste site Moodle.",
-    "success": "Sucesso!",
-    "uploadfiles": "Enviar arquivos",
-    "uploading": "Enviando",
-    "video": "Vídeo"
+    "uploadfiles": "Enviar arquivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt.json b/www/addons/files/lang/pt.json
index b256bcb4afa..15ba2f3b400 100644
--- a/www/addons/files/lang/pt.json
+++ b/www/addons/files/lang/pt.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Tenha en atenção que o administrador do Moodle desativou a opção de descarregar ficheiros. Poderá navegar nos ficheiros mas não conseguirá descarregá-los.",
-    "audio": "Audio",
-    "camera": "Câmara",
-    "chooseaccountuploadfile": "Escolha uma conta para onde carregar o ficheiro.",
     "clicktoupload": "Clique no botão abaixo para carregar ficheiros para os seus ficheiros privados.",
-    "confirmuploadfile": "Está prestes a carregar {{size}}. Tem a certeza que pretende continuar?",
     "couldnotloadfiles": "Não foi possível carregar a lista de ficheiros",
-    "downloading": "A descarregar",
     "emptyfilelist": "Não há ficheiros",
-    "errorcapturingaudio": "Erro na captura do áudio.",
-    "errorcapturingimage": "Erro na captura da imagem.",
-    "errorcapturingvideo": "Erro ao capturar vídeo.",
-    "errorgettingimagealbum": "Erro ao obter a imagem do álbum.",
-    "errormustbeonlinetoupload": "Precisa estar online para carregar ficheiross.",
-    "errornoapp": "Não tem aplicação instalada para executar esta ação.",
-    "errorreadingfile": "Erro ao ler ficheiro.",
-    "errorreceivefilenosites": "Não existem sites armazenados. Por favor adicione um site antes de carregar um ficheiro.",
     "erroruploadnotworking": "Infelizmente não é possível carregar ficheiros para o seu site.",
-    "errorwhiledownloading": "Ocorreu um erro ao tentar descarregar o ficheiro.",
-    "errorwhilerecordingaudio": "Ocorreu um erro ao tentar gravar áudio.",
-    "errorwhileuploading": "Ocorreu um erro durante ao carregar o ficheiro.",
     "files": "Meus ficheiros privados",
-    "fileuploaded": "O ficheiro foi carregado com sucesso.",
-    "myfiles": "Meus ficheiros",
-    "myprivatefiles": "Meus ficheiros privados",
     "myprivatefilesdesc": "Ficheiros disponíveis na sua área privada neste site Moodle",
-    "photoalbums": "Álbum de fotografias",
     "privatefiles": "Ficheiros privados",
-    "readingfile": "A ler ficheiro",
     "sitefiles": "Ficheiros do site",
     "sitefilesdesc": "Os outros ficheiros que estão disponíveis para si neste site Moodle.",
-    "success": "Sucesso!",
-    "uploadfiles": "Carregar ficheiros",
-    "uploading": "A carregar",
-    "video": "Vídeo"
+    "uploadfiles": "Carregar ficheiros"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ro.json b/www/addons/files/lang/ro.json
index 9b9f147bc0b..678713c2e70 100644
--- a/www/addons/files/lang/ro.json
+++ b/www/addons/files/lang/ro.json
@@ -3,14 +3,10 @@
     "clicktoupload": "Apăsați butonul de mai jos pentru a încarcă fișierele în contul dumneavoastră.",
     "couldnotloadfiles": "Lista fișierelor nu a putut fi încărcată.",
     "emptyfilelist": "Nu sunt fișiere disponibile.",
-    "errorreceivefilenosites": "Nu aveți stocat niciun sit. Adăugați un sit înainte de a încărca un fișier.",
     "files": "Fisiere personale",
-    "myfiles": "Fișierele mele",
-    "myprivatefiles": "Fisiere personale",
     "myprivatefilesdesc": "Fișierele disponibile din zona personală, pe care o dețineți pe acest site.",
     "privatefiles": "Fișiere private",
     "sitefiles": "Fișierele disponibile pe site",
     "sitefilesdesc": "Alte fișiere disponibile pe acest site.",
-    "success": "Succes!",
     "uploadfiles": "Încărcați mai multe fișiere"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ru.json b/www/addons/files/lang/ru.json
index a334bae34e4..31fb12c3feb 100644
--- a/www/addons/files/lang/ru.json
+++ b/www/addons/files/lang/ru.json
@@ -1,36 +1,12 @@
 {
     "admindisableddownload": "Обратите внимание, что администратор Moodle отключил скачивание файлов. Вы можете просмотреть файлы, но не скачать их.",
-    "audio": "Аудио",
-    "camera": "Камера",
-    "chooseaccountuploadfile": "Выбрать учетную запись для загрузки файла",
     "clicktoupload": "Нажмите внизу кнопку для загрузки файлов в свои личные файлы.",
-    "confirmuploadfile": "Вы собираетесь загрузить {{size}}. Вы уверены, что хотите продолжить?",
     "couldnotloadfiles": "Файлы из списка не могут быть загружены",
-    "downloading": "Загрузка",
     "emptyfilelist": "Нет файлов для отображения",
-    "errorcapturingaudio": "Ошибка захвата звука",
-    "errorcapturingimage": "Ошибка захвата изображения",
-    "errorcapturingvideo": "Ошибка захвата видео",
-    "errorgettingimagealbum": "Ошибка получения изображения из альбома",
-    "errormustbeonlinetoupload": "Вы должны на сайте, чтобы загружать файлы.",
-    "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
-    "errorreadingfile": "Ошибка при чтении файла",
-    "errorreceivefilenosites": "Нет сайта для хранения. Пожалуйста, добавьте сайт, прежде чем пытаться загрузить файл",
-    "errorwhiledownloading": "Произошла ошибка при попытке загрузки файла",
-    "errorwhilerecordingaudio": "Произошла ошибка при попытке записи аудио",
-    "errorwhileuploading": "Произошла ошибка во время загрузки файла",
     "files": "Мои личные файлы",
-    "fileuploaded": "Файл загружен",
-    "myfiles": "Мои файлы",
-    "myprivatefiles": "Мои личные файлы",
     "myprivatefilesdesc": "Файлы, которые доступны Вам в личном кабинете на этом сайте Moodle.",
-    "photoalbums": "Фотоальбомы",
     "privatefiles": "Личные файлы",
-    "readingfile": "Чтение файла",
     "sitefiles": "Файлы сайта",
     "sitefilesdesc": "Другие файлы, доступные на этом сайте Moodle",
-    "success": "Успешно!",
-    "uploadfiles": "Загрузка файлов",
-    "uploading": "Загрузка",
-    "video": "Видео"
+    "uploadfiles": "Загрузка файлов"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/sv.json b/www/addons/files/lang/sv.json
index 437c3e99d8f..0883562b317 100644
--- a/www/addons/files/lang/sv.json
+++ b/www/addons/files/lang/sv.json
@@ -3,14 +3,10 @@
     "clicktoupload": "Klicka på knappen nedan för att ladda upp filer till dina privata filer.",
     "couldnotloadfiles": "Listan över filer kunde inte läsas in.",
     "emptyfilelist": "Det finns inga filer att visa.",
-    "errorreceivefilenosites": "Det finns inga webbsidor sparade. Lägg till en sida innan du försöker ladda upp en fil.",
     "files": "Mina privata filer",
-    "myfiles": "Mina filer",
-    "myprivatefiles": "Mina privata filer",
     "myprivatefilesdesc": "De filer som finns i din privata område på denna Moodle webbplats.",
     "privatefiles": "Privata filer",
     "sitefiles": "webbplats filer",
     "sitefilesdesc": "De andra filer som är tillgängliga för dig på denna Moodle webbplats.",
-    "success": "Framgång!",
     "uploadfiles": "Ladda upp filer"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/tr.json b/www/addons/files/lang/tr.json
index eea4b750c75..011292bc652 100644
--- a/www/addons/files/lang/tr.json
+++ b/www/addons/files/lang/tr.json
@@ -1,13 +1,6 @@
 {
-    "errorcapturingaudio": "Ses çalma hatası",
-    "errorcapturingvideo": "Video oynatma hatası",
     "files": "Dosyalarım",
-    "fileuploaded": "Dosya yüklendi",
-    "myfiles": "Dosyalarım",
-    "photoalbums": "Fotoğraf albümleri",
     "privatefiles": "Kişisel dosyalar",
     "sitefiles": "Site dosyaları",
-    "uploadfiles": "Dosya yükleyebilir",
-    "uploading": "Yükleniyor",
-    "video": "Video"
+    "uploadfiles": "Dosya yükleyebilir"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/zh-tw.json b/www/addons/files/lang/zh-tw.json
index 23885287d8d..066cdb40014 100644
--- a/www/addons/files/lang/zh-tw.json
+++ b/www/addons/files/lang/zh-tw.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "請注意, 您的Moodle管理員禁止檔案下載, 您可以瀏覽檔案, 但不能下載它們.",
-    "audio": "錄音",
-    "camera": "照相機",
-    "chooseaccountuploadfile": "選擇一個帳號去上傳檔案",
     "clicktoupload": "點選這個按鈕,將檔案上傳到你的個人檔案區",
-    "confirmuploadfile": "您即將上傳{{size}}. 您確定要繼續嗎？",
     "couldnotloadfiles": "這些檔案是不能被載入的",
-    "downloading": "下載中",
     "emptyfilelist": "沒有檔案可以顯示",
-    "errorcapturingaudio": "截取錄音資料錯誤",
-    "errorcapturingimage": "截取畫面錯誤",
-    "errorcapturingvideo": "截取錄影資料錯誤",
-    "errorgettingimagealbum": "從相簿讀取影像檔發生錯誤",
-    "errormustbeonlinetoupload": "你必須上線才能上傳檔案",
-    "errornoapp": "您沒有安裝應用程式來執行此動作.",
-    "errorreadingfile": "讀取檔案發生錯誤",
-    "errorreceivefilenosites": "沒有儲存的網站. 請在嘗試上傳檔案之前新增一個網站.",
     "erroruploadnotworking": "很抱歉, 目前無法將檔案上傳到您的網站.",
-    "errorwhiledownloading": "當試著去下載檔案時發生錯誤",
-    "errorwhilerecordingaudio": "當試著去錄音時發生錯誤",
-    "errorwhileuploading": "上傳檔案時發生錯誤",
     "files": "我的檔案",
-    "fileuploaded": "檔案上傳成功",
-    "myfiles": "我的檔案",
-    "myprivatefiles": "個人專用檔案",
     "myprivatefilesdesc": "在此Moodle網站上, 您的私有區域中有可用的文件",
-    "photoalbums": "相簿",
     "privatefiles": "私人檔案",
-    "readingfile": "讀取檔案",
     "sitefiles": "網站公用檔案",
     "sitefilesdesc": "您在此Moodle網站上有可用的其他文件.",
-    "success": "成功!",
-    "uploadfiles": "上傳檔案",
-    "uploading": "上傳中",
-    "video": "錄影"
+    "uploadfiles": "上傳檔案"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ar.json b/www/addons/frontpage/lang/ar.json
index 1a14d85a4c1..e5c4a314541 100644
--- a/www/addons/frontpage/lang/ar.json
+++ b/www/addons/frontpage/lang/ar.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "الصفحة الرئيسية",
     "sitehome": "الصفحة الرئيسية",
     "sitenews": "أخبار الموقع"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/bg.json b/www/addons/frontpage/lang/bg.json
index d251b48bf26..df102ae2464 100644
--- a/www/addons/frontpage/lang/bg.json
+++ b/www/addons/frontpage/lang/bg.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Заглавна страница",
     "sitehome": "Заглавна страница",
     "sitenews": "Новини от сайта"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ca.json b/www/addons/frontpage/lang/ca.json
index 7a430c3a847..de3886bcffc 100644
--- a/www/addons/frontpage/lang/ca.json
+++ b/www/addons/frontpage/lang/ca.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Pàgina principal",
     "sitehome": "Inici",
     "sitenews": "Notícies del lloc"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/cs.json b/www/addons/frontpage/lang/cs.json
index 97d5a3c4015..8855e125154 100644
--- a/www/addons/frontpage/lang/cs.json
+++ b/www/addons/frontpage/lang/cs.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Titulní stránka",
     "sitehome": "Domovská stránka",
     "sitenews": "Oznámení stránek"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/da.json b/www/addons/frontpage/lang/da.json
index dd3fb3e76ff..e26cdd5bfd6 100644
--- a/www/addons/frontpage/lang/da.json
+++ b/www/addons/frontpage/lang/da.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Forside",
     "sitehome": "Websteds hjem",
     "sitenews": "Sitemeddelelser"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/de.json b/www/addons/frontpage/lang/de.json
index 8c3ca69ec5b..2bdf44debd8 100644
--- a/www/addons/frontpage/lang/de.json
+++ b/www/addons/frontpage/lang/de.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Startseite",
     "sitehome": "Startseite",
     "sitenews": "Ankündigungen"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/el.json b/www/addons/frontpage/lang/el.json
index 80973a4fa0c..a3c4e4c8cf4 100644
--- a/www/addons/frontpage/lang/el.json
+++ b/www/addons/frontpage/lang/el.json
@@ -1,4 +1,4 @@
 {
-    "frontpage": "Κεντρική σελίδα",
-    "sitehome": "Αρχική σελίδα"
+    "sitehome": "Αρχική σελίδα",
+    "sitenews": "Νέα του ιστοχώρου"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es-mx.json b/www/addons/frontpage/lang/es-mx.json
index e2db2b8b52d..59a7b3f143c 100644
--- a/www/addons/frontpage/lang/es-mx.json
+++ b/www/addons/frontpage/lang/es-mx.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Portada",
     "sitehome": "Página inicial del sitio",
     "sitenews": "Anuncios del sitio"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es.json b/www/addons/frontpage/lang/es.json
index e332204ca4a..6fad2149059 100644
--- a/www/addons/frontpage/lang/es.json
+++ b/www/addons/frontpage/lang/es.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Página Principal",
     "sitehome": "Inicio",
     "sitenews": "Novedades del sitio"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/eu.json b/www/addons/frontpage/lang/eu.json
index a87e22dc7d6..2a21d6f7aa1 100644
--- a/www/addons/frontpage/lang/eu.json
+++ b/www/addons/frontpage/lang/eu.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Hasiera-orria",
     "sitehome": "Gunearen hasiera",
     "sitenews": "Gunearen berriak"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/fr.json b/www/addons/frontpage/lang/fr.json
index 427a48724d0..57bf1bb4ec0 100644
--- a/www/addons/frontpage/lang/fr.json
+++ b/www/addons/frontpage/lang/fr.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Page d'accueil",
     "sitehome": "Plateforme",
     "sitenews": "Annonces du site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/he.json b/www/addons/frontpage/lang/he.json
index accf17fcbd4..b0e436c2799 100644
--- a/www/addons/frontpage/lang/he.json
+++ b/www/addons/frontpage/lang/he.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "עמוד ראשי",
     "sitehome": "עמוד ראשי",
     "sitenews": "חדשות האתר"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/it.json b/www/addons/frontpage/lang/it.json
index a941722fcb3..9490d0feb02 100644
--- a/www/addons/frontpage/lang/it.json
+++ b/www/addons/frontpage/lang/it.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Pagina home",
     "sitehome": "Home del sito",
     "sitenews": "Annunci del sito"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ja.json b/www/addons/frontpage/lang/ja.json
index fce19c38c5d..f1b1318bc5a 100644
--- a/www/addons/frontpage/lang/ja.json
+++ b/www/addons/frontpage/lang/ja.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "フロントページ",
     "sitehome": "フロントページ",
     "sitenews": "サイトアナウンスメント"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/lt.json b/www/addons/frontpage/lang/lt.json
index 2e5065cc21b..95d9705bdc1 100644
--- a/www/addons/frontpage/lang/lt.json
+++ b/www/addons/frontpage/lang/lt.json
@@ -1,3 +1,4 @@
 {
-    "frontpage": "Titulinis lapas"
+    "sitehome": "Pagrindinis svetainės puslapis",
+    "sitenews": "Svetainės skelbimai"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/nl.json b/www/addons/frontpage/lang/nl.json
index c9a8024a955..a94c7942487 100644
--- a/www/addons/frontpage/lang/nl.json
+++ b/www/addons/frontpage/lang/nl.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Startpagina",
     "sitehome": "Site startpagina",
     "sitenews": "Site-mededelingen"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt-br.json b/www/addons/frontpage/lang/pt-br.json
index 7eb94bf6ea0..d54afdfa0a6 100644
--- a/www/addons/frontpage/lang/pt-br.json
+++ b/www/addons/frontpage/lang/pt-br.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Página principal",
     "sitehome": "Página inicial",
     "sitenews": "Novidades"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt.json b/www/addons/frontpage/lang/pt.json
index 62b12b63065..ffb96b57d58 100644
--- a/www/addons/frontpage/lang/pt.json
+++ b/www/addons/frontpage/lang/pt.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Página principal",
     "sitehome": "Página inicial",
     "sitenews": "Anúncios do site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ro.json b/www/addons/frontpage/lang/ro.json
index 5c338787d35..dc9350bc054 100644
--- a/www/addons/frontpage/lang/ro.json
+++ b/www/addons/frontpage/lang/ro.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Prima pagina",
     "sitehome": "Pagina principală",
     "sitenews": "Ştiri site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ru.json b/www/addons/frontpage/lang/ru.json
index dbd2facda41..986bb12dcf8 100644
--- a/www/addons/frontpage/lang/ru.json
+++ b/www/addons/frontpage/lang/ru.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Главная страница",
     "sitehome": "Главная страница",
     "sitenews": "Новости сайта"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/sv.json b/www/addons/frontpage/lang/sv.json
index be57af83981..02d32005a71 100644
--- a/www/addons/frontpage/lang/sv.json
+++ b/www/addons/frontpage/lang/sv.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Ingångssida",
     "sitehome": "Webbsida hem",
     "sitenews": "Webbplatsnyheter"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/zh-tw.json b/www/addons/frontpage/lang/zh-tw.json
index 10fd23d8fa7..72b147b8191 100644
--- a/www/addons/frontpage/lang/zh-tw.json
+++ b/www/addons/frontpage/lang/zh-tw.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "首頁",
     "sitehome": "首頁",
     "sitenews": "網站公告"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/bg.json b/www/addons/grades/lang/bg.json
index 6fb3aee6f38..35d8d8343df 100644
--- a/www/addons/grades/lang/bg.json
+++ b/www/addons/grades/lang/bg.json
@@ -1,4 +1,3 @@
 {
-    "itemname": "Оценяване",
     "viewgrades": "Преглед на оценките"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ca.json b/www/addons/grades/lang/ca.json
index 466e2340dfb..d4eaffdc5d6 100644
--- a/www/addons/grades/lang/ca.json
+++ b/www/addons/grades/lang/ca.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Element de qualificació",
     "nogradesreturned": "No s'han retornat qualificacions",
     "viewgrades": "Visualitza les qualificacions"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/cs.json b/www/addons/grades/lang/cs.json
index 83049846fd4..d81f129f741 100644
--- a/www/addons/grades/lang/cs.json
+++ b/www/addons/grades/lang/cs.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Položka známky",
     "nogradesreturned": "Nebyly nalezeny žádné známky",
     "viewgrades": "Zobrazit známky"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/da.json b/www/addons/grades/lang/da.json
index 4a325ef7ec4..5139ff1e2aa 100644
--- a/www/addons/grades/lang/da.json
+++ b/www/addons/grades/lang/da.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Emne til bedømmelse",
     "nogradesreturned": "Ingen karakterer returneret",
     "viewgrades": "Vis bedømmelser"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/de.json b/www/addons/grades/lang/de.json
index b46241900f1..e5cc9fa961b 100644
--- a/www/addons/grades/lang/de.json
+++ b/www/addons/grades/lang/de.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Bewertungsaspekt",
     "nogradesreturned": "Keine Bewertung zum Anzeigen vorhanden",
     "viewgrades": "Bewertungen anzeigen"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/el.json b/www/addons/grades/lang/el.json
index 47b2038b336..c1625a02671 100644
--- a/www/addons/grades/lang/el.json
+++ b/www/addons/grades/lang/el.json
@@ -1,3 +1,4 @@
 {
-    "itemname": "Βαθμολογία αντικειμένου"
+    "nogradesreturned": "Δεν επιστράφηκε κανένας βαθμός",
+    "viewgrades": "Προβολή βαθμών"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/es-mx.json b/www/addons/grades/lang/es-mx.json
index a69b255c454..694aa3a580f 100644
--- a/www/addons/grades/lang/es-mx.json
+++ b/www/addons/grades/lang/es-mx.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Ítem de calificación",
     "nogradesreturned": "No se han devuelto calificaciones",
     "viewgrades": "Ver calificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/es.json b/www/addons/grades/lang/es.json
index daff3a42fa5..694aa3a580f 100644
--- a/www/addons/grades/lang/es.json
+++ b/www/addons/grades/lang/es.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Elemento de calificación",
     "nogradesreturned": "No se han devuelto calificaciones",
     "viewgrades": "Ver calificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/eu.json b/www/addons/grades/lang/eu.json
index a2da159e978..305820b08b2 100644
--- a/www/addons/grades/lang/eu.json
+++ b/www/addons/grades/lang/eu.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Elementua kalifikatu",
     "nogradesreturned": "Ez da kalifikaziorik itzuli",
     "viewgrades": "Kalifikazioak ikusi"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/fr.json b/www/addons/grades/lang/fr.json
index 61839e826ef..37ee094566f 100644
--- a/www/addons/grades/lang/fr.json
+++ b/www/addons/grades/lang/fr.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Élément d'évaluation",
     "nogradesreturned": "Aucune note retournée",
     "viewgrades": "Afficher les notes"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/he.json b/www/addons/grades/lang/he.json
index 9fe92d0ae5c..04c6f80e227 100644
--- a/www/addons/grades/lang/he.json
+++ b/www/addons/grades/lang/he.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "פריט ציון",
     "nogradesreturned": "לא הוחזרו ציונים",
     "viewgrades": "צפיה בציונים"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/it.json b/www/addons/grades/lang/it.json
index 892207d58e2..883d830fb4f 100644
--- a/www/addons/grades/lang/it.json
+++ b/www/addons/grades/lang/it.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Elemento di valutazione",
     "nogradesreturned": "Non è stata ottenuta alcuna valutazione",
     "viewgrades": "Visualizza valutazioni"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ja.json b/www/addons/grades/lang/ja.json
index a756f630d3e..23abe78a3be 100644
--- a/www/addons/grades/lang/ja.json
+++ b/www/addons/grades/lang/ja.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "評定項目",
     "nogradesreturned": "評点がありません。",
     "viewgrades": "評定を表示する"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/lt.json b/www/addons/grades/lang/lt.json
index bc02da46826..eb0999f2672 100644
--- a/www/addons/grades/lang/lt.json
+++ b/www/addons/grades/lang/lt.json
@@ -1,3 +1,4 @@
 {
-    "itemname": "Įvertinti"
+    "nogradesreturned": "Įverčių nepateikta",
+    "viewgrades": "Peržiūrėti įverčius"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/nl.json b/www/addons/grades/lang/nl.json
index f4489bca2f5..a11f8e821e2 100644
--- a/www/addons/grades/lang/nl.json
+++ b/www/addons/grades/lang/nl.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Beoordelingsitem",
     "nogradesreturned": "Geen cijfers",
     "viewgrades": "Bekijk cijfers"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pt-br.json b/www/addons/grades/lang/pt-br.json
index 2105992ad37..a93815a0aca 100644
--- a/www/addons/grades/lang/pt-br.json
+++ b/www/addons/grades/lang/pt-br.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Item de nota",
     "nogradesreturned": "Nenhuma avaliação calculada",
     "viewgrades": "Ver notas"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pt.json b/www/addons/grades/lang/pt.json
index 759a7cf8365..1becbd39256 100644
--- a/www/addons/grades/lang/pt.json
+++ b/www/addons/grades/lang/pt.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Item de avaliação",
     "nogradesreturned": "Não foram devolvidas notas",
     "viewgrades": "Ver notas"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ro.json b/www/addons/grades/lang/ro.json
index 23c1becd038..6b6760ff8e0 100644
--- a/www/addons/grades/lang/ro.json
+++ b/www/addons/grades/lang/ro.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Element al notei",
     "nogradesreturned": "Nu au fost returnate note",
     "viewgrades": "Vedeți notele"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ru.json b/www/addons/grades/lang/ru.json
index 87410fef2ad..733ed0c23e6 100644
--- a/www/addons/grades/lang/ru.json
+++ b/www/addons/grades/lang/ru.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Элемент оценки",
     "nogradesreturned": "Нет оценок",
     "viewgrades": "Просмотр оценок"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/tr.json b/www/addons/grades/lang/tr.json
index 06231a7a90a..a9b8afc370a 100644
--- a/www/addons/grades/lang/tr.json
+++ b/www/addons/grades/lang/tr.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Not ögesi",
     "nogradesreturned": "Hiç not yok",
     "viewgrades": "Notlara bak"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/zh-tw.json b/www/addons/grades/lang/zh-tw.json
index ddf0abb9669..7dedc8d3d0c 100644
--- a/www/addons/grades/lang/zh-tw.json
+++ b/www/addons/grades/lang/zh-tw.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "成績項目",
     "nogradesreturned": "未找到成績",
     "viewgrades": "檢視成績"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index 19ac3536b7d..ec21562a907 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -9,7 +9,6 @@
     "deletemessage": "Nachricht löschen",
     "deletemessageconfirmation": "Möchten Sie wirklich diese Nachricht löschen? Die Nachricht wird ausschließlich aus Ihrem Nachrichtenverlauf gelöscht, ist aber weiterhin bei der Person zu sehen, die Ihnen die Nachricht geschickt hat.",
     "errordeletemessage": "Fehler beim Löschen der Mitteilung",
-    "erroruseronlyacceptsmessagefromcontacts": "Fehler: Diese Person erlaubt den Empfang von Mitteilungen nur von ihren Kontakten.",
     "errorwhileretrievingcontacts": "Fehler beim Lesen der Kontakte vom Server",
     "errorwhileretrievingdiscussions": "Fehler beim Lesen der Themen vom Server",
     "errorwhileretrievingmessages": "Fehler beim Empfang der Mitteilungen vom Server",
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index f9157d0fa00..3476b0c695a 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -1,19 +1,30 @@
 {
+    "addcontact": "Προσθήκη επαφής",
+    "blockcontact": "Φραγμός επαφής",
+    "blocknoncontacts": "Φραγή όλων των νέων μηνυμάτων που προέρχονται από χρήστες που δεν βρίσκονται στη λίστα επαφών σας.",
     "contactlistempty": "Η λίστα επαφών είναι κενή",
     "contactname": "Όνομα επαφής",
+    "contacts": "Επαφές",
     "errordeletemessage": "Σφάλμα κατά τη διαγραφή του μηνύματος.",
     "errorwhileretrievingcontacts": "Σφάλμα κατά την ανάκτηση των επαφών από το διακομιστή.",
     "errorwhileretrievingdiscussions": "Σφάλμα κατά την ανάκτηση των συζητήσεων από το διακομιστή.",
     "errorwhileretrievingmessages": "Σφάλμα κατά την ανάκτηση των μηνυμάτων από το διακομιστή.",
+    "message": "Σώμα μηνύματος",
     "messagenotsent": "Το μήνυμα δεν στάλθηκε, δοκιμάστε ξανά αργότερα.",
+    "messagepreferences": "Προτιμήσεις μηνύματος",
+    "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
     "newmessage": "Νέο μήνυμα...",
     "nomessages": "Κανένα μήνυμα.",
     "nousersfound": "Δεν βρέθηκαν χρήστες",
+    "removecontact": "Αφαίρεσε την επαφή",
+    "send": "Αποστολή",
+    "sendmessage": "Αποστολή μηνύματος",
     "type_blocked": "Μπλοκαρισμένοι",
     "type_offline": "Εκτός σύνδεσης",
     "type_online": "Συνδεδεμένος",
     "type_search": "Αποτελέσματα αναζήτησης",
     "type_strangers": "Άλλοι",
+    "unblockcontact": "Ξεμπλόκαρε την επαφή",
     "warningmessagenotsent": "Το/τα μήνυμα/μηνύματα δεν μπόρεσε/αν να σταλεί/ούν στο χρήστη {{user}}. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/he.json b/www/addons/messages/lang/he.json
index 723bf25d817..eab2c7dbf17 100644
--- a/www/addons/messages/lang/he.json
+++ b/www/addons/messages/lang/he.json
@@ -12,6 +12,7 @@
     "errorwhileretrievingmessages": "שגיאה בזמן טעינת המסרים מהשרת.",
     "message": "גוף ההודעה",
     "messagenotsent": "מסר זה לא נשלח, אנא נסה שוב מאוחר יותר.",
+    "messagepreferences": "העדפות בהודעות",
     "messages": "מסרים",
     "mustbeonlinetosendmessages": "עליך להיות מחובר/ת בכדי לשלוח מסר.",
     "newmessage": "מסר חדש...",
diff --git a/www/addons/messages/lang/lt.json b/www/addons/messages/lang/lt.json
index 144af07ad6d..a35a4a74272 100644
--- a/www/addons/messages/lang/lt.json
+++ b/www/addons/messages/lang/lt.json
@@ -1,19 +1,30 @@
 {
+    "addcontact": "Įtraukite kontaktą",
+    "blockcontact": "Blokuoti kontaktą",
+    "blocknoncontacts": "Neleisti neįtrauktiems į kontaktų sąrašą asmenims siųsti man žinutes",
     "contactlistempty": "Kontaktų sąrašas tuščias",
     "contactname": "Kontaktas",
+    "contacts": "Kontaktai",
     "errordeletemessage": "Klaida trinant žinutes.",
     "errorwhileretrievingcontacts": "Klaida nuskaitant kontaktus iš serverio.",
     "errorwhileretrievingdiscussions": "Klaida nuskaitant diskusijas iš serverio.",
     "errorwhileretrievingmessages": "Klaida nuskaitant pranešimus iš serverio.",
+    "message": "Pranešimo tekstas",
     "messagenotsent": "Žinutė nebuvo išsiųsta, pabandykite vėliau.",
+    "messagepreferences": "Žinučių nuostatos",
+    "messages": "Žinutės",
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite prisijungti",
     "newmessage": "Nauja žinutė...",
     "nomessages": "Žinučių nėra.",
     "nousersfound": "Vartotojas nerastas",
+    "removecontact": "Pašalinti kontaktą",
+    "send": "Siųsti",
+    "sendmessage": "Siųsti žinutę",
     "type_blocked": "Užblokuota",
     "type_offline": "Neprisjungęs",
     "type_online": "Prisijungęs",
     "type_search": "Paieška",
     "type_strangers": "Kita",
+    "unblockcontact": "Atblokuoti kontaktą",
     "warningmessagenotsent": "Žinutė {{user}} vartotojui neišsiųsta. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index b9d30ca5022..c3f12e4d247 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -8,7 +8,6 @@
     "deletemessage": "Excluir mensagem",
     "deletemessageconfirmation": "Tem certeza de que deseja excluir esta mensagem? Ela só será excluída do seu histórico de mensagens e ainda poderá ser vista pelo usuário que enviou ou recebeu a mensagem.",
     "errordeletemessage": "Erro enquanto excluía a mensagem.",
-    "erroruseronlyacceptsmessagefromcontacts": "O usuário somente aceita mensagens de contatos",
     "errorwhileretrievingcontacts": "Erro ao recuperar contatos a partir do servidor.",
     "errorwhileretrievingdiscussions": "Erro ao recuperar discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao recuperar as mensagens do servidor.",
diff --git a/www/addons/messages/lang/pt.json b/www/addons/messages/lang/pt.json
index 2ecee753b1c..e2a54737c80 100644
--- a/www/addons/messages/lang/pt.json
+++ b/www/addons/messages/lang/pt.json
@@ -9,7 +9,6 @@
     "deletemessage": "Apagar mensagem",
     "deletemessageconfirmation": "Tem a certeza que deseja apagar esta mensagem? A mesma será apagada apenas do seu histórico de mensagens, continuando visível para o utilizador que a enviou ou que recebeu a mensagem.",
     "errordeletemessage": "Erro ao eliminar a mensagem.",
-    "erroruseronlyacceptsmessagefromcontacts": "O utilizador apenas recebe mensagens dos seus contactos",
     "errorwhileretrievingcontacts": "Erro ao obter os contactos do servidor.",
     "errorwhileretrievingdiscussions": "Erro ao obter os tópicos de discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao obter as mensagens do servidor.",
diff --git a/www/addons/messages/lang/ro.json b/www/addons/messages/lang/ro.json
index e8497ebbc3a..8d12fb7b3b4 100644
--- a/www/addons/messages/lang/ro.json
+++ b/www/addons/messages/lang/ro.json
@@ -8,7 +8,6 @@
     "deletemessage": "Șterge mesaj",
     "deletemessageconfirmation": "Sunteți sigur că doriți să ștergeți acest mesaj? Va fi șters numai din istoricul mesajelor și va fi în continuare vizibil de către utilizatorul care a trimis sau a primit mesajul.",
     "errordeletemessage": "Eroare la ștergerea mesajului.",
-    "erroruseronlyacceptsmessagefromcontacts": "-",
     "errorwhileretrievingcontacts": "A apărut o eroare în găsirea contactelor pe server.",
     "errorwhileretrievingdiscussions": "A apărut o eroare în găsirea conversațiilor de pe server.",
     "errorwhileretrievingmessages": "A apărut o eroare în găsirea mesajelor de pe server.",
diff --git a/www/addons/messages/lang/tr.json b/www/addons/messages/lang/tr.json
index 27f4c2d6b0f..3b1f963f17b 100644
--- a/www/addons/messages/lang/tr.json
+++ b/www/addons/messages/lang/tr.json
@@ -6,7 +6,9 @@
     "contactname": "Adı",
     "contacts": "Kişiler",
     "message": "Mesaj gövdesi",
+    "messagepreferences": "İleti tercihleri",
     "messages": "Mesaj(lar)",
+    "newmessage": "Yeni ileti",
     "nomessages": "İleti yok.",
     "nousersfound": "Kullanıcı bulunamadı",
     "removecontact": "Kişiyi kaldır",
diff --git a/www/addons/mod/assign/lang/ar.json b/www/addons/mod/assign/lang/ar.json
index 5e26c93b68a..0fa2999789a 100644
--- a/www/addons/mod/assign/lang/ar.json
+++ b/www/addons/mod/assign/lang/ar.json
@@ -1,3 +1,49 @@
 {
-    "pluginname": "محادثة"
+    "addattempt": "اسمح بمحاولة أخرى",
+    "addnewattempt": "إضافة محاولة جديدة",
+    "addnewattemptfromprevious": "إضافة محاولة جديدة بناء على التسليم السابق",
+    "addsubmission": "أضف تسليم",
+    "allowsubmissionsanddescriptionfromdatesummary": "ستكون تفاصيل التكليف (المهمة) ونموذج التسليم مُتاح من <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "اسمح بالتسليم ابتداءّ من",
+    "allowsubmissionsfromdatesummary": "سيبدأ قبول التسليمات لهذا التكليف (المهمة) ابتداءً من <strong>{{$a}}</strong>",
+    "applytoteam": "تطبيق الدرجات والتغذية الراجعة (الملاحظات) على المجموعة بأكملها",
+    "assignmentisdue": "فات موعد التسليم",
+    "attemptnumber": "رقم المحاولة",
+    "attemptreopenmethod": "تم إعادة فتح المحاولة",
+    "attemptreopenmethod_manual": "يدوياً",
+    "attemptreopenmethod_untilpass": "تلقائياً حتى النجاح",
+    "attemptsettings": "إعدادات المحاولة",
+    "confirmsubmission": "هل أنت متأكد أنك تريد أن تُسلِّم عملك للتصحيح؟ لن تكون قادراً على إجراء أية تغييرات أخرى.",
+    "currentattempt": "هذه المحاولة {{$a}}.",
+    "currentattemptof": "هذه المحاولة رقم{{$a.attemptnumber}} ( {{$a.maxattempts}} محاولات مسموحة ).",
+    "currentgrade": "الدرجة الحالية في",
+    "duedate": "تاريخ تقديم مهمة",
+    "duedateno": "لا يوجد موعد لتقديم المهمة",
+    "editsubmission": "حرر تسليمي",
+    "grade": "درجة",
+    "graded": "تم رصد درجة",
+    "gradeoutof": "الدرجة من {{$a}}",
+    "gradingstatus": "حالة التقييم",
+    "noattempt": "لا توجد محاولات",
+    "notgraded": "لم يتم التقييم",
+    "numberofdraftsubmissions": "مسودات",
+    "numberofparticipants": "المشاركين",
+    "numberofsubmissionsneedgrading": "بحاجة لتقييم",
+    "numberofsubmittedassignments": "مسلمة",
+    "numwords": "{{$a}} كلمات",
+    "outof": "من {{$a}}",
+    "overdue": "<font color=\"red\"></font>فات موعد تسليم الوظيفة بـ: {{$a}}",
+    "savechanges": "حفظ التغييرات",
+    "submission": "تسليم",
+    "submissionslocked": "هذه الوظيفة لا تقبل التسليم الآن",
+    "submissionstatus": "حالة التسليم",
+    "submissionstatus_draft": "مسودة (غير مسلمة)",
+    "submissionstatus_marked": "تم رصد درجة",
+    "submissionstatus_submitted": "مسلمة للتقييم",
+    "submissionstatusheading": "حالة التسليم",
+    "submitassignment": "تقديم مهمة",
+    "submittedearly": "تم تسليم الوظيفة مبكرة بـ{{$a}}",
+    "submittedlate": "تم تسليم الوظيفة متأخرة بـ{{$a}}",
+    "timemodified": "وقت التعديل",
+    "timeremaining": "الزمن المتبقي"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/bg.json b/www/addons/mod/assign/lang/bg.json
index 8dd7fa540e7..295e547bd7b 100644
--- a/www/addons/mod/assign/lang/bg.json
+++ b/www/addons/mod/assign/lang/bg.json
@@ -1,3 +1,81 @@
 {
-    "pluginname": "Задание"
+    "addattempt": "Позволяване на друг опит",
+    "addnewattempt": "Позволяване на нов опит",
+    "addnewattemptfromprevious": "Добавяне на нов опит, основан на предишно предаване",
+    "addsubmission": "Добавяне на задание",
+    "allowsubmissionsanddescriptionfromdatesummary": "Данните за заданието и формулярът за предаване ще бъдат достъпни от <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Позволено предаване от",
+    "allowsubmissionsfromdatesummary": "По това задание се приемат работи от <strong>{{$a}}</strong>",
+    "applytoteam": "Прилагане на оценки и забележки към цялата група",
+    "assignmentisdue": "Заданието е приключило",
+    "attemptnumber": "Брой опити",
+    "attemptreopenmethod": "Отворени отново опити",
+    "attemptreopenmethod_manual": "Ръчно",
+    "attemptreopenmethod_untilpass": "Автоматично до завършване",
+    "attemptsettings": "Настройки на опитите",
+    "confirmsubmission": "Сигурни ли сте, че искате да предадете работата си за оценяване? След това няма да можете да правите никакви промени повече.",
+    "currentattempt": "Този опит {{$a}}.",
+    "currentattemptof": "Това е {{$a.attemptnumber}}-и опит ( от разрешените {{$a.maxattempts}} ).",
+    "currentgrade": "Оценка в дневника за оценки",
+    "cutoffdate": "Дата на отказ",
+    "defaultteam": "Група по подразбиране",
+    "duedate": "Краен срок",
+    "duedateno": "Няма краен срок",
+    "duedatereached": "Крайният срок на това задание сега е изтекъл",
+    "editingstatus": "Състояние на редактиране",
+    "editsubmission": "Редактиране на задание",
+    "extensionduedate": "Крайна дата на отлагането",
+    "grade": "Оценка",
+    "graded": "Оценена",
+    "gradedby": "Оценено от",
+    "gradedon": "Оценено на",
+    "gradeoutof": "Оценка до {{$a}}",
+    "gradingstatus": "Състояние на оценяването",
+    "groupsubmissionsettings": "Настройки за групово предаване",
+    "hiddenuser": "Участник",
+    "latesubmissions": "Закъснели предавания",
+    "latesubmissionsaccepted": "Позволено до {{$a}}",
+    "markingworkflowstate": "Отбелязване на етап на оценяване",
+    "markingworkflowstateinmarking": "В процес на оценяване",
+    "markingworkflowstateinreview": "Преглеждане",
+    "markingworkflowstatenotmarked": "Не оценени",
+    "markingworkflowstatereadyforrelease": "Готово за обявяване",
+    "markingworkflowstatereadyforreview": "Оценяването е завършено",
+    "markingworkflowstatereleased": "Обявено",
+    "noattempt": "Няма опити",
+    "nomoresubmissionsaccepted": "Само за участници, получили позволение за отлагане",
+    "noonlinesubmissions": "Това задание не изисква от Вас нищо да качвате онлайн",
+    "nosubmission": "Нищо не е изпратено по това задание",
+    "notgraded": "Неоценена",
+    "numberofdraftsubmissions": "Чернови",
+    "numberofparticipants": "Участници",
+    "numberofsubmissionsneedgrading": "Изискващи оценка",
+    "numberofsubmittedassignments": "Предадени",
+    "numberofteams": "Групи",
+    "numwords": "{{$a}} думи",
+    "outof": "{{$a.current}} от {{$a.total}}",
+    "overdue": "<font color=\"red\">Предаването на работата закъснява с {{$a}} след срока</font>",
+    "savechanges": "Записване на промените",
+    "submission": "Задание",
+    "submissioneditable": "Студентът може да редактира това задание",
+    "submissionnoteditable": "Студентът не може да редактира това задание",
+    "submissionslocked": "Това задание не приема работи за предаване",
+    "submissionstatus": "Състояние на заданието",
+    "submissionstatus_": "Непредадена",
+    "submissionstatus_draft": "Чернова (не е предадена)",
+    "submissionstatus_marked": "Оценена",
+    "submissionstatus_new": "Непредадена",
+    "submissionstatus_reopened": "Отворена отново",
+    "submissionstatus_submitted": "Предадена за оценка",
+    "submissionstatusheading": "Състояние на заданието",
+    "submissionteam": "Група",
+    "submitassignment": "Предаване на задание",
+    "submitassignment_help": "Предадете ли веднъж работата по заданието, Вие няма да можете да я променяте повече.",
+    "submittedearly": "Работата е предадена {{$a}} по-рано",
+    "submittedlate": "Работата по заданието е предадена с {{$a}} закъснение",
+    "timemodified": "Последна промяна",
+    "timeremaining": "Оставащо време",
+    "unlimitedattempts": "Неограничен",
+    "userswhoneedtosubmit": "Потребители, които трябва да предадат: {{$a}}",
+    "viewsubmission": "Преглед на предадена работа"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ca.json b/www/addons/mod/assign/lang/ca.json
index 94c3f3f5d1b..7c27bd7dff0 100644
--- a/www/addons/mod/assign/lang/ca.json
+++ b/www/addons/mod/assign/lang/ca.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Tasca"
+    "addattempt": "Permet un altre intent",
+    "addnewattempt": "Afegeix un altre intent",
+    "addnewattemptfromprevious": "Afegeix un intent nou basat en la tramesa anterior",
+    "addsubmission": "Afegeix la tramesa",
+    "allowsubmissionsanddescriptionfromdatesummary": "Els detalls de la tasca i el formulari de la tramesa estaran disponibles des de <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Permet trameses des de",
+    "allowsubmissionsfromdatesummary": "Aquesta tasca acceptarà trameses des de <strong>{{$a}}</strong>",
+    "applytoteam": "Aplica les qualificacions i la retroacció al grup sencer",
+    "assignmentisdue": "La tasca ha vençut",
+    "attemptnumber": "Número d'intent",
+    "attemptreopenmethod": "Intents reoberts",
+    "attemptreopenmethod_manual": "Manualment",
+    "attemptreopenmethod_untilpass": "Automàticament fins superació",
+    "attemptsettings": "Configuració dels intents",
+    "confirmsubmission": "Segur que voleu trametre el vostre treball per a qualificar? Ja no podreu realitzar més canvis.",
+    "currentattempt": "Aquest és l'intent {{$a}}.",
+    "currentattemptof": "Aquest és l'intent {{$a.attemptnumber}} ( {{$a.maxattempts}} intents permesos ).",
+    "currentgrade": "Qualificació actual en el llibre de qualificacions",
+    "cutoffdate": "Data límit",
+    "defaultteam": "Grup per omissió",
+    "duedate": "Data de venciment",
+    "duedateno": "Sense data de venciment",
+    "duedatereached": "La data de venciment de la tasca ja ha passat",
+    "editingstatus": "S'està editant l'estat",
+    "editsubmission": "Edita la tramesa",
+    "extensionduedate": "Data de venciment de la pròrroga",
+    "grade": "Qualificació",
+    "graded": "Qualificada",
+    "gradedby": "Qualificat per",
+    "gradedon": "Qualificat el",
+    "gradeoutof": "Qualificació sobre {{$a}}",
+    "gradingstatus": "Estat de la qualificació",
+    "groupsubmissionsettings": "Paràmetres de la tramesa en grup",
+    "hiddenuser": "Participant",
+    "latesubmissions": "Trameses fora de termini",
+    "latesubmissionsaccepted": "Permès fins {{$a}}",
+    "markingworkflowstate": "Estat del flux d'avaluació",
+    "markingworkflowstateinmarking": "Avaluant-se",
+    "markingworkflowstateinreview": "En revisió",
+    "markingworkflowstatenotmarked": "No avaluada",
+    "markingworkflowstatereadyforrelease": "A punt per publicar",
+    "markingworkflowstatereadyforreview": "Avaluació completada",
+    "markingworkflowstatereleased": "Publicada",
+    "multipleteams": "Membre de més d'un grup",
+    "noattempt": "Cap intent",
+    "nomoresubmissionsaccepted": "Sols és permès per als participants que tenen concedida una pròrroga.",
+    "noonlinesubmissions": "Aquesta tasca no requereix que trameteu res en línia.",
+    "nosubmission": "No s'ha tramès res per a aquesta tasca",
+    "noteam": "No és membre de cap grup",
+    "notgraded": "Sense qualificació",
+    "numberofdraftsubmissions": "Esborranys",
+    "numberofparticipants": "Participants",
+    "numberofsubmissionsneedgrading": "Necessiten qualificació",
+    "numberofsubmittedassignments": "S'han tramès",
+    "numberofteams": "Grups",
+    "numwords": "{{$a}} paraules",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">La tasca ha vençut fa: {{$a}}</font>",
+    "savechanges": "Desa els canvis",
+    "submission": "Tramesa",
+    "submissioneditable": "L'estudiant pot editar aquesta tramesa",
+    "submissionnoteditable": "L'estudiant no pot editar aquesta tramesa",
+    "submissionslocked": "Aquesta tasca no accepta trameses",
+    "submissionstatus": "Estat de la tramesa",
+    "submissionstatus_": "No s'ha tramès",
+    "submissionstatus_draft": "Esborrany (no s'ha tramès la versió definitiva)",
+    "submissionstatus_marked": "Qualificada",
+    "submissionstatus_new": "No s'ha tramès",
+    "submissionstatus_reopened": "Reoberta",
+    "submissionstatus_submitted": "S'ha tramès per a qualificar",
+    "submissionstatusheading": "Estat de la tramesa",
+    "submissionteam": "Grup",
+    "submitassignment": "Trametre tasca",
+    "submitassignment_help": "Un cop s'hagi tramès la tasca no podreu fer més canvis",
+    "submittedearly": "La tasca s'ha tramès {{$a}} abans del límit",
+    "submittedlate": "La tasca s'ha tramès {{$a}} tard",
+    "timemodified": "Darrera modificació",
+    "timeremaining": "Temps restant",
+    "ungroupedusers": "El paràmetre «Cal formar part d'un grup per fer una tramesa» està activat, i alguns usuaris o no són membres de cap grup o són membres de més d'un grup, per la qual cosa no poden fer trameses.",
+    "unlimitedattempts": "Il·limitats",
+    "userswhoneedtosubmit": "Usuaris que manquen per trametre: {{$a}}",
+    "viewsubmission": "Visualitza la tramesa"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/cs.json b/www/addons/mod/assign/lang/cs.json
index e24d21f8567..9a93eccf489 100644
--- a/www/addons/mod/assign/lang/cs.json
+++ b/www/addons/mod/assign/lang/cs.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Úkol"
+    "addattempt": "Povolit další pokus",
+    "addnewattempt": "Přidat nový pokus",
+    "addnewattemptfromprevious": "Přidat nový pokus na základě posledního odevzdání",
+    "addsubmission": "Přidat řešení úkolu",
+    "allowsubmissionsanddescriptionfromdatesummary": "Detaily úkolu a formulář pro odevzdání bude dostupný od <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Povolit odevzdání úkolů od",
+    "allowsubmissionsfromdatesummary": "Odevzdat úkol bude možné od <strong>{{$a}}</strong>",
+    "applytoteam": "Použít hodnocení pro celou skupinu",
+    "assignmentisdue": "Úkol je zpožděn",
+    "attemptnumber": "Číslo pokusu",
+    "attemptreopenmethod": "Opětovné otevření pokusů",
+    "attemptreopenmethod_manual": "Ručně",
+    "attemptreopenmethod_untilpass": "Automaticky dokud neuspěje",
+    "attemptsettings": "Nastavení pokusů",
+    "confirmsubmission": "Jste si jisti, že chcete odeslat svou práci k hodnocení? Nebudete moci provádět žádné další změny.",
+    "currentattempt": "Toto je pokus č. {{$a}}.",
+    "currentattemptof": "Toto je pokus č. {{$a.attemptnumber}} (celkem je povoleno {{$a.maxattempts}} pokusů).",
+    "currentgrade": "Momentální známka v klasifikaci kurzu",
+    "cutoffdate": "Datum ukončení",
+    "defaultteam": "Výchozí skupina",
+    "duedate": "Termín odevzdání",
+    "duedateno": "Bez termínu odevzdání",
+    "duedatereached": "Termín pro odevzdání tohoto úkolu vypršel",
+    "editingstatus": "Stav úprav",
+    "editsubmission": "Upravit řešení úkolu",
+    "extensionduedate": "Prodloužený termín odevzdání",
+    "grade": "Známka",
+    "graded": "Udělena známka",
+    "gradedby": "Hodnoceno",
+    "gradedon": "Hodnoceno na",
+    "gradeoutof": "Hodnoceno z {{$a}}",
+    "gradingstatus": "Stav hodnocení",
+    "groupsubmissionsettings": "Nastavení skupinového řešení",
+    "hiddenuser": "Účastník",
+    "latesubmissions": "Zpožděné odevzdané úkoly",
+    "latesubmissionsaccepted": "Povoleno do  {{$a}}",
+    "markingworkflowstate": "Stav postupu známkování",
+    "markingworkflowstateinmarking": "Známkováno",
+    "markingworkflowstateinreview": "Revidováno",
+    "markingworkflowstatenotmarked": "Bez známky",
+    "markingworkflowstatereadyforrelease": "Připraveno ke zveřejnění",
+    "markingworkflowstatereadyforreview": "Známkování dokončeno",
+    "markingworkflowstatereleased": "Zveřejněno",
+    "multipleteams": "Člen více než jedné skupiny",
+    "noattempt": "Neodevzdáno",
+    "nomoresubmissionsaccepted": "Povoleny pouze pro účastníky, kterým byl prodloužen termín",
+    "noonlinesubmissions": "Tento úkol nevyžaduje odpověď online",
+    "nosubmission": "K tomuto úkolu nebylo nic odevzdáno",
+    "noteam": "Není členem žádné skupiny",
+    "notgraded": "Nehodnoceno",
+    "numberofdraftsubmissions": "Návrhy",
+    "numberofparticipants": "Účastníci",
+    "numberofsubmissionsneedgrading": "Nutno ohodnotit",
+    "numberofsubmittedassignments": "Odevzdáno",
+    "numberofteams": "Skupiny",
+    "numwords": "{{$a}} slov",
+    "outof": "{{$a.current}} ze {{$a.total}}",
+    "overdue": "<font color=\"red\">Úkol má zpoždění: {{$a}}</font>",
+    "savechanges": "Uložit změny",
+    "submission": "Odevzdané úkoly",
+    "submissioneditable": "Student může upravit tento úkol",
+    "submissionnoteditable": "Student nemůže upravit tento úkol",
+    "submissionslocked": "V tomto úkolu nelze odevzdat práci",
+    "submissionstatus": "Stav odevzdání úkolu",
+    "submissionstatus_": "Neodesláno",
+    "submissionstatus_draft": "Návrh (neodesláno)",
+    "submissionstatus_marked": "Udělena známka",
+    "submissionstatus_new": "Žádné řešení úkolu",
+    "submissionstatus_reopened": "Znovu otevřeno",
+    "submissionstatus_submitted": "Odesláno k hodnocení",
+    "submissionstatusheading": "Stav odevzdání úkolu",
+    "submissionteam": "Skupina",
+    "submitassignment": "Odevzdat úkol",
+    "submitassignment_help": "Po odevzdání úkolu nebudete moci provádět žádné změny.",
+    "submittedearly": "Úkoly byly odevzdány {{$a}} včas",
+    "submittedlate": "Úkoly byly odevzdány {{$a}} po termínu",
+    "timemodified": "Naposledy změněno",
+    "timeremaining": "Zbývá",
+    "ungroupedusers": "Nastavení \"Vyžadovat zařazení do skupiny\" je zapnuto a někteří uživatelé nejsou  zařazeni do skupiny, bude jim to bránit v odevzdání úkolu.",
+    "unlimitedattempts": "Bez omezení",
+    "userswhoneedtosubmit": "Uživatelé, kteří potřebují odevzdat úkol:  {{$a}}",
+    "viewsubmission": "Zobrazit odevzdané úkoly"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/da.json b/www/addons/mod/assign/lang/da.json
index 8e377d9507b..827c92b5aed 100644
--- a/www/addons/mod/assign/lang/da.json
+++ b/www/addons/mod/assign/lang/da.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Opgave"
+    "addattempt": "Tillad endnu et forsøg på besvarelse",
+    "addnewattempt": "Tillad et nyt forsøg på besvarelse",
+    "addnewattemptfromprevious": "Tilføj et nyt forsøg baseret på tidligere aflevering",
+    "addsubmission": "Besvar opgaven",
+    "allowsubmissionsanddescriptionfromdatesummary": "Opgave informationer og afleveringsblanket er tilgængelig fra <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Tillad aflevering fra",
+    "allowsubmissionsfromdatesummary": "Denne opgave accepterer afleveringer fra <strong>{{$a}}</strong>",
+    "applytoteam": "Anvend karakterer og feedback til hele gruppen",
+    "assignmentisdue": "Afleveringsfristen er overskredet",
+    "attemptnumber": "Antal forsøg på besvarelse",
+    "attemptreopenmethod": "Besvarelser som er blevet genåbnet",
+    "attemptreopenmethod_manual": "Manuelt",
+    "attemptreopenmethod_untilpass": "Automatisk indtil bestået",
+    "attemptsettings": "Indstillinger for besvarelsesforsøg",
+    "confirmsubmission": "Er du sikker på at du vil aflevere opgaven til bedømmelse nu? Bagefter vil du ikke kunne ændre den",
+    "currentattempt": "Dette er besvarelsesforsøg {{$a}}.",
+    "currentattemptof": "Dette er besvarelsesforsøg {{$a.attemptnumber}} ( {{$a.maxattempts}} tilladt ).",
+    "currentgrade": "Aktuelle karakter i karakterbogen",
+    "cutoffdate": "Skæringsdato",
+    "defaultteam": "Standardgruppe",
+    "duedate": "Afleveringsdato",
+    "duedateno": "Ingen afleveringsfrist",
+    "duedatereached": "Afleveringsfristen er overskredet",
+    "editingstatus": "Redigeringsstatus",
+    "editsubmission": "Rediger opgavebesvarelse",
+    "extensionduedate": "Forfaldsdato forlænget",
+    "grade": "Karakter",
+    "graded": "Bedømt",
+    "gradedby": "Bedømt af",
+    "gradedon": "Bedømt",
+    "gradeoutof": "Bedømmelse af {{$a}}",
+    "gradingstatus": "Vurderingsstatus",
+    "groupsubmissionsettings": "Indstillinger for gruppeaflevering",
+    "hiddenuser": "Deltager",
+    "latesubmissions": "Forsinkede opgaveafleveringer",
+    "latesubmissionsaccepted": "Tilladt indtil {{$a}}",
+    "markingworkflowstate": "Bedømmelsesstatus",
+    "markingworkflowstateinmarking": "Bedømmelse i gang",
+    "markingworkflowstateinreview": "Gennemgås",
+    "markingworkflowstatenotmarked": "Ikke bedømt",
+    "markingworkflowstatereadyforrelease": "Klar til udgivelse",
+    "markingworkflowstatereadyforreview": "Bedømmelse fuldført",
+    "markingworkflowstatereleased": "Udgivet",
+    "multipleteams": "Medlem af mere end en gruppe",
+    "noattempt": "Intet besvarelsesforsøg",
+    "nomoresubmissionsaccepted": "Kun tilladt for deltagere, der har fået udsættelse",
+    "noonlinesubmissions": "Denne opgave kræver ikke at du afleverer noget online",
+    "nosubmission": "Der er endnu ikke afleveret noget til denne opgave",
+    "noteam": "Ikke medlem af nogen grupper",
+    "notgraded": "Ikke bedømt",
+    "numberofdraftsubmissions": "Kladder",
+    "numberofparticipants": "Deltagere",
+    "numberofsubmissionsneedgrading": "Mangler bedømmelse",
+    "numberofsubmittedassignments": "Afleveret",
+    "numberofteams": "Grupper",
+    "numwords": "{{$a}} ord",
+    "outof": "{{$a.current}} ud af {{$a.total}}",
+    "overdue": "<font color=\"red\">Afleveringsdatoen er overskredet med {{$a}}</font>",
+    "savechanges": "Gem ændringer",
+    "submission": "Aflevering",
+    "submissioneditable": "Den studerende kan redigere opgaven.",
+    "submissionnoteditable": "Den studerende kan ikke redigere denne opgave",
+    "submissionslocked": "Denne opgave accepterer ikke afleveringer",
+    "submissionstatus": "Afleveringsstatus",
+    "submissionstatus_": "Ingen opgavebesvarelse",
+    "submissionstatus_draft": "Kladde (ikke afleveret)",
+    "submissionstatus_marked": "Bedømt",
+    "submissionstatus_new": "Ingen opgavebesvarelse",
+    "submissionstatus_reopened": "Genåbnet",
+    "submissionstatus_submitted": "Afleveret til bedømmelse",
+    "submissionstatusheading": "Afleveringsstatus",
+    "submissionteam": "Gruppe",
+    "submitassignment": "Aflever",
+    "submitassignment_help": "Når opgaven er afleveret kan du ikke længere foretage ændringer i den.",
+    "submittedearly": "Opgaven blev afleveret {{$a}} for tidligt",
+    "submittedlate": "Opgaven blev afleveret {{$a}} for sent",
+    "timemodified": "Seneste ændring",
+    "timeremaining": "Resterende tid",
+    "ungroupedusers": "Indstillingen 'Kræv gruppeaflevering' er slået til, og nogle brugere er forhindret i at aflevere opgaver da de ikke er med i en gruppe eller er medlem af mere end en gruppe.",
+    "unlimitedattempts": "Ubegrænset",
+    "userswhoneedtosubmit": "Brugere, der skal aflevere: {{$a}}",
+    "viewsubmission": "Se aflevering"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/de.json b/www/addons/mod/assign/lang/de.json
index 27488f5022a..f7bb47cb670 100644
--- a/www/addons/mod/assign/lang/de.json
+++ b/www/addons/mod/assign/lang/de.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Aufgabe"
+    "addattempt": "Einen weiteren Versuch zulassen",
+    "addnewattempt": "Neuen Versuch hinzufügen",
+    "addnewattemptfromprevious": "Neuen Versuch auf Grundlage der vorherigen Lösung abgeben",
+    "addsubmission": "Abgabe hinzufügen",
+    "allowsubmissionsanddescriptionfromdatesummary": "Die Aufgabendetails und die Lösungsabgabe stehen zur Verfügung ab <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Abgabebeginn",
+    "allowsubmissionsfromdatesummary": "Abgabe möglich ab <strong>{{$a}}</strong>",
+    "applytoteam": "Bewertungen und Feedback der gesamten Gruppe zuweisen.",
+    "assignmentisdue": "Das Abgabeende ist vorbei",
+    "attemptnumber": "Nummer des Versuchs",
+    "attemptreopenmethod": "Versuche erneut bearbeitbar",
+    "attemptreopenmethod_manual": "Manuell",
+    "attemptreopenmethod_untilpass": "Automatisch bis zum Bestehen",
+    "attemptsettings": "Einstellungen für Versuche",
+    "confirmsubmission": "Wenn Sie nun Ihre Lösung zur Bewertung einreichen, können Sie keine Änderungen mehr vornehmen. Sind Sie sich sicher?",
+    "currentattempt": "Dies ist Versuch {{$a}}",
+    "currentattemptof": "Versuch {{$a.attemptnumber}} (mögliche Versuche {{$a.maxattempts}})",
+    "currentgrade": "Aktuelle Bewertung",
+    "cutoffdate": "Letzte Abgabemöglichkeit",
+    "defaultteam": "Standard-Gruppe",
+    "duedate": "Fälligkeitsdatum",
+    "duedateno": "Kein Fälligkeitsdatum",
+    "duedatereached": "Das Fälligkeitsdatum für diese Aufgabe ist vorbei.",
+    "editingstatus": "Bearbeitungsstatus",
+    "editsubmission": "Lösung bearbeiten",
+    "extensionduedate": "Verlängerung des Fälligkeitsdatums",
+    "grade": "Bewertung",
+    "graded": "Bewertet",
+    "gradedby": "Bewertet von",
+    "gradedon": "Bewertet am",
+    "gradeoutof": "Bewertung (max. {{$a}})",
+    "gradingstatus": "Bewertungsstatus",
+    "groupsubmissionsettings": "Einstellungen für Gruppeneinreichungen",
+    "hiddenuser": "Teilnehmer/in",
+    "latesubmissions": "Verspätete Abgaben",
+    "latesubmissionsaccepted": "Erlaubt bis {{$a}}",
+    "markingworkflowstate": "Status des Bewertungsworkflows",
+    "markingworkflowstateinmarking": "In Bewertung",
+    "markingworkflowstateinreview": "Wird überprüft",
+    "markingworkflowstatenotmarked": "Unbewertet",
+    "markingworkflowstatereadyforrelease": "Fertig zur Freigabe",
+    "markingworkflowstatereadyforreview": "Bewertung abgeschlossen",
+    "markingworkflowstatereleased": "Freigegeben",
+    "multipleteams": "Mitglied in mehreren Gruppen",
+    "noattempt": "Kein Versuch",
+    "nomoresubmissionsaccepted": "Weitere Abgaben sind nur zugelassen wenn der Abgabezeitraum verlängert wurde.",
+    "noonlinesubmissions": "Diese Aufgabe benötigt keine Online-Abgabe",
+    "nosubmission": "Für diese Aufgabe wurde nichts abgegeben",
+    "noteam": "Nicht Mitglied einer Gruppe",
+    "notgraded": "Nicht bewertet",
+    "numberofdraftsubmissions": "Entwürfe",
+    "numberofparticipants": "Teilnehmer/innen",
+    "numberofsubmissionsneedgrading": "Bewertung erwartet",
+    "numberofsubmittedassignments": "Abgegeben",
+    "numberofteams": "Gruppen",
+    "numwords": "{{$a}} Wörter",
+    "outof": "{{$a.current}} von {{$a.total}}",
+    "overdue": "<font color=\"red\">Abgabeende überschritten seit: {{$a}}</font>",
+    "savechanges": "Änderungen sichern",
+    "submission": "Abgabe",
+    "submissioneditable": "Teilnehmer/innen können eingereichte Lösung bearbeiten",
+    "submissionnoteditable": "Teilnehmer/innen können eingereichte Lösung nicht bearbeiten",
+    "submissionslocked": "Bei dieser Aufgabe können derzeit keine Lösungen abgeben werden.",
+    "submissionstatus": "Abgabestatus",
+    "submissionstatus_": "Keine Abgabe",
+    "submissionstatus_draft": "Entwurf (nicht abgegeben)",
+    "submissionstatus_marked": "Bewertet",
+    "submissionstatus_new": "Keine Abgabe",
+    "submissionstatus_reopened": "Erneut geöffnet",
+    "submissionstatus_submitted": "Zur Bewertung abgegeben",
+    "submissionstatusheading": "Abgabestatus",
+    "submissionteam": "Gruppe",
+    "submitassignment": "Aufgabe abgeben",
+    "submitassignment_help": "Sobald diese Aufgabe abgegeben wird, sind keine weiteren Änderungen mehr möglich",
+    "submittedearly": "Aufgabe wurde {{$a}} vor dem Abgabeende abgegeben",
+    "submittedlate": "Aufgabe wurde {{$a}} verspätet abgegeben",
+    "timemodified": "Zuletzt geändert",
+    "timeremaining": "Verbleibende Zeit",
+    "ungroupedusers": "Die Option 'Gruppe notwendig, um etwas abgeben zu können' ist aktiviert. Es gibt Personen ohne Gruppe oder Personen mit mehreren Gruppen, die deshalb nichts abgeben können.",
+    "unlimitedattempts": "Unbegrenzt",
+    "userswhoneedtosubmit": "Nutzer/innen, die noch nicht abgegeben haben: {{$a}}",
+    "viewsubmission": "Abgabe anzeigen"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/el.json b/www/addons/mod/assign/lang/el.json
index 22bd206694b..321937193aa 100644
--- a/www/addons/mod/assign/lang/el.json
+++ b/www/addons/mod/assign/lang/el.json
@@ -1,13 +1,67 @@
 {
     "acceptsubmissionstatement": "Παρακαλώ δεχθείτε τη δήλωση υποβολής.",
+    "addattempt": "Επέτρεψε και άλλη προσπάθεια",
+    "addnewattempt": "Πρόσθεσε μία νέα προσπάθεια",
+    "addnewattemptfromprevious": "Πρόσθεσε μία νέα προσπάθεια βασισμένη σε προηγούμενη υποβολή",
+    "addsubmission": "Υποβολή",
+    "allowsubmissionsfromdate": "Επέτρεψε υποβολές από",
+    "assignmentisdue": "Η προθεσμία έχει λήξει",
+    "attemptnumber": "Αριθμός προσπάθειας",
+    "attemptreopenmethod": "Να ξανανοίξουν οι προσπάθειες",
+    "attemptreopenmethod_manual": "Χειροκίνητα",
+    "attemptsettings": "Ρυθμίσεις προσπάθειας",
     "cannoteditduetostatementsubmission": "Δεν μπορείτε να προσθέσετε ή να επεξεργαστείτε μια υποβολή στην εφαρμογή, γιατί δεν κατέστη δυνατό να ανακτηθεί η δήλωση υποβολής από το site.",
     "cannotgradefromapp": "Μερικές μέθοδοι ταξινόμησης δεν υποστηρίζονται ακόμα από την εφαρμογή και δεν μπορεί να τροποποιηθεί.",
     "cannotsubmitduetostatementsubmission": "Δεν μπορείτε να υποβάλετε για βαθμολόγηση στην εφαρμογή, γιατί δεν κατέστη δυνατό να ανακτηθεί η δήλωση υποβολής από το site.",
+    "currentattempt": "Αυτή είναι η {{$a}} προσπάθεια.",
+    "currentattemptof": "Αυτή είναι η  {{$a.attemptnumber}} προσπάθεια  ( {{$a.maxattempts}} προσπάθειες επιτρέπονται).",
+    "currentgrade": "Τωρινός βαθμός στο βαθμολόγιο",
+    "defaultteam": "Προεπιλεγμένη ομάδα",
+    "duedate": "Καταληκτική ημερομηνία",
+    "duedateno": "Χωρίς καταληκτική ημερομηνία",
+    "editingstatus": "Επεξεργασία κατάστασης",
+    "editsubmission": "Τροποποίηση της υποβολής μου",
     "erroreditpluginsnotsupported": "Δεν μπορείτε να προσθέσετε ή να επεξεργαστείτε μια υποβολή στην εφαρμογή επειδή ορισμένα plugins δεν υποστηρίζονται για επεξεργασία:",
     "errorshowinginformation": "Δεν μπορούν να εμφανιστούν οι πληροφορίες υποβολής",
+    "grade": "Βαθμός",
+    "graded": "Βαθμολογήθηκε",
+    "gradedby": "Βαθμολογήθηκε από",
+    "gradedon": "Βαθμολογήθηκε στις",
+    "gradingstatus": "Κατάσταση Βαθμολόγησης",
+    "groupsubmissionsettings": "Ρυθμίσεις ομαδικής υποβολής",
+    "latesubmissions": "Εκπρόθεσμες υποβολές",
+    "noattempt": "Καμία προσπάθεια",
+    "nomoresubmissionsaccepted": "Επιτρέπονται μόνο στους συμμετέχοντες που τους έχει χορηγηθεί παράταση",
+    "nosubmission": "Δεν έχει υποβληθεί τίποτα για την εργασία αυτή",
     "notallparticipantsareshown": "Συμμετέχοντες χωρίς υποβολές δεν προβάλλονται",
+    "notgraded": "Χωρίς βαθμό",
+    "numberofdraftsubmissions": "Προσχέδια",
+    "numberofparticipants": "Συμμετέχοντες",
+    "numberofsubmissionsneedgrading": "Απαιτείται βαθμολόγηση",
+    "numberofsubmittedassignments": "Υποβλήθηκε",
+    "numberofteams": "Ομάδες",
+    "numwords": "{{$a}} λέξεις",
+    "outof": "Από τα {{$a}}",
+    "overdue": "<font color=\"red\">Η εργασία είναι εκπρόθεσμη για: {{$a}}</font>",
+    "savechanges": "Αποθήκευση αλλαγών",
+    "submission": "Υποβολή",
+    "submissionnoteditable": "Δε μπορεί να γίνει επεξεργασία της υποβολής",
     "submissionnotsupported": "Η υποβολή αυτή δεν υποστηρίζεται από την εφαρμογή και δεν μπορεί να περιέχει όλα τα στοιχεία που",
+    "submissionstatus": "Κατάσταση Υποβολής",
+    "submissionstatus_": "Καμία υποβολή",
+    "submissionstatus_draft": "Πρόχειρο (δεν υποβλήθηκε)",
+    "submissionstatus_marked": "Βαθμολογήθηκε",
+    "submissionstatus_new": "Καμία υποβολή",
+    "submissionstatus_submitted": "Υποβλήθηκε για βαθμολόγηση",
+    "submissionstatusheading": "Κατάσταση Υποβολής",
+    "submissionteam": "Ομάδα",
+    "submitassignment": "Υποβολή εργασίας",
+    "submittedearly": "Η εργασία υποβλήθηκε νωρίτερα κατά {{$a}}",
+    "submittedlate": "Η εργασία υποβλήθηκε {{$a}} αργότερα",
+    "timemodified": "Τελευταία Τροποποίηση",
+    "timeremaining": "Υπολειπόμενος χρόνος",
     "userwithid": "Ο χρήστης με id {{id}}",
+    "viewsubmission": "Προβολή υποβολής",
     "warningsubmissiongrademodified": "Ο βαθμός υποβολής τροποποιήθηκε στο site.",
     "warningsubmissionmodified": "Η υποβολή του χρήστη τροποποιήθηκε στο site."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/es-mx.json b/www/addons/mod/assign/lang/es-mx.json
index c2d8b025be3..a8dc6545d72 100644
--- a/www/addons/mod/assign/lang/es-mx.json
+++ b/www/addons/mod/assign/lang/es-mx.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Tarea"
+    "addattempt": "Permitir otro intento",
+    "addnewattempt": "Añadir un nuevo intento",
+    "addnewattemptfromprevious": "Añadir un nuevo intento basado en un envío anterior",
+    "addsubmission": "Añadir envío",
+    "allowsubmissionsanddescriptionfromdatesummary": "Los detalles de la tarea y el formato de entrega estarán disponibles en <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Permitir envíos desde",
+    "allowsubmissionsfromdatesummary": "Esta tarea aceptará entregas de <strong>{{$a}}</strong>",
+    "applytoteam": "Aplicar calificaciones y retroalimentación a todo el equipo",
+    "assignmentisdue": "La tarea ha vencido",
+    "attemptnumber": "Número de intento",
+    "attemptreopenmethod": "Intentos reabiertos",
+    "attemptreopenmethod_manual": "Manualmente",
+    "attemptreopenmethod_untilpass": "Automáticamente hasta pasar",
+    "attemptsettings": "Configuraciones del intento",
+    "confirmsubmission": "¿Está Usted seguro de querer enviar su trabajo para que sea calificado? Usted ya no le podrá hacer más cambios",
+    "currentattempt": "Éste es el intento {{$a}}.",
+    "currentattemptof": "Éste es el intento {{$a.attemptnumber}} ( {{$a.maxattempts}} intentos permitidos ).",
+    "currentgrade": "Calificación actual en el libro",
+    "cutoffdate": "Fecha de corte",
+    "defaultteam": "Grupo por defecto",
+    "duedate": "Fecha de entrega",
+    "duedateno": "No hay fecha de entrega",
+    "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
+    "editingstatus": "Estatus de edición",
+    "editsubmission": "Editar envío",
+    "extensionduedate": "Fecha de entrega extendida",
+    "grade": "Calificación",
+    "graded": "Calificado",
+    "gradedby": "Calificado por",
+    "gradedon": "Calificado en",
+    "gradeoutof": "Calificación sobre {{$a}}",
+    "gradingstatus": "Estatus de calificación",
+    "groupsubmissionsettings": "Configuraciones de envío de grupo",
+    "hiddenuser": "Participante",
+    "latesubmissions": "Envíos retrasados",
+    "latesubmissionsaccepted": "Permitido hasta {{$a}}",
+    "markingworkflowstate": "Estado del flujograma calificador",
+    "markingworkflowstateinmarking": "En calificación",
+    "markingworkflowstateinreview": "En revisión",
+    "markingworkflowstatenotmarked": "No calificado",
+    "markingworkflowstatereadyforrelease": "Listo para liberar",
+    "markingworkflowstatereadyforreview": "Calificación completada",
+    "markingworkflowstatereleased": "Liberada",
+    "multipleteams": "Miembro de más de un grupo",
+    "noattempt": "Sin intento",
+    "nomoresubmissionsaccepted": "Solamente permitido para participantes que hayan recibido una extensión",
+    "noonlinesubmissions": "Esta tarea no requiere que usted envíe nada de forma online",
+    "nosubmission": "No se ha enviado nada en esta tarea",
+    "noteam": "No es miembro de ningún grupo",
+    "notgraded": "No calificado",
+    "numberofdraftsubmissions": "Borradores",
+    "numberofparticipants": "Participantes",
+    "numberofsubmissionsneedgrading": "Necesita calificarse",
+    "numberofsubmittedassignments": "Enviados",
+    "numberofteams": "Grupos",
+    "numwords": "{{$a}} palabras",
+    "outof": "{{$a.current}} de un total de {{$a.total}}",
+    "overdue": "<font color=\"red\">La Tarea está retrasada por: {{$a}}</font>",
+    "savechanges": "Guardar cambios",
+    "submission": "Entrega",
+    "submissioneditable": "Los estudiantes pueden editar este envío",
+    "submissionnoteditable": "Los estudiantes no pueden editar este envío",
+    "submissionslocked": "Esta tarea no acepta entregas",
+    "submissionstatus": "Estatus de la entrega",
+    "submissionstatus_": "Sin entrega",
+    "submissionstatus_draft": "Borrador (no enviado)",
+    "submissionstatus_marked": "Calificado",
+    "submissionstatus_new": "Sin envío",
+    "submissionstatus_reopened": "Reabierto",
+    "submissionstatus_submitted": "Enviado para calificar",
+    "submissionstatusheading": "Estatus de la entrega",
+    "submissionteam": "Grupo",
+    "submitassignment": "Enviar tarea",
+    "submitassignment_help": "Una vez que esta tarea se haya enviado, usted no podrá hacerle más cambios",
+    "submittedearly": "La tarea fue enviada {{$a}} antes",
+    "submittedlate": "La tarea fue enviada {{$a}} después",
+    "timemodified": "Última modificación",
+    "timeremaining": "Tiempo restante",
+    "ungroupedusers": "La configuración de 'Requerir grupo para hacer envío' está activada y algunos usuarios, o no son miembros de ningún grupo, o son miembros de más de un grupo, por lo que no pueden hacer envíos.",
+    "unlimitedattempts": "Ilimitados",
+    "userswhoneedtosubmit": "Usuarios que necesitan enviar: {{$a}}",
+    "viewsubmission": "Ver entrega"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/es.json b/www/addons/mod/assign/lang/es.json
index c2d8b025be3..147b4119e60 100644
--- a/www/addons/mod/assign/lang/es.json
+++ b/www/addons/mod/assign/lang/es.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Tarea"
+    "addattempt": "Permitir otro intento",
+    "addnewattempt": "Añadir una nueva entrega",
+    "addnewattemptfromprevious": "Añadir un nuevo intento basado en el envío anterior",
+    "addsubmission": "Agregar entrega",
+    "allowsubmissionsanddescriptionfromdatesummary": "Los detalles de la tarea y el formulario de entregas estarán disponibles en <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Permitir entregas desde",
+    "allowsubmissionsfromdatesummary": "Esta tarea aceptará entregas desde el <strong>{{$a}}</strong>",
+    "applytoteam": "Aplicar las mismas calificaciones y comentarios al grupo completo",
+    "assignmentisdue": "La tarea ha vencido",
+    "attemptnumber": "Número del intento",
+    "attemptreopenmethod": "Permitir reapertura",
+    "attemptreopenmethod_manual": "Manual",
+    "attemptreopenmethod_untilpass": "Automática hasta aprobar",
+    "attemptsettings": "Configuración de intentos",
+    "confirmsubmission": "¿Está seguro que quiere enviar su trabajo para que sea evaluado? Una vez enviado ya no podrá realizar modificaciones.",
+    "currentattempt": "Este es el intento {{$a}}.",
+    "currentattemptof": "Este es el intento {{$a.attemptnumber}} ( {{$a.maxattempts}} intentos permitidos ).",
+    "currentgrade": "Calificación actual en el libro de calificaciones",
+    "cutoffdate": "Fecha límite",
+    "defaultteam": "Grupo predeterminado",
+    "duedate": "Fecha de entrega",
+    "duedateno": "No hay fecha de entrega",
+    "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
+    "editingstatus": "Edición de estado",
+    "editsubmission": "Editar entrega",
+    "extensionduedate": "Ampliar plazo",
+    "grade": "Calificación",
+    "graded": "Calificado",
+    "gradedby": "Calificado por",
+    "gradedon": "Calificado sobre",
+    "gradeoutof": "Calificación sobre {{$a}}",
+    "gradingstatus": "Estado de la calificación",
+    "groupsubmissionsettings": "Configuración de entrega por grupo",
+    "hiddenuser": "Participante",
+    "latesubmissions": "Entrega fuera de plazo",
+    "latesubmissionsaccepted": "Permitdo hasta {{$a}}",
+    "markingworkflowstate": "Estado del workflow de marcas",
+    "markingworkflowstateinmarking": "Marcando",
+    "markingworkflowstateinreview": "En revisión",
+    "markingworkflowstatenotmarked": "No marcada",
+    "markingworkflowstatereadyforrelease": "Lista para entregar",
+    "markingworkflowstatereadyforreview": "Marcado completo",
+    "markingworkflowstatereleased": "Entregada",
+    "multipleteams": "Miembro de más de un grupo.",
+    "noattempt": "No entregado",
+    "nomoresubmissionsaccepted": "No se aceptan más entregas",
+    "noonlinesubmissions": "Esta tarea no requiere que usted envíe nada de forma online",
+    "nosubmission": "No se ha enviado nada en esta tarea",
+    "noteam": "No perteneces a ningún grupo.",
+    "notgraded": "Sin calificar",
+    "numberofdraftsubmissions": "Borradores",
+    "numberofparticipants": "Participantes",
+    "numberofsubmissionsneedgrading": "Pendientes por calificar",
+    "numberofsubmittedassignments": "Enviados",
+    "numberofteams": "Grupos",
+    "numwords": "{{$a}} palabras",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">La Tarea está retrasada por: {{$a}}</font>",
+    "savechanges": "Guardar cambios",
+    "submission": "Entrega",
+    "submissioneditable": "El estudiante puede editar esta entrega",
+    "submissionnoteditable": "El estudiante no puede editar esta entrega",
+    "submissionslocked": "Esta tarea no acepta entregas",
+    "submissionstatus": "Estado de la entrega",
+    "submissionstatus_": "Sin entrega",
+    "submissionstatus_draft": "Borrador (no enviado)",
+    "submissionstatus_marked": "Calificado",
+    "submissionstatus_new": "No entregado",
+    "submissionstatus_reopened": "Reabierto",
+    "submissionstatus_submitted": "Enviado para calificar",
+    "submissionstatusheading": "Estado de la entrega",
+    "submissionteam": "Grupo",
+    "submitassignment": "Enviar tarea",
+    "submitassignment_help": "Una vez que esta tarea se haya enviado usted no podrá hacer más cambios.",
+    "submittedearly": "La tarea fue enviada {{$a}} antes",
+    "submittedlate": "La tarea fue enviada {{$a}} después",
+    "timemodified": "Última modificación",
+    "timeremaining": "Tiempo restante",
+    "ungroupedusers": "Si se activa la configuración \"se requiere formar parte de un grupo para realizar la entrega\" se evitará que los usuarios no asignados a lo sgrupos realicen entregas.",
+    "unlimitedattempts": "Ilimitado",
+    "userswhoneedtosubmit": "Componentes del equipo pendientes de entrega: {{$a}}",
+    "viewsubmission": "Ver entrega"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/eu.json b/www/addons/mod/assign/lang/eu.json
index 55fbcb944f3..f72866d7d4d 100644
--- a/www/addons/mod/assign/lang/eu.json
+++ b/www/addons/mod/assign/lang/eu.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Zeregina"
+    "addattempt": "Baimendu beste saiakera bat",
+    "addnewattempt": "Gehitu beste saiakera bat",
+    "addnewattemptfromprevious": "Gehitu aurreko bidalketan oinarritutako saiakera bat",
+    "addsubmission": "Gehitu bidalketa",
+    "allowsubmissionsanddescriptionfromdatesummary": "Zereginaren nondik norakoak eta bidalketarako formularioa eskuragarri izango dituzu <strong>{{$a}}</strong>-tik aurrera",
+    "allowsubmissionsfromdate": "Baimendu bidalketak hemendik:",
+    "allowsubmissionsfromdatesummary": "Zeregin honetan bidalketak onartuko dira <strong>{{$a}}</strong>-tik aurrera",
+    "applytoteam": "Kalifikazioak eta feedbackak talde osoari aplikatu",
+    "assignmentisdue": "Epea bukatu da",
+    "attemptnumber": "Saiakera-kopurua",
+    "attemptreopenmethod": "Saiakerak berriro ireki dira",
+    "attemptreopenmethod_manual": "Eskuz",
+    "attemptreopenmethod_untilpass": "Automatikoki gainditu arte",
+    "attemptsettings": "Saiakeren ezarpenak",
+    "confirmsubmission": "Ziur al zaude zure lana bidali nahi duzula kalifikatzeko? Ezin izango duzu aldaketarik egin.",
+    "currentattempt": "Hau da {{$a}} saiakera.",
+    "currentattemptof": "Hau {{$a.attemptnumber}}. saiakera da ( {{$a.maxattempts}} saiakera onartzen dira ).",
+    "currentgrade": "Oraingo kalifikazioa kalifikazio-liburuan",
+    "cutoffdate": "Itxiera-data",
+    "defaultteam": "Berezko taldea",
+    "duedate": "Entregatze-data",
+    "duedateno": "Entregatze-datarik ez",
+    "duedatereached": "Zeregin hau bidaltzeko epea amaitu da",
+    "editingstatus": "Editatzen egoera",
+    "editsubmission": "Editatu bidalketa",
+    "extensionduedate": "Luzapenaren entregatze-data",
+    "grade": "Kalifikazioa",
+    "graded": "Kalifikatua",
+    "gradedby": "Nork kalifikatua",
+    "gradedon": "Noiz kalifikatua",
+    "gradeoutof": "Kalifikazioa ({{$a}}-(e)ra arte)",
+    "gradingstatus": "Kalifikazioaren egoera",
+    "groupsubmissionsettings": "Taldeko bidalketen ezarpenak",
+    "hiddenuser": "Partaidea",
+    "latesubmissions": "Epez kanpoko bidalketak",
+    "latesubmissionsaccepted": "Noiz arte baimendua: {{$a}}",
+    "markingworkflowstate": "Kalifikazio lan-fluxuaren egoera",
+    "markingworkflowstateinmarking": "Kalifikatzen",
+    "markingworkflowstateinreview": "Berrikusten",
+    "markingworkflowstatenotmarked": "Kalifikatu gabe",
+    "markingworkflowstatereadyforrelease": "Ikusgai jartzeko prest",
+    "markingworkflowstatereadyforreview": "Kalifikazioa osatua",
+    "markingworkflowstatereleased": "Ikusgai",
+    "multipleteams": "Talde bateko baino gehiagoko partaidea",
+    "noattempt": "Saiakerarik ez",
+    "nomoresubmissionsaccepted": "Soilik epearen luzapena jaso duten kideei baimenduta.",
+    "noonlinesubmissions": "Zeregin honek ez du ezer on-line aurkezteko eskatzen",
+    "nosubmission": "Ez dago bildalketarik zeregin honetan",
+    "noteam": "Ez zara inongo taldetako kide",
+    "notgraded": "Kalifikatu gabea",
+    "numberofdraftsubmissions": "Zirriborroak",
+    "numberofparticipants": "Partaideak",
+    "numberofsubmissionsneedgrading": "Kalifikatu beharrekoak",
+    "numberofsubmittedassignments": "Bidalita",
+    "numberofteams": "Taldeak",
+    "numwords": "{{$a}} hitz",
+    "outof": "{{$a.current}}.a {{$a.total}}-tik",
+    "overdue": "<font color=\"red\">Zeregina bidaltzeko epea amaitu da orain dela {{$a}}</font>",
+    "savechanges": "Gorde aldaketak",
+    "submission": "Bidalketa",
+    "submissioneditable": "Ikasleak bere bidalketa edita dezake",
+    "submissionnoteditable": "Ikasleak ezin du editatu bidalketa hau",
+    "submissionslocked": "Zeregin honek ez du bidalketarik onartzen",
+    "submissionstatus": "Bidalketaren egoera",
+    "submissionstatus_": "Ez dago bidalketarik",
+    "submissionstatus_draft": "Zirriborroa (bidali gabea)",
+    "submissionstatus_marked": "Kalifikatua",
+    "submissionstatus_new": "Bidalketarik ez",
+    "submissionstatus_reopened": "Berrirekita",
+    "submissionstatus_submitted": "Kalifikatzeko bidalia",
+    "submissionstatusheading": "Bidalketen egoera",
+    "submissionteam": "Taldea",
+    "submitassignment": "Bidali zeregina",
+    "submitassignment_help": "Behin zeregina bidalita, ezin izango duzu aldaketarik egin.",
+    "submittedearly": "Bidalketagaraiz bidali zen: {{$a}}",
+    "submittedlate": "Zeregina berandu bidali zen: {{$a}}",
+    "timemodified": "Azken aldaketa",
+    "timeremaining": "Geratzen den denbora",
+    "ungroupedusers": "'Taldeko kidea izatea behartu' ezarpena gaituta dago eta erabiltzaile batzuk ez dira inongo taldeko kide edo talde bat baino gehiagoko kideak dira, eta honek erabiltzaile horiek bidalketak egitea ekidingo du.",
+    "unlimitedattempts": "Mugarik gabea",
+    "userswhoneedtosubmit": "Bidalketa egin behar duten erabiltzaileak: {{$a}}",
+    "viewsubmission": "Ikusi bidalketa"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/fa.json b/www/addons/mod/assign/lang/fa.json
index 39c4a4aa427..11c00c0a8db 100644
--- a/www/addons/mod/assign/lang/fa.json
+++ b/www/addons/mod/assign/lang/fa.json
@@ -32,7 +32,7 @@
     "markingworkflowstate": "وضعیت گردش‌کار تصحیح",
     "markingworkflowstateinmarking": "درحال تصحیح",
     "markingworkflowstateinreview": "درحال بازبینی",
-    "markingworkflowstatenotmarked": "نمره داده نشده است",
+    "markingworkflowstatenotmarked": "نمره داده نشده",
     "markingworkflowstatereadyforrelease": "آمادهٔ انتشار",
     "markingworkflowstatereadyforreview": "نمره‌دهی کامل شده",
     "markingworkflowstatereleased": "منتشر‌شده",
diff --git a/www/addons/mod/assign/lang/fr.json b/www/addons/mod/assign/lang/fr.json
index c4edf3fff30..822bc477945 100644
--- a/www/addons/mod/assign/lang/fr.json
+++ b/www/addons/mod/assign/lang/fr.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Devoir"
+    "addattempt": "Autoriser une autre tentative",
+    "addnewattempt": "Ajouter une tentative",
+    "addnewattemptfromprevious": "Ajouter une tentative basée sur le travail remis précédemment",
+    "addsubmission": "Ajouter un travail",
+    "allowsubmissionsanddescriptionfromdatesummary": "Les détails du devoir et le formulaire de remise de document seront disponibles dès le <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Autoriser la remise dès le",
+    "allowsubmissionsfromdatesummary": "Ce devoir acceptera la remise de documents dès le <strong>{{$a}}</strong>",
+    "applytoteam": "Appliquer les notes et le feedback à tout le groupe",
+    "assignmentisdue": "Devoir à effectuer",
+    "attemptnumber": "Numéro de tentative",
+    "attemptreopenmethod": "Réouverture des travaux remis",
+    "attemptreopenmethod_manual": "Manuellement",
+    "attemptreopenmethod_untilpass": "Automatiquement jusqu'à réussite",
+    "attemptsettings": "Réglages de tentative",
+    "confirmsubmission": "Voulez-vous vraiment remettre votre travail pour évaluation&nbsp;? Vous ne pourrez plus effectuer de changement.",
+    "currentattempt": "Ceci est la tentative {{$a}}.",
+    "currentattemptof": "Ceci est la tentative {{$a.attemptnumber}} ({{$a.maxattempts}} tentatives autorisées).",
+    "currentgrade": "Note actuelle dans le carnet de notes",
+    "cutoffdate": "Date limite",
+    "defaultteam": "Groupe par défaut",
+    "duedate": "Date de remise",
+    "duedateno": "Pas de date de remise",
+    "duedatereached": "La date de remise de ce devoir est passée",
+    "editingstatus": "Statut d'édition",
+    "editsubmission": "Modifier le travail",
+    "extensionduedate": "Date de prolongation",
+    "grade": "Note",
+    "graded": "Noté",
+    "gradedby": "Évalué par",
+    "gradedon": "Évalué le",
+    "gradeoutof": "Note sur {{$a}}",
+    "gradingstatus": "Statut de l'évaluation",
+    "groupsubmissionsettings": "Réglages de remises en groupe",
+    "hiddenuser": "Participant",
+    "latesubmissions": "Devoirs en retard",
+    "latesubmissionsaccepted": "Permis jusqu'au {{$a}}",
+    "markingworkflowstate": "Statut du flux d'évaluation",
+    "markingworkflowstateinmarking": "En cours d'évaluation",
+    "markingworkflowstateinreview": "En relecture",
+    "markingworkflowstatenotmarked": "Non évalué",
+    "markingworkflowstatereadyforrelease": "Prêt pour publication",
+    "markingworkflowstatereadyforreview": "Évaluation terminée",
+    "markingworkflowstatereleased": "Publié",
+    "multipleteams": "Membre de plusieurs groupes",
+    "noattempt": "Aucune tentative",
+    "nomoresubmissionsaccepted": "Permis uniquement pour les participants ayant obtenu une prolongation",
+    "noonlinesubmissions": "Ce devoir ne requiert pas de fichier à remettre de votre part",
+    "nosubmission": "Rien n'a été déposé pour ce devoir",
+    "noteam": "Membre d'aucun groupe",
+    "notgraded": "Pas évalué",
+    "numberofdraftsubmissions": "Brouillons",
+    "numberofparticipants": "Participants",
+    "numberofsubmissionsneedgrading": "Nécessitant évaluation",
+    "numberofsubmittedassignments": "Remis",
+    "numberofteams": "Groupes",
+    "numwords": "{{$a}} mots",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<span class=\"flagged-tag\">Le devoir est en retard de {{$a}}</span>",
+    "savechanges": "Enregistrer",
+    "submission": "Devoir rendu",
+    "submissioneditable": "L'étudiant peut modifier ce travail remis",
+    "submissionnoteditable": "L'étudiant ne peut pas modifier ce travail remis",
+    "submissionslocked": "L'ajout, la modification et la suppression de travaux ont été bloqués",
+    "submissionstatus": "Statut des travaux remis",
+    "submissionstatus_": "Pas de travail remis",
+    "submissionstatus_draft": "Brouillon (non remis)",
+    "submissionstatus_marked": "Noté",
+    "submissionstatus_new": "Aucun travail remis",
+    "submissionstatus_reopened": "Rouvert",
+    "submissionstatus_submitted": "Remis pour évaluation",
+    "submissionstatusheading": "État du travail remis",
+    "submissionteam": "Groupe",
+    "submitassignment": "Envoyer le devoir",
+    "submitassignment_help": "Une fois ce devoir envoyé, vous ne pourrez plus y effectuer de modification.",
+    "submittedearly": "Le travail a été remis en avance de {{$a}}",
+    "submittedlate": "Le travail a été remis en retard de {{$a}}",
+    "timemodified": "Dernière modification",
+    "timeremaining": "Temps restant",
+    "ungroupedusers": "Le réglage « Requiert un groupe pour remettre un devoir » est activé et certains utilisateurs ne sont membres d'aucun groupe ou membres de plusieurs groupes. Cette situation les empêchera de remettre un travail.",
+    "unlimitedattempts": "Illimité",
+    "userswhoneedtosubmit": "Utilisateurs devant valider l'envoi du devoir : {{$a}}",
+    "viewsubmission": "Afficher le travail remis"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/he.json b/www/addons/mod/assign/lang/he.json
index bc07d0788cf..896f29b0ac0 100644
--- a/www/addons/mod/assign/lang/he.json
+++ b/www/addons/mod/assign/lang/he.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "מטלה"
+    "addattempt": "אפשר נסיון נוסף",
+    "addnewattempt": "הוספת נסיון חדש",
+    "addnewattemptfromprevious": "הוספת נסיון נוסף המבוסס על ההגשה האחרונה",
+    "addsubmission": "הוספת הגשה",
+    "allowsubmissionsanddescriptionfromdatesummary": "פרטי טופס המטלה וההגשה יהיו זמינים מ-\n<strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "אפשר הגשות מ",
+    "allowsubmissionsfromdatesummary": "מטלה זו תאפשר הגשות החל מ- <strong>{{$a}}</strong>",
+    "applytoteam": "החל ציונים ומשוב לכל הקבוצה",
+    "assignmentisdue": "מועד ההגשה הסתיים",
+    "attemptnumber": "נסיון מספר",
+    "attemptreopenmethod": "מנגנון הגשה חוזרת",
+    "attemptreopenmethod_manual": "ידני",
+    "attemptreopenmethod_untilpass": "אוטומטית עד ציון עובר",
+    "attemptsettings": "הגדרות הנסיון",
+    "confirmsubmission": "האם ברצונך להגיש את העבודה שלך עבור מתן ציון? לאחר ההגשה, לא ניתן יהיה לערוך שינויים נוספים.",
+    "currentattempt": "זהו נסיון {{$a}}.",
+    "currentattemptof": "זהו נסיון מספר {{$a.attemptnumber}} ( {{$a.maxattempts}}  מנסיונות שאופשרו.",
+    "currentgrade": "הציון הנוכחי בגליון הציונים",
+    "cutoffdate": "מועד הגשה סופי",
+    "defaultteam": "קבוצת בררת־המחדל",
+    "duedate": "עד לתאריך",
+    "duedateno": "אין תאריך הגשה",
+    "duedatereached": "משך הזמן שהוגדר עבור מטלה זו חלף",
+    "editingstatus": "מצב עריכה",
+    "editsubmission": "עריכת ההגשה",
+    "extensionduedate": "הארכת מועד הגשה",
+    "grade": "ציונים",
+    "graded": "נבדק",
+    "gradedby": "נבדק על-ידי",
+    "gradedon": "הציון ניתן על",
+    "gradeoutof": "ציון מתוך {{$a}}",
+    "gradingstatus": "מצב מתן הציון",
+    "groupsubmissionsettings": "הגדרות הגשה בקבוצות",
+    "hiddenuser": "משתתף:",
+    "latesubmissions": "הגשות באיחור",
+    "latesubmissionsaccepted": "סטודנטים שנתנה להם הרשאה להארכה יכולים עדיין להגיש עד {{$a}}",
+    "markingworkflowstate": "מצב מנגנון בדיקה מתקדם",
+    "markingworkflowstateinmarking": "בתהליך בדיקה",
+    "markingworkflowstateinreview": "בבדיקת המרצה",
+    "markingworkflowstatenotmarked": "טרם נבדק",
+    "markingworkflowstatereadyforrelease": "הניקוד ממתין להפצה",
+    "markingworkflowstatereadyforreview": "בדיקה ראשונית הסתיימה",
+    "markingworkflowstatereleased": "הניקוד זמין לסטודנט",
+    "multipleteams": "חבר ביותר מקבוצה אחת",
+    "noattempt": "אין נסיונות",
+    "nomoresubmissionsaccepted": "מורשה רק למשתתפים שניתנה להם האפשרות להגשה מאוחרת",
+    "noonlinesubmissions": "מטלה זו לא דורשת ממך להגיש דבר באופן מקוון",
+    "nosubmission": "לא הוגש שום דבר עבור מטלה זו.",
+    "noteam": "אינך חבר באף קבוצה, אנא פנה למורה.",
+    "notgraded": "לא ניתן ציון",
+    "numberofdraftsubmissions": "טיוטות",
+    "numberofparticipants": "משתתפים",
+    "numberofsubmissionsneedgrading": "דורש מתן ציון",
+    "numberofsubmittedassignments": "הוגש",
+    "numberofteams": "קבוצות",
+    "numwords": "{{$a}} מילים",
+    "outof": "{{$a.current}} מתוך ס\"ה {{$a.total}}",
+    "overdue": "<font color=\"red\">\nהמטלה באיחור של:\n{{$a}}</font>",
+    "savechanges": "שמירת שינויים",
+    "submission": "הגשה",
+    "submissioneditable": "סטודנטים יכולים לערוך הגשה זו",
+    "submissionnoteditable": "סטודנטים אינם יכולים לערוך הגשה זו",
+    "submissionslocked": "מטלה זו אינה מאפשרת הגשות",
+    "submissionstatus": "מצב ההגשה",
+    "submissionstatus_": "אין הגשה",
+    "submissionstatus_draft": "מצב טיוטה ( לא הוגש)",
+    "submissionstatus_marked": "נבדק",
+    "submissionstatus_new": "אין הגשה",
+    "submissionstatus_reopened": "נפתח מחדש",
+    "submissionstatus_submitted": "הוגש למתן ציון",
+    "submissionstatusheading": "מצב הגשה",
+    "submissionteam": "קבוצה",
+    "submitassignment": "הגשת מטלה",
+    "submitassignment_help": "ברגע שהמטלה תוגש, לא ניתן יהיה לערוך שינויים נוספים",
+    "submittedearly": "המטלה הוגשה {{$a}} לפני תאריך ההגשה הסופי.",
+    "submittedlate": "המטלה הוגשה באחור של {{$a}}",
+    "timemodified": "עדכון אחרון",
+    "timeremaining": "זמן ההגשה (הראשוני)",
+    "ungroupedusers": "ההגדרה \"יש להיות חבר בקבוצה בכדי להגיש\" פעילה אך כמה משתמשים לא מוקצים לקבוצות, הדבר ימנע מהם מלהגיש את המטלות.",
+    "unlimitedattempts": "לא מוגבל",
+    "userswhoneedtosubmit": "משתמשים שצריכים להגיש: {{$a}}",
+    "viewsubmission": "צפיה בהגשה"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/it.json b/www/addons/mod/assign/lang/it.json
index 8e957365103..ec8a08a3414 100644
--- a/www/addons/mod/assign/lang/it.json
+++ b/www/addons/mod/assign/lang/it.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Compito"
+    "addattempt": "Consenti tentativo ulteriore",
+    "addnewattempt": "Aggiungi tentativo",
+    "addnewattemptfromprevious": "Aggiungi tentativo sulla base della consegna precedente",
+    "addsubmission": "Aggiungi consegna",
+    "allowsubmissionsanddescriptionfromdatesummary": "I dettagli del compito ed il form di consegna saranno disponibili a partire dal <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Inizio consegne",
+    "allowsubmissionsfromdatesummary": "Questo compito accetta consegne a partire dal <strong>{{$a}}</strong>",
+    "applytoteam": "Usa lo stesso feedback e la stessa valutazione per tutto il gruppo",
+    "assignmentisdue": "Consegna compito",
+    "attemptnumber": "Numero tentativo",
+    "attemptreopenmethod": "Riapertura tentativo",
+    "attemptreopenmethod_manual": "Manualmente",
+    "attemptreopenmethod_untilpass": "Automaticamente fino al superamento",
+    "attemptsettings": "Impostazioni tentativo",
+    "confirmsubmission": "Sei sicuro di voler consegnare il tuo lavoro per farlo valutare? La consegna non potrà più essere modificata.",
+    "currentattempt": "Tentativo {{$a}}.",
+    "currentattemptof": "Tentativo {{$a.attemptnumber}} (Tentativi consentiti: {{$a.maxattempts}}).",
+    "currentgrade": "Voto nel Registro delle valutazioni",
+    "cutoffdate": "Data limite",
+    "defaultteam": "Gruppo di default",
+    "duedate": "Termine consegne",
+    "duedateno": "Senza termine consegne",
+    "duedatereached": "La data di scadenza del compito è già trascorsa",
+    "editingstatus": "Possibilità di modifica",
+    "editsubmission": "Modifica consegna",
+    "extensionduedate": "Data scadenza proroga",
+    "grade": "Valutazione",
+    "graded": "Valutata",
+    "gradedby": "Valutatore",
+    "gradedon": "Data di valutazione",
+    "gradeoutof": "Punteggio (su {{$a}})",
+    "gradingstatus": "Stato valutazione",
+    "groupsubmissionsettings": "Impostazioni consegna di gruppo",
+    "hiddenuser": "Partecipante",
+    "latesubmissions": "Consegne in ritardo",
+    "latesubmissionsaccepted": "Consentito fino al {{$a}}",
+    "markingworkflowstate": "Stato del flusso di lavoro della valutazione",
+    "markingworkflowstateinmarking": "In valutazione",
+    "markingworkflowstateinreview": "In revisione",
+    "markingworkflowstatenotmarked": "Non valutata",
+    "markingworkflowstatereadyforrelease": "Pronta per il rilascio",
+    "markingworkflowstatereadyforreview": "Valutazione completata",
+    "markingworkflowstatereleased": "Rilasciata",
+    "multipleteams": "Appartieni a più gruppi",
+    "noattempt": "Nessun tentativo",
+    "nomoresubmissionsaccepted": "Consentito solamente ai partecipanti ai quali è stata concessa una proroga",
+    "noonlinesubmissions": "Questo compito non richiede consegne online",
+    "nosubmission": "Non sono presenti consegne da valutare",
+    "noteam": "Non appartieni a nessun gruppo",
+    "notgraded": "Non valutata",
+    "numberofdraftsubmissions": "Bozze",
+    "numberofparticipants": "Partecipanti",
+    "numberofsubmissionsneedgrading": "In attesa di valutazione",
+    "numberofsubmittedassignments": "Consegne",
+    "numberofteams": "Gruppi",
+    "numwords": "{{$a}} parole",
+    "outof": "{{$a.current}} su {{$a.total}}",
+    "overdue": "<font color=\"red\">Consegna in ritardo da: {{$a}}</font>",
+    "savechanges": "Salva modifiche",
+    "submission": "Consegna",
+    "submissioneditable": "Lo studente può modificare la consegna",
+    "submissionnoteditable": "Gli studenti non possono modificare questa consegna",
+    "submissionslocked": "Il compito non accetta consegne",
+    "submissionstatus": "Stato consegna",
+    "submissionstatus_": "Nessuna consegna",
+    "submissionstatus_draft": "Bozza (non consegnato)",
+    "submissionstatus_marked": "Valutato",
+    "submissionstatus_new": "Nessuna consegna",
+    "submissionstatus_reopened": "Riaperto",
+    "submissionstatus_submitted": "Consegnato per la valutazione",
+    "submissionstatusheading": "Stato consegna",
+    "submissionteam": "Gruppo",
+    "submitassignment": "Consegna compito",
+    "submitassignment_help": "Dopo aver consegnato il compito non potrai più modificarlo",
+    "submittedearly": "Il compito è stato consegnato {{$a}} in anticipo",
+    "submittedlate": "Il compito è stato consegnato {{$a}} in ritardo",
+    "timemodified": "Ultima modifica",
+    "timeremaining": "Tempo rimasto",
+    "ungroupedusers": "L'impostazione 'Consegna di gruppo obbligatoria' è abilitata ma alcuni utenti non fanno parte di gruppi o fanno parte di più gruppi e pertanto non potranno effettuare consegne.",
+    "unlimitedattempts": "Illimitati",
+    "userswhoneedtosubmit": "Utenti che non hanno consegnato: {{$a}}",
+    "viewsubmission": "Visualizza consegne"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ja.json b/www/addons/mod/assign/lang/ja.json
index bee83475d8f..d7f86ec249e 100644
--- a/www/addons/mod/assign/lang/ja.json
+++ b/www/addons/mod/assign/lang/ja.json
@@ -68,16 +68,16 @@
     "submissionstatus_marked": "評定済み",
     "submissionstatus_new": "提出なし",
     "submissionstatus_reopened": "再オープン",
-    "submissionstatus_submitted": "評定のため提出済み",
+    "submissionstatus_submitted": "評定のために提出済み",
     "submissionstatusheading": "提出ステータス",
     "submissionteam": "グループ",
     "submitassignment": "課題を提出する",
-    "submitassignment_help": "この課題を提出した場合、あなたはこれ以上変更できないようになります。",
+    "submitassignment_help": "この課題を提出した時点であなたはこれ以上変更できないようになります。",
     "submittedearly": "課題は {{$a}} 早く提出されました。",
     "submittedlate": "課題は {{$a}} 遅く提出されました。",
     "timemodified": "最終更新日時",
     "timeremaining": "残り時間",
-    "ungroupedusers": "設定「提出にグループを必要とする」が有効にされているため、そして何名かのユーザがグループのメンバーではない、または2つ以上のグループメンバーであるため、提出することはできません。",
+    "ungroupedusers": "設定「提出にグループを必要とする」が有効にされているため、そして何名かのユーザがグループのメンバーではないため、または2つ以上のグループメンバーであるため、提出することはできません。",
     "unlimitedattempts": "無制限",
     "userswhoneedtosubmit": "提出が必要なユーザ: {{$a}}",
     "viewsubmission": "提出を表示する"
diff --git a/www/addons/mod/assign/lang/lt.json b/www/addons/mod/assign/lang/lt.json
index 4de45cd6dd7..981dfa5b68b 100644
--- a/www/addons/mod/assign/lang/lt.json
+++ b/www/addons/mod/assign/lang/lt.json
@@ -1,14 +1,94 @@
 {
     "acceptsubmissionstatement": "Priimkite pateiktą pranešimą.",
+    "addattempt": "Leisti dar vieną bandymą",
+    "addnewattempt": "Pridėti naują bandymą",
+    "addnewattemptfromprevious": "Pridėti naują bandymą remiantis ankstesniu pateikimu",
+    "addsubmission": "Įkelti darbus",
+    "allowsubmissionsanddescriptionfromdatesummary": "Užduoties detalės ir darbo įkėlimo forma bus galima nuo <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Leisti įkelti darbus nuo",
+    "allowsubmissionsfromdatesummary": "Užduotis priims darbus nuo <strong>{{$a}}</strong>",
+    "applytoteam": "Patvirtinti įvertinimus ir atsaką visai grupei",
+    "assignmentisdue": "Užduoties atlikimo laikas baigės",
+    "attemptnumber": "Bandymo numeris",
+    "attemptreopenmethod": "Pateikimų pakartotinis atidarymas",
+    "attemptreopenmethod_manual": "Rankiniu būdu",
+    "attemptreopenmethod_untilpass": "Automatiškai, kol negaunamas teigiamas įvertinimas",
+    "attemptsettings": "Bandymo nustatymai",
     "cannoteditduetostatementsubmission": "Negalite pridėti ar redaguoti pateikiamos programėlės, nes negavome svetainės patvirtinimo.",
     "cannotgradefromapp": "Keli vertinimo metodai nėra palaikomi ir negali būti pakeisti programėlėje.",
     "cannotsubmitduetostatementsubmission": "Negalima pradėti vertinti, nes negautas pareiškimas dėl pateikimo .",
+    "confirmsubmission": "Ar Jūs tikrai norite pateikti darbą vertinimui? Jūs nebegalėsite atlikti jokių pakeitimų.",
+    "currentattempt": "Čia yra {{$a}} bandymas.",
+    "currentattemptof": "Čia yra bandymas {{$a.attemptnumber}} ( {{$a.maxattempts}} attempts allowed ).",
+    "currentgrade": "Dabartinis įvertis įverčių knygelėje",
+    "cutoffdate": "Paskutinė diena pristatymui",
+    "defaultteam": "Numatyta grupė",
+    "duedate": "Data pristatymui",
+    "duedateno": "Nėra termino",
+    "duedatereached": "Vėliausia įkėlimo data šiai užduočiai jau praėjo.",
+    "editingstatus": "Darbo keitimo galimybė",
+    "editsubmission": "Keisti įkeltus darbus",
     "erroreditpluginsnotsupported": "Programėlėje pateikimo negalima pridėti ar redaguoti, nes redagavimo papildiniai nėra palaikomi:",
     "errorshowinginformation": "Pateikta informacija negali būti rodoma",
+    "extensionduedate": "Pratęsta iki",
     "feedbacknotsupported": "Programėlė grįžtamojo ryšio nepalaiko ir negali pateikti visos informacijos",
+    "grade": "Įvertis",
+    "graded": "Įvertinta",
+    "gradedby": "Įvertino",
+    "gradedon": "Įvertinta",
+    "gradeoutof": "Įvertinimas (iš galimų {{$a}})",
+    "gradingstatus": "Vertinimo būsena",
+    "groupsubmissionsettings": "Grupinio pateikimo nustatymai",
+    "hiddenuser": "Dalyvis",
+    "latesubmissions": "Vėluojantys įkelti darbus",
+    "latesubmissionsaccepted": "Leidžiama iki {{$a}}",
+    "markingworkflowstate": "Vertinimo būsena",
+    "markingworkflowstateinmarking": "Vertinama",
+    "markingworkflowstateinreview": "Peržiūrima",
+    "markingworkflowstatenotmarked": "Neįvertinta",
+    "markingworkflowstatereadyforrelease": "Paruošta pateikimui",
+    "markingworkflowstatereadyforreview": "Vertinimas baigtas",
+    "markingworkflowstatereleased": "Pateikta",
+    "noattempt": "Nebandyta",
+    "nomoresubmissionsaccepted": "Tik besimokantieji, kuriems pratęstas įkėlimas vis dar gali įkelti savo darbus",
+    "noonlinesubmissions": "Ši užduotis nereikalauja nieko įkelti į svetainę",
+    "nosubmission": "Nebuvo pateikta darbų šiai užduočiai",
     "notallparticipantsareshown": "Negalima rodyti nepatvirtintų dalyvių",
+    "noteam": "Nesate jokios grupės narys",
+    "notgraded": "Neįvertinta",
+    "numberofdraftsubmissions": "Juodraščiai",
+    "numberofparticipants": "Dalyviai",
+    "numberofsubmissionsneedgrading": "Reikia įvertinti",
+    "numberofsubmittedassignments": "Pateikta",
+    "numberofteams": "Grupės",
+    "numwords": "Žodžių: {{$a}}",
+    "outof": "{{$a.current}} iš {{$a.total}}",
+    "overdue": "<font color=\"red\">Vėluojama  įkelti darbą: {{$a}}</font>",
+    "savechanges": "Išsaugoti pakeitimus",
+    "submission": "Įkeltas darbas",
+    "submissioneditable": "Besimokantysis gali keisti savo darbą",
+    "submissionnoteditable": "Besimokantysis negali keisti šio įkelto darbo",
     "submissionnotsupported": "Programėlė negali patvirtinti ir pateikti visos informacijos",
+    "submissionslocked": "Užduotis nebeleidžia įkelti darbų",
+    "submissionstatus": "Įkelto darbo būsena",
+    "submissionstatus_": "Nėra darbų",
+    "submissionstatus_draft": "Juodraštis (nepateiktas)",
+    "submissionstatus_marked": "Įvertinta",
+    "submissionstatus_new": "Nėra pateikimo",
+    "submissionstatus_reopened": "Vėl atidarytas",
+    "submissionstatus_submitted": "Pateikta vertinimui",
+    "submissionstatusheading": "Vertinimo būsena",
+    "submissionteam": "Grupė",
+    "submitassignment": "Pateikti darbą",
+    "submitassignment_help": "Kai darbas bus pateiktas, Jūs negalėsite padaryti jokių pakeitimų.",
+    "submittedearly": "Užduotis buvo įkelta {{$a}} anksčiau",
+    "submittedlate": "Užduotis buvo įkelta vėluojant {{$a}}",
+    "timemodified": "Paskutinį kartą keista",
+    "timeremaining": "Liko laiko",
+    "unlimitedattempts": "Neribotai",
+    "userswhoneedtosubmit": "Naudotojai, kurie turi pateikti darbą: {{$a}}",
     "userwithid": "Naudotojas su  ID {{id}}",
+    "viewsubmission": "Peržiūrėti darbą",
     "warningsubmissiongrademodified": "Pakeistas vertinimas.",
     "warningsubmissionmodified": "Pakeistas vartotojo pateikimas."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/nl.json b/www/addons/mod/assign/lang/nl.json
index aaf1d477e63..45b21b24103 100644
--- a/www/addons/mod/assign/lang/nl.json
+++ b/www/addons/mod/assign/lang/nl.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Opdracht"
+    "addattempt": "Nog een poging toestaan",
+    "addnewattempt": "Een nieuwe poging toevoegen",
+    "addnewattemptfromprevious": "Een  nieuwe poging toevoegen, gebaseerd op de vorige inzending",
+    "addsubmission": "Inzending toevoegen",
+    "allowsubmissionsanddescriptionfromdatesummary": "De opdrachtdetails en het instuurformulier zullen beschikbaar zijn vanaf <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Insturen toestaan vanaf",
+    "allowsubmissionsfromdatesummary": "Deze opdracht zal inzendingen ontvangen vanaf <strong>{{$a}}</strong>",
+    "applytoteam": "Cijfers en feedback aan de hele groep geven",
+    "assignmentisdue": "Opdracht tegen",
+    "attemptnumber": "Pogingnummer",
+    "attemptreopenmethod": "Heropende pogingen",
+    "attemptreopenmethod_manual": "Manueel",
+    "attemptreopenmethod_untilpass": "Automatisch tot geslaagd",
+    "attemptsettings": "Poginginstellingen",
+    "confirmsubmission": "Weet je zeker dat je je werk wil insturen voor beoordeling? Je zult geen wijzigingen meer kunnen aanbrengen.",
+    "currentattempt": "Deze poging {{$a}}",
+    "currentattemptof": "Dit is poging {{$a.attemptnumber}} ({{$a.maxattempts}} pogingen zijn toegestaan).",
+    "currentgrade": "Huidig cijfer in de cijferlijst",
+    "cutoffdate": "Afsluitdatum",
+    "defaultteam": "Standaard groep",
+    "duedate": "Uiterste inleverdatum",
+    "duedateno": "Geen uiterste inleverdatum",
+    "duedatereached": "De datum waarop deze opdracht moest afgegeven worden is nu voorbij.",
+    "editingstatus": "Status bewerken",
+    "editsubmission": "Bewerk inzending",
+    "extensionduedate": "Extra tijd einddatum",
+    "grade": "Cijfer",
+    "graded": "Beoordeeld",
+    "gradedby": "Beoordeeld door",
+    "gradedon": "Beoordeeld op",
+    "gradeoutof": "Cijfer op {{$a}}",
+    "gradingstatus": "Beoordelingsstatus",
+    "groupsubmissionsettings": "Instellingen groepswerk",
+    "hiddenuser": "Deelnemer",
+    "latesubmissions": "Te late inzendingen",
+    "latesubmissionsaccepted": "Toegestaan tot {{$a}}",
+    "markingworkflowstate": "Status van de beoordelings-workflow",
+    "markingworkflowstateinmarking": "Wordt beoordeeld",
+    "markingworkflowstateinreview": "Wordt nagelezen",
+    "markingworkflowstatenotmarked": "Niet beoordeeld",
+    "markingworkflowstatereadyforrelease": "Klaar om vrijgegeven te worden",
+    "markingworkflowstatereadyforreview": "Beoordeling klaar",
+    "markingworkflowstatereleased": "Vrijgegeven",
+    "multipleteams": "Lid van meer dan één groep",
+    "noattempt": "Geen poging",
+    "nomoresubmissionsaccepted": "Enkel toegestaan voor deelnemers die extra tijd gekregen hebben.",
+    "noonlinesubmissions": "Voor deze opdracht hoef je niets online in te dienen",
+    "nosubmission": "Er is nog niets ingestuurd voor deze opdracht",
+    "noteam": "Lid van geen enkele groep",
+    "notgraded": "Niet beoordeeld",
+    "numberofdraftsubmissions": "Kladwerken",
+    "numberofparticipants": "Deelnemers",
+    "numberofsubmissionsneedgrading": "Beoordeling nodig",
+    "numberofsubmittedassignments": "Ingestuurd",
+    "numberofteams": "Groepen",
+    "numwords": "{{$a}} woorden",
+    "outof": "{{$a.current}} van {{$a.total}}",
+    "overdue": "<font color=\"red\">Opdracht {{$a}} te laat ingestuurd</font>",
+    "savechanges": "Bewaar de wijzigingen",
+    "submission": "Ingestuurde opdracht",
+    "submissioneditable": "Leerling kan zijn ingestuurde opdracht bewerken",
+    "submissionnoteditable": "Leerling kan ingestuurde opdracht niet bewerken",
+    "submissionslocked": "Voor deze opdracht kan nu niets ingestuurd worden.",
+    "submissionstatus": "Status ingestuurde opdracht",
+    "submissionstatus_": "Geen ingestuurde opdracht",
+    "submissionstatus_draft": "Kladwerk (nog niet ingestuurd)",
+    "submissionstatus_marked": "Beoordeeld",
+    "submissionstatus_new": "Geen inzending",
+    "submissionstatus_reopened": "Heropend",
+    "submissionstatus_submitted": "Opdracht ingestuurd om te beoordelen",
+    "submissionstatusheading": "Status ingestuurde opdracht",
+    "submissionteam": "Groep",
+    "submitassignment": "Stuur opdracht in",
+    "submitassignment_help": "Als je deze opdracht hebt ingestuurd, dan zul je geen wijzigingen meer kunnen aanbrengen.",
+    "submittedearly": "Opdracht was {{$a}} te vroeg ingestuurd",
+    "submittedlate": "Opdracht was {{$a}} te laat ingestuurd",
+    "timemodified": "Laatst gewijzigd",
+    "timeremaining": "Resterende tijd",
+    "ungroupedusers": "De insteling \"Groeplidmaatschap vereist om een inzending te maken\" is ingeschakeld en sommige gebruikers zijn niet toegewezen aan een groep of zijn lid van meerdere groepen. Dit zal het hen onmogelijk maken om hun opdracht in te sturen.",
+    "unlimitedattempts": "Onbeperkt",
+    "userswhoneedtosubmit": "Leerlingen die nog moeten insturen: {{$a}}",
+    "viewsubmission": "Bekijk ingestuurde opdracht"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/pl.json b/www/addons/mod/assign/lang/pl.json
index 5789f0029e7..e86e6a78384 100644
--- a/www/addons/mod/assign/lang/pl.json
+++ b/www/addons/mod/assign/lang/pl.json
@@ -1,15 +1,15 @@
 {
     "addattempt": "Zezwalaj na inną próbę",
-    "addnewattempt": "Dodaj odpowiedź",
-    "addnewattemptfromprevious": "Dodaj nową próbę na podstawie poprzedniego zgłoszenia",
-    "addsubmission": "Dodaj swoją pracę",
+    "addnewattempt": "Dodaj nową wersję pracy",
+    "addnewattemptfromprevious": "Dodaj nową wersję pracy na podstawie pracy przesłanej poprzednio",
+    "addsubmission": "Dodaj zadanie",
     "allowsubmissionsanddescriptionfromdatesummary": "Szczegóły zadania oraz możliwość rozwiązania będzie dostępna od <strong>{{$a}}</strong>",
     "allowsubmissionsfromdate": "Zezwól na przesyłanie rozwiązań od",
     "allowsubmissionsfromdatesummary": "Rozwiązania tego zadania będzie można przesyłać od <strong>{{$a}}</strong>",
     "applytoteam": "Zastosuj oceny i informacje zwrotne dla całej grupy",
     "assignmentisdue": "Zadanie jest zaległe",
     "attemptnumber": "Numer próby",
-    "attemptreopenmethod": "Ponownie otwarte próby",
+    "attemptreopenmethod": "Ponowne otwieranie prób",
     "attemptreopenmethod_manual": "Ręcznie",
     "attemptreopenmethod_untilpass": "Automatycznie, aż przejdą",
     "attemptsettings": "Ustawienia próby",
diff --git a/www/addons/mod/assign/lang/pt-br.json b/www/addons/mod/assign/lang/pt-br.json
index a1856be178c..b4a8717686c 100644
--- a/www/addons/mod/assign/lang/pt-br.json
+++ b/www/addons/mod/assign/lang/pt-br.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Tarefa"
+    "addattempt": "Permitir outra tentativa",
+    "addnewattempt": "Adicionar uma nova tentativa",
+    "addnewattemptfromprevious": "Adicionar uma nova tentativa baseada na tentativa anterior",
+    "addsubmission": "Adicionar tarefa",
+    "allowsubmissionsanddescriptionfromdatesummary": "Os detalhes da tarefa e formulário de envio ficarão disponíveis a partir de <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Permite envios a partir de",
+    "allowsubmissionsfromdatesummary": "Esta tarefa aceitará envios a partir de <strong>{{$a}}</strong>",
+    "applytoteam": "Habilitar notas e feedback para todo grupo",
+    "assignmentisdue": "Tarefa encerrada",
+    "attemptnumber": "Número da tentativa",
+    "attemptreopenmethod": "Tentativas reabertas",
+    "attemptreopenmethod_manual": "Manualmente",
+    "attemptreopenmethod_untilpass": "Automaticamente até que passe",
+    "attemptsettings": "Configurações de tentativa",
+    "confirmsubmission": "Tem certeza de que deseja enviar seu trabalho para a classificação? Você não será capaz de fazer mais modificações.",
+    "currentattempt": "Esta é a tentativa  {{$a}} .",
+    "currentattemptof": "Esta é a tentativa {{$a.attemptnumber}} ({{$a.maxattempts}} tentativas permitidas).",
+    "currentgrade": "Nota atual no livro de notas",
+    "cutoffdate": "Data limite",
+    "defaultteam": "Grupo padrão",
+    "duedate": "Data de entrega",
+    "duedateno": "Nenhuma data de entrega",
+    "duedatereached": "A data de encerramento para essa tarefa já foi atingida",
+    "editingstatus": "Editar estado",
+    "editsubmission": "Editar envio",
+    "extensionduedate": "Extensão do prazo de entrega",
+    "grade": "Nota",
+    "graded": "Avaliado",
+    "gradedby": "Avaliado por",
+    "gradedon": "Avaliado em",
+    "gradeoutof": "Nota até {{$a}}",
+    "gradingstatus": "Status da avaliação",
+    "groupsubmissionsettings": "Configurações de envio em grupo",
+    "hiddenuser": "Participante",
+    "latesubmissions": "Submissões atrasadas",
+    "latesubmissionsaccepted": "Somente estudante(s) contemplados com uma extensão ainda poderá(ão) enviar a tarefa",
+    "markingworkflowstate": "Estado do fluxo de avaliação",
+    "markingworkflowstateinmarking": "Em avaliação",
+    "markingworkflowstateinreview": "Em revisão",
+    "markingworkflowstatenotmarked": "Não avaliado",
+    "markingworkflowstatereadyforrelease": "Pronto para publicação",
+    "markingworkflowstatereadyforreview": "Avaliação concluída",
+    "markingworkflowstatereleased": "Publicado",
+    "multipleteams": "Você é membro de vários grupos, entre em contato com o seu professor.",
+    "noattempt": "Nenhuma tentativa",
+    "nomoresubmissionsaccepted": "Só é permitido para os participantes que tenham beneficiado de uma extensão",
+    "noonlinesubmissions": "Esta tarefa não requer o envio online",
+    "nosubmission": "Nada foi enviado para esta tarefa",
+    "noteam": "Você não é membro de nenhum grupo.",
+    "notgraded": "Não há notas",
+    "numberofdraftsubmissions": "Rascunhos",
+    "numberofparticipants": "Participantes",
+    "numberofsubmissionsneedgrading": "Precisa de avaliação",
+    "numberofsubmittedassignments": "Enviado",
+    "numberofteams": "Grupos",
+    "numwords": "{{$a}} palavras",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">A tarefa está atrasada há: {{$a}}</font>",
+    "savechanges": "Salvar mudanças",
+    "submission": "Envio de tarefas",
+    "submissioneditable": "Estudantes podem editar essa submissão",
+    "submissionnoteditable": "Estudante não pode editar este envio",
+    "submissionslocked": "A tarefa não está aceitando envios",
+    "submissionstatus": "Status de envio",
+    "submissionstatus_": "Nenhum envio",
+    "submissionstatus_draft": "Rascunho (não enviado)",
+    "submissionstatus_marked": "Avaliado",
+    "submissionstatus_new": "Nenhum envio",
+    "submissionstatus_reopened": "Reaberto",
+    "submissionstatus_submitted": "Enviado para avaliação",
+    "submissionstatusheading": "Status de envio",
+    "submissionteam": "Grupo",
+    "submitassignment": "Enviar tarefa em definitivo",
+    "submitassignment_help": "Uma vez que a tarefa for enviada você não poderá mais fazer alterações.",
+    "submittedearly": "A tarefa foi enviada {{$a}} adiantado",
+    "submittedlate": "A tarefa foi enviada {{$a}} atrasada",
+    "timemodified": "Última modificação",
+    "timeremaining": "Tempo restante",
+    "ungroupedusers": "A configuração \"Somente membros de grupo podem fazer envio\" está ligada e existem usuários não alocados em grupos. Isso impedira que estes usuários consigam enviar tarefas.",
+    "unlimitedattempts": "Ilimitado",
+    "userswhoneedtosubmit": "Usuários que precisam enviar: {{$a}}",
+    "viewsubmission": "Ver envio"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/pt.json b/www/addons/mod/assign/lang/pt.json
index 39f8fd1ec95..fdc72c080a7 100644
--- a/www/addons/mod/assign/lang/pt.json
+++ b/www/addons/mod/assign/lang/pt.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Trabalho"
+    "addattempt": "Permitir nova tentativa",
+    "addnewattempt": "Adicionar nova tentativa",
+    "addnewattemptfromprevious": "Adicionar nova tentativa baseada na submissão anterior",
+    "addsubmission": "Enviar trabalho",
+    "allowsubmissionsanddescriptionfromdatesummary": "O enunciado do trabalho apenas estará disponível a partir de <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Aceitar trabalhos a partir de",
+    "allowsubmissionsfromdatesummary": "Pode submeter o trabalho a partir de <strong>{{$a}}</strong>",
+    "applytoteam": "Atribuir notas e comentários a todo o grupo",
+    "assignmentisdue": "Já terminou o prazo para submeter o trabalho",
+    "attemptnumber": "Número da tentativa",
+    "attemptreopenmethod": "Tentativas reabertas",
+    "attemptreopenmethod_manual": "Manualmente",
+    "attemptreopenmethod_untilpass": "Automaticamente até obter aproveitamento",
+    "attemptsettings": "Configurações da tentativa",
+    "confirmsubmission": "Tem a certeza de que pretende submeter o seu trabalho para avaliação? Não poderá realizar mais alterações.",
+    "currentattempt": "Esta é a tentativa {{$a}}.",
+    "currentattemptof": "Esta é a {{$a.attemptnumber}}ª tentativa (em {{$a.maxattempts}} tentativa(s) permitida(s)).",
+    "currentgrade": "Nota atual na pauta",
+    "cutoffdate": "Data de fecho",
+    "defaultteam": "Grupo predefinido",
+    "duedate": "Data limite para submeter trabalhos",
+    "duedateno": "Sem data limite",
+    "duedatereached": "A data limite de submissão deste trabalho já foi ultrapassada.",
+    "editingstatus": "Editar o estado",
+    "editsubmission": "Editar submissão",
+    "extensionduedate": "Prolongamento da data limite",
+    "grade": "Avaliação",
+    "graded": "Avaliado",
+    "gradedby": "Avaliado por",
+    "gradedon": "Avaliado em",
+    "gradeoutof": "Nota (de 0 a {{$a}})",
+    "gradingstatus": "Estado da avaliação",
+    "groupsubmissionsettings": "Configurações das submissões de grupo",
+    "hiddenuser": "Participante",
+    "latesubmissions": "Submissões com atraso",
+    "latesubmissionsaccepted": "Disponível até {{$a}}",
+    "markingworkflowstate": "Estado do processo de avaliação",
+    "markingworkflowstateinmarking": "Em avaliação",
+    "markingworkflowstateinreview": "Em validação",
+    "markingworkflowstatenotmarked": "Não avaliado",
+    "markingworkflowstatereadyforrelease": "Avaliação validada",
+    "markingworkflowstatereadyforreview": "Avaliação concluída",
+    "markingworkflowstatereleased": "Avaliação publicada",
+    "multipleteams": "Inscrito em mais do que um grupo",
+    "noattempt": "Nenhuma tentativa",
+    "nomoresubmissionsaccepted": "Apenas disponível aos alunos a quem tenha sido concedida uma extensão do prazo.",
+    "noonlinesubmissions": "Este trabalho não requer que submeta nada online.",
+    "nosubmission": "Ainda não foi submetido nada neste Trabalho",
+    "noteam": "Não está inscrito em nenhum grupo",
+    "notgraded": "Sem avaliação",
+    "numberofdraftsubmissions": "Trabalhos em curso",
+    "numberofparticipants": "Número de alunos",
+    "numberofsubmissionsneedgrading": "Requerem avaliação",
+    "numberofsubmittedassignments": "Número de trabalhos submetidos",
+    "numberofteams": "Grupos",
+    "numwords": "{{$a}} palavra(s)",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">Trabalho entregue com atraso de {{$a}}</font>",
+    "savechanges": "Gravar alterações",
+    "submission": "Trabalho",
+    "submissioneditable": "Os alunos podem editar esta submissão",
+    "submissionnoteditable": "O aluno não pode editar esta submissão",
+    "submissionslocked": "Este trabalho não está a aceitar submissões",
+    "submissionstatus": "Estado da submissão",
+    "submissionstatus_": "Não submetido",
+    "submissionstatus_draft": "Trabalho em curso (não submetido)",
+    "submissionstatus_marked": "Avaliado",
+    "submissionstatus_new": "Nenhuma submissão",
+    "submissionstatus_reopened": "Reaberta",
+    "submissionstatus_submitted": "Submetido para avaliação",
+    "submissionstatusheading": "Estado do trabalho",
+    "submissionteam": "Grupo",
+    "submitassignment": "Submeter o trabalho",
+    "submitassignment_help": "Assim que este trabalho for submetido não poderá fazer mais alterações.",
+    "submittedearly": "O trabalho foi submetido '{{$a}}' antes do fim do prazo",
+    "submittedlate": "O trabalho foi submetido {{$a}} depois do prazo",
+    "timemodified": "Última alteração",
+    "timeremaining": "Tempo restante",
+    "ungroupedusers": "A configuração 'Requer grupo para submeter trabalho' está ativa e existem utilizadores que não pertencem a nenhum grupo, ou que se encontram inscritos em mais do que um, o que fará com que estes fiquem impossibilitados de submeter os seus trabalhos.",
+    "unlimitedattempts": "Ilimitado",
+    "userswhoneedtosubmit": "Utilizadores que têm de submeter: {{$a}}",
+    "viewsubmission": "Ver trabalho"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ro.json b/www/addons/mod/assign/lang/ro.json
index cc1a2799f62..a43a5af5d8a 100644
--- a/www/addons/mod/assign/lang/ro.json
+++ b/www/addons/mod/assign/lang/ro.json
@@ -1,3 +1,65 @@
 {
-    "pluginname": "Lucrare"
+    "addattempt": "Permite altă încercare",
+    "addnewattempt": "Adaugă o nouă încercare",
+    "addsubmission": "Adaugă lucrare",
+    "allowsubmissionsfromdate": "Acceptați lucrări de la",
+    "allowsubmissionsfromdatesummary": "Se acceptă lucrări de la <strong>{{$a}}</strong>",
+    "applytoteam": "Aplică notele și feedback-ul întregului grup",
+    "assignmentisdue": "Data predării",
+    "attemptnumber": "Numărul încercării",
+    "attemptreopenmethod": "Încercările sunt disponibile din nou",
+    "attemptreopenmethod_manual": "Manual",
+    "attemptsettings": "Setări încerecre",
+    "currentattempt": "Aceasta este încercarea {{$a}}.",
+    "currentattemptof": "Aceasta este încercarea {{$a.attemptnumber}} ( {{$a.maxattempts}} încercări permise ).",
+    "currentgrade": "Nota actuală în catalog",
+    "defaultteam": "Grup implicit",
+    "duedate": "Termen de predare",
+    "duedateno": "Fără termen de predare",
+    "duedatereached": "Data predării acestei lucrări este depășită",
+    "editingstatus": "Se editează statusul",
+    "editsubmission": "Editare temă trimisă",
+    "extensionduedate": "Termen de predare extins",
+    "grade": "Notă",
+    "graded": "Notat",
+    "gradedby": "Notat de",
+    "gradedon": "Notat în data de",
+    "gradeoutof": "O notă din {{$a}}",
+    "hiddenuser": "Participant",
+    "latesubmissionsaccepted": "Permis până în {{$a}}",
+    "markingworkflowstateinmarking": "Se notează",
+    "markingworkflowstateinreview": "Se revizuiește",
+    "markingworkflowstatenotmarked": "Nu este notat",
+    "markingworkflowstatereadyforrelease": "Gata de lansare",
+    "markingworkflowstatereadyforreview": "Notare completă",
+    "markingworkflowstatereleased": "Lansat",
+    "multipleteams": "Membru al mai mult de un grup",
+    "noattempt": "Fără încercare",
+    "nosubmission": "Nu s-a primit răspuns la această sarcină de lucru",
+    "noteam": "Nu este un membru al unui grup",
+    "notgraded": "Fără notă",
+    "numberofdraftsubmissions": "Draft-uri",
+    "numberofparticipants": "Participanți",
+    "numberofsubmissionsneedgrading": "Trebuie să fie notat",
+    "numberofsubmittedassignments": "Trimis",
+    "numberofteams": "Grupuri",
+    "numwords": "{{$a}} cuvinte",
+    "outof": "{{$a.current}} din {{$a.total}}",
+    "savechanges": "Salvează modificări",
+    "submission": "Temă trimisă",
+    "submissioneditable": "Cursanții își pot edita lucrările trimise",
+    "submissionnoteditable": "Cursanții nu pot să editeze aceastpă lucrare",
+    "submissionstatus_": "Nu există răspunsuri",
+    "submissionstatus_draft": "Draft (netrimis)",
+    "submissionstatus_marked": "Notat",
+    "submissionstatus_new": "nu există răspunsuri",
+    "submissionstatus_reopened": "Redeschis",
+    "submissionteam": "Grup",
+    "submitassignment": "Trimite răspuns corespunzător sarcinii de lucru",
+    "submittedearly": "Sarcina de lucru a fost rezolvată {{$a}} mai repede",
+    "submittedlate": "Sarcina de lucru a fost rezolvată {{$a}} mai târziu",
+    "timemodified": "Ora la care a fost modificat",
+    "timeremaining": "Timp rămas",
+    "unlimitedattempts": "Nelimitat",
+    "viewsubmission": "Vezi răspunsurile"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ru.json b/www/addons/mod/assign/lang/ru.json
index 8dd7fa540e7..7a4fc03a152 100644
--- a/www/addons/mod/assign/lang/ru.json
+++ b/www/addons/mod/assign/lang/ru.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "Задание"
+    "addattempt": "Разрешить еще одну попытку",
+    "addnewattempt": "Добавить новую попытку",
+    "addnewattemptfromprevious": "Добавить новую попытку на основе предыдущего представления",
+    "addsubmission": "Добавить ответ на задание",
+    "allowsubmissionsanddescriptionfromdatesummary": "Описание задания и возможность отправлять ответов доступны с <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Разрешить выполнение задания с",
+    "allowsubmissionsfromdatesummary": "Это назначение будет приниматься с <strong>{{$a}}</strong>",
+    "applytoteam": "Применить оценки и отзывы для всей группы.",
+    "assignmentisdue": "Задание сдано",
+    "attemptnumber": "Номер попытки",
+    "attemptreopenmethod": "Разрешать новые попытки",
+    "attemptreopenmethod_manual": "Вручную",
+    "attemptreopenmethod_untilpass": "Автоматически (до проходной оценки)",
+    "attemptsettings": "Настройки попытки",
+    "confirmsubmission": "Вы уверены, что хотите представить свою работу для оценивания? Вы больше не сможете изменить свой ответ.",
+    "currentattempt": "Попытка {{$a}}.",
+    "currentattemptof": "Номер этой попытки -  {{$a.attemptnumber}}. (Разрешено попыток - {{$a.maxattempts}})",
+    "currentgrade": "Текущая оценка в журнале",
+    "cutoffdate": "Запретить отправку с",
+    "defaultteam": "Группа по умолчанию",
+    "duedate": "Последний срок сдачи",
+    "duedateno": "Срок сдачи не ограничен",
+    "duedatereached": "Срок сдачи этого задания уже истек",
+    "editingstatus": "Изменение статуса",
+    "editsubmission": "Редактировать ответ",
+    "extensionduedate": "Срок продления",
+    "grade": "Оценка",
+    "graded": "Оценено",
+    "gradedby": "Оценено",
+    "gradedon": "Оценено в",
+    "gradeoutof": "Оценка из {{$a}}",
+    "gradingstatus": "Состояние оценивания",
+    "groupsubmissionsettings": "Настройки представления работ группы",
+    "hiddenuser": "Участник",
+    "latesubmissions": "Поступившие представления",
+    "latesubmissionsaccepted": "Разрешено до {{$a}}",
+    "markingworkflowstate": "Этап процесса оценивания",
+    "markingworkflowstateinmarking": "Оценивается",
+    "markingworkflowstateinreview": "Проверяется",
+    "markingworkflowstatenotmarked": "Еще не оценивалось",
+    "markingworkflowstatereadyforrelease": "Готово к публикации",
+    "markingworkflowstatereadyforreview": "Оценивание завершено",
+    "markingworkflowstatereleased": "Опубликовано",
+    "multipleteams": "Член нескольких групп",
+    "noattempt": "Ни одной попытки",
+    "nomoresubmissionsaccepted": "Разрешено только для участников, которым было предоставлено продление срока.",
+    "noonlinesubmissions": "Ответ на задание должен быть представлен вне сайта",
+    "nosubmission": "Ничего не было представлено",
+    "noteam": "Не является членом какой-либо группы",
+    "notgraded": "Не оценено",
+    "numberofdraftsubmissions": "Черновик",
+    "numberofparticipants": "Участники",
+    "numberofsubmissionsneedgrading": "Требуют оценки",
+    "numberofsubmittedassignments": "Ответы",
+    "numberofteams": "Группы",
+    "numwords": "всего слов - {{$a}}",
+    "outof": "{{$a.current}} из {{$a.total}}",
+    "overdue": "<font color=\"red\">Задание просрочено на: {{$a}}</font>",
+    "savechanges": "Сохранить",
+    "submission": "Ответ",
+    "submissioneditable": "Студент может править свой ответ",
+    "submissionnoteditable": "Студент не может исправлять этот ответ",
+    "submissionslocked": "Ответы на это задание не принимаются",
+    "submissionstatus": "Состояние ответа на задание",
+    "submissionstatus_": "Нет ответа на задание",
+    "submissionstatus_draft": "Черновик (не представлен)",
+    "submissionstatus_marked": "Оценено",
+    "submissionstatus_new": "Ответ не представлен",
+    "submissionstatus_reopened": "Возобновлено",
+    "submissionstatus_submitted": "Ответы для оценки",
+    "submissionstatusheading": "Состояние ответа",
+    "submissionteam": "Группы",
+    "submitassignment": "Отправить на проверку",
+    "submitassignment_help": "Однажды представив ответ на это задание Вы больше не сможете  изменить его.",
+    "submittedearly": "Задание представлено заранее - {{$a}}",
+    "submittedlate": "Задание представлено с опозданием - {{$a}}",
+    "timemodified": "Последнее изменение",
+    "timeremaining": "Оставшееся время",
+    "ungroupedusers": "Включен параметр «Нужно быть в группе для отправки ответа». Некоторые пользователи не являются членами групп или являются членами нескольких групп, эти пользователи не смогут отправить ответы на задание.",
+    "unlimitedattempts": "Неограничено",
+    "userswhoneedtosubmit": "Пользователи, которые должны представить ответ: {{$a}}",
+    "viewsubmission": "Просмотр ответов"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/sv.json b/www/addons/mod/assign/lang/sv.json
index b67892ddbaf..c6da9d2aa61 100644
--- a/www/addons/mod/assign/lang/sv.json
+++ b/www/addons/mod/assign/lang/sv.json
@@ -1,3 +1,83 @@
 {
-    "pluginname": "Inlämningsuppgift"
+    "addattempt": "Tillåt ett nytt försök",
+    "addnewattempt": "Lägg till ett nytt försök",
+    "addnewattemptfromprevious": "Lägg till ett nytt försök baserat på tidigare inlämning",
+    "addsubmission": "Lägg till inskickat bidrag",
+    "allowsubmissionsanddescriptionfromdatesummary": "Detaljer om inlämningsuppgiften samt inlämningsformuläret kommer att vara tillgängligt från <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Tillåt inlämning från",
+    "allowsubmissionsfromdatesummary": "Denna inlämningsuppgift kommer att tillåta inlämning från <strong>{{$a}}</strong>",
+    "applytoteam": "Tillämpa betyg och återkoppling för hela gruppen",
+    "assignmentisdue": "Inlämningstiden har gått ut.",
+    "attemptnumber": "Försök nummer",
+    "attemptreopenmethod": "Försök återupptas",
+    "attemptreopenmethod_manual": "Manuellt",
+    "attemptreopenmethod_untilpass": "Automatiskt tills passerat",
+    "attemptsettings": "Inställningar försök",
+    "confirmsubmission": "Är du säker på att du vill lämna in ditt arbete för betygssättning? Du kommer inte längre att kunna göra några förändringar",
+    "currentattempt": "Detta är försök {{$a}}.",
+    "currentattemptof": "Detta är försök {{$a.attemptnumber}} ( {{$a.maxattempts}} försök tillåten).",
+    "currentgrade": "Aktuellt betyg/omdöme i betygskatalogen",
+    "cutoffdate": "Avstängningsdatum",
+    "defaultteam": "Förvald grupp",
+    "duedate": "Stoppdatum/tid",
+    "duedateno": "Inget stoppdatum/tid",
+    "duedatereached": "Stoppdatum för denna inlämningsuppgift har nu passerat",
+    "editingstatus": "Redigerar status",
+    "editsubmission": "Redigera min inskickade uppgiftslösning",
+    "extensionduedate": "Förlängning av stoppdatum",
+    "grade": "Betyg",
+    "graded": "Betygssatt",
+    "gradedby": "Betygssatt av",
+    "gradedon": "Betygssatt den",
+    "gradeoutof": "Betyg ur {{$a}}",
+    "gradingstatus": "Betygssättningsstatus",
+    "groupsubmissionsettings": "Gruppinlämning inställningar",
+    "hiddenuser": "Deltagare",
+    "latesubmissions": "Sen inlämning",
+    "latesubmissionsaccepted": "Endast elev(er) som har beviljats förlängd inlämningstid kan fortfarande lämna in uppgifter",
+    "markingworkflowstate": "Markera status för arbetsflöde",
+    "markingworkflowstateinmarking": "Under bedömning",
+    "markingworkflowstateinreview": "Under granskning",
+    "markingworkflowstatenotmarked": "Inte bedömnd",
+    "markingworkflowstatereadyforrelease": "Redo för",
+    "markingworkflowstatereadyforreview": "Bedöming färdig",
+    "markingworkflowstatereleased": "Released",
+    "multipleteams": "Medlem av mer än en grupp",
+    "noattempt": "Inga försök",
+    "nomoresubmissionsaccepted": "Inga fler inlämningar accepteras",
+    "noonlinesubmissions": "Denna inlämningsuppgift kräver inte att du lämnar in något online.",
+    "nosubmission": "Inget har lämnats in för denna inlämningsuppgift",
+    "noteam": "Inte medlem i någon grupp",
+    "notgraded": "Ej betygssatt",
+    "numberofdraftsubmissions": "Utkast",
+    "numberofparticipants": "Deltagare",
+    "numberofsubmissionsneedgrading": "Behöver betygssättas",
+    "numberofsubmittedassignments": "Inlämnad",
+    "numberofteams": "Grupper",
+    "numwords": "{{$a}} ord",
+    "outof": "{{$a.current}} av totalt {{$a.total}}",
+    "overdue": "<font color=\"red\">Inlämningsuppgiften är försenad med: {{$a}}</font>",
+    "savechanges": "Spara ändringar.",
+    "submission": "Inskickad uppgift",
+    "submissioneditable": "Elev kan ändra denna inlämning",
+    "submissionnoteditable": "Elev kan inte ändra denna inlämning",
+    "submissionslocked": "Denna inlämningsuppgift accepterar inte inlämningar",
+    "submissionstatus": "Status för inlämning",
+    "submissionstatus_": "Ingen inlämning",
+    "submissionstatus_draft": "Utkast (ej inlämnad)",
+    "submissionstatus_marked": "Betygssatt",
+    "submissionstatus_new": "Ingen inlämning",
+    "submissionstatus_reopened": "Återöppnad",
+    "submissionstatus_submitted": "Inlämnad för betygssättning",
+    "submissionstatusheading": "Status för inlämning",
+    "submissionteam": "Grupp",
+    "submitassignment": "Skicka in uppgift",
+    "submitassignment_help": "När du har lämnat in din uppgift kommer du inte längre att kunna göra ändringar i den.",
+    "submittedearly": "Inlämningsuppgift lämnades in {{$a}} tidigt",
+    "submittedlate": "Inlämningsuppgift lämnades in {{$a}} sent",
+    "timemodified": "Senast ändrad",
+    "timeremaining": "Återstående tid",
+    "unlimitedattempts": "Obegränsad",
+    "userswhoneedtosubmit": "Användare som behöver lämna in: {{$a}}",
+    "viewsubmission": "Visa inlämning"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/tr.json b/www/addons/mod/assign/lang/tr.json
index 22bdbd67ecb..72b0e0a2002 100644
--- a/www/addons/mod/assign/lang/tr.json
+++ b/www/addons/mod/assign/lang/tr.json
@@ -15,7 +15,9 @@
     "attemptsettings": "Deneme ayarları",
     "confirmsubmission": "Çalışmanızı notlandırılması için göndermek istediğinize emin misiniz? Bundan sonra değişiklik yapamayacaksınız.",
     "currentattempt": "{{$a}}. deneme",
+    "currentattemptof": "Bu, {{$a.attemptnumber}} ({{$a.maxattempts}} deneme izinli) denemesi.",
     "currentgrade": "Notdefterindeki şuanki notu",
+    "cutoffdate": "Kesilme tarihi",
     "defaultteam": "Varsayılan grup",
     "duedate": "Son teslim tarihi",
     "duedateno": "Süresiz",
@@ -25,21 +27,26 @@
     "extensionduedate": "Ek sürenin bitiş tarihi",
     "grade": "Not",
     "graded": "Notlandırıldı",
-    "gradedon": "Notlandırıldı: {{$a}}",
+    "gradedon": "Not verildi",
+    "gradeoutof": "{{$a}} Dışarıdan notu",
     "gradingstatus": "Puan durumu",
+    "groupsubmissionsettings": "Grup gönderimleri ayarları",
     "hiddenuser": "Katılımcı",
     "latesubmissions": "Gecikmiş gönderimler",
     "latesubmissionsaccepted": "Sadece ek süre tanınmış olan öğrenciler ödev göndermeye devam edebilir.",
+    "markingworkflowstate": "İş akış durumunu işaretleme",
     "markingworkflowstateinmarking": "İşaretlemede",
     "markingworkflowstateinreview": "İncelemede",
     "markingworkflowstatenotmarked": "İşaretli değil",
     "markingworkflowstatereadyforrelease": "Yayımlamak için hazır",
     "markingworkflowstatereadyforreview": "İşaretleme tamamlandı",
     "markingworkflowstatereleased": "Yayımlandı",
+    "multipleteams": "Birden fazla grubun üyesi",
     "noattempt": "Deneme yok",
     "nomoresubmissionsaccepted": "Artık gönderim kabul edilmiyor",
     "noonlinesubmissions": "Bu ödev için online gönderimde bulunmanız gerekmiyor.",
     "nosubmission": "Bu ödev için gönderimde bulunulmamış.",
+    "noteam": "Herhangi bir grubun üyesi değil",
     "notgraded": "Puanlanmamış",
     "numberofdraftsubmissions": "Taslaklar",
     "numberofparticipants": "Katılımcılar",
@@ -47,8 +54,8 @@
     "numberofsubmittedassignments": "Gönderilen",
     "numberofteams": "Gruplar",
     "numwords": "{{$a}} kelime",
-    "outof": "{{$a.maxgrade}} üzerinden {{$a.grade}}",
-    "overdue": "Süresi dolmuş",
+    "outof": "{{$a.current}} dışında {{$a.total}}",
+    "overdue": "<font color=\"red\">Tarafından göderilen geç kalmış ödev{{$a}}</font>",
     "savechanges": "Değişiklikleri kaydet",
     "submission": "Gönderim",
     "submissioneditable": "Öğrenci bu gönderimi düzenleyebilir",
@@ -69,6 +76,8 @@
     "submittedlate": "Ödev {{$a}} geç teslim edildi",
     "timemodified": "Son düzenleme",
     "timeremaining": "Kalan süre",
+    "ungroupedusers": "'Gönderim yapmak için grup gerekli' ayarı etkindir ve bazı kullanıcılar herhangi bir gruba üye değildir veya birden fazla gruba üye olduğundan, gönderim yapamazlar.",
     "unlimitedattempts": "Sınırsız",
-    "userswhoneedtosubmit": "Gönderim yapması gereken kullanıcı: {{$a}}"
+    "userswhoneedtosubmit": "Gönderim yapması gereken kullanıcı: {{$a}}",
+    "viewsubmission": "Gönderimi görüntüle"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/zh-tw.json b/www/addons/mod/assign/lang/zh-tw.json
index f093f32dc22..2a87180b1de 100644
--- a/www/addons/mod/assign/lang/zh-tw.json
+++ b/www/addons/mod/assign/lang/zh-tw.json
@@ -1,3 +1,84 @@
 {
-    "pluginname": "作業"
+    "addattempt": "允許另一次的繳交",
+    "addnewattempt": "新增一個繳交管道",
+    "addnewattemptfromprevious": "依據先前的作業新增一個繳交管道",
+    "addsubmission": "繳交作業",
+    "allowsubmissionsanddescriptionfromdatesummary": "作業的詳細說明和繳交的表單將從<strong> {{$a}} </ strong>開始可以使用",
+    "allowsubmissionsfromdate": "開始繳交時間",
+    "allowsubmissionsfromdatesummary": "這個作業將從<strong> {{$a}} </ strong>開始可以繳交",
+    "applytoteam": "將分數和回饋套用到整個群組",
+    "assignmentisdue": "作業繳交已截止",
+    "attemptnumber": "作業提交次數",
+    "attemptreopenmethod": "重新開啟作業提交",
+    "attemptreopenmethod_manual": "手動的",
+    "attemptreopenmethod_untilpass": "自動的，直到通過",
+    "attemptsettings": "繳交設定",
+    "confirmsubmission": "您確定要繳交作業並請求評分嗎？一旦這麼做，您將不能再修改作業。",
+    "currentattempt": "這是第{{$a}}次繳交",
+    "currentattemptof": "這是第{{$a.attemptnumber}}次繳交(允許繳交 {{$a.maxattempts}} 次)",
+    "currentgrade": "目前成績單中的分數",
+    "cutoffdate": "拒收作業時間",
+    "defaultteam": "預設群組",
+    "duedate": "規定繳交時間",
+    "duedateno": "沒有規定繳交時間",
+    "duedatereached": "此作業的規定繳交時間已經過了",
+    "editingstatus": "編修狀態",
+    "editsubmission": "修改我已繳交的作業",
+    "extensionduedate": "展延到期日",
+    "grade": "成績",
+    "graded": "已評分",
+    "gradedby": "已評分由",
+    "gradedon": "評分標準",
+    "gradeoutof": "得分(配分{{$a}})",
+    "gradingstatus": "評分狀態",
+    "groupsubmissionsettings": "群組繳交作業設定",
+    "hiddenuser": "參與者",
+    "latesubmissions": "遲交的作業",
+    "latesubmissionsaccepted": "寬延繳交直到 {{$a}}",
+    "markingworkflowstate": "評分工作流程狀態",
+    "markingworkflowstateinmarking": "正在評分中",
+    "markingworkflowstateinreview": "正在檢查評分結果",
+    "markingworkflowstatenotmarked": "沒被評分的",
+    "markingworkflowstatereadyforrelease": "已準備好公布",
+    "markingworkflowstatereadyforreview": "評分已完成",
+    "markingworkflowstatereleased": "已經公布",
+    "multipleteams": "你同時是屬於不同的群組的成員",
+    "noattempt": "沒有繳交作業",
+    "nomoresubmissionsaccepted": "只接受已被寬延期限的學生的繳交作業",
+    "noonlinesubmissions": "這個作業不需要您在網上繳交任何東西",
+    "nosubmission": "這個作業還沒人繳交",
+    "noteam": "不屬於任何群組",
+    "notgraded": "尚未評分",
+    "numberofdraftsubmissions": "草稿",
+    "numberofparticipants": "參與者",
+    "numberofsubmissionsneedgrading": "需要評分",
+    "numberofsubmittedassignments": "已繳交",
+    "numberofteams": "群組",
+    "numwords": "{{$a}}字數",
+    "outof": "{{$a.current}}，共有{{$a.total}}",
+    "overdue": "<font color=\"red\">已經超過應繳交時間: {{$a}}</font>",
+    "savechanges": "儲存更改",
+    "submission": "繳交作業",
+    "submissioneditable": "學生可以編編輯這一繳交的作業",
+    "submissionnoteditable": "學生不能編輯這一繳交的作業",
+    "submissionslocked": "此作業不接受繳交",
+    "submissionstatus": "繳交狀態",
+    "submissionstatus_": "未繳交",
+    "submissionstatus_draft": "草稿（尚未繳交）",
+    "submissionstatus_marked": "已評分",
+    "submissionstatus_new": "沒有繳交的作業",
+    "submissionstatus_reopened": "已經重新開啟",
+    "submissionstatus_submitted": "已繳交，等待評分中",
+    "submissionstatusheading": "繳交狀態",
+    "submissionteam": "群組",
+    "submitassignment": "繳交作業",
+    "submitassignment_help": "當這項作業繳交後，您將不能再做任何修改。",
+    "submittedearly": "提早{{$a}}就繳交作業",
+    "submittedlate": "過期{{$a}}才繳交作業",
+    "timemodified": "最後修改",
+    "timeremaining": "剩餘時間",
+    "ungroupedusers": "\"需要以群組方式提交作業\"的設定已經被啟動，但是仍有某些用戶沒有被指派到群組中，或者同一個人屬於多個群組，因此無法提交作業。",
+    "unlimitedattempts": "無限制的",
+    "userswhoneedtosubmit": "需要提交作業的用戶：{{$a}}",
+    "viewsubmission": "檢視繳交的作業"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/el.json b/www/addons/mod/chat/lang/el.json
index f001b95d4b7..eb3c0910806 100644
--- a/www/addons/mod/chat/lang/el.json
+++ b/www/addons/mod/chat/lang/el.json
@@ -1,8 +1,18 @@
 {
+    "beep": "Ηχητικό σήμα",
+    "currentusers": "Τρέχοντες χρήστες",
+    "enterchat": "Κάντε κλικ εδώ για να μπείτε στη συζήτηση τώρα",
+    "entermessage": "Πληκτρολογήστε το μήνυμά σας",
     "errorwhileconnecting": "Σφάλμα κατά τη σύνδεση στο chat.",
     "errorwhilegettingchatdata": "Σφάλμα κατά την ανάκτηση των δεδομένων του chat.",
     "errorwhilegettingchatusers": "Σφάλμα κατά την ανάκτηση των χρηστών του chat.",
     "errorwhileretrievingmessages": "Σφάλμα κατά την ανάκτηση των μηνυμάτων από το διακομιστή.",
     "errorwhilesendingmessage": "Σφάλμα κατά την αποστολή του μηνύματος.",
-    "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα"
+    "messagebeepsyou": "{{$a}} μόλις σας ειδοποίησε!",
+    "messageenter": "{{$a}} έχει μπει σ' αυτή το συζήτηση",
+    "messageexit": "{{$a}} έχει φύγει από αυτή το συζήτηση",
+    "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
+    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
+    "send": "Αποστολή",
+    "sessionstart": "Η επόμενη συνεδρία τσάτ θα αρχίσει στις {{$a.date}}, ({{$a.fromnow}} από τώρα)"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/lt.json b/www/addons/mod/chat/lang/lt.json
index 8b3a6ec31e7..0eb4caa16f1 100644
--- a/www/addons/mod/chat/lang/lt.json
+++ b/www/addons/mod/chat/lang/lt.json
@@ -1,8 +1,19 @@
 {
+    "beep": "Pyp",
+    "currentusers": "Dabartiniai naudotojai",
+    "enterchat": "Spustelėkite čia, kad prisijungtumėte prie pokalbio dabar",
+    "entermessage": "Įveskite savo žinutę",
     "errorwhileconnecting": "Įvyko klaida jungiantis prie pokalbio.",
     "errorwhilegettingchatdata": "Klaida gaunant pokalbio duomenis.",
     "errorwhilegettingchatusers": "Klaida gaunant pokalbio dalyvių informaciją.",
     "errorwhileretrievingmessages": "Klaida gaunant žinutes iš serverio.",
     "errorwhilesendingmessage": "Klaida siunčiant žinutę.",
-    "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite būti prisijungęs."
+    "messagebeepsyou": "{{$a}} ką tik pyptelėjo jums!",
+    "messageenter": "{{$a}} ką tik prisijungė prie šio pokalbio",
+    "messageexit": "{{$a}} ką tik paliko šį pokalbį",
+    "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite būti prisijungęs.",
+    "nomessages": "Žinučių dar nėra",
+    "send": "Siųsti",
+    "sessionstart": "Pokalbio seansas bus pradėtas po: {{$a}}",
+    "talk": "Kalbėti"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/ru.json b/www/addons/mod/chat/lang/ru.json
index a8f93c0d775..9a36351090d 100644
--- a/www/addons/mod/chat/lang/ru.json
+++ b/www/addons/mod/chat/lang/ru.json
@@ -14,6 +14,6 @@
     "mustbeonlinetosendmessages": "Вы должны быть онлайн, чтобы отправлять сообщения",
     "nomessages": "Нет ни одного сообщения",
     "send": "Отправить",
-    "sessionstart": "Следующий сеанс чата начнется в: {{$a}}",
+    "sessionstart": "Следующий сеанс чата начнётся: {{$a.date}}, (через {{$a.fromnow}})",
     "talk": "Разговор"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/ar.json b/www/addons/mod/choice/lang/ar.json
index 507d25fbe0c..60ff70d91f6 100644
--- a/www/addons/mod/choice/lang/ar.json
+++ b/www/addons/mod/choice/lang/ar.json
@@ -4,7 +4,7 @@
     "full": "(كامل)",
     "noresultsviewable": "حالياً لا يمكن معاينة النتائج",
     "notopenyet": "عذرا، هذا النشاط سيكون متوفر في {{$a}}",
-    "numberofuser": "عدد المشاركين",
+    "numberofuser": "عدد المستخدمين",
     "numberofuserinpercentage": "عدد المستخدمين كنسبة",
     "removemychoice": "استبعد خياري",
     "responses": "إجابات",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index fc6af3e2e89..c0a93b72130 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -6,8 +6,8 @@
     "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
-    "numberofuser": "Nombre de participants",
-    "numberofuserinpercentage": "Percentatge de participants",
+    "numberofuser": "Nombre de respostes",
+    "numberofuserinpercentage": "Percentatge de respostes (%)",
     "previewonly": "Això és sols una vista prèvia de les opcions disponibles en aquesta activitat. No esteu habilitat per enviar consultes fins {{$a}}.",
     "removemychoice": "Suprimeix la meva resposta",
     "responses": "Respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index aaa5ea9560c..f9a22aaf32e 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -6,8 +6,8 @@
     "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
     "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
-    "numberofuser": "Počet účastníků",
-    "numberofuserinpercentage": "Procentní podíl účastníků",
+    "numberofuser": "Počet odpovědí",
+    "numberofuserinpercentage": "Počet odpovědí v procentech",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
     "removemychoice": "Odstranit mou volbu",
     "responses": "Odpovědi",
diff --git a/www/addons/mod/choice/lang/da.json b/www/addons/mod/choice/lang/da.json
index 3ef6b107e4d..e462afcd51a 100644
--- a/www/addons/mod/choice/lang/da.json
+++ b/www/addons/mod/choice/lang/da.json
@@ -6,8 +6,8 @@
     "full": "(Fuld)",
     "noresultsviewable": "Resultaterne er ikke tilgængelige på nuværende tidspunkt.",
     "notopenyet": "Denne aktivitet er tilgængelig fra {{$a}}",
-    "numberofuser": "Antal deltagere",
-    "numberofuserinpercentage": "Procentdel af deltagerne",
+    "numberofuser": "Antal svar",
+    "numberofuserinpercentage": "Antal svar i procent",
     "previewonly": "Dette er en forhåndsvisning af de tilgængelige valgmuligheder i denne afstemning. Du kan ikke indsende dine valg før {{$a}}.",
     "removemychoice": "Slet mit valg",
     "responses": "Besvarelser",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index a7bea8a7061..be13d38af77 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -6,8 +6,8 @@
     "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
     "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
-    "numberofuser": "Anzahl",
-    "numberofuserinpercentage": "Prozent",
+    "numberofuser": "Anzahl der Antworten",
+    "numberofuserinpercentage": "Prozent der Antworten",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
     "responses": "Stimmabgaben",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 1b985033f59..4b17c064e80 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -1,7 +1,16 @@
 {
     "errorgetchoice": "Σφάλμα κατά τη λήψη των επιλεγμένων δεδομένων.",
-    "numberofuser": "Πλήθος συμμετεχόντων",
-    "numberofuserinpercentage": "Ποσοστό συμμετεχόντων",
+    "expired": "Η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη",
+    "full": "(Πλήρες)",
+    "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
+    "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
+    "numberofuser": "Αριθμός απαντήσεων",
+    "numberofuserinpercentage": "Ποσοστό απαντήσεων",
+    "removemychoice": "Διαγραφή της επιλογής μου",
+    "responses": "Απαντήσεις",
     "responsesresultgraphdescription": "{{number}}% των χρηστών επέλεξε: {{text}}.",
-    "resultsnotsynced": "Τα αποτελέσματα δεν περιλαμβάνουν την τελευταία απάντησή σας. Παρακαλώ, συγχρονίστε την εφαρμογή για να τα ενημερώσετε."
+    "responsesresultgraphheader": "Εμφάνιση γραφήματος",
+    "resultsnotsynced": "Τα αποτελέσματα δεν περιλαμβάνουν την τελευταία απάντησή σας. Παρακαλώ, συγχρονίστε την εφαρμογή για να τα ενημερώσετε.",
+    "savemychoice": "Αποθήκευση επιλογής",
+    "yourselection": "Η επιλογή σας"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index 41b15bb932f..ceddb82adc6 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentaje de participantes",
+    "numberofuser": "Número de respuestas",
+    "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/es.json b/www/addons/mod/choice/lang/es.json
index b14f860dda6..74076baa791 100644
--- a/www/addons/mod/choice/lang/es.json
+++ b/www/addons/mod/choice/lang/es.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentaje de participantes",
+    "numberofuser": "Número de respuestas",
+    "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esta es solamente una previsualización de las opciones disponibles para esta actividad. No podrá enviar su respuesta a la consulta hasta el {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/eu.json b/www/addons/mod/choice/lang/eu.json
index a0697c57b41..62e0810b4c4 100644
--- a/www/addons/mod/choice/lang/eu.json
+++ b/www/addons/mod/choice/lang/eu.json
@@ -6,9 +6,9 @@
     "full": "(Beteta)",
     "noresultsviewable": "Emaitzak ezin dira orain ikusi",
     "notopenyet": "Barkatu, baina jarduera hau ez dago erabiltzeko moduan {{$a}} arte.",
-    "numberofuser": "Partaide-kopurua",
-    "numberofuserinpercentage": "Partaideen ehunekoa",
-    "previewonly": "Hau jarduera honen aukeren aurrebista bat besterik ez da. Ezingo duzu zure kontsulta bidali {{$a}} arte.",
+    "numberofuser": "Erantzun-kopurua",
+    "numberofuserinpercentage": "Erantzunen portzentajea",
+    "previewonly": "Hau jarduera honetan eskuragarri dauden aukeren aurrebista besterik ez da. Ezingo duzu zure erantzuna bidali {{$a}}-(e)ra arte.",
     "removemychoice": "Ezabatu nire aukera",
     "responses": "Erantzunak",
     "responsesresultgraphdescription": "Erabiltzaileen %{{number}}-ak aukera hau aukeratu zuten: {{text}}.",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 05e3f3b9c99..9ca0f50c2ea 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -6,8 +6,8 @@
     "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
     "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
-    "numberofuser": "Nombre de participants",
-    "numberofuserinpercentage": "Pourcentage de participants",
+    "numberofuser": "Nombre de réponses",
+    "numberofuserinpercentage": "Pourcentage de réponses",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
     "responses": "Réponses",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index c44e97ee335..01597a9058a 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -6,8 +6,8 @@
     "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
     "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
-    "numberofuser": "Numero di partecipanti",
-    "numberofuserinpercentage": "Percentuale dei partecipanti",
+    "numberofuser": "Numero di risposte",
+    "numberofuserinpercentage": "Percentuale delle risposte",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
     "responses": "Scelte",
diff --git a/www/addons/mod/choice/lang/ja.json b/www/addons/mod/choice/lang/ja.json
index 12f0ff816c5..02afe740bcd 100644
--- a/www/addons/mod/choice/lang/ja.json
+++ b/www/addons/mod/choice/lang/ja.json
@@ -7,7 +7,7 @@
     "notopenyet": "申し訳ございません、この活動は {{$a}} まで利用することができません。",
     "numberofuser": "投票者数",
     "numberofuserinpercentage": "投票者数 (%)",
-    "previewonly": "これはこの活動に関する利用可能なオプションのプレビューです。あなたの投票は {{$a}} まで送信することができません。",
+    "previewonly": "これはこの活動で利用可能なオプションのプレビューです。あなたの投票は {{$a}} まで送信することができません。",
     "removemychoice": "私の投票を削除する",
     "responses": "投票結果",
     "responsesresultgraphheader": "グラフ表示",
diff --git a/www/addons/mod/choice/lang/lt.json b/www/addons/mod/choice/lang/lt.json
index 88dd8621cd7..ee1bf2c25c3 100644
--- a/www/addons/mod/choice/lang/lt.json
+++ b/www/addons/mod/choice/lang/lt.json
@@ -1,7 +1,20 @@
 {
+    "cannotsubmit": "Atsiprašome, buvo problema pateikiant tavo pasirinkimą. Prašau, pabandykite dar kartą.",
+    "choiceoptions": "Pasirinkimo parinktys",
     "errorgetchoice": "Klaida gaunant alternatyvius duomenis.",
-    "numberofuser": "Dalyvių skaičius",
-    "numberofuserinpercentage": "Dalyvių procentas",
+    "expired": "Atsiprašome, veikla uždaryta {{$a}} ir nebegalima",
+    "full": "(Visas)",
+    "noresultsviewable": "Rezultatai dabar nematomi.",
+    "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
+    "numberofuser": "Atsakymų skaičius",
+    "numberofuserinpercentage": "Atsakymų procentas",
+    "previewonly": "Tai yra tik šios veiklos galimų variantų peržiūra. Savo pasirinkimo negalėsite pateikti iki {{$a}}.",
+    "removemychoice": "Pašalinti mano pasirinkimą",
+    "responses": "Atsakymai",
     "responsesresultgraphdescription": "{{number}}%  dalyvių pasirinkusių pasirinkimą: {{tekstas}}",
-    "resultsnotsynced": "Galutinis atsakymas neužfiksuotas. Prašome sinchronizuotai atnaujinti duomenis."
+    "responsesresultgraphheader": "Pavaizduota grafiku",
+    "resultsnotsynced": "Galutinis atsakymas neužfiksuotas. Prašome sinchronizuotai atnaujinti duomenis.",
+    "savemychoice": "Įrašyti mano pasirinkimą",
+    "userchoosethisoption": "Naudotojas, kuris pasirenka šią parinktį",
+    "yourselection": "Jūsų pasirinkimas"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index b2be190c0c9..d7e7f4cd7f3 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -6,8 +6,8 @@
     "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
     "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
-    "numberofuser": "Aantal deelnemers",
-    "numberofuserinpercentage": "Deelnemerspercentage",
+    "numberofuser": "Aantal antwoorden",
+    "numberofuserinpercentage": "Percentage antwoorden",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
     "responses": "Antwoorden",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index f8fbe81990b..01fbb57c4c1 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -6,8 +6,8 @@
     "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
     "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentagem de participantes",
+    "numberofuser": "Número de usuários",
+    "numberofuserinpercentage": "Percentual de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
     "removemychoice": "Remover a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/pt.json b/www/addons/mod/choice/lang/pt.json
index a5b426bc80b..68e628591c5 100644
--- a/www/addons/mod/choice/lang/pt.json
+++ b/www/addons/mod/choice/lang/pt.json
@@ -6,8 +6,8 @@
     "full": "Completa",
     "noresultsviewable": "Os resultados da sondagem ainda não estão disponíveis.",
     "notopenyet": "Lamentamos mas esta atividade só estará disponível em {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Percentagem de participantes",
+    "numberofuser": "Número de respostas",
+    "numberofuserinpercentage": "Percentagem de respostas",
     "previewonly": "Esta é apenas uma pré-visualização das opções disponíveis para esta atividade. Não poderá submeter a sua escolha até {{$a}}.",
     "removemychoice": "Apagar a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/ro.json b/www/addons/mod/choice/lang/ro.json
index eb9c1bc300b..2133b57b951 100644
--- a/www/addons/mod/choice/lang/ro.json
+++ b/www/addons/mod/choice/lang/ro.json
@@ -4,8 +4,8 @@
     "full": "(plin)",
     "noresultsviewable": "În acest moment rezultatele nu pot fi vizualizate.",
     "notopenyet": "Ne pare rău, această activitate nu este disponibilă mai devreme de {{$a}}",
-    "numberofuser": "Numărul participanților",
-    "numberofuserinpercentage": "Procentul participanților",
+    "numberofuser": "Numărul de răspunsuri",
+    "numberofuserinpercentage": "Procentajul răspunsurilor",
     "previewonly": "Acesta este doar o prezentare a opțiunilor existente pentru această activitate. Nu veți putea trimite opțiunea dvs. până la {{$a}}.",
     "removemychoice": "Șterge alegerea mea",
     "responses": "Răspunsuri",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 62217bdb227..8ef6af50622 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
     "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
-    "numberofuser": "Antal deltagare",
-    "numberofuserinpercentage": "Procent av deltagarna",
+    "numberofuser": "Antal användare",
+    "numberofuserinpercentage": "Antalet användare i procent.",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
     "responses": "Svar",
diff --git a/www/addons/mod/choice/lang/zh-tw.json b/www/addons/mod/choice/lang/zh-tw.json
index fd45e3f3362..c97305fd6fa 100644
--- a/www/addons/mod/choice/lang/zh-tw.json
+++ b/www/addons/mod/choice/lang/zh-tw.json
@@ -6,8 +6,8 @@
     "full": "(已滿)",
     "noresultsviewable": "目前無法檢視票選結果",
     "notopenyet": "抱歉，這個活動在{{$a}}之前不能使用",
-    "numberofuser": "參與者人數",
-    "numberofuserinpercentage": "參與者百分比",
+    "numberofuser": "回應的人數",
+    "numberofuserinpercentage": "回應人數的百分比",
     "previewonly": "這只是這一活動的可用選項的預覽。你要等到{{$a}}才可以進行投票。",
     "removemychoice": "移除我的選擇",
     "responses": "答覆",
diff --git a/www/addons/mod/feedback/lang/ar.json b/www/addons/mod/feedback/lang/ar.json
new file mode 100644
index 00000000000..ddcafaf0d1a
--- /dev/null
+++ b/www/addons/mod/feedback/lang/ar.json
@@ -0,0 +1,28 @@
+{
+    "analysis": "تحليل",
+    "anonymous": "غير مشخصن",
+    "anonymous_entries": "مدخلات غير مشخصنة",
+    "average": "متوسط",
+    "complete_the_form": "اجب على الأسئلة.....",
+    "completed_feedbacks": "الاجابات المسلمة",
+    "continue_the_form": "استمر من",
+    "feedbackclose": "إغلاق الأفادة",
+    "feedbackopen": "فتح الإفادة",
+    "mode": "نمط",
+    "next_page": "الصفحة التالية",
+    "non_anonymous": "سيتم تسجيل اسم المستخدم وعرضه مع الإجابات",
+    "non_respondents_students": "غير مستجيبين",
+    "not_selected": "لم يتم الاختيار",
+    "not_started": "لم يتم البدء",
+    "overview": "نظرة عامة",
+    "page_after_submit": "الصفحة بعد الإرسال",
+    "preview": "معاينة",
+    "previous_page": "صفحة سابقة",
+    "questions": "أسئلة",
+    "responses": "إجابات",
+    "save_entries": "سلم إجاباتك",
+    "show_entries": "عرض الردود",
+    "show_nonrespondents": "معاينة غير المستجيبين",
+    "started": "بداء",
+    "this_feedback_is_already_submitted": "لقد قمت مسبقاً بإكمال هذا النشاط."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/bg.json b/www/addons/mod/feedback/lang/bg.json
new file mode 100644
index 00000000000..335c218cf1c
--- /dev/null
+++ b/www/addons/mod/feedback/lang/bg.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "Анализ",
+    "anonymous": "Анонимна",
+    "anonymous_entries": "Анонимни отговори",
+    "average": "Средно",
+    "complete_the_form": "Отговаряне на въпросите...",
+    "completed_feedbacks": "Изпратени отговори",
+    "continue_the_form": "Отговаряне на въпросите",
+    "feedback_is_not_open": "Анкетата не е отворена",
+    "feedbackclose": "Позволено е отговаряне до",
+    "feedbackopen": "Позволено е отговаряне от",
+    "mapcourses": "Свързване на анкетата с курсове",
+    "mode": "Режим",
+    "next_page": "Следваща страница",
+    "non_anonymous": "Да - ще се показват с отговорите",
+    "non_anonymous_entries": "няма анонимни отговори",
+    "non_respondents_students": "не отговорили студенти",
+    "not_selected": "Няма избран",
+    "not_started": "не започната",
+    "overview": "Представяне",
+    "page_after_submit": "Съобщение след попълване",
+    "preview": "Преглед",
+    "previous_page": "Предишна страница",
+    "questions": "Въпроси",
+    "response_nr": "Номер на отговора",
+    "responses": "Отговори",
+    "save_entries": "Изпращане на отговорите",
+    "show_entries": "Преглед на отговорите",
+    "show_nonrespondents": "Показване на не отговорилите",
+    "started": "започната",
+    "this_feedback_is_already_submitted": "Вие вече сте изпълнили тази дейност."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ca.json b/www/addons/mod/feedback/lang/ca.json
new file mode 100644
index 00000000000..bee56432429
--- /dev/null
+++ b/www/addons/mod/feedback/lang/ca.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Anàlisi",
+    "anonymous": "Anonimat",
+    "anonymous_entries": "Entrades anònimes",
+    "average": "Mitjana",
+    "complete_the_form": "Responeu les preguntes...",
+    "completed_feedbacks": "Respostes enviades",
+    "continue_the_form": "Continua el formulari",
+    "feedback_is_not_open": "La retroacció no està oberta",
+    "feedbackclose": "Permet les respostes a",
+    "feedbackopen": "Permet les respostes de",
+    "mapcourses": "Mapatge de retroacció a cursos.",
+    "mode": "Mode",
+    "next_page": "Pàgina següent",
+    "non_anonymous": "El nom de l'usuari es registrarà i es mostrarà amb les respostes",
+    "non_anonymous_entries": "entrades no anònimes",
+    "non_respondents_students": "estudiants que no han respost",
+    "not_selected": "No s'ha seleccionat",
+    "not_started": "No s'ha iniciat",
+    "numberoutofrange": "Número fora de l'interval",
+    "overview": "Descripció",
+    "page_after_submit": "Missatge de compleció",
+    "preview": "Vista prèvia",
+    "previous_page": "Pàgina anterior",
+    "questions": "Preguntes",
+    "response_nr": "Número de resposta",
+    "responses": "Respostes",
+    "save_entries": "Envia les respostes",
+    "show_entries": "Mostra les respostes",
+    "show_nonrespondents": "Mostra els que no han respost",
+    "started": "s'ha iniciat",
+    "this_feedback_is_already_submitted": "Heu completat aquesta activitat"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/cs.json b/www/addons/mod/feedback/lang/cs.json
new file mode 100644
index 00000000000..c330879b1d3
--- /dev/null
+++ b/www/addons/mod/feedback/lang/cs.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analýza",
+    "anonymous": "Anonymní",
+    "anonymous_entries": "Anonymní záznamy",
+    "average": "Průměr",
+    "complete_the_form": "Klikněte zde a odpovězte na otázky...",
+    "completed_feedbacks": "Odevzdané odpovědi",
+    "continue_the_form": "Pokračovat ve formuláři",
+    "feedback_is_not_open": "Dotazník není přístupný",
+    "feedbackclose": "Povolit odpovědi",
+    "feedbackopen": "Dostupné od",
+    "mapcourses": "Mapování kurzů",
+    "mode": "Režim",
+    "next_page": "Další stránka",
+    "non_anonymous": "Jména respondentů budou zaznamenána a ukázána s odpověďmi",
+    "non_anonymous_entries": "Neanonymní záznamy ({{$a}})",
+    "non_respondents_students": "Uživatelé, kteří ještě neodpověděli ({{$a}})",
+    "not_selected": "Nevybráno",
+    "not_started": "Nebylo spuštěno",
+    "numberoutofrange": "Číslo je mimo rozsah",
+    "overview": "Přehled",
+    "page_after_submit": "Zpráva o dokončení",
+    "preview": "Náhled",
+    "previous_page": "Předchozí stránka",
+    "questions": "Otázky",
+    "response_nr": "Číslo odpovědi",
+    "responses": "Odpovědi",
+    "save_entries": "Odevzdejte vaše odpovědi",
+    "show_entries": "Ukázat odpovědi",
+    "show_nonrespondents": "Ukázat uživatele, kteří neodpověděli",
+    "started": "Spuštěno",
+    "this_feedback_is_already_submitted": "Tento dotazník jste již vyplnili."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/da.json b/www/addons/mod/feedback/lang/da.json
new file mode 100644
index 00000000000..55d1b3cd1ba
--- /dev/null
+++ b/www/addons/mod/feedback/lang/da.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "Analyse",
+    "anonymous": "Anonym",
+    "anonymous_entries": "Anonyme indlæg  ({{$a}})",
+    "average": "Gennemsnit",
+    "complete_the_form": "Svar på spørgsmålene...",
+    "completed_feedbacks": "Afleverede svar",
+    "continue_the_form": "Fortsæt formularen",
+    "feedback_is_not_open": "Feedbacken er ikke åben",
+    "feedbackclose": "Tillad svar til",
+    "feedbackopen": "Tillad svar fra",
+    "mapcourses": "Tilknyt feedback til kurser",
+    "mode": "Tilstand",
+    "next_page": "Næste side",
+    "non_anonymous": "Brugerens navn vil blive registreret og vist sammen med svarene",
+    "non_anonymous_entries": "Ikke-anonyme bidrag ({{$a}})",
+    "non_respondents_students": "Studerende der ikke har besvaret ({{$a}})",
+    "not_selected": "Ikke valgt",
+    "not_started": "Ikke startet",
+    "overview": "Overblik",
+    "page_after_submit": "Fuldførelsesbesked",
+    "preview": "Forhåndsvisning",
+    "previous_page": "Forrige side",
+    "questions": "Spørgsmål",
+    "response_nr": "Svar nummer",
+    "responses": "Svar",
+    "save_entries": "Aflever dine svar",
+    "show_entries": "Vis svar",
+    "show_nonrespondents": "Vis ikke-respondenter",
+    "started": "Startet",
+    "this_feedback_is_already_submitted": "Du har allerede gennemført denne aktivitet."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/de.json b/www/addons/mod/feedback/lang/de.json
new file mode 100644
index 00000000000..cbfa2dfb6fb
--- /dev/null
+++ b/www/addons/mod/feedback/lang/de.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Auswertung",
+    "anonymous": "Anonym",
+    "anonymous_entries": "Anonyme Einträge ({{$a}})",
+    "average": "Mittelwert",
+    "complete_the_form": "Formular ausfüllen...",
+    "completed_feedbacks": "Ausgefüllte Feedbacks",
+    "continue_the_form": "Ausfüllen fortsetzen",
+    "feedback_is_not_open": "Feedback ist zu diesem Zeitpunkt nicht möglich",
+    "feedbackclose": "Antworten erlauben bis",
+    "feedbackopen": "Antworten erlauben ab",
+    "mapcourses": "Diesem Feedback Kurse zuordnen",
+    "mode": "Modus",
+    "next_page": "Nächste Seite",
+    "non_anonymous": "Nicht anonym",
+    "non_anonymous_entries": "Nicht-anonyme Einträge ({{$a}})",
+    "non_respondents_students": "Teilnehmer/innen ohne Antwort",
+    "not_selected": "Nicht ausgewählt",
+    "not_started": "Nicht begonnen",
+    "numberoutofrange": "Zahl außerhalb des Bereichs",
+    "overview": "Überblick",
+    "page_after_submit": "Abschlussmitteilung",
+    "preview": "Vorschau",
+    "previous_page": "Vorherige Seite",
+    "questions": "Fragen",
+    "response_nr": "Antwort Nr.",
+    "responses": "Antworten",
+    "save_entries": "Einträge speichern",
+    "show_entries": "Einträge anzeigen",
+    "show_nonrespondents": "Ohne Antwort",
+    "started": "Begonnen",
+    "this_feedback_is_already_submitted": "Sie haben diese Aktivität bereits beendet."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/el.json b/www/addons/mod/feedback/lang/el.json
new file mode 100644
index 00000000000..7dd8e2abab8
--- /dev/null
+++ b/www/addons/mod/feedback/lang/el.json
@@ -0,0 +1,29 @@
+{
+    "analysis": "Ανάλυση",
+    "anonymous": "Ανώνυμα",
+    "anonymous_entries": "Ανώνυμες καταχωρήσεις",
+    "average": "Μέσος όρος",
+    "complete_the_form": "Απαντήστε τις ερωτήσεις...",
+    "completed_feedbacks": "Απαντήσεις που έχουν υποβληθεί",
+    "continue_the_form": "Συνεχίστε τη φόρμα",
+    "feedback_is_not_open": "Το σχόλιο δεν είναι ανοιχτό",
+    "feedbackclose": "Κλείσε το σχόλιο στις",
+    "feedbackopen": "Άνοιξε το σχόλιο στις",
+    "mapcourses": "Αντιστοίχηση σχόλιου σε μαθήματα",
+    "mode": "Λειτουργία",
+    "next_page": "Επόμενη σελίδα",
+    "non_anonymous": "Το όνομα του χρήστη θα καταγραφεί και θα εμφανίζεται με τις απαντήσεις",
+    "non_anonymous_entries": "χωρίς ανώνυμες καταχωρήσεις",
+    "not_selected": "Δεν έχουν επιλεχθεί",
+    "overview": "Επισκόπηση",
+    "page_after_submit": "Σελίδα μετά την υποβολή",
+    "preview": "Προεπισκόπηση",
+    "previous_page": "Προηγούμενη σελίδα",
+    "questions": "Ερωτήσεις",
+    "response_nr": "Απάντηση υπ'αριθμόν.",
+    "responses": "Απαντήσεις",
+    "save_entries": "Υποβολή των απαντήσεων σας",
+    "show_entries": "Εμφάνιση απαντήσεων",
+    "started": "Ξεκίνησε στις",
+    "this_feedback_is_already_submitted": "Έχετε ολοκληρώσει ήδη αυτή την δραστηριότητα."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/es-mx.json b/www/addons/mod/feedback/lang/es-mx.json
new file mode 100644
index 00000000000..3ccea0d4f08
--- /dev/null
+++ b/www/addons/mod/feedback/lang/es-mx.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Análisis",
+    "anonymous": "Anónima",
+    "anonymous_entries": "Respuestas anónimas ({{$a}})",
+    "average": "Promedio",
+    "complete_the_form": "Responda a las preguntas...",
+    "completed_feedbacks": "Respuestas enviadas",
+    "continue_the_form": "Continuar con el formato",
+    "feedback_is_not_open": "La retroalimentación no está disponible",
+    "feedbackclose": "Permitir respuestas a",
+    "feedbackopen": "Permitir respuestas de",
+    "mapcourses": "Asignar retroalimentación a cursos",
+    "mode": "Modo",
+    "next_page": "Siguiente página",
+    "non_anonymous": "Los nombres de los usuarios se mostrarán y registrarán con las respuestas",
+    "non_anonymous_entries": "Entradas no anónimas ({{$a}})",
+    "non_respondents_students": "Estudiantes no respondientes ({{$a}})",
+    "not_selected": "No seleccionada",
+    "not_started": "No comenzado",
+    "numberoutofrange": "Número fuera del rango",
+    "overview": "Vista general",
+    "page_after_submit": "Página a mostrar tras la terminación del envío",
+    "preview": "Previsualizar",
+    "previous_page": "Página anterior",
+    "questions": "Preguntas",
+    "response_nr": "Respuesta número",
+    "responses": "Respuestas",
+    "save_entries": "Enviar sus respuestas",
+    "show_entries": "Mostrar respuestas",
+    "show_nonrespondents": "Mostrar no respondientes",
+    "started": "Comenzado",
+    "this_feedback_is_already_submitted": "Usted ya ha finalizado esta actividad."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/es.json b/www/addons/mod/feedback/lang/es.json
new file mode 100644
index 00000000000..b0d70fa540b
--- /dev/null
+++ b/www/addons/mod/feedback/lang/es.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Análisis",
+    "anonymous": "Anónima",
+    "anonymous_entries": "Respuestas anónimas",
+    "average": "Promedio",
+    "complete_the_form": "Responda a las preguntas...",
+    "completed_feedbacks": "Respuestas enviadas",
+    "continue_the_form": "Continuar con el formulario",
+    "feedback_is_not_open": "La encuesta no está disponible",
+    "feedbackclose": "Permitir respuestas a",
+    "feedbackopen": "Permitir respuestas de",
+    "mapcourses": "Asignar encuesta a cursos",
+    "mode": "Modo",
+    "next_page": "Siguiente página",
+    "non_anonymous": "Los nombres de los usuarios se mostrarán y registrarán con las respuestas",
+    "non_anonymous_entries": "entradas no anónimas",
+    "non_respondents_students": "estudiantes no respondientes",
+    "not_selected": "No seleccionada",
+    "not_started": "no comenzado",
+    "numberoutofrange": "Número fuera de rango",
+    "overview": "Vista general",
+    "page_after_submit": "Página a mostrar tras el envío",
+    "preview": "Previsualizar",
+    "previous_page": "Página anterior",
+    "questions": "Preguntas",
+    "response_nr": "Respuesta número",
+    "responses": "Respuestas",
+    "save_entries": "Enviar sus respuestas",
+    "show_entries": "Mostrar respuestas",
+    "show_nonrespondents": "Mostrar no respondientes",
+    "started": "comenzado",
+    "this_feedback_is_already_submitted": "Usted ya ha finalizado esta actividad."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/eu.json b/www/addons/mod/feedback/lang/eu.json
new file mode 100644
index 00000000000..b063f30fe36
--- /dev/null
+++ b/www/addons/mod/feedback/lang/eu.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analisia",
+    "anonymous": "Anonimoa",
+    "anonymous_entries": "Sarrera anonimoak ({{$a}})",
+    "average": "Batez bestekoa",
+    "complete_the_form": "Erantzun galderei...",
+    "completed_feedbacks": "Bidalitako erantzunak",
+    "continue_the_form": "Jarraitu formularioarekin",
+    "feedback_is_not_open": "Inkesta ez dago zabalik",
+    "feedbackclose": "Noiz itxi inkesta",
+    "feedbackopen": "Noiz zabaldu inkesta",
+    "mapcourses": "Esleitu feedback-a ikastaroetarako",
+    "mode": "Modua",
+    "next_page": "Hurrengo orria",
+    "non_anonymous": "Erabiltzaile-izena erantzunekin erakutsiko da",
+    "non_anonymous_entries": "Sarrera anonimorik ez ({{$a}})",
+    "non_respondents_students": "Erantzun ez duten ikasleak ({{$a}})",
+    "not_selected": "Aukeratu gabea",
+    "not_started": "hasi gabea",
+    "numberoutofrange": "Tartetik kanpoko zenbakia",
+    "overview": "Ikuspegi orokorra",
+    "page_after_submit": "Osaketa-mezua",
+    "preview": "Aurrebista",
+    "previous_page": "Aurreko orria",
+    "questions": "Galderak",
+    "response_nr": "Erantzun-kopurua",
+    "responses": "Erantzunak",
+    "save_entries": "Bidali zure erantzunak",
+    "show_entries": "Erakutsi erantzunak",
+    "show_nonrespondents": "Erakutsi erantzun gabeak",
+    "started": "hasita",
+    "this_feedback_is_already_submitted": "Dagoeneko egina duzu jarduera hau."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/fa.json b/www/addons/mod/feedback/lang/fa.json
new file mode 100644
index 00000000000..c51a518902b
--- /dev/null
+++ b/www/addons/mod/feedback/lang/fa.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "تحلیل",
+    "anonymous": "ناشناس",
+    "anonymous_entries": "نظرهای وارد شدهٔ ناشناس ({{$a}})",
+    "average": "میانگین",
+    "complete_the_form": "پاسخ دادن به سوال‌ها...",
+    "completed_feedbacks": "جواب‌های ارائه شده",
+    "continue_the_form": "ادامه دادن فرم",
+    "feedback_is_not_open": "بازخورد باز نیست",
+    "feedbackclose": "بستن بازخورد در",
+    "feedbackopen": "باز کردن بازخورد در",
+    "mapcourses": "نسبت دادن بازخورد به درس‌ها",
+    "mode": "حالت",
+    "next_page": "صفحهٔ بعد",
+    "non_anonymous": "نام کاربران ثبت و به همراه پاسخ‌ها نمایش داده خواهد شد",
+    "non_anonymous_entries": "اطلاعا وارد شده به صورت غیر ناشناس",
+    "non_respondents_students": "شاگردانی که پاسخ نداده‌اند",
+    "not_selected": "انتخاب نشده",
+    "not_started": "شروع نکرده است",
+    "overview": "مرور اجمالی",
+    "page_after_submit": "صفحهٔ بعد از پر کردن فرم",
+    "preview": "پیش‌نمایش",
+    "previous_page": "صفحهٔ قبل",
+    "questions": "سوال‌ها",
+    "response_nr": "پاسخ شمارهٔ",
+    "responses": "پاسخ‌ها",
+    "save_entries": "فرستادن پاسخ‌های شما",
+    "show_entries": "نمایش پاسخ‌ها",
+    "show_nonrespondents": "نمایش کسانی که پاسخ نداده‌اند",
+    "started": "شروع کرده است",
+    "this_feedback_is_already_submitted": "شما قبلا این فعالیت را کامل کرده‌اید."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/fr.json b/www/addons/mod/feedback/lang/fr.json
new file mode 100644
index 00000000000..e043077cb6a
--- /dev/null
+++ b/www/addons/mod/feedback/lang/fr.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analyse",
+    "anonymous": "Anonyme",
+    "anonymous_entries": "Réponses anonymes ({{$a}})",
+    "average": "Moyenne",
+    "complete_the_form": "Répondre aux questions...",
+    "completed_feedbacks": "Réponses envoyées",
+    "continue_the_form": "Continuer le formulaire",
+    "feedback_is_not_open": "Le feedback n'est pas ouvert",
+    "feedbackclose": "Permettre les réponses jusqu'au",
+    "feedbackopen": "Permettre les réponses dès le",
+    "mapcourses": "Associer le feedback aux cours",
+    "mode": "Mode",
+    "next_page": "Page suivante",
+    "non_anonymous": "Le nom du participant sera enregistré et affiché avec ses réponses",
+    "non_anonymous_entries": "Réponses non anonymes ({{$a}})",
+    "non_respondents_students": "Participants sans réponse ({{$a}})",
+    "not_selected": "Sans réponse",
+    "not_started": "Pas commencé",
+    "numberoutofrange": "Nombre en dehors de l'intervalle permis",
+    "overview": "Vue d'ensemble",
+    "page_after_submit": "Message de fin",
+    "preview": "Prévisualisation",
+    "previous_page": "Page précédente",
+    "questions": "Questions",
+    "response_nr": "Réponse No",
+    "responses": "Réponses",
+    "save_entries": "Remettre vos réponses",
+    "show_entries": "Afficher les réponses",
+    "show_nonrespondents": "Afficher les utilisateurs sans réponse",
+    "started": "Commencé",
+    "this_feedback_is_already_submitted": "Vous avez déjà effectué cette activité."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/he.json b/www/addons/mod/feedback/lang/he.json
new file mode 100644
index 00000000000..52e5c8f67b8
--- /dev/null
+++ b/www/addons/mod/feedback/lang/he.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "ניתוח",
+    "anonymous": "אנונימי",
+    "anonymous_entries": "משובים אנונימיים",
+    "average": "ממוצע",
+    "complete_the_form": "מענה על השאלות...",
+    "completed_feedbacks": "תשובות אשר הוגשו",
+    "continue_the_form": "המשך השאלון",
+    "feedback_is_not_open": "שאלון־מותנה זה איננו זמין כעת",
+    "feedbackclose": "אפשר תשובות ל",
+    "feedbackopen": "אפשרת תשובות מ",
+    "mapcourses": "שיוך שאלון־מותנה עבור הקורסים",
+    "mode": "מצב",
+    "next_page": "העמוד הבא",
+    "non_anonymous": "שמות המשתמשים ישמרו ויוצגו יחד עם התשובות",
+    "non_anonymous_entries": "לא ניתן לענות באופן אנונימי (לא מזוהה)",
+    "non_respondents_students": "לא קיימות תגובות של סטודנטים",
+    "not_selected": "לא נבחר",
+    "not_started": "לא התחיל",
+    "overview": "סקירה",
+    "page_after_submit": "הודעת השלמה",
+    "preview": "תצוגה מקדימה",
+    "previous_page": "העמוד הקודם",
+    "questions": "שאלות",
+    "response_nr": "מספר תגובה",
+    "responses": "תגובות",
+    "save_entries": "הגשת תשובותיך",
+    "show_entries": "הצגת תגובות",
+    "show_nonrespondents": "הצגת שאלות ללא התגובות",
+    "started": "התחיל",
+    "this_feedback_is_already_submitted": "השלמתם פעילות זו, בעבר."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/hu.json b/www/addons/mod/feedback/lang/hu.json
new file mode 100644
index 00000000000..4c096d23974
--- /dev/null
+++ b/www/addons/mod/feedback/lang/hu.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Elemzés",
+    "anonymous": "Névtelen",
+    "anonymous_entries": "Névtelen bejegyzések ({{$a}})",
+    "average": "Átlag",
+    "complete_the_form": "Válaszoljon a kérdésekre...",
+    "completed_feedbacks": "Leadott válaszok",
+    "continue_the_form": "Űrlap folytatása",
+    "feedback_is_not_open": "A visszajelzés nincs nyitva",
+    "feedbackclose": "Válaszok engedélyezése a címzettnek",
+    "feedbackopen": "Válaszok engedélyezése a feladótól",
+    "mapcourses": "A visszajelzés illesztése kurzusokhoz.",
+    "mode": "Mód",
+    "next_page": "Következő oldal",
+    "non_anonymous": "A felhasználó nevét a rendszer naplózza és a válaszok mellett megjeleníti",
+    "non_anonymous_entries": "Nem névtelen bejegyzések ({{$a}})",
+    "non_respondents_students": "Nem válaszoló tanulók ({{$a}})",
+    "not_selected": "Nincs kiválasztva",
+    "not_started": "Nem kezdődött el",
+    "numberoutofrange": "Tartományon kívül eső szám",
+    "overview": "Áttekintés",
+    "page_after_submit": "Teljesítéssel kapcsolatos üzenet",
+    "preview": "Előkép",
+    "previous_page": "Előző oldal",
+    "questions": "Kérdések",
+    "response_nr": "Válasz száma:",
+    "responses": "Tanuló válaszai",
+    "save_entries": "Válaszainak leadása",
+    "show_entries": "Tanuló válaszainak megjelenítése",
+    "show_nonrespondents": "Nem válaszolók megjelenítése",
+    "started": "Elkezdődött",
+    "this_feedback_is_already_submitted": "Ezt a tevékenységet már befejezte."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/it.json b/www/addons/mod/feedback/lang/it.json
new file mode 100644
index 00000000000..d31469322d6
--- /dev/null
+++ b/www/addons/mod/feedback/lang/it.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analisi",
+    "anonymous": "Anonimo",
+    "anonymous_entries": "Compilazioni anonime ({{$a}})",
+    "average": "Media",
+    "complete_the_form": "Compila il questionario",
+    "completed_feedbacks": "Risposte inviate",
+    "continue_the_form": "Continua a rispondere alle domande",
+    "feedback_is_not_open": "Il feedback non è aperto",
+    "feedbackclose": "Chiusura",
+    "feedbackopen": "Apertura",
+    "mapcourses": "Associa feedback ai corsi",
+    "mode": "Modalità",
+    "next_page": "Pagina successiva",
+    "non_anonymous": "Il nome del partecipante verrà registrato e visualizzato nelle risposte",
+    "non_anonymous_entries": "Risposte non anonime ({{$a}})",
+    "non_respondents_students": "Studenti che non hanno risposto ({{$a}})",
+    "not_selected": "Nessuna scelta",
+    "not_started": "Non iniziato",
+    "numberoutofrange": "Il numero è fuori scala",
+    "overview": "Panoramica",
+    "page_after_submit": "Messaggio da visualizzare dopo la compilazione",
+    "preview": "Anteprima",
+    "previous_page": "Pagina precedente",
+    "questions": "Domande",
+    "response_nr": "Risposta numero",
+    "responses": "Risposte",
+    "save_entries": "Invia le risposte",
+    "show_entries": "Risposte",
+    "show_nonrespondents": "Risposte mancanti",
+    "started": "Aperto",
+    "this_feedback_is_already_submitted": "Hai già completato questa attività."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ja.json b/www/addons/mod/feedback/lang/ja.json
new file mode 100644
index 00000000000..63503d3cc28
--- /dev/null
+++ b/www/addons/mod/feedback/lang/ja.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "分析",
+    "anonymous": "匿名",
+    "anonymous_entries": "匿名エントリ ({{$a}})",
+    "average": "平均",
+    "complete_the_form": "質問に回答する ...",
+    "completed_feedbacks": "送信済み回答",
+    "continue_the_form": "フォームを続ける",
+    "feedback_is_not_open": "フィードバックは利用できません。",
+    "feedbackclose": "フィードバック終了日時",
+    "feedbackopen": "フィードバック開始日時",
+    "mapcourses": "フィードバックをコースにマップする",
+    "mode": "モード",
+    "next_page": "次のページ",
+    "non_anonymous": "ユーザ名を記録して回答と共に表示する",
+    "non_anonymous_entries": "非匿名エントリ ({{$a}})",
+    "non_respondents_students": "未回答の学生 ({{$a}})",
+    "not_selected": "未選択",
+    "not_started": "未開始",
+    "numberoutofrange": "数字が範囲を超えています。",
+    "overview": "概要",
+    "page_after_submit": "完了メッセージ",
+    "preview": "プレビュー",
+    "previous_page": "前のページ",
+    "questions": "質問",
+    "response_nr": "回答No",
+    "responses": "回答",
+    "save_entries": "あなたの回答を送信する",
+    "show_entries": "回答を表示する",
+    "show_nonrespondents": "未回答者を表示する",
+    "started": "開始済み",
+    "this_feedback_is_already_submitted": "あなたはすでにこの活動を完了しています。"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/lt.json b/www/addons/mod/feedback/lang/lt.json
new file mode 100644
index 00000000000..dbe395c1dd6
--- /dev/null
+++ b/www/addons/mod/feedback/lang/lt.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analizė",
+    "anonymous": "Anonimiškai",
+    "anonymous_entries": "Anoniminiai įrašai ({{$a}})",
+    "average": "Vidurkis",
+    "complete_the_form": "Atsakyti klausimus...",
+    "completed_feedbacks": "Pateikti atsakymai",
+    "continue_the_form": "Tęsti formą",
+    "feedback_is_not_open": "Atsiliepimas neatidarytas",
+    "feedbackclose": "Uždaryti atsiliepimą",
+    "feedbackopen": "Atidaryti atsiliepimą",
+    "mapcourses": "Susieti atsiliepimą su kursais",
+    "mode": "Režimas",
+    "next_page": "Kitas puslapis",
+    "non_anonymous": "Naudotojo vardas bus užregistruotas ir rodomas su atsakymais",
+    "non_anonymous_entries": "Neanoniminiai įrašai ({{$a}})",
+    "non_respondents_students": "Ne respondentai besimokantieji ({{$a}})",
+    "not_selected": "Nepasirinkta",
+    "not_started": "Nepradėta",
+    "numberoutofrange": "Skaičius nėra iš intervalo",
+    "overview": "Apžvalga",
+    "page_after_submit": "Puslapis po pateikimo",
+    "preview": "Peržiūra",
+    "previous_page": "Ankstesnis puslapis",
+    "questions": "Klausimai",
+    "response_nr": "Atsakymo numeris",
+    "responses": "Atsakymai",
+    "save_entries": "Pateikite savo atsakymus",
+    "show_entries": "Rodyti atsakymus",
+    "show_nonrespondents": "Rodyti ne respondentus",
+    "started": "Pradėjo",
+    "this_feedback_is_already_submitted": "Jau užbaigėte šią veiklą."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/nl.json b/www/addons/mod/feedback/lang/nl.json
new file mode 100644
index 00000000000..d760ceb58c6
--- /dev/null
+++ b/www/addons/mod/feedback/lang/nl.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analyse",
+    "anonymous": "Anoniem",
+    "anonymous_entries": "Anoniem ingevulde formulieren ({{$a}})",
+    "average": "Gemiddelde",
+    "complete_the_form": "Beantwoord de vragen...",
+    "completed_feedbacks": "Ingevulde antwoorden",
+    "continue_the_form": "Ga verder met dit formulier",
+    "feedback_is_not_open": "De feedback is niet open",
+    "feedbackclose": "Antwoorden toestaan tot",
+    "feedbackopen": "Antwoorden toestaan van",
+    "mapcourses": "Koppel feedback aan cursussen",
+    "mode": "Modus",
+    "next_page": "Volgende pagina",
+    "non_anonymous": "De gebruikersnamen zullen bewaard worden en samen met de antwoorden getoond worden",
+    "non_anonymous_entries": "Niet-anonieme items  ({{$a}})",
+    "non_respondents_students": "Leerlingen die niet ingestuurd hebben ({{$a}})",
+    "not_selected": "Niet geselecteerd",
+    "not_started": "Niet begonnen",
+    "numberoutofrange": "Aantal buiten bereik",
+    "overview": "Overzicht",
+    "page_after_submit": "Bericht na voltooien",
+    "preview": "Voorbeeld",
+    "previous_page": "Vorige pagina",
+    "questions": "Vragen",
+    "response_nr": "Antwoordnummer",
+    "responses": "Antwoorden",
+    "save_entries": "Verzend je antwoorden",
+    "show_entries": "Toon antwoorden",
+    "show_nonrespondents": "Niet geantwoord",
+    "started": "Gestart",
+    "this_feedback_is_already_submitted": "Je hebt dit feedbackformulier is al ingestuurd."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/pl.json b/www/addons/mod/feedback/lang/pl.json
new file mode 100644
index 00000000000..7c904cb371a
--- /dev/null
+++ b/www/addons/mod/feedback/lang/pl.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analiza",
+    "anonymous": "Anonimowy",
+    "anonymous_entries": "Anonimowe wpisy",
+    "average": "Średnia",
+    "complete_the_form": "Odpowiedz na pytania ...",
+    "completed_feedbacks": "Zatwierdzone odpowiedzi",
+    "continue_the_form": "Kontynuuj wypełnianie formularza",
+    "feedback_is_not_open": "Informacja zwrotna nie jest otwarta",
+    "feedbackclose": "Zamknij o",
+    "feedbackopen": "Otwórz o",
+    "mapcourses": "Skojarz formularz opinii z kursami",
+    "mode": "Tryb",
+    "next_page": "Następna strona",
+    "non_anonymous": "Nazwa użytkownika będzie zapamiętywana i prezentowana z odpowiedziami",
+    "non_anonymous_entries": "Pozycje nie anonimowe",
+    "non_respondents_students": "Studenci niebędący respondentami*",
+    "not_selected": "Nie wybrano",
+    "not_started": "nie rozpoczęto",
+    "numberoutofrange": "Liczba poza zakresem",
+    "overview": "Przegląd",
+    "page_after_submit": "Wyświetl stronę po zatwierdzeniu",
+    "preview": "Podgląd",
+    "previous_page": "Poprzednia strona\n",
+    "questions": "Pytania",
+    "response_nr": "Liczba odpowiedzi",
+    "responses": "Odpowiedzi",
+    "save_entries": "Zatwierdź swoją odpowiedź",
+    "show_entries": "Pokaż odpowiedzi",
+    "show_nonrespondents": "Pokaż kto nie udzielił opinii*",
+    "started": "Rozpoczęto",
+    "this_feedback_is_already_submitted": "Już zakończyłeś wypełnianie tej aktywności."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/pt-br.json b/www/addons/mod/feedback/lang/pt-br.json
new file mode 100644
index 00000000000..98fb2ece613
--- /dev/null
+++ b/www/addons/mod/feedback/lang/pt-br.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "Análise",
+    "anonymous": "Anônimo",
+    "anonymous_entries": "Entradas anônimas",
+    "average": "Média",
+    "complete_the_form": "Responda as questões...",
+    "completed_feedbacks": "Respostas submetidas",
+    "continue_the_form": "Continue o formulário",
+    "feedback_is_not_open": "A pesquisa não está aberta",
+    "feedbackclose": "Permitir respostas até",
+    "feedbackopen": "Permitir respostas de",
+    "mapcourses": "Mapear pesquisa para os cursos",
+    "mode": "Modo",
+    "next_page": "Próxima página",
+    "non_anonymous": "O nome do usuário será registrado e mostrado com as respostas",
+    "non_anonymous_entries": "entradas não anônimas",
+    "non_respondents_students": "estudantes não respondentes",
+    "not_selected": "Não selecionado",
+    "not_started": "não iniciado",
+    "overview": "Visão geral",
+    "page_after_submit": "Mensagem de conclusão",
+    "preview": "Previsão",
+    "previous_page": "Página anterior",
+    "questions": "Questões",
+    "response_nr": "Resposta numérica",
+    "responses": "Respostas",
+    "save_entries": "Submeter as suas respostas",
+    "show_entries": "Mostrar respostas",
+    "show_nonrespondents": "Mostrar não respondentes",
+    "started": "iniciado",
+    "this_feedback_is_already_submitted": "Você já terminou esta atividade."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/pt.json b/www/addons/mod/feedback/lang/pt.json
new file mode 100644
index 00000000000..66f19fd361e
--- /dev/null
+++ b/www/addons/mod/feedback/lang/pt.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Análise",
+    "anonymous": "Anónimo",
+    "anonymous_entries": "Respostas anónimas ({{$a}})",
+    "average": "Média",
+    "complete_the_form": "Responder às questões...",
+    "completed_feedbacks": "Respostas submetidas",
+    "continue_the_form": "Continuar o inquérito",
+    "feedback_is_not_open": "O inquérito não está aberto",
+    "feedbackclose": "Permitir respostas até",
+    "feedbackopen": "Permitir respostas a partir de",
+    "mapcourses": "Associar o inquérito a disciplinas",
+    "mode": "Modo",
+    "next_page": "Página seguinte",
+    "non_anonymous": "O nome do utilizador será registado e apresentado com as respostas",
+    "non_anonymous_entries": "Respostas não anónimas ({{$a}})",
+    "non_respondents_students": "Alunos que não responderam ({{$a}})",
+    "not_selected": "Não respondido",
+    "not_started": "Por iniciar",
+    "numberoutofrange": "Valor fora do intervalo",
+    "overview": "Visão geral",
+    "page_after_submit": "Mensagem de conclusão",
+    "preview": "Pré-visualização",
+    "previous_page": "Página anterior",
+    "questions": "Questões",
+    "response_nr": "Número da resposta",
+    "responses": "Respostas",
+    "save_entries": "Submeter respostas",
+    "show_entries": "Respostas",
+    "show_nonrespondents": "Utilizadores que não responderam",
+    "started": "iniciado",
+    "this_feedback_is_already_submitted": "Já completou esta atividade"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ro.json b/www/addons/mod/feedback/lang/ro.json
new file mode 100644
index 00000000000..b7e3b467ea1
--- /dev/null
+++ b/www/addons/mod/feedback/lang/ro.json
@@ -0,0 +1,25 @@
+{
+    "analysis": "Analiză",
+    "anonymous": "Anonim",
+    "anonymous_entries": "Postări anonime",
+    "average": "Medie",
+    "complete_the_form": "Răspunde la întrebare",
+    "completed_feedbacks": "Răspunsuri trimise",
+    "feedback_is_not_open": "Feedback-ul nu este disponibil",
+    "feedbackopen": "Permite răspunsuri de la",
+    "mode": "Mod",
+    "next_page": "Următoarea pagină",
+    "not_selected": "Nu este selectat",
+    "not_started": "neînceput",
+    "numberoutofrange": "Număr în afara intervalului",
+    "page_after_submit": "Pagina după trimitere",
+    "preview": "Previzualizare",
+    "previous_page": "Pagina precedentă",
+    "questions": "Întrebări",
+    "response_nr": "Numărul răspunsuluii",
+    "responses": "Răspunsuri",
+    "save_entries": "Trimiteți răspunsurile",
+    "show_entries": "Afișează răspunsuri",
+    "started": "început",
+    "this_feedback_is_already_submitted": "Ați completat deja această activitate."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ru.json b/www/addons/mod/feedback/lang/ru.json
new file mode 100644
index 00000000000..e006d1ef678
--- /dev/null
+++ b/www/addons/mod/feedback/lang/ru.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Анализ результатов",
+    "anonymous": "Анонимный",
+    "anonymous_entries": "Анонимные записи ({{$a}})",
+    "average": "Средний",
+    "complete_the_form": "Ответьте на вопросы ...",
+    "completed_feedbacks": "Отправлено ответов",
+    "continue_the_form": "Продолжить форму",
+    "feedback_is_not_open": "эта анкета обратной связи не открыта",
+    "feedbackclose": "Разрешить отвечать до",
+    "feedbackopen": "Разрешить отвечать с",
+    "mapcourses": "Сопоставление Обратной связи с курсами",
+    "mode": "Режим",
+    "next_page": "Следующая страница",
+    "non_anonymous": "Имя пользователя будет записано и показано с его ответами",
+    "non_anonymous_entries": "Не анонимные записи ({{$a}})",
+    "non_respondents_students": "Не ответившие студенты ({{$a}})",
+    "not_selected": "Не выбрано",
+    "not_started": "не началось",
+    "numberoutofrange": "Значение вне диапазона",
+    "overview": "Просмотр",
+    "page_after_submit": "Сообщение о завершении",
+    "preview": "Предварительный просмотр",
+    "previous_page": "Предыдущая страница",
+    "questions": "Вопросов",
+    "response_nr": "Номер ответа",
+    "responses": "Ответы",
+    "save_entries": "Отправить свои ответы",
+    "show_entries": "Показать ответивших",
+    "show_nonrespondents": "Показать не ответивших",
+    "started": "начало",
+    "this_feedback_is_already_submitted": "Вы уже завершили этот учебный элемент"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/sv.json b/www/addons/mod/feedback/lang/sv.json
new file mode 100644
index 00000000000..c749faa8094
--- /dev/null
+++ b/www/addons/mod/feedback/lang/sv.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "Analys",
+    "anonymous": "Anonym",
+    "anonymous_entries": "Anonyma inlägg",
+    "average": "Medel",
+    "complete_the_form": "Fyll i hela formuläret",
+    "completed_feedbacks": "Fullgjorda Egna enkäter",
+    "continue_the_form": "Fortsätt formuläret",
+    "feedback_is_not_open": "Denna Egen enkät är inte öppen",
+    "feedbackclose": "Stäng Egen enkät vid denna tid",
+    "feedbackopen": "Öppna denna Egen enkät vid den här tiden",
+    "mapcourses": "\"Mappa\" Egen enkät till kurser",
+    "mode": "Läge",
+    "next_page": "Nästa sida",
+    "non_anonymous": "Inte-anonym",
+    "non_anonymous_entries": "Inga anonyma bidrag",
+    "non_respondents_students": "Studenter/elever/deltagare/lärande som inte har lämnat några svar",
+    "not_selected": "Inte vald",
+    "not_started": "inte påbörjad",
+    "overview": "Översikt",
+    "page_after_submit": "Sida efter inskickning",
+    "preview": "Förhandsgranska",
+    "previous_page": "Föregående sida",
+    "questions": "Frågor",
+    "response_nr": "Antal svar",
+    "responses": "Svar",
+    "save_entries": "Spara inlägg",
+    "show_entries": "Visa inlägg",
+    "show_nonrespondents": "Visa dem som inte har lämnat några svar",
+    "started": "startad",
+    "this_feedback_is_already_submitted": "Du har redan fullföljt den här Egen enkät"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/tr.json b/www/addons/mod/feedback/lang/tr.json
new file mode 100644
index 00000000000..b1c57c37b04
--- /dev/null
+++ b/www/addons/mod/feedback/lang/tr.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "Analiz",
+    "anonymous": "Anonim",
+    "anonymous_entries": "Anonim kayıtlar",
+    "average": "Ortalama",
+    "complete_the_form": "Soruları cevaplayın...",
+    "completed_feedbacks": "Gönderilen cevaplar",
+    "continue_the_form": "Devam et",
+    "feedback_is_not_open": "Geribildirim açık değil",
+    "feedbackclose": "Geribildirimi kapat",
+    "feedbackopen": "Geribildirimi aç",
+    "mapcourses": "Geribildirimi derslere eşleştirin",
+    "mode": "Mod",
+    "next_page": "Sonraki sayfa",
+    "non_anonymous": "Kullanıcıların adları kaydedilecek ve cevaplarıyla birlikte gösterilecek",
+    "non_anonymous_entries": "anonim olmayan kayıtlar({{$a}})",
+    "non_respondents_students": "Katılımcı olmayan öğrenciler ({{$a}})",
+    "not_selected": "Seçilmedi",
+    "not_started": "Başlatılmadı",
+    "numberoutofrange": "Aralık dışı numara",
+    "overview": "Gözat",
+    "page_after_submit": "Geribildirim doldurulduktan sonraki sayfa",
+    "preview": "Önizleme",
+    "previous_page": "Önceki sayfa",
+    "questions": "Sorular",
+    "response_nr": "Yanıt No.",
+    "responses": "Yanıtlar",
+    "save_entries": "Cevaplarınızı gönderin",
+    "show_entries": "Yanıtları göster",
+    "show_nonrespondents": "Katılımcıları gösterme",
+    "started": "Başlatıldı",
+    "this_feedback_is_already_submitted": "Bu etkinliği zaten doldurdunuz."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/zh-cn.json b/www/addons/mod/feedback/lang/zh-cn.json
new file mode 100644
index 00000000000..5d53cc04b5d
--- /dev/null
+++ b/www/addons/mod/feedback/lang/zh-cn.json
@@ -0,0 +1,32 @@
+{
+    "analysis": "分析",
+    "anonymous": "匿名",
+    "anonymous_entries": "匿名条目",
+    "average": "平均",
+    "complete_the_form": "回答问题...",
+    "completed_feedbacks": "已提交的答复",
+    "continue_the_form": "继续填表",
+    "feedback_is_not_open": "此反馈未开放",
+    "feedbackclose": "关闭此反馈时间",
+    "feedbackopen": "开放此反馈时间",
+    "mapcourses": "将反馈映射到课程",
+    "mode": "模式",
+    "next_page": "下一页",
+    "non_anonymous": "用户姓名会被记录，并和他们的反馈一起显示",
+    "non_anonymous_entries": "非匿名条目",
+    "non_respondents_students": "未答复的学生",
+    "not_selected": "未选择",
+    "not_started": "还未答题",
+    "overview": "概述",
+    "page_after_submit": "提交后页面",
+    "preview": "预览",
+    "previous_page": "前一页",
+    "questions": "问题",
+    "response_nr": "答复编号",
+    "responses": "答复",
+    "save_entries": "提交您的答复",
+    "show_entries": "显示答复",
+    "show_nonrespondents": "显示未答复者",
+    "started": "已经开始",
+    "this_feedback_is_already_submitted": "您已经完成此活动。"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/zh-tw.json b/www/addons/mod/feedback/lang/zh-tw.json
new file mode 100644
index 00000000000..a940c584fdf
--- /dev/null
+++ b/www/addons/mod/feedback/lang/zh-tw.json
@@ -0,0 +1,33 @@
+{
+    "analysis": "分析",
+    "anonymous": "匿名",
+    "anonymous_entries": "匿名輸入({{$a}})",
+    "average": "平均數",
+    "complete_the_form": "填寫回饋單...",
+    "completed_feedbacks": "已回答",
+    "continue_the_form": "繼續填表",
+    "feedback_is_not_open": "這個回饋單還沒有開放",
+    "feedbackclose": "結束填答時間",
+    "feedbackopen": "開始填答時間",
+    "mapcourses": "對應回饋單到課程",
+    "mode": "模式",
+    "next_page": "下一頁",
+    "non_anonymous": "用戶名稱和回應將被記錄",
+    "non_anonymous_entries": "具名輸入({{$a}})",
+    "non_respondents_students": "沒有回應的學生({{$a}})",
+    "not_selected": "未選",
+    "not_started": "沒有開始",
+    "numberoutofrange": "超過範圍的人數",
+    "overview": "概要",
+    "page_after_submit": "完成後的訊息",
+    "preview": "預覽",
+    "previous_page": "上一頁",
+    "questions": "問題",
+    "response_nr": "回應編號",
+    "responses": "回應",
+    "save_entries": "送出並結束",
+    "show_entries": "顯示回應",
+    "show_nonrespondents": "顯示沒有回應的學生",
+    "started": "已經開始",
+    "this_feedback_is_already_submitted": "您'已經完成這種活動。"
+}
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/bg.json b/www/addons/mod/forum/lang/bg.json
index fc016cf182e..14f634ffe01 100644
--- a/www/addons/mod/forum/lang/bg.json
+++ b/www/addons/mod/forum/lang/bg.json
@@ -5,6 +5,7 @@
     "cannotcreatediscussion": "Не може да се създаде нова дискусия",
     "couldnotadd": "Вашето мнение не можа да се добави поради неизвестна грешка.",
     "discussion": "Обсъждане",
+    "discussionpinned": "Забодена",
     "discussionsubscription": "Абониране за обсъждането",
     "edit": "Редактиране",
     "erroremptymessage": "Мнението не може да бъде празно",
diff --git a/www/addons/mod/forum/lang/ca.json b/www/addons/mod/forum/lang/ca.json
index 6ff975b096c..5f1be9cd58c 100644
--- a/www/addons/mod/forum/lang/ca.json
+++ b/www/addons/mod/forum/lang/ca.json
@@ -5,6 +5,7 @@
     "cannotcreatediscussion": "No s'ha pogut obrir un debat nou",
     "couldnotadd": "Un error desconegut ha impedit afegir el vostre missatge",
     "discussion": "Debat",
+    "discussionpinned": "Fixat",
     "discussionsubscription": "Subscripció als debats",
     "edit": "Edita",
     "erroremptymessage": "El missatge no pot estar buit",
@@ -24,8 +25,6 @@
     "refreshdiscussions": "Actualitza els debats",
     "refreshposts": "Actualitza els missatges",
     "reply": "Respon",
-    "sortnewestfirst": "Mostra els més recents primer",
-    "sortoldestfirst": "Mostra els més antics primer",
     "subject": "Assumpte",
     "unread": "No llegit",
     "unreadpostsnumber": "{{$a}} missatges no llegits"
diff --git a/www/addons/mod/forum/lang/cs.json b/www/addons/mod/forum/lang/cs.json
index 55cfb03b6ee..1477982359d 100644
--- a/www/addons/mod/forum/lang/cs.json
+++ b/www/addons/mod/forum/lang/cs.json
@@ -6,6 +6,7 @@
     "couldnotadd": "Neznámá chyba! Nemohu přidat váš příspěvek.",
     "discussion": "Diskuse",
     "discussionlocked": "Tato diskuse byla uzavřena, takže již nemůže odpovídat.",
+    "discussionpinned": "Připnuté navrch",
     "discussionsubscription": "Odebírání diskuse",
     "edit": "Upravit",
     "erroremptymessage": "Text příspěvku nemůže být prázdný",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Obnovit diskuse",
     "refreshposts": "Obnovit diskusní příspěvky",
     "reply": "Odpovědět",
-    "sortnewestfirst": "Zobrazit nejnovější",
-    "sortoldestfirst": "Zobrazit nejstarší",
     "subject": "Předmět",
     "unread": "Nepřečteno",
     "unreadpostsnumber": "Nepřečtené příspěvky: {{$a}}"
diff --git a/www/addons/mod/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index fc0809143c8..38dca8ad7f1 100644
--- a/www/addons/mod/forum/lang/da.json
+++ b/www/addons/mod/forum/lang/da.json
@@ -5,10 +5,11 @@
     "cannotcreatediscussion": "Kunne ikke oprette en ny tråd.",
     "couldnotadd": "Kunne ikke tilføje dit indlæg pga. en ukendt fejl",
     "discussion": "Tråd",
+    "discussionpinned": "Fastgjort",
     "discussionsubscription": "Abonnement på tråd",
     "edit": "Rediger",
     "erroremptymessage": "Indlægget kan ikke være tomt.",
-    "erroremptysubject": "Emnefeltet kan ikke være tomt",
+    "erroremptysubject": "Indlæggets emne kan ikke være tomt.",
     "errorgetforum": "Fejl ved hentning af forumdata.",
     "errorgetgroups": "Fejl ved hentning af gruppeindstillinger.",
     "forumnodiscussionsyet": "Der er endnu ingen indlæg i dette forum.",
@@ -24,8 +25,6 @@
     "refreshdiscussions": "Genindlæs diskussioner",
     "refreshposts": "Genindlæs indlæg",
     "reply": "Svar",
-    "sortnewestfirst": "Vis nyeste først",
-    "sortoldestfirst": "Vis ældste først",
     "subject": "Emne",
     "unread": "Ikke læst",
     "unreadpostsnumber": "{{$a}} nye indlæg"
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index 5cb60350f84..bee3c7cb0d4 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -6,10 +6,11 @@
     "couldnotadd": "Der Beitrag wurde wegen eines Fehlers nicht hinzugefügt.",
     "discussion": "Thema",
     "discussionlocked": "Dieses Thema wurde gesperrt, so dass Sie hier nicht weiter antworten können.",
+    "discussionpinned": "Angepinnt",
     "discussionsubscription": "Themenabonnement",
     "edit": "Bearbeiten",
     "erroremptymessage": "Die Mitteilung darf nicht leer sein.",
-    "erroremptysubject": "Das Forenthema darf nicht leer sein.",
+    "erroremptysubject": "Der Betreff darf nicht leer sein.",
     "errorgetforum": "Fehler beim Laden der Forendaten",
     "errorgetgroups": "Fehler beim Laden der Gruppeneinstellungen",
     "forumnodiscussionsyet": "Keine Themen im Forum",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Themen aktualisieren",
     "refreshposts": "Forenbeiträge aktualisieren",
     "reply": "Antworten",
-    "sortnewestfirst": "Neu zuerst",
-    "sortoldestfirst": "Alt zuerst",
     "subject": "Betreff",
     "unread": "Ungelesen",
     "unreadpostsnumber": "{{$a}} ungelesene Beiträge"
diff --git a/www/addons/mod/forum/lang/el.json b/www/addons/mod/forum/lang/el.json
index 40f15fd6d8a..78bee38ce77 100644
--- a/www/addons/mod/forum/lang/el.json
+++ b/www/addons/mod/forum/lang/el.json
@@ -1,13 +1,30 @@
 {
+    "addanewdiscussion": "Προσθήκη νέου θέματος συζήτησης",
+    "cannotadddiscussion": "Η προσθήκη συζητήσεων σε αυτή την ομάδα συζήτησης απαιτεί συμμετοχή σε ομάδα.",
+    "cannotadddiscussionall": "Δεν έχετε δικαίωμα να προσθέσετε ένα νέο θέμα συζήτησης για όλους τους συμμετέχοντες.",
+    "cannotcreatediscussion": "Δεν ήταν δυνατό να δημιουργηθεί η νέα συζήτηση",
+    "couldnotadd": "Δεν ήταν δυνατή η προσθήκη του μηνύματός σας λόγω άγνωστου σφάλματος",
+    "discussion": "Συζήτηση",
+    "discussionpinned": "Καρφιτσωμένο",
+    "discussionsubscription": "Εγγραφή στη συζήτηση",
+    "edit": "Επεξεργασία",
     "erroremptysubject": "Το θέμα της δημοσίευσης δεν μπορεί να είναι κενό",
     "errorgetforum": "Σφάλμα κατά τη λήψη των δεδομένων του forum.",
     "errorgetgroups": "Σφάλμα κατά τη λήψη των ρυθμίσεων της ομάδας.",
     "forumnodiscussionsyet": "Δεν υπάρχουν ακόμα θέματα συζήτησης σε αυτό το forum.",
     "group": "Ομάδα",
+    "message": "Μήνυμα",
+    "modeflatnewestfirst": "Εμφάνιση απαντήσεων οριζοντίως, με την πιο πρόσφατη πρώτη",
+    "modeflatoldestfirst": "Εμφάνιση απαντήσεων οριζοντίως, με την παλαιότερη πρώτη",
+    "modenested": "Εμφάνιση απαντήσεων σε φωλιασμένη μορφή",
     "numdiscussions": "{{numdiscussions}} συζητήσεις",
     "numreplies": "{{numreplies}} απαντήσεις",
+    "posttoforum": "Δημοσίευση στην ομάδα συζητήσεων",
+    "re": "Απάντηση:",
     "refreshdiscussions": "Ανανεώστε τις συζητήσεις",
     "refreshposts": "Ανανεώστε τα μηνύματα της συζήτησης",
-    "sortnewestfirst": "Εμφανίστε πρώτα τα νεότερα",
-    "sortoldestfirst": "Εμφανίστε πρώτα τα παλαιότερα"
+    "reply": "Απάντηση",
+    "subject": "Θέμα",
+    "unread": "Μη αναγνωσμένο",
+    "unreadpostsnumber": "{{$a}} μη αναγνωσμένες δημοσιεύσεις"
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index 03477715764..48404906707 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -6,10 +6,11 @@
     "couldnotadd": "No se puede colocar su mensaje debido a un problema desconocido.",
     "discussion": "Discusión",
     "discussionlocked": "Esta discusión ha sido bloqueada, por lo que Usted ya no puede responder a ella.",
+    "discussionpinned": "Apuntalada",
     "discussionsubscription": "Suscripción a discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
-    "erroremptysubject": "El asunto de la publicación no puede estar vacío",
+    "erroremptysubject": "El asunto del mensaje no puede estar vacío.",
     "errorgetforum": "Error al obtener datos del foro.",
     "errorgetgroups": "Error al obtener configuraciones de grupo.",
     "forumnodiscussionsyet": "Todavía no hay tópicos de discusión en este foro.",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Refrescar discusiones",
     "refreshposts": "Refrescar publicaciones de discusiones",
     "reply": "Responder (réplica)",
-    "sortnewestfirst": "Mostrar primeramente los más nuevos",
-    "sortoldestfirst": "Mostrar primeramente los más antiguos",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"
diff --git a/www/addons/mod/forum/lang/es.json b/www/addons/mod/forum/lang/es.json
index 469add90e75..2389777bf37 100644
--- a/www/addons/mod/forum/lang/es.json
+++ b/www/addons/mod/forum/lang/es.json
@@ -5,6 +5,8 @@
     "cannotcreatediscussion": "No se pudo crear un debate nuevo",
     "couldnotadd": "No se puede colocar su mensaje debido a un problema desconocido.",
     "discussion": "Tema",
+    "discussionlocked": "Este tema ha sido bloqueado así que no podrás responder en el.",
+    "discussionpinned": "Fijado",
     "discussionsubscription": "Suscripción a la discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
@@ -24,8 +26,6 @@
     "refreshdiscussions": "Actualizar foro",
     "refreshposts": "Actualizar publicaciones del foro",
     "reply": "Responder",
-    "sortnewestfirst": "Mostrar los más nuevos primero",
-    "sortoldestfirst": "Mostrar los más antiguos primero",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"
diff --git a/www/addons/mod/forum/lang/eu.json b/www/addons/mod/forum/lang/eu.json
index 9bf8746402a..7d41bf9eff3 100644
--- a/www/addons/mod/forum/lang/eu.json
+++ b/www/addons/mod/forum/lang/eu.json
@@ -6,6 +6,7 @@
     "couldnotadd": "Ezin izan da zure mezua gehitu; errore bat gertatu da nonbait.",
     "discussion": "Eztabaida",
     "discussionlocked": "Eztabaida hau blokeatu da eta beraz aurrerantzean ezingo duzu bertan erantzun.",
+    "discussionpinned": "Finkatuta",
     "discussionsubscription": "Eztabaidaren harpidetza",
     "edit": "Editatu",
     "erroremptymessage": "Mezua ezin da hutsik egon",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Freskatu eztabaidak",
     "refreshposts": "Freskatu eztabaidetako mezuak",
     "reply": "Erantzun",
-    "sortnewestfirst": "Erakutsi berrienak lehenago",
-    "sortoldestfirst": "Erakutsi zaharrenak lehenago",
     "subject": "Gaia",
     "unread": "Irakurri gabe",
     "unreadpostsnumber": "Irakurri gabeko {{$a}} mezu"
diff --git a/www/addons/mod/forum/lang/fa.json b/www/addons/mod/forum/lang/fa.json
index 0cd5985f5f0..a65c87f5794 100644
--- a/www/addons/mod/forum/lang/fa.json
+++ b/www/addons/mod/forum/lang/fa.json
@@ -6,6 +6,7 @@
     "couldnotadd": "به دلیل بروز یک خطای ناشناخته ارائه مطلب شما امکان پذیر نبود",
     "discussion": "مباحثه",
     "discussionlocked": "این مباحثه قفل شده است و در نتیجه دیگر نمی‌توانید در آن شرکت کنید.",
+    "discussionpinned": "سنجاق‌شده",
     "discussionsubscription": "آبونه‌شدن در مباحثه",
     "edit": "ویرایش",
     "erroremptymessage": "متن ارسالی نمی‌تواند خالی باشد",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 85cb12a2964..566c52681f0 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -6,10 +6,11 @@
     "couldnotadd": "Impossible d'ajouter votre message à cause d'une erreur indéterminée",
     "discussion": "Discussion",
     "discussionlocked": "Cette discussion a été verrouillée. Vous ne pouvez plus y répondre.",
+    "discussionpinned": "Épinglé",
     "discussionsubscription": "Abonnement à la discussion",
     "edit": "Modifier",
     "erroremptymessage": "Un message ne peut pas être vide",
-    "erroremptysubject": "L'objet du message ne peut pas être vide",
+    "erroremptysubject": "L'objet d'un message ne peut pas être vide",
     "errorgetforum": "Erreur de récupération des données de forum.",
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Rafraîchir les discussions",
     "refreshposts": "Rafraîchir les messages des discussions",
     "reply": "Répondre",
-    "sortnewestfirst": "Afficher la plus récente en premier",
-    "sortoldestfirst": "Afficher la plus ancienne en premier",
     "subject": "Sujet",
     "unread": "Non lu",
     "unreadpostsnumber": "{{$a}} messages non lus"
diff --git a/www/addons/mod/forum/lang/he.json b/www/addons/mod/forum/lang/he.json
index 1e370d19890..665cc87e1b4 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -5,10 +5,11 @@
     "cannotcreatediscussion": "כשלון ביצירת דיון חדש.",
     "couldnotadd": "ההודעה שלך לא פורסמה עקב תקלה בלתי מזוהה",
     "discussion": "דיון",
+    "discussionpinned": "בראש הרשימה",
     "discussionsubscription": "מנוי לעדכונים בדיון",
     "edit": "עריכה",
     "erroremptymessage": "הודעת הפרסום איננה יכולה להיות ריקה",
-    "erroremptysubject": "נושא ההודעה אינו יכול להיות ריק",
+    "erroremptysubject": "הנושא הפרסום אינו יכול להיות ריק",
     "errorgetforum": "שגיאה בטעינת מידע הפורום.",
     "errorgetgroups": "שגיאה בטעינת הגדרות קבוצה.",
     "forumnodiscussionsyet": "עדיין לא קיימים נושאי דיונים בפורום זה.",
diff --git a/www/addons/mod/forum/lang/hu.json b/www/addons/mod/forum/lang/hu.json
index 1785465c5b6..4bde5a436c7 100644
--- a/www/addons/mod/forum/lang/hu.json
+++ b/www/addons/mod/forum/lang/hu.json
@@ -6,6 +6,7 @@
     "couldnotadd": "Ismeretlen hiba miatt a hozzászólást nem lehetett hozzáadni",
     "discussion": "Vita",
     "discussionlocked": "A vitát lezárták, már nem szólhat hozzá.",
+    "discussionpinned": "Megjelölt",
     "discussionsubscription": "Megbeszélésre való feliratkozás",
     "edit": "Szerkesztés",
     "erroremptymessage": "A hozzászólás szövege nem lehet üres.",
diff --git a/www/addons/mod/forum/lang/it.json b/www/addons/mod/forum/lang/it.json
index e57f74dcb38..c54ee597c31 100644
--- a/www/addons/mod/forum/lang/it.json
+++ b/www/addons/mod/forum/lang/it.json
@@ -6,10 +6,11 @@
     "couldnotadd": "Non è possibile aggiungere l'intervento a causa di un errore sconosciuto.",
     "discussion": "Discussione",
     "discussionlocked": "Questa discussione è stata bloccata e non è più possibile intervenire.",
+    "discussionpinned": "In evidenza",
     "discussionsubscription": "Sottoscrizione della discussione",
     "edit": "Modifica",
     "erroremptymessage": "Il corpo del messaggio non può essere vuoto",
-    "erroremptysubject": "L'oggetto dell'intervento non può essere vuoto",
+    "erroremptysubject": "L'oggetto non può essere vuoto",
     "errorgetforum": "Si è verificato un errore durante la ricezione dei dati del forum.",
     "errorgetgroups": "Si è verificato un errore durante la ricezione delle impostazioni gruppo.",
     "forumnodiscussionsyet": "In questo forum non sono presenti discussioni",
diff --git a/www/addons/mod/forum/lang/ja.json b/www/addons/mod/forum/lang/ja.json
index be49d135ff2..c6861af9156 100644
--- a/www/addons/mod/forum/lang/ja.json
+++ b/www/addons/mod/forum/lang/ja.json
@@ -6,10 +6,11 @@
     "couldnotadd": "不明なエラーのため、あなたの投稿を追加できませんでした。",
     "discussion": "ディスカッション",
     "discussionlocked": "このディスカッションはロックされているため、あなたは返信することはできません。",
+    "discussionpinned": "ピン留め",
     "discussionsubscription": "ディスカッション購読",
     "edit": "編集",
     "erroremptymessage": "投稿メッセージを空にすることはできません。",
-    "erroremptysubject": "件名を空にすることはできません。",
+    "erroremptysubject": "投稿件名を空にすることはできません。",
     "forumnodiscussionsyet": "このフォーラムにはまだディスカッショントピックがありません",
     "group": "グループ",
     "message": "メッセージ",
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 88e60c7c484..93f37fba562 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -1,13 +1,32 @@
 {
-    "erroremptysubject": "Pranešimo temos langelis negali būti tuščias",
+    "addanewdiscussion": "Įtraukti naują diskusijų temą",
+    "cannotadddiscussion": "Norint įtraukti diskusijų į šį forumą, būtina grupės narystė.",
+    "cannotadddiscussionall": "Neturite teisės įtraukti naujos diskusijų temos, skirtos visiems dalyviams.",
+    "cannotcreatediscussion": "Nepavyko sukurti naujos diskusijos",
+    "couldnotadd": "Jūsų skelbimo nepavyko įtraukti dėl nežinomos klaidos",
+    "discussion": "Pavadinimas",
+    "discussionlocked": "Ši diskusija buvo užrakinta, todėl jūs negalite pateikti atsakymus joje.",
+    "discussionpinned": "Prisegta",
+    "discussionsubscription": "Diskusijos prenumerata",
+    "edit": "Redaguoti",
+    "erroremptymessage": "Skelbimo žinutė negali būti tuščia",
+    "erroremptysubject": "Skelbimo tema negali būti tuščia.",
     "errorgetforum": "Klaida gaunant forumo duomenis.",
     "errorgetgroups": "Klaida gaunant grupės nustatymus.",
     "forumnodiscussionsyet": "Pokalbio temų forume dar nėra.",
     "group": "Grupė",
+    "message": "Žinutės tekstas",
+    "modeflatnewestfirst": "Rodyti atsakymus standartiškai, pirmiausia rodant naujausią",
+    "modeflatoldestfirst": "Rodyti atsakymus standartiškai, pirmiausia rodant seniausią",
+    "modenested": "Rodyti atsakymus įdėtuoju formatu",
     "numdiscussions": "Pokalbių {{numdiscussions}}",
     "numreplies": "Atsakymų {{numreplies}}",
+    "posttoforum": "Skelbti forume",
+    "re": "Ats.:",
     "refreshdiscussions": "Atnaujinti pokalbius",
     "refreshposts": "Atnaujinti pokalbių įrašus",
-    "sortnewestfirst": "Rodyti naujesnius",
-    "sortoldestfirst": "Rodyti senesnius"
+    "reply": "Atsakyti",
+    "subject": "Temos pavadinimas",
+    "unread": "Neperskaityta",
+    "unreadpostsnumber": "Neperskaitytų skelbimų: {{$a}}"
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index b85f03c50e8..8f7fe7dad45 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -6,10 +6,11 @@
     "couldnotadd": "Door een onbekende fout was het niet mogelijk om je bericht toe te voegen .",
     "discussion": "Discussie",
     "discussionlocked": "Deze discussie is geblokkeerd, zodat u niet meer kan beantwoorden.",
+    "discussionpinned": "Vastgepind",
     "discussionsubscription": "Inschrijving discussie",
     "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
-    "erroremptysubject": "Onderwerp mag niet leeg zijn",
+    "erroremptysubject": "Onderwerp kan niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
     "errorgetgroups": "Fout bij het ophalen van groepinstellingen.",
     "forumnodiscussionsyet": "Er zijn nog geen discussies in dit forum",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Discussie verversen",
     "refreshposts": "Discussieberichten verversen",
     "reply": "Antwoord",
-    "sortnewestfirst": "Toon nieuwste eerst",
-    "sortoldestfirst": "Toon oudste eerst",
     "subject": "Onderwerp",
     "unread": "Niet gelezen",
     "unreadpostsnumber": "{{$a}} ongelezen berichten"
diff --git a/www/addons/mod/forum/lang/pl.json b/www/addons/mod/forum/lang/pl.json
index 138a965754a..67a495dd1a6 100644
--- a/www/addons/mod/forum/lang/pl.json
+++ b/www/addons/mod/forum/lang/pl.json
@@ -6,6 +6,7 @@
     "couldnotadd": "Nie można dodać twojego wpisu z powodu nieznanego błędu",
     "discussion": "Temat",
     "discussionlocked": "Dyskusja została zablokowana, więc nie możesz już odpowiedzieć.",
+    "discussionpinned": "Przypięta",
     "discussionsubscription": "Subskrypcja dyskusja",
     "edit": "Edycja",
     "erroremptymessage": "Wiadomość nie może być pusta",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index c1e4d7bf8f4..aebbce61f21 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "addanewdiscussion": "Acrescentar um novo tópico de discussão",
-    "cannotadddiscussion": "Apenas os participantes inscritos nos grupos podem escrever mensagens neste fórum",
+    "cannotadddiscussion": "Apenas os participantes inscritos nos grupos podem escrever mensagens neste fórum.",
     "cannotadddiscussionall": "Você não tem permissão para abrir um novo tópico de discussão para todos os participantes.",
     "cannotcreatediscussion": "Não foi possível criar uma nova discussão",
     "couldnotadd": "Não foi possível publicar a sua mensagem. Infelizmente a causa do erro não foi identificada.",
@@ -8,7 +8,7 @@
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
-    "erroremptysubject": "Assunto não pode estar vazio",
+    "erroremptysubject": "O assunto da mensagem não pode ser vazio.",
     "errorgetforum": "Erro ao buscar dados de fórum.",
     "errorgetgroups": "Erro ao obter configurações do grupo.",
     "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda",
@@ -24,8 +24,6 @@
     "refreshdiscussions": "Atualizar discussões",
     "refreshposts": "Atualizar as postagens da discussão",
     "reply": "Responder",
-    "sortnewestfirst": "Exibir os mais novos primeiro",
-    "sortoldestfirst": "Exibir os mais velhos primeiro",
     "subject": "Assunto",
     "unread": "Não lida",
     "unreadpostsnumber": "{{$a}} mensagens não lidas"
diff --git a/www/addons/mod/forum/lang/pt.json b/www/addons/mod/forum/lang/pt.json
index 9c6595467e0..8700ce438bd 100644
--- a/www/addons/mod/forum/lang/pt.json
+++ b/www/addons/mod/forum/lang/pt.json
@@ -5,7 +5,8 @@
     "cannotcreatediscussion": "Não foi possível criar o novo tópico de discussão",
     "couldnotadd": "Não foi possível inserir a mensagem que submeteu devido a um erro desconhecido",
     "discussion": "Tópico",
-    "discussionlocked": "Este tópico de discussão foi bloqueado e já não é possível responder a ele.",
+    "discussionlocked": "Este tópico de discussão foi bloqueado, logo já não pode responder ao mesmo",
+    "discussionpinned": "Destacado",
     "discussionsubscription": "Subscrição da discussão",
     "edit": "Editar",
     "erroremptymessage": "O texto da mensagem não pode estar em branco",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "Atualizar tópicos de discussão",
     "refreshposts": "Atualizar repostas dos tópicos de discussão",
     "reply": "Responder",
-    "sortnewestfirst": "Mostrar mais recentes primeiro",
-    "sortoldestfirst": "Mostrar mais antigos primeiro",
     "subject": "Assunto",
     "unread": "Não lidas",
     "unreadpostsnumber": "{{$a}} mensagens não lidas"
diff --git a/www/addons/mod/forum/lang/ro.json b/www/addons/mod/forum/lang/ro.json
index 99d4fc77c16..2dd31a2be41 100644
--- a/www/addons/mod/forum/lang/ro.json
+++ b/www/addons/mod/forum/lang/ro.json
@@ -7,7 +7,7 @@
     "discussion": "Discuție",
     "edit": "Modifică",
     "erroremptymessage": "Mesajul nu poate fi necompletat",
-    "erroremptysubject": "Subiectul nu poate rămâne necompletat",
+    "erroremptysubject": "Subiectul nu poate fi necompletat",
     "errorgetforum": "A apărut o eroare la obținerea datelor despre forum.",
     "errorgetgroups": "Eroare la obținerea setărilor pentru grup.",
     "forumnodiscussionsyet": "Nu există subiecte deschise în acest forum.",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index fec39ead80b..d2d420c71b6 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -6,10 +6,11 @@
     "couldnotadd": "Сообщение не добавлено из-за неизвестной ошибки",
     "discussion": "Обсуждение",
     "discussionlocked": "Обсуждение было заблокировано, поэтому на него нельзя больше отвечать.",
+    "discussionpinned": "Закреплено",
     "discussionsubscription": "Подписаться на эту тему.",
     "edit": "Редактировать",
     "erroremptymessage": "Сообщение не может быть пустым",
-    "erroremptysubject": "Заголовок сообщения не может быть пустым",
+    "erroremptysubject": "Тема сообщения не может быть пустой",
     "errorgetforum": "Ошибка при получении данных форума",
     "errorgetgroups": "Ошибка получения параметров группы",
     "forumnodiscussionsyet": "В этом форуме ещё нет тем для обсуждения",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 676e5ba9fa1..5d9eb54b6ad 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
-    "erroremptysubject": "Rubriken kan inte vara tom",
+    "erroremptysubject": "Ämnesrubriken för inlägget kan inte vara tom.",
     "errorgetforum": "Fel att få forum innehåll",
     "errorgetgroups": "Fel vid hämtning av gruppinställningar",
     "forumnodiscussionsyet": "Det finns inga diskussionsämnen ännu i detta forum.",
diff --git a/www/addons/mod/forum/lang/tr.json b/www/addons/mod/forum/lang/tr.json
index fea30e63702..6106581a1a4 100644
--- a/www/addons/mod/forum/lang/tr.json
+++ b/www/addons/mod/forum/lang/tr.json
@@ -6,6 +6,7 @@
     "couldnotadd": "Bilinmeyen bir nedenle mesajınız eklenemedi",
     "discussion": "Tartışma",
     "discussionlocked": "Bu tartışma kilitli olduğundan artık yanıtlayamıyorsunuz.",
+    "discussionpinned": "Sabitlenmiş",
     "discussionsubscription": "Tartışma aboneliği",
     "edit": "Düzelt",
     "erroremptymessage": "Yazı mesajı boş olamaz",
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index 393d72c7bdf..6a91914a48c 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -6,10 +6,11 @@
     "couldnotadd": "由於不明錯誤， 無法新增您的貼文",
     "discussion": "議題",
     "discussionlocked": "這一議題已經被封鎖，所以你無法回應它",
+    "discussionpinned": "已經釘選",
     "discussionsubscription": "議題訂閱",
     "edit": "編輯",
     "erroremptymessage": "貼文的訊息不能是空白",
-    "erroremptysubject": "貼文的標題不可以是空的",
+    "erroremptysubject": "貼文的主旨不能是空白",
     "errorgetforum": "讀取討論區資料發生錯誤",
     "errorgetgroups": "讀取群組設定發生錯誤",
     "forumnodiscussionsyet": "這個討論區還沒有討論主題",
@@ -25,8 +26,6 @@
     "refreshdiscussions": "更新討論區",
     "refreshposts": "更新討論區貼文",
     "reply": "回應",
-    "sortnewestfirst": "優先顯示最新的項目",
-    "sortoldestfirst": "優先顯示最早的項目",
     "subject": "主旨",
     "unread": "未閱讀",
     "unreadpostsnumber": "{{$a}}篇未閱讀的貼文"
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index 84dd6d6710e..c79bed26793 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,10 +1,13 @@
 {
+    "attachment": "Συνημμένα",
     "browsemode": "Περιήγηση στις καταχωρήσεις",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bynewestfirst": "Νεότερα πρώτα",
     "byrecentlyupdated": "Ανανεώθηκαν πρόσφατα",
     "bysearch": "Αναζήτηση",
+    "casesensitive": "Χρήση κανονικών εκφράσεων",
+    "categories": "Κατηγορίες μαθημάτων",
     "entrypendingapproval": "Εκκρεμεί η έγκριση για αυτή την καταχώρηση.",
     "errorloadingentries": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των καταχωρήσεων.",
     "errorloadingentry": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της καταχώρησης.",
diff --git a/www/addons/mod/glossary/lang/lt.json b/www/addons/mod/glossary/lang/lt.json
index 757d86c8a89..b9cb64fc2d8 100644
--- a/www/addons/mod/glossary/lang/lt.json
+++ b/www/addons/mod/glossary/lang/lt.json
@@ -1,10 +1,13 @@
 {
+    "attachment": "Priedas",
     "browsemode": "Peržiūrėti įrašus",
     "byalphabet": "Abėcėlės tvarka",
     "byauthor": "Pagal autorių",
     "bynewestfirst": "Naujausi",
     "byrecentlyupdated": "Neseniai atnaujinti",
     "bysearch": "Paieška",
+    "casesensitive": "Naudoti reguliariąsias išraiškas",
+    "categories": "Kursų kategorijos",
     "entrypendingapproval": "Patvirtinti įrašą.",
     "errorloadingentries": "Klaida keliant įrašus.",
     "errorloadingentry": "Klaida įkeliant įrašą.",
diff --git a/www/addons/mod/label/lang/ca.json b/www/addons/mod/label/lang/ca.json
index bea219e03e2..129eb9e3838 100644
--- a/www/addons/mod/label/lang/ca.json
+++ b/www/addons/mod/label/lang/ca.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiqueta",
-    "taptoview": "Toqueu per veure l'etiqueta."
+    "label": "Etiqueta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/cs.json b/www/addons/mod/label/lang/cs.json
index 023eb441277..b88d433a998 100644
--- a/www/addons/mod/label/lang/cs.json
+++ b/www/addons/mod/label/lang/cs.json
@@ -1,4 +1,3 @@
 {
-    "label": "Popisek",
-    "taptoview": "Klepnutím zobrazíte popisek."
+    "label": "Popisek"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/da.json b/www/addons/mod/label/lang/da.json
index 47be40b82b2..24b44d12e7b 100644
--- a/www/addons/mod/label/lang/da.json
+++ b/www/addons/mod/label/lang/da.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiket",
-    "taptoview": "Tryk her for at se etiketten."
+    "label": "Etiket"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/de.json b/www/addons/mod/label/lang/de.json
index 56e9fe5f2bf..e325b1d3856 100644
--- a/www/addons/mod/label/lang/de.json
+++ b/www/addons/mod/label/lang/de.json
@@ -1,4 +1,3 @@
 {
-    "label": "Textfeld",
-    "taptoview": "Tippen Sie zum Anzeigen des Textfelds"
+    "label": "Textfeld"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/el.json b/www/addons/mod/label/lang/el.json
index c21721e8995..84d54ad2588 100644
--- a/www/addons/mod/label/lang/el.json
+++ b/www/addons/mod/label/lang/el.json
@@ -1,4 +1,3 @@
 {
-    "label": "Ετικέτα",
-    "taptoview": "Πατήστε για να δείτε την ετικέτα."
+    "label": "Ετικέτα"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/es-mx.json b/www/addons/mod/label/lang/es-mx.json
index 3bfae297d67..129eb9e3838 100644
--- a/www/addons/mod/label/lang/es-mx.json
+++ b/www/addons/mod/label/lang/es-mx.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiqueta",
-    "taptoview": "Elija para ver la etiqueta."
+    "label": "Etiqueta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/es.json b/www/addons/mod/label/lang/es.json
index 98f10a47c36..129eb9e3838 100644
--- a/www/addons/mod/label/lang/es.json
+++ b/www/addons/mod/label/lang/es.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiqueta",
-    "taptoview": "Toca para ver la etiqueta."
+    "label": "Etiqueta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/eu.json b/www/addons/mod/label/lang/eu.json
index fd6c915660d..79e176fef92 100644
--- a/www/addons/mod/label/lang/eu.json
+++ b/www/addons/mod/label/lang/eu.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiketa",
-    "taptoview": "Sakatu etiketa ikusteko."
+    "label": "Etiketa"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/fr.json b/www/addons/mod/label/lang/fr.json
index 443dfeea55e..6cf7f110617 100644
--- a/www/addons/mod/label/lang/fr.json
+++ b/www/addons/mod/label/lang/fr.json
@@ -1,4 +1,3 @@
 {
-    "label": "Étiquette",
-    "taptoview": "Tapoter pour voir l'étiquette"
+    "label": "Étiquette"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/he.json b/www/addons/mod/label/lang/he.json
index 817c39b0d05..7f0814d0381 100644
--- a/www/addons/mod/label/lang/he.json
+++ b/www/addons/mod/label/lang/he.json
@@ -1,4 +1,3 @@
 {
-    "label": "תווית",
-    "taptoview": "הקליקו לצפיה בתווית."
+    "label": "תווית"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/it.json b/www/addons/mod/label/lang/it.json
index 26998a75f55..473ac682886 100644
--- a/www/addons/mod/label/lang/it.json
+++ b/www/addons/mod/label/lang/it.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etichetta",
-    "taptoview": "Tocca per visualizzare l'etichetta."
+    "label": "Etichetta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/lt.json b/www/addons/mod/label/lang/lt.json
index 8ad40c27bd6..f9a1ca059d8 100644
--- a/www/addons/mod/label/lang/lt.json
+++ b/www/addons/mod/label/lang/lt.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiketė",
-    "taptoview": "Paspauskite peržiūrėti etiketę."
+    "label": "Etiketė"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/nl.json b/www/addons/mod/label/lang/nl.json
index 3213dc6de44..817c10edebe 100644
--- a/www/addons/mod/label/lang/nl.json
+++ b/www/addons/mod/label/lang/nl.json
@@ -1,4 +1,3 @@
 {
-    "label": "Label",
-    "taptoview": "Tik om label te zien."
+    "label": "Label"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/pt-br.json b/www/addons/mod/label/lang/pt-br.json
index 041dadd0a90..fdfc1ff9392 100644
--- a/www/addons/mod/label/lang/pt-br.json
+++ b/www/addons/mod/label/lang/pt-br.json
@@ -1,4 +1,3 @@
 {
-    "label": "Rótulo",
-    "taptoview": "Clique para ver o rótulo"
+    "label": "Rótulo"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/pt.json b/www/addons/mod/label/lang/pt.json
index 3ec99abb8ef..afa1ad09ff3 100644
--- a/www/addons/mod/label/lang/pt.json
+++ b/www/addons/mod/label/lang/pt.json
@@ -1,4 +1,3 @@
 {
-    "label": "Separador",
-    "taptoview": "Clique para ver o separador."
+    "label": "Separador"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ro.json b/www/addons/mod/label/lang/ro.json
index ba27ef2881e..beae1b423cb 100644
--- a/www/addons/mod/label/lang/ro.json
+++ b/www/addons/mod/label/lang/ro.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etichetă",
-    "taptoview": "Apăsați pentru a vedea eticheta."
+    "label": "Etichetă"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ru.json b/www/addons/mod/label/lang/ru.json
index c146a5c392a..974254476a8 100644
--- a/www/addons/mod/label/lang/ru.json
+++ b/www/addons/mod/label/lang/ru.json
@@ -1,4 +1,3 @@
 {
-    "label": "Пояснение",
-    "taptoview": "Нажмите для просмотра пояснения."
+    "label": "Пояснение"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/sv.json b/www/addons/mod/label/lang/sv.json
index 7921bbf40e4..f695fc848d9 100644
--- a/www/addons/mod/label/lang/sv.json
+++ b/www/addons/mod/label/lang/sv.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etikett",
-    "taptoview": "Tryck här för att visa etiketten."
+    "label": "Etikett"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/zh-tw.json b/www/addons/mod/label/lang/zh-tw.json
index 640fd1a04ca..c1a016fd047 100644
--- a/www/addons/mod/label/lang/zh-tw.json
+++ b/www/addons/mod/label/lang/zh-tw.json
@@ -1,4 +1,3 @@
 {
-    "label": "標籤",
-    "taptoview": "點擊查看標籤"
+    "label": "標籤"
 }
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ar.json b/www/addons/mod/lesson/lang/ar.json
new file mode 100644
index 00000000000..e314397c4ae
--- /dev/null
+++ b/www/addons/mod/lesson/lang/ar.json
@@ -0,0 +1,47 @@
+{
+    "answer": "أجب",
+    "averagescore": "متوسط الدرجة",
+    "averagetime": "متوسط الوقت",
+    "branchtable": "محتوى",
+    "cannotfinduser": "لم يتم إيجاد المستخدم المسمى \"{{$a}}\"",
+    "completed": "تم",
+    "congratulations": "مبروك - لقد وصلت إلى نهاية الدرس",
+    "continue": "استمر",
+    "detailedstats": "إحصائيات تفصيلية",
+    "didnotanswerquestion": "لم تتم أجابة هذا السؤال",
+    "displayofgrade": "أعرض الدرجة (للطلاب فقط)",
+    "enterpassword": "الرجاء إدخال كلمة المرور",
+    "eolstudentoutoftimenoanswers": "لم تجبن على أي أسئلة. لقد تلقيت 0 لهذا الدرس.",
+    "finish": "نهاية",
+    "grade": "درجة",
+    "highscore": "الدرجة القصوى",
+    "hightime": "الوقت الاقصى",
+    "lessonmenu": "قائمة الدرس",
+    "lessonstats": "أحصائيات درس",
+    "loginfail": "فشلت عملية الدخول، اعد المحاولة",
+    "lowscore": "أقل درجة",
+    "lowtime": "أقل وقت",
+    "modattemptsnoteacher": "معاينة الطالب تعمل فقط للطلاب",
+    "noanswer": "لم تعطى إجابة",
+    "nolessonattempts": "لم يتم إجراء محاولات مسبقة في هذا الدرس",
+    "notcompleted": "لم يتم انهائه",
+    "numberofcorrectanswers": "عدد الاجابات الصحيحة: {{$a}}",
+    "numberofpagesviewed": "عدد الصفحات التي تم مشاهدتها: {{$a}}",
+    "or": "أو",
+    "overview": "عرض عام",
+    "preview": "معاينه",
+    "question": "سؤال",
+    "reports": "تقارير",
+    "response": "إجابة",
+    "review": "مراجعة",
+    "reviewlesson": "مراجعة الدرس",
+    "reviewquestionback": "نعم، أرغب في المحاولة ثانياً",
+    "submit": "سلم",
+    "thatsthecorrectanswer": "هذه إجابة صحيحة",
+    "thatsthewronganswer": "هذه إجابة خاطئة",
+    "timeremaining": "الزمن المتبقى",
+    "timetaken": "الزمن المستنفذ",
+    "welldone": "أحسنت!",
+    "youranswer": "إجابتك",
+    "youshouldview": "يجب أن تجب على الأقل: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/bg.json b/www/addons/mod/lesson/lang/bg.json
new file mode 100644
index 00000000000..a1b9df04b2a
--- /dev/null
+++ b/www/addons/mod/lesson/lang/bg.json
@@ -0,0 +1,71 @@
+{
+    "answer": "Отговор",
+    "attemptsremaining": "Имате оставащ(и) {{$a}} опит(a)",
+    "averagescore": "Среден резултат",
+    "averagetime": "Средно време",
+    "branchtable": "Съдържание",
+    "cannotfindattempt": "Грешка: не може да бъде намерен опит",
+    "cannotfinduser": "Грешка: не може да се намерят потребители",
+    "clusterjump": "Непоказван въпрос в група",
+    "completed": "Завършена",
+    "congratulations": "Поздравления - достигнахте до края на урока",
+    "continue": "Продължаване",
+    "continuetonextpage": "Продължи към следващата страница",
+    "defaultessayresponse": "Вашето есе ще бъде оценено от преподавател от курса.",
+    "detailedstats": "Детайлни статистики",
+    "didnotanswerquestion": "Did not answer this question.",
+    "displayofgrade": "Показване на оценката (само за ученици)",
+    "displayscorewithessays": "Получихте {{$a.score}} точки от общо {{$a.tempmaxgrade}} точки за въпросите с автоматично оценяване.<br />Вашите {{$a.essayquestions}} въпроси от тип есе ще бъдат оценени и добавени към окончателния резултат на по-късна дата.<br /><br />Вашата текуща оценка, без въпросите от тип есе е {{$a.score}} от максимум {{$a.grade}}",
+    "displayscorewithoutessays": "Вашият резултат е {{$a.score}} (От максимум {{$a.grade}}).",
+    "emptypassword": "Паролата не може да е празна",
+    "enterpassword": "Please enter the password:",
+    "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
+    "firstwrong": "Unfortunately you cannot earn this one point, because your response was not correct.  Would you like to keep guessing, just for the sheer joy of learning (but for no point credit)?",
+    "gotoendoflesson": "Отиване в края на урока",
+    "grade": "Оценка",
+    "highscore": "Висок резултат",
+    "hightime": "High Time",
+    "leftduringtimed": "You have left during a timed lesson.<br />Please click on Continue to restart the lesson.",
+    "leftduringtimednoretake": "You have left during a timed lesson and you are<br />not allowed to retake or continue the lesson.",
+    "lessonmenu": "Lesson Menu",
+    "lessonstats": "Статистики за урока",
+    "loginfail": "Login Failed, please try again...",
+    "lowscore": "Нисък резултат",
+    "lowtime": "Low Time",
+    "maximumnumberofattemptsreached": "Достигнат е максималния брой опити - преминаване на следваща страница",
+    "modattemptsnoteacher": "\"Преглеждане от студента\" се отнася само за студент.",
+    "noanswer": "Няма даден отговор",
+    "nolessonattempts": "Не са правени опити за изпълнение на урока.",
+    "notcompleted": "Не е завършен",
+    "numberofcorrectanswers": "Верни отговори: {{$a}}",
+    "numberofpagesviewed": "Брой на отговорените въпроси: {{$a}}",
+    "numberofpagesviewednotice": "Брой отговорени въпроси: {{$a.nquestions}}; (Трябва да отговорите поне на {{$a.minquestions}})",
+    "ongoingcustom": "Вие сте получили до сега {{$a.score}} точки от {{$a.currenthigh}} възможни.",
+    "ongoingnormal": "Вие сте отговорили до сега на {{$a.correct}} въпрос(и) от общо {{$a.viewed}} въпроса.",
+    "or": "ИЛИ",
+    "overview": "Обобщение",
+    "preview": "Преглед",
+    "progressbarteacherwarning2": "Вие няма да видите лентата за напредък, защото можете да редактирате този урок",
+    "progresscompleted": "Вие сте изпълнили {{$a}}% от урока",
+    "question": "Въпрос",
+    "reports": "Отчети",
+    "response": "Забележка",
+    "review": "Преглед",
+    "reviewlesson": "Review Lesson",
+    "reviewquestionback": "Да, искам да опитам отново",
+    "reviewquestioncontinue": "Не, искам само да мина на следващия въпрос",
+    "secondpluswrong": "Не е точно така.  Искате ли да опитате отново?",
+    "submit": "Продължаване",
+    "teacherjumpwarning": "В този урок е използван преход \"{{$a.cluster}}\" или преход \"{{$a.unseen}}\".  Вместо това ще бъде използван преход \"Следваща страница\". Влезте като студент за да изпробвате тези преходи.",
+    "teacherongoingwarning": "Получените точки се показват само на студент. Влезте като студент за да проверите как се начисляват точки.",
+    "teachertimerwarning": "Timer only works for students.  Test the timer by loggin in as a student.",
+    "thatsthecorrectanswer": "Това е верен отговор",
+    "thatsthewronganswer": "Това е грешен отговор",
+    "timeremaining": "Time Remaining",
+    "timetaken": "Изминало време",
+    "unseenpageinbranch": "Не показван въпрос в меню-страница",
+    "welldone": "Добре изпълнено!",
+    "youhaveseen": "Вече сте видели повече от една страница от този урок.<br />Искате ли да продължите от последната, която сте чели?",
+    "youranswer": "Вашият отговор",
+    "youshouldview": "Трябва да прегледате поне {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ca.json b/www/addons/mod/lesson/lang/ca.json
new file mode 100644
index 00000000000..de2e7ee5046
--- /dev/null
+++ b/www/addons/mod/lesson/lang/ca.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Resposta",
+    "attemptheader": "Intent",
+    "attemptsremaining": "Us resten {{$a}} intents",
+    "averagescore": "Puntuació mitjana",
+    "averagetime": "Temps promig",
+    "branchtable": "Contingut",
+    "cannotfindattempt": "Error: no es pot trobar l'intent",
+    "cannotfinduser": "Error: no es poden trobar els usuaris",
+    "clusterjump": "Pregunta no vista en un clúster",
+    "completed": "Completat",
+    "congratulations": "Felicitacions: heu arribat al final de la lliçó",
+    "continue": "Continua",
+    "continuetonextpage": "Continua a la pàgina següent",
+    "defaultessayresponse": "El vostre treball serà qualificat pel professor del curs.",
+    "detailedstats": "Estadístiques detallades",
+    "didnotanswerquestion": "No heu respost aquesta pregunta.",
+    "displayofgrade": "Visualització de la qualificació (només estudiants)",
+    "displayscorewithessays": "<p>Heu aconseguit {{$a.score}} punts d'un màxim de  {{$a.tempmaxgrade}} de les preguntes qualificades automàticament.</p>\n<p>Les vostres {{$a.essayquestions}} preguntes de resposta oberta es qualificaran més endavant i s'afegiran a la puntuació final.</p>\n<p>La vostra qualificació actual, sense les preguntes de resposta oberta, és de  {{$a.score}} sobre {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "La vostra puntuació és {{$a.score}} (sobre {{$a.grade}}).",
+    "emptypassword": "La contrasenya no es pot deixar en blanc",
+    "enterpassword": "Escriviu la contrasenya:",
+    "eolstudentoutoftimenoanswers": "No heu respost cap pregunta. La vostra puntuació d'auqesta lliçó és de 0.",
+    "finish": "Acaba",
+    "firstwrong": "La vostra resposta no és correcta. Voleu reintentar-ho? (Si ara responeu correctament, no s'incrementarà la puntuació final).",
+    "gotoendoflesson": "Vés al final de la lliçó",
+    "grade": "Qualifica",
+    "highscore": "Puntuació més alta",
+    "hightime": "Temps màxim",
+    "leftduringtimed": "Heu abandonat una lliçó cronometrada.<br />Feu clic a Continua per tornar-la a començar.",
+    "leftduringtimednoretake": "Heu abandonat una lliçó cronometrada i no està permès continuar-la o torna-la a fer.",
+    "lessonmenu": "Menú de la lliçó",
+    "lessonstats": "Estadístiques de la lliçó",
+    "linkedmedia": "Fitxer enllaçat",
+    "loginfail": "Ha fallat l'inici de sessió, torneu-ho a provar...",
+    "lowscore": "Puntuació més baixa",
+    "lowtime": "Temps més baix",
+    "maximumnumberofattemptsreached": "Heu arribat al nombre màxim d'intents. Ara passareu a la pàgina següent.",
+    "modattemptsnoteacher": "No podeu fer la revisió dels estudiants.",
+    "noanswer": "Una o més preguntes no tenen resposta. Si us plau, torneu enrere i responeu-les.",
+    "nolessonattempts": "Encara no s'ha registrat cap intent en aquesta lliçó",
+    "nolessonattemptsgroup": "Ningú del grup {{$a}} ha fet encara cap intent d'aquesta lliçó.",
+    "notcompleted": "Incomplet",
+    "numberofcorrectanswers": "Nombre de respostes correctes: {{$a}}",
+    "numberofpagesviewed": "Nombre de preguntes contestades: {{$a}}",
+    "numberofpagesviewednotice": "Nombre de preguntes contestades: {{$a.nquestions}}; (n'hauríeu de contestar com a mínim {{$a.minquestions}})",
+    "ongoingcustom": "Fins ara heu aconseguit {{$a.score}} punts de {{$a.currenthigh}}.",
+    "ongoingnormal": "Heu contestat correctament {{$a.correct}} preguntes d'un total de {{$a.viewed}} intents.",
+    "or": "O",
+    "overview": "Revisió",
+    "preview": "Previsualització",
+    "progressbarteacherwarning2": "No veureu la barra de progrés, ja que teniu permís per modificar aquesta lliçó",
+    "progresscompleted": "Heu completat el {{$a}}%  de la lliçó.",
+    "question": "Pregunta",
+    "rawgrade": "Qualificació bruta",
+    "reports": "Informes",
+    "response": "Reacció",
+    "review": "Revisa",
+    "reviewlesson": "Revisa la lliçó",
+    "reviewquestionback": "Sí, vull tornar-ho a provar",
+    "reviewquestioncontinue": "No, vull anar a la pregunta següent",
+    "secondpluswrong": "Incorrecte de nou. Voleu tornar-ho a provar?",
+    "submit": "Envia",
+    "teacherjumpwarning": "En aquesta lliçó s'utilitza un salt {{$a.cluster}} o un salt {{$a.unseen}}. En lloc d'això, s'utilitzarà un salt a la pàgina següent. Inicieu sessió com a estudiant per comprovar aquests salts.",
+    "teacherongoingwarning": "La puntuació acumulada només es mostra a l'estudiant. Inicieu sessió com a estudiant per comprovar la puntuació acumulada.",
+    "teachertimerwarning": "El cronòmetre només es mostra als estudiants. Entreu com estudiant per comprovar-ne el funcionament",
+    "thatsthecorrectanswer": "Aquesta és la resposta correcta",
+    "thatsthewronganswer": "Aquesta resposta és errònia",
+    "timeremaining": "Temps restant",
+    "timetaken": "Temps dedicat",
+    "unseenpageinbranch": "Pregunta no vista en una pàgina de contingut",
+    "welldone": "Molt bé",
+    "youhaveseen": "Ja heu vist més d'una pàgina d'aquesta lliçó.<br /> Voleu començar a la darrera pàgina que vau veure?",
+    "youranswer": "La vostra resposta",
+    "yourcurrentgradeisoutof": "La vostra qualificació actual és {{$a.grade}} sobre {{$a.total}}",
+    "youshouldview": "N'hauríeu de contestar com a mínim: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/cs.json b/www/addons/mod/lesson/lang/cs.json
new file mode 100644
index 00000000000..3575e0f706c
--- /dev/null
+++ b/www/addons/mod/lesson/lang/cs.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Odpověď",
+    "attemptheader": "Pokus",
+    "attemptsremaining": "Zbývající počet pokusů: {{$a}}",
+    "averagescore": "Průměrná známka",
+    "averagetime": "Průměrný čas",
+    "branchtable": "Obsahová stránka",
+    "cannotfindattempt": "Chyba: nelze najít pokus",
+    "cannotfinduser": "Chyba: nelze najít uživatele",
+    "clusterjump": "Neprohlédnutá otázka v rámci svazku",
+    "completed": "Dokončeno",
+    "congratulations": "Gratulujeme – dosáhli jste konce přednášky",
+    "continue": "Pokračovat",
+    "continuetonextpage": "Pokračovat na následující stránku",
+    "defaultessayresponse": "Vaše tvořená odpověď bude ohodnocena vaším vyučujícím v kurzu.",
+    "detailedstats": "Podrobné statistiky",
+    "didnotanswerquestion": "Tuto otázku student(ka) nezodpověděl(a)",
+    "displayofgrade": "Zobrazení známky (pouze pro studenty)",
+    "displayscorewithessays": "Váš bodový zisk za automaticky hodnocené odpovědi je {{$a.score}} z {{$a.tempmaxgrade}}.<br />Vaše tvořené odpovědi (v počtu {{$a.essayquestions}}) budou ohodnoceny a zahrnuty<br />do vašeho konečného počtu bodů později.<br /><br />Váš současný bodový zisk bez tvořených odpovědí je {{$a.score}} z {{$a.grade}}.",
+    "displayscorewithoutessays": "Váš bodový zisk je {{$a.score}} (z {{$a.grade}}).",
+    "emptypassword": "Heslo nemůže být prázdné",
+    "enterpassword": "Zadejte prosím heslo:",
+    "eolstudentoutoftimenoanswers": "Nezodpověděli jste žádnou otázku. Za tuto přednášku nezískáváte žádný bod.",
+    "finish": "Skončit",
+    "firstwrong": "Bohužel, vaše odpověď není správná. Chcete to zkusit ještě jednou? (ovšem již bez bodového zisku)",
+    "gotoendoflesson": "Přejít na konec přednášky",
+    "grade": "Známka",
+    "highscore": "Nejlepší známka",
+    "hightime": "Nejdelší čas",
+    "leftduringtimed": "Opustili jste přednášku s časovým limitem.<br />Chcete-li přednášku začít znovu, stiskněte Pokračovat.",
+    "leftduringtimednoretake": "Opustili jste přednášku s časovým limitem a není<br />vám povoleno začít znovu nebo pokračovat.",
+    "lessonmenu": "Nabídka přednášky",
+    "lessonstats": "Statistiky přednášky",
+    "linkedmedia": "Odkaz na média",
+    "loginfail": "Nesprávné heslo. Zkuste to prosím znovu.",
+    "lowscore": "Nejhorší známka",
+    "lowtime": "Nejkratší čas",
+    "maximumnumberofattemptsreached": "Vyčerpali jste maximální počet pokusů – následuje další stránka přednášky",
+    "modattemptsnoteacher": "Revize funguje pouze studentům",
+    "noanswer": "Neodpověděli jste jednu nebo více otázek. Prosím, vraťte se zpět a zadejte odpověď.",
+    "nolessonattempts": "O zodpovězení otázek v této přednášce se ještě nikdo nepokusil.",
+    "nolessonattemptsgroup": "Někteří ({{$a}}) členové skupiny se dosud nepokusili o absolvování této přednášky.",
+    "notcompleted": "Nedokončeno",
+    "numberofcorrectanswers": "Počet správných odpovědí: {{$a}}",
+    "numberofpagesviewed": "Počet prohlédnutých stránek: {{$a}}",
+    "numberofpagesviewednotice": "Máte {{$a.nquestions}} zodpovězených otázek; (Máte jich zodpovědět alespoň: {{$a.minquestions}})",
+    "ongoingcustom": "Váš dosavadní bodový zisk: {{$a.score}} z {{$a.currenthigh}}.",
+    "ongoingnormal": "Zatím jste správně zodpověděli {{$a.correct}} z {{$a.viewed}} otázek.",
+    "or": "NEBO",
+    "overview": "Přehled",
+    "preview": "Náhled",
+    "progressbarteacherwarning2": "Ukazatel průchodu se zobrazuje pouze studentům. Chcete-li si jej ověřit, přihlaste se jako student.",
+    "progresscompleted": "Dokončili jste {{$a}} % přednášky",
+    "question": "Otázka",
+    "rawgrade": "Hrubá známka",
+    "reports": "Výsledky",
+    "response": "Reakce",
+    "review": "Revize",
+    "reviewlesson": "Revize přednášky",
+    "reviewquestionback": "Ano, chci to zkusit ještě jednou",
+    "reviewquestioncontinue": "Ne, chci pokračovat dál",
+    "secondpluswrong": "Tato odpověď není správná. Chcete to zkusit ještě jednou?",
+    "submit": "Odeslat",
+    "teacherjumpwarning": "Tato přednáška obsahuje skok typu \"{{$a.cluster}}\" nebo \"{{$a.unseen}}\". Namísto něj bude použit skok na další stránku. Přihlaste se jako student a zkontrolujte tyto skoky.",
+    "teacherongoingwarning": "Průběžný bodový zisk se zobrazuje pouze studentům. Chcete-li si jej ověřit, přihlaste se jako student.",
+    "teachertimerwarning": "Stopky fungují pouze studentům. Chcete-li si je vyzkoušet, přihlaste se jako student.",
+    "thatsthecorrectanswer": "Tato odpověď je správná.",
+    "thatsthewronganswer": "Tato odpověď není správná.",
+    "timeremaining": "Zbývající čas",
+    "timetaken": "Doba průchodu",
+    "unseenpageinbranch": "Nezobrazená otázka v rámci stránky",
+    "welldone": "Výborně!",
+    "youhaveseen": "Některé ze stránek této přednášky jste již viděli.<br />Chcete začít na poslední stránce, kterou jste navštívili?",
+    "youranswer": "Vaše odpověď",
+    "yourcurrentgradeisoutof": "Vaše známka nyní je {{$a.grade}} z možných {{$a.total}}",
+    "youshouldview": "Měli byste zodpovědět nejméně {{$a}} otázek."
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/da.json b/www/addons/mod/lesson/lang/da.json
new file mode 100644
index 00000000000..d00ff2ab04e
--- /dev/null
+++ b/www/addons/mod/lesson/lang/da.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Svar",
+    "attemptheader": "Forsøg",
+    "attemptsremaining": "Du har {{$a}} forsøg endnu",
+    "averagescore": "Gennemsnitlig score",
+    "averagetime": "Gennemsnitstid",
+    "branchtable": "Indhold",
+    "cannotfindattempt": "Fejl: kunne ikke finde forsøget",
+    "cannotfinduser": "Fejl: kunne ikke finde brugere",
+    "clusterjump": "Usete spørgsmål i en klynge",
+    "completed": "Gennemført",
+    "congratulations": "Tillykke - Denne lektion er slut.",
+    "continue": "Fortsæt",
+    "continuetonextpage": "Fortsæt til næste side.",
+    "defaultessayresponse": "Dit svar vil blive vurderet af din lærer på kurset.",
+    "detailedstats": "Detaljeret statistik",
+    "didnotanswerquestion": "Besvarede ikke dette spørgsmål.",
+    "displayofgrade": "Vis bedømmelse (for studerende)",
+    "displayscorewithessays": "<p>Du fik {{$a.score}} ud af {{$a.tempmaxgrade}} for de automatisk rettede spørgsmål.</p> <p>Dit/dine {{$a.essayquestions}} tekstsvar vil blive bedømt og lagt til scoren senere.</p> <p>Din nuværende karakter uden tekstsvarene er {{$a.score}} ud af {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "Din score er {{$a.score}} (ud af {{$a.grade}}).",
+    "emptypassword": "Adgangskode kan ikke være tom",
+    "enterpassword": "Skriv venligst adgangskoden",
+    "eolstudentoutoftimenoanswers": "Du besvarede ikke nogen af spørgsmålene. Du får 0 for denne lektion",
+    "finish": "Færdig",
+    "firstwrong": "Din besvarelse er ikke rigtig. Vil du prøve en gang mere? (Hvis du svarer rigtigt næste gang vil det ikke tælles med i din endelige karakter.)",
+    "gotoendoflesson": "Gå til slutningen af lektionen",
+    "grade": "Karakter",
+    "highscore": "Highscore",
+    "hightime": "Tidsscore",
+    "leftduringtimed": "Du har forladt en tidsbegrænset lektion<br />Du kan klikke på fortsæt for genstarte lektionen.",
+    "leftduringtimednoretake": "Du har forladt en tidsbegrænset lektion<br />Du kan ikke begynde forfra eller fortsætte lektionen.",
+    "lessonmenu": "Lektionsmenu",
+    "lessonstats": "Lektionsstatistik",
+    "linkedmedia": "Linket medie",
+    "loginfail": "Login fejlede, prøv venligst igen..",
+    "lowscore": "Lav score",
+    "lowtime": "Kort tid",
+    "maximumnumberofattemptsreached": "Det maksimale antal forsøg er nået - du føres til næste side",
+    "modattemptsnoteacher": "Det er kun studerende der kan gennemse",
+    "noanswer": "Et eller flere spørgsmål er ikke besvaret. Gå venligst tilbage og aflever en besvarelse.",
+    "nolessonattempts": "Ingen har prøvet denne lektion",
+    "nolessonattemptsgroup": "Ingen forsøg er udført af {{$a}} gruppemedlemmer i denne lektion",
+    "notcompleted": "Ikke færdiggjort",
+    "numberofcorrectanswers": "Antal rigtige svar: {{$a}}",
+    "numberofpagesviewed": "Antal sider vist: {{$a}}",
+    "numberofpagesviewednotice": "Antal besvarede spørgsmål: {{$a.nquestions}} (Du skal mindst besvare {{$a.minquestions}})",
+    "ongoingcustom": "Du har indtil videre opnået {{$a.score}} ud af {{$a.currenthigh}} points",
+    "ongoingnormal": "Du har besvaret {{$a.correct}} spørgsmål rigtigt ud af  {{$a.viewed}} viste.",
+    "or": "ELLER",
+    "overview": "Oversigt",
+    "preview": "Forhåndsvisning",
+    "progressbarteacherwarning2": "Du kan ikke se progressionslinjen da ud kan redigere lektionen",
+    "progresscompleted": "Du har gennemført {{$a}}% af lektionen",
+    "question": "Spørgsmål",
+    "rawgrade": "Rå point",
+    "reports": "Rapporter",
+    "response": "Respons",
+    "review": "Prøv igen",
+    "reviewlesson": "Prøv en gang mere",
+    "reviewquestionback": "Ja, jeg vil gerne prøve igen",
+    "reviewquestioncontinue": "Nej, jeg vil bare videre til næste spørgsmål",
+    "secondpluswrong": "Ikke rigtigt. Vil du prøve en gang mere?",
+    "submit": "Aflever",
+    "teacherjumpwarning": "Et {{$a.cluster}} spring eller et {{$a.unseen}} spring bliver benyttet i denne lektion. Springet 'Næste side' vil blive brugt i stedet. Log ind som studerende for at teste disse spring.",
+    "teacherongoingwarning": "Løbende score vises kun for studerende. Log ind som studerende for at teste løbende score.",
+    "teachertimerwarning": "Timeren virker kun for studerende. Du kan teste det ved at logge ind som studerende.",
+    "thatsthecorrectanswer": "Rigtigt svar!  :-)",
+    "thatsthewronganswer": "Desværre, svaret er forkert.",
+    "timeremaining": "Tid tilbage",
+    "timetaken": "Varighed",
+    "unseenpageinbranch": "Usete spørgsmål på en indholdsside",
+    "welldone": "Fint!",
+    "youhaveseen": "Du har allerede set mere end en side af denne lektion. <br />Ønsker du at starte på den sidste side du så?",
+    "youranswer": "Dine svar",
+    "yourcurrentgradeisoutof": "Din totale score er {{$a.grade}} ud af {{$a.total}}",
+    "youshouldview": "Du skulle se mindst: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/de.json b/www/addons/mod/lesson/lang/de.json
new file mode 100644
index 00000000000..08992c23260
--- /dev/null
+++ b/www/addons/mod/lesson/lang/de.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Antwort",
+    "attemptheader": "Versuch",
+    "attemptsremaining": "Verbleibende Versuche: {{$a}}",
+    "averagescore": "Durchschnittliche Bewertung",
+    "averagetime": "Durchschnittliche Zeit",
+    "branchtable": "Inhaltsseite",
+    "cannotfindattempt": "Fehler: Versuch konnte nicht gefunden werden",
+    "cannotfinduser": "Fehler: Nutzer/innen konnten nicht gefunden werden",
+    "clusterjump": "Ungesehene Frage innerhalb des Clusters",
+    "completed": "Abgeschlossen",
+    "congratulations": "Ende der Lektion.",
+    "continue": "Fortsetzen",
+    "continuetonextpage": "Auf der nächsten Seite fortsetzen",
+    "defaultessayresponse": "Die Freitext-Antwort wird später bewertet.",
+    "detailedstats": "Ergebnisanalyse",
+    "didnotanswerquestion": "Hat diese Frage nicht beantwortet.",
+    "displayofgrade": "Anzeige der Bewertungen (für Teilnehmer/innen)",
+    "displayscorewithessays": "<p>Sie haben bisher {{$a.score}} von {{$a.tempmaxgrade}} Punkten für die automatisch bewerteten Fragen erzielt.</p><p> Die Freitext-Aufgaben ({{$a.essayquestions}}) werden später bewertet und zur Gesamtpunktzahl hinzugefügt .</p><p>Ihre derzeitige Bewertung:  {{$a.score}} von {{$a.grade}} Punkten.</p>",
+    "displayscorewithoutessays": "Ihre Bewertung:  {{$a.score}} von {{$a.grade}} Punkten",
+    "emptypassword": "Das Kennwort muss eingegeben werden",
+    "enterpassword": "Bitte geben Sie das Kennwort ein:",
+    "eolstudentoutoftimenoanswers": "Sie haben keine Fragen beantwortet. Sie erhalten daher 0 Punkte für die Lektion.",
+    "finish": "Fertigstellen",
+    "firstwrong": "Ihre Antwort ist falsch. Wollen Sie noch einmal (ohne Bewertung) wiederholen?",
+    "gotoendoflesson": "Zum Lektionende gehen",
+    "grade": "Relative Bewertung",
+    "highscore": "Beste Bewertung",
+    "hightime": "Beste Zeit",
+    "leftduringtimed": "Sie haben die Lektion abgebrochen. Die Bearbeitung der Lektion ist zeitlich begrenzt. <br />Klicken Sie auf Fortsetzen, um die Lektion erneut zu beginnen.",
+    "leftduringtimednoretake": "Sie haben die Lektion abgebrochen. Die Bearbeitung der Lektion ist zeitlich begrenzt. <br />Sie können diese Lektion nicht mehr bearbeiten.",
+    "lessonmenu": "Seitenmenü",
+    "lessonstats": "Statistik",
+    "linkedmedia": "Verlinkte Medien",
+    "loginfail": "Der Login ist gescheitert. Bitte versuchen Sie es noch einmal.",
+    "lowscore": "Schlechteste Bewertung",
+    "lowtime": "Schlechteste Zeit",
+    "maximumnumberofattemptsreached": "Sie haben die Höchstzahl der Versuche erreicht - weiter zur nächsten Seite",
+    "modattemptsnoteacher": "Navigation nur für Teilnehmer/innen möglich",
+    "noanswer": "Eine oder mehrere Fragen wurden nicht beantwortet. Gehen Sie zurück und geben Sie die Antworten ein.",
+    "nolessonattempts": "Bisher keine Versuche",
+    "nolessonattemptsgroup": "Keines der {{$a}} Gruppenmitglieder hat zu dieser Lektion einen Versuch gemacht.",
+    "notcompleted": "Nicht beendet",
+    "numberofcorrectanswers": "Richtige Antworten: {{$a}}",
+    "numberofpagesviewed": "Beantwortete Fragen: {{$a}}",
+    "numberofpagesviewednotice": "Zahl der beantworteten Fragen: {{$a.nquestions}} (mindestens zu beantworten: {{$a.minquestions}})",
+    "ongoingcustom": "Gesamtpunktzahl: {{$a.score}} / {{$a.currenthigh}}",
+    "ongoingnormal": "Richtige Antworten: {{$a.correct}} / {{$a.viewed}}",
+    "or": "ODER",
+    "overview": "Übersicht",
+    "preview": "Vorschau",
+    "progressbarteacherwarning2": "Die Fortschrittsanzeige wird Ihnen nicht angezeigt, da Sie diese Lektion als Trainer/in bearbeiten können.",
+    "progresscompleted": "Sie haben {{$a}}% der Lektion erledigt",
+    "question": "Frage",
+    "rawgrade": "Absolute Bewertung",
+    "reports": "Ergebnisse",
+    "response": "Feedback",
+    "review": "Rückschau",
+    "reviewlesson": "Zur Lektion",
+    "reviewquestionback": "Wiederholen",
+    "reviewquestioncontinue": "Fortsetzen",
+    "secondpluswrong": "Nicht ganz. Wollen Sie noch einmal wiederholen?",
+    "submit": "Einreichen",
+    "teacherjumpwarning": "In der Lektion werden '{{$a.cluster}}'-Sprünge und/oder '{{$a.unseen}}'-Sprünge verwendet. Diese Sprünge werden durch 'Nächste Seite'-Sprünge ersetzt. Melden Sie sich als Teilnehmer/in an, um die Sprünge zu testen.",
+    "teacherongoingwarning": "Die aktuelle Bewertung wird nur für Teilnehmer/innen angezeigt. Melden Sie sich als Teilnehmer/in an, um diese Funktion zu testen.",
+    "teachertimerwarning": "Die Zeitbegrenzung funktioniert nur für Teilnehmer/innen. Melden Sie sich als Teilnehmer/in an, um diese Funktion zu testen.",
+    "thatsthecorrectanswer": "Richtig",
+    "thatsthewronganswer": "Falsch",
+    "timeremaining": "Verbleibende Zeit",
+    "timetaken": "Aufgewendete Zeit",
+    "unseenpageinbranch": "Noch nicht angezeigte Frage innerhalb des Zweiges",
+    "welldone": "In den Kurs gelangen Sie mit Klick auf \"Zurückkehren zu ...\"",
+    "youhaveseen": "Sie haben einige Seiten der Lektion schon einmal bearbeitet. <br />Wollen Sie an der Stelle fortsetzen, an der Sie damals aufgehört haben?",
+    "youranswer": "Ihre Antwort",
+    "yourcurrentgradeisoutof": "Ihre derzeitige Bewertung ist {{$a.grade}} von {{$a.total}}",
+    "youshouldview": "mindestens zu beantworten: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/el.json b/www/addons/mod/lesson/lang/el.json
new file mode 100644
index 00000000000..d2c0aa91741
--- /dev/null
+++ b/www/addons/mod/lesson/lang/el.json
@@ -0,0 +1,71 @@
+{
+    "answer": "Απάντηση",
+    "attemptsremaining": "Σας απομένουν {{$a}} προσπάθειες",
+    "averagescore": "Μέσος βαθμός",
+    "averagetime": "Μέσος χρόνος",
+    "branchtable": "Πίνακας διακλάδωσης",
+    "cannotfindattempt": "Σφάλμα: αποτυχία εύρεσης απάντησης",
+    "cannotfinduser": "Σφάλμα: αποτυχία εύρεσης χρηστών",
+    "clusterjump": "Ερώτηση μέσα σε συστοιχεία που δεν εμφανίστηκε",
+    "completed": "Ολοκληρώθηκε",
+    "congratulations": "Συγχαρητήρια - τελειώσατε την ενότητα",
+    "continue": "Συνέχεια",
+    "defaultessayresponse": "Η έκθεσή σας θα βαθμολογηθεί από τον καθηγητή του μαθήματος.",
+    "detailedstats": "Αναλυτικά στατιστικά",
+    "didnotanswerquestion": "Δεν απάντησε αυτήν την ερώτηση.",
+    "displayofgrade": "Εμφάνιση βαθμού (μόνο για μαθητές)",
+    "displayscorewithessays": "Πήρατε {{$a.score}} στα {{$a.tempmaxgrade}} για τις αυτόματα βαθμολογούμενες ερωτήσεις.<br>Οι {{$a.essayquestions}} ερωτήσεις έκθεσης θα βαθμολογηθούν και θα προστεθούν<br />στον τελικό σας βαθμό αργότερα.<br /><br />Ο τρέχον βαθμός σας χωρίς τις ερωτήσεις έκθεσης είναι {{$a.score}} στα {{$a.grade}}",
+    "displayscorewithoutessays": "Ο βαθμός σας είναι {{$a.score}} (στα {{$a.grade}}).",
+    "emptypassword": "Ο κωδικός πρόσβασης δεν μπορεί να είναι κενός",
+    "enterpassword": "Παρακαλώ εισάγετε τον κωδικό:",
+    "eolstudentoutoftimenoanswers": "Δεν απαντήσατε καμία ερώτηση. Πήρατε 0 σε αυτή την ενότητα.",
+    "firstwrong": "Δυστυχώς δεν μπορείτε να κερδίσετε αυτό το βαθμό γιατί η απάντησή σας ήταν λάθος. Θέλετε να συνεχίσετε να μαντεύετε, μόνο για τη χαρά της μάθησης (δεν θα λάβετε το βαθμολογικό μπόνους);",
+    "grade": "Βαθμός",
+    "highscore": "Υψηλός βαθμός",
+    "hightime": "Υψηλός χρόνος",
+    "leftduringtimed": "Αποχωρήσατε κατά τη διάρκεια χρονομετρημένης ενότητας. <br />Παρακαλώ, πατήστε Συνέχεια για να επανεκκινήσετε την ενότητα.",
+    "leftduringtimednoretake": "Αποχωρήσατε κατά τη διάρκεια χρονομετρημένης ενότητας και <br />δεν έχετε το δικαίωμα να επαναλάβεται ή να συνεχίσετε την ενότητα.",
+    "lessonmenu": "Μενού ενότητας",
+    "lessonstats": "Στατιστικά ενότητας",
+    "linkedmedia": "Συνδεδεμένα πολυμέσα",
+    "loginfail": "Αποτυχημένη είσοδος, παρακαλώ προσπαθήστε ξανά...",
+    "lowscore": "Χαμηλός βαθμός",
+    "lowtime": "Χαμηλός χρόνος",
+    "maximumnumberofattemptsreached": "Συμπληρώθηκε ο μέγιστος αριθμός προσπαθειών - Μετάβαση στην επόμενη σελίδα",
+    "modattemptsnoteacher": "Η αναθεώρηση από μαθητή δουλεύει μόνο για τους μαθητές",
+    "noanswer": "Καμία απάντηση δεν δόθηκε. Παρακαλώ, πηγαίνετε πίσω και καταχωρήστε την απαντησή σας.",
+    "nolessonattempts": "Δεν πραγματοποιήθηκαν προσπάθειες σε αυτή την ενότητα.",
+    "notcompleted": "Δεν ολοκληρώθηκε",
+    "numberofcorrectanswers": "Αριθμός σωστών απαντήσεων: {{$a}}",
+    "numberofpagesviewed": "Αριθμός απαντημένων ερωτήσεων: {{$a}}",
+    "numberofpagesviewednotice": "Αριθμός απαντημένων ερωτήσεων: {{$a.nquestions}} (πρέπει να απαντήσετε τουλάχιστον: {{$a.minquestions}})",
+    "ongoingcustom": "Έχετε πάρει {{$a.score}} από τους τους {{$a.currenthigh}} βαθμούς μέχρι τώρα .",
+    "ongoingnormal": "Έχετε απαντήσει {{$a.correct}} σωστά από τις {{$a.viewed}} προσπάθειες.",
+    "or": "Ή",
+    "overview": "Σύνοψη",
+    "preview": "Προεπισκόπιση",
+    "progressbarteacherwarning2": "Δεν θα δείτε την μπάρα προόδου γιατί μπορείτε να επεξεργαστείτε αυτή την ενότητα",
+    "question": "Ερώτηση",
+    "rawgrade": "Βαθμός χωρίς επεξεργασία",
+    "reports": "Αναφορές",
+    "response": "Ανταπόκριση",
+    "review": "Αναθεώρηση",
+    "reviewlesson": "Αναθεώρηση ενότητας",
+    "reviewquestionback": "Ναι, θα ήθελα να δοκιμάσω πάλι",
+    "reviewquestioncontinue": "Όχι, θα ήθελα να πάω στην επόμενη ερώτηση",
+    "secondpluswrong": "Όχι ακριβώς. Θέλετε να δοκιμάσετε ξανά;",
+    "submit": "Υποβολή",
+    "teacherjumpwarning": "Μία μεταπήδηση {{$a.cluster}}  ή μια μεταπήδηση {{$a.unseen}} χρησιμοποιείται σε αυτή την ενότητα. Η μεταπήδηση επόμενης σελίδας θα χρησιμοποιηθεί αντί αυτών. Εισέλθετε ως φοιτητής για να δοκιμάσετε αυτές τις μεταπηδήσεις.",
+    "teacherongoingwarning": "Η τρέχουσα βαθμολογία εμφανίζεται μόνο στους μαθητές. Συνδεθείτε ως μαθητής για να δείτε την τρέχουσα βαθμολογία",
+    "teachertimerwarning": "Το χρονόμετρο λειτουργεί μόνο για τους μαθητές. Συνδεθείτε ως μαθητής για να δοκιμάσετε το χρονόμετρο.",
+    "thatsthecorrectanswer": "Αυτή είναι η σωστή απάντηση",
+    "thatsthewronganswer": "Αυτή είναι η λάθος απάντηση",
+    "timeremaining": "Υπολοιπόμενος χρόνος",
+    "timetaken": "Χρόνος που χρειάστηκε",
+    "unseenpageinbranch": "Ερώτηση μέσα σε διακλάδωση που δεν εμφανίσθηκε",
+    "welldone": "Μπράβο!",
+    "youhaveseen": "Έχετε δει περισσότερες από μία σελίδες αυτής της ενότητας.<br />Θέλετε να ξεκινήσετε από την τελευταία σελίδα που είδατε;",
+    "youranswer": "Η απάντησή σας",
+    "yourcurrentgradeisoutof": "Ο τρέχον βαθμός σας είναι {{$a.grade}} στα {{$a.total}}",
+    "youshouldview": "Πρέπει να απαντήσετε τουλάχιστον: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/es-mx.json b/www/addons/mod/lesson/lang/es-mx.json
new file mode 100644
index 00000000000..632d0c294c3
--- /dev/null
+++ b/www/addons/mod/lesson/lang/es-mx.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Respuesta",
+    "attemptheader": "Intento",
+    "attemptsremaining": "Tiene {{$a}} intento(s) restante(s)",
+    "averagescore": "Puntuación promedio",
+    "averagetime": "Tiempo promedio",
+    "branchtable": "Contenido",
+    "cannotfindattempt": "Error: no se pudo encontrar el intento",
+    "cannotfinduser": "Error: no se pudieron encontrar los usuarios",
+    "clusterjump": "Pregunta no vista dentro de un cluster",
+    "completed": "Finalizado",
+    "congratulations": "Enhorabuena, ha llegado al final de la lección",
+    "continue": "Continuar",
+    "continuetonextpage": "Continuar a página siguiente",
+    "defaultessayresponse": "Su ensayo será calificado por su maestro.",
+    "detailedstats": "Estadísticas detalladas",
+    "didnotanswerquestion": "No ha contestado a esta pregunta.",
+    "displayofgrade": "Mostrar calificación (sólo para estudiantes)",
+    "displayscorewithessays": "Usted ha obtenido una puntuación de {{$a.score}} sobre {{$a.tempmaxgrade}} para las preguntas calificadas automáticamente.<br>Su(s) {{$a.essayquestions}} pregunta(s) de su ensayo serán calificadas y añadidas<br>a su calificación final en una fecha posterior.<br><br>Su calificación actual sin contar esa(s) pregunta(s) es de is {{$a.score}} sobre {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "Su puntuación es {{$a.score}} (sobre {{$a.grade}}).",
+    "emptypassword": "La contraseña no puede estar vacía",
+    "enterpassword": "Por favor, escriba la contraseña:",
+    "eolstudentoutoftimenoanswers": "No ha contestado a ninguna pregunta. En esta lección ha obtenido 0 puntos.",
+    "finish": "Terminar",
+    "firstwrong": "Lo sentimos, usted ha contestado incorrectamente. ¡Le gustaría volver a intentar la pregunta de nuevo? (si Usted contesta ahora la pregunta correctamente, no contará hacia su puntaje final).",
+    "gotoendoflesson": "Ir al final de lección",
+    "grade": "Calificación",
+    "highscore": "Calificación máxima",
+    "hightime": "Tiempo máximo",
+    "leftduringtimed": "Se ha interrumpido una lección con tiempo fijo.<br>Por favor, haga clic en Continuar para volver a empezar la lección.",
+    "leftduringtimednoretake": "Se ha interrumpido una lección con tiempo fijo y<br>no se permite volver a empezar o continuar la lección.",
+    "lessonmenu": "Menú Lección",
+    "lessonstats": "Estadísticas de la lección",
+    "linkedmedia": "Medios enlazados",
+    "loginfail": "Ingreso fallido, por favor pruebe de nuevo...",
+    "lowscore": "Puntuación baja",
+    "lowtime": "Tiempo mínimo",
+    "maximumnumberofattemptsreached": "Se ha alcanzado el número máximo de intentos. Traslado a la página siguiente",
+    "modattemptsnoteacher": "La revisión del estudiante sólo está disponible para los estudiantes.",
+    "noanswer": "Una o más preguntas no tienen respuesta dada. Por favor regrese y envíe una respuesta.",
+    "nolessonattempts": "No se han hecho intentos de esta lección.",
+    "nolessonattemptsgroup": "No se han hecho intentos por miembros del grupo {{$a}} en esta lección.",
+    "notcompleted": "Sin finalizar",
+    "numberofcorrectanswers": "Número de respuestas correctas: {{$a}}",
+    "numberofpagesviewed": "Número de páginas vistas: {{$a}}",
+    "numberofpagesviewednotice": "Número de preguntas contestadas: {{$a.nquestions}} (Usted debería contestar al menos {{$a.minquestions}})",
+    "ongoingcustom": "Esta es una lección de {{$a.score}} puntos. Usted ha obtenido {{$a.score}} punto(s) sobre {{$a.currenthigh}} hasta ahora.",
+    "ongoingnormal": "Usted ha respondido correctamente {{$a.correct}} pregunta(s) de un total de {{$a.viewed}} pregunta(s).",
+    "or": "O",
+    "overview": "Visión general",
+    "preview": "Previsualizar",
+    "progressbarteacherwarning2": "Usted no verá la barra de progreso porque puede editar esta lección",
+    "progresscompleted": "Usted ha completado  {{$a}}% de la lección",
+    "question": "Pregunta",
+    "rawgrade": "Calificación en bruto",
+    "reports": "Reportes",
+    "response": "Comentario",
+    "review": "Revisión",
+    "reviewlesson": "Revisar lección",
+    "reviewquestionback": "Sí, me gustaría probar de nuevo",
+    "reviewquestioncontinue": "No, deseo pasar a la siguiente",
+    "secondpluswrong": "No. ¿Desea probar de nuevo?",
+    "submit": "Enviar",
+    "teacherjumpwarning": "Un salto {{$a.cluster}} o {{$a.unseen}} se está usando en esta lección. En su lugar se usará el salto a la página siguiente. Ingrese como estudiante para probar estos saltos.",
+    "teacherongoingwarning": "La puntuación acumulada sólo se muestra al estudiante. Ingrese como estudiante para probar la puntuación acumulada.",
+    "teachertimerwarning": "El temporizador sólo funciona con estudiantes. Entre como estudiante para probar el temporizador.",
+    "thatsthecorrectanswer": "Esta es la respuesta correcta",
+    "thatsthewronganswer": "Esta es la respuesta equivocada",
+    "timeremaining": "Tiempo restante",
+    "timetaken": "Tiempo empleado",
+    "unseenpageinbranch": "Pregunta no vista dentro de una página de conenidos",
+    "welldone": "¡Bien hecho!",
+    "youhaveseen": "Usted ya ha visto más de una página de esta lección.<br />¿Desea comenzar desde la última página vista?",
+    "youranswer": "Su respuesta",
+    "yourcurrentgradeisoutof": "Su calificación actual es {{$a.grade}} sobre {{$a.total}}",
+    "youshouldview": "Usted debería ver como mínimo: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/es.json b/www/addons/mod/lesson/lang/es.json
new file mode 100644
index 00000000000..1b960b84214
--- /dev/null
+++ b/www/addons/mod/lesson/lang/es.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Respuesta",
+    "attemptheader": "Intento",
+    "attemptsremaining": "Tiene {{$a}} intento(s) pendiente(s)",
+    "averagescore": "Puntuación promedio",
+    "averagetime": "Tiempo promedio",
+    "branchtable": "Contenido",
+    "cannotfindattempt": "Error: no se pudo encontrar el intento",
+    "cannotfinduser": "Error: no se pudieron encontrar los usuarios",
+    "clusterjump": "Pregunta no vista dentro de un cluster",
+    "completed": "Finalizado",
+    "congratulations": "Enhorabuena, ha llegado al final de la lección",
+    "continue": "Continuar",
+    "continuetonextpage": "Continuar en la página siguiente",
+    "defaultessayresponse": "Su ensayo será calificado por su profesor.",
+    "detailedstats": "Estadísticas detalladas",
+    "didnotanswerquestion": "No ha contestado a esta pregunta.",
+    "displayofgrade": "Mostrar calificación (sólo para estudiantes)",
+    "displayscorewithessays": "Usted ha obtenido una puntuación de {{$a.score}} sobre {{$a.tempmaxgrade}} en las preguntas calificadas automáticamente.\n\nSus {{$a.essayquestions}} preguntas de tipo ensayo se calificarán posteriormente y su calificación se añadirá a su calificación final\n\nSu calificación actual sin contar esas preguntas es de is {{$a.score}} sobre {{$a.grade}}",
+    "displayscorewithoutessays": "Su puntuación es {{$a.score}} (sobre {{$a.grade}}).",
+    "emptypassword": "La contraseña no puede estar vacía",
+    "enterpassword": "Por favor, escriba la contraseña:",
+    "eolstudentoutoftimenoanswers": "No ha contestado a ninguna pregunta. En esta lección ha obtenido 0 puntos.",
+    "finish": "Terminado",
+    "firstwrong": "Lo sentimos, usted no puede obtener este punto porque su respuesta no es correcta. ¿Desea seguir intentándolo? (únicamente para aprender, no para ganar el punto).",
+    "gotoendoflesson": "Ir al final de la lección",
+    "grade": "Calificación",
+    "highscore": "Puntuación alta",
+    "hightime": "Tiempo alto",
+    "leftduringtimed": "Se ha interrumpido una lección con tiempo fijo.<br>Por favor, haga clic en Continuar para volver a empezar la lección.",
+    "leftduringtimednoretake": "Se ha interrumpido una lección con tiempo fijo y<br>no se permite volver a empezar o continuar la lección.",
+    "lessonmenu": "Menú Lección",
+    "lessonstats": "Estadísticas de la lección",
+    "linkedmedia": "Medios enlazados",
+    "loginfail": "Acceso fallido, por favor pruebe de nuevo...",
+    "lowscore": "Puntuación baja",
+    "lowtime": "Tiempo bajo",
+    "maximumnumberofattemptsreached": "Se ha alcanzado el número máximo de intentos. Traslado a la página siguiente",
+    "modattemptsnoteacher": "La revisión del estudiante sólo está disponible para los estudiantes.",
+    "noanswer": "No se ha dado respuesta",
+    "nolessonattempts": "No se han hecho intentos de practicar esta lección.",
+    "nolessonattemptsgroup": "{{$a}} miembros del grupo no han realizado ningún intento en esta lección.",
+    "notcompleted": "Sin finalizar",
+    "numberofcorrectanswers": "Número de respuestas correctas: {{$a}}",
+    "numberofpagesviewed": "Número de páginas vistas: {{$a}}",
+    "numberofpagesviewednotice": "Número de preguntas contestadas: {{$a.nquestions}}; (Debería contestar al menos: {{$a.minquestions}})",
+    "ongoingcustom": "Esta es una lección de {{$a.score}} puntos. Usted ha obtenido {{$a.score}} punto(s) sobre {{$a.currenthigh}} hasta ahora.",
+    "ongoingnormal": "Usted ha respondido correctamente {{$a.correct}} pregunta(s) de un total de {{$a.viewed}} pregunta(s).",
+    "or": "O",
+    "overview": "Revisión",
+    "preview": "Previsualizar",
+    "progressbarteacherwarning2": "Usted no verá la barra de progreso porque puede editar esta lección",
+    "progresscompleted": "Ha alcanzado el {{$a}}% de esta lección",
+    "question": "Pregunta",
+    "rawgrade": "Calificación en bruto",
+    "reports": "Informes",
+    "response": "Comentario",
+    "review": "Revisión",
+    "reviewlesson": "Revisar lección",
+    "reviewquestionback": "Sí, me gustaría probar de nuevo",
+    "reviewquestioncontinue": "No, deseo pasar a la siguiente",
+    "secondpluswrong": "No. ¿Desea probar de nuevo?",
+    "submit": "Enviar",
+    "teacherjumpwarning": "En esta lección se usa un salto {{$a.cluster}} o {{$a.unseen}}. En su lugar se usará el salto a la página siguiente. Entre como estudiante para probar estos saltos.",
+    "teacherongoingwarning": "La puntuación acumulada sólo se muestra al estudiante. Entre como estudiante para probar la puntuación acumulada.",
+    "teachertimerwarning": "El temporizador sólo funciona con estudiantes. Entre como estudiante para probar el temporizador.",
+    "thatsthecorrectanswer": "Esta es la respuesta correcta",
+    "thatsthewronganswer": "Esta es la respuesta equivocada",
+    "timeremaining": "Tiempo restante",
+    "timetaken": "Tiempo empleado",
+    "unseenpageinbranch": "Pregunta no vista dentro de una página de conenidos",
+    "welldone": "¡Bien hecho!",
+    "youhaveseen": "Usted ya ha visto más de una página de esta lección.<br />¿Desea comenzar desde la última página vista?",
+    "youranswer": "Su respuesta",
+    "yourcurrentgradeisoutof": "Su calificación actual es {{$a.grade}} sobre {{$a.total}}",
+    "youshouldview": "Usted debería ver como mínimo: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/eu.json b/www/addons/mod/lesson/lang/eu.json
new file mode 100644
index 00000000000..9b2a9d0dd80
--- /dev/null
+++ b/www/addons/mod/lesson/lang/eu.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Erantzuna",
+    "attemptheader": "Saiakera",
+    "attemptsremaining": "{{$a}} saiakera pendiente daukazu",
+    "averagescore": "Batez besteko puntuazioa",
+    "averagetime": "Batez besteko denbora",
+    "branchtable": "Edukia",
+    "cannotfindattempt": "Errorea: ezin da saiakera aurkitu",
+    "cannotfinduser": "Errorea: ezin dira erabiltzaileak aurkitu",
+    "clusterjump": "Cluster batean ikusi gabeko galdera",
+    "completed": "Osatuta",
+    "congratulations": "Zorionak! Ikasgaiaren bukaerara iritsi zara",
+    "continue": "Jarraitu",
+    "continuetonextpage": "Jarraitu hurrengo orrira.",
+    "defaultessayresponse": "Zure entsegua irakasleak kalifikatuko du.",
+    "detailedstats": "Estatistika zehatzak",
+    "didnotanswerquestion": "Galdera honi ez diozu erantzunik eman.",
+    "displayofgrade": "Kalifikazioa erakutsi (ikasleentzat soilik)",
+    "displayscorewithessays": "<p>Automatikoki kalifikatutako galderetan hau da zure puntuazioa: {{$a.score}}\nposible zen gehienezko puntuazio honetatik: {{$a.tempmaxgrade}}.</p>\n<p> {{$a.essayquestions}} galdera(k) beranduago kalifikatuko dira eta zure azken emaitzari erantsiko zaizkio aurrerago.</p>\n<p>Oraingoz, eta entsegu-galdera(k) kontuan hartu gabe, zure emaitza {{$a.score}} (e)koa da {{$a.grade}} (e)tik</p>",
+    "displayscorewithoutessays": "Zure puntuazioa hau da: {{$a.score}} (gehienezkoa hau zen: {{$a.grade}}).",
+    "emptypassword": "Pasahitza ezin da hutsik egon",
+    "enterpassword": "Idatzi pasahitza, mesedez:",
+    "eolstudentoutoftimenoanswers": "Ez duzu erantzunik eman. Ikasgai honetan 0 puntu lortu duzu.",
+    "finish": "Amaitu",
+    "firstwrong": "Sentitzen dugu. Ez duzu puntua lortu zure erantzuna zuzena izan ez delako. Berriz saiatu nahi al duzu? (ikasteko bakarrik, ez puntua lortzeko).",
+    "gotoendoflesson": "Joan ikasgaiaren amaierara",
+    "grade": "Kalifikazioa",
+    "highscore": "Puntuazio altua",
+    "hightime": "Denbora altua",
+    "leftduringtimed": "Denbora-epe finkoko ikasgaia eten da.<br/>Berriz hasteko \"Jarraitu\" botoia sakatu, mesedez.",
+    "leftduringtimednoretake": "Denbora-epe finkoko ikasgaia eten da eta<br/>ez dago berriz hasteko edo jarraitzeko baimenik.",
+    "lessonmenu": "Ikasgaiaren menua",
+    "lessonstats": "Ikasgaiaren estatistikak",
+    "linkedmedia": "Estekatutako media",
+    "loginfail": "Sarrerak huts egin du. Berriz saiatu, mesedez...",
+    "lowscore": "Puntuazio baxua",
+    "lowtime": "Denbora baxua",
+    "maximumnumberofattemptsreached": "Gehienezko saiakera-kopurura iritsi zara. Hurrengo orrira jauzi",
+    "modattemptsnoteacher": "Ikaslearen berrikuspena soilik ikasleen eskura dago.",
+    "noanswer": "Galdera batek edo gehiagok ez du erantzunik. Mesedez, joan atzera eta osatu.",
+    "nolessonattempts": "Ez da ikasgai hau praktikatzeko saiakerarik egin.",
+    "nolessonattemptsgroup": "{{$a}} taldeko partaideek ez dute saiakerarik egin ikasgai honetan.",
+    "notcompleted": "Ez osatua",
+    "numberofcorrectanswers": "Erantzun zuzenen kopurua: {{$a}}",
+    "numberofpagesviewed": "Erantzundako galdera-kopurua: {{$a}}",
+    "numberofpagesviewednotice": "Erantzundako galdera-kopurua: {{$a.nquestions}}; (Gutxienez, {{$a.minquestions}} erantzun beharko zenituzke).",
+    "ongoingcustom": "Ikasgai hau gehienez {{$a.score}} punturekin balioesten da. Zuk {{$a.score}} puntu lortu duzu oraingoz posible ziren {{$a.currenthigh}} puntutatik.",
+    "ongoingnormal": "Zuk {{$a.viewed}} galderatik {{$a.correct}} ondo erantzun duzu.",
+    "or": "edo",
+    "overview": "Laburpena",
+    "preview": "Aurreikusi",
+    "progressbarteacherwarning2": "Ikasgaia editatzeko baimena duzunez, zuk ez duzu aurrerapen-barra ikusiko",
+    "progresscompleted": "Ikasgai honen % {{$a}} osatu duzu",
+    "question": "Galdera",
+    "rawgrade": "Puntuazio gordina",
+    "reports": "Txostenak",
+    "response": "Ebazpena",
+    "review": "Berrikuspena",
+    "reviewlesson": "Ikasgaia berrikusi",
+    "reviewquestionback": "Bai, berriz saiatu nahi nuke",
+    "reviewquestioncontinue": "Ez, hurrengora pasa nahi dut",
+    "secondpluswrong": "Ez. Berriz saiatu nahi al duzu?",
+    "submit": "Bidali",
+    "teacherjumpwarning": "Ikasgai honetan {{$a.cluster}} edo {{$a.unseen}} jauzia erabiltzen ari da. Bere ordez, hurrengo orrirako jauzia erabiliko da. Ikasle gisa sartu jauzi horiek probatzeko.",
+    "teacherongoingwarning": "Metatutako puntuazioa ikasleari erakusten zaio solik. Metatutako puntuazioa probatzeko ikasle gisa sartu.",
+    "teachertimerwarning": "Denbora-neurgailua ikasleei erakusten zaie soilik. Denbora-neurgailua probatzeko ikasle gisa sartu.",
+    "thatsthecorrectanswer": "Hauxe da erantzun zuzena",
+    "thatsthewronganswer": "Hauxe da erantzun okerra",
+    "timeremaining": "Geratzen den denbora",
+    "timetaken": "Erabilitako denbora",
+    "unseenpageinbranch": "Eduki-orrian ikusi ez den galdera",
+    "welldone": "Ederki!",
+    "youhaveseen": "Ikasgai honetako orri bat edo gehiago ikusi duzu jadanik.<br />Ikusitako azken orritik hasi nahi al duzu?",
+    "youranswer": "Zure erantzuna",
+    "yourcurrentgradeisoutof": "Zure oraingo kalifikazioa {{$a.grade}} da izan zitekeen {{$a.total}} (e)tik.",
+    "youshouldview": "Gutxienez hau ikusi beharko zenuke: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/fa.json b/www/addons/mod/lesson/lang/fa.json
new file mode 100644
index 00000000000..79774430714
--- /dev/null
+++ b/www/addons/mod/lesson/lang/fa.json
@@ -0,0 +1,72 @@
+{
+    "answer": "جواب",
+    "attemptsremaining": "می‌توانید {{$a}} بار دیگر تلاش کنید",
+    "averagescore": "نمرهٔ میانگین",
+    "averagetime": "زمان میانگین",
+    "branchtable": "مندرجات",
+    "cannotfindattempt": "خطا: پیدا کردن تلاش مقدور نبود",
+    "cannotfinduser": "خطا: پیدا کردن کاربران مقدور نبود",
+    "clusterjump": "سؤال دیده نشده از یک خوشه",
+    "completed": "تکمیل",
+    "congratulations": "تبریک - به انتهای مبحث درسی رسیدید",
+    "continue": "ادامه",
+    "defaultessayresponse": "پاسخ تشریحی شما توسط استادتان تصحیح خواهد شد.",
+    "detailedstats": "آمار تفصیلی",
+    "didnotanswerquestion": "به این سؤال پاسخ نداده است.",
+    "displayofgrade": "نمایش نمره (مختص شاگردان)",
+    "displayscorewithessays": "<p>شما از قسمت سؤالاتی که به صورت خودکار تصحیح می‌شوند نمرهٔ {{$a.score}} از {{$a.tempmaxgrade}} را بدست آوردید.</p>\n<p>{{$a.essayquestions}} سؤال تشریحی باقیمانده بعداً تصحیح و نمرهٔ بدست آمده به نمرهٔ نهایی شما اضافه خواهد شد.</p>\n<p>نمرهٔ فعلی شما بدون در نظر گرفتن نمرهٔ سؤالات تشریحی {{$a.score}} از {{$a.grade}} است.</p>",
+    "displayscorewithoutessays": "نمره شما {{$a.score}} است (از {{$a.grade}}).",
+    "emptypassword": "کلمهٔ رمز نمی‌تواند خالی باشد",
+    "enterpassword": "لطفاً کلمهٔ رمز را وارد نمائید:",
+    "eolstudentoutoftimenoanswers": "به هیچ سؤالی پاسخ ندادید. نمرهٔ شما در این مبحث درسی صفر می‌باشد.",
+    "firstwrong": "متأسفانه پاسخ شما اشتباه بود و نمرهٔ این سؤال را بدست نیاوردید. آیا مایلید که تنها برای لذت یادگیری (و بدون تغییر در نمره) به حدس زدن ادامه دهید؟",
+    "grade": "نمره",
+    "highscore": "بیشترین نمره",
+    "hightime": "بیشترین زمان",
+    "leftduringtimed": "شما مطالعهٔ یک مبحث درسی زمان‌دار را به صورت نیمه‌کاره رها کردید.<br />برای شروع مجدد لطفاً بر روی ادامه کلیک کنید.",
+    "leftduringtimednoretake": "شما مطالعهٔ یک مبحث درسی زمان‌دار را به صورت نیمه‌کاره رها کردید و<br />اجازهٔ شروع مجدد یا ادامهٔ آن را ندارید.",
+    "lessonmenu": "منوی مبحث درسی",
+    "lessonstats": "آمار مبحث درسی",
+    "linkedmedia": "پیوند به فایل",
+    "loginfail": "رمز وارد شده اشتباه بود. لطفاً مجدداً سعی کنید...",
+    "lowscore": "کمترین نمره",
+    "lowtime": "کمترین زمان",
+    "maximumnumberofattemptsreached": "حداکثر دفعات تلاش مجاز را انجام داده‌اید - حرکت به صفحهٔ بعد",
+    "modattemptsnoteacher": "قابلیت مرور فقط برای شاگردان کار می‌کند.",
+    "noanswer": "به یک یا چند سؤال پاسخی داده نشده است. لطفاً بازگردید و پاسخی را ارائه نمائید.",
+    "nolessonattempts": "هیچ تلاشی در این مبحث درسی صورت نگرفته است.",
+    "notcompleted": "تمام نشده",
+    "numberofcorrectanswers": "تعداد پاسخ‌های صحیح: {{$a}}",
+    "numberofpagesviewed": "تعداد سؤال‌هایی که پاسخ داده‌اید: {{$a}}",
+    "numberofpagesviewednotice": "تعداد سؤال‌هایی که پاسخ داده‌اید: {{$a.nquestions}} (حداقل باید به {{$a.minquestions}} سؤال پاسخ دهید)",
+    "ongoingcustom": "تا الان {{$a.score}} نمره از {{$a.currenthigh}} بدست آورده‌اید.",
+    "ongoingnormal": "به {{$a.correct}} سؤال از {{$a.viewed}} سؤال پاسخ صحیح داده‌اید.",
+    "or": "یا",
+    "overview": "مرور کلی",
+    "preview": "پیش‌نمایش",
+    "progressbarteacherwarning2": "شما نوار پیشرفت را نخواهید دید زیرا می‌توانید این مبحث درسی را ویرایش کنید",
+    "progresscompleted": "{{$a}}٪ از این مبحث درسی را کامل کرده‌اید",
+    "question": "سؤال",
+    "rawgrade": "نمرهٔ خام",
+    "reports": "گزارش‌ها",
+    "response": "واکنش به جواب",
+    "review": "مرور",
+    "reviewlesson": "مرور مبحث درسی",
+    "reviewquestionback": "بله، می‌خواهم مجدداً تلاش کنم",
+    "reviewquestioncontinue": "خیر، می‌خواهم به سؤال بعدی بروم",
+    "secondpluswrong": "صحیح نیست. آیا مایلید مجدداً تلاش کنید؟",
+    "submit": "ارائه",
+    "teacherjumpwarning": "در این مبحث درسی از یک پرش به {{$a.cluster}} یا پرش به {{$a.unseen}} استفاده شده است. به جای آن‌ها از پرش به «صفحهٔ بعد» استفاده خواهد شد. برای آزمایش این پرش‌ها بعنوان شاگرد وارد شوید.",
+    "teacherongoingwarning": "نمره در حال شرکت فقط به شاگردان نمایش داده می‌شود. برای آزمایش نمره در حال شرکت، در قالب یک شاگر وارد شوید.",
+    "teachertimerwarning": "تایمر فقط برای شاگردان کار می‌کند. با ورود در قالب یک شاگرد، تایمر را آزمایش کنید.",
+    "thatsthecorrectanswer": "پاسخ شما صحیح است",
+    "thatsthewronganswer": "پاسخ شما اشتباه است",
+    "timeremaining": "زمان باقیمانده",
+    "timetaken": "زمان صرف شده",
+    "unseenpageinbranch": "سؤال دیده نشده از صفحه مندرجات",
+    "welldone": "آفرین!",
+    "youhaveseen": "شما قبلاً بیش از یک صفحه از این مبحث درسی را دیده اید.<br />آیا می‌خواهید از آخرین صفحه‌ای که دیده‌اید شروع کنید؟",
+    "youranswer": "پاسخ شما",
+    "yourcurrentgradeisoutof": "نمرهٔ فعلی شما {{$a.grade}} از {{$a.total}} است",
+    "youshouldview": "باید حداقل به {{$a}} سؤال پاسخ دهید"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/fr.json b/www/addons/mod/lesson/lang/fr.json
new file mode 100644
index 00000000000..2b8652437b9
--- /dev/null
+++ b/www/addons/mod/lesson/lang/fr.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Réponse",
+    "attemptheader": "Tentative",
+    "attemptsremaining": "Il vous reste {{$a}} tentative(s)",
+    "averagescore": "Note moyenne",
+    "averagetime": "Durée moyenne",
+    "branchtable": "Table de contenu",
+    "cannotfindattempt": "Erreur : impossible de trouver la tentative",
+    "cannotfinduser": "Erreur : impossible de trouver les utilisateurs",
+    "clusterjump": "Question non vue du groupe",
+    "completed": "Terminé",
+    "congratulations": "Félicitations - la leçon est terminée",
+    "continue": "Continuer",
+    "continuetonextpage": "Continuer vers la page suivante.",
+    "defaultessayresponse": "Votre composition sera évaluée par votre enseignant.",
+    "detailedstats": "Statistiques détaillées",
+    "didnotanswerquestion": "N'a pas répondu à cette question",
+    "displayofgrade": "Affichage de la note (pour l'étudiant)",
+    "displayscorewithessays": "<p>Vous avez obtenu un score de {{$a.score}} sur {{$a.tempmaxgrade}} aux questions notées automatiquement.</p>\n<p>Les notes de votre(vos) {{$a.essayquestions}} composition(s) sera(ont) évaluée(s) et ajoutée(s) au score final ultérieurement.</p>\n<p>Votre note actuelle, sans la(les) composition(s), est de {{$a.score}} sur {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "Votre score est de {{$a.score}} (sur {{$a.grade}}).",
+    "emptypassword": "Le mot de passe ne peut pas être vide",
+    "enterpassword": "Veuillez saisir le mot de passe :",
+    "eolstudentoutoftimenoanswers": "vous n'avez répondu à aucune question. Votre note pour cette leçon est de 0.",
+    "finish": "Terminer",
+    "firstwrong": "Vous n'avez pas répondu correctement. Voulez-vous essayer de deviner la bonne réponse ? Si vous répondez maintenant correctement, vous ne recevrez cependant pas de point.",
+    "gotoendoflesson": "Aller à la fin de la leçon",
+    "grade": "Note",
+    "highscore": "Meilleure note",
+    "hightime": "Plus longue durée",
+    "leftduringtimed": "Vous avez quitté une leçon à durée limitée.<br />Veuillez cliquer sur Continuer pour recommencer cette leçon.",
+    "leftduringtimednoretake": "Vous avez quitté une leçon à durée limitée et vous n'êtes<br />pas autorisé à la recommencer ou la continuer.",
+    "lessonmenu": "Menu leçon",
+    "lessonstats": "Statistiques de la leçon",
+    "linkedmedia": "Médias liés",
+    "loginfail": "Connexion échouée, veuillez réessayer...",
+    "lowscore": "Note la plus basse",
+    "lowtime": "Plus courte durée",
+    "maximumnumberofattemptsreached": "Le nombre maximal de tentatives a été atteint - On passe à la page suivante",
+    "modattemptsnoteacher": "La critique par les étudiants ne fonctionne que pour les étudiants.",
+    "noanswer": "Une ou plusieurs questions n'ont pas de réponse donnée. Veuillez revenir en arrière et donner une réponse.",
+    "nolessonattempts": "Personne n'a encore fait cette leçon.",
+    "nolessonattemptsgroup": "Aucune tentative n'a été effectuée dans cette leçon par des membres du groupe {{$a}}.",
+    "notcompleted": "Pas terminé",
+    "numberofcorrectanswers": "Nombre de réponses correctes : {{$a}}",
+    "numberofpagesviewed": "Nombre de questions répondues : {{$a}}",
+    "numberofpagesviewednotice": "Nombre de questions répondues : {{$a.nquestions}} (vous devez répondre au moins à {{$a.minquestions}})",
+    "ongoingcustom": "Vous avez jusqu'ici reçu {{$a.score}} sur un maximum de {{$a.currenthigh}} point(s).",
+    "ongoingnormal": "Vous avez répondu correctement à {{$a.correct}} tentatives sur {{$a.viewed}}.",
+    "or": "OU",
+    "overview": "Vue d'ensemble",
+    "preview": "Prévisualisation",
+    "progressbarteacherwarning2": "La barre de progression ne sera pas affichée, car vous pouvez modifier cette leçon",
+    "progresscompleted": "Vous avez terminé {{$a}} % de la leçon",
+    "question": "Question",
+    "rawgrade": "Note brute",
+    "reports": "Rapports",
+    "response": "Feedback",
+    "review": "Relecture",
+    "reviewlesson": "Revoir la leçon",
+    "reviewquestionback": "Oui, j'aimerais essayer à nouveau",
+    "reviewquestioncontinue": "Non, je veux passer à la question suivante",
+    "secondpluswrong": "Pas tout à fait. Voulez-vous essayer à nouveau ?",
+    "submit": "Envoyer",
+    "teacherjumpwarning": "Un lien {{$a.cluster}} ou un lien {{$a.unseen}} est utilisé dans cette leçon. Un lien « Page suivante » sera utilisé à sa place. Veuillez vous connecter en tant que participant pour tester ces liens.",
+    "teacherongoingwarning": "Le score actuel n'est affiché que pour les étudiants. Veuillez vous connecter en tant qu'étudiant pour tester le score actuel.",
+    "teachertimerwarning": "Le chronomètre ne fonctionne que pour les étudiants. Veuillez vous connecter en tant qu'étudiant pour tester le chronomètre.",
+    "thatsthecorrectanswer": "C'est une réponse correcte",
+    "thatsthewronganswer": "C'est une mauvaise réponse",
+    "timeremaining": "Durée restante",
+    "timetaken": "Durée utilisée",
+    "unseenpageinbranch": "Question non vue au sein d'une page de contenu",
+    "welldone": "Bien joué !",
+    "youhaveseen": "Vous avez déjà vu au moins une page de cette leçon.<br />Voulez-vous commencer à la dernière page que vous avez vue ?",
+    "youranswer": "Votre réponse",
+    "yourcurrentgradeisoutof": "Votre note actuelle est {{$a.grade}} sur {{$a.total}}",
+    "youshouldview": "Vous devriez répondre au moins à {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/he.json b/www/addons/mod/lesson/lang/he.json
new file mode 100644
index 00000000000..cc0a9600655
--- /dev/null
+++ b/www/addons/mod/lesson/lang/he.json
@@ -0,0 +1,76 @@
+{
+    "answer": "תשובה",
+    "attemptheader": "ניסיון",
+    "attemptsremaining": "נשארו לך עוד {{$a}} ניסיונות",
+    "averagescore": "תוצאה ממוצעת",
+    "averagetime": "זמן ממוצע",
+    "branchtable": "עמוד תוכן מסתעף",
+    "cannotfindattempt": "שגיאה: הניביון לא נמצא",
+    "cannotfinduser": "שגיאה: לא ניתן היה למצוא משתמשים",
+    "clusterjump": "שאלת אנסין בתוך אשכול",
+    "completed": "הושלם",
+    "congratulations": "איחולים לבבים - הגעת לסוף השיעור",
+    "continue": "המשך",
+    "continuetonextpage": "המשך לעמוד הבא.",
+    "defaultessayresponse": "המאמר שלך ייבדק על ידי המדריך של הקורס.",
+    "detailedstats": "סטטיסטיקה",
+    "didnotanswerquestion": "לא ענה על השאלה.",
+    "displayofgrade": "תצוגת הציון (לתלמידים בלבד)",
+    "displayscorewithessays": "עבור השאלות שנבדקות באופן אוטומטי קיבלת {{$a.score}} נקודות מתוך {{$a.tempmaxgrade}} .<br>\nשאלת(ות) החיבור {{$a.essayquestions}}  שלך תבדק, והציון שתקבל עבורה יתווסף <br />במועד מאוחר יותר לחישוב של הציון הסופי שלך. <br /><br />\nהציון הנוכחי שלך, מבלי שאלת(ות) החיבור הוא תוצאה של {{$a.score}} מתוך {{$a.grade}}.",
+    "displayscorewithoutessays": "התוצאה שלך היא {{$a.score}} (מתוך {{$a.grade}}).",
+    "emptypassword": "הסיסמה איננה יכולה להיות ריקה",
+    "enterpassword": "בבקשה הכנס את הסיסמה:",
+    "eolstudentoutoftimenoanswers": "לא ענית על אף שאלה. קיבלת ציון 0 עבור שיעור זה.",
+    "finish": "סיום",
+    "firstwrong": "למרבה הצער, אינך יכול לזכות בנקודה זו מפני שהתשובה שלך היתה שגויה. האם תרצה להמשיך לנחש בשביל האושר שכרוך בלמידה (אבל ללא נקודות נוספות)?",
+    "gotoendoflesson": "המשך לסוף השיעור",
+    "grade": "ציון",
+    "highscore": "תוצאה גבוהה",
+    "hightime": "זמן גבוה",
+    "leftduringtimed": "עזבת באמצע שיעור מתוזמן.<br />אנא הקליקו על 'המשך' בשביל להתחיל מחדש את השיעור.",
+    "leftduringtimednoretake": "עזבת באמצע שיעור מתוזמן <br />ואינך מורשה לחזור עליו או להמשיך אותו.",
+    "lessonmenu": "תפריט השיעור",
+    "lessonstats": "הנתונים הסטטיסטיים של השיעורים.",
+    "linkedmedia": "מדיה מקושרת",
+    "loginfail": "ההתחברות נכשלה, אנא נסה שנית.....",
+    "lowscore": "תוצאה נמוכה.",
+    "lowtime": "זמן נמוך",
+    "maximumnumberofattemptsreached": "הושג המספר המירבי של נסיונות - עובר לעמוד הבא",
+    "modattemptsnoteacher": "סקירת סטודנטים עובדת רק בשביל סטודנטים.",
+    "noanswer": "לא ניתנה תשובה",
+    "nolessonattempts": "לא נעשו נסיונות מענה לשיעור זה.",
+    "notcompleted": "לא גמור",
+    "numberofcorrectanswers": "מספר התשובות הנכונות: {{$a}}",
+    "numberofpagesviewed": "מספר השאלות שנענו: {{$a}}",
+    "numberofpagesviewednotice": "מספר התשובות שנענו: {{$a.nquestions}}; (עליך לענות על {{$a.minquestions}} שאלות לפחות.)",
+    "ongoingcustom": "הרווחת {{$a.score}} נקודה(ות) מתוך {{$a.currenthigh}} נקודה(ות) עד כה.",
+    "ongoingnormal": "ענית על {{$a.correct}} נכונה מתוך {{$a.viewed}} ניסיונות.",
+    "or": "או",
+    "overview": "סקירה כללית",
+    "preview": "תצוגה מקדימה",
+    "progressbarteacherwarning2": "לא  ניתן לראות את סרגל־ההתקדמות מפני שיש לך יכולת עריכה של שיעור זה",
+    "progresscompleted": "{{$a}}% מהשיעור הושלמו",
+    "question": "שאלה",
+    "rawgrade": "ציון גולמי",
+    "reports": "דוחות",
+    "response": "תגובה",
+    "review": "סקירה",
+    "reviewlesson": "סקירת השיעור",
+    "reviewquestionback": "כן, הייתי רוצה לנסות בשנית",
+    "reviewquestioncontinue": "לא, אני רוצה להמשיך לשאלה הבאה",
+    "secondpluswrong": "לא בדיוק. תרצה לנסות שוב?",
+    "submit": "הגש",
+    "teacherjumpwarning": "שיעור זה משתמש באשכול־מעברים {{$a.cluster}} או במעברים {{$a.unseen}}. כחלופה, יעשה שימוש במעבר ל'עמוד הבא'. יש להתחבר כסטודנט על מנת לבחון את התנהגות מעבר העמודים לעיל.",
+    "teacherongoingwarning": "תוצאה מצטברת מוצגת רק בפני הסטודנט. התחבר כסטודנט כדי לבחון את התוצאה המתמשכת.",
+    "teachertimerwarning": "שעון העצר עובד רק לסטודנטים. התחבר כסטודנט כדי לבחון את שעון העצר.",
+    "thatsthecorrectanswer": "זוהי התשובה הנכונה.",
+    "thatsthewronganswer": "זוהי לא התשובה הנכונה.",
+    "timeremaining": "הזמן שנשאר",
+    "timetaken": "זמן שנלקח",
+    "unseenpageinbranch": "שאלת אנסין בתוך ההסתעפות",
+    "welldone": "כל הכבוד!",
+    "youhaveseen": "כבר ראית יותר מעמוד אחד בשיעור זה.<br />האם תרצה להתחיל בעמוד האחרון שראית?",
+    "youranswer": "התשובה שלך",
+    "yourcurrentgradeisoutof": "הציון הנוכחי שלך הוא {{$a.grade}} מתוך {{$a.total}}.",
+    "youshouldview": "על התשובה שלך להיות לפחות: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/hu.json b/www/addons/mod/lesson/lang/hu.json
new file mode 100644
index 00000000000..d46a7ad2909
--- /dev/null
+++ b/www/addons/mod/lesson/lang/hu.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Válasz",
+    "attemptheader": "Próbálkozás",
+    "attemptsremaining": "{{$a}} próbálkozása maradt",
+    "averagescore": "Átlagpontszám",
+    "averagetime": "Átlagidő",
+    "branchtable": "Tartalom",
+    "cannotfindattempt": "Hiba: nem található a próbálkozás",
+    "cannotfinduser": "Hiba: nem találhatók felhasználók",
+    "clusterjump": "Kihagyott kérdés egy tömbben",
+    "completed": "Kész",
+    "congratulations": "Gratulálunk - elérte a lecke végét!",
+    "continue": "Tovább",
+    "continuetonextpage": "Tovább a következő oldalra",
+    "defaultessayresponse": "Az esszét tanára fogja pontozni.",
+    "detailedstats": "Részletes statisztika",
+    "didnotanswerquestion": "Nem válaszolt erre a kérdésre",
+    "displayofgrade": "Pont kijelzése (csak tanulóknak)",
+    "displayscorewithessays": "Az automatikus pontozású kérdéseknél {{$a.score}} pontot kapott a maximális {{$a.tempmaxgrade}} pontból.<br /><br />Az {{$a.essayquestions}} esszékérdés(é/ei)t később pontozzák és adják hozzá végső pontszámához.<br /><br />Az esszékérdés(ek) nélküli jelenlegi pontszáma {{$a.score}} a(z) {{$a.grade}} pontból",
+    "displayscorewithoutessays": "Pontszáma {{$a.score}} ({{$a.grade}} pontból).",
+    "emptypassword": "A jelszó nem lehet üres",
+    "enterpassword": "Adja meg a jelszót:",
+    "eolstudentoutoftimenoanswers": "Nem válaszolt egyetlen kérdésre sem. A leckére 0 pontot kapott.",
+    "finish": "Kész",
+    "firstwrong": "Hibásan válaszolt. Azért a tanulás kedvéért folytatná még a próbálkozást (de már pontszerzés nélkül)?",
+    "gotoendoflesson": "Tovább a lecke végére",
+    "grade": "Pont",
+    "highscore": "Magas pontszám",
+    "hightime": "Leghosszabb idő",
+    "leftduringtimed": "Időméréses lecke közben távozott.<br />Kattintson a Folytatás gombra, és kezdje újra a leckét.",
+    "leftduringtimednoretake": "Időméréses lecke közben távozott, ezért nem ismételheti meg és nem folytathatja a leckét.",
+    "lessonmenu": "Lecke menü",
+    "lessonstats": "Leckestatisztika",
+    "linkedmedia": "Kapcsolt média",
+    "loginfail": "Belépése nem sikerült, próbálja újra...",
+    "lowscore": "Alacsony pontszám",
+    "lowtime": "Legrövidebb idő",
+    "maximumnumberofattemptsreached": "A próbálkozások maximális számát elérte - áttérés a következő oldalra.",
+    "modattemptsnoteacher": "Önellenőrzést csak tanulók végezhetnek.",
+    "noanswer": "Nincs megadva válasz. Lépjen vissza és adjon le egy választ.",
+    "nolessonattempts": "A leckével kapcsolatosan nem történt próbálkozás.",
+    "nolessonattemptsgroup": "{{$a}} csoporttag a leckével nem próbálkozott.",
+    "notcompleted": "Nincs befejezve",
+    "numberofcorrectanswers": "A helyes válaszok száma: {{$a}}",
+    "numberofpagesviewed": "A megtekintett oldalak száma: {{$a}}",
+    "numberofpagesviewednotice": "Megválaszolt kérdések száma: {{$a.nquestions}}; (Megválaszolandó legalább: {{$a.minquestions}})",
+    "ongoingcustom": "{{$a.score}} pontot ért el az eddig elérhető {{$a.currenthigh}} pontból.",
+    "ongoingnormal": "{{$a-&gt;correct}} kérdést válaszolt meg helyesen az eddigi {{$a-&gt;viewed}} próbálkozásból",
+    "or": "VAGY",
+    "overview": "Áttekintés",
+    "preview": "Előzetes megtekintés",
+    "progressbarteacherwarning2": "A folyamatjelzőt nem fogja látni, mert Ön szerkesztheti ezt a leckét.",
+    "progresscompleted": "A lecke {{$a}}%-át fejezte be.",
+    "question": "Kérdés",
+    "rawgrade": "Nyers pont",
+    "reports": "Jelentések",
+    "response": "Tanuló válasza",
+    "review": "Ellenőrzés",
+    "reviewlesson": "Összefoglaló lecke",
+    "reviewquestionback": "Igen, megpróbálnám",
+    "reviewquestioncontinue": "Nem, továbblépek a következő kérdésre",
+    "secondpluswrong": "Nem pontos. Próbálkozna újra?",
+    "submit": "Leadás",
+    "teacherjumpwarning": "A lecke {{$a.cluster}} ugrást vagy {{$a.unseen}} ugrást tartalmaz. Helyette a következő oldalra ugrik. Az ugrások ellenőrzéséhez lépjen be tanulóként.",
+    "teacherongoingwarning": "A pillanatnyi pontszám csak tanuló számára látható. Ellenőrzéséhez lépjen be tanulóként.",
+    "teachertimerwarning": "Az időmérő csak tanuló számára látható. Ellenőrzéséhez lépjen be tanulóként.",
+    "thatsthecorrectanswer": "Ez a helyes válasz",
+    "thatsthewronganswer": "Ez a hibás válasz",
+    "timeremaining": "Hátralévő idő",
+    "timetaken": "Felhasznált idő",
+    "unseenpageinbranch": "Kihagyott kérdés egy tartalomoldalon",
+    "welldone": "Nagyszerű!",
+    "youhaveseen": "Ebből a leckéből már egynél több oldalt látott.<br />Az utolsó megtekintett oldalon kívánja folytatni?",
+    "youranswer": "Válasza",
+    "yourcurrentgradeisoutof": "Jelenlegi pontjainak száma {{$a.grade}} pont a {{$a.total}} pontból",
+    "youshouldview": "Minimálisan megválaszolandó: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/it.json b/www/addons/mod/lesson/lang/it.json
new file mode 100644
index 00000000000..de8299fe5af
--- /dev/null
+++ b/www/addons/mod/lesson/lang/it.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Risposta",
+    "attemptheader": "Tentativo",
+    "attemptsremaining": "Ti rimangono {{$a}} tentativo/i",
+    "averagescore": "Punteggio medio",
+    "averagetime": "Tempo medio",
+    "branchtable": "Contenuto",
+    "cannotfindattempt": "Errore: non è stato possibile trovare il tentativo",
+    "cannotfinduser": "Errore: non è stato possibile trovare utenti",
+    "clusterjump": "Domanda non visualizzata di un gruppo ",
+    "completed": "Completata",
+    "congratulations": "Congratulazioni - hai raggiunto la fine della lezione",
+    "continue": "Continua",
+    "continuetonextpage": "Vai alla prossima pagina.",
+    "defaultessayresponse": "Il testo libero sarà valutato dal docente.",
+    "detailedstats": "Statistiche dettagliate",
+    "didnotanswerquestion": "Non è stata data risposta a questa domanda.",
+    "displayofgrade": "Visualizzazione voti (solo per studenti)",
+    "displayscorewithessays": "<p>Hai ottenuto {{$a.score}} su {{$a.tempmaxgrade}} per le domande valutate automaticamente.</p>\n<p>Le tue {{$a.essayquestions}} domande a testo libero saranno valutate successivamente e il voto sarà aggiunto<br />al tuo punteggio finale.</p>\n<p>La tua valutazione senza le domande a testo libero è {{$a.score}} su {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "Il tuo punteggio è {{$a.score}} (su {{$a.grade}}).",
+    "emptypassword": "La password deve essere inserita",
+    "enterpassword": "Inserisci la password:",
+    "eolstudentoutoftimenoanswers": "Non hai risposto a nessuna domanda. Per questa lezione hai ottenuto 0 punti.",
+    "finish": "Termina",
+    "firstwrong": "la tua risposta non è corretta. Desideri provare a rispondere di nuovo? (L'eventuale risposta corretta non sarà comunque tenuta in considerazione per il calcolo del punteggio finale).",
+    "gotoendoflesson": "Vai alla fine della lezione",
+    "grade": "Punteggio",
+    "highscore": "Voto migliore",
+    "hightime": "Tempo migliore",
+    "leftduringtimed": "Hai abbandonato il tentativo durante una lezione a tempo.<br />Clicca su Continua per ricominciare la lezione.",
+    "leftduringtimednoretake": "Hai abbandonato il tentativo durante una lezione a tempo e <br />non puoi riprovare o continuare la lezione.",
+    "lessonmenu": "Menu della lezione",
+    "lessonstats": "Statistiche della lezione",
+    "linkedmedia": "Media linkati",
+    "loginfail": "Login fallito, prova ancora...",
+    "lowscore": "Voti peggiori",
+    "lowtime": "Tempi peggiori",
+    "maximumnumberofattemptsreached": "E' stato raggiunto il massimo numero di tentativi - Passaggio alla pagina successiva",
+    "modattemptsnoteacher": "La revisione funziona solo per gli studenti.",
+    "noanswer": "Non è stata data risposta ad una o più domande. Torna indietro e dai una risposta.",
+    "nolessonattempts": "Non è stato effettuato nessun tentativo su questa lezione.",
+    "nolessonattemptsgroup": "La lezione non è stata tentata da {{$a}} membri del gruppo.",
+    "notcompleted": "Non completato",
+    "numberofcorrectanswers": "Numero di risposte esatte: {{$a}}",
+    "numberofpagesviewed": "Numero di domande risposte: {{$a}}",
+    "numberofpagesviewednotice": "Numero di domande dove hai risposto: {{$a.nquestions}}; (Devi rispondere ad almeno: {{$a.minquestions}} domande)",
+    "ongoingcustom": "Finora hai ottenuto {{$a.score}} punti su {{$a.currenthigh}}.",
+    "ongoingnormal": "Hai risposto correttamente a {{$a.correct}} domande su {{$a.viewed}} tentativi.",
+    "or": "OR",
+    "overview": "Riepilogo",
+    "preview": "Anteprima",
+    "progressbarteacherwarning2": "Non vedrai la barra di avanzamento in quanto puoi modificare il contenuto della lezione",
+    "progresscompleted": "Hai completato il {{$a}}% della lezione",
+    "question": "Domanda",
+    "rawgrade": "Voto grezzo",
+    "reports": "Risultati",
+    "response": "Replica",
+    "review": "Revisione",
+    "reviewlesson": "Rivedi la lezione",
+    "reviewquestionback": "Si, voglio provare ancora",
+    "reviewquestioncontinue": "No, voglio andare alla prossima domanda",
+    "secondpluswrong": "Non proprio. Vuoi riprovare?",
+    "submit": "Invia",
+    "teacherjumpwarning": "In questa lezione stai utilizzando un salto a {{$a.cluster}} o un salto a {{$a.unseen}}.  Sarà invece utilizzato il salto alla Pagina seguente. Per verificare i salti devi collegarti con il ruolo di studente.",
+    "teacherongoingwarning": "Durante lo svolgimento della lezione il punteggio ottenuto viene visualizzato solo agli studenti. Esegui il Login come studente per verificare tale punteggio",
+    "teachertimerwarning": "Il timer funziona solamente per gli studenti. Prova il timer facendo il login come studente.",
+    "thatsthecorrectanswer": "Risposta corretta",
+    "thatsthewronganswer": "Risposta sbagliata",
+    "timeremaining": "Tempo rimanente",
+    "timetaken": "Tempo impiegato",
+    "unseenpageinbranch": "Domanda non vista in una pagina con contenuto",
+    "welldone": "Ben fatto!",
+    "youhaveseen": "Hai già  visto più di una pagina di questa lezione. <br />Vuoi iniziare dall'ultima pagina visitata?",
+    "youranswer": "La tua risposta",
+    "yourcurrentgradeisoutof": "Punteggio ottentuo: {{$a.grade}} su {{$a.total}}",
+    "youshouldview": "Devi rispondere ad almeno: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ja.json b/www/addons/mod/lesson/lang/ja.json
new file mode 100644
index 00000000000..18e3ade173c
--- /dev/null
+++ b/www/addons/mod/lesson/lang/ja.json
@@ -0,0 +1,77 @@
+{
+    "answer": "答え/選択肢",
+    "attemptheader": "受験",
+    "attemptsremaining": "あなたには {{$a}} 回の受験回数が残っています。",
+    "averagescore": "平均評点",
+    "averagetime": "平均時間",
+    "branchtable": "コンテンツ",
+    "cannotfindattempt": "エラー: 受験が見つかりませんでした。",
+    "cannotfinduser": "エラー: ユーザが見つかりませんでした。",
+    "clusterjump": "クラスタ内の未閲覧の問題",
+    "completed": "完了",
+    "congratulations": "おめでとうございます - レッスンの最後に到達しました。",
+    "continue": "続ける",
+    "continuetonextpage": "続けて次のページに移動します。",
+    "defaultessayresponse": "あなたの作文はあなたの教師によって評定されます。",
+    "detailedstats": "詳細統計",
+    "didnotanswerquestion": "この問題に解答していません。",
+    "displayofgrade": "評点を表示する (学生のみ)",
+    "displayscorewithessays": "<p>自動評定によるあなたの評点は {{$a.tempmaxgrade}} 点中 {{$a.score}} 点です。</p>\n<p>作文問題 {{$a.essayquestions}} が評定された後、あなたの最終評点に後日追加されます。</p>\n<p>作文問題を除くあなたの現在の評点は {{$a.grade}} 点中 {{$a.score}} 点です。</p>",
+    "displayscorewithoutessays": "あなたの評点は {{$a.score}} ({{$a.grade}} 点中)です。",
+    "emptypassword": "パスワードは空白にできません。",
+    "enterpassword": "パスワードを入力してください:",
+    "eolstudentoutoftimenoanswers": "あなたはどの問題にも解答していません。このレッスンのあなたの評点は0点です。",
+    "finish": "終了",
+    "firstwrong": "あなたの解答は正しくありません。問題を再度受験しますか?  (今から問題に正しく解答した場合、あなたの最終評点には加算されません)",
+    "gotoendoflesson": "レッスンの最後に移動する",
+    "grade": "評点",
+    "highscore": "最高評点",
+    "hightime": "最長時間",
+    "leftduringtimed": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンを再スタートするには「続ける」をクリックしてください。",
+    "leftduringtimednoretake": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンを再受験または継続は許可されていません。",
+    "lessonmenu": "レッスンメニュー",
+    "lessonstats": "レッスン統計",
+    "linkedmedia": "リンクメディア",
+    "loginfail": "ログインに失敗しました、再度ログインしてください ...",
+    "lowscore": "最低評点",
+    "lowtime": "最短時間",
+    "maximumnumberofattemptsreached": "最大受験回数に達しました - 次のページに移動しています。",
+    "modattemptsnoteacher": "学生レビューは学生のみに表示されます。",
+    "noanswer": "1つまたはそれ以上の問題が解答されていません。戻って解答を送信してください。",
+    "nolessonattempts": "このレッスンは受験されていません。",
+    "nolessonattemptsgroup": "このレッスンの {{$a}} グループメンバーによる受験はありません。",
+    "notcompleted": "未了",
+    "numberofcorrectanswers": "正解数: {{$a}}",
+    "numberofpagesviewed": "解答済み問題数: {{$a}}",
+    "numberofpagesviewednotice": "解答済み問題数: {{$a.nquestions}} (あなたは少なくとも {{$a.minquestions}} 問の問題に解答する必要があります)",
+    "ongoingcustom": "現在、あなたの評点は {{$a.currenthigh}} 点中 {{$a.score}} 点です。",
+    "ongoingnormal": "あなたは {{$a.viewed}} 問中 {{$a.correct}} 問を正しく答えました。",
+    "or": "または",
+    "overview": "概要",
+    "preview": "プレビュー",
+    "progressbarteacherwarning2": "あなたはこのレッスンを編集できるため、プログレスバーは表示されません。",
+    "progresscompleted": "あなたは {{$a}}% のレッスンを完了しました。",
+    "question": "問題",
+    "rawgrade": "素点",
+    "reports": "レポート",
+    "response": "返答",
+    "review": "レビュー",
+    "reviewlesson": "レッスンをレビューする",
+    "reviewquestionback": "はい、もう一度受験します",
+    "reviewquestioncontinue": "いいえ、次の問題に移動します",
+    "secondpluswrong": "もう一度受験しますか?",
+    "submit": "送信",
+    "teacherjumpwarning": "このレッスンでは {{$a.cluster}} ジャンプまたは {{$a.unseen}} ジャンプが使用されています。代わりに「次のページ」へのジャンプが使用されます。これらのジャンプを確認するには学生としてログインしてください。",
+    "teacherongoingwarning": "進行中の評点は学生にのみ表示されます。進行中のスコアをテストするには学生としてログインしてください。",
+    "teachertimerwarning": "タイマーは学生に対してのみ作動します。タイマーをテストするには学生としてログインしてください。",
+    "thatsthecorrectanswer": "正解です。",
+    "thatsthewronganswer": "不正解です。",
+    "timeremaining": "残り時間",
+    "timetaken": "経過時間",
+    "unseenpageinbranch": "コンテンツページ内の未閲覧の問題",
+    "welldone": "よくできました!",
+    "youhaveseen": "あなたはすでにこのレッスンを2ページ以上表示しました。<br />あなたが表示した最後のページから始めますか?",
+    "youranswer": "あなたの答え",
+    "yourcurrentgradeisoutof": "あなたの現在の評点は {{$a.total}} 点中 {{$a.grade}} 点です。",
+    "youshouldview": "少なくとも {{$a}} 回解答してください。"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/lt.json b/www/addons/mod/lesson/lang/lt.json
new file mode 100644
index 00000000000..e088a565222
--- /dev/null
+++ b/www/addons/mod/lesson/lang/lt.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Atsakyti",
+    "attemptheader": "Bandymas",
+    "attemptsremaining": "Turite likusių bandymų: {{$a}}",
+    "averagescore": "Vidutinis balas",
+    "averagetime": "Vidutinis laikas",
+    "branchtable": "Turinys",
+    "cannotfindattempt": "Klaida: nepavyko rasti bandymo",
+    "cannotfinduser": "Klaida: nepavyko rasti naudotojų",
+    "clusterjump": "Telkinyje nematomas klausimas",
+    "completed": "Baigta",
+    "congratulations": "Sveikiname. Pasiekta pamokos pabaiga.",
+    "continue": "Tęsti",
+    "continuetonextpage": "Toliau į sekantį puslapį.",
+    "defaultessayresponse": "Jūsų esė įvertins kurų dėstytojas.",
+    "detailedstats": "Išsamūs statistiniai duomenys",
+    "didnotanswerquestion": "Neatsakė į šį klausimą.",
+    "displayofgrade": "Įverčių rodymas (tik besimokantiesiems)",
+    "displayscorewithessays": "Surinkote {{$a.score}} iš {{$a.tempmaxgrade}} už automatiškai vertinamus klausimus.<br />Vėliau jūsų {{$a.essayquestions}} esė klausimas (-ai) bus įvertintas (-i) ir įtrauktas (-i) <br />į galutinį balą.<br /><br />Dabartinis jūsų įvertis be esė klausimo (-ų) yra {{$a.score}} iš {{$a.grade}}.",
+    "displayscorewithoutessays": "Jūsų balas yra {{$a.score}} (iš {{$a.grade}}).",
+    "emptypassword": "Slaptažodis negali būti tuščias",
+    "enterpassword": "Įveskite slaptažodį:",
+    "eolstudentoutoftimenoanswers": "Neatsakėte nė į vieną klausimą. Už šią pamoką surinkote 0 balų.",
+    "finish": "Pabaigti",
+    "firstwrong": "Deja, negalite pelnyti šio taško, nes pateikėte klaidingą atsakymą. Ar norėtumėte spėlioti toliau tik dėl mokymosi malonumo (nerinkdami taškų kreditų)?",
+    "gotoendoflesson": "Eiti į pamokos pabaigą",
+    "grade": "Įvertis",
+    "highscore": "Aukštas balas",
+    "hightime": "Ilga trukmė",
+    "leftduringtimed": "Išėjote vykstant nustatyto laiko pamokai.<br />Spustelėkite Tęsti ir pradėkite pamoką iš naujo.",
+    "leftduringtimednoretake": "Išėjote vykstant nustatyto laiko pamokai. Jums <br />neleidžiama bandyti iš naujo arba tęsti pamokos.",
+    "lessonmenu": "Pamokos meniu",
+    "lessonstats": "Pamokų statistiniai duomenys",
+    "linkedmedia": "Susietoji medija",
+    "loginfail": "Nepavyko prisijungti, bandykite dar kartą.",
+    "lowscore": "Žemas balas",
+    "lowtime": "Trumpa trukmė",
+    "maximumnumberofattemptsreached": "Pasiektas maksimalus bandymų skaičius. Perkeliama į kitą puslapį.",
+    "modattemptsnoteacher": "Besimokančiųjų peržiūrą gali naudoti tik besimokantieji.",
+    "noanswer": "Nepateiktas atsakymas. Grįžkite atgal ir pateikite atsakymą.",
+    "nolessonattempts": "Šioje pamokoje dar nebuvo bandymų.",
+    "nolessonattemptsgroup": "{{$a}} grupės nariai/ių šioje pamokoje nieko nebandė atlikti.",
+    "notcompleted": "Nebaigta",
+    "numberofcorrectanswers": "Teisingų atsakymų skaičius: {{$a}}",
+    "numberofpagesviewed": "Atsakytų klausimų skaičius: {{$a}}",
+    "numberofpagesviewednotice": "Atsakytų klausimų skaičius: {{$a.nquestions}} (mažiausiai turite atsakyti: {{$a.minquestions}})",
+    "ongoingcustom": "Iki šiol esate surinkę taškų: {{$a.score}} iš {{$a.currenthigh}}.",
+    "ongoingnormal": "Teisingai atsakėte {{$a.correct}} iš {{$a.viewed}} bandymų.",
+    "or": "ARBA",
+    "overview": "Apžvalga",
+    "preview": "Peržiūra",
+    "progressbarteacherwarning2": "Eigos juostos nematysite, kadangi galite redaguoti šią pamoką.",
+    "progresscompleted": "Jūs užbaigėte {{$a}}% pamokos",
+    "question": "Klausimas",
+    "rawgrade": "Neapdorotas įvertis",
+    "reports": "Ataskaitos",
+    "response": "Atsakymas",
+    "review": "Peržiūrėti",
+    "reviewlesson": "Peržiūrėti pamoką",
+    "reviewquestionback": "Taip, norėčiau bandyti dar kartą",
+    "reviewquestioncontinue": "Ne, norėčiau pereiti prie kito klausimo",
+    "secondpluswrong": "Ne visai. Ar norėtumėte bandyti dar kartą?",
+    "submit": "Pateikti",
+    "teacherjumpwarning": "Šioje pamokoje naudojamas { $a.cluster}} saitas arba {{$a.unseen}} saitas. Vietoj jo bus naudojamas kito puslapio saitas. Prisijunkite kaip besimokantysis ir patikrinkite šiuos saitus.",
+    "teacherongoingwarning": "Esamas balas rodomas tik besimokančiajam. Prisijunkite kaip besimokantysis ir patikrinkite esamą balą.",
+    "teachertimerwarning": "Laikmatį gali naudoti tik besimokantieji. Prisijunkite kaip besimokantysis ir patikrinkite laikmatį.",
+    "thatsthecorrectanswer": "Tai yra teisingas atsakymas",
+    "thatsthewronganswer": "Tai yra klaidingas atsakymas",
+    "timeremaining": "Liko laiko",
+    "timetaken": "Sugaišta laiko",
+    "unseenpageinbranch": "Nematytas klausimas turinio puslapyje",
+    "welldone": "Gerai!",
+    "youhaveseen": "Jau matėte kelis šios pamokos puslapius.<br />Ar norite pradėti nuo paskutinio jūsų matyto puslapio?",
+    "youranswer": "Jūsų atsakymas",
+    "yourcurrentgradeisoutof": "Dabartinis jūsų įvertis yra {{$a.grade}} iš {{$a.total}}",
+    "youshouldview": "Mažiausiai turite atsakyti: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/nl.json b/www/addons/mod/lesson/lang/nl.json
new file mode 100644
index 00000000000..58d8a40f232
--- /dev/null
+++ b/www/addons/mod/lesson/lang/nl.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Antwoord",
+    "attemptheader": "Poging",
+    "attemptsremaining": "Je kan nog {{$a}} poging(en) doen",
+    "averagescore": "Gemiddelde score",
+    "averagetime": "Gemiddelde tijd",
+    "branchtable": "Inhoud",
+    "cannotfindattempt": "Fout: kon poging niet vinden",
+    "cannotfinduser": "Fout: kon geen gebruikers vinden",
+    "clusterjump": "Ongeziene vraag binnen een cluster",
+    "completed": "Voltooid",
+    "congratulations": "Proficiat - je hebt het einde van de les bereikt",
+    "continue": "Ga verder",
+    "continuetonextpage": "Ga naar volgende pagina",
+    "defaultessayresponse": "Je antwoord op deze open vraag zal door de leraar beoordeeld worden.",
+    "detailedstats": "Gedetailleerde statistieken",
+    "didnotanswerquestion": "Deze vraag niet beantwoord",
+    "displayofgrade": "Tonen van het cijfer (voor de leerling)",
+    "displayscorewithessays": "<p>Je hebt {{$a.score}} punten op {{$a.tempmaxgrade}} behaald voor de automatisch beoordeelde vragen.</p><p>Je {{$a.essayquestions}} open vragen zullen beoordeeld worden op een later moment  toegevoegd worden bij je totaalcijfer.</p><p>Je resultaat op dit ogenblik, zonder de open vragen is {{$a.score}} op {{$a.grade}}.</p>",
+    "displayscorewithoutessays": "Je cijfer is {{$a.score}} (op {{$a.grade}}).",
+    "emptypassword": "Wachtwoord kan niet leeg zijn",
+    "enterpassword": "Geef het wachtwoord:",
+    "eolstudentoutoftimenoanswers": "Je hebt geen enkele vraag beantwoord. Je hebt een 0 voor deze les",
+    "finish": "Einde",
+    "firstwrong": "Je antwoord is fout.  Wil je de vraag opnieuw proberen te beantwoorden? Als je het antwoord weet, zul je er geen punten meer mee verdienen.",
+    "gotoendoflesson": "Ga naar het einde van de les",
+    "grade": "Cijfer",
+    "highscore": "Hoogste score",
+    "hightime": "Langste duur",
+    "leftduringtimed": "Je bent weggegaan tijdens een getimede les. <br />Klik op ga verder om de les te hervatten.",
+    "leftduringtimednoretake": "Je bent weggegaan tijdens een getimede les.  <br />Je mag niet verder werken.",
+    "lessonmenu": "Lesmenu",
+    "lessonstats": "Statistieken van de les",
+    "linkedmedia": "Gelinkte media",
+    "loginfail": "Login mislukt. Probeer nog eens...",
+    "lowscore": "Laagste score",
+    "lowtime": "kortste duur",
+    "maximumnumberofattemptsreached": "Maximum aantal pogingen bereikt - we gaan verder naar de volgende pagina.",
+    "modattemptsnoteacher": "Nalezen werkt alleen voor leerlingen",
+    "noanswer": "Eén of meerdere vragen zijn niet beantwoord. Ga terug en geef een antwoord.",
+    "nolessonattempts": "Niemand heeft deze les gemaakt.",
+    "nolessonattemptsgroup": "Er zijn geen pogingen gedaan door {{$a}} groepsleden voor deze les.",
+    "notcompleted": "Nog niet voltooid",
+    "numberofcorrectanswers": "Aantal juiste antwoorden: {{$a}}",
+    "numberofpagesviewed": "Aantal beantwoorde vragen: {{$a}}",
+    "numberofpagesviewednotice": "Aantal beantwoorde vragen: {{$a.nquestions}} (je moet minstens {{$a.minquestions}} vragen beantwoorden)",
+    "ongoingcustom": "Dit is een les op {{$a.score}} punten. Je hebt nu al {{$a.score}} punten verdiend van de {{$a.currenthigh}} punten die er tot nu toe te verdienen waren.",
+    "ongoingnormal": "Je hebt {{$a.correct}} vragen van de {{$a.viewed}} juist beantwoord.",
+    "or": "OF",
+    "overview": "Overzicht",
+    "preview": "Voorbeeld",
+    "progressbarteacherwarning2": "Je zult de vorderingsbalk niet zien omdat je deze les kunt bewerken",
+    "progresscompleted": "Je hebt {{$a}}% van de les beëindigd",
+    "question": "Vraag",
+    "rawgrade": "Ruwe score",
+    "reports": "Rapporten",
+    "response": "Respons",
+    "review": "Nalezen",
+    "reviewlesson": "Les nalezen",
+    "reviewquestionback": "Ja, ik wil nog eens proberen",
+    "reviewquestioncontinue": "Nee, ik wil naar de volgende vraag gaan",
+    "secondpluswrong": "Niet echt. Wil je nog eens proberen?",
+    "submit": "Insturen",
+    "teacherjumpwarning": "Er wordt een {{$a.cluster}} sprong of een {{$a.unseen}} sprong gebruikt in deze les. De sprong naar de volgende pagina zal in de plaats gebruikt worden. Meld je aan als leerling om deze sprongen te testen.",
+    "teacherongoingwarning": "De score tijdens de les wordt alleen aan leerlingen getoond. Meld je aan als leerling om deze optie te testen",
+    "teachertimerwarning": "De timer werkt enkel voor leerlingen. Test de timer door je als leerling aan te melden.",
+    "thatsthecorrectanswer": "Dat is het juiste antwoord",
+    "thatsthewronganswer": "Dat is het verkeerde antwoord",
+    "timeremaining": "Resterende tijd",
+    "timetaken": "Gebruikte tijd",
+    "unseenpageinbranch": "Ongeziene vraag binnen een inhoudspagina",
+    "welldone": "Goed gedaan!",
+    "youhaveseen": "Je hebt al meer dan één pagina van deze les bekeken.<br />Wil je beginnen bij de laatste pagina die je vorige keer bekeken hebt?",
+    "youranswer": "Jouw antwoord",
+    "yourcurrentgradeisoutof": "Je huidige cijfer is {{$a.grade}} op {{$a.total}}",
+    "youshouldview": "Je moet een antwoord geven op minstens: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/pl.json b/www/addons/mod/lesson/lang/pl.json
new file mode 100644
index 00000000000..c36b7ae91cf
--- /dev/null
+++ b/www/addons/mod/lesson/lang/pl.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Odpowiedź",
+    "attemptheader": "Próba",
+    "attemptsremaining": "Pozostało Ci {{$a}} podejść",
+    "averagescore": "Średnia liczba punktów",
+    "averagetime": "Średni czas",
+    "branchtable": "Tabela wątków",
+    "cannotfindattempt": "Błąd: nie znaleziono podejść",
+    "cannotfinduser": "Błąd: nie znaleziono użytkowników",
+    "clusterjump": "Nie widziane pytanie w obrębie klastra",
+    "completed": "Skończono",
+    "congratulations": "Gratulacje - koniec lekcji",
+    "continue": "Kontynuuj",
+    "continuetonextpage": "Kontynuuj do następnej strony.",
+    "defaultessayresponse": "Twój esej będzie oceniony przez prowadzącego",
+    "detailedstats": "Usuń statystykę",
+    "didnotanswerquestion": "Nie odpowiedziałeś na pytanie",
+    "displayofgrade": "Wyświetl ocenę studentowi",
+    "displayscorewithessays": "Otrzymałeś {{$a.score}} z {{$a.tempmaxgrade}} za pytania oceniane automatycznie. Twój {{$a.essayquestions}} esej zostanie oceniony i punktu zostaną dodane</br> do oceny końcowej później. <br/><br/> Twoja aktualna ocena bez oceny z eseju jest {{$a.score}} z {{$a.grade}}",
+    "displayscorewithoutessays": "Liczba Twoich punktów jest {{$a.score}} (z {{$a.grade}})",
+    "emptypassword": "Hasło nie może być puste",
+    "enterpassword": "Wprowadź hasło:",
+    "eolstudentoutoftimenoanswers": "Nie odpowiedziałeś na żadne pytanie. Otrzymujesz 0 z tej lekcji.",
+    "finish": "Koniec",
+    "firstwrong": "Niestety nie otrzymasz punktów, dlatego że odpowiedź nie była poprawna. Czy chcesz odpowiadać dalej bez otrzymania punktów?",
+    "gotoendoflesson": "Przejdź do końca lekcji",
+    "grade": "Ocena",
+    "highscore": "Najwyższa ocena",
+    "hightime": "Najdłuższy czas",
+    "leftduringtimed": "Czas lekcji minął.<br/> Kliknij 'Kontynuuj', żeby zacząć lekcję od nowa.",
+    "leftduringtimednoretake": "Czas lekcji minął <br/> nie możesz powtórzyć lekcji.",
+    "lessonmenu": "Menu lekcji",
+    "lessonstats": "Statystyka lekcji",
+    "linkedmedia": "Połączone media",
+    "loginfail": "Błąd logowania, spróbuj ponownie",
+    "lowscore": "Najniższa ocena",
+    "lowtime": "Najkrótszy czas",
+    "maximumnumberofattemptsreached": "Osiągnięto maksymalny rozmiar próby - przejdź do następnej strony",
+    "modattemptsnoteacher": "Tylko student może zmieniać pracę.",
+    "noanswer": "Brak odpowiedzi",
+    "nolessonattempts": "Nikt jeszcze nie rozwiązał lekcji",
+    "nolessonattemptsgroup": "Członkowie grupy {{$a}} nie podjęli prób w tej lekcji.",
+    "notcompleted": "Niekompletne",
+    "numberofcorrectanswers": "Ilość poprawnych odpowiedzi: {{$a}}",
+    "numberofpagesviewed": "Ilość obejrzanych strony: {{$a}}",
+    "numberofpagesviewednotice": "Liczba pytań odpowiedzianych: {{$a.nquestions}}; (powinieneś odpowiedzieć na przynajmniej {{$a.minquestions}})",
+    "ongoingcustom": "Otrzymałeś dotąd {{$a.score}} punktów z {{$a.currenthigh}}",
+    "ongoingnormal": "Odpowiedziałeś poprawnie na {{$a.correct}} z {{$a.viewed}} pytań",
+    "or": "lub",
+    "overview": "Skrócony",
+    "preview": "Podgląd",
+    "progressbarteacherwarning2": "Nie zobaczysz wskaźnika postępu, ponieważ możesz edytować tą lekcję.",
+    "progresscompleted": "Masz za sobą {{$a}}% lekcji",
+    "question": "Pytanie",
+    "rawgrade": "Surowa (nie przeliczona) ocena",
+    "reports": "Raporty",
+    "response": "Informacja zwrotna",
+    "review": "Przegląd",
+    "reviewlesson": "Przejrzyj ponownie lekcje",
+    "reviewquestionback": "Tak, chcę spróbować ponownie",
+    "reviewquestioncontinue": "Nie, chcę przejść do następnego pytania",
+    "secondpluswrong": "Niezupełnie. Chcesz spróbować ponownie?",
+    "submit": "Prześlij",
+    "teacherjumpwarning": "Skoki typu {{$a.cluster}} lub {{$a.unseen}} są używane w tej lekcji. Skok do następnej strony będzie używany zamiast tego. Zaloguj się jako student, żeby przetestować przejścia",
+    "teacherongoingwarning": "Wynik jest pokazywany tylko studentowi. Zaloguj się jako student.",
+    "teachertimerwarning": "Licznik czasu działa tylko dla studentów, Aby przetestować, zaloguj się jako student.",
+    "thatsthecorrectanswer": "To jest poprawna odpowiedź",
+    "thatsthewronganswer": "To jest błędna odpowiedź",
+    "timeremaining": "Pozostały czas",
+    "timetaken": "Łączny czas",
+    "unseenpageinbranch": "Nie wyświetlane dotąd pytanie w treści strony",
+    "welldone": "Dobrze zrobione!",
+    "youhaveseen": "Widziałeś już więcej niż jedną stronę tej lekcji. <br />Czy chciałbyś zacząć od ostatniej strony, którą przeglądałeś?",
+    "youranswer": "Twoja odpowiedź",
+    "yourcurrentgradeisoutof": "Masz obecnie {{$a.grade}} punktów z {{$a.total}}",
+    "youshouldview": "Powinieneś odpowiedzieć na co najmniej: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/pt-br.json b/www/addons/mod/lesson/lang/pt-br.json
new file mode 100644
index 00000000000..a50382f3902
--- /dev/null
+++ b/www/addons/mod/lesson/lang/pt-br.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Resposta",
+    "attemptheader": "Tentativa",
+    "attemptsremaining": "Você tem ainda {{$a}} tentativas",
+    "averagescore": "Pontuação média",
+    "averagetime": "Tempo médio",
+    "branchtable": "Painel de Navegação",
+    "cannotfindattempt": "Erro: não foi possível encontrar a tentativa",
+    "cannotfinduser": "Erro: não foi possível encontrar os usuários",
+    "clusterjump": "Questão não vista em um cluster",
+    "completed": "Concluída",
+    "congratulations": "Você chegou ao fim desta lição",
+    "continue": "Continuar",
+    "continuetonextpage": "Continuar para a próxima página.",
+    "defaultessayresponse": "O seu trabalho vai ser avaliado pelo docente do curso.",
+    "detailedstats": "Estatísticas detalhadas",
+    "didnotanswerquestion": "Não respondeu esta questão.",
+    "displayofgrade": "Visualização das notas (apenas para estudantes)",
+    "displayscorewithessays": "Você recebeu {{$a.score}} de um total de {{$a.tempmaxgrade}} nas questões avaliadas automaticamente.<br /> A(s) sua(s) {{$a.essayquestions}} questão(ões) dissertativa(s) será(ão) avaliada(s) depois.<br /><br />A sua nota parcial é {{$a.score}} de um total de {{$a.grade}}",
+    "displayscorewithoutessays": "A sua pontuação é {{$a.score}} (de {{$a.grade}}).",
+    "emptypassword": "Senha não pode ser vazia",
+    "enterpassword": "Inserir a senha:",
+    "eolstudentoutoftimenoanswers": "Você não respondeu nenhuma questão. A nota atribuída foi igual a 0 .",
+    "finish": "Finalizado",
+    "firstwrong": "Infelizmente esta resposta não é correta e portanto não aumentará a sua pontuação. Você gostaria de continuar tentando para conhecer a resposta certa (mas sem direito à revisão da pontuação)?",
+    "gotoendoflesson": "Ir para o final da lição",
+    "grade": "Avaliação",
+    "highscore": "Pontuação alta",
+    "hightime": "Tempo alto",
+    "leftduringtimed": "Você interrompeu uma lição com tempo de duração definido.<br />Por favor clique em Continuar para recomeçar a lição.",
+    "leftduringtimednoretake": "Você interrompeu uma lição com tempo de duração definido.<br />Não será possível continuar ou recomeçar.",
+    "lessonmenu": "Menu da lição",
+    "lessonstats": "Estatísticas da Lição",
+    "linkedmedia": "Arquivo multimídia linkado",
+    "loginfail": "Erro de login, por favor tente novamente...",
+    "lowscore": "Pontuação baixa",
+    "lowtime": "Tempo breve",
+    "maximumnumberofattemptsreached": "Número máximo de tentativas atingido - indo para a próxima página",
+    "modattemptsnoteacher": "A revisão dos estudantes só é ativa para eles.",
+    "noanswer": "Não foi dada nenhuma resposta.Por favor, volte e submeta uma resposta.",
+    "nolessonattempts": "Nenhuma tentativa feita nesta lição.",
+    "nolessonattemptsgroup": "Não há tentativas feitas por membros do grupo {{$a}} nesta lição.",
+    "notcompleted": "Não concluída",
+    "numberofcorrectanswers": "Número de respostas corretas: {{$a}}",
+    "numberofpagesviewed": "Número de páginas vistas: {{$a}}",
+    "numberofpagesviewednotice": "Número de questões respondidas {{$a.nquestions}}; (Você deve responder pelo menos: {{$a.minquestions}})",
+    "ongoingcustom": "Esta lição corresponde a {{$a.score}} pontos. Você recebeu {{$a.score}} ponto(s) de um total de {{$a.currenthigh}} pontos até agora.",
+    "ongoingnormal": "Você respondeu corretamente {{$a.correct}} questões de um total de {{$a.viewed}} .",
+    "or": "OU",
+    "overview": "Visão geral",
+    "preview": "Visualizar",
+    "progressbarteacherwarning2": "Você não verá a barra de progresso porque você pode editar esta lição.",
+    "progresscompleted": "Você completou {{$a}}% da lição",
+    "question": "Questão",
+    "rawgrade": "Nota não ponderada",
+    "reports": "Relatórios",
+    "response": "Retorno",
+    "review": "Revisão",
+    "reviewlesson": "Rever Lição",
+    "reviewquestionback": "Sim, eu gostaria de tentar novamente",
+    "reviewquestioncontinue": "Não, quero continuar com a próxima questão",
+    "secondpluswrong": "Não é exato. Você quer tentar novamente?",
+    "submit": "Enviar",
+    "teacherjumpwarning": "Um destino {{$a.cluster}} ou um destino {{$a.unseen}} está sendo usado nesta lição. O destino Próxima Página substituirá o anterior. Faça o login como estudante para testar estes destinos.",
+    "teacherongoingwarning": "Para testar a pontuação corrente é necessário fazer o login como estudante.",
+    "teachertimerwarning": "Para testar o timer é necessário fazer o login como estudante.",
+    "thatsthecorrectanswer": "Esta é a resposta correta",
+    "thatsthewronganswer": "Esta é a resposta errada",
+    "timeremaining": "Tempo restante",
+    "timetaken": "Tempo utilizado",
+    "unseenpageinbranch": "Questão não vista de uma seção",
+    "welldone": "Muito bem!",
+    "youhaveseen": "Você já visitou algumas páginas desta lição.<br />Você quer iniciar a partir da última página visitada?",
+    "youranswer": "A sua resposta",
+    "yourcurrentgradeisoutof": "A sua nota atual é {{$a.grade}} sobre {{$a.total}}",
+    "youshouldview": "Você deve visitar pelo menos: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/pt.json b/www/addons/mod/lesson/lang/pt.json
new file mode 100644
index 00000000000..16a88172b79
--- /dev/null
+++ b/www/addons/mod/lesson/lang/pt.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Resposta",
+    "attemptheader": "Tentativa",
+    "attemptsremaining": "Ainda pode realizar {{$a}} tentativa(s)",
+    "averagescore": "Pontuação média",
+    "averagetime": "Tempo médio",
+    "branchtable": "Página de conteúdo",
+    "cannotfindattempt": "Erro: não foi possível encontrar a tentativa",
+    "cannotfinduser": "Erro: não foi possível encontrar utilizadores",
+    "clusterjump": "Pergunta não vista dentro do grupo",
+    "completed": "Completou",
+    "congratulations": "Parabéns - chegou ao fim da lição",
+    "continue": "Continuar",
+    "continuetonextpage": "Continuar para a página seguinte",
+    "defaultessayresponse": "A sua resposta à pergunta de desenvolvimento será avaliada pelo professor.",
+    "detailedstats": "Estatísticas detalhadas",
+    "didnotanswerquestion": "Não respondeu a esta pergunta",
+    "displayofgrade": "Exibição da nota (apenas para alunos)",
+    "displayscorewithessays": "Obteve {{$a.score}} num máximo de {{$a.tempmaxgrade}}.<br />As suas respostas à(s) pergunta(s) de desenvolvimento {{$a.essayquestions resposta(s)}} serão avaliadas posteriormente,<br />sendo a pontuação correspondente adicionada à pontuação final.<br /><br />A sua classificação atual, sem as perguntas que faltam avaliar, é de  {{$a.score}} num máximo de {{$a.grade}}.",
+    "displayscorewithoutessays": "Obteve uma pontuação de {{$a.score}} (em {{$a.grade}}). Clique em Ver notas para ver a sua nota final na pauta",
+    "emptypassword": "A palava-chave não pode estar em branco",
+    "enterpassword": "Introduza a senha:",
+    "eolstudentoutoftimenoanswers": "Não respondeu a nenhuma pergunta. Obteve uma classificação de 0 para esta lição.",
+    "finish": "Terminar",
+    "firstwrong": "Não respondeu corretamente. Gostaria de tentar responder novamente? (se responder corretamente não contará para a sua nota final.)",
+    "gotoendoflesson": "Ir para o fim da lição",
+    "grade": "Nota",
+    "highscore": "Melhor nota",
+    "hightime": "Tempo máximo",
+    "leftduringtimed": "Interrompeu uma lição com tempo limite.<br />Clique em Continuar para reiniciar à lição.",
+    "leftduringtimednoretake": "Interrompeu uma lição com tempo limite<br />e não é permitido repetir ou continuar a lição.",
+    "lessonmenu": "Menu da lição",
+    "lessonstats": "Estatísticas da lição",
+    "linkedmedia": "Conteúdo de suporte",
+    "loginfail": "A autenticação falhou. Tente de novo...",
+    "lowscore": "Nota mais baixa",
+    "lowtime": "Tempo mínimo",
+    "maximumnumberofattemptsreached": "Atingiu o número máximo de tentativas permitido - A lição vai avançar para a página seguinte",
+    "modattemptsnoteacher": "A possibilidade de revisão só funciona para os alunos.",
+    "noanswer": "Uma ou mais perguntas estão ainda por responder. Por favor, volte atrás e submeta uma resposta.",
+    "nolessonattempts": "Não houve tentativas de realização desta lição.",
+    "nolessonattemptsgroup": "Não foram realizadas tentativas por membros do grupo {{$a}} nesta lição.",
+    "notcompleted": "Incompleta",
+    "numberofcorrectanswers": "Número de respostas corretas: {{$a}}",
+    "numberofpagesviewed": "Perguntas respondidas: {{$a}}",
+    "numberofpagesviewednotice": "Número de questões respondidas: {{$a.nquestions}} (Tem de responder pelo menos a {{$a.minquestions}} questões)",
+    "ongoingcustom": "Tem {{$a.score}} ponto(s) num máximo de {{$a.currenthigh}}.",
+    "ongoingnormal": "Respondeu corretamente a {{$a.correct}} de {{$a.viewed}} perguntas.",
+    "or": "OU",
+    "overview": "Perspetiva global",
+    "preview": "Pré-visualização",
+    "progressbarteacherwarning2": "Não vê a barra de progresso porque pode editar esta lição",
+    "progresscompleted": "Completou {{$a}}% da lição",
+    "question": "Inserir página de pergunta",
+    "rawgrade": "Nota bruta",
+    "reports": "Relatórios",
+    "response": "Feedback",
+    "review": "Revisão",
+    "reviewlesson": "Rever lição",
+    "reviewquestionback": "Sim, quero tentar novamente",
+    "reviewquestioncontinue": "Não, quero avançar para a pergunta seguinte",
+    "secondpluswrong": "Resposta incorreta. Quer voltar a tentar?",
+    "submit": "Submeter",
+    "teacherjumpwarning": "Nesta lição, há páginas que seguem para {{$a.cluster}}  ou {{$a.unseen}}. Esta sequência será ignorada e a lição seguirá para a página seguinte. Para testar a sequência das páginas entre como aluno.",
+    "teacherongoingwarning": "A exibição da pontuação no decorrer da lição só é visível para os alunos. Para ver a pontuação no decorrer da lição entre como aluno.",
+    "teachertimerwarning": "O cronómetro só é visível para os alunos. Para testar esta funcionalidade, entre como aluno.",
+    "thatsthecorrectanswer": "A sua resposta está correta.",
+    "thatsthewronganswer": "A sua resposta <b>não<b> está correta.",
+    "timeremaining": "Tempo restante",
+    "timetaken": "Tempo usado",
+    "unseenpageinbranch": "Pergunta não vista da sequência",
+    "welldone": "Muito bem!",
+    "youhaveseen": "Já viu mais do que uma página desta lição.<br />Quer continuar a partir da última página que viu?",
+    "youranswer": "A sua resposta",
+    "yourcurrentgradeisoutof": "A sua nota atual é {{$a.grade}} em {{$a.total}}",
+    "youshouldview": "Deve responder a pelo menos: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ro.json b/www/addons/mod/lesson/lang/ro.json
new file mode 100644
index 00000000000..e921358830b
--- /dev/null
+++ b/www/addons/mod/lesson/lang/ro.json
@@ -0,0 +1,60 @@
+{
+    "answer": "Răspuns",
+    "attemptheader": "Încercare",
+    "attemptsremaining": "Mai aveţi {{$a}} încercări disponibile",
+    "averagescore": "Punctaj mediu obţinut",
+    "averagetime": "Timp mediu",
+    "branchtable": "Conținut",
+    "cannotfinduser": "Eroare: nu s-au putut găsi utilizatorii",
+    "clusterjump": "Întrebare ascunsă în cadrul unui cluster",
+    "completed": "Finalizat",
+    "congratulations": "Felicitări - aţi ajuns la finalul lecţiei",
+    "continue": "Mai departe",
+    "continuetonextpage": "Continuați la pagina următoare",
+    "defaultessayresponse": "Eseul dumneavoastră va fi notat de unul din instructorii cursului.",
+    "detailedstats": "Date statistice detaliate",
+    "didnotanswerquestion": "Nu a răspuns la această întrebare.",
+    "displayofgrade": "Afişarea notei (doar pentru cursanţi)",
+    "displayscorewithoutessays": "Punctajul dumneavoastră este de {{$a.score}} (din nota {{$a.grade}}).",
+    "enterpassword": "Vă rugăm introduceţi parola:",
+    "eolstudentoutoftimenoanswers": "Nu aţi răspuns la nicio întrebare. Aţi primit 0 puncte la această lecţie.",
+    "finish": "Terminat",
+    "grade": "Notă",
+    "highscore": "Notă mare",
+    "leftduringtimed": "Aţi abandonat o lecţie cronometrată.<br />Vă rugăm apăsaţi  Continuare pentru a începe lecţia de la început.",
+    "leftduringtimednoretake": "Aţi abandonat o lecţie cronometrată.<br />nu aveţi permisiunea de a continua sau de a începe de la început.",
+    "lessonmenu": "Meniu Lecţie",
+    "lessonstats": "Statistici lecţie",
+    "linkedmedia": "Linked media",
+    "loginfail": "Operaţiunea de logare nu a reuşit, vă rugăm mai încercaţi...",
+    "lowscore": "Punctaj minim",
+    "maximumnumberofattemptsreached": "Numărul maxim de încercări a fost epuizat - se trece la pagina următoare",
+    "noanswer": "Nu aţi dat niciun răspuns. Vă rugăm mergeţi la pagina precedentă şi daţi un răspuns.",
+    "nolessonattempts": "Nu s-a înregistrat nicio încercare de parcurgere a acestei lecţii",
+    "notcompleted": "Nu a fost completat.",
+    "numberofcorrectanswers": "Numărul de răspunsuri corecte: {{$a}}",
+    "numberofpagesviewed": "Numărul de întrebări la care s-a răspuns: {{$a}}",
+    "numberofpagesviewednotice": "Aţi răspuns la {{$a.nquestions}} întrebări; (Trebuie să răspundeţi la cel puţin {{$a.minquestions}} întrebări)",
+    "ongoingcustom": "Până în acest moment aţi obţinut {{$a.score}} point(s) puncte din {{$a.currenthigh}} point(s) posibile.",
+    "or": "SAU",
+    "preview": "Previzualizare",
+    "progresscompleted": "Ați completat {{$a}}% din lecție",
+    "question": "Întrebare",
+    "reports": "Rapoarte",
+    "response": "Răspuns",
+    "review": "Verificare",
+    "reviewquestionback": "Da, doresc să mai încerc o dată",
+    "reviewquestioncontinue": "Nu, vreau să trec la următoarea întrebare",
+    "secondpluswrong": "Nu este corect. Doriţi să mai încercaţi o dată?",
+    "submit": "Trimite",
+    "teacherongoingwarning": "Punctajul curent este afişat doar cursanţilor. Dacă doriţi să vizualizaţi punctajul curent trebuie să intraţi în contul de cursant.",
+    "thatsthecorrectanswer": "Răspuns corect",
+    "thatsthewronganswer": "Răspuns incorect",
+    "timeremaining": "Timp rămas",
+    "timetaken": "Timp necesar",
+    "welldone": "Foarte bine!",
+    "youhaveseen": "Aţi vizualizat deja mai mult de o pagină din această lecţie.<br />Doriţi să reveniţi la prima pagină pe care aţi văzut-o?",
+    "youranswer": "Răspunsul dumneavoastră",
+    "yourcurrentgradeisoutof": "În prezent nota dumneavoastră este {{$a.grade}}, nota maximă posibilă este {{$a.total}}.",
+    "youshouldview": "Trebuie să răspundeţi la cel puţin {{$a}} întrebări."
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ru.json b/www/addons/mod/lesson/lang/ru.json
new file mode 100644
index 00000000000..cdfe818e247
--- /dev/null
+++ b/www/addons/mod/lesson/lang/ru.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Ответ",
+    "attemptheader": "Попытка",
+    "attemptsremaining": "У вас осталось {{$a}} попыток",
+    "averagescore": "Средний балл",
+    "averagetime": "Среднее время",
+    "branchtable": "Список разделов",
+    "cannotfindattempt": "Ошибка: попытка не найдена",
+    "cannotfinduser": "Ошибка: не удалось найти пользователей",
+    "clusterjump": "Непросмотренный вопрос в кластере",
+    "completed": "Лекция завершена",
+    "congratulations": "Поздравления - лекция завершена",
+    "continue": "Продолжить",
+    "continuetonextpage": "Перейти к следующей странице",
+    "defaultessayresponse": "Ваше эссе будет оценено преподавателем курса.",
+    "detailedstats": "Подробная статистика",
+    "didnotanswerquestion": "Студент не ответил на этот вопрос.",
+    "displayofgrade": "Показать оценки (только для студентов)",
+    "displayscorewithessays": "<p>Вы получили {{$a.score}} баллов из {{$a.tempmaxgrade}} за вопросы, оцененные автоматически.</p>\n<p> Оценки за {{$a.essayquestions}} эссе будут поставлены и учтены позднее при выставлении итоговой оценки.</p>\n<p>Ваша текущая оценка (без учета эссе): {{$a.score}} из {{$a.grade}}</p>.",
+    "displayscorewithoutessays": "Оценка за ответы на вопросы: {{$a.score}} из {{$a.grade}}",
+    "emptypassword": "Пароль не может быть пустым",
+    "enterpassword": "Пожалуйста, введите пароль:",
+    "eolstudentoutoftimenoanswers": "Вы не ответили ни на один вопрос. Вы получили 0 за эту лекцию.",
+    "finish": "Завершить",
+    "firstwrong": "Вы ответили неправильно. Хотите снова попробовать ответить на вопрос? (Даже в случае верного ответа его результат не будет засчитан в Вашей итоговой оценке.)",
+    "gotoendoflesson": "Перейти к концу лекции",
+    "grade": "Оценка",
+    "highscore": "Высший результат",
+    "hightime": "Наибольшее время",
+    "leftduringtimed": "Вы просрочили время, отведенное на прохождение лекции. <br/> Щелкните по кнопке «Продолжить», чтобы начать лекцию заново.",
+    "leftduringtimednoretake": "Вы просрочили время, отведенное на прохождение лекции и не можете продолжить её или пройти заново.",
+    "lessonmenu": "Меню лекции",
+    "lessonstats": "Статистика лекции",
+    "linkedmedia": "Связанное медиа",
+    "loginfail": "Логин неверный, пожалуйста, попробуйте еще раз...",
+    "lowscore": "Низший балл",
+    "lowtime": "Наименьшее время",
+    "maximumnumberofattemptsreached": "Достигнуто максимальное количество попыток - переходим к следующей странице",
+    "modattemptsnoteacher": "Только студенты могут повторно проходить лекцию.",
+    "noanswer": "На один или несколько вопросов не получено ответа. Пожалуйста, вернитесь и представьте ответ.",
+    "nolessonattempts": "Не было попыток пройти лекцию.",
+    "nolessonattemptsgroup": "В этой лекции члены группы ({{$a}}) не сделали ни одной попытки.",
+    "notcompleted": "Лекция не завершена",
+    "numberofcorrectanswers": "Количество правильных ответов: {{$a}}",
+    "numberofpagesviewed": "Количество просмотренных страниц : {{$a}}",
+    "numberofpagesviewednotice": "Количество вопросов, на которые дан ответ: {{$a.nquestions}} (Вы должны ответить минимум на {{$a.minquestions}})",
+    "ongoingcustom": "К настоящему времени Вы заработали баллов: {{$a.score}}  из {{$a.currenthigh}} возможных.",
+    "ongoingnormal": "Вы ответили правильно на {{$a.correct}} вопрос(ов) из {{$a.viewed}} просмотренных.",
+    "or": "ИЛИ",
+    "overview": "Обзор",
+    "preview": "Просмотр",
+    "progressbarteacherwarning2": "Вы не увидите индикатор выполнения, потому что можете редактировать эту лекцию.",
+    "progresscompleted": "Вы прошли {{$a}}% лекции",
+    "question": "Вопрос",
+    "rawgrade": "Предварительная оценка",
+    "reports": "Отчеты",
+    "response": "Отзыв",
+    "review": "Пересмотр",
+    "reviewlesson": "Пересмотр лекции",
+    "reviewquestionback": "Да, мне хотелось бы попробовать еще раз",
+    "reviewquestioncontinue": "Нет, я просто хочу перейти к следующему вопросу",
+    "secondpluswrong": "Не совсем правильно. Вы хотите попробовать еще раз?",
+    "submit": "Отправить",
+    "teacherjumpwarning": "В лекции используются переходы «{{$a.cluster}}» или «{{$a.unseen}}». Сейчас вместо них будет использован переход «Следующая страница». Зайдите как студент, чтобы протестировать эти переходы.",
+    "teacherongoingwarning": "Текущий балл отображается только для студентов. Чтобы протестировать текущий балл, зайдите как студент.",
+    "teachertimerwarning": "Таймер отображается только для студентов. Чтобы протестировать таймер, зайдите как студент.",
+    "thatsthecorrectanswer": "Это правильный ответ",
+    "thatsthewronganswer": "Это неправильный ответ",
+    "timeremaining": "Оставшееся время",
+    "timetaken": "Затраченное время",
+    "unseenpageinbranch": "Страница непросмотренного вопроса из раздела",
+    "welldone": "Отлично!",
+    "youhaveseen": "Вы уже работали с этой лекцией.<br /> Хотите продолжить с того места, на котором Вы остановились?",
+    "youranswer": "Ваш ответ",
+    "yourcurrentgradeisoutof": "Ваша текущая оценка: {{$a.grade}} из {{$a.total}}",
+    "youshouldview": "Вы должны ответить, по меньшей мере на: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/sv.json b/www/addons/mod/lesson/lang/sv.json
new file mode 100644
index 00000000000..fe0a53b2702
--- /dev/null
+++ b/www/addons/mod/lesson/lang/sv.json
@@ -0,0 +1,74 @@
+{
+    "answer": "Svar",
+    "attemptsremaining": "Du har {{$a}} återstående försök",
+    "averagescore": "Genomsnittsligt resultat",
+    "averagetime": "Genomsnittslig tid",
+    "branchtable": "Innehåll",
+    "cannotfindattempt": "Fel: det gick inte att hitta försök",
+    "cannotfinduser": "Fel: det gick inte att hitta användare",
+    "clusterjump": "Ej visad fråga inom ett kluster",
+    "completed": "Avslutad",
+    "congratulations": "Gratulerar - lektionen är slut här",
+    "continue": "Fortsätt",
+    "continuetonextpage": "Fortsätt till nästa sida.",
+    "defaultessayresponse": "Din essä kommer att få ett betyg/omdöme av kursens distanslärare.",
+    "detailedstats": "Detaljerad statistik",
+    "didnotanswerquestion": "Besvarade inte den här frågan",
+    "displayofgrade": "Visning av betyg/omdöme",
+    "displayscorewithessays": "Du har uppnått {{$a.score}} av {{$a.tempmaxgrade}} för de frågor som betygssätts automatiskt.<br>Din/a {{$a.essayquestions}} essäfråga/or kommer att betygsättas och läggas till<br>Ditt slutresultat vid ett senare tillfälle.<br><br>Ditt aktuella betyg utan essäfråga/or är {{$a.score}} av {{$a.grade}}",
+    "displayscorewithoutessays": "Ditt resultat är {{$a.score}} (av {{$a.grade}}).",
+    "emptypassword": "Textfältet för lösenord får inte vara tomt.",
+    "enterpassword": "Var snäll och skriv in lösenordet:",
+    "eolstudentoutoftimenoanswers": "Du svarade inte på några frågor. Ditt resultat för den här lektionen är 0.",
+    "finish": "Avsluta",
+    "firstwrong": "Tyvärr har Du inte uppnått den här poängen eftersom Du inte svarade rätt. Vill Du fortsätta att gissa, för lärandets skull (men inte för någon poäng)?",
+    "gotoendoflesson": "Gå till slutet av lektionen",
+    "grade": "Betyg/omdöme",
+    "highscore": "Högt resultat",
+    "hightime": "Hög tid",
+    "leftduringtimed": "Du har avbrutit under en tidsstyrd lektion.<br>Var snäll och välj \"Fortsätt\" för att starta om lektionen.",
+    "leftduringtimednoretake": "Du har avbrutit under en tidsstyrd lektion<br> och Du får inte göra om, eller gå vidare med, lektionen.",
+    "lessonmenu": "Meny för lektion",
+    "lessonstats": "Statistik för lektion",
+    "linkedmedia": "Länkade media",
+    "loginfail": "Det gick inte att logga in, vara snäll och försök igen...",
+    "lowscore": "Lågt resultat",
+    "lowtime": "Låg tid",
+    "maximumnumberofattemptsreached": "Du har uppnått maximalt antal tillåtna försök - Du flyttas nu vidare till nästa sida.",
+    "modattemptsnoteacher": "Upprepad visning för studenter/elever/deltagare/lärande fungerar bara för dem.",
+    "noanswer": "Det finns inget angivet svar",
+    "nolessonattempts": "Det har inte gjorts några försök att genomföra den här lektionen.",
+    "notcompleted": "Inte avslutad",
+    "numberofcorrectanswers": "Antal rätta svar: {{$a}}",
+    "numberofpagesviewed": "Antal sidor som har visats:  {{$a}}",
+    "numberofpagesviewednotice": "Antal besvarade frågor: {{$a.nquestions}}; (Du bör besvara åtminstone: {{$a.minquestions}})",
+    "ongoingcustom": "Du har uppnått {{$a.score}} poäng av {{$a.currenthigh}} poäng så här långt.",
+    "ongoingnormal": "Du har lämnat korrekt/a svar på {{$a.correct}} fråga/or av {{$a.viewed}} fråga/or.",
+    "or": "ELLER",
+    "overview": "Överblick",
+    "preview": "Förhandsgranska",
+    "progressbarteacherwarning2": "Du kan inte se raden för fortskridande eftersom Du kan redigera den här lektionen",
+    "question": "Fråga",
+    "rawgrade": "Grovt antaget betyg/omdöme",
+    "reports": "Rapporter",
+    "response": "Återkoppling på svar",
+    "review": "Granska",
+    "reviewlesson": "Visa lektion igen",
+    "reviewquestionback": "Ja, jag vill försöka igen",
+    "reviewquestioncontinue": "Nej, jag vill gå vidare till nästa fråga",
+    "secondpluswrong": "Inte helt. Vill Du försöka igen?",
+    "submit": "Skicka in",
+    "teacherjumpwarning": "Det finns ett {{$a.cluster}} hopp eller ett {{$a.unseen}} hopp med i den här lektionen. Hoppet \"Nästa sida\" kommer att användas istället. Logga in som en student/elev/deltagare/lärande för att testa dessa hopp.",
+    "teacherongoingwarning": "Ett pågående resultat visas bara för studenter/elever/deltagare/lärande. Logga in som en sådan för att se pågående resultat.",
+    "teachertimerwarning": "Tidtagaren fungerar bara för studenter/elever/deltagare/lärande. Logga in som en sådan för att testa tidtagaren.",
+    "thatsthecorrectanswer": "Det är rätt svar",
+    "thatsthewronganswer": "Det är ett felaktigt svar",
+    "timeremaining": "Återstående tid",
+    "timetaken": "Använd tid",
+    "unseenpageinbranch": "Ej visad fråga inom en innehållssida",
+    "welldone": "Bra gjort!",
+    "youhaveseen": "Du har redan sett mer än en sida av den här lektionen.<br />Vill Du börja med den senaste sidan som Du såg?",
+    "youranswer": "Ditt svar",
+    "yourcurrentgradeisoutof": "Ditt aktuella betyg/omdöme är {{$a.grade}} av {{$a.total}}",
+    "youshouldview": "Du bör åtminstone titta på: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/tr.json b/www/addons/mod/lesson/lang/tr.json
new file mode 100644
index 00000000000..99d0bd338e2
--- /dev/null
+++ b/www/addons/mod/lesson/lang/tr.json
@@ -0,0 +1,77 @@
+{
+    "answer": "Cevap",
+    "attemptheader": "Deneme(Teşebbüs)",
+    "attemptsremaining": "{{$a}} uygulama hakkınız kaldı",
+    "averagescore": "Ortalama not",
+    "averagetime": "Ortalama zaman",
+    "branchtable": "İçerik",
+    "cannotfindattempt": "Hata: uygulama bulunamadı",
+    "cannotfinduser": "Hata: kullanıcılar bulunamadı",
+    "clusterjump": "Küme içindeki bakılmamış soru",
+    "completed": "Bitirmeli",
+    "congratulations": "Tebrikler, dersin sonuna geldiniz",
+    "continue": "Devam et",
+    "continuetonextpage": "Sonraki sayfaya devam et.",
+    "defaultessayresponse": "Yazılınız kurs eğitimcisi tarafından değerlendirilecek.",
+    "detailedstats": "Ayrıntılı istatistikler",
+    "didnotanswerquestion": "Bu soruyu yanıtlamadı.",
+    "displayofgrade": "Not gösterimi (sadece öğrenciler için)",
+    "displayscorewithessays": "Otomatik olarak, değerlendirilen sorulardan {{$a.tempmaxgrade}} üzerinden {{$a.score}} aldınız. <br />{{$a.essayquestions}} yazılı sorusu için notunuz hesaplanacak<br />ve sonraki bir tarihte final notunuza eklenecektir.<br /><br />Yazılı notlar olmaksızın şu anki notunuz {{$a.grade}} üzerinden {{$a.score}}'dir",
+    "displayscorewithoutessays": "Notunuz {{$a.score}} ({{$a.grade}} üzerinden).",
+    "emptypassword": "Şifre boş olamaz",
+    "enterpassword": "Lütfen şifreyi giriniz:",
+    "eolstudentoutoftimenoanswers": "Hiç bir soruya cevap vermediniz. Bu ders için 0 aldınız.",
+    "finish": "Bitiş",
+    "firstwrong": "Cevabınız doğru olmadığı için maalesef bu puanı alamazsınız. Öğrenmenizi daha çok pekiştirmek için tahmin etmeye devam etmek ister misiniz (ama puan verilmez)?",
+    "gotoendoflesson": "Dersin sonuna git",
+    "grade": "Not",
+    "highscore": "Yüksek not",
+    "hightime": "Yüksek zaman",
+    "leftduringtimed": "Zamanlı bir dersin süresini aştınız.<br />Dersi tekrar başlatmak için Devam Et butonuna tıklayın.",
+    "leftduringtimednoretake": "Zamanlı bir dersin süresini aştınız.<br />Dersi tekrar alamaz veya derse devam edemezsiniz.",
+    "lessonmenu": "Ders menüsü",
+    "lessonstats": "Ders istatististikleri",
+    "linkedmedia": "Bağlantılı çokluortam",
+    "loginfail": "Giriş hatalı, lütfen tekrar deneyin...",
+    "lowscore": "Düşük puan",
+    "lowtime": "Düşük zaman",
+    "maximumnumberofattemptsreached": "En fazla uygulama sayısına ulaşıldı - Sonraki sayfaya gidiliyor",
+    "modattemptsnoteacher": "Öğrenci değerlendirmesi sadece öğrenciler için çalışır.",
+    "noanswer": "Bir veya daha fazla soruya cevap verilmedi. Lütfen geri dönün ve bir cevap verin.",
+    "nolessonattempts": "Bu derste uygulama yapılmadı.",
+    "nolessonattemptsgroup": "Bu derste {{$a}} grup üyeleri tarafından hiçbir deneme yapılmadı.",
+    "notcompleted": "Tamamlanmadı",
+    "numberofcorrectanswers": "Doğru cevap sayısı: {{$a}}",
+    "numberofpagesviewed": "Cevaplanan soru sayısı: {{$a}}",
+    "numberofpagesviewednotice": "Cevaplanan soru sayısı: {{$a.nquestions}}; (En az bu kadar cevaplamalısınız: {{$a.minquestions}})",
+    "ongoingcustom": "Şu ana kadar {{$a.currenthigh}} not üzerinden {{$a.score}} puan aldınız.",
+    "ongoingnormal": "{{$a.viewed}} uygulamadan {{$a.correct}} tanesini doğru yanıtladınız.",
+    "or": "VEYA",
+    "overview": "Gözden geçir",
+    "preview": "Önizleme",
+    "progressbarteacherwarning2": "Bu dersi düzenlediğiniz için ilerleme çubuğunu göremezsiniz",
+    "progresscompleted": "Dersin {{$a}} %  tamamladınız",
+    "question": "Soru",
+    "rawgrade": "Ham not",
+    "reports": "Raporlar",
+    "response": "Yanıtına karşılık dönüt",
+    "review": "Gözden geçir",
+    "reviewlesson": "Dersi tekrar gözden geçir",
+    "reviewquestionback": "Evet, tekrar deneyeyim",
+    "reviewquestioncontinue": "Hayır, sonraki soruya geçeyim",
+    "secondpluswrong": "Tamamen değil. Tekrar denemek ister misiniz?",
+    "submit": "Gönder",
+    "teacherjumpwarning": "Bir {{$a.cluster}} veya {{$a.unseen}} ilerlemesi bu derste kullanılıyor. Bunun yerine Sonraki sayfa ilerlemesi kullanılacak. Bu ilerlemeleri denemek için öğrenci olarak giriş yapın.",
+    "teacherongoingwarning": "Sürekli not gösterimi sadece öğrenciler içindir. Bunu denemek için öğrenci olarak giriş yapın",
+    "teachertimerwarning": "Sayaç sadece öğrenciler için çalışır. Öğrenci olarak giriş yaparak sayacı deneyin.",
+    "thatsthecorrectanswer": "Doğru cevap",
+    "thatsthewronganswer": "Yanlış cevap",
+    "timeremaining": "Kalan süre",
+    "timetaken": "Geçen süre",
+    "unseenpageinbranch": "Bir içerik sayfasındaki görülmemiş soru",
+    "welldone": "Aferin!",
+    "youhaveseen": "Bu dersin birden fazla sayfasını zaten gördünüz.\n<br />Kaldığınız sayfadan devam etmek ister misiniz?",
+    "youranswer": "Cevabınız",
+    "yourcurrentgradeisoutof": "Şu anki notunuz {{$a.total}} üzerinden {{$a.grade}} dir.",
+    "youshouldview": "En az cevaplamanız gereken: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/zh-cn.json b/www/addons/mod/lesson/lang/zh-cn.json
new file mode 100644
index 00000000000..3c06c89a713
--- /dev/null
+++ b/www/addons/mod/lesson/lang/zh-cn.json
@@ -0,0 +1,75 @@
+{
+    "answer": "答案",
+    "attemptsremaining": "您还有{{$a}}次机会",
+    "averagescore": "平均分",
+    "averagetime": "平均耗时",
+    "branchtable": "内容",
+    "cannotfindattempt": "错误：找不到试答",
+    "cannotfinduser": "错误：找不到用户",
+    "clusterjump": "在簇中的题目不可见",
+    "completed": "完成",
+    "congratulations": "恭喜 － 已到达练习终点",
+    "continue": "继续",
+    "continuetonextpage": "继续到下一页。",
+    "defaultessayresponse": "教师将随后对您的问答题评分。",
+    "detailedstats": "详细统计",
+    "didnotanswerquestion": "未回答此题。",
+    "displayofgrade": "向学生显示成绩",
+    "displayscorewithessays": "您在自动评分的题目中得了{{$a.score}}（满分：{{$a.tempmaxgrade}}）。<br />您的{{$a.essayquestions}}个问答题将晚些评分，并添加到您的最终成绩中。<br /><br />您当前不包含问答题的成绩是：{{$a.score}} （满分：{{$a.grade}}）",
+    "displayscorewithoutessays": "您的分数是{{$a.score}}(满分{{$a.grade}})。",
+    "emptypassword": "密码不能为空",
+    "enterpassword": "请输入密码",
+    "eolstudentoutoftimenoanswers": "您没有回答任何题目。您在本程序教学中得到了 0 分。",
+    "finish": "结束",
+    "firstwrong": "很遗憾，因为回答不正确，您没能够获得分数。还想继续猜测吗？这纯粹是为了学习的快乐（不能获得成绩）。",
+    "gotoendoflesson": "到程序教学末尾",
+    "grade": "成绩",
+    "highscore": "最高分",
+    "hightime": "最长耗时",
+    "leftduringtimed": "您在计时程序教学的中间离开了。<br/>请点击“继续”来重新开始。",
+    "leftduringtimednoretake": "您在计时程序教学的中间离开了。<br/>此教程不允许重学或继续。",
+    "lessonmenu": "程序教学目录",
+    "lessonstats": "程序教学统计",
+    "linkedmedia": "链接的媒体",
+    "loginfail": "登录错误，请重试……",
+    "lowscore": "最低分",
+    "lowtime": "最短耗时",
+    "maximumnumberofattemptsreached": "您已达到最大数量的尝试-请进入下一个页面",
+    "modattemptsnoteacher": "学生复审只能在学生端使用。",
+    "noanswer": "未回答问题。请回退并提交一个答案。",
+    "nolessonattempts": "还没有人尝试此程序教学。",
+    "notcompleted": "没有完成",
+    "numberofcorrectanswers": "正确答案数：{{$a}}",
+    "numberofpagesviewed": "页面浏览数：{{$a}}",
+    "numberofpagesviewednotice": "已回答题数:{{$a.nquestions}};(您至少要回答{{$a.minquestions}})",
+    "ongoingcustom": "您迄今已获得 {{$a.score}} 分 （满分 {{$a.currenthigh}}）。",
+    "ongoingnormal": "您在已浏览的 {{$a.viewed}} 道题目中已正确回答了{{$a.correct}}道。",
+    "or": "或",
+    "overview": "概览",
+    "preview": "预览",
+    "progressbarteacherwarning2": "因为您可以编辑此程序教学，所以您看不到进度条",
+    "progresscompleted": "您已完成此程序教学的 {{$a}}%",
+    "question": "题目",
+    "rawgrade": "原始分数",
+    "reports": "报表",
+    "response": "回应",
+    "review": "复习",
+    "reviewlesson": "复习程序教学",
+    "reviewquestionback": "再试一次",
+    "reviewquestioncontinue": "不，我只想继续看下一题",
+    "secondpluswrong": "不完全正确，您想再试一次吗？",
+    "submit": "提交",
+    "teacherjumpwarning": "此程序教学使用了一个{{$a.cluster}}跳转或一个{{$a.unseen}}跳转。将使用“下一页”跳转模式替代。以学生身份登录来测试这些跳转。",
+    "teacherongoingwarning": "即时分数只显示给学生。以学生身份登录来测试即时分数",
+    "teachertimerwarning": "只有学生可以使用计时器。要测试计时器，请以学生身份登录。",
+    "thatsthecorrectanswer": "此答案正确",
+    "thatsthewronganswer": "此答案错误",
+    "timeremaining": "剩余时间",
+    "timetaken": "开始时间",
+    "unseenpageinbranch": "内容页面内未查看的题目",
+    "welldone": "非常好!",
+    "youhaveseen": "您已经浏览了本程序教学的多个页面。<br />想从上次结束的页面开始吗？",
+    "youranswer": "您的答案",
+    "yourcurrentgradeisoutof": "您目前的分数是{{$a.grade}}（总分{{$a.total}}）",
+    "youshouldview": "您最少应该浏览：{{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/zh-tw.json b/www/addons/mod/lesson/lang/zh-tw.json
new file mode 100644
index 00000000000..42b9529905a
--- /dev/null
+++ b/www/addons/mod/lesson/lang/zh-tw.json
@@ -0,0 +1,77 @@
+{
+    "answer": "答案",
+    "attemptheader": "作答",
+    "attemptsremaining": "您還有{{$a}}次作答機會",
+    "averagescore": "平均分數",
+    "averagetime": "平均時間",
+    "branchtable": "目錄(分支表)",
+    "cannotfindattempt": "錯誤：找不到作答次",
+    "cannotfinduser": "錯誤：找不到用戶",
+    "clusterjump": "在群集中隱藏的問題",
+    "completed": "已完成",
+    "congratulations": "恭喜！編序學習已經完成。",
+    "continue": "繼續",
+    "continuetonextpage": "繼續到下一頁",
+    "defaultessayresponse": "您的申論題將會由你的教師評分",
+    "detailedstats": "詳細統計",
+    "didnotanswerquestion": "沒有回答這一試題",
+    "displayofgrade": "(只向學生)顯示成績",
+    "displayscorewithessays": "<p>您在自動評計分的試題中，獲得{{$a.score}}分(此部分配分是{{$a.tempmaxgrade}})。</p>\n<p>您的{{$a.essayquestions}}個問答題將會晚一些被評分，並加入到您的最後成績中。</p>\n<p>若不包含問答題，您目前的分數是{{$a.score}}，總配分是{{$a.grade}}</p>",
+    "displayscorewithoutessays": "您的分數是{{$a.score}}(滿分{{$a.grade}})",
+    "emptypassword": "密碼不可以是空白",
+    "enterpassword": "請輸入密碼",
+    "eolstudentoutoftimenoanswers": "您沒有回答任何試題。此課程您將得到0分。",
+    "finish": "完成",
+    "firstwrong": "你答錯了，你想要再答一次嗎？(若你回答正確，也不會算入最後正式分數)？",
+    "gotoendoflesson": "跳到這編序學習的結束",
+    "grade": "分數",
+    "highscore": "最高分",
+    "hightime": "最長時間",
+    "leftduringtimed": "您在一個有計時的編序教學中離開了。<br>請按\"繼續\"以重新開始這編序教學",
+    "leftduringtimednoretake": "您在一個有計時的編序教學中離開了，而您不被允許重新或繼續這一編序教學",
+    "lessonmenu": "編序學習選單",
+    "lessonstats": "編序學習統計",
+    "linkedmedia": "已連結的媒體",
+    "loginfail": "登入錯誤，請重試",
+    "lowscore": "最低分數",
+    "lowtime": "最短時間",
+    "maximumnumberofattemptsreached": "達到嘗試次數上限 - 請進入下一頁",
+    "modattemptsnoteacher": "學生回顧功能只開放給學生們。",
+    "noanswer": "有一個或以上的問題沒有回答。請回頭並提交一個答案。",
+    "nolessonattempts": "這個課程還沒有人嘗試。",
+    "nolessonattemptsgroup": "{{$a}}群組成員在這單元上還沒有人作答",
+    "notcompleted": "未完成",
+    "numberofcorrectanswers": "答對題數：{{$a}}",
+    "numberofpagesviewed": "頁面瀏覽數：{{$a}}",
+    "numberofpagesviewednotice": "已經回答題數：{{$a.nquestions}}(您至少要回答{{$a.minquestions}}題)",
+    "ongoingcustom": "目前的{{$a.currenthigh}}分中，您已獲得{{$a.score}}分。",
+    "ongoingnormal": "到目前為止的{{$a.viewed}}問題中，您答對了{{$a.correct}}題。",
+    "or": "或",
+    "overview": "概要",
+    "preview": "預覽",
+    "progressbarteacherwarning2": "你不能看到這進度列，因為你可以編輯這一編序學習。",
+    "progresscompleted": "在這一編序學習，你已經完成{{$a}}%",
+    "question": "試題",
+    "rawgrade": "原始分數",
+    "reports": "報表",
+    "response": "回覆",
+    "review": "復習",
+    "reviewlesson": "復習編序學習",
+    "reviewquestionback": "是的，我想要再試",
+    "reviewquestioncontinue": "不，我只想要繼續下一個問題",
+    "secondpluswrong": "不離開嗎?您想要再試試?",
+    "submit": "提交",
+    "teacherjumpwarning": "此編序學習正使用群集{{$a.cluster}}跳躍，或{{$a.unseen}}隱藏跳躍。將使用下一頁的跳躍方式來取代。以學生身份登入來測試這些跳躍。",
+    "teacherongoingwarning": "正進行中的分數只顯示給學生。以學生身份登入來測試這個進行中的分數。",
+    "teachertimerwarning": "計時器只提供給學生。以學生身份登入來測試這個計時器。",
+    "thatsthecorrectanswer": "這是正確的答案",
+    "thatsthewronganswer": "這是錯誤的答案",
+    "timeremaining": "剩餘時間",
+    "timetaken": "使用時間",
+    "unseenpageinbranch": "在內容頁面中未瀏覽的試題",
+    "welldone": "做的好！",
+    "youhaveseen": "您已經瀏覽了該課程的多個頁面。<br />想從最後瀏覽的頁面開始嗎?",
+    "youranswer": "您的答案",
+    "yourcurrentgradeisoutof": "您目前的分數是{{$a.grade}}（總分{{$a.total}}）",
+    "youshouldview": "您至少應該回答：{{$a}}題"
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/ar.json b/www/addons/mod/quiz/lang/ar.json
index 436c3c2d817..1c73660d4bd 100644
--- a/www/addons/mod/quiz/lang/ar.json
+++ b/www/addons/mod/quiz/lang/ar.json
@@ -22,6 +22,7 @@
     "hasdatatosync": "هذا الاختبار فيه بيانات يمكن الوصول إليها بدون اتصال بالانترنت وتحتاج للمزامنة",
     "marks": "الدرجات",
     "noquestions": "لم يتم إضافة أية أسئلة بعد",
+    "outof": "من {{$a}}",
     "overdue": "متأخر جدا",
     "preview": "معاينة",
     "previewquiznow": "معاينة الاستمارة الآن",
diff --git a/www/addons/mod/quiz/lang/el.json b/www/addons/mod/quiz/lang/el.json
index 12418e6c93a..2f0e390e7db 100644
--- a/www/addons/mod/quiz/lang/el.json
+++ b/www/addons/mod/quiz/lang/el.json
@@ -1,7 +1,17 @@
 {
+    "attemptfirst": "Πρώτη προσπάθεια",
+    "attemptlast": "Τελευταία προσπάθεια",
+    "attemptnumber": "Προσπάθεια",
+    "attemptquiznow": "Προσπάθεια κουίζ τώρα",
+    "attemptstate": "Κατάσταση",
     "cannotsubmitquizdueto": "Αυτή η προσπάθεια επίλυσης του κουίζ δεν μπορεί να υποβληθεί για τους εξής λόγους:",
+    "comment": "Σχόλιο",
+    "completedon": "Ολοκληρώθηκε στις",
+    "confirmclose": "Πρόκειται να τερματίσετε αυτήν την προσπάθεια. Από τη στιγμή που θα τερματίσετε την προσπάθειά σας δεν θα είστε σε θέση να αλλάξετε τις απαντήσεις σας.",
     "confirmcontinueoffline": "Αυτή η προσπάθεια δεν έχει συγχρονιστεί από {{$ a}}. Αν έχετε συνεχίσει την προσπάθεια αυτή σε μια άλλη συσκευή από τότε, μπορεί να χάσετε δεδομένα.",
     "confirmleavequizonerror": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση των απαντήσεων. Είστε σίγουροι ότι θέλετε να εξέλθετε από το κουίζ;",
+    "continueattemptquiz": "Συνέχιση της τελευταίας προσπάθειας",
+    "continuepreview": "Συνέχιση της τελευταίας προεπισκόπισης",
     "errorbehaviournotsupported": "Δεν μπορείτε να πραγματοποιήσετε αυτό το κουίζ στην εφαρμογή, διότι η συμπεριφορά του δεν υποστηρίζεται από την εφαρμογή:",
     "errordownloading": "Σφάλμα κατά τη λήψη των απαιτούμενων δεδομένων.",
     "errorgetattempt": "Σφάλμα κατά τη λήψη δεδομένων προσπάθειας.",
@@ -13,10 +23,50 @@
     "errorsaveattempt": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια αποθήκευσης των δεδομένων.",
     "errorsyncquiz": "Παρουσιάστηκε σφάλμα κατά το συγχρονισμό. Παρακαλώ προσπαθήστε ξανα.",
     "errorsyncquizblocked": "Αυτό το κουίζ δεν μπορεί να συγχρονιστεί τώρα εξαιτίας μιας εκτελούμενης διαδικασίας. Παρακαλώ δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, δοκιμάστε να επανεκκινήσετε την εφαρμογή.",
+    "feedback": "Ανάδραση",
+    "finishattemptdots": "Τελειώστε την προσπάθεια ...",
     "finishnotsynced": "Ολοκληρωμένο αλλά όχι συγχρονισμένο",
+    "grade": "Βαθμός",
+    "gradeaverage": "Μέσος βαθμός",
+    "gradehighest": "Ο υψηλότερος βαθμός",
+    "grademethod": "Μέθοδος βαθμολόγησης",
+    "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Αυτό το κουίζ έχει δεδομένα εκτός σύνδεσης που πρέπει να συγχρονιστούν.",
+    "marks": "Βαθμοί",
+    "mustbesubmittedby": "Αυτή η προσπάθεια πρέπει να υποβληθεί από {{$a}}.",
+    "noquestions": "Καμία ερώτηση δεν έχει προστεθεί ακόμα",
+    "noreviewattempt": "Δεν επιτρέπεται να επανεξετάσετε αυτήν την προσπάθεια.",
+    "notyetgraded": "Δεν έχει βαθμολογηθεί ακόμη",
     "opentoc": "Ανοίξτε το popover πλοήγησης.",
+    "outof": "{{$a.grade}} από ένα μέγιστο {{$a.maxgrade}}",
+    "outofpercent": "{{$a.grade}} από ένα μέγισο {{$a.maxgrade}} ({{$a.percent}}%)",
+    "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
+    "overallfeedback": "Συνολική ανάδραση",
+    "overdue": "Καθυστερημένο",
+    "preview": "Προεπισκόπηση",
+    "previewquiznow": "Προεπισκόπηση κουίζ",
+    "question": "Ερώτηση",
+    "reattemptquiz": "Επαναπροσπάθεια του κουίζ",
+    "requirepasswordmessage": "Για να συμπληρώσετε αυτό το κουίζ πρέπει να γνωρίζετε το κωδικό του",
+    "returnattempt": "Επιστροφή στην προσπάθεια",
+    "review": "Αναθεώρηση",
+    "reviewofattempt": "αναθεώρηση προσπάθειας {{$a}}",
+    "reviewofpreview": "Ανασκόπηση της προεπισκόπησης",
+    "showall": "Εμφάνιση όλων των ερωτήσεων σε μία σελίδα",
+    "showeachpage": "Προβολή μία σελίδα την φορά",
+    "startedon": "Ξεκίνησε στις",
+    "stateabandoned": "Δεν έχει υποβληθεί",
+    "statefinished": "Ολοκληρωμένο",
+    "statefinisheddetails": "Υποβλήθηκε {{$a}}",
+    "stateoverduedetails": "Πρέπει να υποβληθεί μέχρι {{$a}}",
+    "status": "Κατάσταση",
+    "submitallandfinish": "Υποβολή όλων και τέλος",
+    "summaryofattempt": "Περίληψη προσπάθειας",
+    "summaryofattempts": "Περίληψη προηγούμενων προσπαθειών",
+    "timeleft": "Υπολειπόμενος χρόνος",
+    "timetaken": "Χρόνος που χρειάστηκε",
     "warningattemptfinished": "Η προσπάθεια εκτός σύνδεσης απορρίφθηκε διότι είτε δεν βρέθηκε, είτε έχει ολοκληρωθεί στο site.",
     "warningdatadiscarded": "Μερικές απαντήσεις εκτός σύνδεσης απορρίφθηκαν διότι οι ερωτήσεις είχαν τροποποιηθεί online.",
-    "warningdatadiscardedfromfinished": "Η προσπάθεια δεν ολοκληρώθηκε διότι κάποιες απαντήσεις απορρίφθηκαν. Παρακαλώ ελέγξτε τις απαντήσεις και υποβάλετε εκ νέου την προσπάθεια."
+    "warningdatadiscardedfromfinished": "Η προσπάθεια δεν ολοκληρώθηκε διότι κάποιες απαντήσεις απορρίφθηκαν. Παρακαλώ ελέγξτε τις απαντήσεις και υποβάλετε εκ νέου την προσπάθεια.",
+    "yourfinalgradeis": "Ο τελικός σας βαθμός γι' αυτό το κουίζ είναι {{$a}}"
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/eu.json b/www/addons/mod/quiz/lang/eu.json
index 9f998c85437..a09d62d8049 100644
--- a/www/addons/mod/quiz/lang/eu.json
+++ b/www/addons/mod/quiz/lang/eu.json
@@ -64,7 +64,7 @@
     "stateabandoned": "Bidali gabeak",
     "statefinished": "Amaitutakoak",
     "statefinisheddetails": "{{$a}} bidali da",
-    "stateinprogress": "Egiten ari direnak",
+    "stateinprogress": "Ari da",
     "stateoverdue": "Atzeratutakoak",
     "stateoverduedetails": "{{$a}}-(e)k bidali behar du.",
     "status": "Egoera",
diff --git a/www/addons/mod/quiz/lang/he.json b/www/addons/mod/quiz/lang/he.json
index f8d863f8dc5..ca948e5453b 100644
--- a/www/addons/mod/quiz/lang/he.json
+++ b/www/addons/mod/quiz/lang/he.json
@@ -23,7 +23,7 @@
     "noquestions": "בשלב זה, יש להוסיף שאלות לבוחן על מנת שאפשר יהיה להציג אותו בפני התלמידים",
     "noreviewattempt": "אין הרשאה לצפות בנסיון מענה זה",
     "notyetgraded": "לא ניתן ציון עדיין",
-    "outof": "{{$a.grade}} מתוך מקסימום של {{$a.maxgrade}}",
+    "outof": "{{$a.grade}} מתוך ציון מירבי של {{$a.maxgrade}}",
     "outofpercent": "{{$a.grade}}  מתוך הציון המירבי  {{$a.maxgrade}}({{$a.percent}}%)",
     "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
     "overallfeedback": "הערכה מילולית מסכמת לבוחן",
diff --git a/www/addons/mod/quiz/lang/lt.json b/www/addons/mod/quiz/lang/lt.json
index 24b025cb691..3d18000f600 100644
--- a/www/addons/mod/quiz/lang/lt.json
+++ b/www/addons/mod/quiz/lang/lt.json
@@ -1,7 +1,20 @@
 {
+    "attemptfirst": "Pirmasis bandymas",
+    "attemptlast": "Paskutinis bandymas",
+    "attemptnumber": "Bandymas",
+    "attemptquiznow": "Bandyti testą dabar",
+    "attemptstate": "Būsena",
     "cannotsubmitquizdueto": "Testas negali būti pateiktas dėl šių priežasčių:",
+    "comment": "Komentaras",
+    "completedon": "Baigta",
+    "confirmclose": "Pateikę bandymą, savo atsakymų keisti nebegalėsite.",
     "confirmcontinueoffline": "Bandymas nesinchronizuojamas nuo {{$a}}. Jeigu mėginsite per kitą įrenginį, duomenys bus prarasti.",
     "confirmleavequizonerror": "Klaida išsaugant atsakymus. Ar norite išeiti iš testo?",
+    "confirmstart": "Testas turi {{$a}} laiko limitą. Kai pasirinksite Pradėti, laikas pradedamas skaičiuoti  ir turite pateikti savo sprendimą iki laiko pabaigos. Ar tikrai norite pradėti dabar?",
+    "confirmstartheader": "Laiko apribojimas testui",
+    "connectionerror": "Tinklo ryšys prarastas. (Automatiškai neišsaugota).\n\nPasižymėkite per paskutines kelias minutes įvestus atsakymus šiame puslapyje, tada bandykite dar kartą prisijungti.\n\nKai ryšys bus atkurtas, Jūsų atsakymai turi būti išsaugojami ir šis pranešimas pranyks.",
+    "continueattemptquiz": "Tęsti paskutinį bandymą",
+    "continuepreview": "Tęsti paskutinę peržiūrą",
     "errorbehaviournotsupported": "Negalima pildyti testo, nes programėlė nesupranta veiksmų:",
     "errordownloading": "Klaida siunčiant privalomus duomenis.",
     "errorgetattempt": "Klaida gaunant bandymo duomenis.",
@@ -13,10 +26,54 @@
     "errorsaveattempt": "Klaida saugant duomenis.",
     "errorsyncquiz": "Klaida sinchronizuojant. Pamėginkite vėliau.",
     "errorsyncquizblocked": "Testo negalima sinchronizuoti dėl vykstančių procesų. Mėginkite vėliau. Jei nepavyks, perkraukite programėlę.",
+    "feedback": "Atsiliepimas",
+    "finishattemptdots": "Baigti bandymą...",
     "finishnotsynced": "Baigta, bet nesinchronizuota",
+    "grade": "Įvertis",
+    "gradeaverage": "Vidutinis įvertis",
+    "gradehighest": "Aukščiausias įvertis",
+    "grademethod": "Vertinimo metodas",
+    "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Neprijungti duomenys teste turi būti sinchronizuojami.",
+    "marks": "Balai",
+    "mustbesubmittedby": "Atsakymą turi pateikti {{$a}}.",
+    "noquestions": "Dar neįtraukta jokių klausimų",
+    "noreviewattempt": "Jūs negalite peržiūrėti šio bandymo.",
+    "notyetgraded": "Dar neįvertinta",
     "opentoc": "Atidaryti naršymo skirtuką.",
+    "outof": "{{$a.grade}} iš maks. {{$a.maxgrade}}",
+    "outofpercent": "{{$a.grade}} iš maks. {{$a.maxgrade}} ({{$a.percent}}%)",
+    "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
+    "overallfeedback": "Bendras atsiliepimas",
+    "overdue": "Uždelstas",
+    "preview": "Peržiūra",
+    "previewquiznow": "Peržiūrėti testą dabar",
+    "question": "Klausimas",
+    "quizpassword": "Testo slaptažodis",
+    "reattemptquiz": "Dar kartą bandyti testą",
+    "requirepasswordmessage": "Norint išmėginti testą, reikalingas slaptažodis",
+    "returnattempt": "Grįžti atgal",
+    "review": "Peržiūrėti",
+    "reviewofattempt": "Bandymo {{$a}} peržiūra",
+    "reviewofpreview": "Peržiūros peržiūra",
+    "showall": "Rodyti visus klausimus viename puslapyje",
+    "showeachpage": "Tuo pat metu rodyti tik vieną puslapį",
+    "startattempt": "Pradėti bandymą",
+    "startedon": "Pradėta",
+    "stateabandoned": "Dar nepateikta",
+    "statefinished": "Baigta",
+    "statefinisheddetails": "Registruota {{$a}}",
+    "stateinprogress": "Nebaigta",
+    "stateoverdue": "Pavėluotas",
+    "stateoverduedetails": "Turi būti pateiktas {{$a}}",
+    "status": "Būsena",
+    "submitallandfinish": "Pateikti viską ir baigti",
+    "summaryofattempt": "Bandymo suvestinė",
+    "summaryofattempts": "Ankstesnių bandymų suvestinė",
+    "timeleft": "Likęs laikas",
+    "timetaken": "Sugaišta laiko",
     "warningattemptfinished": "Bandymas neprisijungus atmestas nes buvo baigtas arba neaptiktas.",
     "warningdatadiscarded": "Atsakymai suformuluoti neprisijungus buvo atmesti, nes klausimai formuoti prisijungus.",
-    "warningdatadiscardedfromfinished": "Bandymas nebaigtas dėl atmestų atsakymų. Prašome juos peržiūrėti ir bandyti dar kartą."
+    "warningdatadiscardedfromfinished": "Bandymas nebaigtas dėl atmestų atsakymų. Prašome juos peržiūrėti ir bandyti dar kartą.",
+    "yourfinalgradeis": "Jūsų galutinis šio testo įvertis yra {{$a}}."
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/pt-br.json b/www/addons/mod/quiz/lang/pt-br.json
index 9b4ba58be52..d7a242a292f 100644
--- a/www/addons/mod/quiz/lang/pt-br.json
+++ b/www/addons/mod/quiz/lang/pt-br.json
@@ -10,6 +10,8 @@
     "confirmclose": "Uma vez enviada, você não poderá alterar as respostas para esta tentativa.",
     "confirmcontinueoffline": "A tentativa não foi sincronizada desde {{$a}}. Se você continuou essa tentativa em outro dispositivo desde então, você poderá perder dados.",
     "confirmleavequizonerror": "Ocorreu um erro ao salvar as respostas. Você tem certeza que quer sair do questionário?",
+    "confirmstart": "O questionário tem um limite de tempo de {{$a}}. O cronómetro começará a contar a partir do momento em que iniciar a tentativa e deverá submetê-la antes do tempo acabar. Tem certeza que quer iniciar a tentativa agora?",
+    "confirmstartheader": "Questionário com limite de tempo",
     "connectionerror": "Conexão de rede perdida. (Salvamento automático falhou). Anote quaisquer respostas registradas nesta página nos últimos minutos e tente conectar-se novamente. Quando a conexão for restabelecida, suas respostas devem ser salvas e esta mensagem irá desaparecer.",
     "continueattemptquiz": "Continuar a última tentativa",
     "continuepreview": "Continuar a última prévia",
diff --git a/www/addons/mod/scorm/lang/ca.json b/www/addons/mod/scorm/lang/ca.json
index a5a5ddadc0d..196c9ad1c08 100644
--- a/www/addons/mod/scorm/lang/ca.json
+++ b/www/addons/mod/scorm/lang/ca.json
@@ -32,7 +32,6 @@
     "highestattempt": "Intent més alt",
     "incomplete": "Incomplet",
     "lastattempt": "Darrer intent completat",
-    "lastsync": "Darrera sincronització",
     "mode": "Mode",
     "newattempt": "Comença un nou intent",
     "noattemptsallowed": "Nombre d'intents permesos",
diff --git a/www/addons/mod/scorm/lang/cs.json b/www/addons/mod/scorm/lang/cs.json
index e69a107f5c0..533ab1989ac 100644
--- a/www/addons/mod/scorm/lang/cs.json
+++ b/www/addons/mod/scorm/lang/cs.json
@@ -32,7 +32,6 @@
     "highestattempt": "Nejlepší pokus",
     "incomplete": "Nedokončeno",
     "lastattempt": "Poslední pokus",
-    "lastsync": "Poslední synchronizace",
     "mode": "Režim",
     "newattempt": "Začít nový pokus",
     "noattemptsallowed": "Počet povolených pokusů",
diff --git a/www/addons/mod/scorm/lang/da.json b/www/addons/mod/scorm/lang/da.json
index 8350d1e752d..b87612d58d4 100644
--- a/www/addons/mod/scorm/lang/da.json
+++ b/www/addons/mod/scorm/lang/da.json
@@ -32,7 +32,6 @@
     "highestattempt": "Højeste forsøg",
     "incomplete": "Ukomplet",
     "lastattempt": "Sidste fuldførte forsøg",
-    "lastsync": "Sidste synkronisering",
     "mode": "Tilstand",
     "newattempt": "Prøv et nyt forsøg",
     "noattemptsallowed": "Antal tilladte forsøg",
diff --git a/www/addons/mod/scorm/lang/de.json b/www/addons/mod/scorm/lang/de.json
index 3c08cd38a20..f9c2cd8d027 100644
--- a/www/addons/mod/scorm/lang/de.json
+++ b/www/addons/mod/scorm/lang/de.json
@@ -32,7 +32,6 @@
     "highestattempt": "Bester Versuch",
     "incomplete": "Unvollständig",
     "lastattempt": "Letzter vollständiger Versuch",
-    "lastsync": "Letztes Synchronisieren",
     "mode": "Einstellung",
     "newattempt": "Neuen Versuch beginnen",
     "noattemptsallowed": "Zahl zulässiger Versuche",
diff --git a/www/addons/mod/scorm/lang/el.json b/www/addons/mod/scorm/lang/el.json
index 0bdf6eb8514..a819301fbee 100644
--- a/www/addons/mod/scorm/lang/el.json
+++ b/www/addons/mod/scorm/lang/el.json
@@ -1,6 +1,16 @@
 {
+    "asset": "Στοιχείο",
+    "assetlaunched": "Στοιχείο - Προβλήθηκε",
+    "attempts": "Προσπάθειες",
+    "averageattempt": "Μέσος όρος προσπαθειών",
+    "browse": "Προεπισκόπιση",
+    "browsed": "Προβλήθηκε",
+    "browsemode": "Φάση Προεπισκόπισης",
     "cannotcalculategrade": "Ο βαθμός δεν μπόρεσε να υπολογιστεί.",
+    "completed": "Ολοκληρωμένο",
+    "contents": "Περιεχόμενα",
     "dataattemptshown": "Αυτά τα δεδομένα ανήκουν στην προσπάθεια με αριθμό {{number}}.",
+    "enter": "Είσοδος",
     "errorcreateofflineattempt": "Παρουσιάστηκε σφάλμα κατά τη εκκίνηση μιας νέας προσπάθειας εκτός σύνδεσης. Παρακαλώ προσπαθείστε ξανά.",
     "errordownloadscorm": "Σφάλμα κατά τη λήψη SCORM: \"{{name}}\".",
     "errorgetscorm": "Σφάλμα κατά τη λήψη δεδομένων SCORM.",
@@ -9,10 +19,32 @@
     "errornovalidsco": "Αυτό το SCORM δεν έχει ορατό SCO για να φορτώσει.",
     "errorpackagefile": "Λυπούμαστε, η εφαρμογή υποστηρίζει μόνο ZIP packages.",
     "errorsyncscorm": "Παρουσιάστηκε σφάλμα κατά το συγχρονισμό. Παρακαλώ προσπαθείστε ξανά.",
-    "lastsync": "Τελευταίος συγχρονισμός",
+    "exceededmaxattempts": "Έχετε φτάσει το όριο του επιτρεπόμενου αριθμού προσπαθειών.",
+    "failed": "Απέτυχε",
+    "firstattempt": "Πρώτη προσπάθεια",
+    "gradeaverage": "Μέσος βαθμός",
+    "gradeforattempt": "Βαθμός προσπάθειας",
+    "gradehighest": "Υψηλότερος βαθμός",
+    "grademethod": "Μέθοδος βαθμολόγησης",
+    "gradereported": "Βαθμολογία",
+    "gradescoes": "Μαθησιακά αντικείμενα",
+    "gradesum": "Άθροισμα βαθμού",
+    "highestattempt": "Υψηλότερη βαθμολογία",
+    "incomplete": "Μη ολοκληρωμένο",
+    "lastattempt": "Τελευταία προσπάθεια",
+    "mode": "Φάση",
+    "newattempt": "Έναρξη νέας προσπάθειας",
+    "noattemptsallowed": "Επιτρεπόμενος αριθμός προσπαθειών",
+    "noattemptsmade": "Αριθμός προσπαθειών που κάνατε",
+    "normal": "Κανονικό",
+    "notattempted": "Δεν δοκιμάστηκε",
     "offlineattemptnote": "Αυτή η προσπάθεια έχει στοιχεία που δεν έχουν συγχρονιστεί.",
     "offlineattemptovermax": "Αυτή η προσπάθεια δεν μπορεί να σταλεί, γιατί έχετε ξεπεράσει το μέγιστο αριθμό προσπαθειών.",
+    "organizations": "Οργανισμοί",
+    "passed": "Πέρασε",
+    "reviewmode": "Φάση ανασκόπησης",
     "scormstatusnotdownloaded": "Αυτό το SCORM δεν έχει κατέβει. Θα κατέβει αυτόματα όταν το ανοίξετε.",
     "scormstatusoutdated": "Αυτό το SCORM έχει τροποποιηθεί από την τελευταία λήψη. Θα κατέβει αυτόματα όταν το ανοίξετε.",
+    "suspended": "Αναστέλλεται",
     "warningsynconlineincomplete": "Κάποιες προσπάθειες δεν μπόρεσαν να συγχρονιστούν με το site διότι η τελευταία online προσπάθεια δεν έχει ολοκληρωθεί. Παρακαλώ τελειώστε την online προσπάθεια πρώτα."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/es-mx.json b/www/addons/mod/scorm/lang/es-mx.json
index 0975f01dfc7..2c72808a5b1 100644
--- a/www/addons/mod/scorm/lang/es-mx.json
+++ b/www/addons/mod/scorm/lang/es-mx.json
@@ -32,7 +32,6 @@
     "highestattempt": "Intento más alto",
     "incomplete": "Incompleto",
     "lastattempt": "Último intento",
-    "lastsync": "Ultima sincronización",
     "mode": "Moda",
     "newattempt": "Comenzar un nuevo intento",
     "noattemptsallowed": "Número de intentos permitidos",
diff --git a/www/addons/mod/scorm/lang/es.json b/www/addons/mod/scorm/lang/es.json
index 83baeb100e5..518b5cf6da7 100644
--- a/www/addons/mod/scorm/lang/es.json
+++ b/www/addons/mod/scorm/lang/es.json
@@ -32,7 +32,6 @@
     "highestattempt": "Intento más alto",
     "incomplete": "Incompleto",
     "lastattempt": "Último intento",
-    "lastsync": "Última sincronización",
     "mode": "Moda",
     "newattempt": "Comenzar un nuevo intento",
     "noattemptsallowed": "Número de intentos permitidos",
diff --git a/www/addons/mod/scorm/lang/eu.json b/www/addons/mod/scorm/lang/eu.json
index f595303bee9..d6315ef6681 100644
--- a/www/addons/mod/scorm/lang/eu.json
+++ b/www/addons/mod/scorm/lang/eu.json
@@ -32,7 +32,6 @@
     "highestattempt": "Saiakera altuena",
     "incomplete": "Osatu gabea",
     "lastattempt": "Osatutako azken saiakera",
-    "lastsync": "Azken sinkronizazioa",
     "mode": "Modua",
     "newattempt": "Saiakera berria hasi",
     "noattemptsallowed": "Baimendutako saiakera-kopurua",
diff --git a/www/addons/mod/scorm/lang/fr.json b/www/addons/mod/scorm/lang/fr.json
index 8dbfe8172ba..5798f9a67eb 100644
--- a/www/addons/mod/scorm/lang/fr.json
+++ b/www/addons/mod/scorm/lang/fr.json
@@ -32,7 +32,6 @@
     "highestattempt": "Meilleure tentative",
     "incomplete": "Incomplet",
     "lastattempt": "Dernière tentative terminée",
-    "lastsync": "Dernière synchronisation",
     "mode": "Mode",
     "newattempt": "Commencer une nouvelle tentative",
     "noattemptsallowed": "Nombre de tentatives permises",
diff --git a/www/addons/mod/scorm/lang/it.json b/www/addons/mod/scorm/lang/it.json
index c5f5df6f781..8556f3bf7ab 100644
--- a/www/addons/mod/scorm/lang/it.json
+++ b/www/addons/mod/scorm/lang/it.json
@@ -32,7 +32,6 @@
     "highestattempt": "Tentativo migliore",
     "incomplete": "Incompleto",
     "lastattempt": "Ultimo tentativo completato",
-    "lastsync": "Sincronizzazione più recente",
     "mode": "Modalità",
     "newattempt": "Avvia un nuovo tentativo",
     "noattemptsallowed": "Numero di tentativi consentito",
diff --git a/www/addons/mod/scorm/lang/lt.json b/www/addons/mod/scorm/lang/lt.json
index 00b67bc41c2..5ff4711bf91 100644
--- a/www/addons/mod/scorm/lang/lt.json
+++ b/www/addons/mod/scorm/lang/lt.json
@@ -1,6 +1,16 @@
 {
+    "asset": "Turtas",
+    "assetlaunched": "Turtas – peržiūrėta",
+    "attempts": "Bandymai",
+    "averageattempt": "Vidutiniškai bandymų",
+    "browse": "Peržiūra",
+    "browsed": "Naršyta",
+    "browsemode": "Peržiūros režimas",
     "cannotcalculategrade": "Negalima suskaičiuoti įvertinimo.",
+    "completed": "Užbaigta",
+    "contents": "Turinys",
     "dataattemptshown": "Duomenys priklausom bandymui Nr. {{number}}.",
+    "enter": "Įvesti",
     "errorcreateofflineattempt": "Klaida bandant pildyti neprisijungus. Bandykite dar kartą.",
     "errordownloadscorm": "Klaida siunčiant SCORM: \"{{name}}\".",
     "errorgetscorm": "Klaida gaunant SCORM duomenis.",
@@ -9,11 +19,33 @@
     "errornovalidsco": "SCORM neturi matomo SCO įkelti.",
     "errorpackagefile": "Atsiprašome, palaikomi tik ZIP paketai.",
     "errorsyncscorm": "Klaida sinchronizuojant. Pabandykite dar kartą.",
-    "lastsync": "Paskutinė sinchronizacija",
+    "exceededmaxattempts": "Pasiekėte didžiausią leistiną bandymų skaičių.",
+    "failed": "Nepavyko",
+    "firstattempt": "Pirmasis bandymas",
+    "gradeaverage": "Vidutinis įvertis",
+    "gradeforattempt": "Bandymo įvertis",
+    "gradehighest": "Aukščiausias įvertis",
+    "grademethod": "Vertinimo metodas",
+    "gradereported": "Įvertis užregistruotas",
+    "gradescoes": "Mokymosi objektai",
+    "gradesum": "Įverčių suma",
+    "highestattempt": "Aukščiausiai įvertintas bandymas",
+    "incomplete": "Neužbaigta",
+    "lastattempt": "Paskutinis bandymas",
+    "mode": "Režimas",
+    "newattempt": "Pradėti naują bandymą",
+    "noattemptsallowed": "Leidžiamų bandymų skaičius",
+    "noattemptsmade": "Išnaudotų bandymų skaičius",
+    "normal": "Įprasta",
+    "notattempted": "Nebandyta",
     "offlineattemptnote": "Yra nesinchronizuotų duomenų.",
     "offlineattemptovermax": "Bandymas nepatvirtintas, nes viršytas jų limitas.",
+    "organizations": "Organizacijos",
+    "passed": "Pavyko",
+    "reviewmode": "Peržiūros režimas",
     "scormstatusnotdownloaded": "SCORM neatsiųsta. Programa automatiškai atsisiųs ją atidarius.",
     "scormstatusoutdated": "SCORM pakeista nuo paskutiniojo atsisiuntimo. Programa automatiškai atsisiųs ją atidarius.",
+    "suspended": "Sulaikyta",
     "warningofflinedatadeleted": "Kai kurie neprijungti  bandymo {{number}} duomenys  buvo ištrinti, nes jie negalėjo būti perkelti į naują bandymą.",
     "warningsynconlineincomplete": "Kaikurie bandymai negali būti sinchronizuoti su svetaine dėl to, kad paskutiniai prisijungimo duomenys nebuvo pabaigti. Prašome pabaigti."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/nl.json b/www/addons/mod/scorm/lang/nl.json
index f9339060c67..0a418c7071f 100644
--- a/www/addons/mod/scorm/lang/nl.json
+++ b/www/addons/mod/scorm/lang/nl.json
@@ -32,7 +32,6 @@
     "highestattempt": "Beste poging",
     "incomplete": "Onvolledig",
     "lastattempt": "Laatste voltooide poging",
-    "lastsync": "Laatste synchronisatie",
     "mode": "Modus",
     "newattempt": "Begin een nieuwe poging",
     "noattemptsallowed": "Aantal toegelaten pogingen",
diff --git a/www/addons/mod/scorm/lang/pt-br.json b/www/addons/mod/scorm/lang/pt-br.json
index 31fc512e9df..458dcebee2a 100644
--- a/www/addons/mod/scorm/lang/pt-br.json
+++ b/www/addons/mod/scorm/lang/pt-br.json
@@ -32,7 +32,6 @@
     "highestattempt": "Tentativa mais alta",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa",
-    "lastsync": "Última sincronização",
     "mode": "Modalidade",
     "newattempt": "Começar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
diff --git a/www/addons/mod/scorm/lang/pt.json b/www/addons/mod/scorm/lang/pt.json
index 1486e4694ea..b3539194c48 100644
--- a/www/addons/mod/scorm/lang/pt.json
+++ b/www/addons/mod/scorm/lang/pt.json
@@ -32,7 +32,6 @@
     "highestattempt": "Tentativa com melhor nota",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa concluída",
-    "lastsync": "Última sincronização",
     "mode": "Modo",
     "newattempt": "Iniciar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
diff --git a/www/addons/mod/scorm/lang/ro.json b/www/addons/mod/scorm/lang/ro.json
index d8aa28568ff..24087ff80da 100644
--- a/www/addons/mod/scorm/lang/ro.json
+++ b/www/addons/mod/scorm/lang/ro.json
@@ -30,7 +30,6 @@
     "highestattempt": "Cea mai completă încercare de parcurgere",
     "incomplete": "Incomplet",
     "lastattempt": "Ultima încercare de parcurgere",
-    "lastsync": "Ultima sincronizare",
     "mode": "Mod",
     "newattempt": "Începe o nouă încercare de parcurgere",
     "noattemptsallowed": "Numărul de încercări permise",
diff --git a/www/addons/mod/scorm/lang/ru.json b/www/addons/mod/scorm/lang/ru.json
index 5141addd010..1c3222e4045 100644
--- a/www/addons/mod/scorm/lang/ru.json
+++ b/www/addons/mod/scorm/lang/ru.json
@@ -17,7 +17,7 @@
     "gradehighest": "Высшая оценка",
     "grademethod": "Метод оценивания",
     "gradereported": "Оценка передана",
-    "gradescoes": "Обучающие объекты",
+    "gradescoes": "Объекты обучения",
     "gradesum": "Суммарная оценка",
     "highestattempt": "Лучшая попытка",
     "incomplete": "Не завершено",
diff --git a/www/addons/mod/scorm/lang/sv.json b/www/addons/mod/scorm/lang/sv.json
index 39178a38f12..6cbde1646b4 100644
--- a/www/addons/mod/scorm/lang/sv.json
+++ b/www/addons/mod/scorm/lang/sv.json
@@ -32,7 +32,6 @@
     "highestattempt": "Högsta försöket",
     "incomplete": "Inte komplett",
     "lastattempt": "Senaste försöket",
-    "lastsync": "Senaste synkronisering",
     "mode": "Läge",
     "newattempt": "Påbörja ett nytt försök",
     "noattemptsallowed": "Antal tillåtna försök",
diff --git a/www/addons/mod/scorm/lang/tr.json b/www/addons/mod/scorm/lang/tr.json
index f27a342aa68..244c50c5460 100644
--- a/www/addons/mod/scorm/lang/tr.json
+++ b/www/addons/mod/scorm/lang/tr.json
@@ -22,7 +22,6 @@
     "highestattempt": "En yüksek uygulama",
     "incomplete": "Tamamlanmadı",
     "lastattempt": "Son uygulama",
-    "lastsync": "Son senkronizasyon",
     "mode": "Mod",
     "newattempt": "Yeni bir uygulama başlat",
     "noattemptsallowed": "İzin verilen uygulama sayısı",
diff --git a/www/addons/mod/scorm/lang/zh-tw.json b/www/addons/mod/scorm/lang/zh-tw.json
index f2d8044e8c4..ec476e126b9 100644
--- a/www/addons/mod/scorm/lang/zh-tw.json
+++ b/www/addons/mod/scorm/lang/zh-tw.json
@@ -32,7 +32,6 @@
     "highestattempt": "最高使用次數",
     "incomplete": "不完整",
     "lastattempt": "最後完成的作答次",
-    "lastsync": "最後的同步",
     "mode": "模式",
     "newattempt": "開始新的使用",
     "noattemptsallowed": "允許作答的次數",
diff --git a/www/addons/mod/survey/lang/el.json b/www/addons/mod/survey/lang/el.json
index 6da26455dd3..a2778ccf897 100644
--- a/www/addons/mod/survey/lang/el.json
+++ b/www/addons/mod/survey/lang/el.json
@@ -1,5 +1,9 @@
 {
     "cannotsubmitsurvey": "Λυπούμαστε, υπήρξε πρόβλημα υποβολής της έρευνας. Παρακαλώ δοκιμάστε ξανά.",
     "errorgetsurvey": "Σφάλμα κατά τη λήψη των δεδομένων της έρευνας.",
-    "results": "Αποτελέσματα"
+    "ifoundthat": "Ανακάλυψα ότι",
+    "ipreferthat": "Προτιμώ το ότι",
+    "responses": "Απαντήσεις",
+    "results": "Αποτελέσματα",
+    "surveycompletednograph": "Έχετε ολοκληρώσει αυτή την έρευνα."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/es.json b/www/addons/mod/survey/lang/es.json
index d843246d67c..e8ce6c8504e 100644
--- a/www/addons/mod/survey/lang/es.json
+++ b/www/addons/mod/survey/lang/es.json
@@ -4,5 +4,6 @@
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
     "responses": "Respuestas",
-    "results": "Resultados"
+    "results": "Resultados",
+    "surveycompletednograph": "Has completado esta encuesta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/lt.json b/www/addons/mod/survey/lang/lt.json
index 544e43a2140..60d0f53eb7b 100644
--- a/www/addons/mod/survey/lang/lt.json
+++ b/www/addons/mod/survey/lang/lt.json
@@ -1,5 +1,9 @@
 {
     "cannotsubmitsurvey": "Iškilo problema teikiant apklausą. Pabandykite dar kartą.",
     "errorgetsurvey": "Klaida gaunant apklausos duomenis.",
-    "results": "Rezultatai"
+    "ifoundthat": "Sužinojau",
+    "ipreferthat": "Teikiu pirmenybę",
+    "responses": "Atsakymai",
+    "results": "Rezultatai",
+    "surveycompletednograph": "Jūs baigėte šią apklausą."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/el.json b/www/addons/mod/wiki/lang/el.json
index adc9b68c475..801399e1135 100644
--- a/www/addons/mod/wiki/lang/el.json
+++ b/www/addons/mod/wiki/lang/el.json
@@ -2,6 +2,7 @@
     "errorloadingpage": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της σελίδας.",
     "errornowikiavailable": "Αυτό το wiki δεν έχει ακόμα περιεχόμενο.",
     "gowikihome": "Go Wiki home",
+    "notingroup": "Συγνώμη, αλλά θα πρέπει να είστε μέλος μιας ομάδας για να δείτε αυτήν τη δραστηριότητα",
     "page": "Σελίδα",
     "subwiki": "Subwiki",
     "titleshouldnotbeempty": "Ο τίτλος δεν πρέπει να είναι κενός",
diff --git a/www/addons/mod/wiki/lang/lt.json b/www/addons/mod/wiki/lang/lt.json
index e8e42c3ee97..52f7834015f 100644
--- a/www/addons/mod/wiki/lang/lt.json
+++ b/www/addons/mod/wiki/lang/lt.json
@@ -1,10 +1,21 @@
 {
+    "cannoteditpage": "Jūs negalite redaguoti šio puslapio.",
+    "createpage": "Kurti puslapį",
+    "editingpage": "Redaguojamas puslapis '{{$a}}",
     "errorloadingpage": "Klaida užkraunant puslapį.",
     "errornowikiavailable": "Nėra Wiki turinio.",
     "gowikihome": "Eiti į Wiki",
+    "map": "Susieti",
+    "newpagehdr": "Naujas puslapis",
+    "newpagetitle": "Naujo puslapio pavadinimas",
+    "nocontent": "Nėra šio puslapio turinio",
+    "notingroup": "Nėra grupėje",
     "page": "Puslapis",
+    "pageexists": "Šis puslapis jau yra.",
+    "pagename": "Puslapio pavadinimas",
     "subwiki": "Subwiki",
     "titleshouldnotbeempty": "Pavadinimo eilutė neturi būti tuščia",
     "viewpage": "Peržiūrėti puslapį",
-    "wikipage": "Wiki puslapis"
+    "wikipage": "Wiki puslapis",
+    "wrongversionlock": "Jums redaguojant kitas naudotojas redagavo šį puslapį, taigi jūsų turinys nebegalioja."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/pl.json b/www/addons/mod/wiki/lang/pl.json
index dd4c7ae0cda..8515710e26a 100644
--- a/www/addons/mod/wiki/lang/pl.json
+++ b/www/addons/mod/wiki/lang/pl.json
@@ -4,7 +4,7 @@
     "editingpage": "Edycja strony: '{{$a}}'",
     "map": "Mapa stron",
     "newpagehdr": "Nowa strona",
-    "newpagetitle": "Nowy tytuł strony",
+    "newpagetitle": "Tytuł nowej strony",
     "nocontent": "Brak zawartości dla tej strony",
     "notingroup": "Nie w grupie",
     "page": "Strona",
diff --git a/www/addons/myoverview/lang/ar.json b/www/addons/myoverview/lang/ar.json
new file mode 100644
index 00000000000..c4082746d18
--- /dev/null
+++ b/www/addons/myoverview/lang/ar.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "قيد التنفيذ",
+    "nocourses": "لا يوجد معلومات لمقرر دراسي ليتم اظهرها",
+    "pluginname": "محادثة"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/bg.json b/www/addons/myoverview/lang/bg.json
new file mode 100644
index 00000000000..04ad26a4050
--- /dev/null
+++ b/www/addons/myoverview/lang/bg.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Не е приключен",
+    "nocourses": "Няма информация за курса, която да бъде показана.",
+    "pluginname": "Чат"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/ca.json b/www/addons/myoverview/lang/ca.json
new file mode 100644
index 00000000000..6f57cd536b3
--- /dev/null
+++ b/www/addons/myoverview/lang/ca.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "En curs",
+    "nocourses": "No hi ha informació de cursos per mostrar.",
+    "pluginname": "Nom del connector de repositori"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/cs.json b/www/addons/myoverview/lang/cs.json
new file mode 100644
index 00000000000..c09c509e2a5
--- /dev/null
+++ b/www/addons/myoverview/lang/cs.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Probíhá",
+    "nocourses": "Žádné dostupné informace o kurzech",
+    "pluginname": "Název repozitáře"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/da.json b/www/addons/myoverview/lang/da.json
new file mode 100644
index 00000000000..6b0e076a3e8
--- /dev/null
+++ b/www/addons/myoverview/lang/da.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Igangværende",
+    "nocourses": "Du er ikke tilmeldt nogen kurser.",
+    "pluginname": "Navn på filarkiv-plugin"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/de.json b/www/addons/myoverview/lang/de.json
new file mode 100644
index 00000000000..a8ecb7e9d63
--- /dev/null
+++ b/www/addons/myoverview/lang/de.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "In Bearbeitung",
+    "nocourses": "Keine Kursinformationen",
+    "pluginname": "Name des Plugins"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/el.json b/www/addons/myoverview/lang/el.json
new file mode 100644
index 00000000000..081a9939eec
--- /dev/null
+++ b/www/addons/myoverview/lang/el.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Σε εξέλιξη",
+    "nocourses": "Δεν υπάρχει πληροφορία του μαθήματος για προβολή.",
+    "pluginname": "Όνομα πρόσθετης λειτουργίας χώρου αποθήκευσης"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/es-mx.json b/www/addons/myoverview/lang/es-mx.json
new file mode 100644
index 00000000000..779472c9cfd
--- /dev/null
+++ b/www/addons/myoverview/lang/es-mx.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "En curso",
+    "nocourses": "No hay información del curso para mostrar.",
+    "pluginname": "Nombre del plugin del repositorio"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/es.json b/www/addons/myoverview/lang/es.json
new file mode 100644
index 00000000000..e3cd26f006e
--- /dev/null
+++ b/www/addons/myoverview/lang/es.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "En curso",
+    "nocourses": "No hay información del curso para mostrar.",
+    "pluginname": "Nombre de la extensión de repositorio"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/eu.json b/www/addons/myoverview/lang/eu.json
new file mode 100644
index 00000000000..a63a4669460
--- /dev/null
+++ b/www/addons/myoverview/lang/eu.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Ari da",
+    "nocourses": "Ez dago ikastaroei buruzko informaziorik",
+    "pluginname": "Biltegi-pluginaren izena"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/fa.json b/www/addons/myoverview/lang/fa.json
new file mode 100644
index 00000000000..5f4efdadc1a
--- /dev/null
+++ b/www/addons/myoverview/lang/fa.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "در جریان",
+    "nocourses": "هیچ درسی برای نمایش وجود ندارد",
+    "pluginname": "نام پلاگین انباره"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/fr.json b/www/addons/myoverview/lang/fr.json
new file mode 100644
index 00000000000..f80d60d9cde
--- /dev/null
+++ b/www/addons/myoverview/lang/fr.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "En cours",
+    "nocourses": "Aucune information de cours à afficher.",
+    "pluginname": "Nom du plugin de dépôt"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/he.json b/www/addons/myoverview/lang/he.json
new file mode 100644
index 00000000000..b7b635566d9
--- /dev/null
+++ b/www/addons/myoverview/lang/he.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "בתהליך",
+    "nocourses": "אין מידע שניתן להציג על הקורס",
+    "pluginname": "שם תוסף המאגר"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/hu.json b/www/addons/myoverview/lang/hu.json
new file mode 100644
index 00000000000..19022b6c99a
--- /dev/null
+++ b/www/addons/myoverview/lang/hu.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Folyamatban",
+    "nocourses": "Nincs megjelenítendő kurzusinformáció.",
+    "pluginname": "Az adattár-segédprogram neve"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/it.json b/www/addons/myoverview/lang/it.json
new file mode 100644
index 00000000000..79fb59b2a1b
--- /dev/null
+++ b/www/addons/myoverview/lang/it.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "In corso",
+    "nocourses": "Non sono presenti informazioni sui corsi.",
+    "pluginname": "Nome plugin repository"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/ja.json b/www/addons/myoverview/lang/ja.json
new file mode 100644
index 00000000000..636c78e5c2e
--- /dev/null
+++ b/www/addons/myoverview/lang/ja.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "進行中",
+    "nocourses": "表示するコース情報はありません。",
+    "pluginname": "リポジトリプラグイン名"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/lt.json b/www/addons/myoverview/lang/lt.json
new file mode 100644
index 00000000000..cba79f81ce3
--- /dev/null
+++ b/www/addons/myoverview/lang/lt.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Nebaigta",
+    "nocourses": "Nėra rodytinos kursų informacijos",
+    "pluginname": "Saugyklos priedo pavadinimas"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/nl.json b/www/addons/myoverview/lang/nl.json
new file mode 100644
index 00000000000..a62672827d5
--- /dev/null
+++ b/www/addons/myoverview/lang/nl.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Bezig",
+    "nocourses": "Geen cursusinformatie",
+    "pluginname": "Opslagruimte plugin naam"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/pl.json b/www/addons/myoverview/lang/pl.json
new file mode 100644
index 00000000000..08052becbb2
--- /dev/null
+++ b/www/addons/myoverview/lang/pl.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "W toku",
+    "nocourses": "Nie ma informacji do pokazania",
+    "pluginname": "Nazwa wtyczki repozytorium"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/pt-br.json b/www/addons/myoverview/lang/pt-br.json
new file mode 100644
index 00000000000..c02df1adb37
--- /dev/null
+++ b/www/addons/myoverview/lang/pt-br.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Em andamento",
+    "nocourses": "Nenhuma informação disponível sobre o curso.",
+    "pluginname": "Nome do plugin de repositório"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/pt.json b/www/addons/myoverview/lang/pt.json
new file mode 100644
index 00000000000..b019a3830aa
--- /dev/null
+++ b/www/addons/myoverview/lang/pt.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Em progresso",
+    "nocourses": "Sem informação das suas disciplinas para mostrar.",
+    "pluginname": "Nome do módulo de repositório"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/ro.json b/www/addons/myoverview/lang/ro.json
new file mode 100644
index 00000000000..b243bf6fd1e
--- /dev/null
+++ b/www/addons/myoverview/lang/ro.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "În curs",
+    "nocourses": "Nicio informație legată de cursuri este disponibilă",
+    "pluginname": "Numele plugin-ului depozitului"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/ru.json b/www/addons/myoverview/lang/ru.json
new file mode 100644
index 00000000000..fbfa8f8a870
--- /dev/null
+++ b/www/addons/myoverview/lang/ru.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "В процессе",
+    "nocourses": "Нет информации для отображения.",
+    "pluginname": "Имя плагина хранилища"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/sv.json b/www/addons/myoverview/lang/sv.json
new file mode 100644
index 00000000000..977e7631d0d
--- /dev/null
+++ b/www/addons/myoverview/lang/sv.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Pågår",
+    "nocourses": "Det finns ingen kursinformation att visa.",
+    "pluginname": "Namn  på plugin-program för arkiv"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/tr.json b/www/addons/myoverview/lang/tr.json
new file mode 100644
index 00000000000..6e243db824e
--- /dev/null
+++ b/www/addons/myoverview/lang/tr.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "Devam ediyor",
+    "nocourses": "Gösterilecek ders bilgisi yok",
+    "pluginname": "Depo eklenti adı"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/zh-cn.json b/www/addons/myoverview/lang/zh-cn.json
new file mode 100644
index 00000000000..ce98820d486
--- /dev/null
+++ b/www/addons/myoverview/lang/zh-cn.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "处理中",
+    "nocourses": "没有可显示的课程信息。",
+    "pluginname": "容器插件名"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/zh-tw.json b/www/addons/myoverview/lang/zh-tw.json
new file mode 100644
index 00000000000..63e62e180e2
--- /dev/null
+++ b/www/addons/myoverview/lang/zh-tw.json
@@ -0,0 +1,5 @@
+{
+    "inprogress": "處理中",
+    "nocourses": "沒有課程資訊可以顯示",
+    "pluginname": "倉儲外掛套件名稱"
+}
\ No newline at end of file
diff --git a/www/addons/notifications/lang/he.json b/www/addons/notifications/lang/he.json
index 54d5f85b575..1c1591b94ed 100644
--- a/www/addons/notifications/lang/he.json
+++ b/www/addons/notifications/lang/he.json
@@ -1,5 +1,6 @@
 {
     "errorgetnotifications": "שגיאה בטעינת התראות",
+    "notificationpreferences": "העדפות הודעות",
     "notifications": "התראות",
     "therearentnotificationsyet": "אין התראות"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/tr.json b/www/addons/notifications/lang/tr.json
index 8d73f1eb17c..25c482d24c4 100644
--- a/www/addons/notifications/lang/tr.json
+++ b/www/addons/notifications/lang/tr.json
@@ -1,4 +1,5 @@
 {
+    "notificationpreferences": "Bildirim tercihleri",
     "notifications": "Bildirimler",
     "therearentnotificationsyet": "Hiç bildiriminiz yok"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ar.json b/www/core/components/course/lang/ar.json
index 2f38128e6f9..ab7fafab59b 100644
--- a/www/core/components/course/lang/ar.json
+++ b/www/core/components/course/lang/ar.json
@@ -3,5 +3,6 @@
     "contents": "المحتويات",
     "couldnotloadsections": "لم يتم تحميل كل الأقسام، من فضلك حاول مرة أخرى لاحقاَ",
     "errordownloadingsection": "خطأ عن تنزيل الأقسام",
+    "hiddenfromstudents": "مخفي عن الطلاب",
     "showall": "عرض الكل"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/bg.json b/www/core/components/course/lang/bg.json
index 9a34b5a4985..370471981b9 100644
--- a/www/core/components/course/lang/bg.json
+++ b/www/core/components/course/lang/bg.json
@@ -3,8 +3,7 @@
     "contents": "Съдържание",
     "couldnotloadsectioncontent": "Неуспех при зареждането на съдържанието на секцията, моля опитайте пак по-късно.",
     "couldnotloadsections": "Неуспех при зареждането на секциите, моля опитайте отново.",
-    "gotothesite": "Отиди към сайта.",
+    "hiddenfromstudents": "Скрит от ученици",
     "nocontentavailable": "В момента няма достъпно съдържание.",
-    "showall": "Показване на всичко",
-    "whoops": "Опс!"
+    "showall": "Показване на всичко"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index 44c5e25fc28..4d5f44fc1cc 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "La vostra organització ha desactivat aquesta activitat a l'app mòbil.",
-    "activitynotyetviewable": "Aquesta activitat encara no es pot visualitzar a l'aplicació.",
-    "activitynotyetviewablegothere": "Aquest tipus d'activitat o recurs encara no està disponible per ser visualitzat des de l'aplicació, cliqueu al botó de més avall per accedir-hi des del web.",
     "activitynotyetviewableinapp": "Estem treballant per donar suport a l'activitat {{$a}}.",
     "activitynotyetviewableremoteaddon": "La vostra organització ha instal·lat un complement que encara no és compatible amb l'aplicació.",
     "activitynotyetviewablesiteupgradeneeded": "El Moodle de la vostra organització necessita una actualització.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Contacteu l'administrador del lloc i digueu-li que voleu fer servir aquesta activitat a Moodle Mobile.",
     "confirmdeletemodulefiles": "Confirmeu que voleu eliminar els fitxers d'aquest mòdul?",
     "confirmdownload": "Esteu a punt de descarregar {{size}}. Segur que voleu continuar?",
-    "confirmdownloadsection": "Esteu a punt de descarregar {{size}}. Segur que voleu continuar?",
     "confirmdownloadunknownsize": "No es pot calcular la mida de la descàrrega. Segur que voleu continuar?",
     "confirmpartialdownloadsize": "Ara descarregareu {{size}} <strong>com a mínim</strong>. Confirmeu que voleu continuar?",
     "contents": "Continguts",
@@ -17,10 +14,9 @@
     "couldnotloadsections": "No s'ha pogut carregar les seccions, si us plau, torneu-ho a provar més tard.",
     "errordownloadingsection": "S'ha produït un error en descarregar la secció.",
     "errorgetmodule": "S'ha produït un error en recuperar les dades del mòdul.",
-    "gotothesite": "Vés al web",
+    "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
     "showall": "Mostra-ho tot",
-    "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu.",
-    "whoops": "Renoi!"
+    "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index 4a9a94eda6f..06ae9ba3925 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Tato činnost ještě není v aplikaci zobrazitelná.",
-    "activitynotyetviewablegothere": "Tato činnost nebo zdroj ještě není v aplikaci zobrazitelná, pro přístup z webu klikněte na tlačítko dole.",
     "activitynotyetviewableinapp": "Pracujeme na úpravě aktivity {{$a}}.",
     "activitynotyetviewableremoteaddon": "Tato aktivita je doplněk třetí strany, který ještě není aplikací podporován.",
     "activitynotyetviewablesiteupgradeneeded": "Instalace Moodle vaší organizace je třeba aktualizovat.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Obraťte se na správce webu a řekněte mu, že tuto činnost chcete používat s mobilní Moodle  aplikací.",
     "confirmdeletemodulefiles": "Jste si jisti, že chcete odstranit tyto soubory modulu?",
     "confirmdownload": "Chystáte se stahovat {{velikost}}. Jste si jisti, že chcete pokračovat?",
-    "confirmdownloadsection": "Chystáte se stahovat {{velikost}}. Jste si jisti, že chcete pokračovat?",
     "confirmdownloadunknownsize": "Nebyli jsme schopni vypočítat velikost stahování. Jste si jisti, že stahování chcete?",
     "confirmpartialdownloadsize": "Chystáte se stáhnout <strong> alespoň </strong> {{size}}. Jste si jisti, že chcete pokračovat?",
     "contents": "Obsah",
@@ -16,10 +13,9 @@
     "couldnotloadsections": "Nelze načíst sekce, zkuste to prosím později.",
     "errordownloadingsection": "Chyba při stahování sekce.",
     "errorgetmodule": "Chyba při načítání",
-    "gotothesite": "Přejít na stránky",
+    "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
     "showall": "Zobrazit vše",
-    "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení.",
-    "whoops": "Jejda!"
+    "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/da.json b/www/core/components/course/lang/da.json
index 9bcb0c343e9..9242ee4ca2d 100644
--- a/www/core/components/course/lang/da.json
+++ b/www/core/components/course/lang/da.json
@@ -1,17 +1,13 @@
 {
-    "activitynotyetviewable": "Denne aktivitet kan endnu ikke vises i app'en.",
-    "activitynotyetviewablegothere": "Denne aktivitet eller ressource er det endnu ikke muligt at vise i denne app, klik på knappen herunder for at åbne fra webstedet.",
     "allsections": "Alle sektioner",
     "confirmdownload": "Du er ved at hente {{size}}. Er du sikker på at du vil fortsætte?",
-    "confirmdownloadsection": "Du er ved at hente {{size}}. Er du sikker på at du vil fortsætte?",
     "confirmdownloadunknownsize": "Vi kunne ikke beregne størrelsen af dit download. Er du sikker på du vil hende det?",
     "contents": "Indhold",
     "couldnotloadsectioncontent": "Kunne ikke indlæse sektionens indhold, prøv igen senere.",
     "couldnotloadsections": "Kunne ikke indlæse sektionerne, prøv igen senere.",
     "errordownloadingsection": "Fejl ved indlæsning af sektion.",
-    "gotothesite": "Gå til webstedet",
+    "hiddenfromstudents": "Skjult for studerende",
     "nocontentavailable": "Intet indhold tilgængeligt lige nu.",
     "overriddennotice": "Din endelige karakter fra denne aktivitet blev justeret manuelt.",
-    "showall": "Vis alt",
-    "whoops": "Hovsa!"
+    "showall": "Vis alt"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index dd4ffb180b6..31844262b57 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Für diese Website ist die Aktivität in der App deaktiviert.",
-    "activitynotyetviewable": "Diese Aktivität kann bisher nicht in der App angezeigt werden.",
-    "activitynotyetviewablegothere": "Die Aktivität oder das Material kann bisher in der App nicht angezeigt werden. Tippen Sie auf die Taste, um die Website im Browser anzuzeigen.",
     "activitynotyetviewableinapp": "Wir arbeiten daran, die Aktivität {{$a}} zu unterstützen.",
     "activitynotyetviewableremoteaddon": "Für die Website ist ein Plugin installiert, das bisher nicht unterstützt wird.",
     "activitynotyetviewablesiteupgradeneeded": "Diese Website muss aktualisiert werden.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Wenden Sie sich an den Administrator der Website, um diese Aktivität mit der Moodle Mobile App verwenden zu können.",
     "confirmdeletemodulefiles": "Möchten Sie diese Dateien wirklich löschen?",
     "confirmdownload": "Möchten Sie wirklich {{size}} herunterladen?",
-    "confirmdownloadsection": "Möchten Sie wirklich {{size}} herunterladen?",
     "confirmdownloadunknownsize": "Die Datenmenge kann nicht berechnet werden. Möchten Sie wirklich herunterladen?",
     "confirmpartialdownloadsize": "Möchten Sie wirklich {{size}} herunterladen?",
     "contents": "Inhalte",
@@ -17,10 +14,9 @@
     "couldnotloadsections": "Die Abschnitte konnten nicht geladen werden. Versuchen Sie es später noch einmal.",
     "errordownloadingsection": "Fehler beim Herunterladen des Abschnitts",
     "errorgetmodule": "Fehler beim Laden von Moduldaten",
-    "gotothesite": "Zur Website",
+    "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
     "nocontentavailable": "Aktuell sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
     "showall": "Alles anzeigen",
-    "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden.",
-    "whoops": "Whoops!"
+    "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index b4db167c4b3..5882734e565 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Δεν μπορείτε να δείτε αυτή τη δραστηριότητα στην εφαρμογή ακόμα.",
-    "activitynotyetviewablegothere": "Δεν μπορείτε να δείτε αυτή τη δραστηριότητα/πόρο στην εφαρμογή ακόμα, κάντε κλικ στο παρακάτω κουμπί για να την προσπελάσετε από το site.",
     "activitynotyetviewableinapp": "Εργαζόμαστε για την υποστήριξη της δραστηριότητας {{$a}} .",
     "activitynotyetviewableremoteaddon": "Ο οργανισμός σας εγκατέστησε ένα plugin που δεν υποστηρίζεται ακόμη.",
     "activitynotyetviewablesiteupgradeneeded": "Η πλατφόρμα Moodle του οργανισμού σας πρέπει να αναβαθμιστεί.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Επικοινωνήστε με το διαχειριστή του site για να πείτε ότι θέλετε να χρησιμοποιήσετε αυτή τη δραστηριότητα με την εφαρμογή του Moodle για κινητά.",
     "confirmdeletemodulefiles": "Είστε σίγουροι ότι θέλετε να διαγράψετε τα αρχεία αυτής της ενότητας;",
     "confirmdownload": "Πρόκειται να κατεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
-    "confirmdownloadsection": "Πρόκειται να κατεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "confirmdownloadunknownsize": "Δεν κατέστη δυνατό να υπολογιστεί το μέγεθος των αρχείων που θέλετε να κατεβάσετε. Είστε σίγουροι ότι θέλετε να τα κατεβάσετε;",
     "confirmpartialdownloadsize": "Πρόκειται να κατεβάσετε <strong>τουλάχιστον</strong> {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "contents": "Περιεχόμενα",
@@ -16,8 +13,8 @@
     "couldnotloadsections": "Δεν ήταν δυνατή η φόρτωση αυτής της ενότητας, δοκιμάστε ξανά αργότερα.",
     "errordownloadingsection": "Σφάλμα λήψης ενότητας",
     "errorgetmodule": "Σφάλμα κατά τη λήψη των δεδομένων της ενότητας.",
-    "gotothesite": "Πηγαίνετε στο site.",
+    "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
-    "showall": "Προβολή όλων",
-    "whoops": "Whoops!"
+    "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
+    "showall": "Προβολή όλων"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index f883ef2def1..1745ce4e20a 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Su  organización ha deshabilitado esta actividad en la App mobile.",
-    "activitynotyetviewable": "Esta actividad aun no es visible en la App.",
-    "activitynotyetviewablegothere": "Esta actividad o recurso todavía no es visible en la app. Haga click en el botón inferior para acceder a ella desde el sitio.",
     "activitynotyetviewableinapp": "Nosotros estamos trabajando para soportar la actividad de {{$a}}.",
     "activitynotyetviewableremoteaddon": "Su organización instaló un plugin complemento de terceros que todavía no está soportada por la App.",
     "activitynotyetviewablesiteupgradeneeded": "La instalación Moodle de su organización necesita actualizarse.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Contacte al administrador del sitio y dígale que Usted quiere usar esta actividad junto con la App Moodle Mobile.",
     "confirmdeletemodulefiles": "¿Está Usted seguro de querer eliminar estos archivos del módulo?",
     "confirmdownload": "Usted está a punto de descargar {{size}}. ¿Está Usted seguro de querer continuar?",
-    "confirmdownloadsection": "Usted está a punto de descargar {{size}}. ¿Está seguro de querer continuar?",
     "confirmdownloadunknownsize": "No pudimos calcular el tamaño de la descarga. ¿Está Usted seguro de querer descargarla?",
     "confirmpartialdownloadsize": "Usted está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está Usted seguro de querer continuar?",
     "contents": "Contenidos",
@@ -17,10 +14,9 @@
     "couldnotloadsections": "No pudieron cargarse las secciones; por favor inténtelo nuevamente después.",
     "errordownloadingsection": "Error al descargar sección",
     "errorgetmodule": "Error al obtener datos del módulo.",
-    "gotothesite": "Ir al sitio",
+    "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
     "showall": "Mostrar todo",
-    "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo.",
-    "whoops": "¡Órale!"
+    "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es.json b/www/core/components/course/lang/es.json
index 98fc48f43c3..40087d97665 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Este tipo de actividad o recurso todavía no esta disponible para su visualización en la app.",
-    "activitynotyetviewablegothere": "Este tipo de actividad o recurso todavía no esta disponible para su visualización en la app, haga clic en el botón de abajo para acceder desde la web.",
     "activitynotyetviewableinapp": "Estamos trabajando para soportar la actividad de {{$a}}.",
     "activitynotyetviewableremoteaddon": "Esta actividad es un complemento de terceros que todavía no está soportada por la aplicación.",
     "activitynotyetviewablesiteupgradeneeded": "El sitio no está usando la versión más reciente de Moodle. Por favor, contacte al administrador del sitio.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Contacte al administrador del sitio e indíquele que desea poder usar esta actividad en la aplicación.",
     "confirmdeletemodulefiles": "¿Está seguro de querer eliminar estos archivos del módulo?",
     "confirmdownload": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
-    "confirmdownloadsection": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
     "confirmdownloadunknownsize": "No se puede calcular el tamaño de la descarga. ¿Está seguro que quiere descargarlo?",
     "confirmpartialdownloadsize": "Está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está seguro de querer continuar?",
     "contents": "Contenidos",
@@ -16,10 +13,9 @@
     "couldnotloadsections": "No se ha podido cargar las secciones, por favor inténtelo más tarde.",
     "errordownloadingsection": "Error durante la descarga de la sección.",
     "errorgetmodule": "Se ha producido un error recuperando los datos del módulo.",
-    "gotothesite": "Ir al sitio",
+    "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "No hay contenido disponible en este momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
     "showall": "Mostrar todo",
-    "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo.",
-    "whoops": "¡Vaya!"
+    "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/eu.json b/www/core/components/course/lang/eu.json
index be07e382284..c42572550ec 100644
--- a/www/core/components/course/lang/eu.json
+++ b/www/core/components/course/lang/eu.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Zure erakundeak jarduera hau mobile app-an desgaitu du.",
-    "activitynotyetviewable": "Jarduera hau oraindik ezin da app-ean ikusi.",
-    "activitynotyetviewablegothere": "Jarduera edo baliabide hau oraindik ezin da app-ean ikusi, sakatu beheko botoia gunearen bidez sartzeko.",
     "activitynotyetviewableinapp": "{{$a}} jarduera onartzeko lanean ari gara.",
     "activitynotyetviewableremoteaddon": "Zure erakundeak oraindik app-ean onartzen ez den gehigarri bat instalatuta dauka..",
     "activitynotyetviewablesiteupgradeneeded": "Zure erakundeko Moodle instalazioak eguneraketa bat behar du.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Jarri harremanetan zure guneko kudeatzailearekin eta esaiozu jarduera hau Moodle Mobile app-an erabili nahi duzula.",
     "confirmdeletemodulefiles": "Ziur zaude modulu honetako fitxategiak ezabatu nahi dituzula?",
     "confirmdownload": "{{size}} jaistear zaude. Ziur al zaude aurrera egin nahi duzula?",
-    "confirmdownloadsection": "{{size}} deskargatzera zoaz. Ziur zaude jarraitu nahi duzula?",
     "confirmdownloadunknownsize": "Ezin izan dugu deskargaren tamaina kalkulatu. Ziur zaude jaitsi nahi duzula?",
     "confirmpartialdownloadsize": "<strong>Gutxienez</strong> {{size}} jaistera zoaz. Ziur zaude jarraitu nahi duzula?",
     "contents": "Edukiak",
@@ -17,10 +14,9 @@
     "couldnotloadsections": "Ezin izan dira atalak kargatu, saiatu beranduago mesedez.",
     "errordownloadingsection": "Errorea atala jaistean.",
     "errorgetmodule": "Errorea moduluaren datuak eskuratzean.",
-    "gotothesite": "Joan gunera",
+    "hiddenfromstudents": "Ezkutuan ikasleentzat",
     "nocontentavailable": "Ez dago edukirik eskuragarri momentu honetan.",
     "overriddennotice": "Jarduera honetako zure azken kalifikazioa eskuz egokitu da.",
     "showall": "Erakutsi denak",
-    "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu.",
-    "whoops": "Ups!"
+    "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index 9118ed3c7f8..57ee2b7a639 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -1,4 +1,5 @@
 {
     "contents": "محتوی",
+    "hiddenfromstudents": "پنهان از شاگردان",
     "showall": "نمایش همه"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index 8eca75c1292..fa5ca9f7fb7 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Votre institution a désactivé cette activité dans l'App mobile.",
-    "activitynotyetviewable": "Cette activité n'est pas encore accessible via l'app.",
-    "activitynotyetviewablegothere": "Cette activité ou ressource n'est pas encore accessible via l'app ; cliquer sur le bouton ci-dessous pour y accéder sur la plateforme.",
     "activitynotyetviewableinapp": "L'activité {{$a}} sera bientôt supportée.",
     "activitynotyetviewableremoteaddon": "Votre institution a installé un plugin qui n'est pas encore supporté.",
     "activitynotyetviewablesiteupgradeneeded": "L'installation Moodle de votre institution doit être mise à jour.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Veuillez contacter l'administrateur de la plateforme et l'informer que vous désirez utiliser cette activité avec l'app mobile Moodle.",
     "confirmdeletemodulefiles": "Voulez-vous vraiment supprimer ces fichiers de module ?",
     "confirmdownload": "Vous allez télécharger {{size}}. Voulez-vous vraiment continuer ?",
-    "confirmdownloadsection": "Vous allez télécharger {{size}}. Voulez-vous vraiment continuer ?",
     "confirmdownloadunknownsize": "Il n'a pas été possible de calculer la taille du téléchargement. Voulez-vous vraiment effectuer le téléchargement ?",
     "confirmpartialdownloadsize": "Vous allez télécharger <strong>au moins</strong> {{size}}. Voulez-vous vraiment continuer ?",
     "contents": "Contenus",
@@ -17,10 +14,9 @@
     "couldnotloadsections": "Impossible de charger les sections. Veuillez essayer plus tard.",
     "errordownloadingsection": "Erreur lors du téléchargement de la section.",
     "errorgetmodule": "Erreur lors de l'obtention des données du module.",
-    "gotothesite": "Aller sur la plateforme",
+    "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
     "showall": "Tout afficher",
-    "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil.",
-    "whoops": "Oups !"
+    "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/he.json b/www/core/components/course/lang/he.json
index 0b1a7413b94..1789a2e476e 100644
--- a/www/core/components/course/lang/he.json
+++ b/www/core/components/course/lang/he.json
@@ -1,13 +1,10 @@
 {
-    "activitynotyetviewable": "פעילות או משאב זה עדיין לא ניתנים לצפיה ביישומון.",
-    "activitynotyetviewablegothere": "פעילות או משאב זה עדיין לא ניתנים לצפיה ביישומון, יש להקליק על הכפתור למטה לגישה מהאתר.",
     "allsections": "כל יחידות ההוראה",
     "contents": "תוכן",
     "couldnotloadsectioncontent": "אין אפשרות לטעון ולהציג את תוכן יחידת ההוראה. יש לנסות שוב מאוחר יותר.",
     "couldnotloadsections": "אין אפשרות לטעון ולהציג את יחידות ההוראה, יש לנסות שוב מאוחר יותר.",
-    "gotothesite": "צפיה בעזרת האתר",
+    "hiddenfromstudents": "מוסתר בפני סטודנטים",
     "nocontentavailable": "אין תוכן זמין כרגע.",
     "overriddennotice": "הציון הסופי שלך מפעילות זו הותאם ידנית.",
-    "showall": "הראה הכל",
-    "whoops": "אוווווופס!"
+    "showall": "הראה הכל"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/hu.json b/www/core/components/course/lang/hu.json
index d5333fcfee1..f838946af02 100644
--- a/www/core/components/course/lang/hu.json
+++ b/www/core/components/course/lang/hu.json
@@ -1,5 +1,6 @@
 {
     "contents": "Tartalomjegyzék",
+    "hiddenfromstudents": "Tanulók elől rejtve",
     "overriddennotice": "A tevékenységgel kapcsolatos végső pontja kézzel módosítva lett.",
     "showall": "Mind látszik"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index 6d576b378e3..2f6968177c8 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -1,17 +1,13 @@
 {
-    "activitynotyetviewable": "Questa attività o risorsa non è visualizzabile nell'app.",
-    "activitynotyetviewablegothere": "Questa attività o risorsa non è visualizzabile nell'app, fai click sul pulsante sotto per accedervi tramite browser.",
     "allsections": "Tutte le sezioni",
     "confirmdownload": "Stai per scaricare {{size}}. Vuoi continuare?",
-    "confirmdownloadsection": "Stai per scaricare {{size}}. Vuoi continuare?",
     "confirmdownloadunknownsize": "Non è stato possibile calcolare la dimensione del download. Vuoi scaricare lo stesso?",
     "contents": "Contenuti",
     "couldnotloadsectioncontent": "Non è stato possibile caricare il contenuto della sezione, per favore riprova più tardi.",
     "couldnotloadsections": "Non è stato possibile caricare le sezioni, per favore riprova più tardi.",
     "errordownloadingsection": "Si è verificato un errore durante lo scaricamento della sezione.",
-    "gotothesite": "Vai al sito",
+    "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutto",
-    "whoops": "Oops!"
+    "showall": "Visualizza tutto"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ja.json b/www/core/components/course/lang/ja.json
index 8deacff6591..2059fb9fb13 100644
--- a/www/core/components/course/lang/ja.json
+++ b/www/core/components/course/lang/ja.json
@@ -1,6 +1,7 @@
 {
     "allsections": "全てのセクション",
     "contents": "コンテンツ",
+    "hiddenfromstudents": "学生から非表示",
     "overriddennotice": "この活動に関するあなたの評点は手動で調整されました。",
     "showall": "すべて表示"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/lt.json b/www/core/components/course/lang/lt.json
index 97a9991badf..d348b5e7c7f 100644
--- a/www/core/components/course/lang/lt.json
+++ b/www/core/components/course/lang/lt.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Programėlė šio veiksmo  kol kas neaktlieka.",
-    "activitynotyetviewablegothere": "Šios informacijos programėlėje šiuo metu peržiūrėti negalima, jeigu norite ją peržiūrėti svetainėje, paspauskite žemiau esantį mygtuką.",
     "activitynotyetviewableinapp": "Dirbame prie {{$a}} veiklos.",
     "activitynotyetviewableremoteaddon": "Jūsų įstaiga įdiegė papildinį, kuris dar nėra palaikomas.",
     "activitynotyetviewablesiteupgradeneeded": "Jūsų įstaigos Moodle versija turi būti atnaujinta.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Susisiekite su svetainės administratoriumi, jeigu norite naudoti šią veiklą Moodle mobiliojoje programėlėje.",
     "confirmdeletemodulefiles": "Ar tikrai norite ištrinti šiuos failus?",
     "confirmdownload": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
-    "confirmdownloadsection": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
     "confirmdownloadunknownsize": "Negalima apskaičiuoti failo, kurį norite atsisiųsti, dydžio. Ar tikrai norite atsisiųsti?",
     "confirmpartialdownloadsize": "Norite atsisiųsti <strong>mažiausiai</strong> {{size}}. Ar tikrai norite tęsti?",
     "contents": "Turiniai",
@@ -16,9 +13,9 @@
     "couldnotloadsections": "Negalima užkrauti pasirinkto turinio, prašome pamėginti vėliau.",
     "errordownloadingsection": "Klaida atsisiunčiant.",
     "errorgetmodule": "Klaida gaunant kurso duomenis.",
-    "gotothesite": "Eikite į svetainę",
+    "hiddenfromstudents": "Paslėpta nuo besimokančiųjų",
     "nocontentavailable": "Turinys šiuo metu nepasiekiamas.",
+    "overriddennotice": "Šios veiklos galutinis įvertis buvo koreguotas rankiniu būdu.",
     "showall": "Rodyti visus",
-    "useactivityonbrowser": "Galite naudoti savo naršyklėje.",
-    "whoops": "Oi!"
+    "useactivityonbrowser": "Galite naudoti savo naršyklėje."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index f9cfbbe4b23..514559c815e 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Deze activiteit of bron kan nog niet bekeken worden met deze app.",
-    "activitynotyetviewablegothere": "Deze activiteit of bron kan nog niet bekeken worden met deze app. Klik op onderstaande knop om het te bekijken op de site.",
     "activitynotyetviewableinapp": "We werken aan de ondersteuning van de activiteit {{$a}}.",
     "activitynotyetviewableremoteaddon": "Jouw organisatie heeft een plugin geïnstalleerd die nog niet ondersteund wordt.",
     "activitynotyetviewablesiteupgradeneeded": "De site gebruikt de niet laatste Moodle-versie en moet worden geüpdatet. Neem contact op met de site-beheerder.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Neem contact op met de sitebeheerder en geef aan dat je deze activiteit met de Moodle mobile app wilt gebruiken.",
     "confirmdeletemodulefiles": "Weet he zeker dat je deze modulebestanden wil verwijderen?",
     "confirmdownload": "Je gaat {{size}} downloaden. Weet je zeker dat je verder wil gaan?",
-    "confirmdownloadsection": "Je gaat {{size}} downloaden. Weet je zeker dat je verder wil gaan?",
     "confirmdownloadunknownsize": "We konden de grootte van de download niet berekenen. Weet je zeker dat je toch wil downloaden?",
     "confirmpartialdownloadsize": "Je staat op het punt om <strong>minstens</strong> {{size}} te downloaden. Weet je zeker dat je verder wil gaan?",
     "contents": "Inhoud",
@@ -16,10 +13,9 @@
     "couldnotloadsections": "Kon secties niet laden. Probeer later opnieuw",
     "errordownloadingsection": "Fout bij het downloaden van de sectie.",
     "errorgetmodule": "Fout bij het ophalen van modulegegevens.",
-    "gotothesite": "Ga naar de site",
+    "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
     "showall": "Toon alle",
-    "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken",
-    "whoops": "Whoops!"
+    "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pl.json b/www/core/components/course/lang/pl.json
index b9a6e8524c9..ef88c6b604a 100644
--- a/www/core/components/course/lang/pl.json
+++ b/www/core/components/course/lang/pl.json
@@ -1,5 +1,6 @@
 {
     "contents": "Treść",
+    "hiddenfromstudents": "Ukryte przed studentami",
     "overriddennotice": "Twoja ocena końcowa z tej aktywności została ręcznie zmieniona",
     "showall": "Pokaż wszystko"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index 22803ed283c..792d0ea5f83 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Essa atividade ainda não é visualizável nesse aplicativo.",
-    "activitynotyetviewablegothere": "Essa atividade ou recurso ainda não é visualizável nesse aplicativo, clique no botão abaixo para acessar isso pelo site.",
     "activitynotyetviewableinapp": "Estamos trabalhando para dar suporte a atividade {{$a}}.",
     "activitynotyetviewableremoteaddon": "Sua organização instalou um plugin que não é suportado ainda.",
     "activitynotyetviewablesiteupgradeneeded": "O Moodle de sua organização precisa ser atualizado.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Contate o administrador do site e diga que você deseja usar essa atividade no aplicativo Moodle Mobile.",
     "confirmdeletemodulefiles": "Você tem certeza que quer excluir esse modulo arquivos?",
     "confirmdownload": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
-    "confirmdownloadsection": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
     "confirmdownloadunknownsize": "Não fomos capazes de calcular o tamanho do download. Tem certeza de que deseja fazer o download?",
     "confirmpartialdownloadsize": "Você está prestes a baixar <strong>pelo menos</strong> {{size}}. Você tem certeza que quer continuar?",
     "contents": "Conteúdos",
@@ -16,10 +13,9 @@
     "couldnotloadsections": "Não foi possível carregar a seção, por favor tente mais tarde.",
     "errordownloadingsection": "Erro ao baixar seção.",
     "errorgetmodule": "Erro ao obter os dados do módulo.",
-    "gotothesite": "Ir para o site",
+    "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
     "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente",
     "showall": "Mostrar todos",
-    "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo",
-    "whoops": "Opa!!!"
+    "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt.json b/www/core/components/course/lang/pt.json
index e5da326cf01..7ac9f081fbd 100644
--- a/www/core/components/course/lang/pt.json
+++ b/www/core/components/course/lang/pt.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "A sua organização desativou esta atividade na aplicação para dispositivos móveis.",
-    "activitynotyetviewable": "Esta atividade ainda não é visível na aplicação.",
-    "activitynotyetviewablegothere": "Não é possível visualizar esta atividade ou recurso nesta aplicação, clique no botão abaixo para aceder aos conteúdos a partir do site.",
     "activitynotyetviewableinapp": "Estamos trabalhar no suporte para a atividade {{$a}}.",
     "activitynotyetviewableremoteaddon": "A sua organização instalou um módulo que ainda não é suportado.",
     "activitynotyetviewablesiteupgradeneeded": "A instalação do Moodle da sua organização precisa ser atualizada.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Entre em contacto com o administrador do site e diga-lhes que pretende usar essa atividade com a aplicação móvel Moodle.",
     "confirmdeletemodulefiles": "Tem certeza de que pretende apagar os ficheiros deste módulo?",
     "confirmdownload": "Está prestes a descarregar {{size}}. Tem a certeza que pretende continuar?",
-    "confirmdownloadsection": "Está prestes a descarregar {{size}}. Tem a certeza que pretende continuar?",
     "confirmdownloadunknownsize": "Não foi possível calcular o tamanho da transferência. Tem a certeza que pretende continuar?",
     "confirmpartialdownloadsize": "Está prestes a descarregar <strong> pelo menos </strong> {{size}}. Tem a certeza que pretende continuar?",
     "contents": "Conteúdos",
@@ -17,10 +14,9 @@
     "couldnotloadsections": "Não foi possível carregar as secções, por favor tente novamente mais tarde.",
     "errordownloadingsection": "Erro ao descarregar a secção.",
     "errorgetmodule": "Erro ao obter os dados do módulo.",
-    "gotothesite": "Ir para o site",
+    "hiddenfromstudents": "Oculto para os alunos",
     "nocontentavailable": "Nenhum conteúdo disponível neste momento.",
     "overriddennotice": "A sua nota final nesta atividade foi alterada manualmente na pauta.",
     "showall": "Mostrar todos",
-    "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos.",
-    "whoops": "Ops!"
+    "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ro.json b/www/core/components/course/lang/ro.json
index c695ad2bfb3..2069aa89421 100644
--- a/www/core/components/course/lang/ro.json
+++ b/www/core/components/course/lang/ro.json
@@ -1,18 +1,14 @@
 {
-    "activitynotyetviewable": "Această activitate sau resursă nu este vizibilă în aplicație la acest moment.",
-    "activitynotyetviewablegothere": "Această activitate sau resursă nu este vizibilă în aplicație la acest moment, apăsați pe butonul de mai jos pentru a o accesa de pe site.",
     "allsections": "Toate secțiunile",
     "confirmdownload": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
-    "confirmdownloadsection": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
     "confirmdownloadunknownsize": "Nu putem calcula dimensiunea fișierului pe care doriți să îl descărcați. Sunteți sigur că doriți să descărcați?",
     "contents": "Conținut",
     "couldnotloadsectioncontent": "Nu se poate încărca conținutul acestei secțiuni, încercați mai târziu.",
     "couldnotloadsections": "Nu se pot încărca secțiunile, încercați mai târziu.",
     "errordownloadingsection": "A apărut o eroare la descărcarea secțiunii.",
     "errorgetmodule": "A apărut o eroare la preluarea modului de date.",
-    "gotothesite": "Mergeți pe site",
+    "hiddenfromstudents": "Ascuns de cursanţi",
     "nocontentavailable": "Pentru moment nu există conținut.",
     "overriddennotice": "Nota finală obţinută de dumneavoastră pentru această activitate a fost ajustată manual.",
-    "showall": "Arată tot",
-    "whoops": "Ops!"
+    "showall": "Arată tot"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index 2b1344272ab..6a0a1c3f43a 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -1,13 +1,10 @@
 {
-    "activitynotyetviewable": "Этот активный элемент или ресурс не просматривается в приложении",
-    "activitynotyetviewablegothere": "Этот активный элемент или ресурс не просматривается в приложении. Чтобы получить доступ на сайте нажмите на кнопку внизу.",
     "allsections": "Все разделы",
     "contents": "Содержание",
     "couldnotloadsectioncontent": "Не удалось загрузить содержимое раздела. Повторите попытку позже.",
     "couldnotloadsections": "Не удалось загрузить разделы, повторите попытку позже",
-    "gotothesite": "Зайти на сайт",
+    "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Показать все",
-    "whoops": "Ой!"
+    "showall": "Показать все"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index 7446dd015fd..0063575e970 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -1,18 +1,14 @@
 {
-    "activitynotyetviewable": "Denna aktivitet eller resurs kan ännu inte visas i appen.",
-    "activitynotyetviewablegothere": "Denna aktivitet eller resurs kan ännu inte visas i appen, klicka på knappen nedan för att komma åt den via ordinarie webbsidan",
     "allsections": "Alla sektioner",
     "confirmdownload": "Du är på väg att ladda ner {{size}}. Är du säker att du vill fortsätta?",
-    "confirmdownloadsection": "Du är på väg att ladda ner {{size}}. Är du säker att du vill fortsätta?",
     "confirmdownloadunknownsize": "Det gick inte att beräkna storleken på nedladdningen . Det gick inte att beräkna storleken på nedladdningen . Är du säker att du vill fortsätta och ladda ner?",
     "contents": "Innehåll",
     "couldnotloadsectioncontent": "Det gick inte att läsa sektionens innehåll. Vänligen försök igen senare.",
     "couldnotloadsections": "Det gick inte att läsa sektionen. Vänligen försök igen senare.",
     "errordownloadingsection": "Fel vid nedladdning av sektion",
     "errorgetmodule": "Fel vid hämtning av data",
-    "gotothesite": "Gå till webbplatsen",
+    "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla",
-    "whoops": "Hoppsan!"
+    "showall": "Visa alla"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/tr.json b/www/core/components/course/lang/tr.json
index f7e119dde80..027484a1cc3 100644
--- a/www/core/components/course/lang/tr.json
+++ b/www/core/components/course/lang/tr.json
@@ -1,6 +1,7 @@
 {
     "allsections": "Tüm Bölümler",
     "contents": "İçerik(ler)",
+    "hiddenfromstudents": "Öğrencilerden gizli",
     "overriddennotice": "Bu etkinlikteki final notunuz, elle ayarlandı.",
     "showall": "Tümünü göster"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-cn.json b/www/core/components/course/lang/zh-cn.json
index bdd5cf1034c..c60b61bdc0b 100644
--- a/www/core/components/course/lang/zh-cn.json
+++ b/www/core/components/course/lang/zh-cn.json
@@ -1,5 +1,6 @@
 {
     "contents": "内容",
+    "hiddenfromstudents": "对学生隐藏",
     "overriddennotice": "您在该活动中的最终成绩将自动调整。",
     "showall": "全部显示"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-tw.json b/www/core/components/course/lang/zh-tw.json
index 0a62913b961..c9c97c2ef45 100644
--- a/www/core/components/course/lang/zh-tw.json
+++ b/www/core/components/course/lang/zh-tw.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "此應用程式尚未檢視這項活動.",
-    "activitynotyetviewablegothere": "此應用程式尚未檢視這項活動或資源, 請按底下的按鈕從網站存取.",
     "activitynotyetviewableinapp": "我們正在努力支援{{$ a}}活動.",
     "activitynotyetviewableremoteaddon": "您的組織安裝了尚未支援的外掛",
     "activitynotyetviewablesiteupgradeneeded": "您的組織的Moodle安裝需要更新.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "請與網站管理員聯繫, 告知他們您要使用Moodle Mobile應用程式使用此活動.",
     "confirmdeletemodulefiles": "您確定要刪除此模組檔案嗎?",
     "confirmdownload": "您即將下載{{size}}. 您確定您要繼續嗎?",
-    "confirmdownloadsection": "您即將下載{{size}}. 您確定您要繼續嗎?",
     "confirmdownloadunknownsize": "我們無法計算下載的容量. 您確定要下載嗎?",
     "confirmpartialdownloadsize": "您即將下載<strong>至少</ strong> {{size}}. 您確定您要繼續嗎?",
     "contents": "內容",
@@ -16,10 +13,9 @@
     "couldnotloadsections": "無法載入區塊, 請稍後再試.",
     "errordownloadingsection": "載入區塊時發生錯誤",
     "errorgetmodule": "取得模組資料時出現錯誤",
-    "gotothesite": "連到網站",
+    "hiddenfromstudents": "對學生隱藏",
     "nocontentavailable": "目前無內容可使用",
     "overriddennotice": "您在這活動的最後成績是手動調整的。",
     "showall": "顯示全部",
-    "useactivityonbrowser": "你可以以瀏覽器一直使用",
-    "whoops": "糟糕!"
+    "useactivityonbrowser": "你可以以瀏覽器一直使用"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 7fc7efbde90..23289e84fb8 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -8,7 +8,6 @@
     "errorloadcourses": "Při načítání kurzů došlo k chybě.",
     "errorsearching": "Při vyhledávání došlo k chybě.",
     "errorselfenrol": "Při zápisu sebe sama došlo k chybě.",
-    "filter": "Filtr",
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index b8009ee252f..da8d01f0e52 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -1,14 +1,18 @@
 {
+    "allowguests": "Σε αυτό το μάθημα επιτρέπονται και οι επισκέπτες",
+    "availablecourses": "Διαθέσιμα μαθήματα",
+    "categories": "Κατηγορίες μαθημάτων",
     "confirmselfenrol": "Είστε σίγουροι ότι θέλετε να εγγραφείτε σε αυτό το μάθημα;",
+    "courses": "Μαθήματα",
     "enrolme": "Εγγραφή",
     "errorloadcourses": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των μαθημάτων.",
     "errorsearching": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της αναζήτησης.",
     "errorselfenrol": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της αυτο-εγγραφής.",
-    "filter": "Φίλτρο",
     "filtermycourses": "Φιλτράρισμα των μαθημάτων μου",
     "frontpage": "Αρχική σελίδα",
     "mycourses": "Τα μαθήματά μου",
     "nocourses": "Δεν υπάρχουν πληροφορίες για αυτό το μάθημα.",
+    "nocoursesyet": "Δεν υπάρχουν μαθήματα σε αυτήν την κατηγορία",
     "nosearchresults": "Δεν βρέθηκαν αποτελέσματα",
     "notenroled": "Δεν έχετε εγγραφεί σε αυτό το μάθημα",
     "notenrollable": "Δεν μπορείτε να αυτο-εγγραφείτε σε αυτό το μάθημα.",
diff --git a/www/core/components/courses/lang/it.json b/www/core/components/courses/lang/it.json
index c39e888285b..c46c10af2f5 100644
--- a/www/core/components/courses/lang/it.json
+++ b/www/core/components/courses/lang/it.json
@@ -8,7 +8,6 @@
     "errorloadcourses": "Si è verificato un errore durante il caricamento dei corsi.",
     "errorsearching": "Si è verificato un errore durante la ricerca.",
     "errorselfenrol": "Si è verificato un errore mentre ti stavi iscrivendo.",
-    "filter": "Filtro",
     "filtermycourses": "Filtra i miei corsi",
     "frontpage": "Pagina home",
     "mycourses": "I miei corsi",
diff --git a/www/core/components/courses/lang/lt.json b/www/core/components/courses/lang/lt.json
index e443308188a..cc7eb529a53 100644
--- a/www/core/components/courses/lang/lt.json
+++ b/www/core/components/courses/lang/lt.json
@@ -1,16 +1,24 @@
 {
+    "allowguests": "Į šiuos kursus leidžiama įeiti svečiui",
+    "availablecourses": "Kursai",
+    "categories": "Kursų kategorijos",
     "confirmselfenrol": "Ar Jūs tikrai norite įsirašyti į šiuos mokymo kursus?",
+    "courses": "Kursai",
     "enrolme": "Įrašyti mane",
     "errorloadcourses": "Klaida kraunant kursus.",
     "errorsearching": "Paieškos klaida.",
     "errorselfenrol": "Klaida įrašant.",
     "filtermycourses": "Filtruoti mano kursus",
     "frontpage": "Titulinis lapas",
+    "mycourses": "Mano kursai",
     "nocourses": "Nėra ką rodyti",
+    "nocoursesyet": "Nėra šios kategorijos kursų",
     "nosearchresults": "Paieškos rezultatų nėra",
     "notenroled": "Nesate įrašytas į šį kursą",
     "notenrollable": "Negalite įrašyti savęs į šį kursą.",
     "password": "Įrašymo raktas",
+    "search": "Ieškoti",
+    "searchcourses": "Ieškoti kursų",
     "searchcoursesadvice": "Jūs galite naudoti kursų paieškos mygtuką ieškant kursų su svečio prieiga arba įrašyti save į kursus, kurie yra prieinami.",
     "selfenrolment": "Savarankiška registracija",
     "totalcoursesearchresults": "Visi kursai: {{$a}}"
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index 1851efabb11..f7b7aea83fe 100644
--- a/www/core/components/courses/lang/sv.json
+++ b/www/core/components/courses/lang/sv.json
@@ -8,7 +8,6 @@
     "errorloadcourses": "Ett fel uppstod vid inläsning av kursen",
     "errorsearching": "Fel uppstod vid sökning",
     "errorselfenrol": "Fel uppstod vid registrering",
-    "filter": "Filter",
     "filtermycourses": "Filtrera mina kurser",
     "frontpage": "Ingångssidan",
     "mycourses": "Mina kurser",
diff --git a/www/core/components/grades/lang/el.json b/www/core/components/grades/lang/el.json
new file mode 100644
index 00000000000..8192b0ab2e2
--- /dev/null
+++ b/www/core/components/grades/lang/el.json
@@ -0,0 +1,15 @@
+{
+    "average": "Μέσος όρος",
+    "badgrade": "Ο βαθμός που δόθηκε δεν είναι έγκυρος",
+    "contributiontocoursetotal": "Συνεισφορά στον τελικό βαθμό",
+    "feedback": "Ανάδραση",
+    "grade": "Βαθμός",
+    "grades": "Βαθμοί",
+    "itemname": "Όνομα στοιχείου",
+    "lettergrade": "Γράμμα για βαθμό",
+    "nooutcome": "Χωρίς έκβαση",
+    "percentage": "Ποσοστό",
+    "range": "Εύρος",
+    "rank": "Κατάταξη",
+    "weight": "βαθμός βαρύτητας"
+}
\ No newline at end of file
diff --git a/www/core/components/grades/lang/fa.json b/www/core/components/grades/lang/fa.json
index 4c7c8ba46bc..8a1b93eb79e 100644
--- a/www/core/components/grades/lang/fa.json
+++ b/www/core/components/grades/lang/fa.json
@@ -5,6 +5,9 @@
     "grade": "نمره",
     "grades": "نمرات",
     "itemname": "نام مورد",
+    "lettergrade": "نمرهٔ حرفی",
     "percentage": "درصد",
-    "range": "محدوده"
+    "range": "محدوده",
+    "rank": "رتبه",
+    "weight": "وزن"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/lt.json b/www/core/components/grades/lang/lt.json
new file mode 100644
index 00000000000..80eb71c8e0b
--- /dev/null
+++ b/www/core/components/grades/lang/lt.json
@@ -0,0 +1,15 @@
+{
+    "average": "Vidurkis",
+    "badgrade": "Pateiktas netinkamas įvertis",
+    "contributiontocoursetotal": "Indėlis į kurso bendrą",
+    "feedback": "Atsiliepimas",
+    "grade": "Įvertis",
+    "grades": "Įverčiai",
+    "itemname": "Elemento pavadinimas",
+    "lettergrade": "Raidinis įvertis",
+    "nooutcome": "Rezultato nėra",
+    "percentage": "Procentai",
+    "range": "Intervalas",
+    "rank": "Rangas",
+    "weight": "Svarba"
+}
\ No newline at end of file
diff --git a/www/core/components/login/lang/ar.json b/www/core/components/login/lang/ar.json
index 156414d57e0..e58f7ef0a9d 100644
--- a/www/core/components/login/lang/ar.json
+++ b/www/core/components/login/lang/ar.json
@@ -32,6 +32,7 @@
     "policyagree": "يجب الموافقة على هذه الشروط للإستمرار في إستخدام الموقع. هل أنت موافق؟",
     "policyagreement": "شروط إتفاقية الموقع",
     "policyagreementclick": "رابط لاتفاقية سياسة الموقع",
+    "potentialidps": "هل تسجل الدخول عادة في مكان آخر قبل الوصول إلى هنا ؟<br />اختر من القائمة التالية لتسجل الدخول من مكانك المعتاد:",
     "reconnect": "إعادة الدخول",
     "selectacountry": "اختر دولة",
     "siteaddress": "عنوان الموقع",
diff --git a/www/core/components/login/lang/bg.json b/www/core/components/login/lang/bg.json
index 940cc8bb567..7972b6e59f9 100644
--- a/www/core/components/login/lang/bg.json
+++ b/www/core/components/login/lang/bg.json
@@ -16,6 +16,7 @@
     "invalidemail": "Невалиден имейл адрес",
     "invalidmoodleversion": "Невалидна версия на Moodle. Най-старата изискване версия е 2.4.",
     "invalidsite": "Интернет адресът на сайта е невалиден.",
+    "invalidurl": "URL-ът, който току що въведохте не е валиден",
     "login": "Вход",
     "loginbutton": "Вход!",
     "logininsiterequired": "Трябва да влезете в сайта през прозорец на браузър.",
@@ -32,6 +33,7 @@
     "policyagree": "Трябва да се съгласите с тези условия за ползване, за да продължите да ползвате сайта. Съгласен/на ли сте?",
     "policyagreement": "Условия за ползване на сайта",
     "policyagreementclick": "Препратка към условията за ползване на сайта",
+    "potentialidps": "Влизане с вашия профил от:",
     "reconnect": "Повторно свързване",
     "selectacountry": "Държава",
     "siteaddress": "Адрес на сайта",
diff --git a/www/core/components/login/lang/ca.json b/www/core/components/login/lang/ca.json
index 7fe23867668..c342c379d01 100644
--- a/www/core/components/login/lang/ca.json
+++ b/www/core/components/login/lang/ca.json
@@ -2,7 +2,6 @@
     "auth_email": "Autenticació basada en el correu electrònic",
     "authenticating": "Us esteu autenticant",
     "cancel": "Cancel·la",
-    "cannotdownloadfiles": "La baixada de fitxers està desactivada en el servei mòbil de Moodle, l'aplicació no pot funcionar amb aquest paràmetre desactivat. Contacteu amb l'administrador del lloc.",
     "checksiteversion": "Comproveu que el vostre lloc utilitza Moodle 2.4 o superior.",
     "confirmdeletesite": "Esteu segur que voleu eliminar el lloc {{sitename}}?",
     "connect": "Connecta",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Demaneu a l'administrador que comprovi el problema següent: {{$a}}",
     "createaccount": "Crea el meu compte",
     "createuserandpass": "Trieu un nom d'usuari i una contrasenya",
-    "credentials": "Credencials",
     "credentialsdescription": "Introduïu el vostre nom d'usuari i contrasenya per iniciar sessió.",
     "emailconfirmsent": "<p>S'ha enviat un correu a la vostra adreça <b>{{$a}}</b></p>\n<p>Conté instruccions senzilles per completar el registre.</p>\n<p>Si seguiu tenint problemes, contacteu amb l'administrador del lloc.</p>",
     "emailnotmatch": "Les adreces de correu electrònic no coincideixen",
@@ -52,6 +50,7 @@
     "policyagree": "Heu d'acceptar la normativa abans d'entrar en aquest lloc. Hi esteu d'acord?",
     "policyagreement": "Acceptació de la normativa d'ús del lloc",
     "policyagreementclick": "Enllaç a l'acceptació de la normativa d'ús del lloc",
+    "potentialidps": "Autentiqueu-vos utilitzant el vostre compte a:",
     "problemconnectingerror": "Hi ha problemes per accedir a",
     "problemconnectingerrorcontinue": "Torneu a comprovar que l'adreça sigui correcta i proveu-ho de bell nou.",
     "profileinvaliddata": "El valor no és vàlid",
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index 45296772ee0..9d8f6552859 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -2,7 +2,6 @@
     "auth_email": "Registrace na základě e-mailu",
     "authenticating": "Autentizace",
     "cancel": "Zrušit",
-    "cannotdownloadfiles": "Stahování souborů je vypnuto v mobilních službách, aplikace nebude fungovat s nastavením zakázu. Prosím, obraťte se na správce webu.",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
     "connect": "Připojit!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Požádejte správce, prosím, aby zkontroloval následující problém: {{$a}}",
     "createaccount": "Vytvořit můj nový účet",
     "createuserandpass": "Vytvořit nové uživatelské jméno a heslo pro přihlášení",
-    "credentials": "Identifikační údaje",
     "credentialsdescription": "Pro přihlášení uveďte své uživatelské jméno a heslo.",
     "emailconfirmsent": "<p>E-mail by měl být zaslán na Vaši adresu na <b>{{$a}}</b></p><p>Obsahuje jednoduché instrukce pro dokončení registrace. </p><p>Pokud budou potíže pokračovat, obraťte se na správce webu. </p>",
     "emailnotmatch": "E-maily se neshodují",
@@ -51,6 +49,7 @@
     "policyagree": "Před dalším používáním těchto stránek musíte souhlasit s těmito pravidly. Souhlasíte s nimi?",
     "policyagreement": "Souhlas s pravidly používání stránek",
     "policyagreementclick": "Odkaz na Souhlas s pravidly používání těchto stránek",
+    "potentialidps": "Přihlásit se pomocí účtu na:",
     "problemconnectingerror": "Máme potíže s připojením k",
     "problemconnectingerrorcontinue": "Ještě jednou zkontrolujte, že jste adresu zadali správně a zkuste to znovu.",
     "profileinvaliddata": "Neplatná hodnota",
diff --git a/www/core/components/login/lang/da.json b/www/core/components/login/lang/da.json
index 0cbfa104c19..d822d5653eb 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Godkender",
     "cancel": "Afbryd",
-    "cannotdownloadfiles": "Download af filer er deaktiveret i din Moodleservice. Appen virker ikke med denne indstilling deaktiveret. Kontakt din administrator.",
     "confirmdeletesite": "Er du sikker på at du ønsker at slette websiden {{sitename}}?",
     "connect": "Tilslut!",
     "connecttomoodle": "Tilslut til Moodle",
     "createaccount": "Opret ny profil",
     "createuserandpass": "Vælg  brugernavn og adgangskode",
-    "credentials": "Referencer",
     "credentialsdescription": "Skriv dit brugernavn og adgangskode for at logge på",
     "emailconfirmsent": "<p>En e-mail skulle være sendt til din adresse <b>{{$a}}</b></p> <p>Den indeholder anvisninger på, hvordan du fuldfører din registrering.</p> <p>Hvis du stadig har problemer, så kontakt webadministratoren.</p>",
     "enterthewordsabove": "Skriv ordene herover",
@@ -42,6 +40,7 @@
     "policyagree": "Du må acceptere disse retningslinjer for at benytte dette site.\nAccepterer du?",
     "policyagreement": "Retningslinjer for brug af webstedet",
     "policyagreementclick": "Link til retningslinjer for brug af webstedet",
+    "potentialidps": "Log in ved brug af din konto på:",
     "reconnect": "Genopret forbindelse",
     "reconnectdescription": "Din godkendelse er ugyldigt eller udløbet, du skal genoprette forbindelsen til webstedet.",
     "reconnectssodescription": "Din godkendelse er ugyldig eller udløbet, du skal genoprette forbindelsen til webstedet. Du skal logge på webstedet via en browser.",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index f1d073c10c3..e88b1eeed67 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -2,7 +2,6 @@
     "auth_email": "E-Mail-Registrierung",
     "authenticating": "Authentifizieren ...",
     "cancel": "Abbrechen",
-    "cannotdownloadfiles": "Das Herunterladen von Dateien ist für den mobilen Webservice deaktiviert. Diese Option ist aber für die App unbedingt notwendig. Wenden Sie sich an den Administrator.",
     "checksiteversion": "Prüfen Sie, ob Ihre Website mindestens Moodle 2.4 verwendet.",
     "confirmdeletesite": "Möchten Sie '{{sitename}}' wirklich aus der Liste löschen?",
     "connect": "Verbinden",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Wenden Sie sich an den Administrator der Website, um folgendes Problem prüfen zu lassen: {{$a}}",
     "createaccount": "Zugang anlegen (Registrierung)",
     "createuserandpass": "Wählen Sie Ihren Anmeldenamen und Ihr Kennwort",
-    "credentials": "Bewertungen",
     "credentialsdescription": "Geben Sie den Anmeldenamen und das Kennwort ein. ",
     "emailconfirmsent": "<p>In Kürze wird eine E-Mail an <b>{{$a}}</b> gesendet.</p><p>Sie finden eine einfache Anleitung, wie Sie die Registrierung abschließen. Bei Schwierigkeiten wenden Sie sich an den Administrator der Website.</p>",
     "emailnotmatch": "Die E-Mail-Adressen stimmen nicht überein.",
@@ -52,6 +50,7 @@
     "policyagree": "Lesen Sie diese Zustimmungserklärung sorgfältig. Sie müssen erst zustimmen, um diese Website weiter nutzen zu können. Stimmen Sie zu?",
     "policyagreement": "Zustimmungserklärung",
     "policyagreementclick": "Link zur Zustimmungserklärung",
+    "potentialidps": "Nutzen Sie Ihre Anmeldung auf:",
     "problemconnectingerror": "Probleme beim Verbinden mit",
     "problemconnectingerrorcontinue": "Prüfen Sie, dass Sie die URL richtig eingegeben haben. Versuchen Sie es noch einmal.",
     "profileinvaliddata": "Ungültiger Wert",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index 42a7bc2a353..aa48e107bbb 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -1,17 +1,43 @@
 {
     "auth_email": "Email-based αυτο-εγγραφή",
     "authenticating": "Έλεγχος ταυτότητας",
-    "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο στη Mobile υπηρεσία, η εφαρμογή δεν μπορεί να λειτουργήσει με αυτή τη ρύθμιση απενεργοποιημένη. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
+    "cancel": "Ακύρωση",
     "checksiteversion": "Ελέγξτε ποια έκδοση Moodle χρησιμοποιεί το site, Moodle 2.4 ή μετέπειτα έκδοση.",
     "confirmdeletesite": "Είστε σίγουροι ότι θέλετε να διαγράψετε το site {{sitename}};",
     "connect": "Σύνδεση!",
     "connecttomoodle": "Σύνδεση στο Moodle",
     "contactyouradministrator": "Επικοινωνήστε με το διαχειριστή του site για περαιτέρω βοήθεια.",
     "contactyouradministratorissue": "Ζητήστε από το διαχειριστή του site να ελέγξει το ζήτημα: {{$a}}",
-    "credentials": "Credentials",
+    "createaccount": "Δημιουργία του λογαριασμού μου",
+    "createuserandpass": "Δημιουργία ενός νέου ονόματος χρήστη και κωδικού πρόσβασης για είσοδο στον δικτυακό τόπο",
     "credentialsdescription": "Δώστε το όνομα χρήστη και τον κωδικό πρόσβασής σας για να συνδεθείτε.",
     "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
+    "enterthewordsabove": "Εισάγετε τις παραπάνω λέξεις",
     "errordeletesite": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαγραφής του site. Δοκιμάστε ξανά αργότερα.",
-    "errorupdatesite": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση του site token."
+    "errorupdatesite": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση του site token.",
+    "firsttime": "Είναι η πρώτη σας φορά εδώ;",
+    "getanothercaptcha": "Πάρε ένα άλλο CAPTCHA",
+    "help": "Βοήθεια",
+    "instructions": "Οδηγίες",
+    "invalidemail": "Εσφαλμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
+    "invalidurl": "Μη έγκυρο URL",
+    "login": "Είσοδος",
+    "loginsteps": "Γεια σας,\n\nΓια να έχετε πλήρη πρόσβαση σε κάποια μαθήματα θα χρειαστεί να δημιουργήσετε ένα νέο λογαριασμό, ακολουθώντας τα παρακάτω βήματα:\n<OL size=2>\n   <li>Συμπληρώστε τη φόρμα <A HREF={{$a}}>Νέου λογαριασμού</A> με τα δεδομένα σας.\n   <li>Ένα μήνυμα ηλεκτρονικού ταχυδρομείου θα αποσταλεί στη διεύθυνσή σας.\n   <li>Διαβάστε το μήνυμα και επιλέξτε τη διεύθυνση που περιέχει.\n   <li>Μετά την επιβεβαίωση του λογαριασμού σας, θα μπορείτε να συνδεθείτε στην ηλεκτρονική τάξη.\n   <li>Αφού έχετε συνδεθεί, μπορείτε να επιλέξτε το μάθημα στο οποίο θέλετε να εγγραφείτε. Αν σας ζητηθεί ένα \"κλειδί εγγραφής\" - χρησιμοποιήστε αυτό που σας έδωσε ο διδάσκοντάς σας.\n   <li>Από εδώ και στο εξής θα έχετε τη δυνατότητα να χρησιμοποιήσετε όλες τις δραστηριότητες και τις πηγές πληροφοριών του μαθήματος.\n   </ol>",
+    "missingemail": "Λείπει η διεύθυνση ηλεκτρονικού ταχυδρομείου",
+    "missingfirstname": "Λείπει το όνομα",
+    "missinglastname": "Λείπει το επώνυμο",
+    "newaccount": "Νέος λογαριασμός",
+    "password": "Κωδικός πρόσβασης",
+    "policyaccept": "Καταλαβαίνω και συμφωνώ",
+    "policyagree": "Πρέπει να συμφωνήσετε σε αυτήν την πολιτική για να συνεχίσετε στο ιστοχώρο. Συμφωνείτε;",
+    "policyagreement": "Άδεια χρήσης του ιστοχώρου",
+    "policyagreementclick": "Πατήστε εδώ για να διαβάσετε του όρους χρήσης",
+    "potentialidps": "Συνδεθείτε χρησιμοποιώντας το λογαριασμό σας στο:",
+    "security_question": "Ερώτηση ασφαλείας",
+    "selectacountry": "Επιλέξτε μια χώρα",
+    "startsignup": "Ξεκινήστε τώρα δημιουργώντας νέο λογαριασμό!",
+    "supplyinfo": "Παρακαλώ, δώστε κάποιες πληροφορίες σχετικές με τον εαυτό σας",
+    "username": "Όνομα χρήστη",
+    "usernotaddederror": "Ο χρήστης \"{{$a}}\" δεν προστέθηκε - άγνωστο σφάλμα"
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index 94ac79f587d..c8f3d28744a 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -2,7 +2,6 @@
     "auth_email": "Auto-registro basado en Email",
     "authenticating": "Autenticando",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile, la app nop puede trabajar con esta configuración deshbilitada. Por favor contacte al administrador de su sitio.",
     "checksiteversion": "Revisar que su sitio usa Moodle 2.4 o más reciente.",
     "confirmdeletesite": "¿Está Usted seguro de querer eliminar el sitio {{sitename}}?",
     "connect": "¡Conectar!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear mi cuenta nueva",
     "createuserandpass": "Elegir su nombre_de_usuario y contraseña",
-    "credentials": "Credenciales",
     "credentialsdescription": "Por favor proporcione su nombre_de_usuario y contraseña para ingresar.",
     "emailconfirmsent": "<p>Debería de haberse enviado un Email a su dirección en <b>{{$a}}</b></p><p>El Email contiene instrucciones sencillas para completar su registro.</p><p>Si continúa teniendo dificultades, contacte al administrador del sitio.</p>",
     "emailnotmatch": "No coinciden los Emails",
@@ -52,6 +50,7 @@
     "policyagree": "Usted deberá estar de acuerdo con estas condiciones antes de seguir usando este sitio. ¿Está de acuerdo?",
     "policyagreement": "Acuerdo con las Condiciones del Sitio",
     "policyagreementclick": "Haga clic aquí para leer el acuerdo con las condiciones del sitio",
+    "potentialidps": "¿Entra (se registra) habitualmente en otro sitio antes de llegar aquí? <br />Elija entre las opciones de la siguiente lista para entrar en su sitio habitual:",
     "problemconnectingerror": "Estamos teniendo dificultades para conectarnos",
     "problemconnectingerrorcontinue": "Revise dos veces que Usted haya ingresado la dirección correctamente e inténtelo nuevamente.",
     "profileinvaliddata": "Valor inválido",
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index e2147736c25..eb6bb47b216 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -2,7 +2,6 @@
     "auth_email": "Auto-registro basado en e-mail.",
     "authenticating": "Autenticando",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "La descarga de archivos está desactivada en el servicio móvil de Moodle, la aplicación no puede funcionar con este parámetro desactivado. Por favor, contacte con el administrador del sitio.",
     "checksiteversion": "Comprueba que tu sitio utiliza Moodle 2.4 o superior.",
     "confirmdeletesite": "¿Está seguro de que quiere eliminar el sitio {{sitename}}?",
     "connect": "Conectar",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear cuenta",
     "createuserandpass": "Crear un nuevo usuario y contraseña para acceder al sistema",
-    "credentials": "Credenciales",
     "credentialsdescription": "Introduzca su nombre se usuario y contraseña para entrar",
     "emailconfirmsent": "<p>Se ha enviado un email a su dirección <b>{{$a}}</b></p><p>Contiene instrucciones para completar el proceso de registro.</p><p>Si continúa teniendo algún problema, contacte con el administrador de su sitio.</p>",
     "emailnotmatch": "Las direcciones de correo no coinciden.",
@@ -51,6 +49,7 @@
     "policyagree": "Usted deberá estar de acuerdo con estas condiciones antes de seguir usando este sitio. ¿Está de acuerdo?",
     "policyagreement": "Acuerdo con las Condiciones del Sitio",
     "policyagreementclick": "Haga clic aquí para leer el acuerdo con las condiciones del sitio",
+    "potentialidps": "Identifíquese usando su cuenta en:",
     "problemconnectingerror": "Estamos teniendo dificultades para conectar con su sitio",
     "problemconnectingerrorcontinue": "Compruebe de nuevo que ha introducido correctamente la dirección del sitio.",
     "profileinvaliddata": "Valor incorrecto",
diff --git a/www/core/components/login/lang/eu.json b/www/core/components/login/lang/eu.json
index 92a9e87b700..de8523c2a50 100644
--- a/www/core/components/login/lang/eu.json
+++ b/www/core/components/login/lang/eu.json
@@ -2,7 +2,6 @@
     "auth_email": "E-postaren bidezko autentifikazioa",
     "authenticating": "Egiaztatzen",
     "cancel": "Utzi",
-    "cannotdownloadfiles": "Fitxategiak jaistea ezgaituta dago zure Mobile zerbitzuan, app-ak ezin du ezarpen honekin funtzionatu. Mesedez zure gune kudeatzailean harremanetan jarri zaitez.",
     "checksiteversion": "Egiaztatu zure Moodle guneak 2.4 bertsioa edo aurreragokoa erabiltzen duela.",
     "confirmdeletesite": "Ziur zaude {{sitename}} gunea ezabatu nahi duzula?",
     "connect": "Konektatu!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Mesedez, eskatu zure kudeatzaileari hurrengo arazoa ikuskatu dezala: {{$a}}",
     "createaccount": "Nire kontu berria sortu",
     "createuserandpass": "Aukeratu zure erabiltzaile-izena eta pasahitza",
-    "credentials": "Egiaztagiriak",
     "credentialsdescription": "Mesedez saioa hasteko zure sartu erabiltzaile eta pasahitza.",
     "emailconfirmsent": "<p>Zure <b>{{$a}}</b> helbidera mezu bat bidali da.</p><p>Zure erregistroa amaitzeko argibide erraz batzuk ditu.</p><p>Arazorik baduzu, jarri harremanetan kudeatzailearekin.</p>",
     "emailnotmatch": "E-posta helbideak ez datoz bat",
@@ -52,6 +50,7 @@
     "policyagree": "Web gune honetan jarraitu aurretik baldintzekin ados egon behar duzu. Ados al zaude?",
     "policyagreement": "Gunearen baldintzen akordioa",
     "policyagreementclick": "Gunearen baldintzak irakurtzeko esteka",
+    "potentialidps": "Hasi saioa beste kontu bat erabiliz:",
     "problemconnectingerror": "Arazoak izaten ari gara hona konektatzean",
     "problemconnectingerrorcontinue": "Berriz egiaztatu helbidea ondo idatzi duzula eta ondoren saiatu berriz.",
     "profileinvaliddata": "Balore baliogabea",
diff --git a/www/core/components/login/lang/fa.json b/www/core/components/login/lang/fa.json
index f0169765fad..38dd870a125 100644
--- a/www/core/components/login/lang/fa.json
+++ b/www/core/components/login/lang/fa.json
@@ -30,6 +30,7 @@
     "policyagree": "برای ادامهٔ استفاده از این سایت باید موافقت خود را با خط مشی آن اعلام کنید. آیا موافقید؟",
     "policyagreement": "موافقت با خط مشی سایت",
     "policyagreementclick": "مشاهدهٔ موافقت‌نامهٔ خط مشی سایت",
+    "potentialidps": "ورود با استفاده از حساب شما روی:",
     "security_question": "سؤال امنیتی",
     "selectacountry": "انتخاب کشور",
     "siteinmaintenance": "سایت شما در حالت نگهداشت می باشد",
@@ -39,5 +40,6 @@
     "supplyinfo": "جزئیات بیشتر",
     "username": "نام کاربری",
     "usernamerequired": "نام کاربر لازم است",
+    "usernotaddederror": "کاربر اضافه نشد - خطا",
     "webservicesnotenabled": "وب سرویس سایت اشکال دارد.با مدیر سایت هماهنگ نمایید"
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index d0c76089a56..ffc2ad0f422 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -2,7 +2,6 @@
     "auth_email": "Auto-enregistrement par courriel",
     "authenticating": "Authentification",
     "cancel": "Annuler",
-    "cannotdownloadfiles": "Le téléchargement des fichiers est désactivé sur votre Moodle et l'app ne peut pas fonctionner si ce réglage est désactivé. Veuillez contacter l'administrateur de la plateforme.",
     "checksiteversion": "Veuillez vérifier que votre site utilise Moodle 2.4 ou une version ultérieure.",
     "confirmdeletesite": "Voulez-vous vraiment supprimer la plateforme {{sitename}} ?",
     "connect": "Connecter !",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Veuillez demander à l'administrateur de la plateforme de vérifier l'élément suivant : {{$a}}",
     "createaccount": "Créer mon compte",
     "createuserandpass": "Créer un compte",
-    "credentials": "Données de connexion",
     "credentialsdescription": "Veuillez fournir votre nom d'utilisateur et votre mot de passe pour vous connecter.",
     "emailconfirmsent": "<p>Un message vous a été envoyé par courriel à l'adresse <b>{{$a}}</b></p><p>Il contient des instructions vous permettant de terminer votre enregistrement.</p><p>En cas de difficulté, viellez contacter l'administrateur de la plateforme.</p>",
     "emailnotmatch": "Les adresses de courriel ne correspondent pas",
@@ -52,6 +50,7 @@
     "policyagree": "Vous devez accepter de vous conformer à ce règlement pour continuer à utiliser ce site. Acceptez-vous le règlement ?",
     "policyagreement": "Règlement du site",
     "policyagreementclick": "Lien vers le règlement du site",
+    "potentialidps": "Se connecter au moyen du compte :",
     "problemconnectingerror": "Impossible de se connecter à",
     "problemconnectingerrorcontinue": "Veuillez vérifier l'adresse indiquée et essayer à nouveau.",
     "profileinvaliddata": "Valeur non valide",
diff --git a/www/core/components/login/lang/he.json b/www/core/components/login/lang/he.json
index 3f4379a83d3..087bf0aca8c 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -1,7 +1,6 @@
 {
     "authenticating": "מאמת נתונים",
     "cancel": "ביטול",
-    "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת בשירותי הנייד שלך, האפליקציה אינה יכולה לעבוד במצב זה. אנא פנה למנהל האתר.",
     "confirmdeletesite": "האם את/ה בטוח/ה שברצונך למחוק את האתר {{sitename}}?",
     "connect": "התחברות!",
     "connecttomoodle": "התחברות למוודל",
@@ -39,6 +38,7 @@
     "policyagree": "הינך חייב לאשר את מדיניות זו על מנת להמשיך להשתמש באתר זה. האם אתה מסכים?",
     "policyagreement": "הסכם מדיניות המערכת",
     "policyagreementclick": "יש להקליק כאן על מנת לקרוא את הסכם מדיניות המערכת",
+    "potentialidps": "התחברות (הזדהות) מבוססת החשבון שלך ב:",
     "reconnect": "חיבור מחדש",
     "reconnectdescription": "אסימון האימות שלך (token) אינו תקף או לא תקין, עליך להתחבר לאתר מחדש.",
     "reconnectssodescription": "אסימון האימות שלך (token) אינו תקף או לא תקין, עליך להתחבר לאתר מחדש. יש להתחבר לאתר בשימוש חלון דפדפן.",
diff --git a/www/core/components/login/lang/hu.json b/www/core/components/login/lang/hu.json
index ad15cfc1d91..426d88bebe7 100644
--- a/www/core/components/login/lang/hu.json
+++ b/www/core/components/login/lang/hu.json
@@ -30,6 +30,7 @@
     "policyagree": "A portál használatához el kell fogadnia a feltételeket. Elfogadja őket?",
     "policyagreement": "A portál használati feltételeiről szóló megállapodás",
     "policyagreementclick": "Ugrópont a portál használati feltételeiről szóló megállapodáshoz",
+    "potentialidps": "Lépjen be itteni fiókjával:",
     "security_question": "Biztonsági kérdés",
     "selectacountry": "Válasszon egy országot",
     "siteinmaintenance": "A portálja karbantartási üzemmódban van.",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index a7901ea2e15..2fb9af78281 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Autenticazione in corso",
     "cancel": "Annulla",
-    "cannotdownloadfiles": "Lo scaricamento dei file è disabilitato nel servizio Mobile. l'app non può funzionare con questa impostazione disabilitata, per favore contatta l'amministratore dle sito.",
     "confirmdeletesite": "Sei sicuro di eliminare il sito {{sitename}}?",
     "connect": "Collegati!",
     "connecttomoodle": "Collegati a Moodle",
     "createaccount": "Crea il mio nuovo account",
     "createuserandpass": "Scegli username e password",
-    "credentials": "Credenziali",
     "credentialsdescription": "Per faovre inserisci username e password per l'autenticazione",
     "emailconfirmsent": "<p>Una email è stata inviata al tuo indirizzo <b>{{$a}}</b></p>\n<p>Contiene semplici istruzioni per completare la tua registrazione.</p>\n<p>Se hai qualche difficoltà contatta l'amministratore del sito.</p>",
     "enterthewordsabove": "Inserisci le parole sovrastanti",
@@ -42,6 +40,7 @@
     "policyagree": "Per continuare ad usare questo sito, è necessario accettare le condizioni riportate.",
     "policyagreement": "Condizioni di utilizzo del sito",
     "policyagreementclick": "Leggi le condizioni di utilizzo del sito",
+    "potentialidps": "Autenticati su:",
     "reconnect": "Riconnetti",
     "reconnectdescription": "Il token di autenticazione non è valido oppure è scaduto. Devi ricollegarti al sito.",
     "reconnectssodescription": "Il token di autenticazione non è valido oppure è scaduto. Devi ricollegarti al sito autenticandoti tramite il browser.",
diff --git a/www/core/components/login/lang/ja.json b/www/core/components/login/lang/ja.json
index bf0f4c3d7d5..885e21f8911 100644
--- a/www/core/components/login/lang/ja.json
+++ b/www/core/components/login/lang/ja.json
@@ -30,6 +30,7 @@
     "policyagree": "このサイトを継続して利用するにはあなたは使用許諾に同意する必要があります。同意しますか?",
     "policyagreement": "サイト使用許諾",
     "policyagreementclick": "サイト使用許諾にリンクする",
+    "potentialidps": "あなたのアカウントを使用してログインします:",
     "security_question": "セキュリティ質問",
     "selectacountry": "国を選択する",
     "siteinmaintenance": "このサイトはメンテナンス中です",
diff --git a/www/core/components/login/lang/lt.json b/www/core/components/login/lang/lt.json
index 6a81923cf40..e76a57bd250 100644
--- a/www/core/components/login/lang/lt.json
+++ b/www/core/components/login/lang/lt.json
@@ -1,35 +1,55 @@
 {
     "auth_email": "Savarankiška registracija el. paštu",
     "authenticating": "Autentifikuojama",
-    "cannotdownloadfiles": "Negalima atsisiųsti failo į Jūsų mobilųjį įrenginį, programėlė negali veikti be šių nustatymų. Prašome susisiekti su svetainės administratoriumi.",
+    "cancel": "Atšaukti",
     "checksiteversion": "Patikrintkite, ar svetainė naudoja Moodle 2.4. arba vėlesnę versiją.",
     "confirmdeletesite": "Ar tikrai norite ištrinti svetainę {{sitename}}?",
     "connect": "Prisijungta!",
     "connecttomoodle": "Prisijungti prie Moodle",
     "contactyouradministrator": "Susisiekite su svetainės administratoriumi, jei reikalinga pagalba.",
     "contactyouradministratorissue": "Dėl šių klausimų prašome susisiekti su administratoriumi: {{$a}}",
-    "credentials": "Įgaliojimai",
+    "createaccount": "Kurti naują mano paskyrą",
+    "createuserandpass": "Pasirinkite savo naudotojo vardą ir slaptažodį",
     "credentialsdescription": "Prisijungti naudojant vartotojo vardą ir slaptažodį.",
     "emailconfirmsent": "<p>Informacija išsiųsta Jūsų nurodytu adresu <b>{{$a}}</b></p><p>Tai padės sėkmingai užbaigti registraciją.</p><p>Jeigu nepavyksta, susisiekite su svetainės administratoriumi.</p>",
     "emailnotmatch": "El. paštas nesutampa",
+    "enterthewordsabove": "Įvesti aukščiau rodomus žodžius",
     "erroraccesscontrolalloworigin": "Kryžminis veiksmas buvo atmestas. Patikrinkite: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
     "errordeletesite": "Klaida trinant šią svetainę. Prašome mėginti vėl.",
     "errorupdatesite": "Klaida atnaujinant svetainės kodą.",
+    "firsttime": "Ar jūs čia pirmą kartą?",
+    "getanothercaptcha": "Gauti kitą CAPTCHA",
+    "help": "Žinynas",
     "helpmelogin": "<p>Visame pasaulyje Moodle svetainių yra labai daug. Ši programėlė gali prisijungti prie Moodle svetainių, turinčių specialią Moodle programėlių prieigą.</p><p>Jeigu negalite prisijungti, praneškite apie tai Moodle administratoriui ir paprašykite perskaityti <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>Norėdami išbandyti programėlės demo versiją surinkite <i>teacher (dėstytojui)</i> ar <i>student (besimokančiajam)</i> <i>Svetainės adreso </i> lauke ir paspauskite <b>Prisijungti mygtuką<b>.</p>",
+    "instructions": "Instrukcijos",
     "invalidaccount": "Prašome patikrinti prisijungimo duomenis arba paprašyti administratoriaus patikrinti svetainės nustatymus.",
     "invaliddate": "Netinkama data",
+    "invalidemail": "Neteisingas el. pašto adresas",
     "invalidmoodleversion": "Negaliojanti Moodle versija. Turi būt ne senesnė nei 2.4.",
     "invalidsite": "URL adresas netinkamas.",
     "invalidtime": "Netinkamas laikas",
+    "invalidurl": "Klaidingas URL",
     "invalidvaluemax": "Didžiausia vertė {{$a}}",
     "invalidvaluemin": "Mažiausia vertė {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobilių Papildomų Funkcijų patikra gavo netikėtą atsakymą, būsite autentifikuojamas naudojant standartines mobilias paslaugas.",
+    "login": "Prisijungti",
     "loginbutton": "Prisijungti",
     "logininsiterequired": "Prisijunkite prie svetainės naršyklės lange.",
+    "loginsteps": "Sveiki! Jei norite gauti visą prieigą prie kursų, turite šioje svetainėje sukurti savo paskyrą. Kiekvieni kursai taip pat gali turėti vienkartinius registracijos raktus, kurių reikės vėliau. Reikia atlikti tokius veiksmus: <ol> <li>Užpildykite <a href={{$a}}>naujos paskyros</a> formą, pateikdami savo informaciją.</li> <li>Jūsų el. pašto adresu bus iš karto išsiųstas el. laiškas.</li>\n<li>Perskaitykite el. laišką ir spustelėkite jame esantį saitą.</li>\n<li>Jūsų paskyra bus patvirtinta ir galėsite prisijungti.</li>\n<li>Tada pasirinkite kursus, kuriuose norite dalyvauti.</li>\n<li>Jei jūsų paprašys registracijos rakto, naudokite gautą iš dėstytojo. Taip įsiregistruosite į kursus.</li> <li>Dabar galėsite pasiekti visą kursų informacija. Nuo šiol jums tereikės įvesti asmeninį naudotojo vardą ir slaptažodį (šio puslapio formoje), kad prisijungtumėte ir pasiektumėte visus kursus, kuriuose įsiregistravote.</li> </ol>",
+    "missingemail": "Nėra el. pašto adreso",
+    "missingfirstname": "Nėra pavadinimo",
+    "missinglastname": "Nėra pavardės",
     "mobileservicesnotenabled": "Mobilios paslaugos neįgalintos. Susisiekite su Moodle svetainės administratoriumi, jei šios paslaugos reikalingos.",
+    "newaccount": "Nauja paskyra",
     "newsitedescription": "Įveskite Moodle svetainės URL adresą. Atkreipkite dėmesį, kad gali būti nesukonfigūruotas dirbti su šia programėle.",
     "notloggedin": "Turite prisijungti",
+    "password": "Slaptažodis",
     "passwordrequired": "Reikalingas slaptažodis",
+    "policyaccept": "Suprantu ir sutinku",
+    "policyagree": "Norėdami toliau naudotis šia svetaine, turite sutikti su šia strategija. Ar sutinkate?",
+    "policyagreement": "Svetainės strategijos sutartis",
+    "policyagreementclick": "Saitas su svetainės strategijos sutartimi",
+    "potentialidps": "Prisijungti su išorine paskyra:",
     "problemconnectingerror": "Turime prisijungimo problemų",
     "problemconnectingerrorcontinue": "Patikrinkite, ar įvestas adresas teisingas ir pamėginkite dar kartą.",
     "profileinvaliddata": "Netinkamas įvertinimas",
@@ -37,13 +57,19 @@
     "reconnect": "Jungtis pakartotinai",
     "reconnectdescription": "Jūsų atpažinimo kodas neteisingas arba negalioja, turėsite vėl prisijungti prie svetainės.",
     "reconnectssodescription": "Jūsų atpažinimo kodas neteisingas arba negalioja, turėsite vėl prisijungti prie svetainės. Prisijunkite prie svetainės naršyklės lange.",
+    "security_question": "Saugumo klausimas",
+    "selectacountry": "Pasirinkti šalį",
     "signupplugindisabled": "{{$a}} neįjungtas.",
     "siteaddress": "Svetainės adresas",
     "siteinmaintenance": "Svetainė palaikymo rėžime",
     "siteurl": "URL adresas",
     "siteurlrequired": "Reikalingas URL adresas, pvz., <i>http://www.yourmoodlesite.abc arba https://www.yourmoodlesite.efg</i>",
+    "startsignup": "Kurti naują paskyrą",
     "stillcantconnect": "Vis dar negalite prisijungti?",
+    "supplyinfo": "Daugiau informacijos",
+    "username": "Naudotojo vardas",
     "usernamerequired": "Būtinas vartotojo vardas",
+    "usernotaddederror": "Naudotojas neįtrauktas – klaida",
     "visitchangepassword": "Ar norite pakeisti slaptažodį?",
     "webservicesnotenabled": "Tinklo paslaugos neįgalintos. Susisiekite su Moodle administratoriumi jeigu manote, kad  reikalinga įgalinti."
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index 75cb90543c2..9258b3371cc 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -2,7 +2,6 @@
     "auth_email": "E-mail zelfregistratie",
     "authenticating": "Authenticeren",
     "cancel": "Annuleer",
-    "cannotdownloadfiles": "Het downloaden van bestanden is uitgeschakeld in je mobiele service. De app kan niet werken met deze instelling uitgeschakeld. Contacteer je Moodle sitebeheerder.",
     "checksiteversion": "Controleer of je site minstens Moodle 2.4 of nieuwe gebruikt.",
     "confirmdeletesite": "Weet je zeker dat je de site {{sitename}} wil verwijderen?",
     "connect": "Verbinden!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Vraag aan je site-beheerder om volgend probleem te onderzoeken: {{$a}}",
     "createaccount": "Maak mijn nieuwe account aan",
     "createuserandpass": "Kies een gebruikersnaam en wachtwoord",
-    "credentials": "Accountgegevens",
     "credentialsdescription": "Geef je gebruikersnaam en wachtwoord op om je aan te melden",
     "emailconfirmsent": "<p>Er zou een e-mail gestuurd moeten zijn naar jouw adres <b>{{$a}}</b></p><p>Het bericht bevat eenvoudige instructies om je registratie te voltooien.</p><p>Als je problemen blijft ondervinden, neem dan contact op met de sitebeheerder.</p>",
     "emailnotmatch": "E-mailadressen komen niet overeen",
@@ -51,6 +49,7 @@
     "policyagree": "Je moet akkoord gaan met deze overeenkomst voor je verder kunt gaan met het gebruiken van deze site. Ga je akkoord?",
     "policyagreement": "Overeenkomst voor  het gebruik van deze site",
     "policyagreementclick": "Link naar de gebruiksovereenkomst voor deze site",
+    "potentialidps": "Login met je account op:",
     "problemconnectingerror": "We hebben een probleem met het verbinden met",
     "problemconnectingerrorcontinue": "Controleer of je het adres juist ingegeven hebt en probeer opnieuw.",
     "profileinvaliddata": "Ongeldige waarde",
diff --git a/www/core/components/login/lang/pl.json b/www/core/components/login/lang/pl.json
index 563a456c82c..a9be398b050 100644
--- a/www/core/components/login/lang/pl.json
+++ b/www/core/components/login/lang/pl.json
@@ -30,6 +30,7 @@
     "policyagree": "Musisz zaakceptować te zasady, żeby używać strony. Czy zgadzasz się?",
     "policyagreement": "Zasady użytkowania serwisu",
     "policyagreementclick": "Kliknij tutaj, żeby poznać zasady użytkowania serwisu",
+    "potentialidps": "Zaloguj się używając swojego konta na:",
     "security_question": "Pytanie zabezpieczające",
     "selectacountry": "Wybierz kraj",
     "siteinmaintenance": "Twoja strona jest w trybie konserwacji",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index ed39c9eecc1..6139f81b2af 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -2,7 +2,6 @@
     "auth_email": "Auto-registro por e-mail",
     "authenticating": "Autenticação",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "O download de arquivos está desabilitado em seu serviço Mobile, o aplicativo não pode trabalhar com essa configuração desabilitada. Por favor, contate o administrador do seu site.",
     "checksiteversion": "Verifique se seu site usa Moodle 2.4 ou superior.",
     "confirmdeletesite": "Você tem certeza que quer excluir o site {{sitename}}?",
     "connect": "Conectar!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Por favor, pergunte ao administrador para verificar o seguinte problema: {{$a}}",
     "createaccount": "Cadastrar este novo usuário",
     "createuserandpass": "Escolha seu usuário e senha",
-    "credentials": "Credenciais",
     "credentialsdescription": "Por favor, informe seu nome de usuário e senha para efetuar o login",
     "emailconfirmsent": "<p>Um e-mail irá ser enviado para o seu endereço em <b>{{$a}}</b></p><p> Ele irá conter instruções fáceis para completar seu registro.</p><p>Se você continua a ter dificuldades, contate o administrador do site.</p>",
     "emailnotmatch": "Os e-mail não coincidem",
@@ -51,6 +49,7 @@
     "policyagree": "Para utilizar este site você precisa aceitar o acordo sobre a política de uso do site. Você aceita os termos deste acordo?",
     "policyagreement": "Acordo de política do site",
     "policyagreementclick": "Link para o acordo de política do site",
+    "potentialidps": "Autenticar usando sua conta em:",
     "problemconnectingerror": "Estamos com dificuldades em se conectar com",
     "problemconnectingerrorcontinue": "Verifique se digitou corretamente o endereço e tente novamente.",
     "profileinvaliddata": "Valor inválido",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index 2b3fdcb8c27..8544b642c2b 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -2,7 +2,6 @@
     "auth_email": "Autorregisto com confirmação por e-mail",
     "authenticating": "Autenticação",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "O seu serviço Mobile não permite descarregar ficheiros e a aplicação não funciona sem ativar esta configuração. Por favor, contacte o administrador do site.",
     "checksiteversion": "Verifique se seu site usa o Moodle 2.4 ou posterior.",
     "confirmdeletesite": "Tem a certeza que pretende remover o site {{sitename}}?",
     "connect": "Ligar!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Solicite ao administrador que verifique o seguinte problema: {{$a}}",
     "createaccount": "Criar a minha conta",
     "createuserandpass": "Escolha um nome de utilizador e senha",
-    "credentials": "Credenciais",
     "credentialsdescription": "Por favor, digite o nome de utilizador e senha para entrar",
     "emailconfirmsent": "<P>Um e-mail deve ter sido enviado para o seu endereço <b>{{$a}}</b></p><p>. Contém instruções fáceis para concluir o seu registo. Se continuar a ter dificuldades, entre em contacto com o administrador do site.</p>",
     "emailnotmatch": "Os e-mails não coincidem",
@@ -52,6 +50,7 @@
     "policyagree": "Deverá aceitar este regulamento para poder proceder a utilizar este site. Aceita o regulamento?",
     "policyagreement": "Regulamento de utilização",
     "policyagreementclick": "Carregue aqui para ler o regulamento de utilização",
+    "potentialidps": "Autenticar-se usando a sua conta em:",
     "problemconnectingerror": "Existem alguns problemas na ligação a",
     "problemconnectingerrorcontinue": "Verifique se introduziu correctamente o endereço e tente novamente.",
     "profileinvaliddata": "Valor inválido",
diff --git a/www/core/components/login/lang/ro.json b/www/core/components/login/lang/ro.json
index b3ca3b4b3ca..61a5778af31 100644
--- a/www/core/components/login/lang/ro.json
+++ b/www/core/components/login/lang/ro.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Autentificare",
     "cancel": "Renunță",
-    "cannotdownloadfiles": "Descărcarea de fișiere este inactivată în serviciul pentru mobil iar aplicația nu poate funcționa cu această funcție dezactivată. Contactați administratorul siteului.",
     "confirmdeletesite": "Sunteți sigur că doriți sa ștergeți siteul {{sitename}}?",
     "connect": "Conectare!",
     "connecttomoodle": "Conectare la Moodle",
     "createaccount": "Creează noul meu cont",
     "createuserandpass": "Alege un nume de utilizator şi o parolă",
-    "credentials": "Contributori",
     "credentialsdescription": "Va rugăm să  introduceți userul și parola dumneavoastră pentru a vă conecta",
     "emailconfirmsent": "<p>Un email a fost trimis la adresa Dvs. <b>{{$a}}</b></p>\n   <p>Acest mesaj conţine instrucţiuni despre finalizarea înregistrării.</p>\n   <p>În cazul în care întâmpinaţi dificultăţi contactaţi administratorul site-ului.</p>",
     "enterthewordsabove": "Introduceţi cuvintele de mai sus",
@@ -42,6 +40,7 @@
     "policyagree": "Pentru a continua să folosiţi acest site, trebuie să fiţi de acord cu termenii de utilizare specificaţi. Sunteţi de acord?",
     "policyagreement": "Condiţiile de utilizare ale site-ului",
     "policyagreementclick": "Legătură la condiţiile de utilizare ale site-ului",
+    "potentialidps": "Autentificare folosind contul dvs. de pe:",
     "reconnect": "Reconectare",
     "reconnectdescription": "Tokenul dumneavoastră de autentificare este invalid sau a expirat, trebuie să vă reconectați pe site.",
     "reconnectssodescription": "Tokenul dumneavoastră de autentificare este invalid sau a expirat, trebuie să vă reconectați pe site. Logați-vă folosind un browser.",
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index 2a201c7dc39..41142cfcab7 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Аутентификация",
     "cancel": "Отменить",
-    "cannotdownloadfiles": "Скачивание файла отключено для мобильных служб; приложение не может работать с данной отключенной настройкой. Пожалуйста, свяжитесь с администратором сайта.",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
     "connect": "Подключено!",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
-    "credentials": "Учетные данные",
     "credentialsdescription": "Пожалуйста, укажите Ваш логин и пароль для входа",
     "emailconfirmsent": "На указанный Вами адрес электронной почты (<b>{{$a}}</b>) было отправлено письмо с простыми инструкциями для завершения регистрации.\n Если у вас появятся проблемы с регистрацией, свяжитесь с администратором сайта.",
     "enterthewordsabove": "Напишите слова, которые Вы видите выше",
@@ -41,6 +39,7 @@
     "policyagree": "Чтобы продолжить работу с этим сайтом, Вы должны принять Пользовательское соглашение. Вы согласны?",
     "policyagreement": "Пользовательское соглашение",
     "policyagreementclick": "Ссылка на пользовательское соглашение",
+    "potentialidps": "Войти с использованием учетной записи:",
     "reconnect": "Переподключение",
     "reconnectdescription": "Ваш ключ аутентификации недействителен или срок его действия истек. Вам придется заново подключиться к сайту.",
     "reconnectssodescription": "Ваш ключ аутентификации недействителен или срок его действия истек. Вам придется заново зайти на сайт в окне браузера.",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index af8422c1478..cdbe08f4e8b 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Autentisera",
     "cancel": "Avbryt",
-    "cannotdownloadfiles": "Nedladdning av filer är avaktiverat i din mobila tjänst. Appen fungerar inte om den inställningen är inaktiverad. Vänligen kontakta administratören.",
     "confirmdeletesite": "Är du säker på att du vill ta bort webbsidan {{sitename}}?",
     "connect": "Anslut!",
     "connecttomoodle": "Anslut till Moodle",
     "createaccount": "Skapa mitt nya konto",
     "createuserandpass": "Skapa ett nytt användarnamn och lösenord för att logga in med.",
-    "credentials": "Referenser",
     "credentialsdescription": "Ange ditt användarnamn och lösenord för att logga på",
     "emailconfirmsent": "<p>Vi har skickat ett e-postbrev som Du bör ha fått<br /> till Din adress på <b>{{$a}}</b></p>\n<p>Det innehåller enkla instruktioner som hjälper Dig<br />att fullfölja Din registrering.</p>\n<p>Om Du stöter på problem, är Du välkommen att <br />kontakta den som ansvarar för webbplatsen.</p>",
     "enterthewordsabove": "Mata in de ovanstående orden",
@@ -41,6 +39,7 @@
     "policyagree": "Du måste acceptera denna policy för få fortsätta att använda denna webbplats. Accepterar Du denna policy?",
     "policyagreement": "Avtal angående webbplatsens policy.",
     "policyagreementclick": "Klicka här för att läsa avtalet angående webbplatsens policy.",
+    "potentialidps": "Logga in med ditt konto på:",
     "reconnect": "Anslut",
     "reconnectdescription": "Din autentiseringsnyckel är ogiltig eller har upphört att gälla. Anslut till sidan på nytt",
     "reconnectssodescription": "Din autentiseringsnyckel är ogiltig eller har upphört att gälla. Anslut till sidan på nytt. Du måste logga in på webbsidan via ett webbläsarfönster",
diff --git a/www/core/components/login/lang/tr.json b/www/core/components/login/lang/tr.json
index e1f7342cbea..215b973f377 100644
--- a/www/core/components/login/lang/tr.json
+++ b/www/core/components/login/lang/tr.json
@@ -32,6 +32,7 @@
     "policyagree": "Bu siteyi kullanmaya devam etmek için bu sözleşmeyi kabul etmelisiniz. Kabul ediyor musunuz?",
     "policyagreement": "Site şartları sözleşmesi",
     "policyagreementclick": "Site şartları sözleşmesi bağlantısı",
+    "potentialidps": "Şu hesabınızla oturum açın:",
     "profileinvaliddata": "Geçersiz değer",
     "security_question": "Güvenlik sorusu",
     "selectacountry": "Bir ülke seç",
diff --git a/www/core/components/login/lang/zh-cn.json b/www/core/components/login/lang/zh-cn.json
index 1d4b0340928..232782861a1 100644
--- a/www/core/components/login/lang/zh-cn.json
+++ b/www/core/components/login/lang/zh-cn.json
@@ -29,6 +29,7 @@
     "policyagree": "如要继续使用此站，您必须同意此协议。您同意么?",
     "policyagreement": "网站使用协议",
     "policyagreementclick": "网站政策协议的链接",
+    "potentialidps": "使用您在别处的账号登录：",
     "security_question": "安全问题",
     "selectacountry": "选择一个国家或地区",
     "siteinmaintenance": "您的站点正使用维护模式",
diff --git a/www/core/components/login/lang/zh-tw.json b/www/core/components/login/lang/zh-tw.json
index 5b5bcca5489..4a23bfb81e2 100644
--- a/www/core/components/login/lang/zh-tw.json
+++ b/www/core/components/login/lang/zh-tw.json
@@ -2,7 +2,6 @@
     "auth_email": "基於電子郵件的自助註冊",
     "authenticating": "認證中",
     "cancel": "取消",
-    "cannotdownloadfiles": "在您的行動服務中已停用檔案下載, 應用程式無法使用此未啟用的設定來運作. 請與您的網站管理員聯繫.",
     "checksiteversion": "請檢查您的網站是否使用Moodle 2.4或更高版本.",
     "confirmdeletesite": "您確定要刪除網站{{sitename}}嗎?",
     "connect": "連線!",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "請求管理員檢查以下問題: {{$ a}}",
     "createaccount": "建立我的新帳號",
     "createuserandpass": "請選擇您的帳號名稱和密碼",
-    "credentials": "認證",
     "credentialsdescription": "請提供您的帳號和密碼以便登入",
     "emailconfirmsent": "<p>電子郵件應該已經寄到您的地址<b> {{$ a}} </ b> </ p> <p>它包含簡單的說明, 可以完成註冊. </ p> <p>如果, 您仍然有困難, 請與網站管理員聯繫.</ p>",
     "emailnotmatch": "電子郵件內容不符",
@@ -51,6 +49,7 @@
     "policyagree": "您必須同意這協議才能繼續使用這個網站。您同意嗎?",
     "policyagreement": "網站使用協議",
     "policyagreementclick": "連結到網站使用協議",
+    "potentialidps": "用其他帳號登入：",
     "problemconnectingerror": "我們無法連接到",
     "problemconnectingerrorcontinue": "請仔細檢查您是否正確輸入了地址, 然後重試.",
     "profileinvaliddata": "無效的內容",
diff --git a/www/core/components/question/lang/el.json b/www/core/components/question/lang/el.json
new file mode 100644
index 00000000000..04bb3effa9e
--- /dev/null
+++ b/www/core/components/question/lang/el.json
@@ -0,0 +1,14 @@
+{
+    "answer": "Απάντηση",
+    "answersaved": "Η απάντηση αποθηκεύτηκε",
+    "complete": "Ολοκλήρωση",
+    "correct": "Σωστό",
+    "feedback": "Ανάδραση",
+    "incorrect": "Λάθος",
+    "invalidanswer": "Ημιτελής απάντηση",
+    "notanswered": "Δεν απαντήθηκε ακόμα",
+    "notyetanswered": "Δεν έχει απαντηθεί ακόμα",
+    "partiallycorrect": "Μερικώς σωστή",
+    "questionno": "Ερώτηση {{$a}}",
+    "unknown": "Άγνωστο"
+}
\ No newline at end of file
diff --git a/www/core/components/question/lang/lt.json b/www/core/components/question/lang/lt.json
index 8c7810182b8..795a5dca2fd 100644
--- a/www/core/components/question/lang/lt.json
+++ b/www/core/components/question/lang/lt.json
@@ -1,8 +1,21 @@
 {
+    "answer": "Atsakymas",
+    "answersaved": "Atsakymas išsaugotas",
+    "complete": "Užbaigti",
+    "correct": "Teisingas",
     "errorattachmentsnotsupported": "Programėlė nepalaiko pridėtų failų.",
     "errorinlinefilesnotsupported": "Programėlė nepalaiko redaguojamų failų",
     "errorquestionnotsupported": "Šis klausimo tipas programėlėje nepalaikomas: {{$a}}.",
+    "feedback": "Atsiliepimas",
     "howtodraganddrop": "Paspauskite pasirinkimui, tada perneškite.",
+    "incorrect": "Klaidinga",
+    "information": "Informacija",
+    "invalidanswer": "Nepilnas atsakymas",
+    "notanswered": "Dar neatsakyta",
+    "notyetanswered": "Dar neatsakyta",
+    "partiallycorrect": "Iš dalies teisingas",
     "questionmessage": "Klausimas {{$a}}: {{$b}}",
+    "questionno": "Klausimas {{$a}}",
+    "requiresgrading": "Reikia vertinimo",
     "unknown": "Negalima nustatyti statuso"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/ar.json b/www/core/components/settings/lang/ar.json
index 09752c272ce..40b91651104 100644
--- a/www/core/components/settings/lang/ar.json
+++ b/www/core/components/settings/lang/ar.json
@@ -1,10 +1,8 @@
 {
     "about": "حول",
-    "appname": "تطبيق مودل {{version}}",
     "cacheexpirationtime": "وقت انتهاء صلاحية ذاكرة التخزين المؤقت (بالميلي ثانية)",
     "currentlanguage": "اللغة الحالية",
     "deletesitefiles": "هل أنت متأكد أنك تريد حذف الملفات التي تم تنزيلها من هذا الموقع  '{{sitename}}'؟",
-    "development": "التطوير",
     "deviceinfo": "معلومات الجهاز",
     "deviceos": "نظام تشغيل الجهاز",
     "disableall": "تعطيل الإعلامات بشكل مؤقت",
@@ -22,7 +20,6 @@
     "settings": "الإعدادات",
     "sites": "المواقع",
     "spaceusage": "المساحة المستخدمة",
-    "success": "تم بنجاح",
     "synchronization": "تزامن",
     "synchronizenow": "زامن الأن",
     "synchronizing": "يتم التزامن",
diff --git a/www/core/components/settings/lang/bg.json b/www/core/components/settings/lang/bg.json
index dc2d2031bd9..e9de7ab1cf5 100644
--- a/www/core/components/settings/lang/bg.json
+++ b/www/core/components/settings/lang/bg.json
@@ -1,10 +1,8 @@
 {
     "about": "Относно",
-    "appname": "Moodle Мобайл {{version}}",
     "cacheexpirationtime": "Продължителност на кеша (милисекунди)",
     "currentlanguage": "Текущ език",
     "deletesitefiles": "Сигурни ли сте, че искате да изтриете изтеглените от този сайт файлове?",
-    "development": "Разработка",
     "disableall": "Временно отменяне на съобщенията",
     "disabled": "Блокирано",
     "enabledebugging": "Позволяване на диагностициране",
@@ -18,7 +16,6 @@
     "loggedoff": "Не е онлайн",
     "settings": "Настройки",
     "spaceusage": "Използване на пространство",
-    "success": "Успех!",
     "synchronization": "Синхронизиране",
     "synchronizing": "Синхронизиране",
     "syncsitesuccess": "Данните от сайта са синхронизирани и всички кешове са инвалидирани.",
diff --git a/www/core/components/settings/lang/ca.json b/www/core/components/settings/lang/ca.json
index eb5ec501f98..66977c70db9 100644
--- a/www/core/components/settings/lang/ca.json
+++ b/www/core/components/settings/lang/ca.json
@@ -1,6 +1,5 @@
 {
     "about": "Quant a",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App preparada",
     "cacheexpirationtime": "Temps de venciment de memòria cau (milisegons)",
     "cannotsyncoffline": "No es poden sincronitzar dades fora de línia.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "Esteu segur que voleu esborrar els fitxers baixats d'aquest lloc?",
     "deletesitefilestitle": "Elimina els fitxers del lloc",
-    "development": "Desenvolupament",
     "deviceinfo": "Informació del dispositiu",
     "deviceos": "OS del dispositiu",
     "devicewebworkers": "És compatible amb Device Web Workers",
@@ -48,7 +46,6 @@
     "sites": "Llocs",
     "spaceusage": "Utilització de l'espai",
     "storagetype": "Tipus d'emmagatzematge",
-    "success": "Èxit!",
     "synchronization": "Sincronització",
     "synchronizenow": "Sincronitza ara",
     "synchronizing": "S'està sincronitzant",
diff --git a/www/core/components/settings/lang/cs.json b/www/core/components/settings/lang/cs.json
index f2281c6c005..db0893052c2 100644
--- a/www/core/components/settings/lang/cs.json
+++ b/www/core/components/settings/lang/cs.json
@@ -1,6 +1,5 @@
 {
     "about": "O aplikaci",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplikace je připravena",
     "cacheexpirationtime": "Vypršení platnosti vyrovnávací paměti (milisekundy)",
     "cannotsyncoffline": "Nelze synchronizovat offline.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Aktuální jazyk",
     "deletesitefiles": "Jste si jisti, že chcete odstranit stažené soubory z tohoto webu?",
     "deletesitefilestitle": "Odstranit soubory webu",
-    "development": "Vývoj",
     "deviceinfo": "Informace o zařízení",
     "deviceos": "OS zařízení",
     "devicewebworkers": "Podporovaný Web Workers zařízení",
@@ -48,7 +46,6 @@
     "sites": "Stránky",
     "spaceusage": "Použitý prostor",
     "storagetype": "Typ paměti",
-    "success": "Úspěch!",
     "synchronization": "Synchronizace",
     "synchronizenow": "Právě synchonizuji",
     "synchronizing": "Synchronizování",
diff --git a/www/core/components/settings/lang/da.json b/www/core/components/settings/lang/da.json
index 7d2f1960299..3dbfd79c45d 100644
--- a/www/core/components/settings/lang/da.json
+++ b/www/core/components/settings/lang/da.json
@@ -1,6 +1,5 @@
 {
     "about": "Om",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App klar",
     "cacheexpirationtime": "Cache udløbstid (milisekunder)",
     "cordovadevicemodel": "Cordova Device model",
@@ -12,7 +11,6 @@
     "currentlanguage": "Nuværende sprog",
     "deletesitefiles": "Er du sikker på du vil slette de downloadede filer fra webstedet '{{sitename}}'?",
     "deletesitefilestitle": "Slet webstedsfiler",
-    "development": "Udvikling",
     "deviceinfo": "Enhedsinfo",
     "deviceos": "Enheds operativsystem",
     "disableall": "Deaktiver midlertidigt underretninger",
@@ -39,7 +37,6 @@
     "sites": "Steder",
     "spaceusage": "Pladsforbrug",
     "storagetype": "Lagertype",
-    "success": "Succes!",
     "synchronization": "Synkronisering",
     "synchronizenow": "Synkroniser nu",
     "synchronizing": "Synkroniserer",
diff --git a/www/core/components/settings/lang/de.json b/www/core/components/settings/lang/de.json
index 3562db16393..7e50163b6f1 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -1,6 +1,5 @@
 {
     "about": "Über diese App",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App nutzbar",
     "cacheexpirationtime": "Speicherdauer im Cache (Millisekunden)",
     "cannotsyncoffline": "Offline kann nicht synchronisiert werden.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Sprache",
     "deletesitefiles": "Möchten Sie wirklich alle von der Website '{{sitename}}' geladenen Dateien löschen?",
     "deletesitefilestitle": "Website-Dateien löschen",
-    "development": "Entwicklung",
     "deviceinfo": "Geräteinfo",
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
@@ -49,7 +47,6 @@
     "sites": "Websites",
     "spaceusage": "Speicherplatz",
     "storagetype": "Speicherart",
-    "success": "Fertig!",
     "synchronization": "Synchronisieren",
     "synchronizenow": "Synchronisieren",
     "synchronizing": "Synchronisieren ...",
diff --git a/www/core/components/settings/lang/el.json b/www/core/components/settings/lang/el.json
new file mode 100644
index 00000000000..cc1f0b1429c
--- /dev/null
+++ b/www/core/components/settings/lang/el.json
@@ -0,0 +1,13 @@
+{
+    "currentlanguage": "Επιλεγμένη γλώσσα",
+    "disableall": "Προσωρινή απενεργοποίηση ειδοποιήσεων",
+    "disabled": "Απενεργοποιημένο",
+    "general": "Γενικά",
+    "language": "Γλώσσα",
+    "license": "Άδεια",
+    "loggedin": "Συνδεδεμένος",
+    "loggedoff": "Μη συνδεδεμένος",
+    "settings": "Ρυθμίσεις",
+    "sites": "Δικτυακοί τόποι",
+    "total": "Συνολικά"
+}
\ No newline at end of file
diff --git a/www/core/components/settings/lang/es-mx.json b/www/core/components/settings/lang/es-mx.json
index 8bf53cb0fe2..a393ff2b1f0 100644
--- a/www/core/components/settings/lang/es-mx.json
+++ b/www/core/components/settings/lang/es-mx.json
@@ -1,6 +1,5 @@
 {
     "about": "Acerca de",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App lista",
     "cacheexpirationtime": "Tiempo de caducidad del caché (mili segundos)",
     "cannotsyncoffline": "No puede sincronizarse fuera-de-línea.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
     "deletesitefilestitle": "Eliminar archivos del sitio",
-    "development": "Desarrollo",
     "deviceinfo": "Información del Dispositivo",
     "deviceos": "Sistema Operativo del dispositivo",
     "devicewebworkers": "Trabajadores Web del Dispositivo soportados",
@@ -49,7 +47,6 @@
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
-    "success": "¡Éxito!",
     "synchronization": "Sincronización",
     "synchronizenow": "Sincronizar ahorita",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/es.json b/www/core/components/settings/lang/es.json
index 30bff8fb558..ee9f45a2d00 100644
--- a/www/core/components/settings/lang/es.json
+++ b/www/core/components/settings/lang/es.json
@@ -1,6 +1,5 @@
 {
     "about": "Acerca de",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App preparada",
     "cacheexpirationtime": "Tiempo de expiración de caché (mili segundos)",
     "cannotsyncoffline": "No puede sincronizarse fuera de línea.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
     "deletesitefilestitle": "Elimina los ficheros del sitio",
-    "development": "Desarrollo",
     "deviceinfo": "Información del dispositivo",
     "deviceos": "OS del dispositivo",
     "devicewebworkers": "Soporta Device Web Workers",
@@ -48,7 +46,6 @@
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
-    "success": "Éxito",
     "synchronization": "Sincronización",
     "synchronizenow": "Sincronizar ahora",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/eu.json b/www/core/components/settings/lang/eu.json
index e9ed0780a27..d8e8b25d60c 100644
--- a/www/core/components/settings/lang/eu.json
+++ b/www/core/components/settings/lang/eu.json
@@ -1,6 +1,5 @@
 {
     "about": "Honi buruz",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App-a prest",
     "cacheexpirationtime": "Cache-aren iraungitze denbora (milisegundotan)",
     "cannotsyncoffline": "Ezin da lineaz-kanpo sinkronizatu.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Oraingo hizkuntza",
     "deletesitefiles": "Ziur zaude '{{sitename}}' gunetik jaitsitako fitxategiak ezabatu nahi dituzula?",
     "deletesitefilestitle": "Ezabatu guneko fitxategiak",
-    "development": "Garapena",
     "deviceinfo": "Gailuaren informazio",
     "deviceos": "Gailuaren SEa",
     "devicewebworkers": "Device Web Workers onartuak",
@@ -43,12 +41,12 @@
     "navigatoruseragent": "Nabigatzailearen userAgent-a",
     "networkstatus": "Internet konexioaren egoera",
     "privacypolicy": "Pribatutasun politika.",
+    "processorsettings": "Prozesadorearen ezarpenak",
     "reportinbackground": "Erroreak automatikoki jakinarazi",
     "settings": "Ezarpenak",
     "sites": "Guneak",
     "spaceusage": "Lekuaren erabilera",
     "storagetype": "Biltegi mota",
-    "success": "Ondo!",
     "synchronization": "Sinkronizazioa",
     "synchronizenow": "Sinkronizatu orain",
     "synchronizing": "Sinkronizatzen",
diff --git a/www/core/components/settings/lang/fr.json b/www/core/components/settings/lang/fr.json
index a26ab0cc96b..539c3217ca3 100644
--- a/www/core/components/settings/lang/fr.json
+++ b/www/core/components/settings/lang/fr.json
@@ -1,6 +1,5 @@
 {
     "about": "À propos",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Prêt pour l'app",
     "cacheexpirationtime": "Durée d'échéance du cache (ms)",
     "cannotsyncoffline": "Impossible de synchroniser sans connection réseau.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Langue actuelle",
     "deletesitefiles": "Voulez-vous vraiment supprimer les fichiers téléchargés depuis ce site ?",
     "deletesitefilestitle": "Supprimer les fichiers de site",
-    "development": "Développement",
     "deviceinfo": "Info sur l'appareil",
     "deviceos": "Système d'exploitation de l'appareil",
     "devicewebworkers": "Web workers supportés",
@@ -49,7 +47,6 @@
     "sites": "Plateformes",
     "spaceusage": "Espace utilisé",
     "storagetype": "Type de stockage",
-    "success": "Succès !",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchroniser maintenant",
     "synchronizing": "Synchronisation en cours",
diff --git a/www/core/components/settings/lang/he.json b/www/core/components/settings/lang/he.json
index fb9798c3810..12f50bd95c4 100644
--- a/www/core/components/settings/lang/he.json
+++ b/www/core/components/settings/lang/he.json
@@ -5,7 +5,6 @@
     "currentlanguage": "שפה נוכחית",
     "deletesitefiles": "האם אתה בטוח שברצונך למחוק את כל הקבצים שהורדו מאתר זה?",
     "deletesitefilestitle": "מחיקת קבצי אתר",
-    "development": "פיתוח",
     "deviceinfo": "מידע אודות המכשיר",
     "deviceos": "מערכת הפעלה של המכשיר",
     "disableall": "הודעות־מערכת כבויות זמנית",
@@ -26,7 +25,6 @@
     "settings": "הגדרות",
     "sites": "אתרים",
     "spaceusage": "זיכרון בשימוש",
-    "success": "הצלחה!",
     "synchronization": "סינכרון",
     "synchronizenow": "סינכרון עכשיו",
     "synchronizing": "מסנכרן",
diff --git a/www/core/components/settings/lang/it.json b/www/core/components/settings/lang/it.json
index cefcde944c6..ea9f2b111a6 100644
--- a/www/core/components/settings/lang/it.json
+++ b/www/core/components/settings/lang/it.json
@@ -1,6 +1,5 @@
 {
     "about": "Informazioni",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App ready",
     "cacheexpirationtime": "Durata cache (millisecondi)",
     "cordovadevicemodel": "Modello del dispositivo Cordova",
@@ -12,7 +11,6 @@
     "currentlanguage": "Lingua in uso",
     "deletesitefiles": "Sei sicuro di eliminare i file scaricati dal sito '{{sitename}}'?",
     "deletesitefilestitle": "Elimina file del sito",
-    "development": "Sviluppo",
     "deviceinfo": "Informazioni sul dispositivo",
     "deviceos": "SO del dispositivo",
     "devicewebworkers": "Dispositivi Web Worker supportati",
@@ -41,7 +39,6 @@
     "sites": "Siti",
     "spaceusage": "Spazio utilizzato",
     "storagetype": "Tipo di storage",
-    "success": "Effettuato correttamente!",
     "synchronization": "Sincronizzazione",
     "synchronizenow": "Sincronizza adesso",
     "synchronizing": "Sincronizzazione in corso",
diff --git a/www/core/components/settings/lang/ja.json b/www/core/components/settings/lang/ja.json
index ff314f93d59..e0fc530bcd2 100644
--- a/www/core/components/settings/lang/ja.json
+++ b/www/core/components/settings/lang/ja.json
@@ -3,7 +3,6 @@
     "cacheexpirationtime": "キャッシュ有効期限（ミリ秒単位）",
     "currentlanguage": "現在の言語",
     "deletesitefiles": "本当にこのサイトからダウンロードしたファイルを消去しますか？",
-    "development": "開発",
     "disableall": "一時的に通知を無効にする",
     "disabled": "無効",
     "enabledebugging": "デバッグを有効にする",
diff --git a/www/core/components/settings/lang/lt.json b/www/core/components/settings/lang/lt.json
index 10f1e9f8a85..114a814c206 100644
--- a/www/core/components/settings/lang/lt.json
+++ b/www/core/components/settings/lang/lt.json
@@ -1,6 +1,5 @@
 {
     "about": "Apie",
-    "appname": "Moodle mobili {{version}}",
     "appready": "Programėlė paruošta",
     "cacheexpirationtime": "Laikinas galiojimo laikas (ms)",
     "cannotsyncoffline": "Negalima sinchronizuoti neprisijungus.",
@@ -12,12 +11,14 @@
     "cordovadeviceuuid": "Cordova įrenginio uuid",
     "cordovaversion": "Cordova versija",
     "credits": "Kreditai",
+    "currentlanguage": "Vartojama kalba",
     "deletesitefiles": "Ar esate tikri, kad norite ištrinti atsisiųstus failus iš svetainės '{{sitename}}'?",
     "deletesitefilestitle": "Ištrinti svetainės failus",
-    "development": "Kūrimas",
     "deviceinfo": "Informacija apie įrenginį",
     "deviceos": "Įrenginio OS",
     "devicewebworkers": "Įrenginio palaikymas",
+    "disableall": "Išjungti pranešimus",
+    "disabled": "Išjungta",
     "displayformat": "Rodyti formatą",
     "enabledebugging": "Leisti derinti",
     "enabledownloadsection": "Įgalinti sekciją parsiuntimą",
@@ -29,20 +30,28 @@
     "errorsyncsite": "Klaida sinchronizuojant svetainės duomenis, prašome patikrinti interneto ryšį ir pabandyti dar kartą.",
     "estimatedfreespace": "Laisva vieta",
     "filesystemroot": "Failų sistema pradžia",
+    "general": "Bendra",
+    "language": "Kalba",
+    "license": "Licencija",
     "localnotifavailable": "Prieinami vietos pranešimai",
     "locationhref": "URL peržiūra",
+    "loggedin": "Prisijungęs",
+    "loggedoff": "Neprisijungęs",
     "navigatorlanguage": "Navigatoriaus kalba",
     "navigatoruseragent": "Navigatorius userAgent",
     "networkstatus": "Interneto ryšio būsena",
+    "processorsettings": "Procesoriaus nustatymai",
     "reportinbackground": "Automatiškai pranešti apie klaidas",
+    "settings": "Parametrai",
+    "sites": "Svetainės",
     "spaceusage": "Vietos naudojimas",
     "storagetype": "Atminties tipas",
-    "success": "Sėkmė!!",
     "synchronization": "Sinchronizavimas",
     "synchronizenow": "Sinchronizuoti dabar",
     "synchronizing": "Sinchronizuojama",
     "syncsettings": "Sinchronizavimo nustatymai",
     "syncsitesuccess": "Svetainės duomenys sinchronizuoti ir visos talpyklos neveikiančios.",
+    "total": "Bendroji suma",
     "versioncode": "Versijos kodas",
     "versionname": "Versijos pavadinimas",
     "wificonnection": "WiFi ryšys"
diff --git a/www/core/components/settings/lang/nl.json b/www/core/components/settings/lang/nl.json
index ebb67953114..81291109d95 100644
--- a/www/core/components/settings/lang/nl.json
+++ b/www/core/components/settings/lang/nl.json
@@ -1,6 +1,5 @@
 {
     "about": "Over",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App klaar",
     "cacheexpirationtime": "Cache verlooptijd (milliseconden)",
     "cannotsyncoffline": "Kan offline geen bestanden synchroniseren.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Huidige taal",
     "deletesitefiles": "Weet je zeker dat je deze site en gedownloade bestanden ervan wil verwijderen?",
     "deletesitefilestitle": "Verwijder site-bestanden",
-    "development": "Ontwikkeling",
     "deviceinfo": "Toestel info",
     "deviceos": "Toestel OS",
     "devicewebworkers": "Ondersteunde Device Web Workers",
@@ -48,7 +46,6 @@
     "sites": "Sites",
     "spaceusage": "Gebruikte ruimte",
     "storagetype": "Opslagtype",
-    "success": "Gelukt!",
     "synchronization": "Synchronisatie",
     "synchronizenow": "Nu synchroniseren",
     "synchronizing": "Aan het synchroniseren...",
diff --git a/www/core/components/settings/lang/pt-br.json b/www/core/components/settings/lang/pt-br.json
index 9282cb141db..d1d1efa4b27 100644
--- a/www/core/components/settings/lang/pt-br.json
+++ b/www/core/components/settings/lang/pt-br.json
@@ -1,6 +1,5 @@
 {
     "about": "Sobre",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicativo pronto",
     "cacheexpirationtime": "Tempo de expiração do cache (milisegundos)",
     "cannotsyncoffline": "Não pode sincronizar offline.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Idioma atual",
     "deletesitefiles": "Você tem certeza que quer excluir os arquivos baixados do site '{{sitename}}'?",
     "deletesitefilestitle": "Excluir os arquivos do site",
-    "development": "Desenvolvimento",
     "deviceinfo": "Informação do dispositivo",
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
@@ -47,7 +45,6 @@
     "sites": "Sites",
     "spaceusage": "Uso do espaço",
     "storagetype": "Tipo de armazenamento",
-    "success": "Sucesso!",
     "synchronization": "Sincronização",
     "synchronizenow": "Sincronizar agora",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/pt.json b/www/core/components/settings/lang/pt.json
index e1640c0210c..206bccea67c 100644
--- a/www/core/components/settings/lang/pt.json
+++ b/www/core/components/settings/lang/pt.json
@@ -1,6 +1,5 @@
 {
     "about": "Acerca",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicação pronta",
     "cacheexpirationtime": "Intervalo de tempo para a cache expirar (milisegundos)",
     "cannotsyncoffline": "Não é possível sincronizar offline.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Idioma atual",
     "deletesitefiles": "Tem a certeza que pretende apagar os ficheiros descarregados a partir do site '{{sitename}}'?",
     "deletesitefilestitle": "Excluir os ficheiros do site",
-    "development": "Desenvolvimento",
     "deviceinfo": "Informação do dispositivo",
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
@@ -49,7 +47,6 @@
     "sites": "Sites",
     "spaceusage": "Utilização do espaço",
     "storagetype": "Tipo de armazenamento",
-    "success": "Sucesso!",
     "synchronization": "Sincronização",
     "synchronizenow": "Sincronizar agora",
     "synchronizing": "A sincronizar",
diff --git a/www/core/components/settings/lang/ro.json b/www/core/components/settings/lang/ro.json
index 5b2bcf83f36..09946ee22d7 100644
--- a/www/core/components/settings/lang/ro.json
+++ b/www/core/components/settings/lang/ro.json
@@ -1,6 +1,5 @@
 {
     "about": "Despre",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicația este pregătită",
     "cacheexpirationtime": "Timpul de expirare al cacheului (milisecunde)",
     "cordovadevicemodel": "Modelul Cordova Device",
@@ -12,7 +11,6 @@
     "currentlanguage": "Limba curenta",
     "deletesitefiles": "Sunteți sigur/ă ca doriți să ștergeți fișierele descărcate de pe siteul '{{sitename}}'?",
     "deletesitefilestitle": "Șterge fișierele de pe site",
-    "development": "Dezvoltare",
     "deviceinfo": "Informații despre dispozitiv",
     "deviceos": "Sistemul de operare al dispozitivului",
     "devicewebworkers": "Web Workers este suportat pe dispozitiv",
@@ -42,7 +40,6 @@
     "sites": "Siteuri",
     "spaceusage": "Spațiu utilizat",
     "storagetype": "Tipul stocării",
-    "success": "Succes!",
     "synchronization": "Sincronizare",
     "synchronizenow": "Sincronizați acum",
     "synchronizing": "Se sincronizeaza",
diff --git a/www/core/components/settings/lang/ru.json b/www/core/components/settings/lang/ru.json
index 5eb58abb46e..11efd2e04a9 100644
--- a/www/core/components/settings/lang/ru.json
+++ b/www/core/components/settings/lang/ru.json
@@ -1,12 +1,10 @@
 {
     "about": "О приложении",
-    "appname": "Moodle Mobile {{version}}",
     "cacheexpirationtime": "Срок действия кэша (миллисекунд)",
     "credits": "Разработчики",
     "currentlanguage": "Выбранный язык",
     "deletesitefiles": "Вы уверены, что хотите удалить файлы, скачанные с сайта «{{sitename}}»?",
     "deletesitefilestitle": "Удалить файлы сайта",
-    "development": "Разработка",
     "disableall": "Временно отключить уведомления",
     "disabled": "Отключено",
     "enabledebugging": "Включить отладку",
@@ -21,7 +19,6 @@
     "settings": "Настройки",
     "sites": "Сайты",
     "spaceusage": "Используемое пространство",
-    "success": "Успешно!",
     "synchronization": "Синхронизация",
     "synchronizing": "Синхронизация",
     "syncsitesuccess": "Данные синхронизации сайта и все кэши недействительны.",
diff --git a/www/core/components/settings/lang/sv.json b/www/core/components/settings/lang/sv.json
index 50ab6aae45a..935618d25dd 100644
--- a/www/core/components/settings/lang/sv.json
+++ b/www/core/components/settings/lang/sv.json
@@ -1,6 +1,5 @@
 {
     "about": "Om",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Appen är redo",
     "cacheexpirationtime": "Cache utgångs tid (millisekunder)",
     "cordovadevicemodel": "",
@@ -12,7 +11,6 @@
     "currentlanguage": "Aktuellt språk",
     "deletesitefiles": "Är du säker på att du vill ta bort de nedladdade filerna från den här webbplatsen?",
     "deletesitefilestitle": "Ta bort platsfiler",
-    "development": "Utveckling",
     "deviceinfo": "Info mobil enhet",
     "deviceos": "Mobil enhet operativsystem",
     "devicewebworkers": "Enheten stödjer Web Workers",
@@ -42,7 +40,6 @@
     "sites": "Webbsidor",
     "spaceusage": "Utrymmesanvändning",
     "storagetype": "Lagringstyp",
-    "success": "Framgång!",
     "synchronization": "Synkronisering",
     "synchronizenow": "Synkronisera nu",
     "synchronizing": "Synkronisera",
diff --git a/www/core/components/settings/lang/tr.json b/www/core/components/settings/lang/tr.json
index 90732afe76b..b450a65faba 100644
--- a/www/core/components/settings/lang/tr.json
+++ b/www/core/components/settings/lang/tr.json
@@ -1,10 +1,9 @@
 {
     "about": "Hakkında",
-    "appname": "Moodle Mobile {{version}}",
     "cacheexpirationtime": "Önbellek zaman aşımı (milisaniye)",
     "currentlanguage": "Geçerli dil",
     "deletesitefiles": "Bu siteden indirdiğiniz dosyaları silmek istediğinizden eminmisiniz?",
-    "development": "Gelişmiş ayarlar",
+    "disableall": "Bildirimleri devre dışı bırak",
     "disabled": "Devre dışı bırakıldı",
     "enabledebugging": "Hata ayıklamayı etkinleştir",
     "estimatedfreespace": "Tahmini boş alan",
@@ -13,6 +12,7 @@
     "license": "Lisans",
     "loggedin": "Çevrimiçi",
     "loggedoff": "Çevrim içi değil",
+    "processorsettings": "İşlemci ayarları",
     "settings": "Ayarlar",
     "sites": "Siteler",
     "spaceusage": "Kullanılan alan",
diff --git a/www/core/components/settings/lang/zh-tw.json b/www/core/components/settings/lang/zh-tw.json
index 66e3782719f..7ee451f999e 100644
--- a/www/core/components/settings/lang/zh-tw.json
+++ b/www/core/components/settings/lang/zh-tw.json
@@ -1,6 +1,5 @@
 {
     "about": "關於",
-    "appname": "Moodle行動版{{version}}",
     "appready": "應用程式已就緒",
     "cacheexpirationtime": "快取到期時間(毫秒)",
     "cannotsyncoffline": "離線狀態無法進行同步",
@@ -15,7 +14,6 @@
     "currentlanguage": "選定語言",
     "deletesitefiles": "您確定想從這個網站位置刪除已下載的檔案?",
     "deletesitefilestitle": "刪除網站檔案",
-    "development": "開發",
     "deviceinfo": "裝置資訊",
     "deviceos": "裝置作業系統",
     "devicewebworkers": "裝置網路工作站已支援",
@@ -48,7 +46,6 @@
     "sites": "網站",
     "spaceusage": "使用空間",
     "storagetype": "儲存類型",
-    "success": "成功!",
     "synchronization": "同步",
     "synchronizenow": "立即同步",
     "synchronizing": "同步中",
diff --git a/www/core/components/sharedfiles/lang/el.json b/www/core/components/sharedfiles/lang/el.json
new file mode 100644
index 00000000000..581cf18441d
--- /dev/null
+++ b/www/core/components/sharedfiles/lang/el.json
@@ -0,0 +1,4 @@
+{
+    "rename": "Μετονομασία",
+    "replace": "Αντικατάσταση"
+}
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/el.json b/www/core/components/sidemenu/lang/el.json
new file mode 100644
index 00000000000..46aa4595112
--- /dev/null
+++ b/www/core/components/sidemenu/lang/el.json
@@ -0,0 +1,5 @@
+{
+    "help": "Βοήθεια",
+    "logout": "Έξοδος",
+    "mycourses": "Τα μαθήματά μου"
+}
\ No newline at end of file
diff --git a/www/core/components/user/lang/el.json b/www/core/components/user/lang/el.json
new file mode 100644
index 00000000000..aa3e3d7b91d
--- /dev/null
+++ b/www/core/components/user/lang/el.json
@@ -0,0 +1,20 @@
+{
+    "address": "Διεύθυνση",
+    "city": "Πόλη/χωριό",
+    "country": "Χώρα",
+    "description": "Περιγραφή",
+    "details": "Παρακολούθηση λεπτομερειών",
+    "email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
+    "emailagain": "Αποστολή ηλεκτρονικού ταχυδρομείου (ξανά)",
+    "firstname": "Όνομα",
+    "interests": "Ενδιαφέροντα",
+    "invaliduser": "Μη έγκυρος χρήστης",
+    "lastname": "Επώνυμο",
+    "newpicture": "Νέα εικόνα",
+    "phone1": "Τηλέφωνο",
+    "phone2": "Κινητό τηλέφωνο",
+    "roles": "Ρόλοι",
+    "student": "Φοιτητής",
+    "viewprofile": "Επισκόπηση του προφίλ",
+    "webpage": "Ιστοσελίδα"
+}
\ No newline at end of file
diff --git a/www/core/components/user/lang/lt.json b/www/core/components/user/lang/lt.json
index 37781c2992f..794c12956b1 100644
--- a/www/core/components/user/lang/lt.json
+++ b/www/core/components/user/lang/lt.json
@@ -1,11 +1,25 @@
 {
+    "address": "Adresas",
+    "city": "Miestas / miestelis",
     "contact": "Kontaktai",
+    "country": "Šalis",
+    "description": "Aprašas",
     "details": "Detalės",
     "detailsnotavailable": "Šio vartotojo duomenys jums nepasiekiami.",
     "editingteacher": "Dėstytojas",
+    "email": "El. pašto adresas",
+    "emailagain": "El. paštas (dar kartą)",
+    "firstname": "Vardas",
+    "interests": "Pomėgiai",
     "invaliduser": "Netinkamas vartotojas.",
+    "lastname": "Pavardė",
     "manager": "Valdytojas",
+    "newpicture": "Naujas paveikslėlis",
+    "phone1": "Telefonas",
     "phone2": "Mobilus",
+    "roles": "Vaidmenys",
     "student": "Besimokantysis",
-    "teacher": "Neredaguojantis mokytojas"
+    "teacher": "Neredaguojantis mokytojas",
+    "viewprofile": "Peržiūrėti profilį",
+    "webpage": "Tinklalapis"
 }
\ No newline at end of file
diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index 46c99955516..942118016c5 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -18,6 +18,7 @@
     "completion-alt-manual-n": "غير مكتمل؛ حدد لجعل هذا العنصر مكتمل",
     "completion-alt-manual-y": "مكتمل؛ حدد لجعل هذا العنصر غير مكتمل",
     "content": "المحتوى",
+    "continue": "استمر",
     "course": "مقرر دراسي",
     "coursedetails": "تفاصيل المقرر الدراسي",
     "date": "تاريخ",
@@ -25,6 +26,7 @@
     "days": "أيام",
     "decsep": ".",
     "delete": "حذف",
+    "deleting": "حذف",
     "description": "الوصف",
     "done": "تم",
     "download": "تحميل",
@@ -36,6 +38,8 @@
     "folder": "مجلد",
     "forcepasswordchangenotice": "يجب عليك تغير كلمة المرور ليتسنى لك الاستمرار",
     "fulllistofcourses": "كل المقررات الدراسية",
+    "groupsseparate": "مجموعات منفصلة",
+    "groupsvisible": "مجموعات ظاهرة",
     "help": "مساعدة",
     "hide": "إخفاء",
     "hour": "ساعة",
@@ -50,22 +54,26 @@
     "maxsizeandattachments": "الحجم الأقصى للملفات الجديدة: {{$a.size}}, أقصى عدد للمرفقات: {{$a.attachments}}",
     "min": "الحد الأدنى",
     "mins": "الأقل",
-    "mod_assign": "مهمة",
+    "mod_assign": null,
     "mod_assignment": "مهمة",
     "mod_book": "كتاب",
     "mod_chat": "محادثة",
-    "mod_choice": "اختيار",
+    "mod_choice": "الاختيار",
     "mod_data": "قاعدة بيانات",
     "mod_database": "قاعدة بيانات",
-    "mod_feedback": "تغذية راجعة",
+    "mod_feedback": "إفادة",
     "mod_file": "ملف",
     "mod_folder": "مجلد",
-    "mod_forum": "منتدى",
+    "mod_forum": "المنتدى",
     "mod_label": "ملصق",
     "mod_lesson": "درس",
+    "mod_lti": null,
     "mod_page": "صفحة",
     "mod_quiz": "اختبار",
+    "mod_scorm": null,
+    "mod_survey": "استبيان",
     "mod_url": "رابط صفحة",
+    "mod_wiki": "ويكي",
     "mod_workshop": "ورشة عمل",
     "moduleintro": "وصف",
     "mygroups": "مجموعاتي",
@@ -79,6 +87,7 @@
     "none": "لا يوجد",
     "nopasswordchangeforced": "لا يمكنك الاستمرار دون تغيير كلمة مرورك، لكن يبدو أنه لا يوجد صفحة متوفرة لتغييرها. رجاءً قم بالاتصال بمدير مودل.",
     "nopermissions": "عذراً ولكنك لا تملك حالياً الصلاحيات لتقوم بهذا ({{$a}})",
+    "noresults": "لا توجد نتائج",
     "notice": "إشعار",
     "now": "الآن",
     "numwords": "{{$a}} كلمات",
@@ -95,6 +104,7 @@
     "save": "حفظ",
     "search": "بحث",
     "searching": "يتم البحث",
+    "searchresults": "نتائج البحث",
     "sec": "ثانية",
     "secs": "ثواني",
     "seemoredetail": "اضغط هنا لترى تفاصيل أكثر",
@@ -107,10 +117,13 @@
     "sizegb": "غيغابايت",
     "sizekb": "كيلو بايت",
     "sizemb": "ميغا بايب",
+    "start": "إبداء",
+    "submit": "سلم",
     "success": "نجاح",
     "teachers": "معلمون",
     "time": "الوقت",
     "timesup": "انتهى الوقت!",
+    "today": "اليوم",
     "unexpectederror": "خطأ غير متوقع. الرجاء الإغلاق وإعادة فتح التطبيق للمحاولة مرة أخرى",
     "unknown": "غير معروف",
     "unlimited": "بلا حدود",
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index 018e7022272..b58c5bf07c1 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -16,6 +16,7 @@
     "completion-alt-manual-y": "Завършена е дейността: {{$a}}. Изберете я за да я отбележите за незавършена.",
     "confirmdeletefile": "Сигурни ли сте, че искате да изтриете този файл?",
     "content": "Съдържание",
+    "continue": "Продължаване",
     "course": "Курс",
     "coursedetails": "Информация за курсове",
     "date": "Дата",
@@ -23,6 +24,7 @@
     "days": "дни",
     "decsep": ",",
     "delete": "Изтриване",
+    "deleting": "Изтриване",
     "description": "Описание",
     "done": "Извършено",
     "download": "Изтегляне",
@@ -34,6 +36,8 @@
     "folder": "Папка",
     "forcepasswordchangenotice": "Трябва да промените Вашата парола, преди да продължите",
     "fulllistofcourses": "Всички курсове",
+    "groupsseparate": "Отделни групи",
+    "groupsvisible": "Видими групи",
     "help": "Помощ",
     "hide": "Да не се вижда",
     "hour": "час",
@@ -52,7 +56,7 @@
     "mod_book": "Книга",
     "mod_chat": "Чат",
     "mod_choice": "Избор",
-    "mod_data": "База от данни",
+    "mod_data": "База данни",
     "mod_database": "База от данни",
     "mod_external-tool": "Външен инструмент",
     "mod_feedback": "Обратна връзка",
@@ -64,14 +68,14 @@
     "mod_imscp": "Пакет с IMS съдържание",
     "mod_label": "Етикет",
     "mod_lesson": "Урок",
-    "mod_lti": "Външен инструмент",
+    "mod_lti": null,
     "mod_page": "Страница",
-    "mod_quiz": "",
+    "mod_quiz": "Тест",
     "mod_resource": "Ресурс",
     "mod_scorm": "SCORM пакет",
-    "mod_survey": "Проучване",
+    "mod_survey": "Анкета",
     "mod_url": "URL",
-    "mod_wiki": "Wiki",
+    "mod_wiki": "Уики",
     "moduleintro": "Описание",
     "name": "Име",
     "networkerrormsg": "Мрежата не е разрешена или не работи",
@@ -83,6 +87,7 @@
     "none": "Нищо",
     "nopasswordchangeforced": "Не можете да продължите без да се променили паролата, обаче няма налична страница за промяната и. Моля, свържете се с Вашия Moodle администратор.",
     "nopermissions": "За съжаление Вие нямате право да правите това  ({{$a}})",
+    "noresults": "Няма резултати",
     "notapplicable": "няма",
     "notice": "Съобщене",
     "now": "сега",
@@ -98,6 +103,7 @@
     "save": "Запазване",
     "search": "Търсене",
     "searching": "Търсене в ...",
+    "searchresults": "Резултати от търсенето",
     "sec": "сек.",
     "secs": "сек.",
     "seemoredetail": "Щракнете тук за повече подробности",
@@ -110,9 +116,12 @@
     "sizekb": "КБ",
     "sizemb": "МБ",
     "sizetb": "ТБ",
+    "start": "Започване",
+    "submit": "Изпълняване",
     "success": "Успешно",
     "time": "Време",
     "timesup": "Времето изтече!",
+    "today": "Днес",
     "unexpectederror": "Неочаквана грешка. Моля, затворете мобилното приложение и го отворете пак, за да опитате отново.",
     "unknown": "Неизвестно",
     "unlimited": "Неограничен",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index f83adc35289..67fcd220cff 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -29,6 +29,7 @@
     "confirmopeninbrowser": "Voleu obrir-ho al navegador?",
     "content": "Contingut",
     "contenteditingsynced": "El contingut que esteu editant s'ha sincronitzat.",
+    "continue": "Continua",
     "copiedtoclipboard": "S'ha copiat el text al porta-retalls",
     "course": "Curs",
     "coursedetails": "Detalls del curs",
@@ -52,7 +53,6 @@
     "download": "Baixa",
     "downloading": "S'està descarregant",
     "edit": "Edita",
-    "elementseparator": ",",
     "error": "Error",
     "errorchangecompletion": "S'ha produït un error en carregar l'estat de la compleció. Si us plau torneu a intentar-ho.",
     "errordeletefile": "S'ha produït un error en eliminar el fitxer. Torneu-ho a provar més tard.",
@@ -68,13 +68,14 @@
     "errorrenamefile": "S'ha produït un error en reanomenar el fitxer. Torneu-ho a provar més tard.",
     "errorsync": "S'ha produït un error durant la sincronització. Torneu-ho a provar més tard.",
     "errorsyncblocked": "Aquest/a {{$a}} no es pot sincronitzar ara mateix perquè ja hi ha un procés en marxa. Torneu-ho a provar més tard. Si el problema persisteix, reinicieu l'aplicació.",
-    "fieldvalueseparator": ":",
     "filename": "Nom de fitxer",
     "filenameexist": "Ja existeix un fitxer amb el nom: {{$a}}",
     "folder": "Carpeta",
     "forcepasswordchangenotice": "Heu de canviar la contrasenya abans de continuar",
     "fulllistofcourses": "Tots els cursos",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Grups separats",
+    "groupsvisible": "Grups visibles",
     "hasdatatosync": "Aquest/a {{$a}} té dades fora de línia per sincronitzar.",
     "help": "Ajuda",
     "hide": "Oculta",
@@ -102,7 +103,7 @@
     "mod_data": "Base de dades",
     "mod_database": "Base de dades",
     "mod_external-tool": "Eina externa",
-    "mod_feedback": "Retroalimentació",
+    "mod_feedback": "Retroacció",
     "mod_file": "Fitxer",
     "mod_folder": "Carpeta",
     "mod_forum": "Fòrum",
@@ -111,7 +112,7 @@
     "mod_imscp": "Paquet de contingut IMS",
     "mod_label": "Etiqueta",
     "mod_lesson": "Lliçó",
-    "mod_lti": "Eina externa",
+    "mod_lti": "LTI",
     "mod_page": "Pàgina",
     "mod_quiz": "Qüestionari",
     "mod_resource": "Fitxer",
@@ -132,6 +133,7 @@
     "none": "Cap",
     "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya.",
     "nopermissions": "Actualment no teniu permisos per a fer això ({{$a}})",
+    "noresults": "Sense resultats",
     "notapplicable": "n/a",
     "notice": "Avís",
     "notsent": "No enviat",
@@ -156,6 +158,7 @@
     "save": "Desa",
     "search": "Cerca",
     "searching": "S'està cercant",
+    "searchresults": "Resultats de la cerca",
     "sec": "segon",
     "secs": "segons",
     "seemoredetail": "Feu clic aquí per veure més detalls",
@@ -172,12 +175,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Ho sentim...",
+    "start": "Inicia",
+    "submit": "Tramet",
     "success": "Èxit",
     "tablet": "Tablet",
     "teachers": "Professors",
     "thereisdatatosync": "Hi ha {{$a}} fora de línia per sincronitzar.",
     "time": "Hora",
     "timesup": "Temps esgotat",
+    "today": "Avui",
     "tryagain": "Torna-ho a provar",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Oh no!",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index b55965d0826..c3efd1d141d 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -28,6 +28,7 @@
     "confirmopeninbrowser": "Chcete jej otevřít v prohlížeči?",
     "content": "Obsah",
     "contenteditingsynced": "Obsah, který upravujete byl synchronizován.",
+    "continue": "Pokračovat",
     "course": "Kurz",
     "coursedetails": "Podrobnosti kurzu",
     "currentdevice": "Aktuální zařízení",
@@ -51,7 +52,6 @@
     "download": "Stáhnout",
     "downloading": "Stahování",
     "edit": "Upravit",
-    "elementseparator": ",",
     "error": "Chyba",
     "errorchangecompletion": "Při změně stavu dokončení došlo k chybě. Prosím zkuste to znovu.",
     "errordeletefile": "Chyba při odstraňování souboru. Prosím zkuste to znovu.",
@@ -72,6 +72,8 @@
     "forcepasswordchangenotice": "Před pokračováním si musíte změnit heslo.",
     "fulllistofcourses": "Všechny kurzy",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Oddělené skupiny",
+    "groupsvisible": "Viditelné skupiny",
     "hasdatatosync": "{{$a}} má offline data, která mají být synchronizována.",
     "help": "Nápověda",
     "hide": "Skrýt",
@@ -96,7 +98,7 @@
     "mod_book": "Kniha",
     "mod_chat": "Chat",
     "mod_choice": "Anketa",
-    "mod_data": "Databáse",
+    "mod_data": "Databáze",
     "mod_database": "Databáse",
     "mod_external-tool": "Externí nástroj",
     "mod_feedback": "Dotazník",
@@ -129,6 +131,7 @@
     "none": "Žádný",
     "nopasswordchangeforced": "Nelze pokračovat beze změny hesla.",
     "nopermissions": "Je mi líto, ale momentálně nemáte oprávnění vykonat tuto operaci ({{$a}})",
+    "noresults": "Bez výsledků",
     "notapplicable": "n/a",
     "notice": "Poznámka",
     "notsent": "Neodesláno",
@@ -153,6 +156,7 @@
     "save": "Uložit",
     "search": "Hledat",
     "searching": "Hledání",
+    "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
@@ -169,12 +173,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Promiňte...",
+    "start": "Začátek",
+    "submit": "Odeslat",
     "success": "Úspěch!",
     "tablet": "Tablet",
     "teachers": "Učitelé",
     "thereisdatatosync": "K dispozici jsou v  offline režimu {{$a}}, které mají být synchronizovány.",
     "time": "Čas",
     "timesup": "Čas!",
+    "today": "Dnes",
     "tryagain": "Zkuste znovu",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Herdekfilek!",
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index 68f42559239..b50e989cc6f 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -26,6 +26,7 @@
     "confirmdeletefile": "Er du sikker på at du vil slette denne fil?",
     "confirmopeninbrowser": "Vil du åbne den i en browser?",
     "content": "Indhold",
+    "continue": "Fortsæt",
     "course": "Rum",
     "coursedetails": "Kursusdetaljer",
     "datastoredoffline": "Der blev gemt data på enheden da det ikke kunne sendes. Det vil blive sendt senere.",
@@ -52,6 +53,8 @@
     "folder": "Mappe",
     "forcepasswordchangenotice": "Du skal ændre din kode inden du kan fortsætte",
     "fulllistofcourses": "Alle kurser",
+    "groupsseparate": "Separate grupper",
+    "groupsvisible": "Synlige grupper",
     "help": "Hjælp",
     "hide": "Skjul",
     "hour": "time",
@@ -74,7 +77,7 @@
     "mod_assignment": "Opgave",
     "mod_book": "Bog",
     "mod_chat": "Chat",
-    "mod_choice": "Valg",
+    "mod_choice": "Afstemning",
     "mod_data": "Database",
     "mod_database": "Database",
     "mod_external-tool": "Eksternt værktøj",
@@ -107,6 +110,7 @@
     "none": "Ingen",
     "nopasswordchangeforced": "Du kan ikke fortsætte uden at ændre din adgangskode, men der er ingen tilgængelig side at ændre den på. Kontakt venligst din Moodleadministrator.",
     "nopermissions": "Beklager, men dette ({{$a}}) har du ikke tilladelse til.",
+    "noresults": "Ingen resultater",
     "notapplicable": "n/a",
     "notice": "Bemærk",
     "now": "nu",
@@ -127,6 +131,7 @@
     "save": "Gem",
     "search": "Søg",
     "searching": "Søger",
+    "searchresults": "Søgeresultater",
     "sec": "sekunder",
     "secs": "sekunder",
     "seemoredetail": "Klik her for detaljer",
@@ -140,11 +145,14 @@
     "sizekb": "Kb",
     "sizemb": "Mb",
     "sizetb": "TB",
+    "start": "Start",
+    "submit": "Gem",
     "success": "Succes!",
     "tablet": "Tablet",
     "teachers": "Undervisere",
     "time": "Tidspunkt",
     "timesup": "Tiden er gået!",
+    "today": "I dag",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "unexpectederror": "Uventet fejl. Luk og åben programmet igen i et nyt forsøg.",
     "unknown": "Ukendt",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 3f16cae7ad6..775bdec9b20 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -29,6 +29,7 @@
     "confirmopeninbrowser": "Möchten Sie dies im Browser öffnen?",
     "content": "Inhalt",
     "contenteditingsynced": "Der Inhalt, den Sie bearbeiten, wurde synchronisiert.",
+    "continue": "Weiter",
     "copiedtoclipboard": "Text in die Zwischenablage kopiert",
     "course": "Kurs",
     "coursedetails": "Kursdetails",
@@ -53,7 +54,6 @@
     "download": "Herunterladen",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
-    "elementseparator": ";",
     "error": "Fehler",
     "errorchangecompletion": "Fehler beim Ändern des Abschlussstatus. Versuchen Sie es noch einmal.",
     "errordeletefile": "Fehler beim Löschen der Datei. Versuchen Sie es noch einmal.",
@@ -69,13 +69,14 @@
     "errorrenamefile": "Fehler beim Umbenennen der Datei. Versuchen Sie es noch einmal.",
     "errorsync": "Fehler beim Synchronisieren. Versuchen Sie es noch einmal.",
     "errorsyncblocked": "Diese(s/r) {{$ a}} kann im Moment nicht synchronisiert werden. Versuchen Sie es später noch einmal. Falls das Problem weiterhin besteht, sollten Sie die App neu starten.",
-    "fieldvalueseparator": ":",
     "filename": "Dateiname",
     "filenameexist": "Dateiname existiert bereits: {{$a}}",
     "folder": "Verzeichnis",
     "forcepasswordchangenotice": "Bitte ändern Sie Ihr Kennwort, bevor Sie weiterarbeiten",
     "fulllistofcourses": "Alle Kurse",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Getrennte Gruppen",
+    "groupsvisible": "Sichtbare Gruppen",
     "hasdatatosync": "Die Offline-Daten von {{$a}} müssen synchronisiert werden.",
     "help": "Hilfe",
     "hide": "Verbergen",
@@ -133,6 +134,7 @@
     "none": "Keine",
     "nopasswordchangeforced": "Sie können nicht weitermachen, ohne das Kennwort zu ändern.",
     "nopermissions": "Sie besitzen derzeit keine Rechte, dies zu tun ({{$a}}).",
+    "noresults": "Keine Ergebnisse",
     "notapplicable": "n/a",
     "notice": "Hinweis",
     "notsent": "Nicht gesendet",
@@ -157,6 +159,7 @@
     "save": "Speichern",
     "search": "Suchen",
     "searching": "Suchen",
+    "searchresults": "Suchergebnisse",
     "sec": "Sekunde",
     "secs": "Sekunden",
     "seemoredetail": "Hier klicken, um weitere Details sichtbar zu machen",
@@ -173,12 +176,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry ...",
+    "start": "Start",
+    "submit": "Speichern",
     "success": "Fertig!",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
     "thereisdatatosync": "Die Offline-Daten {{$a}} müssen synchronisiert werden.",
     "time": "Zeit",
     "timesup": "Zeit ist abgelaufen.",
+    "today": "Heute",
     "tryagain": "Versuchen Sie es noch einmal.",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index 947338a8097..3d8094f4a9c 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -1,10 +1,21 @@
 {
     "accounts": "Λογαριασμοί",
+    "allparticipants": "Όλοι οι συμμετέχοντες",
     "android": "Android",
+    "areyousure": "Είστε σίγουρος ;",
+    "back": "Επιστροφή",
+    "cancel": "Ακύρωση",
     "cannotconnect": "Δεν είναι δυνατή η σύνδεση: Βεβαιωθείτε ότι έχετε πληκτρολογήσει σωστά τη διεύθυνση URL και ότι το site σας χρησιμοποιεί το Moodle 2.4 ή νεότερη έκδοση.",
     "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
+    "category": "Κατηγορία",
+    "choose": "Επιλέξτε",
+    "choosedots": "Επιλέξτε...",
     "clearsearch": "Καθαρισμός αναζήτησης",
+    "clicktohideshow": "Πατήστε για επέκταση ή κατάρρευση",
     "clicktoseefull": "Κάντε κλικ για να δείτε το πλήρες περιεχόμενο.",
+    "close": "Κλείσιμο",
+    "comments": "Σχόλια",
+    "commentscount": "Σχόλια ({{$a}})",
     "commentsnotworking": "Τα σχόλια δεν μπορούν να ανακτηθούν",
     "completion-alt-auto-fail": "Ολοκληρώθηκε: {{$a}} (δεν πετύχατε βαθμό πρόσβασης)",
     "completion-alt-auto-n": "Δεν ολοκληρώθηκε: {{$a}}",
@@ -13,11 +24,22 @@
     "completion-alt-manual-n": "Δεν ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως ολοκληρωμένο.",
     "completion-alt-manual-y": "Ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως μη ολοκληρωμένο.",
     "confirmcanceledit": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν τη σελίδα; Όλες οι αλλαγές θα χαθούν.",
+    "confirmdeletefile": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmopeninbrowser": "Θέλετε να το ανοίξετε στο πρόγραμμα περιήγησης;",
+    "content": "Περιεχόμενο",
     "contenteditingsynced": "Το περιεχόμενο που επεξεργάζεστε έχει συγχρονιστεί.",
+    "continue": "Συνέχεια",
+    "course": "Μάθημα",
+    "coursedetails": "Λεπτομέρειες μαθήματος",
     "currentdevice": "Τρέχουσα συσκευή",
     "datastoredoffline": "Τα δεδομένα αποθηκεύονται στη συσκευή, διότι δεν μπορούν να σταλούν. Θα αποσταλούν αυτόματα αργότερα.",
+    "date": "Ημερομηνία",
+    "day": "ημέρα",
+    "days": "ημέρες",
+    "decsep": ",",
+    "delete": "Διαγραφή",
     "deleting": "Γίνεται διαγραφή",
+    "description": "Περιγραφή",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -25,8 +47,11 @@
     "dftimedate": "h[:]mm A",
     "discard": "Απόρριψη",
     "dismiss": "Απόρριψη",
+    "done": "Ολοκληρώθηκε",
+    "download": "Μεταφόρτωση",
     "downloading": "Κατέβασμα",
-    "elementseparator": ",",
+    "edit": "Επεξεργασία ",
+    "error": "Σφάλμα",
     "errorchangecompletion": "Παρουσιάστηκε σφάλμα κατά την αλλαγή της κατάστασης ολοκλήρωσης. Παρακαλώ προσπαθήστε ξανά.",
     "errordeletefile": "Σφάλμα κατά τη διαγραφή του αρχείου. Παρακαλώ προσπαθήστε ξανά.",
     "errordownloading": "Σφάλμα στο κατέβασμα του αρχείου.",
@@ -40,17 +65,33 @@
     "errorrenamefile": "Σφάλμα κατά τη μετονομασία του αρχείου. Παρακαλώ δοκιμάστε ξανά.",
     "errorsync": "Παρουσιάστηκε σφάλμα κατά τη διαδικασία του συγχρονισμού. Παρακαλώ δοκιμάστε ξανά.",
     "errorsyncblocked": "Αυτό το {{$a}} δεν μπορεί να συγχρονιστεί τώρα εξαιτίας μιας συνεχιζόμενης διαδικασίας. Παρακαλώ δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, δοκιμάστε να επανεκκινήσετε την εφαρμογή.",
+    "filename": "Όνομα αρχείου",
     "filenameexist": "Το όνομα του αρχείου υπάρχει ήδη: {{$a}}",
+    "folder": "Φάκελος",
+    "forcepasswordchangenotice": "Πρέπει να αλλάξετε τον κωδικό πρόσβασης για να συνεχίσετε.",
+    "fulllistofcourses": "Όλα τα μαθήματα",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Ξεχωριστές ομάδες",
+    "groupsvisible": "Ορατές ομάδες",
     "hasdatatosync": "Αυτό το {{$a}} έχει δεδομένα εκτός σύνδεσης τα οποία πρέπει να συγχρονιστούν.",
+    "help": "Βοήθεια",
+    "hide": "Απόκρυψη",
+    "hour": "ώρα",
+    "hours": "ώρες",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Εικόνα",
     "imageviewer": "Εργαλείο προβολής εικόνων",
     "info": "Πληροφορίες",
     "ios": "iOS",
+    "lastmodified": "Τελευταία τροποποίηση",
     "lastsync": "Τελευταίος συγχρονισμός",
+    "listsep": ";",
+    "loading": "Φόρτωση...",
     "lostconnection": "Η σύνδεσή σας είναι άκυρη ή έχει λήξει. Πρέπει να ξανασυνδεθείτε στο site.",
-    "mod_assign": "Εργασία",
+    "maxsizeandattachments": "Μέγιστο μέγεθος για νέα αρχεία: {{$a.size}}, μέγιστος αριθμός συνημμένων: {{$a.attachments}}",
+    "min": "λεπτό",
+    "mins": "λεπτά",
+    "mod_assign": null,
     "mod_assignment": "Εργασία",
     "mod_book": "Βιβλίο",
     "mod_chat": "Συζήτηση",
@@ -61,54 +102,102 @@
     "mod_feedback": "Ανατροφοδότηση",
     "mod_file": "Αρχείο",
     "mod_folder": "Φάκελος",
-    "mod_forum": "Forum",
+    "mod_forum": "Ομάδα Συζητήσεων",
     "mod_glossary": "Γλωσσάριο",
     "mod_ims": "IMS πακέτο περιεχομένου",
     "mod_imscp": "IMS πακέτο περιεχομένου",
     "mod_label": "Ετικέτα",
-    "mod_lesson": "Μάθημα",
-    "mod_lti": "Εξωτερικό εργαλείο",
+    "mod_lesson": "Ενότητα",
+    "mod_lti": null,
     "mod_page": "Σελίδα",
     "mod_quiz": "Κουίζ",
     "mod_resource": "Πόρος",
-    "mod_scorm": "Πακέτο SCORM",
+    "mod_scorm": "πακέτο SCORM",
     "mod_survey": "Έρευνα",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Workshop",
+    "moduleintro": "Περιγραφή",
     "mygroups": "Οι ομάδες μου",
+    "name": "Όνομα",
     "networkerrormsg": "Το δίκτυο δεν είναι ενεργοποιημένο ή δεν δουλεύει.",
+    "never": "Ποτέ",
+    "next": "Επόμενο",
+    "no": "Όχι",
+    "nocomments": "Χωρίς σχόλια",
+    "nograde": "Δεν υπάρχει βαθμός",
+    "none": "Κανένας",
     "nopasswordchangeforced": "Δεν μπορείτε να προχωρήσετε χωρίς να αλλάξετε τον κωδικό πρόσβασής σας.",
+    "nopermissions": "Συγνώμη, αλλά επί του τρεχόντως δεν έχετε το δικαίωμα να το κάνετε αυτό ({{$a}})",
+    "noresults": "Κανένα αποτέλεσμα",
     "notapplicable": "n/a",
+    "notice": "Ειδοποίηση",
     "notsent": "Δεν εστάλη",
+    "now": "τώρα",
+    "numwords": "{{$a}} λέξεις",
     "offline": "Εκτός σύνδεσης",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
     "othergroups": "Άλλες ομάδες",
+    "pagea": "Σελίδα {{$a}}",
     "percentagenumber": "{{$a}}%",
+    "phone": "Τηλέφωνο",
+    "pictureof": "Φωτογραφία {{$a}}",
+    "previous": "Προηγούμενο",
     "pulltorefresh": "Τραβήξτε προς τα κάτω για ανανέωση",
     "redirectingtosite": "Θα μεταφερθείτε στο site.",
+    "refresh": "Ανανέωση",
+    "required": "Απαιτείται",
     "requireduserdatamissing": "Αυτός ο χρήστης δεν έχει συμπληρωμένα κάποια απαιτούμενα στοιχεία του προφίλ του. Συμπληρώστε τα δεδομένα στο Moodle σας και προσπαθήστε ξανά.<br>{{$a}}",
     "retry": "Προσπαθήστε ξανά",
+    "save": "Αποθήκευση",
+    "search": "Αναζήτηση",
     "searching": "Αναζήτηση",
+    "searchresults": "Αποτελέσματα αναζήτησης",
+    "sec": "δευτερόλεπτο",
+    "secs": "δευτερόλεπτα",
+    "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
+    "send": "Αποστολή",
     "sending": "Αποστολή",
+    "show": "Προβολή",
     "showmore": "Περισσότερα...",
+    "site": "ιστοχώρος",
     "sitemaintenance": "Η ιστοσελίδα είναι υπό συντήρηση και δεν είναι άμεσα διαθέσιμη",
+    "sizeb": "bytes",
+    "sizegb": "GB",
+    "sizekb": "KB",
+    "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Λυπάμαι...",
+    "start": "Αρχή",
+    "submit": "Υποβολή",
     "success": "Επιτυχία!",
     "tablet": "Tablet",
+    "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
+    "time": "Ώρα",
+    "timesup": "Έληξε ο χρόνος!",
+    "today": "Σήμερα",
     "tryagain": "Προσπαθήστε ξανά.",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Απρόσμενο σφάλμα. Κλείστε και ανοίξτε ξανά την εφαρμογή για να προσπαθήσετε ξανά",
     "unknown": "Άγνωστο",
+    "unlimited": "Χωρίς περιορισμό",
     "unzipping": "Αποσυμπίεση",
+    "upgraderunning": "Ο ιστοχώρος βρίσκεται υπό αναβάθμιση, παρακαλώ ξαναπροσπαθήστε αργότερα.",
+    "userdeleted": "Αυτός ο λογαριασμός χρήστη έχει διαγραφεί",
+    "userdetails": "Λεπτομέρειες χρήστη",
+    "users": "Χρήστες",
+    "view": "Προβολή",
+    "viewprofile": "Επισκόπηση του προφίλ",
     "warningofflinedatadeleted": "Τα δεδομένα εκτός σύνδεσης {{component}} '{{name}}' έχουν σβηστεί. {{error}}",
     "whoops": "Oops!",
     "whyisthishappening": "Γιατί συμβαίνει αυτό;",
     "windowsphone": "Windows Phone",
-    "wsfunctionnotavailable": "Η λειτουργία διαδικτύου δεν είναι διαθέσιμη."
+    "wsfunctionnotavailable": "Η λειτουργία διαδικτύου δεν είναι διαθέσιμη.",
+    "year": "χρονιά",
+    "years": "χρονιές",
+    "yes": "Ναι"
 }
\ No newline at end of file
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index ad964232f9f..8de7b28aff1 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -29,6 +29,7 @@
     "confirmopeninbrowser": "¿Desea Usted abrirla dentro del navegador?",
     "content": "Contenido",
     "contenteditingsynced": "El contenido que Usted está editando ha sido sincronizado.",
+    "continue": "Continuar",
     "copiedtoclipboard": "Texto copiado al portapapeles",
     "course": "Curso",
     "coursedetails": "Detalles del curso",
@@ -53,7 +54,6 @@
     "download": "Descargar",
     "downloading": "Descargando",
     "edit": "Editar",
-    "elementseparator": ",",
     "error": "Error",
     "errorchangecompletion": "Ocurrió un error al cambiar el estatus de finalización. Por favor inténtelo nuevamente.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo nuevamente.",
@@ -69,13 +69,14 @@
     "errorrenamefile": "Error al renombrar el archivo. Por favor inténtelo nuevamente.",
     "errorsync": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente más tarde.",
     "errorsyncblocked": "Este/a {{$a}} no puede sincronizarse ahorita porque hay un proceso trabajando. Por favor inténtelo nuevamente más tarde. Si el problema persiste, intente reiniciar la App.",
-    "fieldvalueseparator": ":",
     "filename": "Nombre del archivo",
     "filenameexist": "El archivo ya existe: {{$a}}",
     "folder": "Carpeta",
     "forcepasswordchangenotice": "Para continuar, deberá cambiar su contraseña.",
     "fulllistofcourses": "Todos los cursos",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Grupos separados",
+    "groupsvisible": "Grupos visibles",
     "hasdatatosync": "Este/a {{$a}} tiene datos fuera-de-línea para sincronizarse.",
     "help": "Ayuda",
     "hide": "Ocultar",
@@ -100,7 +101,7 @@
     "mod_book": "Libro",
     "mod_chat": "Chat",
     "mod_choice": "Elección",
-    "mod_data": "BasedeDatos",
+    "mod_data": "Base de datos",
     "mod_database": "BasedeDatos",
     "mod_external-tool": "Herramienta externa",
     "mod_feedback": "Retroalimentación",
@@ -117,7 +118,7 @@
     "mod_quiz": "Examen",
     "mod_resource": "Recurso",
     "mod_scorm": "Paquete SCORM",
-    "mod_survey": "Encuesta",
+    "mod_survey": "Encuesta predefinida",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Taller",
@@ -133,6 +134,7 @@
     "none": "Ninguno(a)",
     "nopasswordchangeforced": "Usted no puede proceder sin cambiar su contraseña.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
+    "noresults": "No hay resultados",
     "notapplicable": "no disp.",
     "notice": "Aviso",
     "notsent": "No enviado",
@@ -157,6 +159,7 @@
     "save": "Guardar",
     "search": "Búsqueda",
     "searching": "Buscando",
+    "searchresults": "Resultados de la búsqueda",
     "sec": "seg",
     "secs": "segs",
     "seemoredetail": "Haga clic aquí para ver más detalles",
@@ -173,12 +176,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Lo siento...",
+    "start": "Inicio",
+    "submit": "Enviar",
     "success": "¡Éxito!",
     "tablet": "Tableta",
     "teachers": "Profesores",
     "thereisdatatosync": "Existen {{$a}} fuera-de-línea para ser sincronizados/as.",
     "time": "Hora",
     "timesup": "¡Se ha pasado el tiempo!",
+    "today": "Hoy",
     "tryagain": "Intentar nuevamente",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "¡Órale!",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index 911aabeeedc..3c0eceb2f94 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -28,6 +28,7 @@
     "confirmopeninbrowser": "¿Quiere abrirlo en el navegador?",
     "content": "Contenido",
     "contenteditingsynced": "El contenido que está editando ha sido sincronizado.",
+    "continue": "Continuar",
     "course": "Curso",
     "coursedetails": "Detalles del curso",
     "currentdevice": "Dispositivo actual",
@@ -50,7 +51,6 @@
     "download": "Descargar",
     "downloading": "Descargando...",
     "edit": "Editar",
-    "elementseparator": ",",
     "error": "Error",
     "errorchangecompletion": "Ha ocurrido un error cargando el grado de realización. Por favor inténtalo de nuevo.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo de nuevo.",
@@ -71,6 +71,8 @@
     "forcepasswordchangenotice": "Para continuar, deberá cambiar su contraseña.",
     "fulllistofcourses": "Todos los cursos",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Grupos separados",
+    "groupsvisible": "Grupos visibles",
     "hasdatatosync": "Este/a {{$a}} tiene datos fuera de línea para sincronizarse.",
     "help": "Ayuda",
     "hide": "Ocultar",
@@ -94,11 +96,11 @@
     "mod_assignment": "Tarea",
     "mod_book": "Libro",
     "mod_chat": "Chat",
-    "mod_choice": "Elección",
+    "mod_choice": "Consulta",
     "mod_data": "Base de datos",
     "mod_database": "Base de datos",
     "mod_external-tool": "Herramienta externa",
-    "mod_feedback": "Retroalimentación",
+    "mod_feedback": "Módulo de encuesta",
     "mod_file": "Recurso",
     "mod_folder": "Directorio",
     "mod_forum": "Foro",
@@ -107,12 +109,12 @@
     "mod_imscp": "Paquete de contenidos IMS",
     "mod_label": "Etiqueta",
     "mod_lesson": "Lección",
-    "mod_lti": "Herramienta externa",
+    "mod_lti": "LTI",
     "mod_page": "Página",
     "mod_quiz": "Cuestionario",
     "mod_resource": "Recurso",
     "mod_scorm": "Paquete SCORM",
-    "mod_survey": "Encuesta",
+    "mod_survey": "Encuesta predefinida",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Taller",
@@ -128,6 +130,7 @@
     "none": "Ninguno",
     "nopasswordchangeforced": "No puede continuar sin cambiar su contraseña.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
+    "noresults": "No hay resultados",
     "notapplicable": "n/a",
     "notice": "Noticia",
     "notsent": "No enviado",
@@ -152,6 +155,7 @@
     "save": "Guardar",
     "search": "Buscar",
     "searching": "Buscando",
+    "searchresults": "Resultados de la búsqueda",
     "sec": "segundos",
     "secs": "segundos",
     "seemoredetail": "Haga clic aquí para ver más detalles",
@@ -168,12 +172,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Disculpe...",
+    "start": "Inicio",
+    "submit": "Enviar",
     "success": "Éxito",
     "tablet": "Tablet",
     "teachers": "Profesores",
     "thereisdatatosync": "Hay {{$a}} fuera de línea pendiente de ser sincronizado.",
     "time": "Hora",
     "timesup": "¡Se ha pasado el tiempo!",
+    "today": "Hoy",
     "tryagain": "Intentar de nuevo",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "¡Oh oh!",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index d5b7ad2cfd4..b0ec2d0645b 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -29,6 +29,7 @@
     "confirmopeninbrowser": "Nabigatzailean ireki nahi duzu?",
     "content": "Edukia",
     "contenteditingsynced": "Editatzen ari zaren edukiak sinkronizatu dira.",
+    "continue": "Jarraitu",
     "copiedtoclipboard": "Testua arbelean kopiatu da",
     "course": "Ikastaroa",
     "coursedetails": "Ikastaroaren xehetasunak",
@@ -52,7 +53,6 @@
     "download": "Jaitsi",
     "downloading": "Jaisten",
     "edit": "Editatu",
-    "elementseparator": ",",
     "error": "Errorea",
     "errorchangecompletion": "Errorea gertatu da osaketa-egoera aldatzean. Mesedez saiatu berriz.",
     "errordeletefile": "Errorea fitxategia ezabatzean. Mesedez, saiatu berriz.",
@@ -68,13 +68,14 @@
     "errorrenamefile": "Errorea izena berrizendatzean. Mesedez, saiatu berriz.",
     "errorsync": "Errorea gertatu da sinkronizatzean. Mesedez, saiatu berriz.",
     "errorsyncblocked": "{{$a}} hau ezin izan da orain sinkronizatu prozesu bat martxan dagoelako. Mesedez, saiatu berriz beranduago. Arazoa errepikatzen bada, saiatu app-a berrabiarazten.",
-    "fieldvalueseparator": ":",
     "filename": "Fitxategiaren izena",
     "filenameexist": "Fitxategi-izena dagoeneko existitzen da: {{$a}}",
     "folder": "Karpeta",
     "forcepasswordchangenotice": "Jarraitzeko zure pasahitza aldatu behar duzu.",
     "fulllistofcourses": "Ikastaro guztiak",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Taldeek ezin elkar ikusi",
+    "groupsvisible": "Taldeek elkar ikusten dute",
     "hasdatatosync": "{{$a}} honek sinkronizatu beharreko lineaz kanpoko informazioa du.",
     "help": "Laguntza",
     "hide": "Ezkutatu",
@@ -97,12 +98,12 @@
     "mod_assign": "Zeregina",
     "mod_assignment": "Zeregina",
     "mod_book": "Liburua",
-    "mod_chat": "Txata",
+    "mod_chat": "Txat-gela",
     "mod_choice": "Kontsulta",
     "mod_data": "Datu-basea",
     "mod_database": "Datu-basea",
     "mod_external-tool": "Kanpoko tresna",
-    "mod_feedback": "Feedback-a",
+    "mod_feedback": "Inkesta",
     "mod_file": "Fitxategia",
     "mod_folder": "Karpeta",
     "mod_forum": "Foroa",
@@ -132,6 +133,7 @@
     "none": "Bat ere ez",
     "nopasswordchangeforced": "Ezin duzu jarraitu zure pasahitza aldatu gabe.",
     "nopermissions": "Sentitzen dugu, baina oraingoz ez duzu hori egiteko baimenik ({{$a}})",
+    "noresults": "Emaitzarik ez",
     "notapplicable": "ezin da aplikatu",
     "notice": "Abisua",
     "notsent": "Bidali gabea",
@@ -156,6 +158,7 @@
     "save": "Gorde",
     "search": "Bilatu",
     "searching": "Bilatzen",
+    "searchresults": "Bilaketaren emaitzak",
     "sec": "seg",
     "secs": "segundu",
     "seemoredetail": "Klik egin hemen xehetasun gehiago ikusteko",
@@ -172,12 +175,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Barkatu...",
+    "start": "Hasiera",
+    "submit": "Bidali",
     "success": "Ondo!",
     "tablet": "Tablet-a",
     "teachers": "Irakasleak",
     "thereisdatatosync": "Lineaz-kanpoko {{$a}} daude sinkronizatzeko .",
     "time": "Ordua",
     "timesup": "Denbora amaitu egin da!",
+    "today": "Gaur",
     "tryagain": "Saiatu berriz",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Oh oh!",
diff --git a/www/core/lang/fa.json b/www/core/lang/fa.json
index 31296e796b1..41e61af53b7 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -19,6 +19,7 @@
     "completion-alt-manual-y": "کامل شده است؛ انتخاب کنید تا به عنوان کامل شده علامت بخورد",
     "confirmdeletefile": "آیا مطمئنید که می‌خواهید این فایل را حذف کنید؟",
     "content": "محتوا",
+    "continue": "ادامه",
     "course": "درس",
     "coursedetails": "جزئیات درس",
     "date": "تاریخ",
@@ -26,6 +27,7 @@
     "days": "روز",
     "decsep": ".",
     "delete": "حذف",
+    "deleting": "در حال حذف",
     "description": "توصیف",
     "done": "پر کرده است",
     "download": "دریافت",
@@ -34,6 +36,8 @@
     "folder": "پوشه",
     "forcepasswordchangenotice": "برای پیش‌روی باید رمز ورود خود را تغییر دهید.",
     "fulllistofcourses": "همهٔ درس‌ها",
+    "groupsseparate": "گروه‌های جداگانه",
+    "groupsvisible": "گروه‌های مرئی",
     "help": "راهنمایی",
     "hide": "پنهان کردن",
     "hour": "ساعت",
@@ -47,6 +51,18 @@
     "maxsizeandattachments": "حداکثر اندازه برای فایل‌های جدید: {{$a.size}}، حداکثر تعداد فایل‌های پیوست: {{$a.attachments}}",
     "min": "دقیقه",
     "mins": "دقیقه",
+    "mod_assign": "تکلیف",
+    "mod_chat": "اتاق گفتگو",
+    "mod_choice": "انتخاب",
+    "mod_data": "بانک اطلاعاتی",
+    "mod_feedback": "بازخورد",
+    "mod_forum": "تالار گفتگو",
+    "mod_lesson": "مبحث درسی",
+    "mod_lti": "ابزار خارجی",
+    "mod_quiz": "آزمون",
+    "mod_scorm": "بستهٔ اسکورم",
+    "mod_survey": "ارزیابی",
+    "mod_wiki": "ویکی",
     "moduleintro": "توصیف",
     "name": "نام",
     "networkerrormsg": "شبکه قابل دسترسی نیست",
@@ -58,6 +74,7 @@
     "none": "هیچ",
     "nopasswordchangeforced": "شما نمی‌توانید بدون تغییر رمز عبور ادامه دهید اما هیچ صفحه‌ای برای عوض کردن آن وجود ندارد. لطفا با مدیریت سایت تماس بگیرید.",
     "nopermissions": "متأسفیم، شما مجوز انجام این کار را ندارید ({{$a}})",
+    "noresults": "بدون نتیجه",
     "notice": "اخطار",
     "now": "اکنون",
     "numwords": "{{$a}} کلمه",
@@ -72,6 +89,7 @@
     "save": "ذخیره",
     "search": "جستجو",
     "searching": "در حال جستجو در ...",
+    "searchresults": "نتیجهٔ جستجو",
     "sec": "ثانیه",
     "secs": "ثانیه",
     "seemoredetail": "برای دیدن جزئیات بیشتر اینجا را کلیک کنید",
@@ -84,15 +102,20 @@
     "sizegb": "گیگابایت",
     "sizekb": "کیلوبایت",
     "sizemb": "مگابایت",
+    "start": "آغاز",
+    "submit": "ارسال",
     "success": "موفق",
     "teachers": "استاد",
     "time": "زمان",
     "timesup": "وقت تمام شد!",
+    "today": "امروز",
     "unexpectederror": "خطای غیرمنتظره.لطفا برنامه را ببندید و دوباره اجرا نمایید",
     "unknown": "نامعلوم",
     "unlimited": "نامحدود",
+    "upgraderunning": "سایت در حال ارتقا است، لطفا بعدا تلاش کنید.",
     "userdeleted": "این حساب کاربری حذف شده است",
     "userdetails": "با جزئیات",
+    "usernotfullysetup": "کاربر به‌طور کامل برپا نشده است",
     "users": "کاربران",
     "view": "مشاهده",
     "viewprofile": "مشاهدهٔ صفحهٔ مشخصات فردی",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index 32765b1bcee..b1d51078985 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -29,6 +29,7 @@
     "confirmopeninbrowser": "Voulez-vous l'ouvrir dans le navigateur ?",
     "content": "Contenu",
     "contenteditingsynced": "Le contenu que vous modifiez a été synchronisé.",
+    "continue": "Continuer",
     "copiedtoclipboard": "Texte copié dans le presse-papier",
     "course": "Cours",
     "coursedetails": "Informations détaillées du cours",
@@ -53,7 +54,6 @@
     "download": "Télécharger",
     "downloading": "Téléchargement en cours",
     "edit": "Modifier",
-    "elementseparator": ",",
     "error": "Erreur",
     "errorchangecompletion": "Une erreur est survenue lors du changement de l'état d'achèvement. Veuillez essayer à nouveau.",
     "errordeletefile": "Erreur lors de la suppression du fichier. Veuillez essayer à nouveau.",
@@ -69,13 +69,14 @@
     "errorrenamefile": "Erreur lors du renommage du fichier. Veuillez essayer à nouveau.",
     "errorsync": "Une erreur est survenue lors de la synchronisation. Veuillez essayer plus tard.",
     "errorsyncblocked": "Ce {{$a}} ne peut pas être synchronisé à l'instant en raison d'une tâche en cours. Veuillez essayer plus tard. Si le problème persiste, veuillez relancer l'app.",
-    "fieldvalueseparator": ":",
     "filename": "Nom de fichier",
     "filenameexist": "Le nom de fichier existe déjà : {{$a}}",
     "folder": "Dossier",
     "forcepasswordchangenotice": "Vous devez changer votre mot de passe pour continuer.",
     "fulllistofcourses": "Tous les cours",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Groupes séparés",
+    "groupsvisible": "Groupes visibles",
     "hasdatatosync": "Ce {{$a}} a des données locales à synchroniser.",
     "help": "Aide",
     "hide": "Cacher",
@@ -133,6 +134,7 @@
     "none": "Aucun",
     "nopasswordchangeforced": "Vous ne pouvez pas continuer ans changer votre mot de passe.",
     "nopermissions": "Désolé, vous n'avez actuellement pas les droits d'accès requis pour effectuer ceci ({{$a}})",
+    "noresults": "Aucun résultat",
     "notapplicable": "n/a",
     "notice": "Remarque",
     "notsent": "Pas envoyé",
@@ -157,6 +159,7 @@
     "save": "Enregistrer",
     "search": "Recherche",
     "searching": "Recherche",
+    "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
     "seemoredetail": "Cliquer ici pour avoir plus de détail",
@@ -173,12 +176,15 @@
     "sizemb": "Mo",
     "sizetb": "To",
     "sorry": "Désolé...",
+    "start": "Début",
+    "submit": "Envoyer",
     "success": "Succès !",
     "tablet": "Tablette",
     "teachers": "Enseignants",
     "thereisdatatosync": "Il y a des {{$a}} locales à synchroniser",
     "time": "Heure",
     "timesup": "Le chrono est enclenché !",
+    "today": "Aujourd'hui",
     "tryagain": "Essayer encore",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Aïe !",
diff --git a/www/core/lang/he.json b/www/core/lang/he.json
index 1ef6ef8e249..47bc8596120 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -22,6 +22,7 @@
     "completion-alt-manual-y": "הושלם: {{$a}}. יש לבחור כדי לסמן כ:לא-הושלם.",
     "confirmdeletefile": "האם הינך בטוח כי ברצונך למחוק את קובץ זה?",
     "content": "תוכן",
+    "continue": "המשך",
     "course": "קורס",
     "coursedetails": "פרטי הקורס",
     "date": "תאריך",
@@ -29,6 +30,7 @@
     "days": "ימים",
     "decsep": ".",
     "delete": "מחיקה",
+    "deleting": "מוחק",
     "description": "תיאור",
     "dfdayweekmonth": "dddd, D  MMMM",
     "dflastweekdate": "dddd",
@@ -44,6 +46,8 @@
     "folder": "תיקייה",
     "forcepasswordchangenotice": "יש לשנות סיסמה כדי להמשיך",
     "fulllistofcourses": "כל הקורסים",
+    "groupsseparate": "קבוצות נפרדות",
+    "groupsvisible": "קבוצות נראות",
     "help": "עזרה",
     "hide": "הסתרה",
     "hour": "שעה",
@@ -70,20 +74,20 @@
     "mod_feedback": "שאלון מותנה",
     "mod_file": "קובץ",
     "mod_folder": "תיקיה",
-    "mod_forum": "פורום",
+    "mod_forum": "פורום (קבוצת־דיון)",
     "mod_glossary": "אגרון מונחים",
     "mod_ims": "חבילת תוכן IMS",
     "mod_imscp": "חבילת תוכן IMS",
     "mod_label": "פסקה מעוצבת",
     "mod_lesson": "שיעור",
-    "mod_lti": "כלי חיצוני LTI",
+    "mod_lti": "רכיב חיצוני (LTI)",
     "mod_page": "דף תוכן מעוצב",
     "mod_quiz": "בוחן",
     "mod_resource": "משאב",
-    "mod_scorm": "חבילת־לומדה SCORM",
-    "mod_survey": "תבנית סקרים מובנית",
+    "mod_scorm": "חבילת SCORM",
+    "mod_survey": "תבנית סקרים מובנת",
     "mod_url": "קישור",
-    "mod_wiki": "ויקי (תוצר משותף)",
+    "mod_wiki": "ויקי (תוצר־משותף)",
     "mod_workshop": "הערכת־עמיתים",
     "moduleintro": "הנחיה לפעילות",
     "name": "שם",
@@ -96,6 +100,7 @@
     "none": "אין",
     "nopasswordchangeforced": "אינך יכול להמשיך ללא שינוי הסיסמה שלך. אך נכון לעכשיו אין דף זמין בו ניתן לשנותה. אנא צור קשר עם מנהל המוודל שלך.",
     "nopermissions": "למשתמש שלכם אין את ההרשאה לבצע את הפעולה \"{{$a}}\".\n<br/>\nיש לפנות למנהל(ת) המערכת שלכם לקבלת ההרשאות המתאימות.",
+    "noresults": "אין תוצאות",
     "notapplicable": "לא זמין",
     "notice": "לתשומת לב",
     "now": "עכשיו",
@@ -115,6 +120,7 @@
     "save": "שמירה",
     "search": "חיפוש",
     "searching": "מחפש ב...",
+    "searchresults": "תוצאות חיפוש",
     "sec": "שניה",
     "secs": "שניות",
     "seemoredetail": "לחץ כאן כדי לראות פרטים נוספים",
@@ -127,11 +133,14 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "start": "התחלה",
+    "submit": "שמירה",
     "success": "הצלחה!",
     "tablet": "טאבלט",
     "teachers": "מורים",
     "time": "זמן",
     "timesup": "זמנך נגמר!",
+    "today": "היום",
     "unexpectederror": "שגיאה לא ידועה.  יש לסגור את היישום Moodle ואז לפתוח מחדש ולנסות שוב",
     "unknown": "לא ידוע",
     "unlimited": "אין הגבלה",
diff --git a/www/core/lang/hu.json b/www/core/lang/hu.json
index 9ef5e53eeda..5a2b766447f 100644
--- a/www/core/lang/hu.json
+++ b/www/core/lang/hu.json
@@ -19,6 +19,7 @@
     "completion-alt-manual-y": "Teljesítve:  {{$a}}, teljesítetlenként való megjelöléséhez válassza ki.",
     "confirmdeletefile": "Biztosan törli ezt az állományt?",
     "content": "Tartalom",
+    "continue": "Folytatás",
     "course": "Kurzus",
     "coursedetails": "Kurzusadatok",
     "date": "Dátum",
@@ -27,6 +28,7 @@
     "decsep": ",",
     "defaultvalue": "Alapeset ({{$a}})",
     "delete": "Törlés",
+    "deleting": "Törlés",
     "description": "Leírás",
     "done": "Kész",
     "download": "Letöltés",
@@ -38,6 +40,8 @@
     "folder": "Mappa",
     "forcepasswordchangenotice": "Továbblépéshez módosítsa jelszavát.",
     "fulllistofcourses": "Minden kurzus",
+    "groupsseparate": "Külön csoportok",
+    "groupsvisible": "Látható csoportok",
     "help": "Súgó",
     "hide": "Elrejtés",
     "hour": "óra",
@@ -51,6 +55,18 @@
     "maxsizeandattachments": "Új állományok maximális mérete: {{$a.size}}, maximális csatolt állomány: {{$a.attachments}}",
     "min": "p",
     "mins": "perc",
+    "mod_assign": "Feladat",
+    "mod_chat": "Csevegés",
+    "mod_choice": "Válaszlehetőség",
+    "mod_data": "Adatbázis",
+    "mod_feedback": "Visszajelzés",
+    "mod_forum": "Fórum",
+    "mod_lesson": "Lecke",
+    "mod_lti": "Külső eszköz",
+    "mod_quiz": "Teszt",
+    "mod_scorm": "SCORM-csomag",
+    "mod_survey": "Felmérés",
+    "mod_wiki": "Wiki",
     "moduleintro": "Leírás",
     "name": "Név",
     "networkerrormsg": "A hálózat nincs bekapcsolva vagy nem működik.",
@@ -62,6 +78,7 @@
     "none": "Nincs",
     "nopasswordchangeforced": "A továbblépéshez először módosítania kell a jelszavát, ehhez azonban nem áll rendelkezésre megfelelő oldal. Forduljon a Moodle rendszergazdájához.",
     "nopermissions": "Ehhez ({{$a}}) jelenleg nincs engedélye",
+    "noresults": "Nincs eredmény",
     "notice": "Tájékoztatás",
     "now": "most",
     "numwords": "{{$a}} szó",
@@ -76,6 +93,7 @@
     "save": "Mentés",
     "search": "Keresés",
     "searching": "Keresés helye ...",
+    "searchresults": "Keresési eredmények",
     "sec": "mp",
     "secs": "mp",
     "seemoredetail": "A részletekért kattintson ide",
@@ -88,10 +106,13 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "start": "Kezdés",
+    "submit": "Leadás",
     "success": "Sikerült",
     "teachers": "Tanárok",
     "time": "Idő",
     "timesup": "Ideje elfogyott",
+    "today": "Ma",
     "unexpectederror": "Váratlan hiba. Zárja be és nyissa meg újból az alkalmazást.",
     "unknown": "ismeretlen",
     "unlimited": "Korlátlan",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index ce919400a7b..2150dc7e90d 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -26,6 +26,7 @@
     "confirmdeletefile": "Sei sicuro di voler eliminare questo file?",
     "confirmopeninbrowser": "Desideri aprirlo nel browser?",
     "content": "Contenuto",
+    "continue": "Continua",
     "course": "Corso",
     "coursedetails": "Dettagli corso",
     "date": "Data",
@@ -44,7 +45,6 @@
     "download": "Scarica",
     "downloading": "Scaricamento in corso",
     "edit": "Modifica",
-    "elementseparator": ",",
     "error": "Errore",
     "errorchangecompletion": "Si è verificato un errore durante la modifica dello stato di completamento. Per favore riprova.",
     "errordeletefile": "Si è verificato un errore durante l'eliminazione del file. Per favore riprova.",
@@ -61,6 +61,8 @@
     "forcepasswordchangenotice": "È necessario cambiare la password per proseguire.",
     "fulllistofcourses": "Tutti i corsi",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Gruppi separati",
+    "groupsvisible": "Gruppi visibili",
     "help": "Aiuto",
     "hide": "Nascondi",
     "hour": "ora",
@@ -117,6 +119,7 @@
     "none": "Nessuno",
     "nopasswordchangeforced": "Non puoi proseguire senza modificare la tua password, ma non c'è una pagina per cambiarla. Contatta il tuo amministratore Moodle.",
     "nopermissions": "Spiacente, ma attualmente non avete il permesso per fare questo ({{$a}})",
+    "noresults": "Nessun risultato",
     "notapplicable": "n/d",
     "notice": "Nota",
     "now": "adesso",
@@ -139,6 +142,7 @@
     "save": "Salva",
     "search": "Cerca",
     "searching": "Ricerca in corso",
+    "searchresults": "Risultati della ricerca",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
@@ -152,11 +156,14 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "sizetb": "TB",
+    "start": "Apertura",
+    "submit": "Invia",
     "success": "OK!",
     "tablet": "Tablet",
     "teachers": "Docenti",
     "time": "Data/Ora",
     "timesup": "Tempo scaduto!",
+    "today": "Oggi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "unexpectederror": "Si è verificato un errore inatteso. Riprova chiudendo e riaprendo l'applicazione",
     "unknown": "Sconosciuto",
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 6305cfdb5a6..c36075d65b9 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -19,6 +19,7 @@
     "completion-alt-manual-y": "完了: {{$a}} 未完了マークするには選択してください。",
     "confirmdeletefile": "本当にこのファイルを削除してもよろしいですか?",
     "content": "コンテンツ",
+    "continue": "続ける",
     "course": "コース",
     "coursedetails": "コース詳細",
     "date": "日付",
@@ -27,6 +28,7 @@
     "decsep": ".",
     "defaultvalue": "デフォルト ({{$a}})",
     "delete": "削除",
+    "deleting": "削除中",
     "description": "説明",
     "done": "完了",
     "download": "ダウンロード",
@@ -38,6 +40,8 @@
     "folder": "フォルダ",
     "forcepasswordchangenotice": "続けるにはパスワードを変更してください。",
     "fulllistofcourses": "すべてのコース",
+    "groupsseparate": "分離グループ",
+    "groupsvisible": "可視グループ",
     "help": "ヘルプ",
     "hide": "非表示",
     "hour": "時間",
@@ -51,6 +55,18 @@
     "maxsizeandattachments": "新しいファイルの最大サイズ: {{$a.size}} / 最大添付: {{$a.attachments}}",
     "min": "分",
     "mins": "分",
+    "mod_assign": "課題",
+    "mod_chat": "チャット",
+    "mod_choice": "投票",
+    "mod_data": "データベース",
+    "mod_feedback": "フィードバック",
+    "mod_forum": "フォーラム",
+    "mod_lesson": "レッスン",
+    "mod_lti": "外部ツール",
+    "mod_quiz": "小テスト",
+    "mod_scorm": "SCORMパッケージ",
+    "mod_survey": "調査",
+    "mod_wiki": "Wiki",
     "moduleintro": "説明",
     "name": "名称",
     "networkerrormsg": "ネットワークが無効もしくは機能していません",
@@ -62,6 +78,7 @@
     "none": "なし",
     "nopasswordchangeforced": "あなたはパスワードを変更せずに次へ進むことはできません。しかし、パスワードを変更するため利用できるページがありません。あなたのMoodle管理者にご連絡ください。",
     "nopermissions": "申し訳ございません、現在、あなたは 「 {{$a}} 」を実行するためのパーミッションがありません。",
+    "noresults": "該当データがありません。",
     "notice": "警告",
     "now": "現在",
     "numwords": "{{$a}} 語",
@@ -76,6 +93,7 @@
     "save": "保存",
     "search": "検索",
     "searching": "検索 ...",
+    "searchresults": "検索結果",
     "sec": "秒",
     "secs": "秒",
     "seemoredetail": "詳細を見るためにはここをクリックしてください。",
@@ -88,10 +106,13 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "start": "開始",
+    "submit": "送信",
     "success": "成功",
     "teachers": "教師",
     "time": "時間",
     "timesup": "時間終了!",
+    "today": "本日",
     "unexpectederror": "不明なエラー。アプリを閉じて再起動してみてください。",
     "unknown": "不明",
     "unlimited": "無制限",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 6c1f14069fb..1fa825cfd25 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -1,10 +1,21 @@
 {
     "accounts": "Paskyros",
+    "allparticipants": "Visi dalyviai",
     "android": "Android",
+    "areyousure": "Ar Jūs tikras?",
+    "back": "Grįžti",
+    "cancel": "Atšaukti",
     "cannotconnect": "Negalima prisijungti: patikrinkite, ar teisingai įvedėte URL adresą, ar Jūsų svetainė naudoja Moodle 2.4. ar vėlesnę versiją.",
     "cannotdownloadfiles": "Jūsų mobiliuoju ryšiu negalima atsisiųsti failo. Prašome susisiekti su svetainės administratoriumi.",
+    "category": "Kursų kategorija",
+    "choose": "Pasirinkite",
+    "choosedots": "Pasirinkite...",
     "clearsearch": "Išvalyti peiškos laukelį",
+    "clicktohideshow": "Spustelėkite, kad išplėstumėte ar sutrauktumėte",
     "clicktoseefull": "Paspauskite norėdami pamatyti visą turinį.",
+    "close": "Uždaryti",
+    "comments": "Komentarai",
+    "commentscount": "Komentarai ({{$a}})",
     "commentsnotworking": "Komentarų negalima ištaisyti",
     "completion-alt-auto-fail": "Baigta: {{$a}} (nepasiekta)",
     "completion-alt-auto-n": "Nebaigta: {{$a}}",
@@ -13,11 +24,22 @@
     "completion-alt-manual-n": "Nebaigta: {{$a}}. Pažymėti, kaip baigtą",
     "completion-alt-manual-y": "Baigta: {{$a}}. Pažymėti, kaip nebaigtą.",
     "confirmcanceledit": "Ar tikrai norite išeiti iš šio puslapio? Visi pakeitimai bus prarasti.",
+    "confirmdeletefile": "Ar tikrai norite naikinti šį failą?",
     "confirmopeninbrowser": "Ar norite tai atidaryti naršyklėje?",
+    "content": "Turinys",
     "contenteditingsynced": "Turinys, kurį taisote, sinchronizuojamas.",
+    "continue": "Tęsti",
+    "course": "Kursai",
+    "coursedetails": "Kurso informacija",
     "currentdevice": "Dabartinis prietaisas",
     "datastoredoffline": "Duomenys saugomi įrenginyje, nes šiuo metu negalima išsiųsti. Bus vėlaiu išsiųsti automatiškai.",
+    "date": "Data",
+    "day": "diena",
+    "days": "dienos",
+    "decsep": ".",
+    "delete": "Naikinti",
     "deleting": "Trinama",
+    "description": "Aprašas",
     "dfdaymonthyear": "MM-DD-MMMM",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -25,8 +47,11 @@
     "dftimedate": "v:mm",
     "discard": "Atmesti",
     "dismiss": "Praleisti",
+    "done": "Atlikta",
+    "download": "Atsisiųsti",
     "downloading": "Siunčiama",
-    "elementseparator": ",",
+    "edit": "Redaguoti",
+    "error": "Klaida",
     "errorchangecompletion": "Klaida keičiant baigimo būseną. Pabandykite dar kartą.",
     "errordeletefile": "Klaida trinant failą. Pabandykite dar kartą.",
     "errordownloading": "Klaida siunčiant failą.",
@@ -40,75 +65,141 @@
     "errorrenamefile": "Klaida pervadinant failą. Bandykite dar kartą.",
     "errorsync": "Klaida sinchronizuojant. Bandykite dar kartą.",
     "errorsyncblocked": "Dėl tebevykstančių procesų {{$a}} negali būti sinchronizuojama dabar. Bandykite dar kartą. Jei nepavyksta, bandykite iš naujo paleisti programą.",
+    "filename": "Failo pavadinimas",
     "filenameexist": "Failas tokiu pavadinimu jau yra: {{$a}}",
+    "folder": "Aplankas",
+    "forcepasswordchangenotice": "Norėdami tęsti, turite pakeisti slaptažodį.",
+    "fulllistofcourses": "Visi kursai",
     "fullnameandsitename": "{{vardas, pavardė}} ({{svetainės pavadinimas}})",
+    "groupsseparate": "Atskiros grupės",
+    "groupsvisible": "Matomos grupės",
     "hasdatatosync": "{{$a}} turi duomenis, kuriuos reikia sinchronizuoti.",
+    "help": "Žinynas",
+    "hide": "Slėpti",
+    "hour": "valanda",
+    "hours": "valandos",
     "humanreadablesize": "{{dydis}} {{vienetai}}",
     "image": "Paveiksliukas",
     "imageviewer": "Paveiksliukų peržiūra",
     "info": "Informacija",
     "ios": "iOS",
+    "labelsep": ":",
+    "lastmodified": "Paskutinį kartą modifikuota",
     "lastsync": "Paskutinis sinchronizavimas",
+    "listsep": ";",
+    "loading": "Įkeliama...",
     "lostconnection": "Jūsų atpažinimo kodas neteisingas arba negalioja, turėsite vėl prisijungti prie svetainės.",
+    "maxsizeandattachments": "Maksimalus naujo failo dydis: {{$a.size}}, maksimalus priedų skaičius: {{$a.attachments}}",
+    "min": "min.",
+    "mins": "min.",
     "mod_assign": "Užduotis",
     "mod_assignment": "Užduotis",
     "mod_book": "Knyga",
-    "mod_chat": "Pokalbiai",
+    "mod_chat": "Pokalbis",
     "mod_choice": "Pasirinkimas",
     "mod_data": "Duomenų bazė",
     "mod_database": "Duomenų bazė",
     "mod_external-tool": "Išorinis įrankis",
-    "mod_feedback": "Grįžtamasis ryšys",
+    "mod_feedback": "Atsiliepimas",
     "mod_file": "Failas",
     "mod_folder": "Aplankas",
-    "mod_forum": "Forumas",
+    "mod_forum": "Diskusijos",
     "mod_glossary": "Žodynėlis",
     "mod_ims": "IMS turinio paketas",
     "mod_imscp": "IMS turinio paketas",
     "mod_label": "Etiketė",
     "mod_lesson": "Pamoka",
-    "mod_lti": "Išorinis įrankis",
+    "mod_lti": "LTI",
     "mod_page": "Puslapis",
     "mod_quiz": "Testas",
     "mod_resource": "Šaltinis",
     "mod_scorm": "SCORM paketas",
     "mod_survey": "Apklausa",
     "mod_url": "URL",
-    "mod_wiki": "Wiki",
+    "mod_wiki": "Vikis",
     "mod_workshop": "Darbas grupėje",
+    "moduleintro": "Aprašas",
     "mygroups": "Mano grupės",
+    "name": "Vardas",
     "networkerrormsg": "Tinklas nepasiekiamas arba neveikia.",
+    "never": "Niekada",
+    "next": "Pirmyn",
+    "no": "Ne",
+    "nocomments": "Jokių komentarų",
+    "nograde": "Nėra įverčio",
+    "none": "Nėra",
     "nopasswordchangeforced": "Nepakeitus slaptažodžio, negalima tęsti.",
+    "nopermissions": "Atsiprašome, tačiau šiuo metu jūs neturite teisės atlikti šio veiksmo",
+    "noresults": "Nėra rezultatų",
     "notapplicable": "netaikoma",
+    "notice": "Įspėjimas",
     "notsent": "Neišsiųsta",
+    "now": "dabar",
+    "numwords": "Žodžių: {{$a}}",
     "offline": "Neprisijungęs",
     "online": "Prisijungęs",
     "openfullimage": "Paspauskite, norėdami matyti visą vaizdą",
     "openinbrowser": "Atidaryti naršyklėje",
     "othergroups": "Kitos grupės",
+    "pagea": "{{$a}} puslapis",
     "percentagenumber": "{{$a}}%",
+    "phone": "Telefonas",
+    "pictureof": "{{$a}} paveikslėlis",
+    "previous": "Ankstesnis",
     "pulltorefresh": "Atnaujinti",
     "redirectingtosite": "Būsite nukreiptas į svetainę.",
+    "refresh": "Atnaujinti",
+    "required": "Būtina",
     "requireduserdatamissing": "Trūkta vartotojo duomenų.  Prašome užpildyti duomenis Moodle ir pabandyti dar kartą.<br>{{$a}}",
     "retry": "Bandykite dar kartą",
+    "save": "Įrašyti",
+    "search": "Ieškoti",
     "searching": "Ieškoma",
+    "searchresults": "Ieškos rezultatai",
+    "sec": "sek.",
+    "secs": "sek.",
+    "seemoredetail": "Spustelėkite čia, kad pamatytumėte daugiau informacijos",
+    "send": "Siųsti",
     "sending": "Siunčiama",
+    "serverconnection": "Klaida jungiantis į serverį",
+    "show": "Rodyti",
     "showmore": "Daugiau...",
+    "site": "Svetainė",
     "sitemaintenance": "Svetainė tvarkoma",
+    "sizeb": "baitai",
+    "sizegb": "GB",
+    "sizekb": "KB",
+    "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Atsiprašome...",
+    "start": "Pradėti",
+    "submit": "Pateikti",
     "success": "Sėkmė!",
     "tablet": "Planšetė",
+    "teachers": "Dėstytojai",
     "thereisdatatosync": "Neprijungtas {{$a}}, kad sinchronizuotų.",
+    "time": "Laikas",
+    "timesup": "Laikas baigėsi!",
+    "today": "Šiandien",
     "tryagain": "Pabandykite dar kartą",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Klaida. Uždarykite programėlę ir bandykite atidaryti dar kartą",
     "unknown": "Nežinomas",
+    "unlimited": "Neribota",
     "unzipping": "Išskleidžiama",
+    "upgraderunning": "Naujinama svetainės versija, bandykite vėliau.",
+    "userdeleted": "Ši naudotojo paskyra buvo panaikinta",
+    "userdetails": "Naudotojo informacija",
+    "users": "Naudotojai",
+    "view": "Peržiūrėti",
+    "viewprofile": "Peržiūrėti profilį",
     "warningofflinedatadeleted": "{{component}} {{name}} neprijungti duomenys  panaikinti. {{error}}",
     "whoops": "Oi!",
     "whyisthishappening": "Kodėl tai nutiko?",
     "windowsphone": "Windows telefonas",
-    "wsfunctionnotavailable": "Interneto paslaugų funkcija nepasiekiama."
+    "wsfunctionnotavailable": "Interneto paslaugų funkcija nepasiekiama.",
+    "year": "metai",
+    "years": "metai",
+    "yes": "Taip"
 }
\ No newline at end of file
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index 7e309112381..c50185c0577 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -28,6 +28,7 @@
     "confirmopeninbrowser": "Wil je het openen in je browser?",
     "content": "Inhoud",
     "contenteditingsynced": "De inhoud die je aan het bewerken bent, is gesynchroniseerd.",
+    "continue": "Ga door",
     "course": "Cursus",
     "coursedetails": "Cursusdetails",
     "currentdevice": "Huidig apparaat",
@@ -51,7 +52,6 @@
     "download": "Download",
     "downloading": "Downloaden",
     "edit": "Bewerk",
-    "elementseparator": ",",
     "error": "Fout",
     "errorchangecompletion": "Er is een fout opgetreden tijdens het wijzigen van de voltooiingsstatus. Probeer opnieuw.",
     "errordeletefile": "Fout tijdens het verwijderen van het bestand. Probeer opnieuw.",
@@ -72,6 +72,8 @@
     "forcepasswordchangenotice": "Je moet je wachtwoord wijzigen om verder te kunnen gaan",
     "fulllistofcourses": "Alle cursussen",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Gescheiden groepen",
+    "groupsvisible": "Zichtbare groepen",
     "hasdatatosync": "Dit {{$a}} heeft offline data om te synchroniseren.",
     "help": "Help",
     "hide": "Verberg",
@@ -99,7 +101,7 @@
     "mod_data": "Databank",
     "mod_database": "Databank",
     "mod_external-tool": "Externe tool",
-    "mod_feedback": "Feedback",
+    "mod_feedback": "Feedbackformulier",
     "mod_file": "Bestand",
     "mod_folder": "Map",
     "mod_forum": "Forum",
@@ -129,6 +131,7 @@
     "none": "Geen",
     "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te veranderen.",
     "nopermissions": "Sorry, maar je hebt nu niet het recht om dat te doen ({{$a}}).",
+    "noresults": "Geen resultaten",
     "notapplicable": "n/a",
     "notice": "Opmerking",
     "notsent": "Niet verstuurd",
@@ -153,6 +156,7 @@
     "save": "Bewaar",
     "search": "Zoek",
     "searching": "Zoeken",
+    "searchresults": "Zoekresultaten",
     "sec": "sec",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
@@ -169,12 +173,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry...",
+    "start": "Start",
+    "submit": "Insturen",
     "success": "Gelukt!",
     "tablet": "Tablet",
     "teachers": "Leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
     "time": "Tijd",
     "timesup": "Tijd is op!",
+    "today": "Vandaag",
     "tryagain": "Probeer opnieuw",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Ojee!",
diff --git a/www/core/lang/pl.json b/www/core/lang/pl.json
index e3e33ca723c..4fa8ac3b1ec 100644
--- a/www/core/lang/pl.json
+++ b/www/core/lang/pl.json
@@ -19,6 +19,7 @@
     "completion-alt-manual-y": "Ukończone: {{$a}}.  Wybierz, aby oznaczyć jako niezakończone",
     "confirmdeletefile": "Czy na pewno chcesz usunąć ten plik?",
     "content": "Zawartość",
+    "continue": "Kontynuuj",
     "course": "Kurs",
     "coursedetails": "Szczegóły kursu",
     "date": "Data",
@@ -26,6 +27,7 @@
     "days": "dni",
     "decsep": ",",
     "delete": "Usuń",
+    "deleting": "Usuwanie",
     "description": "Opis",
     "done": "Wykonane",
     "download": "Pobierz",
@@ -36,6 +38,8 @@
     "folder": "Folder",
     "forcepasswordchangenotice": "W celu kontynuacji musisz zmienić swoje hasło",
     "fulllistofcourses": "Wszystkie kursy",
+    "groupsseparate": "Osobne grupy",
+    "groupsvisible": "Widoczne grupy",
     "help": "Pomoc",
     "hide": "Ukryj",
     "hour": "godz.",
@@ -49,6 +53,18 @@
     "maxsizeandattachments": "Maksymalny rozmiar dla nowych plików: {{$a.size}}, maksimum załączników: {{$a.attachments}}",
     "min": "min",
     "mins": "min.",
+    "mod_assign": "Zadanie",
+    "mod_chat": "Czat",
+    "mod_choice": "Głosowanie",
+    "mod_data": "Baza Danych",
+    "mod_feedback": "Opinia zwrotna",
+    "mod_forum": "Forum",
+    "mod_lesson": "Lekcja",
+    "mod_lti": "Narzędzie zewnętrzne",
+    "mod_quiz": "Test (Quiz )",
+    "mod_scorm": "Pakiet SCORM",
+    "mod_survey": "Ankieta",
+    "mod_wiki": "Wiki",
     "moduleintro": "Opis",
     "name": "Nazwa",
     "networkerrormsg": "Sieć jest wyłączona lub nie działa.",
@@ -60,6 +76,7 @@
     "none": "Żaden",
     "nopasswordchangeforced": "Nie możesz kontynuować bez zmiany hasła, jakkolwiek nie ma dostępnej strony do tej zmiany. Proszę skontaktować się z Administratorem Moodla.",
     "nopermissions": "Brak odpowiednich uprawnień do wykonania ({{$a}})",
+    "noresults": "Brak wyników",
     "notice": "Powiadomienie",
     "now": "teraz",
     "numwords": "{{$a}} słów",
@@ -74,6 +91,7 @@
     "save": "Zapisz",
     "search": "Wyszukaj",
     "searching": "Wyszukiwanie w ...",
+    "searchresults": "Wyniki wyszukiwania",
     "sec": "sek",
     "secs": "sek.",
     "seemoredetail": "Kliknij aby zobaczyć więcej szczegółów",
@@ -86,10 +104,13 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "start": "Rozpocznij",
+    "submit": "Prześlij",
     "success": "Gotowe",
     "teachers": "Prowadzący",
     "time": "Czas",
     "timesup": "Koniec czasu",
+    "today": "Dzisiaj",
     "unexpectederror": "Niespodziewany błąd. Zamknij i otwórz aplikację ponownie aby spróbować jeszcze raz",
     "unknown": "Nieznany",
     "unlimited": "Nieograniczone",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 89e9efa4d08..2ab084735d9 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -28,6 +28,7 @@
     "confirmopeninbrowser": "Você quer abri-lo no navegador?",
     "content": "Conteúdo",
     "contenteditingsynced": "O conteúdo que você está editando foi sincronizado.",
+    "continue": "Continuar",
     "course": "Curso",
     "coursedetails": "Detalhes do curso",
     "currentdevice": "Dispositivo atual",
@@ -50,7 +51,6 @@
     "download": "Download",
     "downloading": "Baixando",
     "edit": "Editar",
-    "elementseparator": ",",
     "error": "Erro",
     "errorchangecompletion": "Ocorreu um erro ao alterar o status de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao excluir o arquivo. Por favor tente novamente.",
@@ -71,6 +71,8 @@
     "forcepasswordchangenotice": "Você tem que mudar a senha antes de continuar",
     "fulllistofcourses": "Todos os cursos",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Grupos separados",
+    "groupsvisible": "Grupos visíveis",
     "hasdatatosync": "Esse {{$a}} tem informação offline que precisar ser sincronizada.",
     "help": "Ajuda",
     "hide": "Ocultar",
@@ -93,12 +95,12 @@
     "mod_assign": "Tarefa",
     "mod_assignment": "Tarefa",
     "mod_book": "Livro",
-    "mod_chat": "Bate-papo",
+    "mod_chat": "Chat",
     "mod_choice": "Escolha",
-    "mod_data": "Banco de dados",
+    "mod_data": "Base de dados",
     "mod_database": "Banco de dados",
     "mod_external-tool": "Ferramenta externa",
-    "mod_feedback": "Feedback",
+    "mod_feedback": "Pesquisa",
     "mod_file": "Arquivo",
     "mod_folder": "Pasta",
     "mod_forum": "Fórum",
@@ -107,12 +109,12 @@
     "mod_imscp": "Conteúdo de pacote IMS",
     "mod_label": "Rótulo",
     "mod_lesson": "Lição",
-    "mod_lti": "Ferramenta externa",
+    "mod_lti": "LTI",
     "mod_page": "Página",
     "mod_quiz": "Questionário",
     "mod_resource": "Recurso",
-    "mod_scorm": "Pacote SCROM",
-    "mod_survey": "Pesquisa",
+    "mod_scorm": "Pacote SCORM",
+    "mod_survey": "Pesquisa de avaliação",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Workshop",
@@ -128,6 +130,7 @@
     "none": "Nenhum",
     "nopasswordchangeforced": "Você não pode proceder sem mudar sua senha.",
     "nopermissions": "Você não tem permissão para {{$a}}",
+    "noresults": "Nenhum resultado",
     "notapplicable": "n/a",
     "notice": "Notar",
     "notsent": "Não enviado",
@@ -152,6 +155,7 @@
     "save": "Salvar",
     "search": "Procura",
     "searching": "Procurando",
+    "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para mais detalhes",
@@ -168,12 +172,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Desculpe...",
+    "start": "Início",
+    "submit": "Enviar",
     "success": "Sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
     "time": "Hora",
     "timesup": "Acabou o tempo de duração!",
+    "today": "Hoje",
     "tryagain": "Tente de novo",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index 62e68dbba31..5c1291ed00b 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -29,6 +29,7 @@
     "confirmopeninbrowser": "Pretende abrir a ligação no navegador?",
     "content": "Conteúdo",
     "contenteditingsynced": "O conteúdo que está a editar foi sincronizado.",
+    "continue": "Continuar",
     "copiedtoclipboard": "Texto copiado para a área de transferência",
     "course": "Disciplina",
     "coursedetails": "Detalhes da disciplina",
@@ -52,7 +53,6 @@
     "download": "Descarregar",
     "downloading": "A descarregar",
     "edit": "Editar",
-    "elementseparator": ",",
     "error": "Erro",
     "errorchangecompletion": "Ocorreu um erro ao alterar o estado de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao apagar o ficheiro. Por favor, tente novamente.",
@@ -68,13 +68,14 @@
     "errorrenamefile": "Erro ao mudar o nome do ficheiro. Por favor, tente novamente.",
     "errorsync": "Ocorreu um erro durante a sincronização. Por favor, tente novamente.",
     "errorsyncblocked": "Não é possível sincronizar agora este {{$a}} devido a um outro processo já em andamento. Por favor, tente novamente mais tarde. Se o problema persistir, tente reiniciar a aplicação.",
-    "fieldvalueseparator": ":",
     "filename": "Nome do ficheiro",
     "filenameexist": "O nome do ficheiro já existe: {{$a}}",
     "folder": "Pasta",
     "forcepasswordchangenotice": "Deverá alterar a sua senha para poder continuar.",
     "fulllistofcourses": "Todas as disciplinas",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Grupos separados",
+    "groupsvisible": "Grupos visíveis",
     "hasdatatosync": "{{$a}} tem dados offline que precisam de ser sincronizados.",
     "help": "Ajuda",
     "hide": "Ocultar",
@@ -116,7 +117,7 @@
     "mod_quiz": "Teste",
     "mod_resource": "Recurso",
     "mod_scorm": "Pacote SCORM",
-    "mod_survey": "Inquérito",
+    "mod_survey": "Inquérito predefinido",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Workshop",
@@ -132,6 +133,7 @@
     "none": "Nenhum",
     "nopasswordchangeforced": "Não pode prosseguir sem alterar sua senha.",
     "nopermissions": "Atualmente, não tem permissões para realizar a operação <b>{{$a}}</b>",
+    "noresults": "Sem resultados",
     "notapplicable": "n/a",
     "notice": "Aviso",
     "notsent": "Não enviado",
@@ -156,6 +158,7 @@
     "save": "Guardar",
     "search": "Procurar",
     "searching": "A procurar",
+    "searchresults": "Procurar resultados",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para ver mais detalhes",
@@ -172,12 +175,15 @@
     "sizemb": "Mb",
     "sizetb": "TB",
     "sorry": "Desculpe...",
+    "start": "Iniciar",
+    "submit": "Submeter",
     "success": "Sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline que têm de ser sincronizados.",
     "time": "Hora",
     "timesup": "O tempo terminou!",
+    "today": "Hoje",
     "tryagain": "Tente novamente",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index 53a1186e75e..deb5b67132e 100644
--- a/www/core/lang/ro.json
+++ b/www/core/lang/ro.json
@@ -24,6 +24,7 @@
     "confirmdeletefile": "Sunteți sigur că doriți să ștergeți acest fișier?",
     "confirmopeninbrowser": "Doriți să deschideți într-un browser?",
     "content": "Conţinut",
+    "continue": "Continuă",
     "course": "Curs",
     "coursedetails": "Detalii curs",
     "date": "Dată",
@@ -41,7 +42,6 @@
     "download": "Descarcă",
     "downloading": "Se descarcă",
     "edit": "Editează",
-    "elementseparator": ",",
     "error": "Eroare",
     "errorchangecompletion": "A apărut o eroare în timpul schimbării nivelului de completare a cursului. Încercați din nou!",
     "errordownloading": "A apărut o eroare la descărcarea fișierului.",
@@ -54,6 +54,8 @@
     "folder": "Folder",
     "forcepasswordchangenotice": "Trebui să vă schimbaţi parola pentru a putea continua.",
     "fulllistofcourses": "Toate cursurile",
+    "groupsseparate": "Separă grupuri",
+    "groupsvisible": "Grupuri vizibile",
     "help": "Ajutor",
     "hide": "Ascunde",
     "hour": "oră",
@@ -72,7 +74,7 @@
     "maxsizeandattachments": "Dimensiunea maximă pentru fișierele noi: {{$a.size}}, atașamente maxime: {{$a.attachments}}",
     "min": "min",
     "mins": "min",
-    "mod_assign": "Temă",
+    "mod_assign": "Lucrare",
     "mod_assignment": "Temă",
     "mod_book": "Carte",
     "mod_chat": "Chat",
@@ -88,8 +90,8 @@
     "mod_ims": "Pachet cu conținut IMS",
     "mod_imscp": "Pachet cu conținut IMS",
     "mod_label": "Etichetă",
-    "mod_lesson": "Lecție",
-    "mod_lti": "Instrument din afara aplicației",
+    "mod_lesson": "Lecţie",
+    "mod_lti": null,
     "mod_page": "Pagină",
     "mod_quiz": "Test",
     "mod_resource": "Resursă",
@@ -109,6 +111,7 @@
     "none": "Niciunul",
     "nopasswordchangeforced": "Nu puteţi trece mai departe fără să vă schimbaţi parola, însă nu există nicio pagină în care să realizaţi această operaţiune. Vă rugăm contactaţi un administrator Moodle.",
     "nopermissions": "Ne pare rău, dar în acest moment nu aveţi permisiunea să realizaţi această operaţiune ({{$a}})",
+    "noresults": "Niciun rezultat",
     "notapplicable": "n/a",
     "notice": "Notificare",
     "now": "acum",
@@ -129,6 +132,7 @@
     "save": "Salvează",
     "search": "Caută",
     "searching": "Căutare",
+    "searchresults": "Rezultate căutare",
     "sec": "sec",
     "secs": "secs",
     "seemoredetail": "Apasă aici pentru mai multe detalii",
@@ -142,11 +146,14 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "sizetb": "TB",
+    "start": "Start",
+    "submit": "Trimite",
     "success": "Succes!",
     "tablet": "Tabletă",
     "teachers": "Profesori",
     "time": "Ora",
     "timesup": "Timpul a expirat!",
+    "today": "Azi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "unexpectederror": "A apărut o eroare neașteptată. Închideți și redeschideți aplicația pentru a încerca din nou",
     "unknown": "Necunoscut",
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index c19f784bda2..51d7861fd1f 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -22,6 +22,7 @@
     "completion-alt-manual-y": "Выполнено: {{$a}}. Выберите, чтобы отметить элемент курса как невыполненный",
     "confirmdeletefile": "Вы уверены, что хотите удалить это файл?",
     "content": "Содержимое",
+    "continue": "Продолжить",
     "course": "Курс",
     "coursedetails": "Информация о курсе",
     "date": "Дата",
@@ -30,18 +31,20 @@
     "decsep": ",",
     "defaultvalue": "Значение по умолчанию ({{$a}})",
     "delete": "Удалить",
+    "deleting": "Удаление",
     "description": "Описание",
     "done": "Завершено",
     "download": "Скачать",
     "downloading": "Загрузка",
     "edit": "Редактировать",
-    "elementseparator": ",",
     "error": "Ошибка",
     "errordownloading": "Ошибка загрузки файла",
     "filename": "Имя файла",
     "folder": "Папка",
     "forcepasswordchangenotice": "Вы должны изменить свой пароль.",
     "fulllistofcourses": "Все курсы",
+    "groupsseparate": "Изолированные группы",
+    "groupsvisible": "Видимые группы",
     "help": "Справка",
     "hide": "Скрыть",
     "hour": "ч.",
@@ -77,7 +80,7 @@
     "mod_page": "Страница",
     "mod_quiz": "Тест",
     "mod_resource": "Ресурс",
-    "mod_scorm": "SCORM-пакет",
+    "mod_scorm": "Пакет SCORM",
     "mod_survey": "Анкета",
     "mod_url": "URL",
     "mod_wiki": "Вики",
@@ -93,6 +96,7 @@
     "none": "Пусто",
     "nopasswordchangeforced": "Вы не можете продолжать работу без смены пароля, однако страница для его изменения не доступна. Пожалуйста, свяжитесь с администратором сайта.",
     "nopermissions": "Извините, но у Вас нет прав сделать это ({{$a}})",
+    "noresults": "Нет результатов",
     "notapplicable": "н/д",
     "notice": "Уведомление",
     "now": "сейчас",
@@ -109,6 +113,7 @@
     "save": "Сохранить",
     "search": "Поиск",
     "searching": "Поиск в...",
+    "searchresults": "Результаты поиска",
     "sec": "сек.",
     "secs": "сек.",
     "seemoredetail": "Детали…",
@@ -122,10 +127,13 @@
     "sizekb": "кб",
     "sizemb": "Мб",
     "sizetb": "Тб",
+    "start": "Начало",
+    "submit": "Отправить",
     "success": "Успешно",
     "teachers": "Преподаватели",
     "time": "Время",
     "timesup": "Время закончилось!",
+    "today": "Сегодня",
     "unexpectederror": "Неизвестная ошибка. Пожалуйста, закройте и снова еще раз откройте приложение",
     "unknown": "неизвестно",
     "unlimited": "Неограничено",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index 67de29d6227..41824b3f50e 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -24,6 +24,7 @@
     "confirmdeletefile": "Är Du säker på att Du vill ta bort den här filen?",
     "confirmopeninbrowser": "Vill du öppna den i webbläsaren ?",
     "content": "Innehåll",
+    "continue": "Fortsätt",
     "course": "Kurs",
     "coursedetails": "Kursinformation",
     "date": "Datum",
@@ -41,7 +42,6 @@
     "download": "Ladda ner",
     "downloading": "Laddar ner",
     "edit": "Redigera",
-    "elementseparator": ",",
     "error": "Fel",
     "errorchangecompletion": "Ett fel uppstod när du ändrade status för fullföljande. Var god försök igen.",
     "errordownloading": "Fel vid nedladdning av fil",
@@ -54,6 +54,8 @@
     "folder": "Katalog",
     "forcepasswordchangenotice": "Du måste använda Ditt lösenord för att kunna fortsätta.",
     "fulllistofcourses": "Alla kurser",
+    "groupsseparate": "Olika grupper",
+    "groupsvisible": "Synliga grupper",
     "help": "Hjälp",
     "hide": "Dölj",
     "hour": "timme",
@@ -72,10 +74,10 @@
     "maxsizeandattachments": "Maximal storlek för nya filer: {{$a.size}}, max bilagor: {{$a.attachments}}",
     "min": "minut",
     "mins": "minuter",
-    "mod_assign": "Uppgift",
+    "mod_assign": "Inlämningsuppgift",
     "mod_assignment": "Uppgift",
     "mod_book": "Bok",
-    "mod_chat": "Chat",
+    "mod_chat": "Direktsamtal",
     "mod_choice": "Opinionsundersökning",
     "mod_data": "Databas",
     "mod_database": "Databas",
@@ -89,11 +91,11 @@
     "mod_imscp": "Innehållspaket av typ IMS",
     "mod_label": "Etikett",
     "mod_lesson": "Lektion",
-    "mod_lti": "External tool",
+    "mod_lti": null,
     "mod_page": "Sida",
     "mod_quiz": "Test",
     "mod_resource": "Resurs",
-    "mod_scorm": "Scormpaket",
+    "mod_scorm": "SCORM-paket",
     "mod_survey": "Färdig enkät",
     "mod_url": "URL/Webbadress",
     "mod_wiki": "Wiki",
@@ -110,6 +112,7 @@
     "none": "Ingen",
     "nopasswordchangeforced": "Du kan inte gå vidare utan att ändra Ditt lösenord, men det finns inte någon sida tillgänglig för att ändra det. Var snäll och kontakta Din administratör för Moodle.",
     "nopermissions": "Du har tyvärr f.n. inte tillstånd att göra detta ({{$a}})",
+    "noresults": "Inga resultat",
     "notapplicable": "n/a",
     "notice": "Meddelande",
     "now": "nu",
@@ -131,6 +134,7 @@
     "save": "Spara",
     "search": "Sök",
     "searching": "Söker",
+    "searchresults": "Sökresultat",
     "sec": "Sekund",
     "secs": "Sekunder",
     "seemoredetail": "Klicka här för att se fler detaljer",
@@ -144,11 +148,14 @@
     "sizekb": "Kb",
     "sizemb": "Mb",
     "sizetb": "Tb",
+    "start": "Starta",
+    "submit": "Skicka",
     "success": "Succé!",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
     "time": "Tid",
     "timesup": "Tiden är slut!",
+    "today": "Idag",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "unexpectederror": "Oväntad fel. Stäng och öppna programmet igen för ett nytt försök.",
     "unknown": "Okänd",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index 5c526df274e..4d3df8cb624 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -23,6 +23,7 @@
     "confirmdeletefile": "Bu dosyayı silmek istediğinize emin misiniz?",
     "confirmopeninbrowser": "Tarayıcıda açmak istediğine emin misin?",
     "content": "İçerik",
+    "continue": "Devam",
     "course": "Kurs",
     "coursedetails": "Kurs ayrıntıları",
     "date": "Tarih",
@@ -30,6 +31,7 @@
     "days": "gün",
     "decsep": ",",
     "delete": "Sil",
+    "deleting": "Siliniyor",
     "description": "Açıklama",
     "done": "Tamamlandı",
     "download": "İndir",
@@ -41,6 +43,8 @@
     "folder": "Klasör",
     "forcepasswordchangenotice": "Devam etmek için şifrenizi değiştirmelisiniz.",
     "fulllistofcourses": "Tüm dersler",
+    "groupsseparate": "Ayrı gruplar",
+    "groupsvisible": "Görünür gruplar",
     "help": "Yardım",
     "hide": "Gizle",
     "hour": "saat",
@@ -57,12 +61,14 @@
     "maxsizeandattachments": "Yeni dosyalar için azami büyüklük: {{$a.size}}, azami ek: {{$a.attachments}}",
     "min": "dk",
     "mins": "dk",
+    "mod_assign": "Ödev",
     "mod_book": "Kitap",
     "mod_chat": "Sohbet",
-    "mod_choice": "Seçenek",
+    "mod_choice": "Anket",
     "mod_data": "Veritabanı",
     "mod_database": "Veritabanı",
     "mod_external-tool": "Harici araç",
+    "mod_feedback": "Geribildirim",
     "mod_file": "Dosya",
     "mod_folder": "Klasör",
     "mod_forum": "Forum",
@@ -71,11 +77,12 @@
     "mod_imscp": "İMS içerik paketi",
     "mod_label": "Etiket",
     "mod_lesson": "Ders",
+    "mod_lti": null,
     "mod_page": "Sayfa",
     "mod_quiz": "Sınav",
     "mod_resource": "Kaynak",
     "mod_scorm": "SCORM paketi",
-    "mod_survey": "Anket",
+    "mod_survey": "Anket Formu",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Çalıştay",
@@ -91,6 +98,7 @@
     "none": "Hiçbiri",
     "nopasswordchangeforced": "Şifrenizi değiştirmeden ilerleyemezsiniz, ancak şifrenizi değiştirmek için bir sayfa yok. Lütfen Moodle Yöneticinizle iletişime geçin.",
     "nopermissions": "Üzgünüz, şu anda bunu yapmaya yetkiniz yok: {{$a}}",
+    "noresults": "Sonuç yok",
     "notice": "Uyarı",
     "now": "şimdi",
     "numwords": "{{$a}} kelime",
@@ -107,6 +115,7 @@
     "save": "Kaydet",
     "search": "Ara",
     "searching": "Aranıyor",
+    "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
     "seemoredetail": "Ayrıntıları görmek için tıklayınız",
@@ -121,11 +130,14 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "sorry": "Üzgünüz...",
+    "start": "Başla",
+    "submit": "Gönder",
     "success": "Başarılı",
     "tablet": "Tablet",
     "teachers": "Eğitimciler",
     "time": "Zaman",
     "timesup": "Süre doldu!",
+    "today": "Bugün",
     "unexpectederror": "Beklenmeyen hata. Lütfen uygulamanızı yeniden açın ve tekrar deneyin",
     "unknown": "Bilinmeyen",
     "unlimited": "Limitsiz",
diff --git a/www/core/lang/zh-cn.json b/www/core/lang/zh-cn.json
index bf017fa6738..b97b6694361 100644
--- a/www/core/lang/zh-cn.json
+++ b/www/core/lang/zh-cn.json
@@ -19,6 +19,7 @@
     "completion-alt-manual-y": "已完成：{{$a}}。点击标记为未完成。",
     "confirmdeletefile": "您确信要删除此文件？",
     "content": "内容",
+    "continue": "继续",
     "course": "课程",
     "coursedetails": "课程详情",
     "date": "日期",
@@ -26,6 +27,7 @@
     "days": "天",
     "decsep": ".",
     "delete": "删除",
+    "deleting": "删除中",
     "description": "描述",
     "done": "完成",
     "download": "下载",
@@ -35,6 +37,8 @@
     "folder": "文件夹",
     "forcepasswordchangenotice": "继续下去之前，您必须修改您的密码。",
     "fulllistofcourses": "所有课程",
+    "groupsseparate": "分隔小组",
+    "groupsvisible": "可视小组",
     "help": "帮助",
     "hide": "隐藏",
     "hour": "小时",
@@ -48,6 +52,18 @@
     "maxsizeandattachments": "新文件的最大尺寸： {{$a.size}} ，最多附件：{{$a.attachments}}",
     "min": "分钟",
     "mins": "分钟",
+    "mod_assign": "作业",
+    "mod_chat": "聊天",
+    "mod_choice": "投票",
+    "mod_data": "数据库",
+    "mod_feedback": "反馈",
+    "mod_forum": "讨论区",
+    "mod_lesson": "程序教学",
+    "mod_lti": "LTI",
+    "mod_quiz": "测验",
+    "mod_scorm": "SCORM 课件",
+    "mod_survey": "问卷调查",
+    "mod_wiki": "Wiki协作",
     "moduleintro": "描述",
     "name": "名称",
     "networkerrormsg": "网络未启用或不工作。",
@@ -59,6 +75,7 @@
     "none": "无",
     "nopasswordchangeforced": "在您更改密码前不能继续操作，但系统找不到用来更改密码的页面，请与管理员联系。",
     "nopermissions": "很抱歉，您没有相应权限（{{$a}}）",
+    "noresults": "没有结果",
     "notice": "注意",
     "now": "现在",
     "numwords": "{{$a}}单词",
@@ -73,6 +90,7 @@
     "save": "保存",
     "search": "搜索",
     "searching": "搜索",
+    "searchresults": "搜索结果",
     "sec": "秒",
     "secs": "秒",
     "seemoredetail": "点击这里看更多细节",
@@ -85,10 +103,13 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "start": "开始",
+    "submit": "提交",
     "success": "成功",
     "teachers": "教师",
     "time": "时间",
     "timesup": "时间到！",
+    "today": "今天",
     "unexpectederror": "意外出错。请关闭并重新打开APP再试一次",
     "unknown": "未知",
     "unlimited": "无限制",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index cb004de6009..5183ee101d5 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -28,6 +28,7 @@
     "confirmopeninbrowser": "你想要在瀏覽器內開啟嗎?",
     "content": "內容",
     "contenteditingsynced": "您正在編輯的內容已同步.",
+    "continue": "繼續",
     "course": "課程",
     "coursedetails": "課程細節",
     "currentdevice": "目前的裝置",
@@ -51,7 +52,6 @@
     "download": "下載",
     "downloading": "下載中",
     "edit": "編修",
-    "elementseparator": ",",
     "error": "錯誤",
     "errorchangecompletion": "更改完成狀態時發生錯誤. 請再試一次.",
     "errordeletefile": "刪除檔案時出錯. 請再試一次.",
@@ -72,6 +72,8 @@
     "forcepasswordchangenotice": "您必須修改您的密碼才能繼續進行。",
     "fulllistofcourses": "所有課程",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "分隔群組",
+    "groupsvisible": "可視群組",
     "hasdatatosync": "此{{$ a}}有離線資料要同步.",
     "help": "輔助說明",
     "hide": "隱藏",
@@ -91,15 +93,15 @@
     "maxsizeandattachments": "新檔案的最大容量： {{$a.size}} ，最多附件：{{$a.attachments}}",
     "min": "分鐘",
     "mins": "分鐘",
-    "mod_assign": "分配",
+    "mod_assign": "作業",
     "mod_assignment": "分配",
     "mod_book": "預定",
-    "mod_chat": "交談",
-    "mod_choice": "選擇",
+    "mod_chat": "聊天室",
+    "mod_choice": "票選活動",
     "mod_data": "資料庫",
     "mod_database": "資料庫",
     "mod_external-tool": "外部工具",
-    "mod_feedback": "回饋",
+    "mod_feedback": "回饋單",
     "mod_file": "檔案",
     "mod_folder": "資料夾",
     "mod_forum": "討論區",
@@ -107,15 +109,15 @@
     "mod_ims": "IMS內容套件",
     "mod_imscp": "IMS內容套件",
     "mod_label": "標籤",
-    "mod_lesson": "課程",
-    "mod_lti": "外部工具",
+    "mod_lesson": "編序學習",
+    "mod_lti": "學習工具互通",
     "mod_page": "分頁",
-    "mod_quiz": "測驗",
+    "mod_quiz": "測驗卷",
     "mod_resource": "資源",
-    "mod_scorm": "SCORM套件",
-    "mod_survey": "調查",
+    "mod_scorm": "SCORM包裹",
+    "mod_survey": "問卷",
     "mod_url": "網址",
-    "mod_wiki": "維基百科",
+    "mod_wiki": "Wiki共筆",
     "mod_workshop": "工作坊",
     "moduleintro": "說明",
     "mygroups": "我的群組",
@@ -129,6 +131,7 @@
     "none": "無",
     "nopasswordchangeforced": "你若沒有更新密碼無法進行此處理",
     "nopermissions": "抱歉，但是您目前沒有權限執行({{$a}})",
+    "noresults": "沒有結果",
     "notapplicable": "n/a",
     "notice": "注意",
     "notsent": "沒有傳送",
@@ -153,6 +156,7 @@
     "save": "儲存",
     "search": "搜尋",
     "searching": "搜尋中",
+    "searchresults": "搜尋結果",
     "sec": "秒",
     "secs": "秒",
     "seemoredetail": "按此以觀看更多細節",
@@ -169,12 +173,15 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "抱歉...",
+    "start": "開始",
+    "submit": "送出",
     "success": "成功!",
     "tablet": "平板",
     "teachers": "教師",
     "thereisdatatosync": "有離線的{{$ a}}要同步",
     "time": "時間",
     "timesup": "時間到",
+    "today": "今日",
     "tryagain": "再試一次",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "噢哦!",

From 38373720573a04a7cff97b19660b5574802871d1 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 19 May 2017 13:06:29 +0200
Subject: [PATCH 182/218] MOBILE-2103 release: Sync languages from AMOS

---
 www/addons/calendar/lang/cs.json              |  1 +
 www/addons/calendar/lang/fa.json              |  5 ++++
 www/addons/calendar/lang/nl.json              |  1 +
 www/addons/calendar/lang/pt-br.json           |  1 +
 www/addons/competency/lang/ar.json            |  1 +
 www/addons/competency/lang/ca.json            |  1 +
 www/addons/competency/lang/cs.json            |  1 +
 www/addons/competency/lang/da.json            |  1 +
 www/addons/competency/lang/de.json            |  1 +
 www/addons/competency/lang/el.json            |  1 +
 www/addons/competency/lang/es-mx.json         |  1 +
 www/addons/competency/lang/es.json            |  1 +
 www/addons/competency/lang/eu.json            |  1 +
 www/addons/competency/lang/fa.json            |  2 ++
 www/addons/competency/lang/fr.json            |  1 +
 www/addons/competency/lang/it.json            |  1 +
 www/addons/competency/lang/lt.json            |  1 +
 www/addons/competency/lang/nl.json            |  1 +
 www/addons/competency/lang/pt-br.json         |  1 +
 www/addons/competency/lang/pt.json            |  1 +
 www/addons/competency/lang/ru.json            |  1 +
 www/addons/competency/lang/tr.json            |  1 +
 www/addons/competency/lang/zh-tw.json         |  1 +
 www/addons/coursecompletion/lang/fa.json      |  2 +-
 www/addons/files/lang/ar.json                 | 22 +++++++++++++++-
 www/addons/files/lang/bg.json                 |  4 +++
 www/addons/files/lang/ca.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/cs.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/da.json                 | 23 +++++++++++++++-
 www/addons/files/lang/de.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/el.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/es-mx.json              | 26 ++++++++++++++++++-
 www/addons/files/lang/es.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/eu.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/fa.json                 |  4 +++
 www/addons/files/lang/fr.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/he.json                 |  4 +++
 www/addons/files/lang/it.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/ja.json                 |  2 ++
 www/addons/files/lang/lt.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/nl.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/pt-br.json              | 26 ++++++++++++++++++-
 www/addons/files/lang/pt.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/ro.json                 |  4 +++
 www/addons/files/lang/ru.json                 | 26 ++++++++++++++++++-
 www/addons/files/lang/sv.json                 |  4 +++
 www/addons/files/lang/tr.json                 |  9 ++++++-
 www/addons/files/lang/zh-cn.json              |  8 +++++-
 www/addons/files/lang/zh-tw.json              | 26 ++++++++++++++++++-
 www/addons/frontpage/lang/ar.json             |  1 +
 www/addons/frontpage/lang/bg.json             |  1 +
 www/addons/frontpage/lang/ca.json             |  1 +
 www/addons/frontpage/lang/cs.json             |  1 +
 www/addons/frontpage/lang/da.json             |  1 +
 www/addons/frontpage/lang/de.json             |  1 +
 www/addons/frontpage/lang/el.json             |  1 +
 www/addons/frontpage/lang/es-mx.json          |  1 +
 www/addons/frontpage/lang/es.json             |  1 +
 www/addons/frontpage/lang/eu.json             |  1 +
 www/addons/frontpage/lang/fr.json             |  1 +
 www/addons/frontpage/lang/he.json             |  1 +
 www/addons/frontpage/lang/it.json             |  1 +
 www/addons/frontpage/lang/ja.json             |  1 +
 www/addons/frontpage/lang/lt.json             |  1 +
 www/addons/frontpage/lang/nl.json             |  1 +
 www/addons/frontpage/lang/pt-br.json          |  1 +
 www/addons/frontpage/lang/pt.json             |  1 +
 www/addons/frontpage/lang/ro.json             |  1 +
 www/addons/frontpage/lang/ru.json             |  1 +
 www/addons/frontpage/lang/sv.json             |  1 +
 www/addons/frontpage/lang/zh-tw.json          |  1 +
 www/addons/grades/lang/bg.json                |  1 +
 www/addons/grades/lang/ca.json                |  1 +
 www/addons/grades/lang/cs.json                |  1 +
 www/addons/grades/lang/da.json                |  1 +
 www/addons/grades/lang/de.json                |  1 +
 www/addons/grades/lang/el.json                |  1 +
 www/addons/grades/lang/es-mx.json             |  1 +
 www/addons/grades/lang/es.json                |  1 +
 www/addons/grades/lang/eu.json                |  1 +
 www/addons/grades/lang/fr.json                |  1 +
 www/addons/grades/lang/he.json                |  1 +
 www/addons/grades/lang/it.json                |  1 +
 www/addons/grades/lang/ja.json                |  1 +
 www/addons/grades/lang/lt.json                |  1 +
 www/addons/grades/lang/nl.json                |  1 +
 www/addons/grades/lang/pt-br.json             |  1 +
 www/addons/grades/lang/pt.json                |  1 +
 www/addons/grades/lang/ro.json                |  1 +
 www/addons/grades/lang/ru.json                |  1 +
 www/addons/grades/lang/tr.json                |  1 +
 www/addons/grades/lang/zh-cn.json             |  1 +
 www/addons/grades/lang/zh-tw.json             |  1 +
 .../messageoutput/airnotifier/lang/fa.json    |  3 +++
 www/addons/messages/lang/cs.json              |  4 +++
 www/addons/messages/lang/de.json              |  1 +
 www/addons/messages/lang/fa.json              |  2 ++
 www/addons/messages/lang/nl.json              |  4 +++
 www/addons/messages/lang/pt-br.json           |  5 ++++
 www/addons/messages/lang/pt.json              |  1 +
 www/addons/messages/lang/ro.json              |  1 +
 www/addons/messages/lang/ru.json              |  2 ++
 www/addons/mod/assign/lang/ca.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/cs.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/da.json            |  1 +
 www/addons/mod/assign/lang/de.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/es-mx.json         | 15 ++++++++++-
 www/addons/mod/assign/lang/es.json            | 14 +++++++++-
 www/addons/mod/assign/lang/eu.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/fr.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/he.json            |  1 +
 www/addons/mod/assign/lang/it.json            |  3 +++
 www/addons/mod/assign/lang/nl.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/pt-br.json         | 15 ++++++++++-
 www/addons/mod/assign/lang/pt.json            | 15 ++++++++++-
 www/addons/mod/assign/lang/ro.json            |  1 +
 www/addons/mod/assign/lang/ru.json            |  2 ++
 www/addons/mod/assign/lang/sv.json            |  1 +
 www/addons/mod/assign/lang/zh-tw.json         | 14 +++++++++-
 www/addons/mod/choice/lang/ar.json            |  2 +-
 www/addons/mod/choice/lang/ca.json            |  4 +--
 www/addons/mod/choice/lang/cs.json            |  4 +--
 www/addons/mod/choice/lang/da.json            |  4 +--
 www/addons/mod/choice/lang/de.json            |  4 +--
 www/addons/mod/choice/lang/el.json            |  4 +--
 www/addons/mod/choice/lang/es-mx.json         |  4 +--
 www/addons/mod/choice/lang/es.json            |  4 +--
 www/addons/mod/choice/lang/eu.json            |  4 +--
 www/addons/mod/choice/lang/fr.json            |  4 +--
 www/addons/mod/choice/lang/it.json            |  4 +--
 www/addons/mod/choice/lang/lt.json            |  4 +--
 www/addons/mod/choice/lang/nl.json            |  4 +--
 www/addons/mod/choice/lang/pt-br.json         |  4 +--
 www/addons/mod/choice/lang/pt.json            |  4 +--
 www/addons/mod/choice/lang/ro.json            |  4 +--
 www/addons/mod/choice/lang/sv.json            |  4 +--
 www/addons/mod/choice/lang/zh-tw.json         |  4 +--
 www/addons/mod/forum/lang/ca.json             |  2 ++
 www/addons/mod/forum/lang/cs.json             |  2 ++
 www/addons/mod/forum/lang/da.json             |  4 ++-
 www/addons/mod/forum/lang/de.json             |  4 ++-
 www/addons/mod/forum/lang/el.json             |  2 ++
 www/addons/mod/forum/lang/es-mx.json          |  4 ++-
 www/addons/mod/forum/lang/es.json             |  2 ++
 www/addons/mod/forum/lang/eu.json             |  2 ++
 www/addons/mod/forum/lang/fa.json             |  6 ++++-
 www/addons/mod/forum/lang/fr.json             |  4 ++-
 www/addons/mod/forum/lang/he.json             |  2 +-
 www/addons/mod/forum/lang/it.json             |  2 +-
 www/addons/mod/forum/lang/lt.json             |  4 ++-
 www/addons/mod/forum/lang/nl.json             |  4 ++-
 www/addons/mod/forum/lang/pt-br.json          |  4 ++-
 www/addons/mod/forum/lang/pt.json             |  2 ++
 www/addons/mod/forum/lang/ro.json             |  2 +-
 www/addons/mod/forum/lang/ru.json             |  4 ++-
 www/addons/mod/forum/lang/sv.json             |  2 +-
 www/addons/mod/forum/lang/zh-tw.json          |  4 ++-
 www/addons/mod/glossary/lang/cs.json          |  3 +++
 www/addons/mod/glossary/lang/nl.json          |  3 +++
 www/addons/mod/glossary/lang/pt-br.json       |  3 +++
 www/addons/mod/glossary/lang/ru.json          |  4 +++
 www/addons/mod/label/lang/ca.json             |  3 ++-
 www/addons/mod/label/lang/cs.json             |  3 ++-
 www/addons/mod/label/lang/da.json             |  3 ++-
 www/addons/mod/label/lang/de.json             |  3 ++-
 www/addons/mod/label/lang/el.json             |  3 ++-
 www/addons/mod/label/lang/es-mx.json          |  3 ++-
 www/addons/mod/label/lang/es.json             |  3 ++-
 www/addons/mod/label/lang/eu.json             |  3 ++-
 www/addons/mod/label/lang/fr.json             |  3 ++-
 www/addons/mod/label/lang/he.json             |  3 ++-
 www/addons/mod/label/lang/it.json             |  3 ++-
 www/addons/mod/label/lang/lt.json             |  3 ++-
 www/addons/mod/label/lang/nl.json             |  3 ++-
 www/addons/mod/label/lang/pt-br.json          |  3 ++-
 www/addons/mod/label/lang/pt.json             |  3 ++-
 www/addons/mod/label/lang/ro.json             |  3 ++-
 www/addons/mod/label/lang/ru.json             |  3 ++-
 www/addons/mod/label/lang/sv.json             |  3 ++-
 www/addons/mod/label/lang/zh-tw.json          |  3 ++-
 www/addons/mod/quiz/lang/fa.json              |  1 +
 www/addons/mod/quiz/lang/ru.json              |  1 +
 www/addons/mod/scorm/lang/ca.json             |  1 +
 www/addons/mod/scorm/lang/cs.json             |  1 +
 www/addons/mod/scorm/lang/da.json             |  1 +
 www/addons/mod/scorm/lang/de.json             |  1 +
 www/addons/mod/scorm/lang/el.json             |  1 +
 www/addons/mod/scorm/lang/es-mx.json          |  1 +
 www/addons/mod/scorm/lang/es.json             |  1 +
 www/addons/mod/scorm/lang/eu.json             |  1 +
 www/addons/mod/scorm/lang/fa.json             |  2 ++
 www/addons/mod/scorm/lang/fr.json             |  1 +
 www/addons/mod/scorm/lang/it.json             |  1 +
 www/addons/mod/scorm/lang/lt.json             |  1 +
 www/addons/mod/scorm/lang/nl.json             |  1 +
 www/addons/mod/scorm/lang/pt-br.json          |  1 +
 www/addons/mod/scorm/lang/pt.json             |  1 +
 www/addons/mod/scorm/lang/ro.json             |  1 +
 www/addons/mod/scorm/lang/ru.json             |  4 +++
 www/addons/mod/scorm/lang/sv.json             |  1 +
 www/addons/mod/scorm/lang/tr.json             |  1 +
 www/addons/mod/scorm/lang/zh-tw.json          |  1 +
 www/addons/mod/survey/lang/fa.json            |  1 +
 www/addons/mod/wiki/lang/fa.json              |  1 +
 www/addons/mod/wiki/lang/ru.json              |  4 +++
 www/core/components/contentlinks/lang/ru.json |  3 +++
 www/core/components/course/lang/bg.json       |  4 ++-
 www/core/components/course/lang/ca.json       |  7 ++++-
 www/core/components/course/lang/cs.json       |  8 +++++-
 www/core/components/course/lang/da.json       |  7 ++++-
 www/core/components/course/lang/de.json       |  9 +++++--
 www/core/components/course/lang/el.json       |  7 ++++-
 www/core/components/course/lang/es-mx.json    |  7 ++++-
 www/core/components/course/lang/es.json       |  7 ++++-
 www/core/components/course/lang/eu.json       |  7 ++++-
 www/core/components/course/lang/fa.json       | 14 ++++++++--
 www/core/components/course/lang/fr.json       |  7 ++++-
 www/core/components/course/lang/he.json       |  6 ++++-
 www/core/components/course/lang/it.json       |  7 ++++-
 www/core/components/course/lang/lt.json       |  7 ++++-
 www/core/components/course/lang/nl.json       |  8 +++++-
 www/core/components/course/lang/pt-br.json    |  8 +++++-
 www/core/components/course/lang/pt.json       |  7 ++++-
 www/core/components/course/lang/ro.json       |  7 ++++-
 www/core/components/course/lang/ru.json       |  6 ++++-
 www/core/components/course/lang/sv.json       |  7 ++++-
 www/core/components/course/lang/zh-tw.json    |  7 ++++-
 www/core/components/courses/lang/cs.json      |  2 ++
 www/core/components/courses/lang/fa.json      |  3 +++
 www/core/components/courses/lang/nl.json      |  2 ++
 www/core/components/courses/lang/pt-br.json   |  2 ++
 www/core/components/fileuploader/lang/fa.json |  2 ++
 .../components/fileuploader/lang/zh-cn.json   |  6 ++---
 www/core/components/login/lang/ca.json        |  2 ++
 www/core/components/login/lang/cs.json        |  4 +++
 www/core/components/login/lang/da.json        |  2 ++
 www/core/components/login/lang/de.json        |  2 ++
 www/core/components/login/lang/el.json        |  2 ++
 www/core/components/login/lang/es-mx.json     |  2 ++
 www/core/components/login/lang/es.json        |  2 ++
 www/core/components/login/lang/eu.json        |  2 ++
 www/core/components/login/lang/fa.json        |  7 +++--
 www/core/components/login/lang/fr.json        |  2 ++
 www/core/components/login/lang/he.json        |  1 +
 www/core/components/login/lang/it.json        |  4 ++-
 www/core/components/login/lang/lt.json        |  2 ++
 www/core/components/login/lang/nl.json        |  4 +++
 www/core/components/login/lang/pt-br.json     |  4 +++
 www/core/components/login/lang/pt.json        |  2 ++
 www/core/components/login/lang/ro.json        |  2 ++
 www/core/components/login/lang/ru.json        |  2 ++
 www/core/components/login/lang/sv.json        |  2 ++
 www/core/components/login/lang/zh-cn.json     |  1 +
 www/core/components/login/lang/zh-tw.json     |  2 ++
 www/core/components/settings/lang/ar.json     |  3 +++
 www/core/components/settings/lang/bg.json     |  3 +++
 www/core/components/settings/lang/ca.json     |  3 +++
 www/core/components/settings/lang/cs.json     |  4 +++
 www/core/components/settings/lang/da.json     |  3 +++
 www/core/components/settings/lang/de.json     |  3 +++
 www/core/components/settings/lang/es-mx.json  |  3 +++
 www/core/components/settings/lang/es.json     |  3 +++
 www/core/components/settings/lang/eu.json     |  3 +++
 www/core/components/settings/lang/fa.json     | 15 ++++++++++-
 www/core/components/settings/lang/fr.json     |  3 +++
 www/core/components/settings/lang/he.json     |  2 ++
 www/core/components/settings/lang/it.json     |  3 +++
 www/core/components/settings/lang/ja.json     |  1 +
 www/core/components/settings/lang/lt.json     |  3 +++
 www/core/components/settings/lang/nl.json     |  4 +++
 www/core/components/settings/lang/pt-br.json  |  4 +++
 www/core/components/settings/lang/pt.json     |  3 +++
 www/core/components/settings/lang/ro.json     |  3 +++
 www/core/components/settings/lang/ru.json     |  3 +++
 www/core/components/settings/lang/sv.json     |  3 +++
 www/core/components/settings/lang/tr.json     |  2 ++
 www/core/components/settings/lang/zh-cn.json  |  2 ++
 www/core/components/settings/lang/zh-tw.json  |  3 +++
 www/core/components/sidemenu/lang/fa.json     |  5 ++--
 www/core/components/sidemenu/lang/nl.json     |  2 +-
 www/core/components/sidemenu/lang/zh-cn.json  |  2 +-
 www/core/components/user/lang/cs.json         |  1 +
 www/core/components/user/lang/nl.json         |  1 +
 www/core/components/user/lang/pt-br.json      |  1 +
 www/core/lang/ar.json                         |  8 +++---
 www/core/lang/bg.json                         |  8 +++---
 www/core/lang/ca.json                         |  6 +++--
 www/core/lang/cs.json                         |  9 ++++++-
 www/core/lang/da.json                         |  2 +-
 www/core/lang/de.json                         |  2 ++
 www/core/lang/el.json                         | 11 ++++----
 www/core/lang/es-mx.json                      |  6 +++--
 www/core/lang/es.json                         |  9 ++++---
 www/core/lang/eu.json                         |  6 +++--
 www/core/lang/fa.json                         | 14 ++++++++--
 www/core/lang/fr.json                         |  4 ++-
 www/core/lang/he.json                         | 10 +++----
 www/core/lang/it.json                         |  1 +
 www/core/lang/lt.json                         | 11 ++++----
 www/core/lang/nl.json                         |  9 ++++++-
 www/core/lang/pt-br.json                      | 19 +++++++++-----
 www/core/lang/pt.json                         |  4 ++-
 www/core/lang/ro.json                         |  7 ++---
 www/core/lang/ru.json                         |  3 ++-
 www/core/lang/sv.json                         |  9 ++++---
 www/core/lang/tr.json                         |  4 +--
 www/core/lang/zh-cn.json                      |  1 +
 www/core/lang/zh-tw.json                      | 21 ++++++++-------
 308 files changed, 1283 insertions(+), 199 deletions(-)
 create mode 100644 www/addons/messageoutput/airnotifier/lang/fa.json
 create mode 100644 www/core/components/contentlinks/lang/ru.json

diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index cc871f276aa..93d27c11dce 100644
--- a/www/addons/calendar/lang/cs.json
+++ b/www/addons/calendar/lang/cs.json
@@ -1,5 +1,6 @@
 {
     "calendarevents": "Kalendář událostí",
+    "defaultnotificationtime": "Výchozí čas oznámení",
     "errorloadevent": "Chyba při načítání události.",
     "errorloadevents": "Chyba při načítání událostí.",
     "noevents": "Nejsou žádné události",
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 74876d860c2..109ac4e7ec6 100644
--- a/www/addons/calendar/lang/fa.json
+++ b/www/addons/calendar/lang/fa.json
@@ -1,3 +1,8 @@
 {
+    "calendarevents": "رویدادهای تقویم",
+    "defaultnotificationtime": "زمان پیش‌فرض اطلاع‌رسانی",
+    "errorloadevent": "خطا در بارگیری رویداد.",
+    "errorloadevents": "خطا در بارگیری رویدادها.",
+    "noevents": "هیچ رویدادی نیست",
     "notifications": "هشدارها"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/nl.json b/www/addons/calendar/lang/nl.json
index 9dfa9116bc3..5c7174a3165 100644
--- a/www/addons/calendar/lang/nl.json
+++ b/www/addons/calendar/lang/nl.json
@@ -1,5 +1,6 @@
 {
     "calendarevents": "Kalendergebeurtenissen",
+    "defaultnotificationtime": "Standaard notificatietijd",
     "errorloadevent": "Fout bij het laden van de gebeurtenis.",
     "errorloadevents": "Fout bij het laden van de gebeurtenissen.",
     "noevents": "Er zijn geen gebeurtenissen",
diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index 5fdd6a9b8f2..b348e89bed4 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -1,5 +1,6 @@
 {
     "calendarevents": "Eventos do calendário",
+    "defaultnotificationtime": "Tempo de notificação padrão",
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
     "noevents": "Sem eventos",
diff --git a/www/addons/competency/lang/ar.json b/www/addons/competency/lang/ar.json
index 26d04da22a0..90425c007dd 100644
--- a/www/addons/competency/lang/ar.json
+++ b/www/addons/competency/lang/ar.json
@@ -2,6 +2,7 @@
     "activities": "أنشطة",
     "duedate": "تاريخ تقديم مهمة",
     "errornocompetenciesfound": "لا يوجد أي قدرات موجودة",
+    "mylearningplans": "خططي للتعلم",
     "myplans": "خططي للتعلم",
     "nocompetencies": "لا يوجد أي قدرات",
     "path": "مسار",
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index 70962efd930..20b5e09e58f 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -8,6 +8,7 @@
     "evidence": "Evidència",
     "learningplancompetencies": "Competències del pla d'aprenentatge",
     "learningplans": "Plans d'aprenentatge",
+    "mylearningplans": "Els meus plans d'aprenentatge",
     "myplans": "Els meus plans d'aprenentatge",
     "noactivities": "Cap activitat",
     "nocompetencies": "Cap competència",
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index 4bb3a752942..9c3ef7338a3 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -10,6 +10,7 @@
     "evidence": "Evidence",
     "learningplancompetencies": "Kompetence studijního plánu",
     "learningplans": "Studijní plány",
+    "mylearningplans": "Můj studijní plán",
     "myplans": "Můj studijní plán",
     "noactivities": "Žádné aktivity",
     "nocompetencies": "Žádné kompetence",
diff --git a/www/addons/competency/lang/da.json b/www/addons/competency/lang/da.json
index 3cb1ed842af..6a8244c24cc 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -9,6 +9,7 @@
     "evidence": "Vidnesbyrd",
     "learningplancompetencies": "Læringsplankompetencer",
     "learningplans": "Læringsplaner",
+    "mylearningplans": "Mine læringsplaner",
     "myplans": "Mine læringsplaner",
     "noactivities": "Ingen aktiviteter",
     "nocompetencies": "Ingen kompetencer",
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index ffdc80bebc2..b005d234dec 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -10,6 +10,7 @@
     "evidence": "Evidenz",
     "learningplancompetencies": "Kompetenzen des Lernplans",
     "learningplans": "Lernpläne",
+    "mylearningplans": "Meine Lernpläne",
     "myplans": "Meine Lernpläne",
     "noactivities": "Keine Aktivitäten",
     "nocompetencies": "Keine Kompetenzen",
diff --git a/www/addons/competency/lang/el.json b/www/addons/competency/lang/el.json
index 3a61231a7af..524b6206fe8 100644
--- a/www/addons/competency/lang/el.json
+++ b/www/addons/competency/lang/el.json
@@ -2,6 +2,7 @@
     "activities": "Δραστηριότητες",
     "duedate": "Καταληκτική ημερομηνία",
     "errornocompetenciesfound": "Δεν βρέθηκαν ικανότητες",
+    "mylearningplans": "Το μαθησιακό πλάνο μου",
     "nocompetencies": "Δεν βρέθηκαν ικανότητες",
     "path": "Διαδρομή",
     "progress": "Πρόοδος μαθητών",
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index 276f784e4f3..d924545ee14 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -10,6 +10,7 @@
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "Planes de aprendizaje",
+    "mylearningplans": "Mis planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
     "nocompetencies": "Sin competencias",
diff --git a/www/addons/competency/lang/es.json b/www/addons/competency/lang/es.json
index b87c3dda451..40406ead3e2 100644
--- a/www/addons/competency/lang/es.json
+++ b/www/addons/competency/lang/es.json
@@ -10,6 +10,7 @@
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "Planes de aprendizaje",
+    "mylearningplans": "Mis planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
     "nocompetencies": "Sin competencias",
diff --git a/www/addons/competency/lang/eu.json b/www/addons/competency/lang/eu.json
index 3b4e8511411..9c97e3c153f 100644
--- a/www/addons/competency/lang/eu.json
+++ b/www/addons/competency/lang/eu.json
@@ -7,6 +7,7 @@
     "evidence": "Ebidentzia",
     "learningplancompetencies": "Ikasketa-planaren gaitasunak",
     "learningplans": "Ikasketa-planak",
+    "mylearningplans": "Nire ikasketa-planak",
     "myplans": "Nire ikasketa-planak",
     "noactivities": "Ez dago jarduerarik",
     "nocompetencies": "Gaitasunik ez",
diff --git a/www/addons/competency/lang/fa.json b/www/addons/competency/lang/fa.json
index 958790ed5b6..209f8a9cc31 100644
--- a/www/addons/competency/lang/fa.json
+++ b/www/addons/competency/lang/fa.json
@@ -5,9 +5,11 @@
     "coursecompetencyratingsarepushedtouserplans": "امتیازهای شایستگی‌ها در این درس بلافاصله در برنامه‌های آموزشی به‌روز می‌شوند.",
     "crossreferencedcompetencies": "شایستگی‌های دارای ارجاع متقابل",
     "duedate": "مهلت تحویل",
+    "errornocompetenciesfound": "هیچ شایستگی‌ای پیدا نشد",
     "evidence": "مدرک",
     "learningplancompetencies": "شایستگی‌های برنامه آموزشی",
     "learningplans": "برنامه‌های آزموشی",
+    "mylearningplans": "برنامه‌های آموزشی من",
     "myplans": "برنامه‌های آموزشی من",
     "nocrossreferencedcompetencies": "هیچ شایستگی دیگری به این شایستگی به‌طور متقابل ارجاع داده نشده است.",
     "noevidence": "بدون مدرک",
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index 54703a62fc1..bf16110e08f 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -10,6 +10,7 @@
     "evidence": "Preuve",
     "learningplancompetencies": "Compétences du plan de formation",
     "learningplans": "Plans de formation",
+    "mylearningplans": "Mes plans de formation",
     "myplans": "Mes plans de formation",
     "noactivities": "Aucune activité",
     "nocompetencies": "Aucune compétence",
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index e34cefd8b4b..8e2551a9b4f 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -10,6 +10,7 @@
     "evidence": "Verifica",
     "learningplancompetencies": "Competenze del piano di formazione",
     "learningplans": "Piani di formazione",
+    "mylearningplans": "I miei piani formativi",
     "myplans": "I miei piani formativi",
     "noactivities": "Nessuna attività.",
     "nocompetencies": "Non sono presenti competenze",
diff --git a/www/addons/competency/lang/lt.json b/www/addons/competency/lang/lt.json
index bfd76f8a42c..5d1638d202f 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -7,6 +7,7 @@
     "evidence": "Įrodymas",
     "learningplancompetencies": "Mokymosi plano kompetencijos",
     "learningplans": "Mokymosi planai",
+    "mylearningplans": "Mano mokymosi planai",
     "myplans": "Mano mokymosi planai",
     "noactivities": "Nėra veiklų",
     "nocompetencies": "Nėra kompetencijų",
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index 01e03c53c24..896d0dddd81 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -10,6 +10,7 @@
     "evidence": "Bewijs",
     "learningplancompetencies": "Studieplan competenties",
     "learningplans": "Studieplannen",
+    "mylearningplans": "Mijn leerplannen",
     "myplans": "Mijn leerplannen",
     "noactivities": "Geen activiteiten",
     "nocompetencies": "Geen competenties",
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index 268860975f8..bb9013f1f72 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -10,6 +10,7 @@
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
+    "mylearningplans": "Meus planos de aprendizagem",
     "myplans": "Meus planos de aprendizagem",
     "noactivities": "Sem atividades",
     "nocompetencies": "Nenhuma competência",
diff --git a/www/addons/competency/lang/pt.json b/www/addons/competency/lang/pt.json
index 9acc0bd20d8..16d560a1fde 100644
--- a/www/addons/competency/lang/pt.json
+++ b/www/addons/competency/lang/pt.json
@@ -10,6 +10,7 @@
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
+    "mylearningplans": "Meus planos de aprendizagem",
     "myplans": "Os meus planos de aprendizagem",
     "noactivities": "Nenhuma atividade associada",
     "nocompetencies": "Sem competências",
diff --git a/www/addons/competency/lang/ru.json b/www/addons/competency/lang/ru.json
index d268e9046ac..c4ed3c620f7 100644
--- a/www/addons/competency/lang/ru.json
+++ b/www/addons/competency/lang/ru.json
@@ -9,6 +9,7 @@
     "evidence": "Подтверждение",
     "learningplancompetencies": "Компетенции учебного плана",
     "learningplans": "Учебные планы",
+    "mylearningplans": "Мои учебные планы",
     "myplans": "Мои учебные планы",
     "noactivities": "Нет элементов",
     "nocompetencies": "Нет компетенций, созданных в этом фреймворке.",
diff --git a/www/addons/competency/lang/tr.json b/www/addons/competency/lang/tr.json
index aaf5e15f532..e61b42445f4 100644
--- a/www/addons/competency/lang/tr.json
+++ b/www/addons/competency/lang/tr.json
@@ -9,6 +9,7 @@
     "evidence": "Kanıt",
     "learningplancompetencies": "Öğrenme planı yetkinlikleri",
     "learningplans": "Öğrenme planları",
+    "mylearningplans": "Eğitim Planlarım",
     "myplans": "Benim öğrenme planlarım",
     "noactivities": "Etkinlikler yok",
     "nocompetencies": "Bu çerçevede hiçbir yetkinlik oluşturulmamıştır.",
diff --git a/www/addons/competency/lang/zh-tw.json b/www/addons/competency/lang/zh-tw.json
index fe0b027bb70..bbafffe7c4e 100644
--- a/www/addons/competency/lang/zh-tw.json
+++ b/www/addons/competency/lang/zh-tw.json
@@ -10,6 +10,7 @@
     "evidence": "證據",
     "learningplancompetencies": "學習計畫核心能力",
     "learningplans": "學習計畫",
+    "mylearningplans": "我的學習計畫",
     "myplans": "我的學習計畫",
     "noactivities": "沒有活動",
     "nocompetencies": "沒有功能",
diff --git a/www/addons/coursecompletion/lang/fa.json b/www/addons/coursecompletion/lang/fa.json
index 38de3a36227..5800f75ef35 100644
--- a/www/addons/coursecompletion/lang/fa.json
+++ b/www/addons/coursecompletion/lang/fa.json
@@ -13,5 +13,5 @@
     "required": "لازم است",
     "requiredcriteria": "ضوابط مورد نیاز",
     "status": "وضعیت",
-    "viewcoursereport": "مشاهده گزارش درس"
+    "viewcoursereport": "مشاهدهٔ گزارش درس"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ar.json b/www/addons/files/lang/ar.json
index c9eb7b83d46..1a2b6a545b5 100644
--- a/www/addons/files/lang/ar.json
+++ b/www/addons/files/lang/ar.json
@@ -1,8 +1,28 @@
 {
+    "audio": "صوت",
+    "camera": "آلة التصوير",
     "couldnotloadfiles": "لا يمكن تحميل قائمة الملفات",
+    "downloading": "يتم التنزيل",
     "emptyfilelist": "لا يوجد ملفات للعرض",
+    "errorcapturingaudio": "خطأ في إلتقاط الصوت",
+    "errorcapturingimage": "خطأ في إلتقاط الصورة",
+    "errorcapturingvideo": "خطأ في إلتقاط الفيديو",
+    "errorgettingimagealbum": "خطأ في الحصول على الصورة من ألبوم الصور",
+    "errormustbeonlinetoupload": "لابد ان تكون متصل بالأنترنت لكي ترفع الملفات",
+    "errornoapp": "لا يوجود لديك تطبيق مثبت لتنفيذ هذا الإجراء",
+    "errorreadingfile": "خطأ في قراءة الملف",
+    "errorreceivefilenosites": "لا يوجد مواقع مخزنة. من فضلك أضف موقع قبل محاولة رفع ملف",
+    "errorwhileuploading": "حدث خطأ أثناء رفع الملف",
     "files": "ملفاتي الخاصة",
+    "fileuploaded": "تم رفع الملف بنجاح",
+    "myfiles": "ملفاتي",
+    "myprivatefiles": "ملفاتي الخاصة",
+    "photoalbums": "ألبوم صور",
     "privatefiles": "ملفات خاصة",
+    "readingfile": "يتم قراءة الملف",
     "sitefiles": "ملفات الموقع",
-    "uploadfiles": "رفع ملفات"
+    "success": "تم بنجاح",
+    "uploadfiles": "رفع ملفات",
+    "uploading": "يتم الرفع",
+    "video": "فيديو"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/bg.json b/www/addons/files/lang/bg.json
index a0e3edebf90..8ab069ff1ca 100644
--- a/www/addons/files/lang/bg.json
+++ b/www/addons/files/lang/bg.json
@@ -3,10 +3,14 @@
     "clicktoupload": "Натиснете бутона по-долу за да качите файловете в секция \"Вашите частни файлове\".",
     "couldnotloadfiles": "Списъкът с файлове не можа да бъде зареден.",
     "emptyfilelist": "Няма файлове, които да бъдат показани.",
+    "errorreceivefilenosites": "Няма записани сайтове. Моля добавете сайтове, преди да се опитвате да качите файл.",
     "files": "Моите лични файлове",
+    "myfiles": "Моите файлове",
+    "myprivatefiles": "Моите лични файлове",
     "myprivatefilesdesc": "Файловете, които са налични във Вашата лична област на сайта.",
     "privatefiles": "Лични файлове",
     "sitefiles": "Файлове от сайта",
     "sitefilesdesc": "Други файлоне, които са достъпни за Вас на този Moodle сайт.",
+    "success": "Успех!",
     "uploadfiles": "Качване на файлове"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ca.json b/www/addons/files/lang/ca.json
index 7b918b6d4f4..61aed4639aa 100644
--- a/www/addons/files/lang/ca.json
+++ b/www/addons/files/lang/ca.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Teniu en compte que l'administrador de Moodle ha desactivat la descàrrega d'arxius; podeu visualitzar els arxius, però no descarregar-los.",
+    "audio": "Àudio",
+    "camera": "Càmera",
+    "chooseaccountuploadfile": "Escolliu un compte on pujar el fitxer",
     "clicktoupload": "Feu clic al botó del dessota per pujar arxius a l'àrea del vostres fitxers.",
+    "confirmuploadfile": "Esteu a punt de pujar {{size}}. Voleu continuar?",
     "couldnotloadfiles": "La llista d'arxius no s'ha pogut carregar.",
+    "downloading": "S'està descarregant",
     "emptyfilelist": "No hi ha fitxers per mostrar.",
+    "errorcapturingaudio": "S'ha produït un error en capturar l'àudio.",
+    "errorcapturingimage": "S'ha produït un error en capturar la imatge.",
+    "errorcapturingvideo": "S'ha produït un error en capturar el vídeo.",
+    "errorgettingimagealbum": "S'ha produït un error en recuperar la imatge de l'àlbum.",
+    "errormustbeonlinetoupload": "Heu de tenir connexió a la xarxa per a pujar fitxers.",
+    "errornoapp": "No teniu cap aplicació instal·lada per a realitzar aquesta acció.",
+    "errorreadingfile": "S'ha produït un error en llegir el fitxer.",
+    "errorreceivefilenosites": "No hi ha llocs web emmagatzemats. Afegiu un lloc abans d'intentar pujar un arxiu.",
     "erroruploadnotworking": "No es poden pujar fitxers al vostre lloc ara mateix.",
+    "errorwhiledownloading": "S'ha produït un error durant la descàrrega del fitxer.",
+    "errorwhilerecordingaudio": "S'ha produït un error durant l'enregistrament de l'àudio.",
+    "errorwhileuploading": "S'ha produït un error durant la càrrega del fitxer.",
     "files": "Els meus fitxers privats",
+    "fileuploaded": "S'ha penjat el fitxer amb èxit.",
+    "myfiles": "Els meus fitxers",
+    "myprivatefiles": "Els meus fitxers privats",
     "myprivatefilesdesc": "Els arxius que teniu disponibles a la vostra àrea privada en aquest lloc Moodle.",
+    "photoalbums": "Àlbums de fotos",
     "privatefiles": "Fitxers privats",
+    "readingfile": "S'està llegint un fitxer",
     "sitefiles": "Fitxers del lloc",
     "sitefilesdesc": "Els altres arxius que es troben disponibles en aquest lloc Moodle.",
-    "uploadfiles": "Puja fitxers"
+    "success": "Èxit!",
+    "uploadfiles": "Puja fitxers",
+    "uploading": "S'està pujant",
+    "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/cs.json b/www/addons/files/lang/cs.json
index d9398ec785f..2e5efab57fc 100644
--- a/www/addons/files/lang/cs.json
+++ b/www/addons/files/lang/cs.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Upozorňujeme, že správce Moodle zakázal stahování souborů, soubory si můžete prohlížet, ale ne stáhnout.",
+    "audio": "Audio",
+    "camera": "Fotoaparát",
+    "chooseaccountuploadfile": "Vyberte účet, pod kterým chcete nahrát soubor.",
     "clicktoupload": "Kliknutím na tlačítko níže nahrát soubory do vašich osobních souborů.",
+    "confirmuploadfile": "Chystáte nahrát {{$a}}. Jste si jisti, že chcete pokračovat?",
     "couldnotloadfiles": "Seznam souborů, které nelze načíst .",
+    "downloading": "Stahování",
     "emptyfilelist": "Žádný soubor k zobrazení.",
+    "errorcapturingaudio": "Chyba snímání zvuku.",
+    "errorcapturingimage": "Chyba snímání obrazu.",
+    "errorcapturingvideo": "Chyba snímání videa.",
+    "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
+    "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
+    "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
+    "errorreadingfile": "Chyba při čtení souboru.",
+    "errorreceivefilenosites": "Nejsou uloženy žádné stránky. Než se pokusíte nahrát soubor, přidejte prosím stránku.",
     "erroruploadnotworking": "Bohužel v současné době není možné nahrávat na stránky vašeho Moodle.",
+    "errorwhiledownloading": "Při pokusu o stahování souboru došlo k chybě .",
+    "errorwhilerecordingaudio": "Při pokusu o nahrání zvuku došlo k chybě .",
+    "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
     "files": "Osobní soubory",
+    "fileuploaded": "Soubor byl úspěšně nahrán.",
+    "myfiles": "Moje soubory",
+    "myprivatefiles": "Osobní soubory",
     "myprivatefilesdesc": "Soubory, které jsou dostupné v soukromé oblasti na těchto stránkách Moodle.",
+    "photoalbums": "Fotoalba",
     "privatefiles": "Osobní soubory",
+    "readingfile": "Čtení souboru",
     "sitefiles": "Soubory stránek",
     "sitefilesdesc": "Další soubory, které jsou dostupné na těchto stránkách Moodle.",
-    "uploadfiles": "Nahrát soubory"
+    "success": "Úspěch!",
+    "uploadfiles": "Nahrát soubory",
+    "uploading": "Nahrávání",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/da.json b/www/addons/files/lang/da.json
index 58173692d99..56ea8289414 100644
--- a/www/addons/files/lang/da.json
+++ b/www/addons/files/lang/da.json
@@ -1,13 +1,34 @@
 {
     "admindisableddownload": "Bemærk venligst at din Moodleadministrator har deaktiveret download af filer. Du kan se filerne men ikke downloade dem.",
+    "audio": "Lyd",
+    "camera": "Kamera",
+    "chooseaccountuploadfile": "Vælg en konto filen skal uploades til",
     "clicktoupload": "Klik på knappen nedenfor for at uploade filer til dine private filer.",
+    "confirmuploadfile": "Du er ved at uploade {{size}}. Er du sikker på at du vil fortsætte",
     "couldnotloadfiles": "Fillisten kunne ikke hentes",
+    "downloading": "Downloader",
     "emptyfilelist": "Der er ingen filer at vise.",
+    "errorgettingimagealbum": "Fejl ved hentning af billede fra album.",
+    "errormustbeonlinetoupload": "Du skal være online for at uploade",
+    "errornoapp": "Du har ikke en app installeret der kan udføre denne handling.",
+    "errorreadingfile": "Fejl ved læsning af filen",
+    "errorreceivefilenosites": "Der er ingen gemte websider. Tilføj en webside inden du prøver at uploade en fil.",
     "erroruploadnotworking": "Desværre er det p.t. ikke muligt at uploade filer til dit site.",
+    "errorwhiledownloading": "Der opstod en fejl ved forsøg på download af filen.",
+    "errorwhilerecordingaudio": "Der opstod en fejl under forsøg på at optage lyd.",
+    "errorwhileuploading": "Der opstod en fejl under upload af fil.",
     "files": "Mine private filer",
+    "fileuploaded": "Filen er uoloadet.",
+    "myfiles": "Mine filer",
+    "myprivatefiles": "Mine private filer",
     "myprivatefilesdesc": "Filerne som er tilgængelige i dit private område på dette Moodlewebsted.",
+    "photoalbums": "Fotoalbum",
     "privatefiles": "Private filer",
+    "readingfile": "Læser fil",
     "sitefiles": "Webside filer",
     "sitefilesdesc": "De andre filer som er tilgængelige for dig på denne Moodlewebside.",
-    "uploadfiles": "Upload filer"
+    "success": "Succes!",
+    "uploadfiles": "Upload filer",
+    "uploading": "Uploader",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/de.json b/www/addons/files/lang/de.json
index 40e53824d33..59be6e84477 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Sie können nur die Dateiliste sehen.",
+    "audio": "Audio",
+    "camera": "Kamera",
+    "chooseaccountuploadfile": "Wählen Sie ein Nutzerkonto, um die Datei zu speichern.",
     "clicktoupload": "Tippen Sie auf die Taste, um Dateien in 'Meine Dateien' hochzuladen.",
+    "confirmuploadfile": "Möchten Sie wirklich {{size}} hochladen?",
     "couldnotloadfiles": "Die Dateiliste konnte nicht geladen werden.",
+    "downloading": "Herunterladen ...",
     "emptyfilelist": "Keine Dateien",
+    "errorcapturingaudio": "Fehler bei der Audioaufnahme",
+    "errorcapturingimage": "Fehler beim Fotografieren",
+    "errorcapturingvideo": "Fehler bei der Videoaufnahme",
+    "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
+    "errormustbeonlinetoupload": "Sie müssen online sein, um Dateien hochzuladen.",
+    "errornoapp": "Sie haben keine App installiert, um diese Aktion durchzuführen.",
+    "errorreadingfile": "Fehler beim Lesen der Datei",
+    "errorreceivefilenosites": "Keine Website gespeichert. Fügen Sie zuerst eine Website hinzu, bevor Sie das Hochladen einer Datei versuchen.",
     "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
+    "errorwhiledownloading": "Fehler beim Herunterladen der Datei",
+    "errorwhilerecordingaudio": "Fehler bei der Audioaufnahme",
+    "errorwhileuploading": "Fehler beim Hochladen der Datei",
     "files": "Meine Dateien",
+    "fileuploaded": "Die Datei wurde erfolgreich hochgeladen.",
+    "myfiles": "Meine Dateien",
+    "myprivatefiles": "Meine Dateien",
     "myprivatefilesdesc": "Diese Dateien liegen in Ihrem persönlichen Bereich auf dieser Website.",
+    "photoalbums": "Fotoalbum",
     "privatefiles": "Meine Dateien",
+    "readingfile": "Datei lesen",
     "sitefiles": "Dateien der Webseite",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
-    "uploadfiles": "Dateien hochladen"
+    "success": "Fertig!",
+    "uploadfiles": "Dateien hochladen",
+    "uploading": "Hochladen",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/el.json b/www/addons/files/lang/el.json
index d2c98e03f53..e535f6bf57c 100644
--- a/www/addons/files/lang/el.json
+++ b/www/addons/files/lang/el.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Παρακαλω λάβετε υπόψιν ότι ο διαχειριστής του Moodle site σας απενεργοποίησε τις λήψεις αρχείων, μπορείτε να περιηγηθείτε μέσα στα αρχεία, αλλά όχι να τα κατεβάσετε.",
+    "audio": "Audio",
+    "camera": "Κάμερα",
+    "chooseaccountuploadfile": "Επιλέξτε έναν λογαριασμό για να μεταφορτώσετε το αρχείο",
     "clicktoupload": "Κάντε κλικ στο παρακάτω κουμπί για να μεταφορτώσετε αρχεία στους προσωπικούς σας φακέλους.",
+    "confirmuploadfile": "Πρόκειται να ανεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "couldnotloadfiles": "Η λίστα των αρχείων δεν φορτώθηκε.",
+    "downloading": "Μεταφόρτωση",
     "emptyfilelist": "Δεν υπαρχουν αρχεία.",
+    "errorcapturingaudio": "Σφάλμα καταγραφής ήχου.",
+    "errorcapturingimage": "Σφάλμα λήψης εικόνας.",
+    "errorcapturingvideo": "Σφάλμα καταγραφής βίντεο.",
+    "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από τη συλλογή.",
+    "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
+    "errornoapp": "Δεν έχετε εγκατεστημένη κάποια εφαρμογή για να εκτελεστεί αυτή η ενέργεια.",
+    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
+    "errorreceivefilenosites": "Δεν υπάρχουν αποθηκευμένα sites. Παρακαλώ προσθέστε ένα site πριν προσπαθήσετε να φορτώσετε ένα αρχείο.",
     "erroruploadnotworking": "Δυστυχώς, προσωρινά δεν είναι δυνατό να ανεβάσετε τα αρχεία στο site σας.",
+    "errorwhiledownloading": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια να κατεβάσετε το αρχείο.",
+    "errorwhilerecordingaudio": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια καταγραφής ήχου.",
+    "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά τη μεταφόρτωση αρχείων.",
     "files": "Αρχεία",
+    "fileuploaded": "Αυτό το αρχείο ανέβηκε επιτυχώς.",
+    "myfiles": "Τα αρχεία μου",
+    "myprivatefiles": "Τα προσωπικά αρχεία μου",
     "myprivatefilesdesc": "Τα αρχεία που είναι διαθέσιμα στο προσωπικό χώρο σας σε αυτό το Moodle site.",
+    "photoalbums": "Συλλογή εικόνων",
     "privatefiles": "Προσωπικά αρχεία",
+    "readingfile": "Διάβασμα αρχείου",
     "sitefiles": "Τα αρχεία του site",
     "sitefilesdesc": "Άλλα αρχεία που είναι στη διάθεσή σας σε αυτό το site Moodle.",
-    "uploadfiles": "Μεταφορτώστε αρχεία"
+    "success": "Επιτυχία!",
+    "uploadfiles": "Μεταφορτώστε αρχεία",
+    "uploading": "Μεταφόρτωση",
+    "video": "Βίντεο"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es-mx.json b/www/addons/files/lang/es-mx.json
index 1b2e0bb7504..0da9a6aecc5 100644
--- a/www/addons/files/lang/es-mx.json
+++ b/www/addons/files/lang/es-mx.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ver los archivos pero no puede descargarlos.",
+    "audio": "Audio",
+    "camera": "Cámara",
+    "chooseaccountuploadfile": "Elija una cuanta a donde subirle el archivo.",
     "clicktoupload": "Haga click en el botón inferior para subir archivos a sus archivos privados.",
+    "confirmuploadfile": "Usted está a punto de subir {{size}}. ¿Está Usted seguro de querer continuar?",
     "couldnotloadfiles": "La lista de archivos no pudo cargarse.",
+    "downloading": "Descargando",
     "emptyfilelist": "No hay archivos para mostrar.",
+    "errorcapturingaudio": "Error al capturar audio.",
+    "errorcapturingimage": "Error al capturar imagen.",
+    "errorcapturingvideo": "Error al capturar video.",
+    "errorgettingimagealbum": "Error al obtener imagen del álbum.",
+    "errormustbeonlinetoupload": "Usted necesita estar conectado en-línea para subir archivos.",
+    "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
+    "errorreadingfile": "Error al leer el archivo.",
+    "errorreceivefilenosites": "No hay archivos almacenados. Por favor, añada un sitio antes de intentar subir un archivo.",
     "erroruploadnotworking": "Desafortunadamente ahorita no es posible subir archivos a su sitio.",
+    "errorwhiledownloading": "Ocurrió un error al intentar descargar el archivo.",
+    "errorwhilerecordingaudio": "Ocurrió un error al intentar grabar audio.",
+    "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
     "files": "Mis archivos privados",
+    "fileuploaded": "El archivo fue subido exitosamente.",
+    "myfiles": "Mis archivos",
+    "myprivatefiles": "Mis archivos privados",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
+    "photoalbums": "Álbum de fotos",
     "privatefiles": "Archivos privados",
+    "readingfile": "Leyendo archivo",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "uploadfiles": "Subir archivos"
+    "success": "¡Éxito!",
+    "uploadfiles": "Subir archivos",
+    "uploading": "Subiendo",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es.json b/www/addons/files/lang/es.json
index c0a531637c2..741ecf09583 100644
--- a/www/addons/files/lang/es.json
+++ b/www/addons/files/lang/es.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ojear los archivos pero no puede descargarlos.",
+    "audio": "Audio",
+    "camera": "Cámara",
+    "chooseaccountuploadfile": "Elija una cuanta donde subir el archivo.",
     "clicktoupload": "Clic en el botón inferior para subir archivos a su zona de archivos privados.",
+    "confirmuploadfile": "Está a punto de subir {{size}}. ¿Está seguro de que desea continuar?",
     "couldnotloadfiles": "La lista de archivos no ha podido cargarse.",
+    "downloading": "Descargando",
     "emptyfilelist": "No hay archivos que mostrar",
+    "errorcapturingaudio": "Error capturando audio.",
+    "errorcapturingimage": "Error capturando imagen.",
+    "errorcapturingvideo": "Error capturando vídeo.",
+    "errorgettingimagealbum": "Error obteniendo imagen del album.",
+    "errormustbeonlinetoupload": "Necesitas tener conexión para subir archivos.",
+    "errornoapp": "No dispone de una app instalada para realizar esta acción.",
+    "errorreadingfile": "Error leyendo archivo.",
+    "errorreceivefilenosites": "No hay archivos almacenados. Por favor, añada un sitio antes de intentar subir un archivo.",
     "erroruploadnotworking": "Desafortunadamente en estos momentos no es posible subir archivos al sitio.",
+    "errorwhiledownloading": "Ocurrió un error al intentar descargar el archivo.",
+    "errorwhilerecordingaudio": "Ocurrió un error al intentar grabar audio.",
+    "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
     "files": "Mis archivos privados",
+    "fileuploaded": "El archivo fue subido correctamente.",
+    "myfiles": "Mis archivos",
+    "myprivatefiles": "Mis archivos privados",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
+    "photoalbums": "Álbum de fotos",
     "privatefiles": "Ficheros privados",
+    "readingfile": "Leyendo archivo",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "uploadfiles": "Subir archivos"
+    "success": "Éxito",
+    "uploadfiles": "Subir archivos",
+    "uploading": "Subiendo",
+    "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/eu.json b/www/addons/files/lang/eu.json
index 1ab5413775e..3c92814d15f 100644
--- a/www/addons/files/lang/eu.json
+++ b/www/addons/files/lang/eu.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Mesedez ohartu zaitez zure Moodle administratzaileak fitxategien jaitsiera ezgaitu duela, fitxategiak arakatu ditzakezu baina ezin dituzu jaitsi.",
+    "audio": "Audioa",
+    "camera": "Kamera",
+    "chooseaccountuploadfile": "Aukeratu kontu bat fitxategiak bertara igotzeko.",
     "clicktoupload": "Klik egin beheko botoian fitxategiak zure gune pribatura igotzeko.",
+    "confirmuploadfile": "{{size}} igotzera zoaz. Ziur al zaude aurrera egin nahi duzula?",
     "couldnotloadfiles": "Ezin izan da fitxategien zerrenda kargatu.",
+    "downloading": "Jaisten",
     "emptyfilelist": "Ez dago fitxategirik erakusteko.",
+    "errorcapturingaudio": "Errorea audioa atzitzean.",
+    "errorcapturingimage": "Errorea irudia atzitzean.",
+    "errorcapturingvideo": "Errorea bideoa atzitzean.",
+    "errorgettingimagealbum": "Errorea irudia albumetik hartzean.",
+    "errormustbeonlinetoupload": "Online egon behar zara fitxategiak igo ahal izateko.",
+    "errornoapp": "Ez duzu ekintza hau burutzeko app-ik instalatuta.",
+    "errorreadingfile": "Errorea fitxategia irakurtzean.",
+    "errorreceivefilenosites": "Ez dago gordetako gunerik. Mesedez gehitu gune bat fitxategia igotzen saiatu baino lehen.",
     "erroruploadnotworking": "Zoritxarrez une honetan ezin dira fitxategiak zure gunera igo.",
+    "errorwhiledownloading": "Errorea gertatu da fitxategia jaisten saiatzean.",
+    "errorwhilerecordingaudio": "Errorea gertatu da audioa grabatzen saiatzean.",
+    "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
     "files": "Nire fitxategi pribatuak",
+    "fileuploaded": "Fitxategia ondo igo da.",
+    "myfiles": "Nire fitxategiak",
+    "myprivatefiles": "Nire fitxategi pribatuak",
     "myprivatefilesdesc": "Moodle gune honetako zure gune pribatuan eskuragarri dauden fitxategiak.",
+    "photoalbums": "Argazki albumak",
     "privatefiles": "Fitxategi pribatuak",
+    "readingfile": "Fitxategia irakurtzen",
     "sitefiles": "Guneko fitxategiak",
     "sitefilesdesc": "Zure Moodle gunean eskuragarri dauden beste fitxategiak.",
-    "uploadfiles": "Igo fitxategiak"
+    "success": "Ondo!",
+    "uploadfiles": "Igo fitxategiak",
+    "uploading": "Igotzen",
+    "video": "Bideoa"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fa.json b/www/addons/files/lang/fa.json
index c8a4b1dbcd2..afdb485efb6 100644
--- a/www/addons/files/lang/fa.json
+++ b/www/addons/files/lang/fa.json
@@ -1,5 +1,9 @@
 {
+    "admindisableddownload": "لطفا در نظر داشته باشید که مدیر سایت شما دریافت فایل‌ها را غیرفعال کرده است. شما می‌توانید فایل‌ها را مرور کنید، ولی نمی‌توانید آنها را روی دستگاه خود دریافت کنید.",
+    "camera": "دوربین",
+    "confirmuploadfile": "شما در آستانهٔ ارسال {{size}} هستید. آیا مطمئن هستید که می‌خواهید ادامه دهید؟",
     "files": "فایلهای من",
+    "myfiles": "فایل‌های من",
     "privatefiles": "فایل‌های شخصی",
     "sitefiles": "فایلهای سایت",
     "uploadfiles": "ارسال فایل‌های بازخورد"
diff --git a/www/addons/files/lang/fr.json b/www/addons/files/lang/fr.json
index 66738ab0a4d..944b62fdd52 100644
--- a/www/addons/files/lang/fr.json
+++ b/www/addons/files/lang/fr.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "L'administrateur de votre Moodle a désactivé le téléchargement des fichiers. Vous pouvez les consulter, mais pas les télécharger.",
+    "audio": "Audio",
+    "camera": "Caméra",
+    "chooseaccountuploadfile": "Sélectionner un compte vers lequel déposer le fichier.",
     "clicktoupload": "Cliquer sur le bouton ci-dessous pour déposer les fichiers dans vos fichiers personnels.",
+    "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
     "couldnotloadfiles": "La liste des fichiers n'a pas pu être chargée.",
+    "downloading": "Téléchargement",
     "emptyfilelist": "Aucun fichier à afficher.",
+    "errorcapturingaudio": "Erreur d'enregistrement audio.",
+    "errorcapturingimage": "Erreur lors de la capture de l'image.",
+    "errorcapturingvideo": "Erreur lors de la capture vidéo.",
+    "errorgettingimagealbum": "Erreur lors de la récupération de l'image dans l'album.",
+    "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
+    "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
+    "errorreadingfile": "Erreur lecture du fichier.",
+    "errorreceivefilenosites": "Aucun site enregistré. Veuillez ajouter un site avant de déposer un fichier.",
     "erroruploadnotworking": "Il n'est actuellement pas possible de déposer des fichiers sur votre site.",
+    "errorwhiledownloading": "Une erreur est survenue lors du téléchargement du fichier.",
+    "errorwhilerecordingaudio": "Une erreur est survenue lors de l'enregistrement du son.",
+    "errorwhileuploading": "Une erreur est survenue durant le dépôt du fichier.",
     "files": "Mes fichiers personnels",
+    "fileuploaded": "Le fichier a été déposé.",
+    "myfiles": "Mes fichiers",
+    "myprivatefiles": "Mes fichiers personnels",
     "myprivatefilesdesc": "Les fichiers disponibles dans votre zone privée sur cette plateforme Moodle.",
+    "photoalbums": "Albums de photos",
     "privatefiles": "Fichiers personnels",
+    "readingfile": "Lecture du fichier",
     "sitefiles": "Fichiers du site",
     "sitefilesdesc": "Les autres fichiers disponibles sur cette plateforme Moodle.",
-    "uploadfiles": "Déposer des fichiers"
+    "success": "Succès !",
+    "uploadfiles": "Déposer des fichiers",
+    "uploading": "Dépôt en cours",
+    "video": "Vidéo"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/he.json b/www/addons/files/lang/he.json
index 25a48b96070..f650a693ed6 100644
--- a/www/addons/files/lang/he.json
+++ b/www/addons/files/lang/he.json
@@ -3,10 +3,14 @@
     "clicktoupload": "להעלאת הקבצים לקבצים הפרטיים שלך, יש להקליק על הכפתור למטה.",
     "couldnotloadfiles": "לא ניתן לטעון את רשימת הקבצים.",
     "emptyfilelist": "אין קבצים להצגה.",
+    "errorreceivefilenosites": "לא קיימים אתרים שמורים. יש להוסף אתר לפני הניסיון להעלות קובץ.",
     "files": "הקבצים הפרטיים שלי",
+    "myfiles": "הקבצים שלי",
+    "myprivatefiles": "הקבצים הפרטיים שלי",
     "myprivatefilesdesc": "הקבצים הזמינים לך באזור הפרטי באתר מוודל זה.",
     "privatefiles": "הקבצים שלי",
     "sitefiles": "קבצי האתר",
     "sitefilesdesc": "הקבצים האחרים הזמינים לך באתר מוודל זה.",
+    "success": "הצלחה!",
     "uploadfiles": "העלה קבצים"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/it.json b/www/addons/files/lang/it.json
index 0bc9591947f..49674385421 100644
--- a/www/addons/files/lang/it.json
+++ b/www/addons/files/lang/it.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "L'amministratore del sito Moodle ha disabilitato il download dei file. Puoi navigare tra i file ma non potrai scaricarli.",
+    "audio": "Audio",
+    "camera": "Camera",
+    "chooseaccountuploadfile": "Scegli l'account dove caricare il file.",
     "clicktoupload": "Fai click sul pulsante sotto per caricare i file nei File personali",
+    "confirmuploadfile": "Stai per caricare {{size}}. Sei sicuro di continuare?",
     "couldnotloadfiles": "Non è stato possibile caricare l'elenco dei file.",
+    "downloading": "Scaricamento in corso",
     "emptyfilelist": "Non ci sono file da visualizzare.",
+    "errorcapturingaudio": "Si è verificato un errore durante la registrazione dell'audio.",
+    "errorcapturingimage": "Si è verificato un errore durante l'acquisizione dell'immagine.",
+    "errorcapturingvideo": "Si è verificato un errore durante l'acquisizione del video.",
+    "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
+    "errormustbeonlinetoupload": "Per caricar file devi essere online.",
+    "errornoapp": "Non hai un'app per svolgere questa azione.",
+    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
+    "errorreceivefilenosites": "Non ci sono siti memorizzati. Devi aggiungere un sito prima di poter caricare file.",
     "erroruploadnotworking": "Al momento non è possibile caricare file sul sito.",
+    "errorwhiledownloading": "Si è verificato un errore durante lo scaricamento del file.",
+    "errorwhilerecordingaudio": "Si è verificato un errore durante la registrazione dell'audio.",
+    "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
     "files": "File personali",
+    "fileuploaded": "Il file è stato caricato correttamente.",
+    "myfiles": "I miei file",
+    "myprivatefiles": "File personali",
     "myprivatefilesdesc": "I file memorizzati nell'omonima area di Moodle",
+    "photoalbums": "Album fotografico",
     "privatefiles": "File personali",
+    "readingfile": "Lettura del file in corso",
     "sitefiles": "File del sito",
     "sitefilesdesc": "Altri file del sito Moodle ai quali puoi accedere.",
-    "uploadfiles": "Carica file"
+    "success": "Effettuato correttamente!",
+    "uploadfiles": "Carica file",
+    "uploading": "Caricamento in corso",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ja.json b/www/addons/files/lang/ja.json
index 22d47aced87..c744c4a763c 100644
--- a/www/addons/files/lang/ja.json
+++ b/www/addons/files/lang/ja.json
@@ -1,6 +1,8 @@
 {
     "emptyfilelist": "表示するファイルはありません。",
+    "errorreceivefilenosites": "登録されているサイトがありません。ファイルをアップロードする前にサイトを追加してください。",
     "files": "マイファイル",
+    "myfiles": "マイファイル",
     "privatefiles": "プライベートファイル",
     "sitefiles": "サイトファイル",
     "uploadfiles": "ファイルをアップロードできる"
diff --git a/www/addons/files/lang/lt.json b/www/addons/files/lang/lt.json
index 82157441c00..524a98ebaf5 100644
--- a/www/addons/files/lang/lt.json
+++ b/www/addons/files/lang/lt.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Primename, kad Moodle administratorius panaikino galimybę parsisiųsti failus, failų atsisiųsti negalima, galite tik naršyti.",
+    "audio": "Garsas",
+    "camera": "Vaizdas",
+    "chooseaccountuploadfile": "Pasirinkite paskyrą „įkelti failą į“.",
     "clicktoupload": "Paspauskite mygtuką, esantį žemiau, kad galėtumėte atsisiųsti failus į privatų aplanką.",
+    "confirmuploadfile": "Jūs ketinate įkelti {{size}}. Ar norite tęsti?",
     "couldnotloadfiles": "Negalima užkrauti failų sąrašo.",
+    "downloading": "Siunčiama",
     "emptyfilelist": "Nėra ką rodyti.",
+    "errorcapturingaudio": "Klaida fiksuojant garsą.",
+    "errorcapturingimage": "Klaida fiksuojant paveiksliuką.",
+    "errorcapturingvideo": "Klaida fiksuojant vaizdo įrašą.",
+    "errorgettingimagealbum": "Klaida perkeliant paveiksliuką iš albumo.",
+    "errormustbeonlinetoupload": "Norėdamas įkelti failus, turite prisijungti .",
+    "errornoapp": "Norint atlikti šiuos veiksmus, reikia atsisiųsti programėlę.",
+    "errorreadingfile": "Klaida skaitant failą.",
+    "errorreceivefilenosites": "Svetainė nenurodyta. Prašome ją nurodyti prieš keliant failus.",
     "erroruploadnotworking": "Deja, failo į pasirinktą svetainę įkelti negalima.",
+    "errorwhiledownloading": "Klaida atsisiunčiant failą.",
+    "errorwhilerecordingaudio": "Įrašymo klaida.",
+    "errorwhileuploading": "Atsisiuntimo klaida.",
     "files": "Failai",
+    "fileuploaded": "Failas sėkmingai atsiųstas.",
+    "myfiles": "Mano failai",
+    "myprivatefiles": "Asmeniniai failai",
     "myprivatefilesdesc": "Jūsų privatūs failai Moodle svetainėje.",
+    "photoalbums": "Nuotraukų albumas",
     "privatefiles": "Asmeniniai failai",
+    "readingfile": "Skaitomas failas",
     "sitefiles": "Svetainės failai",
     "sitefilesdesc": "Kiti failai Moodle svetainėje",
-    "uploadfiles": "Įkelti failus"
+    "success": "Sėkmė!",
+    "uploadfiles": "Įkelti failus",
+    "uploading": "Įkeliama",
+    "video": "Vaizdo įrašas"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/nl.json b/www/addons/files/lang/nl.json
index ef922199f2d..a0eca312bb8 100644
--- a/www/addons/files/lang/nl.json
+++ b/www/addons/files/lang/nl.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Je Moodle beheerder heeft het downloaden van bestanden uitgeschakeld. Je kunt door de bestandenlijst bladeren, maar ze niet downloaden.",
+    "audio": "Audio",
+    "camera": "Camera",
+    "chooseaccountuploadfile": "Kies een account om dit bestand naar toe te sturen.",
     "clicktoupload": "Klik op onderstaande knop om bestanden naar je privé-bestanden te uploaden.",
+    "confirmuploadfile": "Je gaat {{size}} uploaden. Wil je verder gaan?",
     "couldnotloadfiles": "De bestandenlijst kon niet geladen worden.",
+    "downloading": "Aan het downloaden",
     "emptyfilelist": "Er zijn geen bestanden te tonen.",
+    "errorcapturingaudio": "Fout bij de audio-opname.",
+    "errorcapturingimage": "Fout bij de foto-opname.",
+    "errorcapturingvideo": "Fout bij de video-opname.",
+    "errorgettingimagealbum": "Fout bij het ophalen van een afbeelding uit het album.",
+    "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
+    "errornoapp": "Je hebt geen app geïnstalleerd om deze actie mee uit te voeren.",
+    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
+    "errorreceivefilenosites": "Er zijn geen sites bewaard. Voeg een site toe voor je een bestand probeert te uploaden.",
     "erroruploadnotworking": "Jammer genoeg kun je op dit ogenblik geen bestanden uploaden naar de site.",
+    "errorwhiledownloading": "Er is een fout opgetreden bij het downloaden van het bestand.",
+    "errorwhilerecordingaudio": "Er is een fout opgetreden tijdens het opnemen van audio.",
+    "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
     "files": "Mijn privé-bestanden",
+    "fileuploaded": "Het uploaden van het bestand is gelukt.",
+    "myfiles": "Mijn bestanden",
+    "myprivatefiles": "Mijn privé-bestanden",
     "myprivatefilesdesc": "Jouw bestanden op deze Moodle-site.",
+    "photoalbums": "Foto-albums",
     "privatefiles": "Privébestanden",
+    "readingfile": "Bestand lezen",
     "sitefiles": "Sitebestanden",
     "sitefilesdesc": "Andere bestanden op deze Moodle-site.",
-    "uploadfiles": "Bestanden uploaden"
+    "success": "Succes!",
+    "uploadfiles": "Bestanden uploaden",
+    "uploading": "Aan het uploaden",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt-br.json b/www/addons/files/lang/pt-br.json
index 3bd84a665d5..2560de0dc8d 100644
--- a/www/addons/files/lang/pt-br.json
+++ b/www/addons/files/lang/pt-br.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Por favor note que o administrador do Moodle desativou downloads de arquivos, você pode navegar através dos arquivos, mas não baixá-los.",
+    "audio": "Áudio",
+    "camera": "Câmera",
+    "chooseaccountuploadfile": "Escolha uma conta para a qual enviar o arquivo.",
     "clicktoupload": "Clique no botão abaixo para enviar para seus arquivos privados.",
+    "confirmuploadfile": "Você está prestes a enviar um arquivo de {{size}}. Você tem certeza que quer continuar?",
     "couldnotloadfiles": "A lista de arquivos não pode ser carregada.",
+    "downloading": "Baixando",
     "emptyfilelist": "Não há arquivos para mostrar.",
+    "errorcapturingaudio": "Erro ao capturar áudio.",
+    "errorcapturingimage": "Erro ao capturar imagem.",
+    "errorcapturingvideo": "Erro ao capturar vídeo.",
+    "errorgettingimagealbum": "Erro ao receber a imagem do álbum.",
+    "errormustbeonlinetoupload": "Você tem que estar online para enviar arquivos.",
+    "errornoapp": "Você não tem um aplicativo instalado que possa fazer essa ação.",
+    "errorreadingfile": "Erro ao ler o arquivo.",
+    "errorreceivefilenosites": "Não existem sites armazenados. Por favor adicione um site antes de enviar um arquivo.",
     "erroruploadnotworking": "Infelizmente é impossível enviar arquivos para o seu site.",
+    "errorwhiledownloading": "Ocorreu um erro ao tentar baixar o arquivo.",
+    "errorwhilerecordingaudio": "Ocorreu um erro ao tentar gravar o áudio.",
+    "errorwhileuploading": "Ocorreu um erro durante o envio do arquivo.",
     "files": "Meus arquivos privados",
+    "fileuploaded": "O arquivo foi enviado com sucesso.",
+    "myfiles": "Meus arquivos",
+    "myprivatefiles": "Meus arquivos privados",
     "myprivatefilesdesc": "Os arquivos que estão disponíveis em sua área de arquivos privados nesse site Moodle.",
+    "photoalbums": "Álbum de fotos",
     "privatefiles": "Arquivos privados",
+    "readingfile": "Lendo o arquivo",
     "sitefiles": "Arquivos do site",
     "sitefilesdesc": "Os outros arquivos que estão disponíveis a você neste site Moodle.",
-    "uploadfiles": "Enviar arquivos"
+    "success": "Sucesso!",
+    "uploadfiles": "Enviar arquivos",
+    "uploading": "Enviando",
+    "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt.json b/www/addons/files/lang/pt.json
index 15ba2f3b400..b256bcb4afa 100644
--- a/www/addons/files/lang/pt.json
+++ b/www/addons/files/lang/pt.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "Tenha en atenção que o administrador do Moodle desativou a opção de descarregar ficheiros. Poderá navegar nos ficheiros mas não conseguirá descarregá-los.",
+    "audio": "Audio",
+    "camera": "Câmara",
+    "chooseaccountuploadfile": "Escolha uma conta para onde carregar o ficheiro.",
     "clicktoupload": "Clique no botão abaixo para carregar ficheiros para os seus ficheiros privados.",
+    "confirmuploadfile": "Está prestes a carregar {{size}}. Tem a certeza que pretende continuar?",
     "couldnotloadfiles": "Não foi possível carregar a lista de ficheiros",
+    "downloading": "A descarregar",
     "emptyfilelist": "Não há ficheiros",
+    "errorcapturingaudio": "Erro na captura do áudio.",
+    "errorcapturingimage": "Erro na captura da imagem.",
+    "errorcapturingvideo": "Erro ao capturar vídeo.",
+    "errorgettingimagealbum": "Erro ao obter a imagem do álbum.",
+    "errormustbeonlinetoupload": "Precisa estar online para carregar ficheiross.",
+    "errornoapp": "Não tem aplicação instalada para executar esta ação.",
+    "errorreadingfile": "Erro ao ler ficheiro.",
+    "errorreceivefilenosites": "Não existem sites armazenados. Por favor adicione um site antes de carregar um ficheiro.",
     "erroruploadnotworking": "Infelizmente não é possível carregar ficheiros para o seu site.",
+    "errorwhiledownloading": "Ocorreu um erro ao tentar descarregar o ficheiro.",
+    "errorwhilerecordingaudio": "Ocorreu um erro ao tentar gravar áudio.",
+    "errorwhileuploading": "Ocorreu um erro durante ao carregar o ficheiro.",
     "files": "Meus ficheiros privados",
+    "fileuploaded": "O ficheiro foi carregado com sucesso.",
+    "myfiles": "Meus ficheiros",
+    "myprivatefiles": "Meus ficheiros privados",
     "myprivatefilesdesc": "Ficheiros disponíveis na sua área privada neste site Moodle",
+    "photoalbums": "Álbum de fotografias",
     "privatefiles": "Ficheiros privados",
+    "readingfile": "A ler ficheiro",
     "sitefiles": "Ficheiros do site",
     "sitefilesdesc": "Os outros ficheiros que estão disponíveis para si neste site Moodle.",
-    "uploadfiles": "Carregar ficheiros"
+    "success": "Sucesso!",
+    "uploadfiles": "Carregar ficheiros",
+    "uploading": "A carregar",
+    "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ro.json b/www/addons/files/lang/ro.json
index 678713c2e70..9b9f147bc0b 100644
--- a/www/addons/files/lang/ro.json
+++ b/www/addons/files/lang/ro.json
@@ -3,10 +3,14 @@
     "clicktoupload": "Apăsați butonul de mai jos pentru a încarcă fișierele în contul dumneavoastră.",
     "couldnotloadfiles": "Lista fișierelor nu a putut fi încărcată.",
     "emptyfilelist": "Nu sunt fișiere disponibile.",
+    "errorreceivefilenosites": "Nu aveți stocat niciun sit. Adăugați un sit înainte de a încărca un fișier.",
     "files": "Fisiere personale",
+    "myfiles": "Fișierele mele",
+    "myprivatefiles": "Fisiere personale",
     "myprivatefilesdesc": "Fișierele disponibile din zona personală, pe care o dețineți pe acest site.",
     "privatefiles": "Fișiere private",
     "sitefiles": "Fișierele disponibile pe site",
     "sitefilesdesc": "Alte fișiere disponibile pe acest site.",
+    "success": "Succes!",
     "uploadfiles": "Încărcați mai multe fișiere"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ru.json b/www/addons/files/lang/ru.json
index 31fb12c3feb..a334bae34e4 100644
--- a/www/addons/files/lang/ru.json
+++ b/www/addons/files/lang/ru.json
@@ -1,12 +1,36 @@
 {
     "admindisableddownload": "Обратите внимание, что администратор Moodle отключил скачивание файлов. Вы можете просмотреть файлы, но не скачать их.",
+    "audio": "Аудио",
+    "camera": "Камера",
+    "chooseaccountuploadfile": "Выбрать учетную запись для загрузки файла",
     "clicktoupload": "Нажмите внизу кнопку для загрузки файлов в свои личные файлы.",
+    "confirmuploadfile": "Вы собираетесь загрузить {{size}}. Вы уверены, что хотите продолжить?",
     "couldnotloadfiles": "Файлы из списка не могут быть загружены",
+    "downloading": "Загрузка",
     "emptyfilelist": "Нет файлов для отображения",
+    "errorcapturingaudio": "Ошибка захвата звука",
+    "errorcapturingimage": "Ошибка захвата изображения",
+    "errorcapturingvideo": "Ошибка захвата видео",
+    "errorgettingimagealbum": "Ошибка получения изображения из альбома",
+    "errormustbeonlinetoupload": "Вы должны на сайте, чтобы загружать файлы.",
+    "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
+    "errorreadingfile": "Ошибка при чтении файла",
+    "errorreceivefilenosites": "Нет сайта для хранения. Пожалуйста, добавьте сайт, прежде чем пытаться загрузить файл",
+    "errorwhiledownloading": "Произошла ошибка при попытке загрузки файла",
+    "errorwhilerecordingaudio": "Произошла ошибка при попытке записи аудио",
+    "errorwhileuploading": "Произошла ошибка во время загрузки файла",
     "files": "Мои личные файлы",
+    "fileuploaded": "Файл загружен",
+    "myfiles": "Мои файлы",
+    "myprivatefiles": "Мои личные файлы",
     "myprivatefilesdesc": "Файлы, которые доступны Вам в личном кабинете на этом сайте Moodle.",
+    "photoalbums": "Фотоальбомы",
     "privatefiles": "Личные файлы",
+    "readingfile": "Чтение файла",
     "sitefiles": "Файлы сайта",
     "sitefilesdesc": "Другие файлы, доступные на этом сайте Moodle",
-    "uploadfiles": "Загрузка файлов"
+    "success": "Успешно!",
+    "uploadfiles": "Загрузка файлов",
+    "uploading": "Загрузка",
+    "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/sv.json b/www/addons/files/lang/sv.json
index 0883562b317..437c3e99d8f 100644
--- a/www/addons/files/lang/sv.json
+++ b/www/addons/files/lang/sv.json
@@ -3,10 +3,14 @@
     "clicktoupload": "Klicka på knappen nedan för att ladda upp filer till dina privata filer.",
     "couldnotloadfiles": "Listan över filer kunde inte läsas in.",
     "emptyfilelist": "Det finns inga filer att visa.",
+    "errorreceivefilenosites": "Det finns inga webbsidor sparade. Lägg till en sida innan du försöker ladda upp en fil.",
     "files": "Mina privata filer",
+    "myfiles": "Mina filer",
+    "myprivatefiles": "Mina privata filer",
     "myprivatefilesdesc": "De filer som finns i din privata område på denna Moodle webbplats.",
     "privatefiles": "Privata filer",
     "sitefiles": "webbplats filer",
     "sitefilesdesc": "De andra filer som är tillgängliga för dig på denna Moodle webbplats.",
+    "success": "Framgång!",
     "uploadfiles": "Ladda upp filer"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/tr.json b/www/addons/files/lang/tr.json
index 011292bc652..eea4b750c75 100644
--- a/www/addons/files/lang/tr.json
+++ b/www/addons/files/lang/tr.json
@@ -1,6 +1,13 @@
 {
+    "errorcapturingaudio": "Ses çalma hatası",
+    "errorcapturingvideo": "Video oynatma hatası",
     "files": "Dosyalarım",
+    "fileuploaded": "Dosya yüklendi",
+    "myfiles": "Dosyalarım",
+    "photoalbums": "Fotoğraf albümleri",
     "privatefiles": "Kişisel dosyalar",
     "sitefiles": "Site dosyaları",
-    "uploadfiles": "Dosya yükleyebilir"
+    "uploadfiles": "Dosya yükleyebilir",
+    "uploading": "Yükleniyor",
+    "video": "Video"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/zh-cn.json b/www/addons/files/lang/zh-cn.json
index 667c6b73e0b..c4da0041842 100644
--- a/www/addons/files/lang/zh-cn.json
+++ b/www/addons/files/lang/zh-cn.json
@@ -1,7 +1,13 @@
 {
     "emptyfilelist": "没有可显示的文件",
+    "errorcapturingaudio": "捕捉音频时出错。",
+    "errorcapturingvideo": "捕捉视频时出错。",
     "files": "我的文件",
+    "fileuploaded": "文件已成功上传。",
+    "myfiles": "我的文件",
     "privatefiles": "私人文件",
     "sitefiles": "站点文件",
-    "uploadfiles": "可以上传文件"
+    "uploadfiles": "可以上传文件",
+    "uploading": "上传中",
+    "video": "视频"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/zh-tw.json b/www/addons/files/lang/zh-tw.json
index 066cdb40014..23885287d8d 100644
--- a/www/addons/files/lang/zh-tw.json
+++ b/www/addons/files/lang/zh-tw.json
@@ -1,13 +1,37 @@
 {
     "admindisableddownload": "請注意, 您的Moodle管理員禁止檔案下載, 您可以瀏覽檔案, 但不能下載它們.",
+    "audio": "錄音",
+    "camera": "照相機",
+    "chooseaccountuploadfile": "選擇一個帳號去上傳檔案",
     "clicktoupload": "點選這個按鈕,將檔案上傳到你的個人檔案區",
+    "confirmuploadfile": "您即將上傳{{size}}. 您確定要繼續嗎？",
     "couldnotloadfiles": "這些檔案是不能被載入的",
+    "downloading": "下載中",
     "emptyfilelist": "沒有檔案可以顯示",
+    "errorcapturingaudio": "截取錄音資料錯誤",
+    "errorcapturingimage": "截取畫面錯誤",
+    "errorcapturingvideo": "截取錄影資料錯誤",
+    "errorgettingimagealbum": "從相簿讀取影像檔發生錯誤",
+    "errormustbeonlinetoupload": "你必須上線才能上傳檔案",
+    "errornoapp": "您沒有安裝應用程式來執行此動作.",
+    "errorreadingfile": "讀取檔案發生錯誤",
+    "errorreceivefilenosites": "沒有儲存的網站. 請在嘗試上傳檔案之前新增一個網站.",
     "erroruploadnotworking": "很抱歉, 目前無法將檔案上傳到您的網站.",
+    "errorwhiledownloading": "當試著去下載檔案時發生錯誤",
+    "errorwhilerecordingaudio": "當試著去錄音時發生錯誤",
+    "errorwhileuploading": "上傳檔案時發生錯誤",
     "files": "我的檔案",
+    "fileuploaded": "檔案上傳成功",
+    "myfiles": "我的檔案",
+    "myprivatefiles": "個人專用檔案",
     "myprivatefilesdesc": "在此Moodle網站上, 您的私有區域中有可用的文件",
+    "photoalbums": "相簿",
     "privatefiles": "私人檔案",
+    "readingfile": "讀取檔案",
     "sitefiles": "網站公用檔案",
     "sitefilesdesc": "您在此Moodle網站上有可用的其他文件.",
-    "uploadfiles": "上傳檔案"
+    "success": "成功!",
+    "uploadfiles": "上傳檔案",
+    "uploading": "上傳中",
+    "video": "錄影"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ar.json b/www/addons/frontpage/lang/ar.json
index e5c4a314541..1a14d85a4c1 100644
--- a/www/addons/frontpage/lang/ar.json
+++ b/www/addons/frontpage/lang/ar.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "الصفحة الرئيسية",
     "sitehome": "الصفحة الرئيسية",
     "sitenews": "أخبار الموقع"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/bg.json b/www/addons/frontpage/lang/bg.json
index df102ae2464..d251b48bf26 100644
--- a/www/addons/frontpage/lang/bg.json
+++ b/www/addons/frontpage/lang/bg.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Заглавна страница",
     "sitehome": "Заглавна страница",
     "sitenews": "Новини от сайта"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ca.json b/www/addons/frontpage/lang/ca.json
index de3886bcffc..7a430c3a847 100644
--- a/www/addons/frontpage/lang/ca.json
+++ b/www/addons/frontpage/lang/ca.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Pàgina principal",
     "sitehome": "Inici",
     "sitenews": "Notícies del lloc"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/cs.json b/www/addons/frontpage/lang/cs.json
index 8855e125154..97d5a3c4015 100644
--- a/www/addons/frontpage/lang/cs.json
+++ b/www/addons/frontpage/lang/cs.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Titulní stránka",
     "sitehome": "Domovská stránka",
     "sitenews": "Oznámení stránek"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/da.json b/www/addons/frontpage/lang/da.json
index e26cdd5bfd6..dd3fb3e76ff 100644
--- a/www/addons/frontpage/lang/da.json
+++ b/www/addons/frontpage/lang/da.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Forside",
     "sitehome": "Websteds hjem",
     "sitenews": "Sitemeddelelser"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/de.json b/www/addons/frontpage/lang/de.json
index 2bdf44debd8..8c3ca69ec5b 100644
--- a/www/addons/frontpage/lang/de.json
+++ b/www/addons/frontpage/lang/de.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Startseite",
     "sitehome": "Startseite",
     "sitenews": "Ankündigungen"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/el.json b/www/addons/frontpage/lang/el.json
index a3c4e4c8cf4..e327cf31466 100644
--- a/www/addons/frontpage/lang/el.json
+++ b/www/addons/frontpage/lang/el.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Κεντρική σελίδα",
     "sitehome": "Αρχική σελίδα",
     "sitenews": "Νέα του ιστοχώρου"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es-mx.json b/www/addons/frontpage/lang/es-mx.json
index 59a7b3f143c..e2db2b8b52d 100644
--- a/www/addons/frontpage/lang/es-mx.json
+++ b/www/addons/frontpage/lang/es-mx.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Portada",
     "sitehome": "Página inicial del sitio",
     "sitenews": "Anuncios del sitio"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es.json b/www/addons/frontpage/lang/es.json
index 6fad2149059..e332204ca4a 100644
--- a/www/addons/frontpage/lang/es.json
+++ b/www/addons/frontpage/lang/es.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Página Principal",
     "sitehome": "Inicio",
     "sitenews": "Novedades del sitio"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/eu.json b/www/addons/frontpage/lang/eu.json
index 2a21d6f7aa1..a87e22dc7d6 100644
--- a/www/addons/frontpage/lang/eu.json
+++ b/www/addons/frontpage/lang/eu.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Hasiera-orria",
     "sitehome": "Gunearen hasiera",
     "sitenews": "Gunearen berriak"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/fr.json b/www/addons/frontpage/lang/fr.json
index 57bf1bb4ec0..427a48724d0 100644
--- a/www/addons/frontpage/lang/fr.json
+++ b/www/addons/frontpage/lang/fr.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Page d'accueil",
     "sitehome": "Plateforme",
     "sitenews": "Annonces du site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/he.json b/www/addons/frontpage/lang/he.json
index b0e436c2799..accf17fcbd4 100644
--- a/www/addons/frontpage/lang/he.json
+++ b/www/addons/frontpage/lang/he.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "עמוד ראשי",
     "sitehome": "עמוד ראשי",
     "sitenews": "חדשות האתר"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/it.json b/www/addons/frontpage/lang/it.json
index 9490d0feb02..a941722fcb3 100644
--- a/www/addons/frontpage/lang/it.json
+++ b/www/addons/frontpage/lang/it.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Pagina home",
     "sitehome": "Home del sito",
     "sitenews": "Annunci del sito"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ja.json b/www/addons/frontpage/lang/ja.json
index f1b1318bc5a..fce19c38c5d 100644
--- a/www/addons/frontpage/lang/ja.json
+++ b/www/addons/frontpage/lang/ja.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "フロントページ",
     "sitehome": "フロントページ",
     "sitenews": "サイトアナウンスメント"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/lt.json b/www/addons/frontpage/lang/lt.json
index 95d9705bdc1..7eeb8a3a4f9 100644
--- a/www/addons/frontpage/lang/lt.json
+++ b/www/addons/frontpage/lang/lt.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Titulinis lapas",
     "sitehome": "Pagrindinis svetainės puslapis",
     "sitenews": "Svetainės skelbimai"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/nl.json b/www/addons/frontpage/lang/nl.json
index a94c7942487..c9a8024a955 100644
--- a/www/addons/frontpage/lang/nl.json
+++ b/www/addons/frontpage/lang/nl.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Startpagina",
     "sitehome": "Site startpagina",
     "sitenews": "Site-mededelingen"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt-br.json b/www/addons/frontpage/lang/pt-br.json
index d54afdfa0a6..7eb94bf6ea0 100644
--- a/www/addons/frontpage/lang/pt-br.json
+++ b/www/addons/frontpage/lang/pt-br.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Página principal",
     "sitehome": "Página inicial",
     "sitenews": "Novidades"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt.json b/www/addons/frontpage/lang/pt.json
index ffb96b57d58..62b12b63065 100644
--- a/www/addons/frontpage/lang/pt.json
+++ b/www/addons/frontpage/lang/pt.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Página principal",
     "sitehome": "Página inicial",
     "sitenews": "Anúncios do site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ro.json b/www/addons/frontpage/lang/ro.json
index dc9350bc054..5c338787d35 100644
--- a/www/addons/frontpage/lang/ro.json
+++ b/www/addons/frontpage/lang/ro.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Prima pagina",
     "sitehome": "Pagina principală",
     "sitenews": "Ştiri site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ru.json b/www/addons/frontpage/lang/ru.json
index 986bb12dcf8..dbd2facda41 100644
--- a/www/addons/frontpage/lang/ru.json
+++ b/www/addons/frontpage/lang/ru.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Главная страница",
     "sitehome": "Главная страница",
     "sitenews": "Новости сайта"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/sv.json b/www/addons/frontpage/lang/sv.json
index 02d32005a71..be57af83981 100644
--- a/www/addons/frontpage/lang/sv.json
+++ b/www/addons/frontpage/lang/sv.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "Ingångssida",
     "sitehome": "Webbsida hem",
     "sitenews": "Webbplatsnyheter"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/zh-tw.json b/www/addons/frontpage/lang/zh-tw.json
index 72b147b8191..10fd23d8fa7 100644
--- a/www/addons/frontpage/lang/zh-tw.json
+++ b/www/addons/frontpage/lang/zh-tw.json
@@ -1,4 +1,5 @@
 {
+    "frontpage": "首頁",
     "sitehome": "首頁",
     "sitenews": "網站公告"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/bg.json b/www/addons/grades/lang/bg.json
index 35d8d8343df..6fb3aee6f38 100644
--- a/www/addons/grades/lang/bg.json
+++ b/www/addons/grades/lang/bg.json
@@ -1,3 +1,4 @@
 {
+    "itemname": "Оценяване",
     "viewgrades": "Преглед на оценките"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ca.json b/www/addons/grades/lang/ca.json
index d4eaffdc5d6..466e2340dfb 100644
--- a/www/addons/grades/lang/ca.json
+++ b/www/addons/grades/lang/ca.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Element de qualificació",
     "nogradesreturned": "No s'han retornat qualificacions",
     "viewgrades": "Visualitza les qualificacions"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/cs.json b/www/addons/grades/lang/cs.json
index d81f129f741..83049846fd4 100644
--- a/www/addons/grades/lang/cs.json
+++ b/www/addons/grades/lang/cs.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Položka známky",
     "nogradesreturned": "Nebyly nalezeny žádné známky",
     "viewgrades": "Zobrazit známky"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/da.json b/www/addons/grades/lang/da.json
index 5139ff1e2aa..4a325ef7ec4 100644
--- a/www/addons/grades/lang/da.json
+++ b/www/addons/grades/lang/da.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Emne til bedømmelse",
     "nogradesreturned": "Ingen karakterer returneret",
     "viewgrades": "Vis bedømmelser"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/de.json b/www/addons/grades/lang/de.json
index e5cc9fa961b..b46241900f1 100644
--- a/www/addons/grades/lang/de.json
+++ b/www/addons/grades/lang/de.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Bewertungsaspekt",
     "nogradesreturned": "Keine Bewertung zum Anzeigen vorhanden",
     "viewgrades": "Bewertungen anzeigen"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/el.json b/www/addons/grades/lang/el.json
index c1625a02671..b7bd37ee00f 100644
--- a/www/addons/grades/lang/el.json
+++ b/www/addons/grades/lang/el.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Βαθμολογία αντικειμένου",
     "nogradesreturned": "Δεν επιστράφηκε κανένας βαθμός",
     "viewgrades": "Προβολή βαθμών"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/es-mx.json b/www/addons/grades/lang/es-mx.json
index 694aa3a580f..a69b255c454 100644
--- a/www/addons/grades/lang/es-mx.json
+++ b/www/addons/grades/lang/es-mx.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Ítem de calificación",
     "nogradesreturned": "No se han devuelto calificaciones",
     "viewgrades": "Ver calificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/es.json b/www/addons/grades/lang/es.json
index 694aa3a580f..daff3a42fa5 100644
--- a/www/addons/grades/lang/es.json
+++ b/www/addons/grades/lang/es.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Elemento de calificación",
     "nogradesreturned": "No se han devuelto calificaciones",
     "viewgrades": "Ver calificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/eu.json b/www/addons/grades/lang/eu.json
index 305820b08b2..a2da159e978 100644
--- a/www/addons/grades/lang/eu.json
+++ b/www/addons/grades/lang/eu.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Elementua kalifikatu",
     "nogradesreturned": "Ez da kalifikaziorik itzuli",
     "viewgrades": "Kalifikazioak ikusi"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/fr.json b/www/addons/grades/lang/fr.json
index 37ee094566f..61839e826ef 100644
--- a/www/addons/grades/lang/fr.json
+++ b/www/addons/grades/lang/fr.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Élément d'évaluation",
     "nogradesreturned": "Aucune note retournée",
     "viewgrades": "Afficher les notes"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/he.json b/www/addons/grades/lang/he.json
index 04c6f80e227..9fe92d0ae5c 100644
--- a/www/addons/grades/lang/he.json
+++ b/www/addons/grades/lang/he.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "פריט ציון",
     "nogradesreturned": "לא הוחזרו ציונים",
     "viewgrades": "צפיה בציונים"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/it.json b/www/addons/grades/lang/it.json
index 883d830fb4f..892207d58e2 100644
--- a/www/addons/grades/lang/it.json
+++ b/www/addons/grades/lang/it.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Elemento di valutazione",
     "nogradesreturned": "Non è stata ottenuta alcuna valutazione",
     "viewgrades": "Visualizza valutazioni"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ja.json b/www/addons/grades/lang/ja.json
index 23abe78a3be..a756f630d3e 100644
--- a/www/addons/grades/lang/ja.json
+++ b/www/addons/grades/lang/ja.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "評定項目",
     "nogradesreturned": "評点がありません。",
     "viewgrades": "評定を表示する"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/lt.json b/www/addons/grades/lang/lt.json
index eb0999f2672..fc1809b6b53 100644
--- a/www/addons/grades/lang/lt.json
+++ b/www/addons/grades/lang/lt.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Įvertinti",
     "nogradesreturned": "Įverčių nepateikta",
     "viewgrades": "Peržiūrėti įverčius"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/nl.json b/www/addons/grades/lang/nl.json
index a11f8e821e2..f4489bca2f5 100644
--- a/www/addons/grades/lang/nl.json
+++ b/www/addons/grades/lang/nl.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Beoordelingsitem",
     "nogradesreturned": "Geen cijfers",
     "viewgrades": "Bekijk cijfers"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pt-br.json b/www/addons/grades/lang/pt-br.json
index a93815a0aca..2105992ad37 100644
--- a/www/addons/grades/lang/pt-br.json
+++ b/www/addons/grades/lang/pt-br.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Item de nota",
     "nogradesreturned": "Nenhuma avaliação calculada",
     "viewgrades": "Ver notas"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pt.json b/www/addons/grades/lang/pt.json
index 1becbd39256..759a7cf8365 100644
--- a/www/addons/grades/lang/pt.json
+++ b/www/addons/grades/lang/pt.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Item de avaliação",
     "nogradesreturned": "Não foram devolvidas notas",
     "viewgrades": "Ver notas"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ro.json b/www/addons/grades/lang/ro.json
index 6b6760ff8e0..23c1becd038 100644
--- a/www/addons/grades/lang/ro.json
+++ b/www/addons/grades/lang/ro.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Element al notei",
     "nogradesreturned": "Nu au fost returnate note",
     "viewgrades": "Vedeți notele"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ru.json b/www/addons/grades/lang/ru.json
index 733ed0c23e6..87410fef2ad 100644
--- a/www/addons/grades/lang/ru.json
+++ b/www/addons/grades/lang/ru.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Элемент оценки",
     "nogradesreturned": "Нет оценок",
     "viewgrades": "Просмотр оценок"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/tr.json b/www/addons/grades/lang/tr.json
index a9b8afc370a..06231a7a90a 100644
--- a/www/addons/grades/lang/tr.json
+++ b/www/addons/grades/lang/tr.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "Not ögesi",
     "nogradesreturned": "Hiç not yok",
     "viewgrades": "Notlara bak"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/zh-cn.json b/www/addons/grades/lang/zh-cn.json
index 61847c25ce4..c4bcff223e8 100644
--- a/www/addons/grades/lang/zh-cn.json
+++ b/www/addons/grades/lang/zh-cn.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "评分项",
     "nogradesreturned": "未找到成绩",
     "viewgrades": "查看成绩"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/zh-tw.json b/www/addons/grades/lang/zh-tw.json
index 7dedc8d3d0c..ddf0abb9669 100644
--- a/www/addons/grades/lang/zh-tw.json
+++ b/www/addons/grades/lang/zh-tw.json
@@ -1,4 +1,5 @@
 {
+    "itemname": "成績項目",
     "nogradesreturned": "未找到成績",
     "viewgrades": "檢視成績"
 }
\ No newline at end of file
diff --git a/www/addons/messageoutput/airnotifier/lang/fa.json b/www/addons/messageoutput/airnotifier/lang/fa.json
new file mode 100644
index 00000000000..b5a9bf34d9e
--- /dev/null
+++ b/www/addons/messageoutput/airnotifier/lang/fa.json
@@ -0,0 +1,3 @@
+{
+    "processorsettingsdesc": "پیکربندی دستگاه‌ها"
+}
\ No newline at end of file
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index 1c2ca6e4d20..a8db02553b9 100644
--- a/www/addons/messages/lang/cs.json
+++ b/www/addons/messages/lang/cs.json
@@ -1,6 +1,7 @@
 {
     "addcontact": "Přidat kontakt",
     "blockcontact": "Blokovat kontakt",
+    "blockcontactconfirm": "Přestanete dostávat zprávy od tohoto kontaktu.",
     "blocknoncontacts": "Blokuj všechny nové zprávy od uživatelů, které nemám v seznamu kontaktů",
     "contactlistempty": "Seznam kontaktů je prázdný",
     "contactname": "Jméno kontaktu",
@@ -11,15 +12,18 @@
     "errorwhileretrievingcontacts": "Chyba při načítání kontaktů ze serveru.",
     "errorwhileretrievingdiscussions": "Chyba při načítání diskusí ze serveru.",
     "errorwhileretrievingmessages": "Chyba při načítání zpráv ze serveru.",
+    "loadpreviousmessages": "Načtení předchozích zpráv",
     "message": "Zpráva",
     "messagenotsent": "Zpráva nebyla odeslána, zkuste to prosím později.",
     "messagepreferences": "Nastavení zpráv",
     "messages": "Zprávy",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
     "newmessage": "Nová zpráva...",
+    "newmessages": "Nové zprávy",
     "nomessages": "Žádné zprávy.",
     "nousersfound": "Nebyl nalezen žádný uživatel",
     "removecontact": "Odstranit kontakt",
+    "removecontactconfirm": "Kontakt bude odstraněn ze seznamu kontaktů.",
     "send": "Odeslat",
     "sendmessage": "Odeslat zprávu",
     "type_blocked": "Blokováno",
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index ec21562a907..19ac3536b7d 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -9,6 +9,7 @@
     "deletemessage": "Nachricht löschen",
     "deletemessageconfirmation": "Möchten Sie wirklich diese Nachricht löschen? Die Nachricht wird ausschließlich aus Ihrem Nachrichtenverlauf gelöscht, ist aber weiterhin bei der Person zu sehen, die Ihnen die Nachricht geschickt hat.",
     "errordeletemessage": "Fehler beim Löschen der Mitteilung",
+    "erroruseronlyacceptsmessagefromcontacts": "Fehler: Diese Person erlaubt den Empfang von Mitteilungen nur von ihren Kontakten.",
     "errorwhileretrievingcontacts": "Fehler beim Lesen der Kontakte vom Server",
     "errorwhileretrievingdiscussions": "Fehler beim Lesen der Themen vom Server",
     "errorwhileretrievingmessages": "Fehler beim Empfang der Mitteilungen vom Server",
diff --git a/www/addons/messages/lang/fa.json b/www/addons/messages/lang/fa.json
index cfe73baae57..f8289b8bc32 100644
--- a/www/addons/messages/lang/fa.json
+++ b/www/addons/messages/lang/fa.json
@@ -3,7 +3,9 @@
     "blockcontact": "مسدود کردن مخاطب",
     "blocknoncontacts": "جلوگیری از دریافت پیام افرادی که در لیست مخاطبین من نمی باشند.",
     "contactlistempty": "لیست مخاطبین شما خالی است",
+    "contactname": "نام مخاطب",
     "contacts": "مخاطبین",
+    "errorwhileretrievingdiscussions": "خطا در دریافت مباحثه‌ها از کارگزار.",
     "message": "متن پیام",
     "messagepreferences": "ترجیحات پیام‌دهی",
     "messages": "پیام های من",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index ba78b24e0ee..436885ecfdb 100644
--- a/www/addons/messages/lang/nl.json
+++ b/www/addons/messages/lang/nl.json
@@ -1,6 +1,7 @@
 {
     "addcontact": "Voeg contact toe",
     "blockcontact": "Blokkeer contact",
+    "blockcontactconfirm": "Je zult geen berichten meer krijgen van deze contactpersoon.",
     "blocknoncontacts": "Blokkeer gebruikers  die niet op mijn contactenlijst staan",
     "contactlistempty": "De contactenlijst is leeg",
     "contactname": "Naam",
@@ -11,15 +12,18 @@
     "errorwhileretrievingcontacts": "Fout bij het ophalen van contacten van de server.",
     "errorwhileretrievingdiscussions": "Fout bij het ophalen van discussies van de server.",
     "errorwhileretrievingmessages": "Fout bij het ophalen van berichten van de server.",
+    "loadpreviousmessages": "Laad vorige berichten",
     "message": "Berichtinhoud",
     "messagenotsent": "Het bericht is niet verzonden. Probeer het later opnieuw.",
     "messagepreferences": "Berichten voorkeuren",
     "messages": "Berichten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
     "newmessage": "Nieuw bericht...",
+    "newmessages": "Nieuwe berichten",
     "nomessages": "Geen berichten.",
     "nousersfound": "Geen gebruikers gevonden",
     "removecontact": "Verwijder contact",
+    "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
     "send": "Stuur",
     "sendmessage": "Stuur een bericht",
     "type_blocked": "Geblokkeerd",
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index c3f12e4d247..e3087c02adb 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -1,6 +1,7 @@
 {
     "addcontact": "Adicionar como contato",
     "blockcontact": "Bloquear contato",
+    "blockcontactconfirm": "Você deixará de receber mensagens deste contato.",
     "blocknoncontacts": "Bloquear todas as mensagens de quem não estiver na minha lista de contatos",
     "contactlistempty": "A lista de contatos está vaiza",
     "contactname": "Nome do contato",
@@ -8,17 +9,21 @@
     "deletemessage": "Excluir mensagem",
     "deletemessageconfirmation": "Tem certeza de que deseja excluir esta mensagem? Ela só será excluída do seu histórico de mensagens e ainda poderá ser vista pelo usuário que enviou ou recebeu a mensagem.",
     "errordeletemessage": "Erro enquanto excluía a mensagem.",
+    "erroruseronlyacceptsmessagefromcontacts": "O usuário somente aceita mensagens de contatos",
     "errorwhileretrievingcontacts": "Erro ao recuperar contatos a partir do servidor.",
     "errorwhileretrievingdiscussions": "Erro ao recuperar discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao recuperar as mensagens do servidor.",
+    "loadpreviousmessages": "Carregar mensagens anteriores",
     "message": "Corpo da mensagem",
     "messagenotsent": "A mensagem não foi enviada. Por favor tente novamente mais tarde.",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Você precisa estar conectado para enviar mensagens.",
     "newmessage": "Nova mensagem...",
+    "newmessages": "Novas mensagens",
     "nomessages": "Não há mensagens.",
     "nousersfound": "Nenhum usuário encontrado",
     "removecontact": "Remover contato",
+    "removecontactconfirm": "O contato será removido da sua lista de contatos.",
     "send": "Enviar",
     "sendmessage": "Envie uma mensagem",
     "type_blocked": "Bloqueado",
diff --git a/www/addons/messages/lang/pt.json b/www/addons/messages/lang/pt.json
index e2a54737c80..2ecee753b1c 100644
--- a/www/addons/messages/lang/pt.json
+++ b/www/addons/messages/lang/pt.json
@@ -9,6 +9,7 @@
     "deletemessage": "Apagar mensagem",
     "deletemessageconfirmation": "Tem a certeza que deseja apagar esta mensagem? A mesma será apagada apenas do seu histórico de mensagens, continuando visível para o utilizador que a enviou ou que recebeu a mensagem.",
     "errordeletemessage": "Erro ao eliminar a mensagem.",
+    "erroruseronlyacceptsmessagefromcontacts": "O utilizador apenas recebe mensagens dos seus contactos",
     "errorwhileretrievingcontacts": "Erro ao obter os contactos do servidor.",
     "errorwhileretrievingdiscussions": "Erro ao obter os tópicos de discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao obter as mensagens do servidor.",
diff --git a/www/addons/messages/lang/ro.json b/www/addons/messages/lang/ro.json
index 8d12fb7b3b4..e8497ebbc3a 100644
--- a/www/addons/messages/lang/ro.json
+++ b/www/addons/messages/lang/ro.json
@@ -8,6 +8,7 @@
     "deletemessage": "Șterge mesaj",
     "deletemessageconfirmation": "Sunteți sigur că doriți să ștergeți acest mesaj? Va fi șters numai din istoricul mesajelor și va fi în continuare vizibil de către utilizatorul care a trimis sau a primit mesajul.",
     "errordeletemessage": "Eroare la ștergerea mesajului.",
+    "erroruseronlyacceptsmessagefromcontacts": "-",
     "errorwhileretrievingcontacts": "A apărut o eroare în găsirea contactelor pe server.",
     "errorwhileretrievingdiscussions": "A apărut o eroare în găsirea conversațiilor de pe server.",
     "errorwhileretrievingmessages": "A apărut o eroare în găsirea mesajelor de pe server.",
diff --git a/www/addons/messages/lang/ru.json b/www/addons/messages/lang/ru.json
index 5d5b88bff34..ac3a6c3473b 100644
--- a/www/addons/messages/lang/ru.json
+++ b/www/addons/messages/lang/ru.json
@@ -10,12 +10,14 @@
     "errorwhileretrievingcontacts": "Ошибка при извлечении контактов с сервера",
     "errorwhileretrievingdiscussions": "Ошибка при получении обсуждения с сервера.",
     "errorwhileretrievingmessages": "Ошибка при получении сообщения с сервера",
+    "loadpreviousmessages": "Загрузить предыдущее сообщение",
     "message": "Текст сообщения",
     "messagenotsent": "Сообщение не было отправлено. Повторите попытку позже.",
     "messagepreferences": "Настройки сообщений",
     "messages": "Сообщения",
     "mustbeonlinetosendmessages": "Вы должны быть на сайте, чтобы отправлять сообщения",
     "newmessage": "Новое сообщение...",
+    "newmessages": "Новые сообщения",
     "nomessages": "Нет сообщений",
     "nousersfound": "Пользователи не найдены",
     "removecontact": "Удалить контакт",
diff --git a/www/addons/mod/assign/lang/ca.json b/www/addons/mod/assign/lang/ca.json
index 7c27bd7dff0..065ff663e07 100644
--- a/www/addons/mod/assign/lang/ca.json
+++ b/www/addons/mod/assign/lang/ca.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Accepteu el compromís de tramesa.",
     "addattempt": "Permet un altre intent",
     "addnewattempt": "Afegeix un altre intent",
     "addnewattemptfromprevious": "Afegeix un intent nou basat en la tramesa anterior",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manualment",
     "attemptreopenmethod_untilpass": "Automàticament fins superació",
     "attemptsettings": "Configuració dels intents",
+    "cannoteditduetostatementsubmission": "No podeu afegir o editar la tramesa en l'aplicació perquè no s'ha pogut recuperar el compromís de tramesa del lloc.",
+    "cannotgradefromapp": "Alguns mètodes de qualificació no estan encara suportats per l'aplicació i no es poden modificar.",
+    "cannotsubmitduetostatementsubmission": "No podeu enviar la tramesa a qualificar en l'aplicació perquè no s'ha pogut recuperar el compromís de tramesa del lloc.",
     "confirmsubmission": "Segur que voleu trametre el vostre treball per a qualificar? Ja no podreu realitzar més canvis.",
     "currentattempt": "Aquest és l'intent {{$a}}.",
     "currentattemptof": "Aquest és l'intent {{$a.attemptnumber}} ( {{$a.maxattempts}} intents permesos ).",
@@ -24,11 +28,15 @@
     "duedatereached": "La data de venciment de la tasca ja ha passat",
     "editingstatus": "S'està editant l'estat",
     "editsubmission": "Edita la tramesa",
+    "erroreditpluginsnotsupported": "No podeu afegir o editar una tramesa en l'aplicació perquè alguns connectors no s'admeten per editar:",
+    "errorshowinginformation": "No es pot mostrar la informació de la tramesa",
     "extensionduedate": "Data de venciment de la pròrroga",
+    "feedbacknotsupported": "Aquesta retroacció no està admesa per l'aplicació i podria no contenir tota la informació",
     "grade": "Qualificació",
     "graded": "Qualificada",
     "gradedby": "Qualificat per",
     "gradedon": "Qualificat el",
+    "gradenotsynced": "La puntuació no està sincronitzada",
     "gradeoutof": "Qualificació sobre {{$a}}",
     "gradingstatus": "Estat de la qualificació",
     "groupsubmissionsettings": "Paràmetres de la tramesa en grup",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Sols és permès per als participants que tenen concedida una pròrroga.",
     "noonlinesubmissions": "Aquesta tasca no requereix que trameteu res en línia.",
     "nosubmission": "No s'ha tramès res per a aquesta tasca",
+    "notallparticipantsareshown": "Els participants que no tinguin cap tramesa no es mostren",
     "noteam": "No és membre de cap grup",
     "notgraded": "Sense qualificació",
     "numberofdraftsubmissions": "Esborranys",
@@ -61,6 +70,7 @@
     "submission": "Tramesa",
     "submissioneditable": "L'estudiant pot editar aquesta tramesa",
     "submissionnoteditable": "L'estudiant no pot editar aquesta tramesa",
+    "submissionnotsupported": "Aquesta tramesa no està admesa per l'aplicació i podria no contenir tota la informació",
     "submissionslocked": "Aquesta tasca no accepta trameses",
     "submissionstatus": "Estat de la tramesa",
     "submissionstatus_": "No s'ha tramès",
@@ -80,5 +90,8 @@
     "ungroupedusers": "El paràmetre «Cal formar part d'un grup per fer una tramesa» està activat, i alguns usuaris o no són membres de cap grup o són membres de més d'un grup, per la qual cosa no poden fer trameses.",
     "unlimitedattempts": "Il·limitats",
     "userswhoneedtosubmit": "Usuaris que manquen per trametre: {{$a}}",
-    "viewsubmission": "Visualitza la tramesa"
+    "userwithid": "Usuari amb Id {{id}}",
+    "viewsubmission": "Visualitza la tramesa",
+    "warningsubmissiongrademodified": "S'ha modificat la qualificació de la tramesa a la web.",
+    "warningsubmissionmodified": "La tramesa de l'usuari s'ha modificat a la web."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/cs.json b/www/addons/mod/assign/lang/cs.json
index 9a93eccf489..5a161371d89 100644
--- a/www/addons/mod/assign/lang/cs.json
+++ b/www/addons/mod/assign/lang/cs.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Přijměte prohlášení prosím.",
     "addattempt": "Povolit další pokus",
     "addnewattempt": "Přidat nový pokus",
     "addnewattemptfromprevious": "Přidat nový pokus na základě posledního odevzdání",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Ručně",
     "attemptreopenmethod_untilpass": "Automaticky dokud neuspěje",
     "attemptsettings": "Nastavení pokusů",
+    "cannoteditduetostatementsubmission": "V aplikaci nemůžete přidat nebo upravit řešení úkolu, protože jsme nemohli získat stav řešení z webu.",
+    "cannotgradefromapp": "Některé metody známkování zatím nejsou aplikací podporovány a nemohou být změněny.",
+    "cannotsubmitduetostatementsubmission": "V aplikaci nemůžete odeslat známku úkolu, protože jsme nemohli získat stav řešení z webu.",
     "confirmsubmission": "Jste si jisti, že chcete odeslat svou práci k hodnocení? Nebudete moci provádět žádné další změny.",
     "currentattempt": "Toto je pokus č. {{$a}}.",
     "currentattemptof": "Toto je pokus č. {{$a.attemptnumber}} (celkem je povoleno {{$a.maxattempts}} pokusů).",
@@ -24,11 +28,15 @@
     "duedatereached": "Termín pro odevzdání tohoto úkolu vypršel",
     "editingstatus": "Stav úprav",
     "editsubmission": "Upravit řešení úkolu",
+    "erroreditpluginsnotsupported": "V aplikaci nemůžete přidat nebo upravit řešení úkolu, protože některé doplňky nepodporují úpravy:",
+    "errorshowinginformation": "Nemůžeme zobrazit informace o řešení úkolu",
     "extensionduedate": "Prodloužený termín odevzdání",
+    "feedbacknotsupported": "Tento komentář není aplikací podporován a nemůže obsahovat informace",
     "grade": "Známka",
     "graded": "Udělena známka",
     "gradedby": "Hodnoceno",
     "gradedon": "Hodnoceno na",
+    "gradenotsynced": "Známky nejsou synchronizovány",
     "gradeoutof": "Hodnoceno z {{$a}}",
     "gradingstatus": "Stav hodnocení",
     "groupsubmissionsettings": "Nastavení skupinového řešení",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Povoleny pouze pro účastníky, kterým byl prodloužen termín",
     "noonlinesubmissions": "Tento úkol nevyžaduje odpověď online",
     "nosubmission": "K tomuto úkolu nebylo nic odevzdáno",
+    "notallparticipantsareshown": "Nejsou zobrazeni účastníci bez odevzdaného řešení úkolu",
     "noteam": "Není členem žádné skupiny",
     "notgraded": "Nehodnoceno",
     "numberofdraftsubmissions": "Návrhy",
@@ -61,6 +70,7 @@
     "submission": "Odevzdané úkoly",
     "submissioneditable": "Student může upravit tento úkol",
     "submissionnoteditable": "Student nemůže upravit tento úkol",
+    "submissionnotsupported": "Tento formát řešení úkolu není aplikací podporován a nemůže obsahovat  informace",
     "submissionslocked": "V tomto úkolu nelze odevzdat práci",
     "submissionstatus": "Stav odevzdání úkolu",
     "submissionstatus_": "Neodesláno",
@@ -80,5 +90,8 @@
     "ungroupedusers": "Nastavení \"Vyžadovat zařazení do skupiny\" je zapnuto a někteří uživatelé nejsou  zařazeni do skupiny, bude jim to bránit v odevzdání úkolu.",
     "unlimitedattempts": "Bez omezení",
     "userswhoneedtosubmit": "Uživatelé, kteří potřebují odevzdat úkol:  {{$a}}",
-    "viewsubmission": "Zobrazit odevzdané úkoly"
+    "userwithid": "Uživatel s ID {{id}}",
+    "viewsubmission": "Zobrazit odevzdané úkoly",
+    "warningsubmissiongrademodified": "Známka úkolu byla na webu upravena.",
+    "warningsubmissionmodified": "Řešení úkolu bylo na webu upraveno."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/da.json b/www/addons/mod/assign/lang/da.json
index 827c92b5aed..b8900d9e6d4 100644
--- a/www/addons/mod/assign/lang/da.json
+++ b/www/addons/mod/assign/lang/da.json
@@ -80,5 +80,6 @@
     "ungroupedusers": "Indstillingen 'Kræv gruppeaflevering' er slået til, og nogle brugere er forhindret i at aflevere opgaver da de ikke er med i en gruppe eller er medlem af mere end en gruppe.",
     "unlimitedattempts": "Ubegrænset",
     "userswhoneedtosubmit": "Brugere, der skal aflevere: {{$a}}",
+    "userwithid": "Bruger med Id {{id}}",
     "viewsubmission": "Se aflevering"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/de.json b/www/addons/mod/assign/lang/de.json
index f7bb47cb670..02ebc2a9649 100644
--- a/www/addons/mod/assign/lang/de.json
+++ b/www/addons/mod/assign/lang/de.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Bestätigen Sie die Erklärung zur Eigenständigkeit.",
     "addattempt": "Einen weiteren Versuch zulassen",
     "addnewattempt": "Neuen Versuch hinzufügen",
     "addnewattemptfromprevious": "Neuen Versuch auf Grundlage der vorherigen Lösung abgeben",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manuell",
     "attemptreopenmethod_untilpass": "Automatisch bis zum Bestehen",
     "attemptsettings": "Einstellungen für Versuche",
+    "cannoteditduetostatementsubmission": "Sie können keine Abgabe hinzufügen oder bearbeiten, weil kein Abgabestatement von der Website empfangen wurde.",
+    "cannotgradefromapp": "Manche Bewertungsmethoden werden von der App noch nicht unterstützt und können nicht verändert werden.",
+    "cannotsubmitduetostatementsubmission": "Sie können nichts zur Bewertung abgeben, weil von der Website kein Abgabestatement empfangen wurde..",
     "confirmsubmission": "Wenn Sie nun Ihre Lösung zur Bewertung einreichen, können Sie keine Änderungen mehr vornehmen. Sind Sie sich sicher?",
     "currentattempt": "Dies ist Versuch {{$a}}",
     "currentattemptof": "Versuch {{$a.attemptnumber}} (mögliche Versuche {{$a.maxattempts}})",
@@ -24,11 +28,15 @@
     "duedatereached": "Das Fälligkeitsdatum für diese Aufgabe ist vorbei.",
     "editingstatus": "Bearbeitungsstatus",
     "editsubmission": "Lösung bearbeiten",
+    "erroreditpluginsnotsupported": "Sie können keine Abgabe in der App hinzufügen oder bearbeiten, weil manche Plugins keine Bearbeitung zulassen:",
+    "errorshowinginformation": "Die Abgabeinformationen können nicht angezeigt werden.",
     "extensionduedate": "Verlängerung des Fälligkeitsdatums",
+    "feedbacknotsupported": "Dieses Feedback wird von der App nicht unterstützt und könnte möglicherweise Informationen unvollständig enthalten.",
     "grade": "Bewertung",
     "graded": "Bewertet",
     "gradedby": "Bewertet von",
     "gradedon": "Bewertet am",
+    "gradenotsynced": "Bewertung nicht synchronisiert",
     "gradeoutof": "Bewertung (max. {{$a}})",
     "gradingstatus": "Bewertungsstatus",
     "groupsubmissionsettings": "Einstellungen für Gruppeneinreichungen",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Weitere Abgaben sind nur zugelassen wenn der Abgabezeitraum verlängert wurde.",
     "noonlinesubmissions": "Diese Aufgabe benötigt keine Online-Abgabe",
     "nosubmission": "Für diese Aufgabe wurde nichts abgegeben",
+    "notallparticipantsareshown": "Teilnehmer/innen ohne Abgaben werden nicht angezeigt.",
     "noteam": "Nicht Mitglied einer Gruppe",
     "notgraded": "Nicht bewertet",
     "numberofdraftsubmissions": "Entwürfe",
@@ -61,6 +70,7 @@
     "submission": "Abgabe",
     "submissioneditable": "Teilnehmer/innen können eingereichte Lösung bearbeiten",
     "submissionnoteditable": "Teilnehmer/innen können eingereichte Lösung nicht bearbeiten",
+    "submissionnotsupported": "Diese Abgabe wird von der App nicht unterstützt und könnte möglicherweise Informationen unvollständig enthalten.",
     "submissionslocked": "Bei dieser Aufgabe können derzeit keine Lösungen abgeben werden.",
     "submissionstatus": "Abgabestatus",
     "submissionstatus_": "Keine Abgabe",
@@ -80,5 +90,8 @@
     "ungroupedusers": "Die Option 'Gruppe notwendig, um etwas abgeben zu können' ist aktiviert. Es gibt Personen ohne Gruppe oder Personen mit mehreren Gruppen, die deshalb nichts abgeben können.",
     "unlimitedattempts": "Unbegrenzt",
     "userswhoneedtosubmit": "Nutzer/innen, die noch nicht abgegeben haben: {{$a}}",
-    "viewsubmission": "Abgabe anzeigen"
+    "userwithid": "Nutzer/in mit ID {{id}}",
+    "viewsubmission": "Abgabe anzeigen",
+    "warningsubmissiongrademodified": "Die Abgabebewertung wurde auf der Website geändert.",
+    "warningsubmissionmodified": "Die Abgabe wurde auf der Website geändert."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/es-mx.json b/www/addons/mod/assign/lang/es-mx.json
index a8dc6545d72..1e8f0405cf7 100644
--- a/www/addons/mod/assign/lang/es-mx.json
+++ b/www/addons/mod/assign/lang/es-mx.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Por favor acepte la declaratoria de envío.",
     "addattempt": "Permitir otro intento",
     "addnewattempt": "Añadir un nuevo intento",
     "addnewattemptfromprevious": "Añadir un nuevo intento basado en un envío anterior",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automáticamente hasta pasar",
     "attemptsettings": "Configuraciones del intento",
+    "cannoteditduetostatementsubmission": "Usted no puede añadir o editar un envío en la App porque no pudimos recuperar la declaratoria de envío del sitio.",
+    "cannotgradefromapp": "Algunos métodos para calificar aun no están soportados por la App y no pueden ser modificados.",
+    "cannotsubmitduetostatementsubmission": "Usted no puede enviar para calificar en la App porque no pudimos recuperar la declaratoria de envío del sitio.",
     "confirmsubmission": "¿Está Usted seguro de querer enviar su trabajo para que sea calificado? Usted ya no le podrá hacer más cambios",
     "currentattempt": "Éste es el intento {{$a}}.",
     "currentattemptof": "Éste es el intento {{$a.attemptnumber}} ( {{$a.maxattempts}} intentos permitidos ).",
@@ -24,11 +28,15 @@
     "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
     "editingstatus": "Estatus de edición",
     "editsubmission": "Editar envío",
+    "erroreditpluginsnotsupported": "Usted no puede añadir o editar un envío en la App porque algunos plugins no están soportados para editar:",
+    "errorshowinginformation": "No se puede mostrar la información del envío",
     "extensionduedate": "Fecha de entrega extendida",
+    "feedbacknotsupported": "La retroalimentación no está soportada por la App y es posible que no contenga toda la información.",
     "grade": "Calificación",
     "graded": "Calificado",
     "gradedby": "Calificado por",
     "gradedon": "Calificado en",
+    "gradenotsynced": "Calificación no sincronizada",
     "gradeoutof": "Calificación sobre {{$a}}",
     "gradingstatus": "Estatus de calificación",
     "groupsubmissionsettings": "Configuraciones de envío de grupo",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Solamente permitido para participantes que hayan recibido una extensión",
     "noonlinesubmissions": "Esta tarea no requiere que usted envíe nada de forma online",
     "nosubmission": "No se ha enviado nada en esta tarea",
+    "notallparticipantsareshown": "Los participantes sin envíos no se muestran",
     "noteam": "No es miembro de ningún grupo",
     "notgraded": "No calificado",
     "numberofdraftsubmissions": "Borradores",
@@ -61,6 +70,7 @@
     "submission": "Entrega",
     "submissioneditable": "Los estudiantes pueden editar este envío",
     "submissionnoteditable": "Los estudiantes no pueden editar este envío",
+    "submissionnotsupported": "Este envío no es soportado por la App y es posible que no contenga toda la información",
     "submissionslocked": "Esta tarea no acepta entregas",
     "submissionstatus": "Estatus de la entrega",
     "submissionstatus_": "Sin entrega",
@@ -80,5 +90,8 @@
     "ungroupedusers": "La configuración de 'Requerir grupo para hacer envío' está activada y algunos usuarios, o no son miembros de ningún grupo, o son miembros de más de un grupo, por lo que no pueden hacer envíos.",
     "unlimitedattempts": "Ilimitados",
     "userswhoneedtosubmit": "Usuarios que necesitan enviar: {{$a}}",
-    "viewsubmission": "Ver entrega"
+    "userwithid": "Usuario con ID {{id}}",
+    "viewsubmission": "Ver entrega",
+    "warningsubmissiongrademodified": "La calificación por el envío fue modificada en el sitio.",
+    "warningsubmissionmodified": "El envío del usuario fue modificado en el sitio."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/es.json b/www/addons/mod/assign/lang/es.json
index 147b4119e60..35e141f70c9 100644
--- a/www/addons/mod/assign/lang/es.json
+++ b/www/addons/mod/assign/lang/es.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Por favor acepte las condiciones de envío.",
     "addattempt": "Permitir otro intento",
     "addnewattempt": "Añadir una nueva entrega",
     "addnewattemptfromprevious": "Añadir un nuevo intento basado en el envío anterior",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manual",
     "attemptreopenmethod_untilpass": "Automática hasta aprobar",
     "attemptsettings": "Configuración de intentos",
+    "cannoteditduetostatementsubmission": "No puede añadir o editar un envío en la app porque no pudimos recuperar las condiciones de envío del sitio.",
+    "cannotgradefromapp": "Algunos métodos de calificación no son compatibles aún con la aplicación y no se pueden modificar.",
+    "cannotsubmitduetostatementsubmission": "No puede enviar para calificar en la app porque no pudimos recuperar las condiciones de envío del sitio.",
     "confirmsubmission": "¿Está seguro que quiere enviar su trabajo para que sea evaluado? Una vez enviado ya no podrá realizar modificaciones.",
     "currentattempt": "Este es el intento {{$a}}.",
     "currentattemptof": "Este es el intento {{$a.attemptnumber}} ( {{$a.maxattempts}} intentos permitidos ).",
@@ -24,7 +28,10 @@
     "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
     "editingstatus": "Edición de estado",
     "editsubmission": "Editar entrega",
+    "erroreditpluginsnotsupported": "No puede añadir o editar un envío en la app porque algunos plugins no tienen soporte para editar:",
+    "errorshowinginformation": "No se puede mostrar la información del envío",
     "extensionduedate": "Ampliar plazo",
+    "feedbacknotsupported": "La retroalimentación no está soportada por la app y podría no mostrar la información completa",
     "grade": "Calificación",
     "graded": "Calificado",
     "gradedby": "Calificado por",
@@ -47,6 +54,7 @@
     "nomoresubmissionsaccepted": "No se aceptan más entregas",
     "noonlinesubmissions": "Esta tarea no requiere que usted envíe nada de forma online",
     "nosubmission": "No se ha enviado nada en esta tarea",
+    "notallparticipantsareshown": "Los participantes sin envíos no se muestran",
     "noteam": "No perteneces a ningún grupo.",
     "notgraded": "Sin calificar",
     "numberofdraftsubmissions": "Borradores",
@@ -61,6 +69,7 @@
     "submission": "Entrega",
     "submissioneditable": "El estudiante puede editar esta entrega",
     "submissionnoteditable": "El estudiante no puede editar esta entrega",
+    "submissionnotsupported": "Este envío no está soportada por la app y es posible que no muestre la información completa",
     "submissionslocked": "Esta tarea no acepta entregas",
     "submissionstatus": "Estado de la entrega",
     "submissionstatus_": "Sin entrega",
@@ -80,5 +89,8 @@
     "ungroupedusers": "Si se activa la configuración \"se requiere formar parte de un grupo para realizar la entrega\" se evitará que los usuarios no asignados a lo sgrupos realicen entregas.",
     "unlimitedattempts": "Ilimitado",
     "userswhoneedtosubmit": "Componentes del equipo pendientes de entrega: {{$a}}",
-    "viewsubmission": "Ver entrega"
+    "userwithid": "Usuario con ID {{id}}",
+    "viewsubmission": "Ver entrega",
+    "warningsubmissiongrademodified": "La calificación del envío se modificó en el sitio.",
+    "warningsubmissionmodified": "El envío del usuario fue modificado en el sitio."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/eu.json b/www/addons/mod/assign/lang/eu.json
index f72866d7d4d..c5b7f53de20 100644
--- a/www/addons/mod/assign/lang/eu.json
+++ b/www/addons/mod/assign/lang/eu.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Mesedez onartu bidalketa-sententzia.",
     "addattempt": "Baimendu beste saiakera bat",
     "addnewattempt": "Gehitu beste saiakera bat",
     "addnewattemptfromprevious": "Gehitu aurreko bidalketan oinarritutako saiakera bat",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Eskuz",
     "attemptreopenmethod_untilpass": "Automatikoki gainditu arte",
     "attemptsettings": "Saiakeren ezarpenak",
+    "cannoteditduetostatementsubmission": "Ezin duzu app-an bidalketa gehitu edo editatu ezin izan dugulako berreskuratu guneko bidalketa-sententzia.",
+    "cannotgradefromapp": "Kalifikazio-metodo batzuk oraindik ez daude app-an onartuta eta ezin dira aldatu.",
+    "cannotsubmitduetostatementsubmission": "Ezin duzu app-an bidalketa ebaluatzeko bidali ezin izan dugulako berreskuratu guneko bidalketa-sententzia.",
     "confirmsubmission": "Ziur al zaude zure lana bidali nahi duzula kalifikatzeko? Ezin izango duzu aldaketarik egin.",
     "currentattempt": "Hau da {{$a}} saiakera.",
     "currentattemptof": "Hau {{$a.attemptnumber}}. saiakera da ( {{$a.maxattempts}} saiakera onartzen dira ).",
@@ -24,11 +28,15 @@
     "duedatereached": "Zeregin hau bidaltzeko epea amaitu da",
     "editingstatus": "Editatzen egoera",
     "editsubmission": "Editatu bidalketa",
+    "erroreditpluginsnotsupported": "Ezin duzu app-an bidalketa gehitu edo editatu gehigarri batzuk ez dutelako editatatzea onartzen:",
+    "errorshowinginformation": "Ezin dugu bidalketaren informazioa erakutsi",
     "extensionduedate": "Luzapenaren entregatze-data",
+    "feedbacknotsupported": "Feedback hau ez da onartzen app-an eta baliteke informazio guztia jasota ez egotea.",
     "grade": "Kalifikazioa",
     "graded": "Kalifikatua",
     "gradedby": "Nork kalifikatua",
     "gradedon": "Noiz kalifikatua",
+    "gradenotsynced": "Kalifikazioa ez da sinkronizatu",
     "gradeoutof": "Kalifikazioa ({{$a}}-(e)ra arte)",
     "gradingstatus": "Kalifikazioaren egoera",
     "groupsubmissionsettings": "Taldeko bidalketen ezarpenak",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Soilik epearen luzapena jaso duten kideei baimenduta.",
     "noonlinesubmissions": "Zeregin honek ez du ezer on-line aurkezteko eskatzen",
     "nosubmission": "Ez dago bildalketarik zeregin honetan",
+    "notallparticipantsareshown": "Bidalketarik egin ez duten ikasleak ez dira erakusten",
     "noteam": "Ez zara inongo taldetako kide",
     "notgraded": "Kalifikatu gabea",
     "numberofdraftsubmissions": "Zirriborroak",
@@ -61,6 +70,7 @@
     "submission": "Bidalketa",
     "submissioneditable": "Ikasleak bere bidalketa edita dezake",
     "submissionnoteditable": "Ikasleak ezin du editatu bidalketa hau",
+    "submissionnotsupported": "Bidalketa hau ez da onartzen app-an eta baliteke informazio guztia jasota ez egotea.",
     "submissionslocked": "Zeregin honek ez du bidalketarik onartzen",
     "submissionstatus": "Bidalketaren egoera",
     "submissionstatus_": "Ez dago bidalketarik",
@@ -80,5 +90,8 @@
     "ungroupedusers": "'Taldeko kidea izatea behartu' ezarpena gaituta dago eta erabiltzaile batzuk ez dira inongo taldeko kide edo talde bat baino gehiagoko kideak dira, eta honek erabiltzaile horiek bidalketak egitea ekidingo du.",
     "unlimitedattempts": "Mugarik gabea",
     "userswhoneedtosubmit": "Bidalketa egin behar duten erabiltzaileak: {{$a}}",
-    "viewsubmission": "Ikusi bidalketa"
+    "userwithid": "{{id}} IDa duen erabiltzailea",
+    "viewsubmission": "Ikusi bidalketa",
+    "warningsubmissiongrademodified": "Bidalketaren kalifikazioa gunean aldatua izan da.",
+    "warningsubmissionmodified": "Ikaslearen bidalketa gunean aldatua izan da."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/fr.json b/www/addons/mod/assign/lang/fr.json
index 822bc477945..4dc3f9a1b2b 100644
--- a/www/addons/mod/assign/lang/fr.json
+++ b/www/addons/mod/assign/lang/fr.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Veuillez accepter les conditions d'envoi.",
     "addattempt": "Autoriser une autre tentative",
     "addnewattempt": "Ajouter une tentative",
     "addnewattemptfromprevious": "Ajouter une tentative basée sur le travail remis précédemment",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manuellement",
     "attemptreopenmethod_untilpass": "Automatiquement jusqu'à réussite",
     "attemptsettings": "Réglages de tentative",
+    "cannoteditduetostatementsubmission": "Vous ne pouvez pas ajouter, ni modifier de données dans l'app, car il n'est actuellement pas possible de récupérer les conditions d'envoi.",
+    "cannotgradefromapp": "Certaines méthodes d'évaluations ne sont pas encore supportées par l'app et ne peuvent pas être modifiées",
+    "cannotsubmitduetostatementsubmission": "Vous ne pouvez pas déposer de travail à évaluer dans l'app, car il n'est actuellement pas possible de récupérer les conditions d'envoi.",
     "confirmsubmission": "Voulez-vous vraiment remettre votre travail pour évaluation&nbsp;? Vous ne pourrez plus effectuer de changement.",
     "currentattempt": "Ceci est la tentative {{$a}}.",
     "currentattemptof": "Ceci est la tentative {{$a.attemptnumber}} ({{$a.maxattempts}} tentatives autorisées).",
@@ -24,11 +28,15 @@
     "duedatereached": "La date de remise de ce devoir est passée",
     "editingstatus": "Statut d'édition",
     "editsubmission": "Modifier le travail",
+    "erroreditpluginsnotsupported": "Vous ne pouvez pas ajouter, ni modifier de données dans l'app, car certains plugins ne permettent pas la modification :",
+    "errorshowinginformation": "Il n'est pas possible d'afficher les informations de dépôt",
     "extensionduedate": "Date de prolongation",
+    "feedbacknotsupported": "Le feedback n'est pas supporté par l'app et pourrait ne pas contenir la totalité des informations",
     "grade": "Note",
     "graded": "Noté",
     "gradedby": "Évalué par",
     "gradedon": "Évalué le",
+    "gradenotsynced": "Note non synchronisée",
     "gradeoutof": "Note sur {{$a}}",
     "gradingstatus": "Statut de l'évaluation",
     "groupsubmissionsettings": "Réglages de remises en groupe",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Permis uniquement pour les participants ayant obtenu une prolongation",
     "noonlinesubmissions": "Ce devoir ne requiert pas de fichier à remettre de votre part",
     "nosubmission": "Rien n'a été déposé pour ce devoir",
+    "notallparticipantsareshown": "Les participants sans travail remis ne sont pas affichés",
     "noteam": "Membre d'aucun groupe",
     "notgraded": "Pas évalué",
     "numberofdraftsubmissions": "Brouillons",
@@ -61,6 +70,7 @@
     "submission": "Devoir rendu",
     "submissioneditable": "L'étudiant peut modifier ce travail remis",
     "submissionnoteditable": "L'étudiant ne peut pas modifier ce travail remis",
+    "submissionnotsupported": "Le dépôt n'est pas supporté par l'app et pourrait ne pas contenir la totalité des informations",
     "submissionslocked": "L'ajout, la modification et la suppression de travaux ont été bloqués",
     "submissionstatus": "Statut des travaux remis",
     "submissionstatus_": "Pas de travail remis",
@@ -80,5 +90,8 @@
     "ungroupedusers": "Le réglage « Requiert un groupe pour remettre un devoir » est activé et certains utilisateurs ne sont membres d'aucun groupe ou membres de plusieurs groupes. Cette situation les empêchera de remettre un travail.",
     "unlimitedattempts": "Illimité",
     "userswhoneedtosubmit": "Utilisateurs devant valider l'envoi du devoir : {{$a}}",
-    "viewsubmission": "Afficher le travail remis"
+    "userwithid": "Utilisateur d'Id {{id}}",
+    "viewsubmission": "Afficher le travail remis",
+    "warningsubmissiongrademodified": "La note a été modifiée sur le site.",
+    "warningsubmissionmodified": "Le travail remis par l'utilisateur a été modifié sur le site."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/he.json b/www/addons/mod/assign/lang/he.json
index 896f29b0ac0..634624ece1e 100644
--- a/www/addons/mod/assign/lang/he.json
+++ b/www/addons/mod/assign/lang/he.json
@@ -80,5 +80,6 @@
     "ungroupedusers": "ההגדרה \"יש להיות חבר בקבוצה בכדי להגיש\" פעילה אך כמה משתמשים לא מוקצים לקבוצות, הדבר ימנע מהם מלהגיש את המטלות.",
     "unlimitedattempts": "לא מוגבל",
     "userswhoneedtosubmit": "משתמשים שצריכים להגיש: {{$a}}",
+    "userwithid": "משתמש עם מספר-זיהוי {{id}}",
     "viewsubmission": "צפיה בהגשה"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/it.json b/www/addons/mod/assign/lang/it.json
index ec8a08a3414..bfcebef051d 100644
--- a/www/addons/mod/assign/lang/it.json
+++ b/www/addons/mod/assign/lang/it.json
@@ -47,6 +47,7 @@
     "nomoresubmissionsaccepted": "Consentito solamente ai partecipanti ai quali è stata concessa una proroga",
     "noonlinesubmissions": "Questo compito non richiede consegne online",
     "nosubmission": "Non sono presenti consegne da valutare",
+    "notallparticipantsareshown": "I partecipanti che non hanno consegnato non sono visualizzati",
     "noteam": "Non appartieni a nessun gruppo",
     "notgraded": "Non valutata",
     "numberofdraftsubmissions": "Bozze",
@@ -61,6 +62,7 @@
     "submission": "Consegna",
     "submissioneditable": "Lo studente può modificare la consegna",
     "submissionnoteditable": "Gli studenti non possono modificare questa consegna",
+    "submissionnotsupported": "Questa consegna non è supportata dalla app e può non contenere tutte le informazioni.",
     "submissionslocked": "Il compito non accetta consegne",
     "submissionstatus": "Stato consegna",
     "submissionstatus_": "Nessuna consegna",
@@ -80,5 +82,6 @@
     "ungroupedusers": "L'impostazione 'Consegna di gruppo obbligatoria' è abilitata ma alcuni utenti non fanno parte di gruppi o fanno parte di più gruppi e pertanto non potranno effettuare consegne.",
     "unlimitedattempts": "Illimitati",
     "userswhoneedtosubmit": "Utenti che non hanno consegnato: {{$a}}",
+    "userwithid": "Utente con id {{id}}",
     "viewsubmission": "Visualizza consegne"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/nl.json b/www/addons/mod/assign/lang/nl.json
index 45b21b24103..cb58014537a 100644
--- a/www/addons/mod/assign/lang/nl.json
+++ b/www/addons/mod/assign/lang/nl.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Accepteer de uploadvoorwaarden.",
     "addattempt": "Nog een poging toestaan",
     "addnewattempt": "Een nieuwe poging toevoegen",
     "addnewattemptfromprevious": "Een  nieuwe poging toevoegen, gebaseerd op de vorige inzending",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manueel",
     "attemptreopenmethod_untilpass": "Automatisch tot geslaagd",
     "attemptsettings": "Poginginstellingen",
+    "cannoteditduetostatementsubmission": "Je kunt geen inzending toevoegen in de app, omdat we de uploadvoorwaarden niet konden ophalen van de site.",
+    "cannotgradefromapp": "Some beoordelingsmethodes worden nog niet door de app ondersteund en kunnen niet worden aangepast.",
+    "cannotsubmitduetostatementsubmission": "Je kunt niet insturen voor beoordeling omdat we de uploadvoorwaarden niet konden ophalen van de site.",
     "confirmsubmission": "Weet je zeker dat je je werk wil insturen voor beoordeling? Je zult geen wijzigingen meer kunnen aanbrengen.",
     "currentattempt": "Deze poging {{$a}}",
     "currentattemptof": "Dit is poging {{$a.attemptnumber}} ({{$a.maxattempts}} pogingen zijn toegestaan).",
@@ -24,11 +28,15 @@
     "duedatereached": "De datum waarop deze opdracht moest afgegeven worden is nu voorbij.",
     "editingstatus": "Status bewerken",
     "editsubmission": "Bewerk inzending",
+    "erroreditpluginsnotsupported": "Je kunt geen inzending toesturen of bewerken in de app omdat sommige plugins bewerken niet ondersteunen:",
+    "errorshowinginformation": "We kunnen de instuurinformatie niet tonen",
     "extensionduedate": "Extra tijd einddatum",
+    "feedbacknotsupported": "Deze feedback wordt niet ondersteund door de app en het is mogelijk dat de informatie onvolledig is",
     "grade": "Cijfer",
     "graded": "Beoordeeld",
     "gradedby": "Beoordeeld door",
     "gradedon": "Beoordeeld op",
+    "gradenotsynced": "Cijfer niet gesynchroniseerd",
     "gradeoutof": "Cijfer op {{$a}}",
     "gradingstatus": "Beoordelingsstatus",
     "groupsubmissionsettings": "Instellingen groepswerk",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Enkel toegestaan voor deelnemers die extra tijd gekregen hebben.",
     "noonlinesubmissions": "Voor deze opdracht hoef je niets online in te dienen",
     "nosubmission": "Er is nog niets ingestuurd voor deze opdracht",
+    "notallparticipantsareshown": "Deelnemers die niet ingestuurd hebben worden niet getoond",
     "noteam": "Lid van geen enkele groep",
     "notgraded": "Niet beoordeeld",
     "numberofdraftsubmissions": "Kladwerken",
@@ -61,6 +70,7 @@
     "submission": "Ingestuurde opdracht",
     "submissioneditable": "Leerling kan zijn ingestuurde opdracht bewerken",
     "submissionnoteditable": "Leerling kan ingestuurde opdracht niet bewerken",
+    "submissionnotsupported": "Deze ingestuurde opdracht wordt niet ondersteund door de app bevat mogelijk niet alle informatie",
     "submissionslocked": "Voor deze opdracht kan nu niets ingestuurd worden.",
     "submissionstatus": "Status ingestuurde opdracht",
     "submissionstatus_": "Geen ingestuurde opdracht",
@@ -80,5 +90,8 @@
     "ungroupedusers": "De insteling \"Groeplidmaatschap vereist om een inzending te maken\" is ingeschakeld en sommige gebruikers zijn niet toegewezen aan een groep of zijn lid van meerdere groepen. Dit zal het hen onmogelijk maken om hun opdracht in te sturen.",
     "unlimitedattempts": "Onbeperkt",
     "userswhoneedtosubmit": "Leerlingen die nog moeten insturen: {{$a}}",
-    "viewsubmission": "Bekijk ingestuurde opdracht"
+    "userwithid": "Gebruiker met Id {{id}}",
+    "viewsubmission": "Bekijk ingestuurde opdracht",
+    "warningsubmissiongrademodified": "Het cijfer van je ingeleverde opdracht is op de site gewijzigd.",
+    "warningsubmissionmodified": "Het door de gebruiker ingestuurde bestand is gewijzigd op de site."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/pt-br.json b/www/addons/mod/assign/lang/pt-br.json
index b4a8717686c..5623ab38711 100644
--- a/www/addons/mod/assign/lang/pt-br.json
+++ b/www/addons/mod/assign/lang/pt-br.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Por favor aceite a declaração do envio.",
     "addattempt": "Permitir outra tentativa",
     "addnewattempt": "Adicionar uma nova tentativa",
     "addnewattemptfromprevious": "Adicionar uma nova tentativa baseada na tentativa anterior",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente até que passe",
     "attemptsettings": "Configurações de tentativa",
+    "cannoteditduetostatementsubmission": "Você não pode adicionar ou editar um envio no aplicativo porque nós não conseguimos receber a declaração de envio do site.",
+    "cannotgradefromapp": "Alguns métodos de avaliação ainda não são suportadas pelo aplicativo e não podem ser modificadas.",
+    "cannotsubmitduetostatementsubmission": "Você não pode enviar para avaliação pelo aplicativo porque nós não conseguimos receber a declaração de envio do site.",
     "confirmsubmission": "Tem certeza de que deseja enviar seu trabalho para a classificação? Você não será capaz de fazer mais modificações.",
     "currentattempt": "Esta é a tentativa  {{$a}} .",
     "currentattemptof": "Esta é a tentativa {{$a.attemptnumber}} ({{$a.maxattempts}} tentativas permitidas).",
@@ -24,11 +28,15 @@
     "duedatereached": "A data de encerramento para essa tarefa já foi atingida",
     "editingstatus": "Editar estado",
     "editsubmission": "Editar envio",
+    "erroreditpluginsnotsupported": "Você não pode adicionar ou editar um envio no aplicativo por causa que alguns plugins não são suportados para edição:",
+    "errorshowinginformation": "Nós não podemos exibir as informações do envio",
     "extensionduedate": "Extensão do prazo de entrega",
+    "feedbacknotsupported": "Esse feedback não é suportado pelo aplicativo e pode não conter todas as informações",
     "grade": "Nota",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
     "gradedon": "Avaliado em",
+    "gradenotsynced": "Avaliação não sincronizada",
     "gradeoutof": "Nota até {{$a}}",
     "gradingstatus": "Status da avaliação",
     "groupsubmissionsettings": "Configurações de envio em grupo",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Só é permitido para os participantes que tenham beneficiado de uma extensão",
     "noonlinesubmissions": "Esta tarefa não requer o envio online",
     "nosubmission": "Nada foi enviado para esta tarefa",
+    "notallparticipantsareshown": "Participantes sem permissão não são exibidos",
     "noteam": "Você não é membro de nenhum grupo.",
     "notgraded": "Não há notas",
     "numberofdraftsubmissions": "Rascunhos",
@@ -61,6 +70,7 @@
     "submission": "Envio de tarefas",
     "submissioneditable": "Estudantes podem editar essa submissão",
     "submissionnoteditable": "Estudante não pode editar este envio",
+    "submissionnotsupported": "Esse envio não é suportado pelo aplicativo e pode não conter todas as informações",
     "submissionslocked": "A tarefa não está aceitando envios",
     "submissionstatus": "Status de envio",
     "submissionstatus_": "Nenhum envio",
@@ -80,5 +90,8 @@
     "ungroupedusers": "A configuração \"Somente membros de grupo podem fazer envio\" está ligada e existem usuários não alocados em grupos. Isso impedira que estes usuários consigam enviar tarefas.",
     "unlimitedattempts": "Ilimitado",
     "userswhoneedtosubmit": "Usuários que precisam enviar: {{$a}}",
-    "viewsubmission": "Ver envio"
+    "userwithid": "Usuário com id {{id}}",
+    "viewsubmission": "Ver envio",
+    "warningsubmissiongrademodified": "A nota do envio foi modificada no site.",
+    "warningsubmissionmodified": "O envio do usuário foi modificado no site."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/pt.json b/www/addons/mod/assign/lang/pt.json
index fdc72c080a7..e2242d63f5e 100644
--- a/www/addons/mod/assign/lang/pt.json
+++ b/www/addons/mod/assign/lang/pt.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "Por favor, aceite a declaração de submissão.",
     "addattempt": "Permitir nova tentativa",
     "addnewattempt": "Adicionar nova tentativa",
     "addnewattemptfromprevious": "Adicionar nova tentativa baseada na submissão anterior",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente até obter aproveitamento",
     "attemptsettings": "Configurações da tentativa",
+    "cannoteditduetostatementsubmission": "Não pode adicionar ou editar uma submissão na aplicação porque não foi possível recuperar a declaração de submissão do site.",
+    "cannotgradefromapp": "Alguns métodos de avaliação ainda não são suportados pela aplicação e não podem ser modificados.",
+    "cannotsubmitduetostatementsubmission": "Não pode submeter para avaliação na aplicação porque não foi possível recuperar a declaração de submissão do site.",
     "confirmsubmission": "Tem a certeza de que pretende submeter o seu trabalho para avaliação? Não poderá realizar mais alterações.",
     "currentattempt": "Esta é a tentativa {{$a}}.",
     "currentattemptof": "Esta é a {{$a.attemptnumber}}ª tentativa (em {{$a.maxattempts}} tentativa(s) permitida(s)).",
@@ -24,11 +28,15 @@
     "duedatereached": "A data limite de submissão deste trabalho já foi ultrapassada.",
     "editingstatus": "Editar o estado",
     "editsubmission": "Editar submissão",
+    "erroreditpluginsnotsupported": "Não pode adicionar ou editar uma submissão na aplicação porque alguns módulos não são suportados para edição:",
+    "errorshowinginformation": "Não é possível mostrar a informação da submissão",
     "extensionduedate": "Prolongamento da data limite",
+    "feedbacknotsupported": "Este feedback não é suportado pela aplicação e pode não conter toda a informação",
     "grade": "Avaliação",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
     "gradedon": "Avaliado em",
+    "gradenotsynced": "Nota não está sincronizada",
     "gradeoutof": "Nota (de 0 a {{$a}})",
     "gradingstatus": "Estado da avaliação",
     "groupsubmissionsettings": "Configurações das submissões de grupo",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "Apenas disponível aos alunos a quem tenha sido concedida uma extensão do prazo.",
     "noonlinesubmissions": "Este trabalho não requer que submeta nada online.",
     "nosubmission": "Ainda não foi submetido nada neste Trabalho",
+    "notallparticipantsareshown": "Participantes sem submissão não são mostrados",
     "noteam": "Não está inscrito em nenhum grupo",
     "notgraded": "Sem avaliação",
     "numberofdraftsubmissions": "Trabalhos em curso",
@@ -61,6 +70,7 @@
     "submission": "Trabalho",
     "submissioneditable": "Os alunos podem editar esta submissão",
     "submissionnoteditable": "O aluno não pode editar esta submissão",
+    "submissionnotsupported": "Esta submissão não é suportada pela aplicação e pode não conter toda a informação",
     "submissionslocked": "Este trabalho não está a aceitar submissões",
     "submissionstatus": "Estado da submissão",
     "submissionstatus_": "Não submetido",
@@ -80,5 +90,8 @@
     "ungroupedusers": "A configuração 'Requer grupo para submeter trabalho' está ativa e existem utilizadores que não pertencem a nenhum grupo, ou que se encontram inscritos em mais do que um, o que fará com que estes fiquem impossibilitados de submeter os seus trabalhos.",
     "unlimitedattempts": "Ilimitado",
     "userswhoneedtosubmit": "Utilizadores que têm de submeter: {{$a}}",
-    "viewsubmission": "Ver trabalho"
+    "userwithid": "Utilizador com ID {{id}}",
+    "viewsubmission": "Ver trabalho",
+    "warningsubmissiongrademodified": "A nota de submissão foi modificada no site.",
+    "warningsubmissionmodified": "A submissão do utilizador foi modificada no site."
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ro.json b/www/addons/mod/assign/lang/ro.json
index a43a5af5d8a..9e5786fe879 100644
--- a/www/addons/mod/assign/lang/ro.json
+++ b/www/addons/mod/assign/lang/ro.json
@@ -61,5 +61,6 @@
     "timemodified": "Ora la care a fost modificat",
     "timeremaining": "Timp rămas",
     "unlimitedattempts": "Nelimitat",
+    "userwithid": "Utilizatorul cu ID-ul {{id}}",
     "viewsubmission": "Vezi răspunsurile"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ru.json b/www/addons/mod/assign/lang/ru.json
index 7a4fc03a152..d2e1917e97a 100644
--- a/www/addons/mod/assign/lang/ru.json
+++ b/www/addons/mod/assign/lang/ru.json
@@ -29,6 +29,7 @@
     "graded": "Оценено",
     "gradedby": "Оценено",
     "gradedon": "Оценено в",
+    "gradenotsynced": "Оценка не синхронизирована",
     "gradeoutof": "Оценка из {{$a}}",
     "gradingstatus": "Состояние оценивания",
     "groupsubmissionsettings": "Настройки представления работ группы",
@@ -80,5 +81,6 @@
     "ungroupedusers": "Включен параметр «Нужно быть в группе для отправки ответа». Некоторые пользователи не являются членами групп или являются членами нескольких групп, эти пользователи не смогут отправить ответы на задание.",
     "unlimitedattempts": "Неограничено",
     "userswhoneedtosubmit": "Пользователи, которые должны представить ответ: {{$a}}",
+    "userwithid": "Пользователь с ID {{id}}",
     "viewsubmission": "Просмотр ответов"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/sv.json b/www/addons/mod/assign/lang/sv.json
index c6da9d2aa61..a7fecd382cc 100644
--- a/www/addons/mod/assign/lang/sv.json
+++ b/www/addons/mod/assign/lang/sv.json
@@ -79,5 +79,6 @@
     "timeremaining": "Återstående tid",
     "unlimitedattempts": "Obegränsad",
     "userswhoneedtosubmit": "Användare som behöver lämna in: {{$a}}",
+    "userwithid": "Användare men Id {{id}}",
     "viewsubmission": "Visa inlämning"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/zh-tw.json b/www/addons/mod/assign/lang/zh-tw.json
index 2a87180b1de..674e767eebf 100644
--- a/www/addons/mod/assign/lang/zh-tw.json
+++ b/www/addons/mod/assign/lang/zh-tw.json
@@ -1,4 +1,5 @@
 {
+    "acceptsubmissionstatement": "請接受提交聲明.",
     "addattempt": "允許另一次的繳交",
     "addnewattempt": "新增一個繳交管道",
     "addnewattemptfromprevious": "依據先前的作業新增一個繳交管道",
@@ -13,6 +14,9 @@
     "attemptreopenmethod_manual": "手動的",
     "attemptreopenmethod_untilpass": "自動的，直到通過",
     "attemptsettings": "繳交設定",
+    "cannoteditduetostatementsubmission": "您無法在應用程式中新增或編輯提交內容, 因為我們無法從該網站擷取提交內容.",
+    "cannotgradefromapp": "應用程式尚未支援部分評分方式, 無法修改.",
+    "cannotsubmitduetostatementsubmission": "您無法在應用程式中提交評分,  因為我們無法從網站存取提交聲明",
     "confirmsubmission": "您確定要繳交作業並請求評分嗎？一旦這麼做，您將不能再修改作業。",
     "currentattempt": "這是第{{$a}}次繳交",
     "currentattemptof": "這是第{{$a.attemptnumber}}次繳交(允許繳交 {{$a.maxattempts}} 次)",
@@ -24,7 +28,10 @@
     "duedatereached": "此作業的規定繳交時間已經過了",
     "editingstatus": "編修狀態",
     "editsubmission": "修改我已繳交的作業",
+    "erroreditpluginsnotsupported": "您無法在應用程式中新增或修改提交, 因為某些外掛不支援編輯:",
+    "errorshowinginformation": "我們無法顯示提交資訊",
     "extensionduedate": "展延到期日",
+    "feedbacknotsupported": "該應用程式不支援此回饋, 並且可能不包含所有資訊",
     "grade": "成績",
     "graded": "已評分",
     "gradedby": "已評分由",
@@ -47,6 +54,7 @@
     "nomoresubmissionsaccepted": "只接受已被寬延期限的學生的繳交作業",
     "noonlinesubmissions": "這個作業不需要您在網上繳交任何東西",
     "nosubmission": "這個作業還沒人繳交",
+    "notallparticipantsareshown": "沒有提交的參與者不會被顯示出來",
     "noteam": "不屬於任何群組",
     "notgraded": "尚未評分",
     "numberofdraftsubmissions": "草稿",
@@ -61,6 +69,7 @@
     "submission": "繳交作業",
     "submissioneditable": "學生可以編編輯這一繳交的作業",
     "submissionnoteditable": "學生不能編輯這一繳交的作業",
+    "submissionnotsupported": "該應用程式不支援此提交, 並且可能不包含所有資訊",
     "submissionslocked": "此作業不接受繳交",
     "submissionstatus": "繳交狀態",
     "submissionstatus_": "未繳交",
@@ -80,5 +89,8 @@
     "ungroupedusers": "\"需要以群組方式提交作業\"的設定已經被啟動，但是仍有某些用戶沒有被指派到群組中，或者同一個人屬於多個群組，因此無法提交作業。",
     "unlimitedattempts": "無限制的",
     "userswhoneedtosubmit": "需要提交作業的用戶：{{$a}}",
-    "viewsubmission": "檢視繳交的作業"
+    "userwithid": "ID為{{id}}的使用者",
+    "viewsubmission": "檢視繳交的作業",
+    "warningsubmissiongrademodified": "在網站上修改了提交成績.",
+    "warningsubmissionmodified": "使用者的提交已在網站中修改."
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/ar.json b/www/addons/mod/choice/lang/ar.json
index 60ff70d91f6..507d25fbe0c 100644
--- a/www/addons/mod/choice/lang/ar.json
+++ b/www/addons/mod/choice/lang/ar.json
@@ -4,7 +4,7 @@
     "full": "(كامل)",
     "noresultsviewable": "حالياً لا يمكن معاينة النتائج",
     "notopenyet": "عذرا، هذا النشاط سيكون متوفر في {{$a}}",
-    "numberofuser": "عدد المستخدمين",
+    "numberofuser": "عدد المشاركين",
     "numberofuserinpercentage": "عدد المستخدمين كنسبة",
     "removemychoice": "استبعد خياري",
     "responses": "إجابات",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index c0a93b72130..fc6af3e2e89 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -6,8 +6,8 @@
     "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
-    "numberofuser": "Nombre de respostes",
-    "numberofuserinpercentage": "Percentatge de respostes (%)",
+    "numberofuser": "Nombre de participants",
+    "numberofuserinpercentage": "Percentatge de participants",
     "previewonly": "Això és sols una vista prèvia de les opcions disponibles en aquesta activitat. No esteu habilitat per enviar consultes fins {{$a}}.",
     "removemychoice": "Suprimeix la meva resposta",
     "responses": "Respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index f9a22aaf32e..aaa5ea9560c 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -6,8 +6,8 @@
     "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
     "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
-    "numberofuser": "Počet odpovědí",
-    "numberofuserinpercentage": "Počet odpovědí v procentech",
+    "numberofuser": "Počet účastníků",
+    "numberofuserinpercentage": "Procentní podíl účastníků",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
     "removemychoice": "Odstranit mou volbu",
     "responses": "Odpovědi",
diff --git a/www/addons/mod/choice/lang/da.json b/www/addons/mod/choice/lang/da.json
index e462afcd51a..3ef6b107e4d 100644
--- a/www/addons/mod/choice/lang/da.json
+++ b/www/addons/mod/choice/lang/da.json
@@ -6,8 +6,8 @@
     "full": "(Fuld)",
     "noresultsviewable": "Resultaterne er ikke tilgængelige på nuværende tidspunkt.",
     "notopenyet": "Denne aktivitet er tilgængelig fra {{$a}}",
-    "numberofuser": "Antal svar",
-    "numberofuserinpercentage": "Antal svar i procent",
+    "numberofuser": "Antal deltagere",
+    "numberofuserinpercentage": "Procentdel af deltagerne",
     "previewonly": "Dette er en forhåndsvisning af de tilgængelige valgmuligheder i denne afstemning. Du kan ikke indsende dine valg før {{$a}}.",
     "removemychoice": "Slet mit valg",
     "responses": "Besvarelser",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index be13d38af77..a7bea8a7061 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -6,8 +6,8 @@
     "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
     "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
-    "numberofuser": "Anzahl der Antworten",
-    "numberofuserinpercentage": "Prozent der Antworten",
+    "numberofuser": "Anzahl",
+    "numberofuserinpercentage": "Prozent",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
     "responses": "Stimmabgaben",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 4b17c064e80..31602f11f93 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -4,8 +4,8 @@
     "full": "(Πλήρες)",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
     "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
-    "numberofuser": "Αριθμός απαντήσεων",
-    "numberofuserinpercentage": "Ποσοστό απαντήσεων",
+    "numberofuser": "Πλήθος συμμετεχόντων",
+    "numberofuserinpercentage": "Ποσοστό συμμετεχόντων",
     "removemychoice": "Διαγραφή της επιλογής μου",
     "responses": "Απαντήσεις",
     "responsesresultgraphdescription": "{{number}}% των χρηστών επέλεξε: {{text}}.",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index ceddb82adc6..41b15bb932f 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de respuestas",
-    "numberofuserinpercentage": "Porcentaje de respuestas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentaje de participantes",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/es.json b/www/addons/mod/choice/lang/es.json
index 74076baa791..b14f860dda6 100644
--- a/www/addons/mod/choice/lang/es.json
+++ b/www/addons/mod/choice/lang/es.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de respuestas",
-    "numberofuserinpercentage": "Porcentaje de respuestas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentaje de participantes",
     "previewonly": "Esta es solamente una previsualización de las opciones disponibles para esta actividad. No podrá enviar su respuesta a la consulta hasta el {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/eu.json b/www/addons/mod/choice/lang/eu.json
index 62e0810b4c4..ceb6eff44db 100644
--- a/www/addons/mod/choice/lang/eu.json
+++ b/www/addons/mod/choice/lang/eu.json
@@ -6,8 +6,8 @@
     "full": "(Beteta)",
     "noresultsviewable": "Emaitzak ezin dira orain ikusi",
     "notopenyet": "Barkatu, baina jarduera hau ez dago erabiltzeko moduan {{$a}} arte.",
-    "numberofuser": "Erantzun-kopurua",
-    "numberofuserinpercentage": "Erantzunen portzentajea",
+    "numberofuser": "Partaide-kopurua",
+    "numberofuserinpercentage": "Partaideen ehunekoa",
     "previewonly": "Hau jarduera honetan eskuragarri dauden aukeren aurrebista besterik ez da. Ezingo duzu zure erantzuna bidali {{$a}}-(e)ra arte.",
     "removemychoice": "Ezabatu nire aukera",
     "responses": "Erantzunak",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 9ca0f50c2ea..05e3f3b9c99 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -6,8 +6,8 @@
     "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
     "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
-    "numberofuser": "Nombre de réponses",
-    "numberofuserinpercentage": "Pourcentage de réponses",
+    "numberofuser": "Nombre de participants",
+    "numberofuserinpercentage": "Pourcentage de participants",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
     "responses": "Réponses",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index 01597a9058a..c44e97ee335 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -6,8 +6,8 @@
     "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
     "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
-    "numberofuser": "Numero di risposte",
-    "numberofuserinpercentage": "Percentuale delle risposte",
+    "numberofuser": "Numero di partecipanti",
+    "numberofuserinpercentage": "Percentuale dei partecipanti",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
     "responses": "Scelte",
diff --git a/www/addons/mod/choice/lang/lt.json b/www/addons/mod/choice/lang/lt.json
index ee1bf2c25c3..94e682f5d51 100644
--- a/www/addons/mod/choice/lang/lt.json
+++ b/www/addons/mod/choice/lang/lt.json
@@ -6,8 +6,8 @@
     "full": "(Visas)",
     "noresultsviewable": "Rezultatai dabar nematomi.",
     "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
-    "numberofuser": "Atsakymų skaičius",
-    "numberofuserinpercentage": "Atsakymų procentas",
+    "numberofuser": "Dalyvių skaičius",
+    "numberofuserinpercentage": "Dalyvių procentas",
     "previewonly": "Tai yra tik šios veiklos galimų variantų peržiūra. Savo pasirinkimo negalėsite pateikti iki {{$a}}.",
     "removemychoice": "Pašalinti mano pasirinkimą",
     "responses": "Atsakymai",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index d7e7f4cd7f3..b2be190c0c9 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -6,8 +6,8 @@
     "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
     "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
-    "numberofuser": "Aantal antwoorden",
-    "numberofuserinpercentage": "Percentage antwoorden",
+    "numberofuser": "Aantal deelnemers",
+    "numberofuserinpercentage": "Deelnemerspercentage",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
     "responses": "Antwoorden",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index 01fbb57c4c1..f8fbe81990b 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -6,8 +6,8 @@
     "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
     "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
-    "numberofuser": "Número de usuários",
-    "numberofuserinpercentage": "Percentual de participantes",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentagem de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
     "removemychoice": "Remover a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/pt.json b/www/addons/mod/choice/lang/pt.json
index 68e628591c5..a5b426bc80b 100644
--- a/www/addons/mod/choice/lang/pt.json
+++ b/www/addons/mod/choice/lang/pt.json
@@ -6,8 +6,8 @@
     "full": "Completa",
     "noresultsviewable": "Os resultados da sondagem ainda não estão disponíveis.",
     "notopenyet": "Lamentamos mas esta atividade só estará disponível em {{$a}}",
-    "numberofuser": "Número de respostas",
-    "numberofuserinpercentage": "Percentagem de respostas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Percentagem de participantes",
     "previewonly": "Esta é apenas uma pré-visualização das opções disponíveis para esta atividade. Não poderá submeter a sua escolha até {{$a}}.",
     "removemychoice": "Apagar a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/ro.json b/www/addons/mod/choice/lang/ro.json
index 2133b57b951..eb9c1bc300b 100644
--- a/www/addons/mod/choice/lang/ro.json
+++ b/www/addons/mod/choice/lang/ro.json
@@ -4,8 +4,8 @@
     "full": "(plin)",
     "noresultsviewable": "În acest moment rezultatele nu pot fi vizualizate.",
     "notopenyet": "Ne pare rău, această activitate nu este disponibilă mai devreme de {{$a}}",
-    "numberofuser": "Numărul de răspunsuri",
-    "numberofuserinpercentage": "Procentajul răspunsurilor",
+    "numberofuser": "Numărul participanților",
+    "numberofuserinpercentage": "Procentul participanților",
     "previewonly": "Acesta este doar o prezentare a opțiunilor existente pentru această activitate. Nu veți putea trimite opțiunea dvs. până la {{$a}}.",
     "removemychoice": "Șterge alegerea mea",
     "responses": "Răspunsuri",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 8ef6af50622..62217bdb227 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
     "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
-    "numberofuser": "Antal användare",
-    "numberofuserinpercentage": "Antalet användare i procent.",
+    "numberofuser": "Antal deltagare",
+    "numberofuserinpercentage": "Procent av deltagarna",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
     "responses": "Svar",
diff --git a/www/addons/mod/choice/lang/zh-tw.json b/www/addons/mod/choice/lang/zh-tw.json
index c97305fd6fa..fd45e3f3362 100644
--- a/www/addons/mod/choice/lang/zh-tw.json
+++ b/www/addons/mod/choice/lang/zh-tw.json
@@ -6,8 +6,8 @@
     "full": "(已滿)",
     "noresultsviewable": "目前無法檢視票選結果",
     "notopenyet": "抱歉，這個活動在{{$a}}之前不能使用",
-    "numberofuser": "回應的人數",
-    "numberofuserinpercentage": "回應人數的百分比",
+    "numberofuser": "參與者人數",
+    "numberofuserinpercentage": "參與者百分比",
     "previewonly": "這只是這一活動的可用選項的預覽。你要等到{{$a}}才可以進行投票。",
     "removemychoice": "移除我的選擇",
     "responses": "答覆",
diff --git a/www/addons/mod/forum/lang/ca.json b/www/addons/mod/forum/lang/ca.json
index 5f1be9cd58c..9b03a43476a 100644
--- a/www/addons/mod/forum/lang/ca.json
+++ b/www/addons/mod/forum/lang/ca.json
@@ -25,6 +25,8 @@
     "refreshdiscussions": "Actualitza els debats",
     "refreshposts": "Actualitza els missatges",
     "reply": "Respon",
+    "sortnewestfirst": "Mostra els més recents primer",
+    "sortoldestfirst": "Mostra els més antics primer",
     "subject": "Assumpte",
     "unread": "No llegit",
     "unreadpostsnumber": "{{$a}} missatges no llegits"
diff --git a/www/addons/mod/forum/lang/cs.json b/www/addons/mod/forum/lang/cs.json
index 1477982359d..0c872da170b 100644
--- a/www/addons/mod/forum/lang/cs.json
+++ b/www/addons/mod/forum/lang/cs.json
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Obnovit diskuse",
     "refreshposts": "Obnovit diskusní příspěvky",
     "reply": "Odpovědět",
+    "sortnewestfirst": "Zobrazit nejnovější",
+    "sortoldestfirst": "Zobrazit nejstarší",
     "subject": "Předmět",
     "unread": "Nepřečteno",
     "unreadpostsnumber": "Nepřečtené příspěvky: {{$a}}"
diff --git a/www/addons/mod/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index 38dca8ad7f1..5d5b273c23b 100644
--- a/www/addons/mod/forum/lang/da.json
+++ b/www/addons/mod/forum/lang/da.json
@@ -9,7 +9,7 @@
     "discussionsubscription": "Abonnement på tråd",
     "edit": "Rediger",
     "erroremptymessage": "Indlægget kan ikke være tomt.",
-    "erroremptysubject": "Indlæggets emne kan ikke være tomt.",
+    "erroremptysubject": "Emnefeltet kan ikke være tomt",
     "errorgetforum": "Fejl ved hentning af forumdata.",
     "errorgetgroups": "Fejl ved hentning af gruppeindstillinger.",
     "forumnodiscussionsyet": "Der er endnu ingen indlæg i dette forum.",
@@ -25,6 +25,8 @@
     "refreshdiscussions": "Genindlæs diskussioner",
     "refreshposts": "Genindlæs indlæg",
     "reply": "Svar",
+    "sortnewestfirst": "Vis nyeste først",
+    "sortoldestfirst": "Vis ældste først",
     "subject": "Emne",
     "unread": "Ikke læst",
     "unreadpostsnumber": "{{$a}} nye indlæg"
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index bee3c7cb0d4..52492263eb9 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Themenabonnement",
     "edit": "Bearbeiten",
     "erroremptymessage": "Die Mitteilung darf nicht leer sein.",
-    "erroremptysubject": "Der Betreff darf nicht leer sein.",
+    "erroremptysubject": "Das Forenthema darf nicht leer sein.",
     "errorgetforum": "Fehler beim Laden der Forendaten",
     "errorgetgroups": "Fehler beim Laden der Gruppeneinstellungen",
     "forumnodiscussionsyet": "Keine Themen im Forum",
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Themen aktualisieren",
     "refreshposts": "Forenbeiträge aktualisieren",
     "reply": "Antworten",
+    "sortnewestfirst": "Neu zuerst",
+    "sortoldestfirst": "Alt zuerst",
     "subject": "Betreff",
     "unread": "Ungelesen",
     "unreadpostsnumber": "{{$a}} ungelesene Beiträge"
diff --git a/www/addons/mod/forum/lang/el.json b/www/addons/mod/forum/lang/el.json
index 78bee38ce77..4fbff1a9446 100644
--- a/www/addons/mod/forum/lang/el.json
+++ b/www/addons/mod/forum/lang/el.json
@@ -24,6 +24,8 @@
     "refreshdiscussions": "Ανανεώστε τις συζητήσεις",
     "refreshposts": "Ανανεώστε τα μηνύματα της συζήτησης",
     "reply": "Απάντηση",
+    "sortnewestfirst": "Εμφανίστε πρώτα τα νεότερα",
+    "sortoldestfirst": "Εμφανίστε πρώτα τα παλαιότερα",
     "subject": "Θέμα",
     "unread": "Μη αναγνωσμένο",
     "unreadpostsnumber": "{{$a}} μη αναγνωσμένες δημοσιεύσεις"
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index 48404906707..13a2026b53c 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Suscripción a discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
-    "erroremptysubject": "El asunto del mensaje no puede estar vacío.",
+    "erroremptysubject": "El asunto de la publicación no puede estar vacío",
     "errorgetforum": "Error al obtener datos del foro.",
     "errorgetgroups": "Error al obtener configuraciones de grupo.",
     "forumnodiscussionsyet": "Todavía no hay tópicos de discusión en este foro.",
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Refrescar discusiones",
     "refreshposts": "Refrescar publicaciones de discusiones",
     "reply": "Responder (réplica)",
+    "sortnewestfirst": "Mostrar primeramente los más nuevos",
+    "sortoldestfirst": "Mostrar primeramente los más antiguos",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"
diff --git a/www/addons/mod/forum/lang/es.json b/www/addons/mod/forum/lang/es.json
index 2389777bf37..616127e8155 100644
--- a/www/addons/mod/forum/lang/es.json
+++ b/www/addons/mod/forum/lang/es.json
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Actualizar foro",
     "refreshposts": "Actualizar publicaciones del foro",
     "reply": "Responder",
+    "sortnewestfirst": "Mostrar los más nuevos primero",
+    "sortoldestfirst": "Mostrar los más antiguos primero",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"
diff --git a/www/addons/mod/forum/lang/eu.json b/www/addons/mod/forum/lang/eu.json
index 7d41bf9eff3..8d101ce7c90 100644
--- a/www/addons/mod/forum/lang/eu.json
+++ b/www/addons/mod/forum/lang/eu.json
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Freskatu eztabaidak",
     "refreshposts": "Freskatu eztabaidetako mezuak",
     "reply": "Erantzun",
+    "sortnewestfirst": "Erakutsi berrienak lehenago",
+    "sortoldestfirst": "Erakutsi zaharrenak lehenago",
     "subject": "Gaia",
     "unread": "Irakurri gabe",
     "unreadpostsnumber": "Irakurri gabeko {{$a}} mezu"
diff --git a/www/addons/mod/forum/lang/fa.json b/www/addons/mod/forum/lang/fa.json
index a65c87f5794..c2909c73988 100644
--- a/www/addons/mod/forum/lang/fa.json
+++ b/www/addons/mod/forum/lang/fa.json
@@ -11,14 +11,18 @@
     "edit": "ویرایش",
     "erroremptymessage": "متن ارسالی نمی‌تواند خالی باشد",
     "erroremptysubject": "موضوع مطلب نمی‌تواند خالی باشد.",
-    "forumnodiscussionsyet": "هیچ مباحثه ای در این تالار یافت نشد",
+    "forumnodiscussionsyet": "هنوز هیچ مباحثه ای در این تالار شروع نشده است.",
     "group": "گروه",
     "message": "متن",
     "modeflatnewestfirst": "نمایش مطالب به صورت مسطح (از جدید به قدیمی)",
     "modeflatoldestfirst": "نمایش مطالب به صورت مسطح (از قدیمی به جدید)",
     "modenested": "نمایش مطالب به صورت تو در تو",
+    "numdiscussions": "{{numdiscussions}} مباحثه",
+    "numreplies": "{{numreplies}} پاسخ",
     "posttoforum": "طرح در تالار",
     "re": "در پاسخ به:",
+    "refreshdiscussions": "تازه‌سازی مباحثه‌ها",
+    "refreshposts": "تازه‌سازی مطالب مباحثه",
     "reply": "ارسال پاسخ",
     "subject": "موضوع",
     "unread": "خوانده نشده",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 566c52681f0..cdc750bf5ea 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Abonnement à la discussion",
     "edit": "Modifier",
     "erroremptymessage": "Un message ne peut pas être vide",
-    "erroremptysubject": "L'objet d'un message ne peut pas être vide",
+    "erroremptysubject": "L'objet du message ne peut pas être vide",
     "errorgetforum": "Erreur de récupération des données de forum.",
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Rafraîchir les discussions",
     "refreshposts": "Rafraîchir les messages des discussions",
     "reply": "Répondre",
+    "sortnewestfirst": "Afficher la plus récente en premier",
+    "sortoldestfirst": "Afficher la plus ancienne en premier",
     "subject": "Sujet",
     "unread": "Non lu",
     "unreadpostsnumber": "{{$a}} messages non lus"
diff --git a/www/addons/mod/forum/lang/he.json b/www/addons/mod/forum/lang/he.json
index 665cc87e1b4..585aef50b5f 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -9,7 +9,7 @@
     "discussionsubscription": "מנוי לעדכונים בדיון",
     "edit": "עריכה",
     "erroremptymessage": "הודעת הפרסום איננה יכולה להיות ריקה",
-    "erroremptysubject": "הנושא הפרסום אינו יכול להיות ריק",
+    "erroremptysubject": "נושא ההודעה אינו יכול להיות ריק",
     "errorgetforum": "שגיאה בטעינת מידע הפורום.",
     "errorgetgroups": "שגיאה בטעינת הגדרות קבוצה.",
     "forumnodiscussionsyet": "עדיין לא קיימים נושאי דיונים בפורום זה.",
diff --git a/www/addons/mod/forum/lang/it.json b/www/addons/mod/forum/lang/it.json
index c54ee597c31..ad1b8b1ed8b 100644
--- a/www/addons/mod/forum/lang/it.json
+++ b/www/addons/mod/forum/lang/it.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Sottoscrizione della discussione",
     "edit": "Modifica",
     "erroremptymessage": "Il corpo del messaggio non può essere vuoto",
-    "erroremptysubject": "L'oggetto non può essere vuoto",
+    "erroremptysubject": "L'oggetto dell'intervento non può essere vuoto",
     "errorgetforum": "Si è verificato un errore durante la ricezione dei dati del forum.",
     "errorgetgroups": "Si è verificato un errore durante la ricezione delle impostazioni gruppo.",
     "forumnodiscussionsyet": "In questo forum non sono presenti discussioni",
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 93f37fba562..4b8b79b3365 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Diskusijos prenumerata",
     "edit": "Redaguoti",
     "erroremptymessage": "Skelbimo žinutė negali būti tuščia",
-    "erroremptysubject": "Skelbimo tema negali būti tuščia.",
+    "erroremptysubject": "Pranešimo temos langelis negali būti tuščias",
     "errorgetforum": "Klaida gaunant forumo duomenis.",
     "errorgetgroups": "Klaida gaunant grupės nustatymus.",
     "forumnodiscussionsyet": "Pokalbio temų forume dar nėra.",
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Atnaujinti pokalbius",
     "refreshposts": "Atnaujinti pokalbių įrašus",
     "reply": "Atsakyti",
+    "sortnewestfirst": "Rodyti naujesnius",
+    "sortoldestfirst": "Rodyti senesnius",
     "subject": "Temos pavadinimas",
     "unread": "Neperskaityta",
     "unreadpostsnumber": "Neperskaitytų skelbimų: {{$a}}"
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 8f7fe7dad45..648c381b008 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Inschrijving discussie",
     "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
-    "erroremptysubject": "Onderwerp kan niet leeg zijn",
+    "erroremptysubject": "Onderwerp mag niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
     "errorgetgroups": "Fout bij het ophalen van groepinstellingen.",
     "forumnodiscussionsyet": "Er zijn nog geen discussies in dit forum",
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Discussie verversen",
     "refreshposts": "Discussieberichten verversen",
     "reply": "Antwoord",
+    "sortnewestfirst": "Toon nieuwste eerst",
+    "sortoldestfirst": "Toon oudste eerst",
     "subject": "Onderwerp",
     "unread": "Niet gelezen",
     "unreadpostsnumber": "{{$a}} ongelezen berichten"
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index aebbce61f21..1e2d3378fe7 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
-    "erroremptysubject": "O assunto da mensagem não pode ser vazio.",
+    "erroremptysubject": "Assunto não pode estar vazio",
     "errorgetforum": "Erro ao buscar dados de fórum.",
     "errorgetgroups": "Erro ao obter configurações do grupo.",
     "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda",
@@ -24,6 +24,8 @@
     "refreshdiscussions": "Atualizar discussões",
     "refreshposts": "Atualizar as postagens da discussão",
     "reply": "Responder",
+    "sortnewestfirst": "Exibir os mais novos primeiro",
+    "sortoldestfirst": "Exibir os mais velhos primeiro",
     "subject": "Assunto",
     "unread": "Não lida",
     "unreadpostsnumber": "{{$a}} mensagens não lidas"
diff --git a/www/addons/mod/forum/lang/pt.json b/www/addons/mod/forum/lang/pt.json
index 8700ce438bd..7b09d8c15ca 100644
--- a/www/addons/mod/forum/lang/pt.json
+++ b/www/addons/mod/forum/lang/pt.json
@@ -26,6 +26,8 @@
     "refreshdiscussions": "Atualizar tópicos de discussão",
     "refreshposts": "Atualizar repostas dos tópicos de discussão",
     "reply": "Responder",
+    "sortnewestfirst": "Mostrar mais recentes primeiro",
+    "sortoldestfirst": "Mostrar mais antigos primeiro",
     "subject": "Assunto",
     "unread": "Não lidas",
     "unreadpostsnumber": "{{$a}} mensagens não lidas"
diff --git a/www/addons/mod/forum/lang/ro.json b/www/addons/mod/forum/lang/ro.json
index 2dd31a2be41..99d4fc77c16 100644
--- a/www/addons/mod/forum/lang/ro.json
+++ b/www/addons/mod/forum/lang/ro.json
@@ -7,7 +7,7 @@
     "discussion": "Discuție",
     "edit": "Modifică",
     "erroremptymessage": "Mesajul nu poate fi necompletat",
-    "erroremptysubject": "Subiectul nu poate fi necompletat",
+    "erroremptysubject": "Subiectul nu poate rămâne necompletat",
     "errorgetforum": "A apărut o eroare la obținerea datelor despre forum.",
     "errorgetgroups": "Eroare la obținerea setărilor pentru grup.",
     "forumnodiscussionsyet": "Nu există subiecte deschise în acest forum.",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index d2d420c71b6..64b3bb7d575 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Подписаться на эту тему.",
     "edit": "Редактировать",
     "erroremptymessage": "Сообщение не может быть пустым",
-    "erroremptysubject": "Тема сообщения не может быть пустой",
+    "erroremptysubject": "Заголовок сообщения не может быть пустым",
     "errorgetforum": "Ошибка при получении данных форума",
     "errorgetgroups": "Ошибка получения параметров группы",
     "forumnodiscussionsyet": "В этом форуме ещё нет тем для обсуждения",
@@ -24,6 +24,8 @@
     "posttoforum": "Отправить в форум",
     "re": "Re:",
     "reply": "Ответить",
+    "sortnewestfirst": "Отобразить сначала новые",
+    "sortoldestfirst": "Отобразить сначала старые",
     "subject": "Тема",
     "unread": "Непрочтенные",
     "unreadpostsnumber": "Непрочитанных сообщений - {{$a}}"
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 5d9eb54b6ad..676e5ba9fa1 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
-    "erroremptysubject": "Ämnesrubriken för inlägget kan inte vara tom.",
+    "erroremptysubject": "Rubriken kan inte vara tom",
     "errorgetforum": "Fel att få forum innehåll",
     "errorgetgroups": "Fel vid hämtning av gruppinställningar",
     "forumnodiscussionsyet": "Det finns inga diskussionsämnen ännu i detta forum.",
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index 6a91914a48c..7184cb121a0 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "議題訂閱",
     "edit": "編輯",
     "erroremptymessage": "貼文的訊息不能是空白",
-    "erroremptysubject": "貼文的主旨不能是空白",
+    "erroremptysubject": "貼文的標題不可以是空的",
     "errorgetforum": "讀取討論區資料發生錯誤",
     "errorgetgroups": "讀取群組設定發生錯誤",
     "forumnodiscussionsyet": "這個討論區還沒有討論主題",
@@ -26,6 +26,8 @@
     "refreshdiscussions": "更新討論區",
     "refreshposts": "更新討論區貼文",
     "reply": "回應",
+    "sortnewestfirst": "優先顯示最新的項目",
+    "sortoldestfirst": "優先顯示最早的項目",
     "subject": "主旨",
     "unread": "未閱讀",
     "unreadpostsnumber": "{{$a}}篇未閱讀的貼文"
diff --git a/www/addons/mod/glossary/lang/cs.json b/www/addons/mod/glossary/lang/cs.json
index a2a4035667d..169ca928d6a 100644
--- a/www/addons/mod/glossary/lang/cs.json
+++ b/www/addons/mod/glossary/lang/cs.json
@@ -3,11 +3,14 @@
     "browsemode": "Prohlížení příspěvků",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
+    "bycategory": "Skupina podle kategorie",
     "bynewestfirst": "Nejnovější nejdříve",
     "byrecentlyupdated": "Posledně aktualizované",
     "bysearch": "Hledat",
+    "cannoteditentry": "Záznam nelze upravit",
     "casesensitive": "Rozlišovat malá/VELKÁ",
     "categories": "Kategorie kurzů",
+    "entriestobesynced": "Příspěvky, které mají být synchronizovány",
     "entrypendingapproval": "Tato položka čeká na schválení",
     "errorloadingentries": "Při načítání položek došlo k chybě",
     "errorloadingentry": "Při načítání položky došlo k chybě",
diff --git a/www/addons/mod/glossary/lang/nl.json b/www/addons/mod/glossary/lang/nl.json
index 87f331b64c8..34dd6c4e2b3 100644
--- a/www/addons/mod/glossary/lang/nl.json
+++ b/www/addons/mod/glossary/lang/nl.json
@@ -3,11 +3,14 @@
     "browsemode": "Blader door items",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
+    "bycategory": "Groepeer per categorie",
     "bynewestfirst": "Nieuwste eerst",
     "byrecentlyupdated": "Onlangs gewijzigd",
     "bysearch": "Zoek",
+    "cannoteditentry": "Kan item niet bewerken",
     "casesensitive": "Gevoeligheid voor hoofd/kleine letters",
     "categories": "Cursuscategorieën",
+    "entriestobesynced": "Items niet gesynchroniseerd",
     "entrypendingapproval": "Dit item wacht op goedkeuring.",
     "errorloadingentries": "Fout bij het laden van de items.",
     "errorloadingentry": "Fout tijdens het laden van dit item.",
diff --git a/www/addons/mod/glossary/lang/pt-br.json b/www/addons/mod/glossary/lang/pt-br.json
index e0e952c15be..809150ea25e 100644
--- a/www/addons/mod/glossary/lang/pt-br.json
+++ b/www/addons/mod/glossary/lang/pt-br.json
@@ -3,11 +3,14 @@
     "browsemode": "Navegar nas entradas",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
+    "bycategory": "Agrupar por categoria",
     "bynewestfirst": "Novos primeiro",
     "byrecentlyupdated": "Recentemente atualizados",
     "bysearch": "Pesquisa",
+    "cannoteditentry": "Não é possível editar o item",
     "casesensitive": "Considerar diferenças entre maiúsculas e minúsculas",
     "categories": "Categorias de Cursos",
+    "entriestobesynced": "Itens a serem sincronizados",
     "entrypendingapproval": "A entrada está pendente de aprovação.",
     "errorloadingentries": "Ocorreu um erro enquanto carregava entradas.",
     "errorloadingentry": "Ocorreu um erro enquanto carregava a entrada.",
diff --git a/www/addons/mod/glossary/lang/ru.json b/www/addons/mod/glossary/lang/ru.json
index a3d14a5d3c8..0436f1b73c4 100644
--- a/www/addons/mod/glossary/lang/ru.json
+++ b/www/addons/mod/glossary/lang/ru.json
@@ -1,6 +1,10 @@
 {
     "attachment": "Вложение:",
     "browsemode": "Режим предпросмотра",
+    "byalphabet": "Алфавитно",
+    "byauthor": "Группировать по автору",
+    "bycategory": "Группировать по категориям",
+    "bysearch": "Поиск",
     "casesensitive": "Чувствительность ответа к регистру",
     "categories": "Категории курсов"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ca.json b/www/addons/mod/label/lang/ca.json
index 129eb9e3838..bea219e03e2 100644
--- a/www/addons/mod/label/lang/ca.json
+++ b/www/addons/mod/label/lang/ca.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etiqueta"
+    "label": "Etiqueta",
+    "taptoview": "Toqueu per veure l'etiqueta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/cs.json b/www/addons/mod/label/lang/cs.json
index b88d433a998..023eb441277 100644
--- a/www/addons/mod/label/lang/cs.json
+++ b/www/addons/mod/label/lang/cs.json
@@ -1,3 +1,4 @@
 {
-    "label": "Popisek"
+    "label": "Popisek",
+    "taptoview": "Klepnutím zobrazíte popisek."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/da.json b/www/addons/mod/label/lang/da.json
index 24b44d12e7b..47be40b82b2 100644
--- a/www/addons/mod/label/lang/da.json
+++ b/www/addons/mod/label/lang/da.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etiket"
+    "label": "Etiket",
+    "taptoview": "Tryk her for at se etiketten."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/de.json b/www/addons/mod/label/lang/de.json
index e325b1d3856..56e9fe5f2bf 100644
--- a/www/addons/mod/label/lang/de.json
+++ b/www/addons/mod/label/lang/de.json
@@ -1,3 +1,4 @@
 {
-    "label": "Textfeld"
+    "label": "Textfeld",
+    "taptoview": "Tippen Sie zum Anzeigen des Textfelds"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/el.json b/www/addons/mod/label/lang/el.json
index 84d54ad2588..c21721e8995 100644
--- a/www/addons/mod/label/lang/el.json
+++ b/www/addons/mod/label/lang/el.json
@@ -1,3 +1,4 @@
 {
-    "label": "Ετικέτα"
+    "label": "Ετικέτα",
+    "taptoview": "Πατήστε για να δείτε την ετικέτα."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/es-mx.json b/www/addons/mod/label/lang/es-mx.json
index 129eb9e3838..3bfae297d67 100644
--- a/www/addons/mod/label/lang/es-mx.json
+++ b/www/addons/mod/label/lang/es-mx.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etiqueta"
+    "label": "Etiqueta",
+    "taptoview": "Elija para ver la etiqueta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/es.json b/www/addons/mod/label/lang/es.json
index 129eb9e3838..98f10a47c36 100644
--- a/www/addons/mod/label/lang/es.json
+++ b/www/addons/mod/label/lang/es.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etiqueta"
+    "label": "Etiqueta",
+    "taptoview": "Toca para ver la etiqueta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/eu.json b/www/addons/mod/label/lang/eu.json
index 79e176fef92..fd6c915660d 100644
--- a/www/addons/mod/label/lang/eu.json
+++ b/www/addons/mod/label/lang/eu.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etiketa"
+    "label": "Etiketa",
+    "taptoview": "Sakatu etiketa ikusteko."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/fr.json b/www/addons/mod/label/lang/fr.json
index 6cf7f110617..443dfeea55e 100644
--- a/www/addons/mod/label/lang/fr.json
+++ b/www/addons/mod/label/lang/fr.json
@@ -1,3 +1,4 @@
 {
-    "label": "Étiquette"
+    "label": "Étiquette",
+    "taptoview": "Tapoter pour voir l'étiquette"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/he.json b/www/addons/mod/label/lang/he.json
index 7f0814d0381..817c39b0d05 100644
--- a/www/addons/mod/label/lang/he.json
+++ b/www/addons/mod/label/lang/he.json
@@ -1,3 +1,4 @@
 {
-    "label": "תווית"
+    "label": "תווית",
+    "taptoview": "הקליקו לצפיה בתווית."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/it.json b/www/addons/mod/label/lang/it.json
index 473ac682886..26998a75f55 100644
--- a/www/addons/mod/label/lang/it.json
+++ b/www/addons/mod/label/lang/it.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etichetta"
+    "label": "Etichetta",
+    "taptoview": "Tocca per visualizzare l'etichetta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/lt.json b/www/addons/mod/label/lang/lt.json
index f9a1ca059d8..8ad40c27bd6 100644
--- a/www/addons/mod/label/lang/lt.json
+++ b/www/addons/mod/label/lang/lt.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etiketė"
+    "label": "Etiketė",
+    "taptoview": "Paspauskite peržiūrėti etiketę."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/nl.json b/www/addons/mod/label/lang/nl.json
index 817c10edebe..3213dc6de44 100644
--- a/www/addons/mod/label/lang/nl.json
+++ b/www/addons/mod/label/lang/nl.json
@@ -1,3 +1,4 @@
 {
-    "label": "Label"
+    "label": "Label",
+    "taptoview": "Tik om label te zien."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/pt-br.json b/www/addons/mod/label/lang/pt-br.json
index fdfc1ff9392..041dadd0a90 100644
--- a/www/addons/mod/label/lang/pt-br.json
+++ b/www/addons/mod/label/lang/pt-br.json
@@ -1,3 +1,4 @@
 {
-    "label": "Rótulo"
+    "label": "Rótulo",
+    "taptoview": "Clique para ver o rótulo"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/pt.json b/www/addons/mod/label/lang/pt.json
index afa1ad09ff3..3ec99abb8ef 100644
--- a/www/addons/mod/label/lang/pt.json
+++ b/www/addons/mod/label/lang/pt.json
@@ -1,3 +1,4 @@
 {
-    "label": "Separador"
+    "label": "Separador",
+    "taptoview": "Clique para ver o separador."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ro.json b/www/addons/mod/label/lang/ro.json
index beae1b423cb..ba27ef2881e 100644
--- a/www/addons/mod/label/lang/ro.json
+++ b/www/addons/mod/label/lang/ro.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etichetă"
+    "label": "Etichetă",
+    "taptoview": "Apăsați pentru a vedea eticheta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ru.json b/www/addons/mod/label/lang/ru.json
index 974254476a8..c146a5c392a 100644
--- a/www/addons/mod/label/lang/ru.json
+++ b/www/addons/mod/label/lang/ru.json
@@ -1,3 +1,4 @@
 {
-    "label": "Пояснение"
+    "label": "Пояснение",
+    "taptoview": "Нажмите для просмотра пояснения."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/sv.json b/www/addons/mod/label/lang/sv.json
index f695fc848d9..7921bbf40e4 100644
--- a/www/addons/mod/label/lang/sv.json
+++ b/www/addons/mod/label/lang/sv.json
@@ -1,3 +1,4 @@
 {
-    "label": "Etikett"
+    "label": "Etikett",
+    "taptoview": "Tryck här för att visa etiketten."
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/zh-tw.json b/www/addons/mod/label/lang/zh-tw.json
index c1a016fd047..640fd1a04ca 100644
--- a/www/addons/mod/label/lang/zh-tw.json
+++ b/www/addons/mod/label/lang/zh-tw.json
@@ -1,3 +1,4 @@
 {
-    "label": "標籤"
+    "label": "標籤",
+    "taptoview": "點擊查看標籤"
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/fa.json b/www/addons/mod/quiz/lang/fa.json
index 8ffdde83a28..32834035097 100644
--- a/www/addons/mod/quiz/lang/fa.json
+++ b/www/addons/mod/quiz/lang/fa.json
@@ -7,6 +7,7 @@
     "comment": "توضیح",
     "completedon": "پایان",
     "confirmclose": "شما در آستانهٔ اتمام شرکت خود در آزمون هستید. پس ا ز اتمام شرکت دیگر نمی‌توانید پاسخ‌های خود را تغییر دهید.",
+    "confirmleavequizonerror": "در حین ذخیرهٔ پاسخ‌ها خطایی رخ داد. آیا مطمئن هستید که می‌خواهید از آزمون خارج شوید؟",
     "continueattemptquiz": "ادامهٔ آخرین دفعهٔ شرکت در آزمون",
     "continuepreview": "ادامهٔ آخرین پیش‌نمایش",
     "feedback": "بازخورد",
diff --git a/www/addons/mod/quiz/lang/ru.json b/www/addons/mod/quiz/lang/ru.json
index add39223f4a..f6e5e3fee00 100644
--- a/www/addons/mod/quiz/lang/ru.json
+++ b/www/addons/mod/quiz/lang/ru.json
@@ -14,6 +14,7 @@
     "continuepreview": "Продолжить последний просмотр",
     "feedback": "Отзыв",
     "finishattemptdots": "Закончить попытку...",
+    "finishnotsynced": "Завершено, но не синхронизировано",
     "grade": "Оценка",
     "gradeaverage": "Средняя оценка",
     "gradehighest": "Высшая оценка",
diff --git a/www/addons/mod/scorm/lang/ca.json b/www/addons/mod/scorm/lang/ca.json
index 196c9ad1c08..a5a5ddadc0d 100644
--- a/www/addons/mod/scorm/lang/ca.json
+++ b/www/addons/mod/scorm/lang/ca.json
@@ -32,6 +32,7 @@
     "highestattempt": "Intent més alt",
     "incomplete": "Incomplet",
     "lastattempt": "Darrer intent completat",
+    "lastsync": "Darrera sincronització",
     "mode": "Mode",
     "newattempt": "Comença un nou intent",
     "noattemptsallowed": "Nombre d'intents permesos",
diff --git a/www/addons/mod/scorm/lang/cs.json b/www/addons/mod/scorm/lang/cs.json
index 533ab1989ac..e69a107f5c0 100644
--- a/www/addons/mod/scorm/lang/cs.json
+++ b/www/addons/mod/scorm/lang/cs.json
@@ -32,6 +32,7 @@
     "highestattempt": "Nejlepší pokus",
     "incomplete": "Nedokončeno",
     "lastattempt": "Poslední pokus",
+    "lastsync": "Poslední synchronizace",
     "mode": "Režim",
     "newattempt": "Začít nový pokus",
     "noattemptsallowed": "Počet povolených pokusů",
diff --git a/www/addons/mod/scorm/lang/da.json b/www/addons/mod/scorm/lang/da.json
index b87612d58d4..8350d1e752d 100644
--- a/www/addons/mod/scorm/lang/da.json
+++ b/www/addons/mod/scorm/lang/da.json
@@ -32,6 +32,7 @@
     "highestattempt": "Højeste forsøg",
     "incomplete": "Ukomplet",
     "lastattempt": "Sidste fuldførte forsøg",
+    "lastsync": "Sidste synkronisering",
     "mode": "Tilstand",
     "newattempt": "Prøv et nyt forsøg",
     "noattemptsallowed": "Antal tilladte forsøg",
diff --git a/www/addons/mod/scorm/lang/de.json b/www/addons/mod/scorm/lang/de.json
index f9c2cd8d027..3c08cd38a20 100644
--- a/www/addons/mod/scorm/lang/de.json
+++ b/www/addons/mod/scorm/lang/de.json
@@ -32,6 +32,7 @@
     "highestattempt": "Bester Versuch",
     "incomplete": "Unvollständig",
     "lastattempt": "Letzter vollständiger Versuch",
+    "lastsync": "Letztes Synchronisieren",
     "mode": "Einstellung",
     "newattempt": "Neuen Versuch beginnen",
     "noattemptsallowed": "Zahl zulässiger Versuche",
diff --git a/www/addons/mod/scorm/lang/el.json b/www/addons/mod/scorm/lang/el.json
index a819301fbee..d68f024cfa9 100644
--- a/www/addons/mod/scorm/lang/el.json
+++ b/www/addons/mod/scorm/lang/el.json
@@ -32,6 +32,7 @@
     "highestattempt": "Υψηλότερη βαθμολογία",
     "incomplete": "Μη ολοκληρωμένο",
     "lastattempt": "Τελευταία προσπάθεια",
+    "lastsync": "Τελευταίος συγχρονισμός",
     "mode": "Φάση",
     "newattempt": "Έναρξη νέας προσπάθειας",
     "noattemptsallowed": "Επιτρεπόμενος αριθμός προσπαθειών",
diff --git a/www/addons/mod/scorm/lang/es-mx.json b/www/addons/mod/scorm/lang/es-mx.json
index 2c72808a5b1..0975f01dfc7 100644
--- a/www/addons/mod/scorm/lang/es-mx.json
+++ b/www/addons/mod/scorm/lang/es-mx.json
@@ -32,6 +32,7 @@
     "highestattempt": "Intento más alto",
     "incomplete": "Incompleto",
     "lastattempt": "Último intento",
+    "lastsync": "Ultima sincronización",
     "mode": "Moda",
     "newattempt": "Comenzar un nuevo intento",
     "noattemptsallowed": "Número de intentos permitidos",
diff --git a/www/addons/mod/scorm/lang/es.json b/www/addons/mod/scorm/lang/es.json
index 518b5cf6da7..83baeb100e5 100644
--- a/www/addons/mod/scorm/lang/es.json
+++ b/www/addons/mod/scorm/lang/es.json
@@ -32,6 +32,7 @@
     "highestattempt": "Intento más alto",
     "incomplete": "Incompleto",
     "lastattempt": "Último intento",
+    "lastsync": "Última sincronización",
     "mode": "Moda",
     "newattempt": "Comenzar un nuevo intento",
     "noattemptsallowed": "Número de intentos permitidos",
diff --git a/www/addons/mod/scorm/lang/eu.json b/www/addons/mod/scorm/lang/eu.json
index d6315ef6681..f595303bee9 100644
--- a/www/addons/mod/scorm/lang/eu.json
+++ b/www/addons/mod/scorm/lang/eu.json
@@ -32,6 +32,7 @@
     "highestattempt": "Saiakera altuena",
     "incomplete": "Osatu gabea",
     "lastattempt": "Osatutako azken saiakera",
+    "lastsync": "Azken sinkronizazioa",
     "mode": "Modua",
     "newattempt": "Saiakera berria hasi",
     "noattemptsallowed": "Baimendutako saiakera-kopurua",
diff --git a/www/addons/mod/scorm/lang/fa.json b/www/addons/mod/scorm/lang/fa.json
index 5f72f7f83ca..28c96dadd4e 100644
--- a/www/addons/mod/scorm/lang/fa.json
+++ b/www/addons/mod/scorm/lang/fa.json
@@ -9,6 +9,8 @@
     "completed": "کامل شده",
     "contents": "محتویات",
     "enter": "ورود",
+    "errorinvalidversion": "متاسفانه برنامه تنها از اسکورم ۱٫۲ پشتیبانی می‌کند.",
+    "errorpackagefile": "متاسفانه برنامه تنها از بسته‌های ZIP پشتیبانی می‌کند.",
     "exceededmaxattempts": "حداکثر تعداد تلاش‌ها را انجام داده‌اید.",
     "failed": "ناموفق",
     "firstattempt": "اولین تلاش",
diff --git a/www/addons/mod/scorm/lang/fr.json b/www/addons/mod/scorm/lang/fr.json
index 5798f9a67eb..8dbfe8172ba 100644
--- a/www/addons/mod/scorm/lang/fr.json
+++ b/www/addons/mod/scorm/lang/fr.json
@@ -32,6 +32,7 @@
     "highestattempt": "Meilleure tentative",
     "incomplete": "Incomplet",
     "lastattempt": "Dernière tentative terminée",
+    "lastsync": "Dernière synchronisation",
     "mode": "Mode",
     "newattempt": "Commencer une nouvelle tentative",
     "noattemptsallowed": "Nombre de tentatives permises",
diff --git a/www/addons/mod/scorm/lang/it.json b/www/addons/mod/scorm/lang/it.json
index 8556f3bf7ab..c5f5df6f781 100644
--- a/www/addons/mod/scorm/lang/it.json
+++ b/www/addons/mod/scorm/lang/it.json
@@ -32,6 +32,7 @@
     "highestattempt": "Tentativo migliore",
     "incomplete": "Incompleto",
     "lastattempt": "Ultimo tentativo completato",
+    "lastsync": "Sincronizzazione più recente",
     "mode": "Modalità",
     "newattempt": "Avvia un nuovo tentativo",
     "noattemptsallowed": "Numero di tentativi consentito",
diff --git a/www/addons/mod/scorm/lang/lt.json b/www/addons/mod/scorm/lang/lt.json
index 5ff4711bf91..0ea8a51a742 100644
--- a/www/addons/mod/scorm/lang/lt.json
+++ b/www/addons/mod/scorm/lang/lt.json
@@ -32,6 +32,7 @@
     "highestattempt": "Aukščiausiai įvertintas bandymas",
     "incomplete": "Neužbaigta",
     "lastattempt": "Paskutinis bandymas",
+    "lastsync": "Paskutinė sinchronizacija",
     "mode": "Režimas",
     "newattempt": "Pradėti naują bandymą",
     "noattemptsallowed": "Leidžiamų bandymų skaičius",
diff --git a/www/addons/mod/scorm/lang/nl.json b/www/addons/mod/scorm/lang/nl.json
index 0a418c7071f..f9339060c67 100644
--- a/www/addons/mod/scorm/lang/nl.json
+++ b/www/addons/mod/scorm/lang/nl.json
@@ -32,6 +32,7 @@
     "highestattempt": "Beste poging",
     "incomplete": "Onvolledig",
     "lastattempt": "Laatste voltooide poging",
+    "lastsync": "Laatste synchronisatie",
     "mode": "Modus",
     "newattempt": "Begin een nieuwe poging",
     "noattemptsallowed": "Aantal toegelaten pogingen",
diff --git a/www/addons/mod/scorm/lang/pt-br.json b/www/addons/mod/scorm/lang/pt-br.json
index 458dcebee2a..31fc512e9df 100644
--- a/www/addons/mod/scorm/lang/pt-br.json
+++ b/www/addons/mod/scorm/lang/pt-br.json
@@ -32,6 +32,7 @@
     "highestattempt": "Tentativa mais alta",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa",
+    "lastsync": "Última sincronização",
     "mode": "Modalidade",
     "newattempt": "Começar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
diff --git a/www/addons/mod/scorm/lang/pt.json b/www/addons/mod/scorm/lang/pt.json
index b3539194c48..1486e4694ea 100644
--- a/www/addons/mod/scorm/lang/pt.json
+++ b/www/addons/mod/scorm/lang/pt.json
@@ -32,6 +32,7 @@
     "highestattempt": "Tentativa com melhor nota",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa concluída",
+    "lastsync": "Última sincronização",
     "mode": "Modo",
     "newattempt": "Iniciar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
diff --git a/www/addons/mod/scorm/lang/ro.json b/www/addons/mod/scorm/lang/ro.json
index 24087ff80da..d8aa28568ff 100644
--- a/www/addons/mod/scorm/lang/ro.json
+++ b/www/addons/mod/scorm/lang/ro.json
@@ -30,6 +30,7 @@
     "highestattempt": "Cea mai completă încercare de parcurgere",
     "incomplete": "Incomplet",
     "lastattempt": "Ultima încercare de parcurgere",
+    "lastsync": "Ultima sincronizare",
     "mode": "Mod",
     "newattempt": "Începe o nouă încercare de parcurgere",
     "noattemptsallowed": "Numărul de încercări permise",
diff --git a/www/addons/mod/scorm/lang/ru.json b/www/addons/mod/scorm/lang/ru.json
index 1c3222e4045..82a27dc1caa 100644
--- a/www/addons/mod/scorm/lang/ru.json
+++ b/www/addons/mod/scorm/lang/ru.json
@@ -6,9 +6,12 @@
     "browse": "Предпросмотр",
     "browsed": "Найден",
     "browsemode": "Режим предпросмотра",
+    "cannotcalculategrade": "Оценка не может быть посчитана",
     "completed": "Завершено",
     "contents": "Содержание",
     "enter": "Войти",
+    "errorinvalidversion": "К сожалению, приложение поддерживает только SCORM 1.2.",
+    "errorpackagefile": "К сожалению, приложение поддерживает только ZIP-архивы.",
     "exceededmaxattempts": "Вы достигли максимального количества попыток.",
     "failed": "Неудачно",
     "firstattempt": "Первая попытка",
@@ -22,6 +25,7 @@
     "highestattempt": "Лучшая попытка",
     "incomplete": "Не завершено",
     "lastattempt": "Завершена последняя попытка",
+    "lastsync": "Последняя синхронизация",
     "mode": "Режим",
     "newattempt": "Начать новую попытку",
     "noattemptsallowed": "Количество попыток",
diff --git a/www/addons/mod/scorm/lang/sv.json b/www/addons/mod/scorm/lang/sv.json
index 6cbde1646b4..39178a38f12 100644
--- a/www/addons/mod/scorm/lang/sv.json
+++ b/www/addons/mod/scorm/lang/sv.json
@@ -32,6 +32,7 @@
     "highestattempt": "Högsta försöket",
     "incomplete": "Inte komplett",
     "lastattempt": "Senaste försöket",
+    "lastsync": "Senaste synkronisering",
     "mode": "Läge",
     "newattempt": "Påbörja ett nytt försök",
     "noattemptsallowed": "Antal tillåtna försök",
diff --git a/www/addons/mod/scorm/lang/tr.json b/www/addons/mod/scorm/lang/tr.json
index 244c50c5460..f27a342aa68 100644
--- a/www/addons/mod/scorm/lang/tr.json
+++ b/www/addons/mod/scorm/lang/tr.json
@@ -22,6 +22,7 @@
     "highestattempt": "En yüksek uygulama",
     "incomplete": "Tamamlanmadı",
     "lastattempt": "Son uygulama",
+    "lastsync": "Son senkronizasyon",
     "mode": "Mod",
     "newattempt": "Yeni bir uygulama başlat",
     "noattemptsallowed": "İzin verilen uygulama sayısı",
diff --git a/www/addons/mod/scorm/lang/zh-tw.json b/www/addons/mod/scorm/lang/zh-tw.json
index ec476e126b9..f2d8044e8c4 100644
--- a/www/addons/mod/scorm/lang/zh-tw.json
+++ b/www/addons/mod/scorm/lang/zh-tw.json
@@ -32,6 +32,7 @@
     "highestattempt": "最高使用次數",
     "incomplete": "不完整",
     "lastattempt": "最後完成的作答次",
+    "lastsync": "最後的同步",
     "mode": "模式",
     "newattempt": "開始新的使用",
     "noattemptsallowed": "允許作答的次數",
diff --git a/www/addons/mod/survey/lang/fa.json b/www/addons/mod/survey/lang/fa.json
index 7d03eac0e6e..eac2b9fbf74 100644
--- a/www/addons/mod/survey/lang/fa.json
+++ b/www/addons/mod/survey/lang/fa.json
@@ -1,4 +1,5 @@
 {
+    "cannotsubmitsurvey": "متاسفیم. مشکلی در ثبت نظرسنجی شما وجود داشت. لطفا دوباره تلاش کنید.",
     "ifoundthat": "متوجه شدم که:",
     "ipreferthat": "ترجیح می‌دهم که:",
     "responses": "پاسخ‌ها",
diff --git a/www/addons/mod/wiki/lang/fa.json b/www/addons/mod/wiki/lang/fa.json
index f5fab63cf6d..3ea0f81b588 100644
--- a/www/addons/mod/wiki/lang/fa.json
+++ b/www/addons/mod/wiki/lang/fa.json
@@ -7,5 +7,6 @@
     "notingroup": "بدون گروه",
     "page": "صفحه",
     "pageexists": "این صفحه در حال حاضر وجود دارد. در حال تغییر مسیر به صفحهٔ موجود.",
+    "viewpage": "مشاهدهٔ صفحه",
     "wrongversionlock": "هنگامی که شما در حال ویرایش این صفحه بودید، کاربر دیگری آن را ویرایش کرد و محتوایش را تغییر داد."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ru.json b/www/addons/mod/wiki/lang/ru.json
index 5c2ae966ec1..d1aad170e59 100644
--- a/www/addons/mod/wiki/lang/ru.json
+++ b/www/addons/mod/wiki/lang/ru.json
@@ -2,6 +2,8 @@
     "cannoteditpage": "Вы не можете редактировать эту страницу",
     "createpage": "Создать страницу",
     "editingpage": "Редактирование страницы «{{$a}}»",
+    "errorloadingpage": "При загрузке страницы произошла ошибка.",
+    "errornowikiavailable": "В этом модуле WIKI пока нет контента.",
     "map": "Карта",
     "newpagehdr": "Новая страница",
     "newpagetitle": "Заголовок новой страницы",
@@ -10,5 +12,7 @@
     "page": "Страница",
     "pageexists": "Такая страница уже существует.",
     "pagename": "Название страницы",
+    "titleshouldnotbeempty": "Заголовок не должен быть пустым",
+    "wikipage": "Страница Wiki",
     "wrongversionlock": "Другой пользователь отредактировал страницу и Ваше содержимое устарело"
 }
\ No newline at end of file
diff --git a/www/core/components/contentlinks/lang/ru.json b/www/core/components/contentlinks/lang/ru.json
new file mode 100644
index 00000000000..8efa22ed39c
--- /dev/null
+++ b/www/core/components/contentlinks/lang/ru.json
@@ -0,0 +1,3 @@
+{
+    "chooseaccount": "Выберите учетную запись"
+}
\ No newline at end of file
diff --git a/www/core/components/course/lang/bg.json b/www/core/components/course/lang/bg.json
index 370471981b9..27e55810940 100644
--- a/www/core/components/course/lang/bg.json
+++ b/www/core/components/course/lang/bg.json
@@ -3,7 +3,9 @@
     "contents": "Съдържание",
     "couldnotloadsectioncontent": "Неуспех при зареждането на съдържанието на секцията, моля опитайте пак по-късно.",
     "couldnotloadsections": "Неуспех при зареждането на секциите, моля опитайте отново.",
+    "gotothesite": "Отиди към сайта.",
     "hiddenfromstudents": "Скрит от ученици",
     "nocontentavailable": "В момента няма достъпно съдържание.",
-    "showall": "Показване на всичко"
+    "showall": "Показване на всичко",
+    "whoops": "Опс!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index 4d5f44fc1cc..7ab8b932f97 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -1,5 +1,7 @@
 {
     "activitydisabled": "La vostra organització ha desactivat aquesta activitat a l'app mòbil.",
+    "activitynotyetviewable": "Aquesta activitat encara no es pot visualitzar a l'aplicació.",
+    "activitynotyetviewablegothere": "Aquest tipus d'activitat o recurs encara no està disponible per ser visualitzat des de l'aplicació, cliqueu al botó de més avall per accedir-hi des del web.",
     "activitynotyetviewableinapp": "Estem treballant per donar suport a l'activitat {{$a}}.",
     "activitynotyetviewableremoteaddon": "La vostra organització ha instal·lat un complement que encara no és compatible amb l'aplicació.",
     "activitynotyetviewablesiteupgradeneeded": "El Moodle de la vostra organització necessita una actualització.",
@@ -7,6 +9,7 @@
     "askadmintosupport": "Contacteu l'administrador del lloc i digueu-li que voleu fer servir aquesta activitat a Moodle Mobile.",
     "confirmdeletemodulefiles": "Confirmeu que voleu eliminar els fitxers d'aquest mòdul?",
     "confirmdownload": "Esteu a punt de descarregar {{size}}. Segur que voleu continuar?",
+    "confirmdownloadsection": "Esteu a punt de descarregar {{size}}. Segur que voleu continuar?",
     "confirmdownloadunknownsize": "No es pot calcular la mida de la descàrrega. Segur que voleu continuar?",
     "confirmpartialdownloadsize": "Ara descarregareu {{size}} <strong>com a mínim</strong>. Confirmeu que voleu continuar?",
     "contents": "Continguts",
@@ -14,9 +17,11 @@
     "couldnotloadsections": "No s'ha pogut carregar les seccions, si us plau, torneu-ho a provar més tard.",
     "errordownloadingsection": "S'ha produït un error en descarregar la secció.",
     "errorgetmodule": "S'ha produït un error en recuperar les dades del mòdul.",
+    "gotothesite": "Vés al web",
     "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
     "showall": "Mostra-ho tot",
-    "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
+    "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu.",
+    "whoops": "Renoi!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index 06ae9ba3925..5ccb9f1241c 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -1,4 +1,7 @@
 {
+    "activitydisabled": "Vaše organizace zakázal tuto činnost v mobilní aplikaci.",
+    "activitynotyetviewable": "Tato činnost ještě není v aplikaci zobrazitelná.",
+    "activitynotyetviewablegothere": "Tato činnost nebo zdroj ještě není v aplikaci zobrazitelná, pro přístup z webu klikněte na tlačítko dole.",
     "activitynotyetviewableinapp": "Pracujeme na úpravě aktivity {{$a}}.",
     "activitynotyetviewableremoteaddon": "Tato aktivita je doplněk třetí strany, který ještě není aplikací podporován.",
     "activitynotyetviewablesiteupgradeneeded": "Instalace Moodle vaší organizace je třeba aktualizovat.",
@@ -6,6 +9,7 @@
     "askadmintosupport": "Obraťte se na správce webu a řekněte mu, že tuto činnost chcete používat s mobilní Moodle  aplikací.",
     "confirmdeletemodulefiles": "Jste si jisti, že chcete odstranit tyto soubory modulu?",
     "confirmdownload": "Chystáte se stahovat {{velikost}}. Jste si jisti, že chcete pokračovat?",
+    "confirmdownloadsection": "Chystáte se stahovat {{velikost}}. Jste si jisti, že chcete pokračovat?",
     "confirmdownloadunknownsize": "Nebyli jsme schopni vypočítat velikost stahování. Jste si jisti, že stahování chcete?",
     "confirmpartialdownloadsize": "Chystáte se stáhnout <strong> alespoň </strong> {{size}}. Jste si jisti, že chcete pokračovat?",
     "contents": "Obsah",
@@ -13,9 +17,11 @@
     "couldnotloadsections": "Nelze načíst sekce, zkuste to prosím později.",
     "errordownloadingsection": "Chyba při stahování sekce.",
     "errorgetmodule": "Chyba při načítání",
+    "gotothesite": "Přejít na stránky",
     "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
     "showall": "Zobrazit vše",
-    "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
+    "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení.",
+    "whoops": "Jejda!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/da.json b/www/core/components/course/lang/da.json
index 9242ee4ca2d..23f7c8c2901 100644
--- a/www/core/components/course/lang/da.json
+++ b/www/core/components/course/lang/da.json
@@ -1,13 +1,18 @@
 {
+    "activitynotyetviewable": "Denne aktivitet kan endnu ikke vises i app'en.",
+    "activitynotyetviewablegothere": "Denne aktivitet eller ressource er det endnu ikke muligt at vise i denne app, klik på knappen herunder for at åbne fra webstedet.",
     "allsections": "Alle sektioner",
     "confirmdownload": "Du er ved at hente {{size}}. Er du sikker på at du vil fortsætte?",
+    "confirmdownloadsection": "Du er ved at hente {{size}}. Er du sikker på at du vil fortsætte?",
     "confirmdownloadunknownsize": "Vi kunne ikke beregne størrelsen af dit download. Er du sikker på du vil hende det?",
     "contents": "Indhold",
     "couldnotloadsectioncontent": "Kunne ikke indlæse sektionens indhold, prøv igen senere.",
     "couldnotloadsections": "Kunne ikke indlæse sektionerne, prøv igen senere.",
     "errordownloadingsection": "Fejl ved indlæsning af sektion.",
+    "gotothesite": "Gå til webstedet",
     "hiddenfromstudents": "Skjult for studerende",
     "nocontentavailable": "Intet indhold tilgængeligt lige nu.",
     "overriddennotice": "Din endelige karakter fra denne aktivitet blev justeret manuelt.",
-    "showall": "Vis alt"
+    "showall": "Vis alt",
+    "whoops": "Hovsa!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index 31844262b57..3311d3535e1 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -1,5 +1,7 @@
 {
     "activitydisabled": "Für diese Website ist die Aktivität in der App deaktiviert.",
+    "activitynotyetviewable": "Diese Aktivität kann bisher nicht in der App angezeigt werden.",
+    "activitynotyetviewablegothere": "Die Aktivität oder das Material kann bisher in der App nicht angezeigt werden. Tippen Sie auf die Taste, um die Website im Browser anzuzeigen.",
     "activitynotyetviewableinapp": "Wir arbeiten daran, die Aktivität {{$a}} zu unterstützen.",
     "activitynotyetviewableremoteaddon": "Für die Website ist ein Plugin installiert, das bisher nicht unterstützt wird.",
     "activitynotyetviewablesiteupgradeneeded": "Diese Website muss aktualisiert werden.",
@@ -7,6 +9,7 @@
     "askadmintosupport": "Wenden Sie sich an den Administrator der Website, um diese Aktivität mit der Moodle Mobile App verwenden zu können.",
     "confirmdeletemodulefiles": "Möchten Sie diese Dateien wirklich löschen?",
     "confirmdownload": "Möchten Sie wirklich {{size}} herunterladen?",
+    "confirmdownloadsection": "Möchten Sie wirklich {{size}} herunterladen?",
     "confirmdownloadunknownsize": "Die Datenmenge kann nicht berechnet werden. Möchten Sie wirklich herunterladen?",
     "confirmpartialdownloadsize": "Möchten Sie wirklich {{size}} herunterladen?",
     "contents": "Inhalte",
@@ -14,9 +17,11 @@
     "couldnotloadsections": "Die Abschnitte konnten nicht geladen werden. Versuchen Sie es später noch einmal.",
     "errordownloadingsection": "Fehler beim Herunterladen des Abschnitts",
     "errorgetmodule": "Fehler beim Laden von Moduldaten",
+    "gotothesite": "Zur Website",
     "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
-    "nocontentavailable": "Aktuell sind keine Inhalte verfügbar",
+    "nocontentavailable": "Momentan sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
     "showall": "Alles anzeigen",
-    "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
+    "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden.",
+    "whoops": "Whoops!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index 5882734e565..c23f6c16b54 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -1,4 +1,6 @@
 {
+    "activitynotyetviewable": "Δεν μπορείτε να δείτε αυτή τη δραστηριότητα στην εφαρμογή ακόμα.",
+    "activitynotyetviewablegothere": "Δεν μπορείτε να δείτε αυτή τη δραστηριότητα/πόρο στην εφαρμογή ακόμα, κάντε κλικ στο παρακάτω κουμπί για να την προσπελάσετε από το site.",
     "activitynotyetviewableinapp": "Εργαζόμαστε για την υποστήριξη της δραστηριότητας {{$a}} .",
     "activitynotyetviewableremoteaddon": "Ο οργανισμός σας εγκατέστησε ένα plugin που δεν υποστηρίζεται ακόμη.",
     "activitynotyetviewablesiteupgradeneeded": "Η πλατφόρμα Moodle του οργανισμού σας πρέπει να αναβαθμιστεί.",
@@ -6,6 +8,7 @@
     "askadmintosupport": "Επικοινωνήστε με το διαχειριστή του site για να πείτε ότι θέλετε να χρησιμοποιήσετε αυτή τη δραστηριότητα με την εφαρμογή του Moodle για κινητά.",
     "confirmdeletemodulefiles": "Είστε σίγουροι ότι θέλετε να διαγράψετε τα αρχεία αυτής της ενότητας;",
     "confirmdownload": "Πρόκειται να κατεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
+    "confirmdownloadsection": "Πρόκειται να κατεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "confirmdownloadunknownsize": "Δεν κατέστη δυνατό να υπολογιστεί το μέγεθος των αρχείων που θέλετε να κατεβάσετε. Είστε σίγουροι ότι θέλετε να τα κατεβάσετε;",
     "confirmpartialdownloadsize": "Πρόκειται να κατεβάσετε <strong>τουλάχιστον</strong> {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "contents": "Περιεχόμενα",
@@ -13,8 +16,10 @@
     "couldnotloadsections": "Δεν ήταν δυνατή η φόρτωση αυτής της ενότητας, δοκιμάστε ξανά αργότερα.",
     "errordownloadingsection": "Σφάλμα λήψης ενότητας",
     "errorgetmodule": "Σφάλμα κατά τη λήψη των δεδομένων της ενότητας.",
+    "gotothesite": "Πηγαίνετε στο site.",
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Προβολή όλων"
+    "showall": "Προβολή όλων",
+    "whoops": "Whoops!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index 1745ce4e20a..418a50edb14 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -1,5 +1,7 @@
 {
     "activitydisabled": "Su  organización ha deshabilitado esta actividad en la App mobile.",
+    "activitynotyetviewable": "Esta actividad aun no es visible en la App.",
+    "activitynotyetviewablegothere": "Esta actividad o recurso todavía no es visible en la app. Haga click en el botón inferior para acceder a ella desde el sitio.",
     "activitynotyetviewableinapp": "Nosotros estamos trabajando para soportar la actividad de {{$a}}.",
     "activitynotyetviewableremoteaddon": "Su organización instaló un plugin complemento de terceros que todavía no está soportada por la App.",
     "activitynotyetviewablesiteupgradeneeded": "La instalación Moodle de su organización necesita actualizarse.",
@@ -7,6 +9,7 @@
     "askadmintosupport": "Contacte al administrador del sitio y dígale que Usted quiere usar esta actividad junto con la App Moodle Mobile.",
     "confirmdeletemodulefiles": "¿Está Usted seguro de querer eliminar estos archivos del módulo?",
     "confirmdownload": "Usted está a punto de descargar {{size}}. ¿Está Usted seguro de querer continuar?",
+    "confirmdownloadsection": "Usted está a punto de descargar {{size}}. ¿Está seguro de querer continuar?",
     "confirmdownloadunknownsize": "No pudimos calcular el tamaño de la descarga. ¿Está Usted seguro de querer descargarla?",
     "confirmpartialdownloadsize": "Usted está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está Usted seguro de querer continuar?",
     "contents": "Contenidos",
@@ -14,9 +17,11 @@
     "couldnotloadsections": "No pudieron cargarse las secciones; por favor inténtelo nuevamente después.",
     "errordownloadingsection": "Error al descargar sección",
     "errorgetmodule": "Error al obtener datos del módulo.",
+    "gotothesite": "Ir al sitio",
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
     "showall": "Mostrar todo",
-    "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
+    "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo.",
+    "whoops": "¡Órale!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es.json b/www/core/components/course/lang/es.json
index 40087d97665..e0594271533 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -1,4 +1,6 @@
 {
+    "activitynotyetviewable": "Este tipo de actividad o recurso todavía no esta disponible para su visualización en la app.",
+    "activitynotyetviewablegothere": "Este tipo de actividad o recurso todavía no esta disponible para su visualización en la app, haga clic en el botón de abajo para acceder desde la web.",
     "activitynotyetviewableinapp": "Estamos trabajando para soportar la actividad de {{$a}}.",
     "activitynotyetviewableremoteaddon": "Esta actividad es un complemento de terceros que todavía no está soportada por la aplicación.",
     "activitynotyetviewablesiteupgradeneeded": "El sitio no está usando la versión más reciente de Moodle. Por favor, contacte al administrador del sitio.",
@@ -6,6 +8,7 @@
     "askadmintosupport": "Contacte al administrador del sitio e indíquele que desea poder usar esta actividad en la aplicación.",
     "confirmdeletemodulefiles": "¿Está seguro de querer eliminar estos archivos del módulo?",
     "confirmdownload": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
+    "confirmdownloadsection": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
     "confirmdownloadunknownsize": "No se puede calcular el tamaño de la descarga. ¿Está seguro que quiere descargarlo?",
     "confirmpartialdownloadsize": "Está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está seguro de querer continuar?",
     "contents": "Contenidos",
@@ -13,9 +16,11 @@
     "couldnotloadsections": "No se ha podido cargar las secciones, por favor inténtelo más tarde.",
     "errordownloadingsection": "Error durante la descarga de la sección.",
     "errorgetmodule": "Se ha producido un error recuperando los datos del módulo.",
+    "gotothesite": "Ir al sitio",
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "No hay contenido disponible en este momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
     "showall": "Mostrar todo",
-    "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo."
+    "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo.",
+    "whoops": "¡Vaya!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/eu.json b/www/core/components/course/lang/eu.json
index c42572550ec..f31d1d8038a 100644
--- a/www/core/components/course/lang/eu.json
+++ b/www/core/components/course/lang/eu.json
@@ -1,5 +1,7 @@
 {
     "activitydisabled": "Zure erakundeak jarduera hau mobile app-an desgaitu du.",
+    "activitynotyetviewable": "Jarduera hau oraindik ezin da app-ean ikusi.",
+    "activitynotyetviewablegothere": "Jarduera edo baliabide hau oraindik ezin da app-ean ikusi, sakatu beheko botoia gunearen bidez sartzeko.",
     "activitynotyetviewableinapp": "{{$a}} jarduera onartzeko lanean ari gara.",
     "activitynotyetviewableremoteaddon": "Zure erakundeak oraindik app-ean onartzen ez den gehigarri bat instalatuta dauka..",
     "activitynotyetviewablesiteupgradeneeded": "Zure erakundeko Moodle instalazioak eguneraketa bat behar du.",
@@ -7,6 +9,7 @@
     "askadmintosupport": "Jarri harremanetan zure guneko kudeatzailearekin eta esaiozu jarduera hau Moodle Mobile app-an erabili nahi duzula.",
     "confirmdeletemodulefiles": "Ziur zaude modulu honetako fitxategiak ezabatu nahi dituzula?",
     "confirmdownload": "{{size}} jaistear zaude. Ziur al zaude aurrera egin nahi duzula?",
+    "confirmdownloadsection": "{{size}} deskargatzera zoaz. Ziur zaude jarraitu nahi duzula?",
     "confirmdownloadunknownsize": "Ezin izan dugu deskargaren tamaina kalkulatu. Ziur zaude jaitsi nahi duzula?",
     "confirmpartialdownloadsize": "<strong>Gutxienez</strong> {{size}} jaistera zoaz. Ziur zaude jarraitu nahi duzula?",
     "contents": "Edukiak",
@@ -14,9 +17,11 @@
     "couldnotloadsections": "Ezin izan dira atalak kargatu, saiatu beranduago mesedez.",
     "errordownloadingsection": "Errorea atala jaistean.",
     "errorgetmodule": "Errorea moduluaren datuak eskuratzean.",
+    "gotothesite": "Joan gunera",
     "hiddenfromstudents": "Ezkutuan ikasleentzat",
     "nocontentavailable": "Ez dago edukirik eskuragarri momentu honetan.",
     "overriddennotice": "Jarduera honetako zure azken kalifikazioa eskuz egokitu da.",
     "showall": "Erakutsi denak",
-    "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu."
+    "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu.",
+    "whoops": "Ups!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index 57ee2b7a639..b9c6451b65e 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -1,5 +1,15 @@
 {
-    "contents": "محتوی",
+    "activitynotyetviewableinapp": "ما در حال کار بر روی پشتیبانی از فعالیت {{$a}} هستیم.",
+    "allsections": "تمام قسمت‌ها",
+    "confirmdeletemodulefiles": "آیا مطمئنید که می‌خواهید فایل‌های این ماژول را پاک کنید؟",
+    "confirmdownload": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
+    "confirmdownloadsection": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
+    "confirmdownloadunknownsize": "ما نتوانستیم حجم دریافت را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
+    "confirmpartialdownloadsize": "شما در آستانهٔ دریافت <strong>حداقل</strong> {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
+    "contents": "محتواها",
+    "couldnotloadsectioncontent": "محتوای قسمت نتوانست بارگیری شود. لطفا بعدا دوباره تلاش کنید.",
+    "couldnotloadsections": "قسمت‌ها نتوانستند بارگیری شوند. لطفا بعدا دوباره تلاش کنید.",
     "hiddenfromstudents": "پنهان از شاگردان",
-    "showall": "نمایش همه"
+    "showall": "نمایش همه",
+    "useactivityonbrowser": "البته همچنان می‌توانید با استفاده از مرورگر دستگاه خود، از آن استفاده کنید."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index fa5ca9f7fb7..3302324c74c 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -1,5 +1,7 @@
 {
     "activitydisabled": "Votre institution a désactivé cette activité dans l'App mobile.",
+    "activitynotyetviewable": "Cette activité n'est pas encore accessible via l'app.",
+    "activitynotyetviewablegothere": "Cette activité ou ressource n'est pas encore accessible via l'app ; cliquer sur le bouton ci-dessous pour y accéder sur la plateforme.",
     "activitynotyetviewableinapp": "L'activité {{$a}} sera bientôt supportée.",
     "activitynotyetviewableremoteaddon": "Votre institution a installé un plugin qui n'est pas encore supporté.",
     "activitynotyetviewablesiteupgradeneeded": "L'installation Moodle de votre institution doit être mise à jour.",
@@ -7,6 +9,7 @@
     "askadmintosupport": "Veuillez contacter l'administrateur de la plateforme et l'informer que vous désirez utiliser cette activité avec l'app mobile Moodle.",
     "confirmdeletemodulefiles": "Voulez-vous vraiment supprimer ces fichiers de module ?",
     "confirmdownload": "Vous allez télécharger {{size}}. Voulez-vous vraiment continuer ?",
+    "confirmdownloadsection": "Vous allez télécharger {{size}}. Voulez-vous vraiment continuer ?",
     "confirmdownloadunknownsize": "Il n'a pas été possible de calculer la taille du téléchargement. Voulez-vous vraiment effectuer le téléchargement ?",
     "confirmpartialdownloadsize": "Vous allez télécharger <strong>au moins</strong> {{size}}. Voulez-vous vraiment continuer ?",
     "contents": "Contenus",
@@ -14,9 +17,11 @@
     "couldnotloadsections": "Impossible de charger les sections. Veuillez essayer plus tard.",
     "errordownloadingsection": "Erreur lors du téléchargement de la section.",
     "errorgetmodule": "Erreur lors de l'obtention des données du module.",
+    "gotothesite": "Aller sur la plateforme",
     "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
     "showall": "Tout afficher",
-    "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
+    "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil.",
+    "whoops": "Oups !"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/he.json b/www/core/components/course/lang/he.json
index 1789a2e476e..2f067dc148f 100644
--- a/www/core/components/course/lang/he.json
+++ b/www/core/components/course/lang/he.json
@@ -1,10 +1,14 @@
 {
+    "activitynotyetviewable": "פעילות או משאב זה עדיין לא ניתנים לצפיה ביישומון.",
+    "activitynotyetviewablegothere": "פעילות או משאב זה עדיין לא ניתנים לצפיה ביישומון, יש להקליק על הכפתור למטה לגישה מהאתר.",
     "allsections": "כל יחידות ההוראה",
     "contents": "תוכן",
     "couldnotloadsectioncontent": "אין אפשרות לטעון ולהציג את תוכן יחידת ההוראה. יש לנסות שוב מאוחר יותר.",
     "couldnotloadsections": "אין אפשרות לטעון ולהציג את יחידות ההוראה, יש לנסות שוב מאוחר יותר.",
+    "gotothesite": "צפיה בעזרת האתר",
     "hiddenfromstudents": "מוסתר בפני סטודנטים",
     "nocontentavailable": "אין תוכן זמין כרגע.",
     "overriddennotice": "הציון הסופי שלך מפעילות זו הותאם ידנית.",
-    "showall": "הראה הכל"
+    "showall": "הראה הכל",
+    "whoops": "אוווווופס!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index 2f6968177c8..e4485843adb 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -1,13 +1,18 @@
 {
+    "activitynotyetviewable": "Questa attività o risorsa non è visualizzabile nell'app.",
+    "activitynotyetviewablegothere": "Questa attività o risorsa non è visualizzabile nell'app, fai click sul pulsante sotto per accedervi tramite browser.",
     "allsections": "Tutte le sezioni",
     "confirmdownload": "Stai per scaricare {{size}}. Vuoi continuare?",
+    "confirmdownloadsection": "Stai per scaricare {{size}}. Vuoi continuare?",
     "confirmdownloadunknownsize": "Non è stato possibile calcolare la dimensione del download. Vuoi scaricare lo stesso?",
     "contents": "Contenuti",
     "couldnotloadsectioncontent": "Non è stato possibile caricare il contenuto della sezione, per favore riprova più tardi.",
     "couldnotloadsections": "Non è stato possibile caricare le sezioni, per favore riprova più tardi.",
     "errordownloadingsection": "Si è verificato un errore durante lo scaricamento della sezione.",
+    "gotothesite": "Vai al sito",
     "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutto"
+    "showall": "Visualizza tutto",
+    "whoops": "Oops!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/lt.json b/www/core/components/course/lang/lt.json
index d348b5e7c7f..98f58437b05 100644
--- a/www/core/components/course/lang/lt.json
+++ b/www/core/components/course/lang/lt.json
@@ -1,4 +1,6 @@
 {
+    "activitynotyetviewable": "Programėlė šio veiksmo  kol kas neaktlieka.",
+    "activitynotyetviewablegothere": "Šios informacijos programėlėje šiuo metu peržiūrėti negalima, jeigu norite ją peržiūrėti svetainėje, paspauskite žemiau esantį mygtuką.",
     "activitynotyetviewableinapp": "Dirbame prie {{$a}} veiklos.",
     "activitynotyetviewableremoteaddon": "Jūsų įstaiga įdiegė papildinį, kuris dar nėra palaikomas.",
     "activitynotyetviewablesiteupgradeneeded": "Jūsų įstaigos Moodle versija turi būti atnaujinta.",
@@ -6,6 +8,7 @@
     "askadmintosupport": "Susisiekite su svetainės administratoriumi, jeigu norite naudoti šią veiklą Moodle mobiliojoje programėlėje.",
     "confirmdeletemodulefiles": "Ar tikrai norite ištrinti šiuos failus?",
     "confirmdownload": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
+    "confirmdownloadsection": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
     "confirmdownloadunknownsize": "Negalima apskaičiuoti failo, kurį norite atsisiųsti, dydžio. Ar tikrai norite atsisiųsti?",
     "confirmpartialdownloadsize": "Norite atsisiųsti <strong>mažiausiai</strong> {{size}}. Ar tikrai norite tęsti?",
     "contents": "Turiniai",
@@ -13,9 +16,11 @@
     "couldnotloadsections": "Negalima užkrauti pasirinkto turinio, prašome pamėginti vėliau.",
     "errordownloadingsection": "Klaida atsisiunčiant.",
     "errorgetmodule": "Klaida gaunant kurso duomenis.",
+    "gotothesite": "Eikite į svetainę",
     "hiddenfromstudents": "Paslėpta nuo besimokančiųjų",
     "nocontentavailable": "Turinys šiuo metu nepasiekiamas.",
     "overriddennotice": "Šios veiklos galutinis įvertis buvo koreguotas rankiniu būdu.",
     "showall": "Rodyti visus",
-    "useactivityonbrowser": "Galite naudoti savo naršyklėje."
+    "useactivityonbrowser": "Galite naudoti savo naršyklėje.",
+    "whoops": "Oi!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index 514559c815e..29874ac6803 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -1,4 +1,7 @@
 {
+    "activitydisabled": "Jouw organisatie heeft deze activiteit uitgeschakeld in de mobiele app.",
+    "activitynotyetviewable": "Deze activiteit of bron kan nog niet bekeken worden met deze app.",
+    "activitynotyetviewablegothere": "Deze activiteit of bron kan nog niet bekeken worden met deze app. Klik op onderstaande knop om het te bekijken op de site.",
     "activitynotyetviewableinapp": "We werken aan de ondersteuning van de activiteit {{$a}}.",
     "activitynotyetviewableremoteaddon": "Jouw organisatie heeft een plugin geïnstalleerd die nog niet ondersteund wordt.",
     "activitynotyetviewablesiteupgradeneeded": "De site gebruikt de niet laatste Moodle-versie en moet worden geüpdatet. Neem contact op met de site-beheerder.",
@@ -6,6 +9,7 @@
     "askadmintosupport": "Neem contact op met de sitebeheerder en geef aan dat je deze activiteit met de Moodle mobile app wilt gebruiken.",
     "confirmdeletemodulefiles": "Weet he zeker dat je deze modulebestanden wil verwijderen?",
     "confirmdownload": "Je gaat {{size}} downloaden. Weet je zeker dat je verder wil gaan?",
+    "confirmdownloadsection": "Je gaat {{size}} downloaden. Weet je zeker dat je verder wil gaan?",
     "confirmdownloadunknownsize": "We konden de grootte van de download niet berekenen. Weet je zeker dat je toch wil downloaden?",
     "confirmpartialdownloadsize": "Je staat op het punt om <strong>minstens</strong> {{size}} te downloaden. Weet je zeker dat je verder wil gaan?",
     "contents": "Inhoud",
@@ -13,9 +17,11 @@
     "couldnotloadsections": "Kon secties niet laden. Probeer later opnieuw",
     "errordownloadingsection": "Fout bij het downloaden van de sectie.",
     "errorgetmodule": "Fout bij het ophalen van modulegegevens.",
+    "gotothesite": "Ga naar de site",
     "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
     "showall": "Toon alle",
-    "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
+    "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken",
+    "whoops": "Whoops!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index 792d0ea5f83..fdf6834307a 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -1,4 +1,7 @@
 {
+    "activitydisabled": "Sua organização desativou essa atividade no aplicativo para dispositivos móveis.",
+    "activitynotyetviewable": "Essa atividade ainda não é visualizável nesse aplicativo.",
+    "activitynotyetviewablegothere": "Essa atividade ou recurso ainda não é visualizável nesse aplicativo, clique no botão abaixo para acessar isso pelo site.",
     "activitynotyetviewableinapp": "Estamos trabalhando para dar suporte a atividade {{$a}}.",
     "activitynotyetviewableremoteaddon": "Sua organização instalou um plugin que não é suportado ainda.",
     "activitynotyetviewablesiteupgradeneeded": "O Moodle de sua organização precisa ser atualizado.",
@@ -6,6 +9,7 @@
     "askadmintosupport": "Contate o administrador do site e diga que você deseja usar essa atividade no aplicativo Moodle Mobile.",
     "confirmdeletemodulefiles": "Você tem certeza que quer excluir esse modulo arquivos?",
     "confirmdownload": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
+    "confirmdownloadsection": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
     "confirmdownloadunknownsize": "Não fomos capazes de calcular o tamanho do download. Tem certeza de que deseja fazer o download?",
     "confirmpartialdownloadsize": "Você está prestes a baixar <strong>pelo menos</strong> {{size}}. Você tem certeza que quer continuar?",
     "contents": "Conteúdos",
@@ -13,9 +17,11 @@
     "couldnotloadsections": "Não foi possível carregar a seção, por favor tente mais tarde.",
     "errordownloadingsection": "Erro ao baixar seção.",
     "errorgetmodule": "Erro ao obter os dados do módulo.",
+    "gotothesite": "Ir para o site",
     "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
     "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente",
     "showall": "Mostrar todos",
-    "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
+    "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo",
+    "whoops": "Opa!!!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt.json b/www/core/components/course/lang/pt.json
index 7ac9f081fbd..803dab975fd 100644
--- a/www/core/components/course/lang/pt.json
+++ b/www/core/components/course/lang/pt.json
@@ -1,5 +1,7 @@
 {
     "activitydisabled": "A sua organização desativou esta atividade na aplicação para dispositivos móveis.",
+    "activitynotyetviewable": "Esta atividade ainda não é visível na aplicação.",
+    "activitynotyetviewablegothere": "Não é possível visualizar esta atividade ou recurso nesta aplicação, clique no botão abaixo para aceder aos conteúdos a partir do site.",
     "activitynotyetviewableinapp": "Estamos trabalhar no suporte para a atividade {{$a}}.",
     "activitynotyetviewableremoteaddon": "A sua organização instalou um módulo que ainda não é suportado.",
     "activitynotyetviewablesiteupgradeneeded": "A instalação do Moodle da sua organização precisa ser atualizada.",
@@ -7,6 +9,7 @@
     "askadmintosupport": "Entre em contacto com o administrador do site e diga-lhes que pretende usar essa atividade com a aplicação móvel Moodle.",
     "confirmdeletemodulefiles": "Tem certeza de que pretende apagar os ficheiros deste módulo?",
     "confirmdownload": "Está prestes a descarregar {{size}}. Tem a certeza que pretende continuar?",
+    "confirmdownloadsection": "Está prestes a descarregar {{size}}. Tem a certeza que pretende continuar?",
     "confirmdownloadunknownsize": "Não foi possível calcular o tamanho da transferência. Tem a certeza que pretende continuar?",
     "confirmpartialdownloadsize": "Está prestes a descarregar <strong> pelo menos </strong> {{size}}. Tem a certeza que pretende continuar?",
     "contents": "Conteúdos",
@@ -14,9 +17,11 @@
     "couldnotloadsections": "Não foi possível carregar as secções, por favor tente novamente mais tarde.",
     "errordownloadingsection": "Erro ao descarregar a secção.",
     "errorgetmodule": "Erro ao obter os dados do módulo.",
+    "gotothesite": "Ir para o site",
     "hiddenfromstudents": "Oculto para os alunos",
     "nocontentavailable": "Nenhum conteúdo disponível neste momento.",
     "overriddennotice": "A sua nota final nesta atividade foi alterada manualmente na pauta.",
     "showall": "Mostrar todos",
-    "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos."
+    "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos.",
+    "whoops": "Ops!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ro.json b/www/core/components/course/lang/ro.json
index 2069aa89421..b80f619a350 100644
--- a/www/core/components/course/lang/ro.json
+++ b/www/core/components/course/lang/ro.json
@@ -1,14 +1,19 @@
 {
+    "activitynotyetviewable": "Această activitate sau resursă nu este vizibilă în aplicație la acest moment.",
+    "activitynotyetviewablegothere": "Această activitate sau resursă nu este vizibilă în aplicație la acest moment, apăsați pe butonul de mai jos pentru a o accesa de pe site.",
     "allsections": "Toate secțiunile",
     "confirmdownload": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
+    "confirmdownloadsection": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
     "confirmdownloadunknownsize": "Nu putem calcula dimensiunea fișierului pe care doriți să îl descărcați. Sunteți sigur că doriți să descărcați?",
     "contents": "Conținut",
     "couldnotloadsectioncontent": "Nu se poate încărca conținutul acestei secțiuni, încercați mai târziu.",
     "couldnotloadsections": "Nu se pot încărca secțiunile, încercați mai târziu.",
     "errordownloadingsection": "A apărut o eroare la descărcarea secțiunii.",
     "errorgetmodule": "A apărut o eroare la preluarea modului de date.",
+    "gotothesite": "Mergeți pe site",
     "hiddenfromstudents": "Ascuns de cursanţi",
     "nocontentavailable": "Pentru moment nu există conținut.",
     "overriddennotice": "Nota finală obţinută de dumneavoastră pentru această activitate a fost ajustată manual.",
-    "showall": "Arată tot"
+    "showall": "Arată tot",
+    "whoops": "Ops!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index 6a0a1c3f43a..909597130f4 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -1,10 +1,14 @@
 {
+    "activitynotyetviewable": "Этот активный элемент или ресурс не просматривается в приложении",
+    "activitynotyetviewablegothere": "Этот активный элемент или ресурс не просматривается в приложении. Чтобы получить доступ на сайте нажмите на кнопку внизу.",
     "allsections": "Все разделы",
     "contents": "Содержание",
     "couldnotloadsectioncontent": "Не удалось загрузить содержимое раздела. Повторите попытку позже.",
     "couldnotloadsections": "Не удалось загрузить разделы, повторите попытку позже",
+    "gotothesite": "Зайти на сайт",
     "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Показать все"
+    "showall": "Показать все",
+    "whoops": "Ой!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index 0063575e970..ddbb9339989 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -1,14 +1,19 @@
 {
+    "activitynotyetviewable": "Denna aktivitet eller resurs kan ännu inte visas i appen.",
+    "activitynotyetviewablegothere": "Denna aktivitet eller resurs kan ännu inte visas i appen, klicka på knappen nedan för att komma åt den via ordinarie webbsidan",
     "allsections": "Alla sektioner",
     "confirmdownload": "Du är på väg att ladda ner {{size}}. Är du säker att du vill fortsätta?",
+    "confirmdownloadsection": "Du är på väg att ladda ner {{size}}. Är du säker att du vill fortsätta?",
     "confirmdownloadunknownsize": "Det gick inte att beräkna storleken på nedladdningen . Det gick inte att beräkna storleken på nedladdningen . Är du säker att du vill fortsätta och ladda ner?",
     "contents": "Innehåll",
     "couldnotloadsectioncontent": "Det gick inte att läsa sektionens innehåll. Vänligen försök igen senare.",
     "couldnotloadsections": "Det gick inte att läsa sektionen. Vänligen försök igen senare.",
     "errordownloadingsection": "Fel vid nedladdning av sektion",
     "errorgetmodule": "Fel vid hämtning av data",
+    "gotothesite": "Gå till webbplatsen",
     "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla"
+    "showall": "Visa alla",
+    "whoops": "Hoppsan!"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-tw.json b/www/core/components/course/lang/zh-tw.json
index c9c97c2ef45..e71584065fe 100644
--- a/www/core/components/course/lang/zh-tw.json
+++ b/www/core/components/course/lang/zh-tw.json
@@ -1,4 +1,6 @@
 {
+    "activitynotyetviewable": "此應用程式尚未檢視這項活動.",
+    "activitynotyetviewablegothere": "此應用程式尚未檢視這項活動或資源, 請按底下的按鈕從網站存取.",
     "activitynotyetviewableinapp": "我們正在努力支援{{$ a}}活動.",
     "activitynotyetviewableremoteaddon": "您的組織安裝了尚未支援的外掛",
     "activitynotyetviewablesiteupgradeneeded": "您的組織的Moodle安裝需要更新.",
@@ -6,6 +8,7 @@
     "askadmintosupport": "請與網站管理員聯繫, 告知他們您要使用Moodle Mobile應用程式使用此活動.",
     "confirmdeletemodulefiles": "您確定要刪除此模組檔案嗎?",
     "confirmdownload": "您即將下載{{size}}. 您確定您要繼續嗎?",
+    "confirmdownloadsection": "您即將下載{{size}}. 您確定您要繼續嗎?",
     "confirmdownloadunknownsize": "我們無法計算下載的容量. 您確定要下載嗎?",
     "confirmpartialdownloadsize": "您即將下載<strong>至少</ strong> {{size}}. 您確定您要繼續嗎?",
     "contents": "內容",
@@ -13,9 +16,11 @@
     "couldnotloadsections": "無法載入區塊, 請稍後再試.",
     "errordownloadingsection": "載入區塊時發生錯誤",
     "errorgetmodule": "取得模組資料時出現錯誤",
+    "gotothesite": "連到網站",
     "hiddenfromstudents": "對學生隱藏",
     "nocontentavailable": "目前無內容可使用",
     "overriddennotice": "您在這活動的最後成績是手動調整的。",
     "showall": "顯示全部",
-    "useactivityonbrowser": "你可以以瀏覽器一直使用"
+    "useactivityonbrowser": "你可以以瀏覽器一直使用",
+    "whoops": "糟糕!"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 23289e84fb8..43ca3125ec4 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -1,10 +1,12 @@
 {
     "allowguests": "Tento kurz je otevřen i pro hosty",
     "availablecourses": "Dostupné kurzy",
+    "cannotretrievemorecategories": "Kategorie hlubší než úroveň {{$a}} nelze načíst.",
     "categories": "Kategorie kurzů",
     "confirmselfenrol": "Jste si jisti, že chcete zapsat se do tohoto kurzu?",
     "courses": "Kurzy",
     "enrolme": "Zapsat se",
+    "errorloadcategories": "Při načítání kategorií došlo k chybě.",
     "errorloadcourses": "Při načítání kurzů došlo k chybě.",
     "errorsearching": "Při vyhledávání došlo k chybě.",
     "errorselfenrol": "Při zápisu sebe sama došlo k chybě.",
diff --git a/www/core/components/courses/lang/fa.json b/www/core/components/courses/lang/fa.json
index c47d3e5854d..7843a006162 100644
--- a/www/core/components/courses/lang/fa.json
+++ b/www/core/components/courses/lang/fa.json
@@ -2,8 +2,11 @@
     "allowguests": "ورود کاربران مهمان به این درس مجاز است",
     "availablecourses": "درس‌های موجود",
     "categories": "طبقه‌های درسی",
+    "confirmselfenrol": "آیا مطمئنید که می‌خواهید خود را در این درس ثبت‌نام کنید؟",
     "courses": "درس‌ها",
     "enrolme": "من را ثیت نام کن",
+    "errorloadcourses": "در هنگام بارگیری درس‌ها خطایی رخ داد.",
+    "filtermycourses": "پالایش درس‌های من",
     "frontpage": "صفحهٔ اول",
     "mycourses": "درسهای من",
     "nocourses": "هیچ درسی برای نمایش وجود ندارد",
diff --git a/www/core/components/courses/lang/nl.json b/www/core/components/courses/lang/nl.json
index 654cca51ff3..60fc63d43fe 100644
--- a/www/core/components/courses/lang/nl.json
+++ b/www/core/components/courses/lang/nl.json
@@ -1,10 +1,12 @@
 {
     "allowguests": "In deze cursus zijn gasten toegestaan",
     "availablecourses": "Beschikbare cursussen",
+    "cannotretrievemorecategories": "Categorieën dieper dan niveau {{$a}} kunnen niet opgehaald worden.",
     "categories": "Cursuscategorieën",
     "confirmselfenrol": "Weet je zeker dat je je wil aanmelden in deze cursus?",
     "courses": "Cursussen",
     "enrolme": "Meld me aan",
+    "errorloadcategories": "Er is een fout opgetreden bij het ophalen van categorieën",
     "errorloadcourses": "Er is een fout opgetreden tijdens het laden van de cursussen.",
     "errorsearching": "Er is een fout opgetreden tijdens het zoeken.",
     "errorselfenrol": "Er is een fout opgetreden tijdens het zelf aanmelden.",
diff --git a/www/core/components/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index 9a9a5738733..2090e867bb9 100644
--- a/www/core/components/courses/lang/pt-br.json
+++ b/www/core/components/courses/lang/pt-br.json
@@ -1,10 +1,12 @@
 {
     "allowguests": "Visitantes podem entrar neste curso",
     "availablecourses": "Cursos disponíveis",
+    "cannotretrievemorecategories": "Categorias mais profundas que o nível {{$a}} não podem ser recuperadas.",
     "categories": "Categorias de Cursos",
     "confirmselfenrol": "Tem certeza de que deseja inscrever-se neste curso?",
     "courses": "Cursos",
     "enrolme": "Inscreva-me",
+    "errorloadcategories": "Ocorreu um erro ao carregar categorias.",
     "errorloadcourses": "Um erro ocorreu enquanto os cursos estavam sendo carregados.",
     "errorsearching": "Ocorreu um erro durante a pesquisa.",
     "errorselfenrol": "Ocorreu um erro ao auto registo.",
diff --git a/www/core/components/fileuploader/lang/fa.json b/www/core/components/fileuploader/lang/fa.json
index d6e44e022e1..02f6d7c8b77 100644
--- a/www/core/components/fileuploader/lang/fa.json
+++ b/www/core/components/fileuploader/lang/fa.json
@@ -1,4 +1,6 @@
 {
+    "confirmuploadfile": "شما در آستانهٔ ارسال {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
+    "confirmuploadunknownsize": "ما نتوانستیم حجم ارسال را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "errorcapturingaudio": "خطا در ضبط صدا",
     "errorcapturingvideo": "خطا در ضبط ویدئو",
     "errorreadingfile": "خطا در خواندن فایل «{{$a}}»",
diff --git a/www/core/components/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index a54abb30853..e27704956e5 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -1,11 +1,11 @@
 {
     "addfiletext": "添加文件",
     "confirmuploadfile": "Chcesz wysłać plik {$a}. Czy na pewno chcesz kontynuować?",
-    "errorcapturingaudio": "捕捉音频时出错",
-    "errorcapturingvideo": "捕捉视频时出错",
+    "errorcapturingaudio": "捕捉音频时出错。",
+    "errorcapturingvideo": "捕捉视频时出错。",
     "errorreadingfile": "在读取文件“{$a}”时发生错误",
     "file": "文件",
-    "fileuploaded": "文件已上传",
+    "fileuploaded": "文件已成功上传。",
     "maxbytesfile": "这个文件 {{$a.file}} 太大了。你可以上传的文件最大容量是 {{$a.size}}。",
     "readingfile": "Odczytywanie pliku",
     "uploadafile": "上传一个文件",
diff --git a/www/core/components/login/lang/ca.json b/www/core/components/login/lang/ca.json
index c342c379d01..253e1337f13 100644
--- a/www/core/components/login/lang/ca.json
+++ b/www/core/components/login/lang/ca.json
@@ -2,6 +2,7 @@
     "auth_email": "Autenticació basada en el correu electrònic",
     "authenticating": "Us esteu autenticant",
     "cancel": "Cancel·la",
+    "cannotdownloadfiles": "La baixada de fitxers està desactivada en el servei mòbil de Moodle, l'aplicació no pot funcionar amb aquest paràmetre desactivat. Contacteu amb l'administrador del lloc.",
     "checksiteversion": "Comproveu que el vostre lloc utilitza Moodle 2.4 o superior.",
     "confirmdeletesite": "Esteu segur que voleu eliminar el lloc {{sitename}}?",
     "connect": "Connecta",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Demaneu a l'administrador que comprovi el problema següent: {{$a}}",
     "createaccount": "Crea el meu compte",
     "createuserandpass": "Trieu un nom d'usuari i una contrasenya",
+    "credentials": "Credencials",
     "credentialsdescription": "Introduïu el vostre nom d'usuari i contrasenya per iniciar sessió.",
     "emailconfirmsent": "<p>S'ha enviat un correu a la vostra adreça <b>{{$a}}</b></p>\n<p>Conté instruccions senzilles per completar el registre.</p>\n<p>Si seguiu tenint problemes, contacteu amb l'administrador del lloc.</p>",
     "emailnotmatch": "Les adreces de correu electrònic no coincideixen",
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index 9d8f6552859..bd8f051b5cc 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -2,6 +2,7 @@
     "auth_email": "Registrace na základě e-mailu",
     "authenticating": "Autentizace",
     "cancel": "Zrušit",
+    "cannotdownloadfiles": "Stahování souborů je vypnuto v mobilních službách, aplikace nebude fungovat s nastavením zakázu. Prosím, obraťte se na správce webu.",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
     "connect": "Připojit!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Požádejte správce, prosím, aby zkontroloval následující problém: {{$a}}",
     "createaccount": "Vytvořit můj nový účet",
     "createuserandpass": "Vytvořit nové uživatelské jméno a heslo pro přihlášení",
+    "credentials": "Identifikační údaje",
     "credentialsdescription": "Pro přihlášení uveďte své uživatelské jméno a heslo.",
     "emailconfirmsent": "<p>E-mail by měl být zaslán na Vaši adresu na <b>{{$a}}</b></p><p>Obsahuje jednoduché instrukce pro dokončení registrace. </p><p>Pokud budou potíže pokračovat, obraťte se na správce webu. </p>",
     "emailnotmatch": "E-maily se neshodují",
@@ -32,6 +34,7 @@
     "invalidvaluemax": "Maximální hodnota je {{$a}}",
     "invalidvaluemin": "Minimální hodnota je {{$a}}",
     "localmobileunexpectedresponse": "Kontrola rozšířených vlastností Moodle Mobile vrátil neočekávanou odezvu, budete ověřen pomocí standardních služeb mobilu .",
+    "loggedoutssodescription": "Musíte se znovu autentizovat. Musíte se přihlásit na stránky v okně prohlížeče.",
     "login": "Přihlásit se",
     "loginbutton": "Přihlásit se",
     "logininsiterequired": "Váš Moodlu vás nutí k přihlášení pomocí prohlížeče. Nová instance prohlížeče otevře přesměrování na vaše stránky Moodle.",
@@ -62,6 +65,7 @@
     "signupplugindisabled": "{{$a}} není povoleno.",
     "siteaddress": "Adresa stránky",
     "siteinmaintenance": "Váš web je v režimu údržby",
+    "sitepolicynotagreederror": "Zásady bezpečnosti nebyly odsouhlaseny.",
     "siteurl": "URL adresa stránky",
     "siteurlrequired": "Je požadováno URL webu, tj. <i> http://www.yourmoodlesite.abc nebo https://www.yourmoodlesite.efg </ i>",
     "startsignup": "Začněte nyní vytvořením nového účtu!",
diff --git a/www/core/components/login/lang/da.json b/www/core/components/login/lang/da.json
index d822d5653eb..2b9c4745b9c 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -1,11 +1,13 @@
 {
     "authenticating": "Godkender",
     "cancel": "Afbryd",
+    "cannotdownloadfiles": "Download af filer er deaktiveret i din Moodleservice. Appen virker ikke med denne indstilling deaktiveret. Kontakt din administrator.",
     "confirmdeletesite": "Er du sikker på at du ønsker at slette websiden {{sitename}}?",
     "connect": "Tilslut!",
     "connecttomoodle": "Tilslut til Moodle",
     "createaccount": "Opret ny profil",
     "createuserandpass": "Vælg  brugernavn og adgangskode",
+    "credentials": "Referencer",
     "credentialsdescription": "Skriv dit brugernavn og adgangskode for at logge på",
     "emailconfirmsent": "<p>En e-mail skulle være sendt til din adresse <b>{{$a}}</b></p> <p>Den indeholder anvisninger på, hvordan du fuldfører din registrering.</p> <p>Hvis du stadig har problemer, så kontakt webadministratoren.</p>",
     "enterthewordsabove": "Skriv ordene herover",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index e88b1eeed67..005d568ca01 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -2,6 +2,7 @@
     "auth_email": "E-Mail-Registrierung",
     "authenticating": "Authentifizieren ...",
     "cancel": "Abbrechen",
+    "cannotdownloadfiles": "Das Herunterladen von Dateien ist für den mobilen Webservice deaktiviert. Diese Option ist aber für die App unbedingt notwendig. Wenden Sie sich an den Administrator.",
     "checksiteversion": "Prüfen Sie, ob Ihre Website mindestens Moodle 2.4 verwendet.",
     "confirmdeletesite": "Möchten Sie '{{sitename}}' wirklich aus der Liste löschen?",
     "connect": "Verbinden",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Wenden Sie sich an den Administrator der Website, um folgendes Problem prüfen zu lassen: {{$a}}",
     "createaccount": "Zugang anlegen (Registrierung)",
     "createuserandpass": "Wählen Sie Ihren Anmeldenamen und Ihr Kennwort",
+    "credentials": "Bewertungen",
     "credentialsdescription": "Geben Sie den Anmeldenamen und das Kennwort ein. ",
     "emailconfirmsent": "<p>In Kürze wird eine E-Mail an <b>{{$a}}</b> gesendet.</p><p>Sie finden eine einfache Anleitung, wie Sie die Registrierung abschließen. Bei Schwierigkeiten wenden Sie sich an den Administrator der Website.</p>",
     "emailnotmatch": "Die E-Mail-Adressen stimmen nicht überein.",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index aa48e107bbb..a0eae4494d9 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -2,6 +2,7 @@
     "auth_email": "Email-based αυτο-εγγραφή",
     "authenticating": "Έλεγχος ταυτότητας",
     "cancel": "Ακύρωση",
+    "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο στη Mobile υπηρεσία, η εφαρμογή δεν μπορεί να λειτουργήσει με αυτή τη ρύθμιση απενεργοποιημένη. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
     "checksiteversion": "Ελέγξτε ποια έκδοση Moodle χρησιμοποιεί το site, Moodle 2.4 ή μετέπειτα έκδοση.",
     "confirmdeletesite": "Είστε σίγουροι ότι θέλετε να διαγράψετε το site {{sitename}};",
     "connect": "Σύνδεση!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Ζητήστε από το διαχειριστή του site να ελέγξει το ζήτημα: {{$a}}",
     "createaccount": "Δημιουργία του λογαριασμού μου",
     "createuserandpass": "Δημιουργία ενός νέου ονόματος χρήστη και κωδικού πρόσβασης για είσοδο στον δικτυακό τόπο",
+    "credentials": "Credentials",
     "credentialsdescription": "Δώστε το όνομα χρήστη και τον κωδικό πρόσβασής σας για να συνδεθείτε.",
     "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index c8f3d28744a..4a73347b2db 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -2,6 +2,7 @@
     "auth_email": "Auto-registro basado en Email",
     "authenticating": "Autenticando",
     "cancel": "Cancelar",
+    "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile, la app nop puede trabajar con esta configuración deshbilitada. Por favor contacte al administrador de su sitio.",
     "checksiteversion": "Revisar que su sitio usa Moodle 2.4 o más reciente.",
     "confirmdeletesite": "¿Está Usted seguro de querer eliminar el sitio {{sitename}}?",
     "connect": "¡Conectar!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear mi cuenta nueva",
     "createuserandpass": "Elegir su nombre_de_usuario y contraseña",
+    "credentials": "Credenciales",
     "credentialsdescription": "Por favor proporcione su nombre_de_usuario y contraseña para ingresar.",
     "emailconfirmsent": "<p>Debería de haberse enviado un Email a su dirección en <b>{{$a}}</b></p><p>El Email contiene instrucciones sencillas para completar su registro.</p><p>Si continúa teniendo dificultades, contacte al administrador del sitio.</p>",
     "emailnotmatch": "No coinciden los Emails",
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index eb6bb47b216..8cf8466827a 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -2,6 +2,7 @@
     "auth_email": "Auto-registro basado en e-mail.",
     "authenticating": "Autenticando",
     "cancel": "Cancelar",
+    "cannotdownloadfiles": "La descarga de archivos está desactivada en el servicio móvil de Moodle, la aplicación no puede funcionar con este parámetro desactivado. Por favor, contacte con el administrador del sitio.",
     "checksiteversion": "Comprueba que tu sitio utiliza Moodle 2.4 o superior.",
     "confirmdeletesite": "¿Está seguro de que quiere eliminar el sitio {{sitename}}?",
     "connect": "Conectar",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear cuenta",
     "createuserandpass": "Crear un nuevo usuario y contraseña para acceder al sistema",
+    "credentials": "Credenciales",
     "credentialsdescription": "Introduzca su nombre se usuario y contraseña para entrar",
     "emailconfirmsent": "<p>Se ha enviado un email a su dirección <b>{{$a}}</b></p><p>Contiene instrucciones para completar el proceso de registro.</p><p>Si continúa teniendo algún problema, contacte con el administrador de su sitio.</p>",
     "emailnotmatch": "Las direcciones de correo no coinciden.",
diff --git a/www/core/components/login/lang/eu.json b/www/core/components/login/lang/eu.json
index de8523c2a50..7b129c08738 100644
--- a/www/core/components/login/lang/eu.json
+++ b/www/core/components/login/lang/eu.json
@@ -2,6 +2,7 @@
     "auth_email": "E-postaren bidezko autentifikazioa",
     "authenticating": "Egiaztatzen",
     "cancel": "Utzi",
+    "cannotdownloadfiles": "Fitxategiak jaistea ezgaituta dago zure Mobile zerbitzuan, app-ak ezin du ezarpen honekin funtzionatu. Mesedez zure gune kudeatzailean harremanetan jarri zaitez.",
     "checksiteversion": "Egiaztatu zure Moodle guneak 2.4 bertsioa edo aurreragokoa erabiltzen duela.",
     "confirmdeletesite": "Ziur zaude {{sitename}} gunea ezabatu nahi duzula?",
     "connect": "Konektatu!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Mesedez, eskatu zure kudeatzaileari hurrengo arazoa ikuskatu dezala: {{$a}}",
     "createaccount": "Nire kontu berria sortu",
     "createuserandpass": "Aukeratu zure erabiltzaile-izena eta pasahitza",
+    "credentials": "Egiaztagiriak",
     "credentialsdescription": "Mesedez saioa hasteko zure sartu erabiltzaile eta pasahitza.",
     "emailconfirmsent": "<p>Zure <b>{{$a}}</b> helbidera mezu bat bidali da.</p><p>Zure erregistroa amaitzeko argibide erraz batzuk ditu.</p><p>Arazorik baduzu, jarri harremanetan kudeatzailearekin.</p>",
     "emailnotmatch": "E-posta helbideak ez datoz bat",
diff --git a/www/core/components/login/lang/fa.json b/www/core/components/login/lang/fa.json
index 38dd870a125..ff8e4c89e54 100644
--- a/www/core/components/login/lang/fa.json
+++ b/www/core/components/login/lang/fa.json
@@ -1,7 +1,9 @@
 {
-    "authenticating": "بررسی مجوز",
+    "authenticating": "در حال شناسایی",
     "cancel": "انصراف",
+    "confirmdeletesite": "آیا مطمئن هستید که می‌خواهید سایت {{sitename}} را پاک کنید؟",
     "connect": "اتصال",
+    "connecttomoodle": "اتصال به مودل",
     "createaccount": "ایجاد حساب کاربری من",
     "createuserandpass": "نام کاربری و رمز عبور خود را انتخاب کنید",
     "emailconfirmsent": "<p>باید نامه‌ای به آدرس شما در <b>{{$a}}</b> فرستاده شده باشد</p>\n   <p>این نامه شامل دستورالعمل‌های ساده‌ای برای تکمیل عضویت شما است.</p>\n   <p>در صورت تداوم مواجهه با مشکل، با مدیر سایت تماس بگیرید.</p>",
@@ -9,7 +11,7 @@
     "firsttime": "برای اولین بار به این صفحه آمده‌اید؟",
     "getanothercaptcha": "دریافت یک کپچای دیگر",
     "help": "راهنما",
-    "helpmelogin": "<p>چندین هزار سایت مودل در دنیا وجود دارد. این برنامه فقط می‌تواند به آن مودل‌هایی متصل شود که صراحتا دسترسی «برنامه موبایل» را فعال کرده‌باشند.</p><p>اگر نمی‌توانید به سایت مودل خود وصل شوید، باید با مدیر مودل سایتی که مورد نظرتان است تماس بگیرید و بخواهید که <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a> را مطالعه کنند.</p>\n<p>برای آزمایش برنامه با استفاده از یک سایت آزمایشی، در قسمت مربوط به <i>آدرس سایت</i> عبارت <i>teacher</i> یا <i>student</i> را وارد کرده و بر روی دکمه <b>اضافه‌کردن</b> کلیک کنید.</p>\n<p></p>",
+    "helpmelogin": "<p>چندین هزار سایت مودل در دنیا وجود دارد. این برنامه فقط می‌تواند به آن مودل‌هایی متصل شود که صراحتا دسترسی «برنامه موبایل» را فعال کرده‌باشند.</p><p>اگر نمی‌توانید به سایت مودل خود وصل شوید، باید با مدیر مودل آن سایت تماس بگیرید و بخواهید که <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a> را مطالعه کنند.</p>\n<p>برای آزمایش برنامه با استفاده از یک سایت آزمایشی، در قسمت مربوط به <i>آدرس سایت</i> عبارت <i>teacher</i> یا <i>student</i> را وارد کرده و بر روی دکمه <b>اتصال</b> کلیک کنید.</p>",
     "instructions": "دستورالعمل",
     "invalidaccount": "لطفا اطلاعات ورودخود را بررسی نمایید",
     "invalidemail": "آدرس پست الکترونیک نامعتبر",
@@ -33,6 +35,7 @@
     "potentialidps": "ورود با استفاده از حساب شما روی:",
     "security_question": "سؤال امنیتی",
     "selectacountry": "انتخاب کشور",
+    "siteaddress": "آدرس سایت",
     "siteinmaintenance": "سایت شما در حالت نگهداشت می باشد",
     "siteurl": "نشانی سایت",
     "siteurlrequired": "نشانی سایت لازم است. مثال: <i>http://www.yourmoodlesite.abc یا https://www.yourmoodlesite.efg</i>",
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index ffc2ad0f422..5879ba75bab 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -2,6 +2,7 @@
     "auth_email": "Auto-enregistrement par courriel",
     "authenticating": "Authentification",
     "cancel": "Annuler",
+    "cannotdownloadfiles": "Le téléchargement des fichiers est désactivé sur votre Moodle et l'app ne peut pas fonctionner si ce réglage est désactivé. Veuillez contacter l'administrateur de la plateforme.",
     "checksiteversion": "Veuillez vérifier que votre site utilise Moodle 2.4 ou une version ultérieure.",
     "confirmdeletesite": "Voulez-vous vraiment supprimer la plateforme {{sitename}} ?",
     "connect": "Connecter !",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Veuillez demander à l'administrateur de la plateforme de vérifier l'élément suivant : {{$a}}",
     "createaccount": "Créer mon compte",
     "createuserandpass": "Créer un compte",
+    "credentials": "Données de connexion",
     "credentialsdescription": "Veuillez fournir votre nom d'utilisateur et votre mot de passe pour vous connecter.",
     "emailconfirmsent": "<p>Un message vous a été envoyé par courriel à l'adresse <b>{{$a}}</b></p><p>Il contient des instructions vous permettant de terminer votre enregistrement.</p><p>En cas de difficulté, viellez contacter l'administrateur de la plateforme.</p>",
     "emailnotmatch": "Les adresses de courriel ne correspondent pas",
diff --git a/www/core/components/login/lang/he.json b/www/core/components/login/lang/he.json
index 087bf0aca8c..0a9969ee7c7 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -1,6 +1,7 @@
 {
     "authenticating": "מאמת נתונים",
     "cancel": "ביטול",
+    "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת בשירותי הנייד שלך, האפליקציה אינה יכולה לעבוד במצב זה. אנא פנה למנהל האתר.",
     "confirmdeletesite": "האם את/ה בטוח/ה שברצונך למחוק את האתר {{sitename}}?",
     "connect": "התחברות!",
     "connecttomoodle": "התחברות למוודל",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index 2fb9af78281..bc646497fc2 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -1,12 +1,14 @@
 {
     "authenticating": "Autenticazione in corso",
     "cancel": "Annulla",
+    "cannotdownloadfiles": "Lo scaricamento dei file è disabilitato nel servizio Mobile. l'app non può funzionare con questa impostazione disabilitata, per favore contatta l'amministratore dle sito.",
     "confirmdeletesite": "Sei sicuro di eliminare il sito {{sitename}}?",
     "connect": "Collegati!",
     "connecttomoodle": "Collegati a Moodle",
     "createaccount": "Crea il mio nuovo account",
     "createuserandpass": "Scegli username e password",
-    "credentialsdescription": "Per faovre inserisci username e password per l'autenticazione",
+    "credentials": "Credenziali",
+    "credentialsdescription": "Per favore inserisci username e password per l'autenticazione",
     "emailconfirmsent": "<p>Una email è stata inviata al tuo indirizzo <b>{{$a}}</b></p>\n<p>Contiene semplici istruzioni per completare la tua registrazione.</p>\n<p>Se hai qualche difficoltà contatta l'amministratore del sito.</p>",
     "enterthewordsabove": "Inserisci le parole sovrastanti",
     "erroraccesscontrolalloworigin": "La chiamata Cross-Origin che stai effettuando è stata rifiutata. Per ulteriori informazioni: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/lt.json b/www/core/components/login/lang/lt.json
index e76a57bd250..9329ebf2aac 100644
--- a/www/core/components/login/lang/lt.json
+++ b/www/core/components/login/lang/lt.json
@@ -2,6 +2,7 @@
     "auth_email": "Savarankiška registracija el. paštu",
     "authenticating": "Autentifikuojama",
     "cancel": "Atšaukti",
+    "cannotdownloadfiles": "Negalima atsisiųsti failo į Jūsų mobilųjį įrenginį, programėlė negali veikti be šių nustatymų. Prašome susisiekti su svetainės administratoriumi.",
     "checksiteversion": "Patikrintkite, ar svetainė naudoja Moodle 2.4. arba vėlesnę versiją.",
     "confirmdeletesite": "Ar tikrai norite ištrinti svetainę {{sitename}}?",
     "connect": "Prisijungta!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Dėl šių klausimų prašome susisiekti su administratoriumi: {{$a}}",
     "createaccount": "Kurti naują mano paskyrą",
     "createuserandpass": "Pasirinkite savo naudotojo vardą ir slaptažodį",
+    "credentials": "Įgaliojimai",
     "credentialsdescription": "Prisijungti naudojant vartotojo vardą ir slaptažodį.",
     "emailconfirmsent": "<p>Informacija išsiųsta Jūsų nurodytu adresu <b>{{$a}}</b></p><p>Tai padės sėkmingai užbaigti registraciją.</p><p>Jeigu nepavyksta, susisiekite su svetainės administratoriumi.</p>",
     "emailnotmatch": "El. paštas nesutampa",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index 9258b3371cc..33c44238ede 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -2,6 +2,7 @@
     "auth_email": "E-mail zelfregistratie",
     "authenticating": "Authenticeren",
     "cancel": "Annuleer",
+    "cannotdownloadfiles": "Het downloaden van bestanden is uitgeschakeld in je mobiele service. De app kan niet werken met deze instelling uitgeschakeld. Contacteer je Moodle sitebeheerder.",
     "checksiteversion": "Controleer of je site minstens Moodle 2.4 of nieuwe gebruikt.",
     "confirmdeletesite": "Weet je zeker dat je de site {{sitename}} wil verwijderen?",
     "connect": "Verbinden!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Vraag aan je site-beheerder om volgend probleem te onderzoeken: {{$a}}",
     "createaccount": "Maak mijn nieuwe account aan",
     "createuserandpass": "Kies een gebruikersnaam en wachtwoord",
+    "credentials": "Accountgegevens",
     "credentialsdescription": "Geef je gebruikersnaam en wachtwoord op om je aan te melden",
     "emailconfirmsent": "<p>Er zou een e-mail gestuurd moeten zijn naar jouw adres <b>{{$a}}</b></p><p>Het bericht bevat eenvoudige instructies om je registratie te voltooien.</p><p>Als je problemen blijft ondervinden, neem dan contact op met de sitebeheerder.</p>",
     "emailnotmatch": "E-mailadressen komen niet overeen",
@@ -32,6 +34,7 @@
     "invalidvaluemax": "De maximum waarde is {{$a}}",
     "invalidvaluemin": "De minimum waard eis {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobile Additional Features Check gaf een onverwacht antwoord. Je zult aanmelden via de standaard Mobile service.",
+    "loggedoutssodescription": "Je moet opnieuw aanmelden. Je moet aanmelden met een browservenster.",
     "login": "Login",
     "loginbutton": "Inloggen",
     "logininsiterequired": "Je dient via een browser in te loggen op je Moodle site",
@@ -62,6 +65,7 @@
     "signupplugindisabled": "{{$a}} is niet geactiveerd",
     "siteaddress": "Site-adres",
     "siteinmaintenance": "Je Moodle site staat in onderhoudsmodus",
+    "sitepolicynotagreederror": "Site-beleid niet goedgekeurd.",
     "siteurl": "Site URL",
     "siteurlrequired": "De site URL is vereist, bijvoorbeeld <i>http://www.jouwmoodlesite.abc of https://www.jouwmoodlesite.efg</i>",
     "startsignup": "Nieuw account maken",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index 6139f81b2af..657bba65bcf 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -2,6 +2,7 @@
     "auth_email": "Auto-registro por e-mail",
     "authenticating": "Autenticação",
     "cancel": "Cancelar",
+    "cannotdownloadfiles": "O download de arquivos está desabilitado em seu serviço Mobile, o aplicativo não pode trabalhar com essa configuração desabilitada. Por favor, contate o administrador do seu site.",
     "checksiteversion": "Verifique se seu site usa Moodle 2.4 ou superior.",
     "confirmdeletesite": "Você tem certeza que quer excluir o site {{sitename}}?",
     "connect": "Conectar!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Por favor, pergunte ao administrador para verificar o seguinte problema: {{$a}}",
     "createaccount": "Cadastrar este novo usuário",
     "createuserandpass": "Escolha seu usuário e senha",
+    "credentials": "Credenciais",
     "credentialsdescription": "Por favor, informe seu nome de usuário e senha para efetuar o login",
     "emailconfirmsent": "<p>Um e-mail irá ser enviado para o seu endereço em <b>{{$a}}</b></p><p> Ele irá conter instruções fáceis para completar seu registro.</p><p>Se você continua a ter dificuldades, contate o administrador do site.</p>",
     "emailnotmatch": "Os e-mail não coincidem",
@@ -32,6 +34,7 @@
     "invalidvaluemax": "O valor máximo é {{$a}}",
     "invalidvaluemin": "O valor minimo é{{$a}}",
     "localmobileunexpectedresponse": "Verificação do Moodle Mobile Additional Features retornou uma resposta inesperada, você ira se autenticar usando o serviço Mobile padrão",
+    "loggedoutssodescription": "Você tem que autenticar novamente. Você precisa fazer login no site em uma janela do navegador.",
     "login": "Login",
     "loginbutton": "Entrar",
     "logininsiterequired": "É preciso logar no site num navegador.",
@@ -62,6 +65,7 @@
     "signupplugindisabled": "{{$a}} não está habilitado.",
     "siteaddress": "Endereço do site",
     "siteinmaintenance": "O site está em modo de manutenção",
+    "sitepolicynotagreederror": "Não concordou com a política do site.",
     "siteurl": "URL do site",
     "siteurlrequired": "URL do site é obrigatória, por exemplo  <i>http://www.yourmoodlesite.abc ou https://www.yourmoodlesite.efg</i>",
     "startsignup": "Criar uma conta",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index 8544b642c2b..2e46e99dccb 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -2,6 +2,7 @@
     "auth_email": "Autorregisto com confirmação por e-mail",
     "authenticating": "Autenticação",
     "cancel": "Cancelar",
+    "cannotdownloadfiles": "O seu serviço Mobile não permite descarregar ficheiros e a aplicação não funciona sem ativar esta configuração. Por favor, contacte o administrador do site.",
     "checksiteversion": "Verifique se seu site usa o Moodle 2.4 ou posterior.",
     "confirmdeletesite": "Tem a certeza que pretende remover o site {{sitename}}?",
     "connect": "Ligar!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "Solicite ao administrador que verifique o seguinte problema: {{$a}}",
     "createaccount": "Criar a minha conta",
     "createuserandpass": "Escolha um nome de utilizador e senha",
+    "credentials": "Credenciais",
     "credentialsdescription": "Por favor, digite o nome de utilizador e senha para entrar",
     "emailconfirmsent": "<P>Um e-mail deve ter sido enviado para o seu endereço <b>{{$a}}</b></p><p>. Contém instruções fáceis para concluir o seu registo. Se continuar a ter dificuldades, entre em contacto com o administrador do site.</p>",
     "emailnotmatch": "Os e-mails não coincidem",
diff --git a/www/core/components/login/lang/ro.json b/www/core/components/login/lang/ro.json
index 61a5778af31..4428f198e31 100644
--- a/www/core/components/login/lang/ro.json
+++ b/www/core/components/login/lang/ro.json
@@ -1,11 +1,13 @@
 {
     "authenticating": "Autentificare",
     "cancel": "Renunță",
+    "cannotdownloadfiles": "Descărcarea de fișiere este inactivată în serviciul pentru mobil iar aplicația nu poate funcționa cu această funcție dezactivată. Contactați administratorul siteului.",
     "confirmdeletesite": "Sunteți sigur că doriți sa ștergeți siteul {{sitename}}?",
     "connect": "Conectare!",
     "connecttomoodle": "Conectare la Moodle",
     "createaccount": "Creează noul meu cont",
     "createuserandpass": "Alege un nume de utilizator şi o parolă",
+    "credentials": "Contributori",
     "credentialsdescription": "Va rugăm să  introduceți userul și parola dumneavoastră pentru a vă conecta",
     "emailconfirmsent": "<p>Un email a fost trimis la adresa Dvs. <b>{{$a}}</b></p>\n   <p>Acest mesaj conţine instrucţiuni despre finalizarea înregistrării.</p>\n   <p>În cazul în care întâmpinaţi dificultăţi contactaţi administratorul site-ului.</p>",
     "enterthewordsabove": "Introduceţi cuvintele de mai sus",
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index 41142cfcab7..e7ff24b5d2c 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -1,11 +1,13 @@
 {
     "authenticating": "Аутентификация",
     "cancel": "Отменить",
+    "cannotdownloadfiles": "Скачивание файла отключено для мобильных служб; приложение не может работать с данной отключенной настройкой. Пожалуйста, свяжитесь с администратором сайта.",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
     "connect": "Подключено!",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
+    "credentials": "Учетные данные",
     "credentialsdescription": "Пожалуйста, укажите Ваш логин и пароль для входа",
     "emailconfirmsent": "На указанный Вами адрес электронной почты (<b>{{$a}}</b>) было отправлено письмо с простыми инструкциями для завершения регистрации.\n Если у вас появятся проблемы с регистрацией, свяжитесь с администратором сайта.",
     "enterthewordsabove": "Напишите слова, которые Вы видите выше",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index cdbe08f4e8b..14dbfdaa592 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -1,11 +1,13 @@
 {
     "authenticating": "Autentisera",
     "cancel": "Avbryt",
+    "cannotdownloadfiles": "Nedladdning av filer är avaktiverat i din mobila tjänst. Appen fungerar inte om den inställningen är inaktiverad. Vänligen kontakta administratören.",
     "confirmdeletesite": "Är du säker på att du vill ta bort webbsidan {{sitename}}?",
     "connect": "Anslut!",
     "connecttomoodle": "Anslut till Moodle",
     "createaccount": "Skapa mitt nya konto",
     "createuserandpass": "Skapa ett nytt användarnamn och lösenord för att logga in med.",
+    "credentials": "Referenser",
     "credentialsdescription": "Ange ditt användarnamn och lösenord för att logga på",
     "emailconfirmsent": "<p>Vi har skickat ett e-postbrev som Du bör ha fått<br /> till Din adress på <b>{{$a}}</b></p>\n<p>Det innehåller enkla instruktioner som hjälper Dig<br />att fullfölja Din registrering.</p>\n<p>Om Du stöter på problem, är Du välkommen att <br />kontakta den som ansvarar för webbplatsen.</p>",
     "enterthewordsabove": "Mata in de ovanstående orden",
diff --git a/www/core/components/login/lang/zh-cn.json b/www/core/components/login/lang/zh-cn.json
index 232782861a1..df24baac33c 100644
--- a/www/core/components/login/lang/zh-cn.json
+++ b/www/core/components/login/lang/zh-cn.json
@@ -9,6 +9,7 @@
     "firsttime": "第一次来访吗？",
     "getanothercaptcha": "获取另一个 CAPTCHA",
     "help": "帮助",
+    "helpmelogin": "<p>全世界有成千上万的Moodle站点。本APP只能连接那些启用移动APP接入功能的Moodle站点。</p><p>如果您无法连接该站点，请与相关站点管理员联系并请他们阅读以下文档<a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>想要在Moodle演示站点中测试本APP，请在<i>站点URL</i>栏中输入<i>teacher</i>或者<i>student</i>，并点击<b>添加按钮</b>。</p>",
     "instructions": "使用说明",
     "invalidaccount": "请检查您的登录信息，或请您的网站管理员检查网站设置。",
     "invalidemail": "Email地址无效",
diff --git a/www/core/components/login/lang/zh-tw.json b/www/core/components/login/lang/zh-tw.json
index 4a23bfb81e2..e50821ef899 100644
--- a/www/core/components/login/lang/zh-tw.json
+++ b/www/core/components/login/lang/zh-tw.json
@@ -2,6 +2,7 @@
     "auth_email": "基於電子郵件的自助註冊",
     "authenticating": "認證中",
     "cancel": "取消",
+    "cannotdownloadfiles": "在您的行動服務中已停用檔案下載, 應用程式無法使用此未啟用的設定來運作. 請與您的網站管理員聯繫.",
     "checksiteversion": "請檢查您的網站是否使用Moodle 2.4或更高版本.",
     "confirmdeletesite": "您確定要刪除網站{{sitename}}嗎?",
     "connect": "連線!",
@@ -10,6 +11,7 @@
     "contactyouradministratorissue": "請求管理員檢查以下問題: {{$ a}}",
     "createaccount": "建立我的新帳號",
     "createuserandpass": "請選擇您的帳號名稱和密碼",
+    "credentials": "認證",
     "credentialsdescription": "請提供您的帳號和密碼以便登入",
     "emailconfirmsent": "<p>電子郵件應該已經寄到您的地址<b> {{$ a}} </ b> </ p> <p>它包含簡單的說明, 可以完成註冊. </ p> <p>如果, 您仍然有困難, 請與網站管理員聯繫.</ p>",
     "emailnotmatch": "電子郵件內容不符",
diff --git a/www/core/components/settings/lang/ar.json b/www/core/components/settings/lang/ar.json
index 40b91651104..09752c272ce 100644
--- a/www/core/components/settings/lang/ar.json
+++ b/www/core/components/settings/lang/ar.json
@@ -1,8 +1,10 @@
 {
     "about": "حول",
+    "appname": "تطبيق مودل {{version}}",
     "cacheexpirationtime": "وقت انتهاء صلاحية ذاكرة التخزين المؤقت (بالميلي ثانية)",
     "currentlanguage": "اللغة الحالية",
     "deletesitefiles": "هل أنت متأكد أنك تريد حذف الملفات التي تم تنزيلها من هذا الموقع  '{{sitename}}'؟",
+    "development": "التطوير",
     "deviceinfo": "معلومات الجهاز",
     "deviceos": "نظام تشغيل الجهاز",
     "disableall": "تعطيل الإعلامات بشكل مؤقت",
@@ -20,6 +22,7 @@
     "settings": "الإعدادات",
     "sites": "المواقع",
     "spaceusage": "المساحة المستخدمة",
+    "success": "تم بنجاح",
     "synchronization": "تزامن",
     "synchronizenow": "زامن الأن",
     "synchronizing": "يتم التزامن",
diff --git a/www/core/components/settings/lang/bg.json b/www/core/components/settings/lang/bg.json
index e9de7ab1cf5..dc2d2031bd9 100644
--- a/www/core/components/settings/lang/bg.json
+++ b/www/core/components/settings/lang/bg.json
@@ -1,8 +1,10 @@
 {
     "about": "Относно",
+    "appname": "Moodle Мобайл {{version}}",
     "cacheexpirationtime": "Продължителност на кеша (милисекунди)",
     "currentlanguage": "Текущ език",
     "deletesitefiles": "Сигурни ли сте, че искате да изтриете изтеглените от този сайт файлове?",
+    "development": "Разработка",
     "disableall": "Временно отменяне на съобщенията",
     "disabled": "Блокирано",
     "enabledebugging": "Позволяване на диагностициране",
@@ -16,6 +18,7 @@
     "loggedoff": "Не е онлайн",
     "settings": "Настройки",
     "spaceusage": "Използване на пространство",
+    "success": "Успех!",
     "synchronization": "Синхронизиране",
     "synchronizing": "Синхронизиране",
     "syncsitesuccess": "Данните от сайта са синхронизирани и всички кешове са инвалидирани.",
diff --git a/www/core/components/settings/lang/ca.json b/www/core/components/settings/lang/ca.json
index 66977c70db9..eb5ec501f98 100644
--- a/www/core/components/settings/lang/ca.json
+++ b/www/core/components/settings/lang/ca.json
@@ -1,5 +1,6 @@
 {
     "about": "Quant a",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App preparada",
     "cacheexpirationtime": "Temps de venciment de memòria cau (milisegons)",
     "cannotsyncoffline": "No es poden sincronitzar dades fora de línia.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "Esteu segur que voleu esborrar els fitxers baixats d'aquest lloc?",
     "deletesitefilestitle": "Elimina els fitxers del lloc",
+    "development": "Desenvolupament",
     "deviceinfo": "Informació del dispositiu",
     "deviceos": "OS del dispositiu",
     "devicewebworkers": "És compatible amb Device Web Workers",
@@ -46,6 +48,7 @@
     "sites": "Llocs",
     "spaceusage": "Utilització de l'espai",
     "storagetype": "Tipus d'emmagatzematge",
+    "success": "Èxit!",
     "synchronization": "Sincronització",
     "synchronizenow": "Sincronitza ara",
     "synchronizing": "S'està sincronitzant",
diff --git a/www/core/components/settings/lang/cs.json b/www/core/components/settings/lang/cs.json
index db0893052c2..734789c9372 100644
--- a/www/core/components/settings/lang/cs.json
+++ b/www/core/components/settings/lang/cs.json
@@ -1,5 +1,6 @@
 {
     "about": "O aplikaci",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplikace je připravena",
     "cacheexpirationtime": "Vypršení platnosti vyrovnávací paměti (milisekundy)",
     "cannotsyncoffline": "Nelze synchronizovat offline.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Aktuální jazyk",
     "deletesitefiles": "Jste si jisti, že chcete odstranit stažené soubory z tohoto webu?",
     "deletesitefilestitle": "Odstranit soubory webu",
+    "development": "Vývoj",
     "deviceinfo": "Informace o zařízení",
     "deviceos": "OS zařízení",
     "devicewebworkers": "Podporovaný Web Workers zařízení",
@@ -40,12 +42,14 @@
     "navigatorlanguage": "Jazyk navigátoru",
     "navigatoruseragent": "Navigátor userAgent",
     "networkstatus": "Stav připojení k Internetu",
+    "privacypolicy": "Zásady ochrany osobních údajů",
     "processorsettings": "Nastavení procesoru",
     "reportinbackground": "Zobrazovat chyby automaticky",
     "settings": "Nastavení",
     "sites": "Stránky",
     "spaceusage": "Použitý prostor",
     "storagetype": "Typ paměti",
+    "success": "Úspěch!",
     "synchronization": "Synchronizace",
     "synchronizenow": "Právě synchonizuji",
     "synchronizing": "Synchronizování",
diff --git a/www/core/components/settings/lang/da.json b/www/core/components/settings/lang/da.json
index 3dbfd79c45d..7d2f1960299 100644
--- a/www/core/components/settings/lang/da.json
+++ b/www/core/components/settings/lang/da.json
@@ -1,5 +1,6 @@
 {
     "about": "Om",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App klar",
     "cacheexpirationtime": "Cache udløbstid (milisekunder)",
     "cordovadevicemodel": "Cordova Device model",
@@ -11,6 +12,7 @@
     "currentlanguage": "Nuværende sprog",
     "deletesitefiles": "Er du sikker på du vil slette de downloadede filer fra webstedet '{{sitename}}'?",
     "deletesitefilestitle": "Slet webstedsfiler",
+    "development": "Udvikling",
     "deviceinfo": "Enhedsinfo",
     "deviceos": "Enheds operativsystem",
     "disableall": "Deaktiver midlertidigt underretninger",
@@ -37,6 +39,7 @@
     "sites": "Steder",
     "spaceusage": "Pladsforbrug",
     "storagetype": "Lagertype",
+    "success": "Succes!",
     "synchronization": "Synkronisering",
     "synchronizenow": "Synkroniser nu",
     "synchronizing": "Synkroniserer",
diff --git a/www/core/components/settings/lang/de.json b/www/core/components/settings/lang/de.json
index 7e50163b6f1..3562db16393 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -1,5 +1,6 @@
 {
     "about": "Über diese App",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App nutzbar",
     "cacheexpirationtime": "Speicherdauer im Cache (Millisekunden)",
     "cannotsyncoffline": "Offline kann nicht synchronisiert werden.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Sprache",
     "deletesitefiles": "Möchten Sie wirklich alle von der Website '{{sitename}}' geladenen Dateien löschen?",
     "deletesitefilestitle": "Website-Dateien löschen",
+    "development": "Entwicklung",
     "deviceinfo": "Geräteinfo",
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
@@ -47,6 +49,7 @@
     "sites": "Websites",
     "spaceusage": "Speicherplatz",
     "storagetype": "Speicherart",
+    "success": "Fertig!",
     "synchronization": "Synchronisieren",
     "synchronizenow": "Synchronisieren",
     "synchronizing": "Synchronisieren ...",
diff --git a/www/core/components/settings/lang/es-mx.json b/www/core/components/settings/lang/es-mx.json
index a393ff2b1f0..8bf53cb0fe2 100644
--- a/www/core/components/settings/lang/es-mx.json
+++ b/www/core/components/settings/lang/es-mx.json
@@ -1,5 +1,6 @@
 {
     "about": "Acerca de",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App lista",
     "cacheexpirationtime": "Tiempo de caducidad del caché (mili segundos)",
     "cannotsyncoffline": "No puede sincronizarse fuera-de-línea.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
     "deletesitefilestitle": "Eliminar archivos del sitio",
+    "development": "Desarrollo",
     "deviceinfo": "Información del Dispositivo",
     "deviceos": "Sistema Operativo del dispositivo",
     "devicewebworkers": "Trabajadores Web del Dispositivo soportados",
@@ -47,6 +49,7 @@
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
+    "success": "¡Éxito!",
     "synchronization": "Sincronización",
     "synchronizenow": "Sincronizar ahorita",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/es.json b/www/core/components/settings/lang/es.json
index ee9f45a2d00..30bff8fb558 100644
--- a/www/core/components/settings/lang/es.json
+++ b/www/core/components/settings/lang/es.json
@@ -1,5 +1,6 @@
 {
     "about": "Acerca de",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App preparada",
     "cacheexpirationtime": "Tiempo de expiración de caché (mili segundos)",
     "cannotsyncoffline": "No puede sincronizarse fuera de línea.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
     "deletesitefilestitle": "Elimina los ficheros del sitio",
+    "development": "Desarrollo",
     "deviceinfo": "Información del dispositivo",
     "deviceos": "OS del dispositivo",
     "devicewebworkers": "Soporta Device Web Workers",
@@ -46,6 +48,7 @@
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
+    "success": "Éxito",
     "synchronization": "Sincronización",
     "synchronizenow": "Sincronizar ahora",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/eu.json b/www/core/components/settings/lang/eu.json
index d8e8b25d60c..65a898ffbe7 100644
--- a/www/core/components/settings/lang/eu.json
+++ b/www/core/components/settings/lang/eu.json
@@ -1,5 +1,6 @@
 {
     "about": "Honi buruz",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App-a prest",
     "cacheexpirationtime": "Cache-aren iraungitze denbora (milisegundotan)",
     "cannotsyncoffline": "Ezin da lineaz-kanpo sinkronizatu.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Oraingo hizkuntza",
     "deletesitefiles": "Ziur zaude '{{sitename}}' gunetik jaitsitako fitxategiak ezabatu nahi dituzula?",
     "deletesitefilestitle": "Ezabatu guneko fitxategiak",
+    "development": "Garapena",
     "deviceinfo": "Gailuaren informazio",
     "deviceos": "Gailuaren SEa",
     "devicewebworkers": "Device Web Workers onartuak",
@@ -47,6 +49,7 @@
     "sites": "Guneak",
     "spaceusage": "Lekuaren erabilera",
     "storagetype": "Biltegi mota",
+    "success": "Ondo!",
     "synchronization": "Sinkronizazioa",
     "synchronizenow": "Sinkronizatu orain",
     "synchronizing": "Sinkronizatzen",
diff --git a/www/core/components/settings/lang/fa.json b/www/core/components/settings/lang/fa.json
index 195ff604177..4b17b4372a0 100644
--- a/www/core/components/settings/lang/fa.json
+++ b/www/core/components/settings/lang/fa.json
@@ -1,20 +1,33 @@
 {
     "about": "درباره",
     "cacheexpirationtime": "زمان اعتبار کشها (miliseconds)",
+    "configuringnotifications": "شما در حال پیکربندی اطلاعیه‌های «{{$a}}» هستید.",
+    "cordovadevicemodel": "مدل دستگاه کُردوا",
     "currentlanguage": "زبان فعلی",
-    "deletesitefiles": "آیا از حذف کلیه فایلهای این سایت مطمئنید؟",
+    "deletesitefiles": "آیا از حذف کلیه فایل‌های این سایت مطمئنید؟",
+    "deletesitefilestitle": "پاک‌کردن فایل‌های سایت",
+    "development": "توسعه",
+    "deviceinfo": "اطلاعات دستگاه",
+    "deviceos": "سیستم‌عامل دستگاه",
     "disableall": "غیرفعال‌کردن موقت اطلاعیه‌ها",
     "disabled": "غیر فعال",
     "enabledebugging": "فعالسازی اشکالزدایی",
+    "enabledownloadsection": "فعال‌کردن دریافت قسمت‌ها",
+    "enabledownloadsectiondescription": "برای سریع‌تر شدن بارگیری قسمت‌های درس این گزینه را غیرفعال کنید.",
+    "enablerichtexteditor": "فعال‌کردن ویرایشگر متنی پیشرفته",
+    "enablerichtexteditordescription": "اگر فعال باشد، در جاهایی که ممکن باشد یک ویرایشگر متنی پیشرفته نمایش داده خواهد شد.",
     "estimatedfreespace": "فضای آزاد تخمینی",
     "general": "عمومی",
     "language": "زبان",
     "license": "اجازه‌نامه",
     "loggedin": "هنگام بودن در سایت",
     "loggedoff": "هنگام نبودن در سایت",
+    "privacypolicy": "خط مشی حفظ حریم خصوصی",
     "processorsettings": "تنظیمات پردازشگر",
+    "reportinbackground": "گزارش خطاها به‌صورت خودکار",
     "settings": "تنظیمات",
     "sites": "سایت‌ها",
     "spaceusage": "فضای مورد استفاده",
+    "synchronization": "هماهنگسازی",
     "total": "مجموع"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/fr.json b/www/core/components/settings/lang/fr.json
index 539c3217ca3..a26ab0cc96b 100644
--- a/www/core/components/settings/lang/fr.json
+++ b/www/core/components/settings/lang/fr.json
@@ -1,5 +1,6 @@
 {
     "about": "À propos",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "Prêt pour l'app",
     "cacheexpirationtime": "Durée d'échéance du cache (ms)",
     "cannotsyncoffline": "Impossible de synchroniser sans connection réseau.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Langue actuelle",
     "deletesitefiles": "Voulez-vous vraiment supprimer les fichiers téléchargés depuis ce site ?",
     "deletesitefilestitle": "Supprimer les fichiers de site",
+    "development": "Développement",
     "deviceinfo": "Info sur l'appareil",
     "deviceos": "Système d'exploitation de l'appareil",
     "devicewebworkers": "Web workers supportés",
@@ -47,6 +49,7 @@
     "sites": "Plateformes",
     "spaceusage": "Espace utilisé",
     "storagetype": "Type de stockage",
+    "success": "Succès !",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchroniser maintenant",
     "synchronizing": "Synchronisation en cours",
diff --git a/www/core/components/settings/lang/he.json b/www/core/components/settings/lang/he.json
index 12f50bd95c4..fb9798c3810 100644
--- a/www/core/components/settings/lang/he.json
+++ b/www/core/components/settings/lang/he.json
@@ -5,6 +5,7 @@
     "currentlanguage": "שפה נוכחית",
     "deletesitefiles": "האם אתה בטוח שברצונך למחוק את כל הקבצים שהורדו מאתר זה?",
     "deletesitefilestitle": "מחיקת קבצי אתר",
+    "development": "פיתוח",
     "deviceinfo": "מידע אודות המכשיר",
     "deviceos": "מערכת הפעלה של המכשיר",
     "disableall": "הודעות־מערכת כבויות זמנית",
@@ -25,6 +26,7 @@
     "settings": "הגדרות",
     "sites": "אתרים",
     "spaceusage": "זיכרון בשימוש",
+    "success": "הצלחה!",
     "synchronization": "סינכרון",
     "synchronizenow": "סינכרון עכשיו",
     "synchronizing": "מסנכרן",
diff --git a/www/core/components/settings/lang/it.json b/www/core/components/settings/lang/it.json
index ea9f2b111a6..cefcde944c6 100644
--- a/www/core/components/settings/lang/it.json
+++ b/www/core/components/settings/lang/it.json
@@ -1,5 +1,6 @@
 {
     "about": "Informazioni",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App ready",
     "cacheexpirationtime": "Durata cache (millisecondi)",
     "cordovadevicemodel": "Modello del dispositivo Cordova",
@@ -11,6 +12,7 @@
     "currentlanguage": "Lingua in uso",
     "deletesitefiles": "Sei sicuro di eliminare i file scaricati dal sito '{{sitename}}'?",
     "deletesitefilestitle": "Elimina file del sito",
+    "development": "Sviluppo",
     "deviceinfo": "Informazioni sul dispositivo",
     "deviceos": "SO del dispositivo",
     "devicewebworkers": "Dispositivi Web Worker supportati",
@@ -39,6 +41,7 @@
     "sites": "Siti",
     "spaceusage": "Spazio utilizzato",
     "storagetype": "Tipo di storage",
+    "success": "Effettuato correttamente!",
     "synchronization": "Sincronizzazione",
     "synchronizenow": "Sincronizza adesso",
     "synchronizing": "Sincronizzazione in corso",
diff --git a/www/core/components/settings/lang/ja.json b/www/core/components/settings/lang/ja.json
index e0fc530bcd2..ff314f93d59 100644
--- a/www/core/components/settings/lang/ja.json
+++ b/www/core/components/settings/lang/ja.json
@@ -3,6 +3,7 @@
     "cacheexpirationtime": "キャッシュ有効期限（ミリ秒単位）",
     "currentlanguage": "現在の言語",
     "deletesitefiles": "本当にこのサイトからダウンロードしたファイルを消去しますか？",
+    "development": "開発",
     "disableall": "一時的に通知を無効にする",
     "disabled": "無効",
     "enabledebugging": "デバッグを有効にする",
diff --git a/www/core/components/settings/lang/lt.json b/www/core/components/settings/lang/lt.json
index 114a814c206..178c58fe546 100644
--- a/www/core/components/settings/lang/lt.json
+++ b/www/core/components/settings/lang/lt.json
@@ -1,5 +1,6 @@
 {
     "about": "Apie",
+    "appname": "Moodle mobili {{version}}",
     "appready": "Programėlė paruošta",
     "cacheexpirationtime": "Laikinas galiojimo laikas (ms)",
     "cannotsyncoffline": "Negalima sinchronizuoti neprisijungus.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Vartojama kalba",
     "deletesitefiles": "Ar esate tikri, kad norite ištrinti atsisiųstus failus iš svetainės '{{sitename}}'?",
     "deletesitefilestitle": "Ištrinti svetainės failus",
+    "development": "Kūrimas",
     "deviceinfo": "Informacija apie įrenginį",
     "deviceos": "Įrenginio OS",
     "devicewebworkers": "Įrenginio palaikymas",
@@ -46,6 +48,7 @@
     "sites": "Svetainės",
     "spaceusage": "Vietos naudojimas",
     "storagetype": "Atminties tipas",
+    "success": "Sėkmė!!",
     "synchronization": "Sinchronizavimas",
     "synchronizenow": "Sinchronizuoti dabar",
     "synchronizing": "Sinchronizuojama",
diff --git a/www/core/components/settings/lang/nl.json b/www/core/components/settings/lang/nl.json
index 81291109d95..505652de0ee 100644
--- a/www/core/components/settings/lang/nl.json
+++ b/www/core/components/settings/lang/nl.json
@@ -1,5 +1,6 @@
 {
     "about": "Over",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "App klaar",
     "cacheexpirationtime": "Cache verlooptijd (milliseconden)",
     "cannotsyncoffline": "Kan offline geen bestanden synchroniseren.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Huidige taal",
     "deletesitefiles": "Weet je zeker dat je deze site en gedownloade bestanden ervan wil verwijderen?",
     "deletesitefilestitle": "Verwijder site-bestanden",
+    "development": "Ontwikkeling",
     "deviceinfo": "Toestel info",
     "deviceos": "Toestel OS",
     "devicewebworkers": "Ondersteunde Device Web Workers",
@@ -40,12 +42,14 @@
     "navigatorlanguage": "Navigatietaal",
     "navigatoruseragent": "Navigatie userAgent",
     "networkstatus": "Internet connectiestatus",
+    "privacypolicy": "Privacy-beleid",
     "processorsettings": "Processor instellingen",
     "reportinbackground": "Fouten automatisch rapporteren",
     "settings": "Instellingen",
     "sites": "Sites",
     "spaceusage": "Gebruikte ruimte",
     "storagetype": "Opslagtype",
+    "success": "Gelukt!",
     "synchronization": "Synchronisatie",
     "synchronizenow": "Nu synchroniseren",
     "synchronizing": "Aan het synchroniseren...",
diff --git a/www/core/components/settings/lang/pt-br.json b/www/core/components/settings/lang/pt-br.json
index d1d1efa4b27..e3e3771f7f9 100644
--- a/www/core/components/settings/lang/pt-br.json
+++ b/www/core/components/settings/lang/pt-br.json
@@ -1,5 +1,6 @@
 {
     "about": "Sobre",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicativo pronto",
     "cacheexpirationtime": "Tempo de expiração do cache (milisegundos)",
     "cannotsyncoffline": "Não pode sincronizar offline.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Idioma atual",
     "deletesitefiles": "Você tem certeza que quer excluir os arquivos baixados do site '{{sitename}}'?",
     "deletesitefilestitle": "Excluir os arquivos do site",
+    "development": "Desenvolvimento",
     "deviceinfo": "Informação do dispositivo",
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
@@ -40,11 +42,13 @@
     "navigatorlanguage": "Idioma de navegação",
     "navigatoruseragent": "Navegador userAgent",
     "networkstatus": "O status da conexão Internet",
+    "privacypolicy": "Política de privacidade",
     "reportinbackground": "Relatar erros automaticamente",
     "settings": "Configurações",
     "sites": "Sites",
     "spaceusage": "Uso do espaço",
     "storagetype": "Tipo de armazenamento",
+    "success": "Sucesso!",
     "synchronization": "Sincronização",
     "synchronizenow": "Sincronizar agora",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/pt.json b/www/core/components/settings/lang/pt.json
index 206bccea67c..e1640c0210c 100644
--- a/www/core/components/settings/lang/pt.json
+++ b/www/core/components/settings/lang/pt.json
@@ -1,5 +1,6 @@
 {
     "about": "Acerca",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicação pronta",
     "cacheexpirationtime": "Intervalo de tempo para a cache expirar (milisegundos)",
     "cannotsyncoffline": "Não é possível sincronizar offline.",
@@ -14,6 +15,7 @@
     "currentlanguage": "Idioma atual",
     "deletesitefiles": "Tem a certeza que pretende apagar os ficheiros descarregados a partir do site '{{sitename}}'?",
     "deletesitefilestitle": "Excluir os ficheiros do site",
+    "development": "Desenvolvimento",
     "deviceinfo": "Informação do dispositivo",
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
@@ -47,6 +49,7 @@
     "sites": "Sites",
     "spaceusage": "Utilização do espaço",
     "storagetype": "Tipo de armazenamento",
+    "success": "Sucesso!",
     "synchronization": "Sincronização",
     "synchronizenow": "Sincronizar agora",
     "synchronizing": "A sincronizar",
diff --git a/www/core/components/settings/lang/ro.json b/www/core/components/settings/lang/ro.json
index 09946ee22d7..5b2bcf83f36 100644
--- a/www/core/components/settings/lang/ro.json
+++ b/www/core/components/settings/lang/ro.json
@@ -1,5 +1,6 @@
 {
     "about": "Despre",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicația este pregătită",
     "cacheexpirationtime": "Timpul de expirare al cacheului (milisecunde)",
     "cordovadevicemodel": "Modelul Cordova Device",
@@ -11,6 +12,7 @@
     "currentlanguage": "Limba curenta",
     "deletesitefiles": "Sunteți sigur/ă ca doriți să ștergeți fișierele descărcate de pe siteul '{{sitename}}'?",
     "deletesitefilestitle": "Șterge fișierele de pe site",
+    "development": "Dezvoltare",
     "deviceinfo": "Informații despre dispozitiv",
     "deviceos": "Sistemul de operare al dispozitivului",
     "devicewebworkers": "Web Workers este suportat pe dispozitiv",
@@ -40,6 +42,7 @@
     "sites": "Siteuri",
     "spaceusage": "Spațiu utilizat",
     "storagetype": "Tipul stocării",
+    "success": "Succes!",
     "synchronization": "Sincronizare",
     "synchronizenow": "Sincronizați acum",
     "synchronizing": "Se sincronizeaza",
diff --git a/www/core/components/settings/lang/ru.json b/www/core/components/settings/lang/ru.json
index 11efd2e04a9..5eb58abb46e 100644
--- a/www/core/components/settings/lang/ru.json
+++ b/www/core/components/settings/lang/ru.json
@@ -1,10 +1,12 @@
 {
     "about": "О приложении",
+    "appname": "Moodle Mobile {{version}}",
     "cacheexpirationtime": "Срок действия кэша (миллисекунд)",
     "credits": "Разработчики",
     "currentlanguage": "Выбранный язык",
     "deletesitefiles": "Вы уверены, что хотите удалить файлы, скачанные с сайта «{{sitename}}»?",
     "deletesitefilestitle": "Удалить файлы сайта",
+    "development": "Разработка",
     "disableall": "Временно отключить уведомления",
     "disabled": "Отключено",
     "enabledebugging": "Включить отладку",
@@ -19,6 +21,7 @@
     "settings": "Настройки",
     "sites": "Сайты",
     "spaceusage": "Используемое пространство",
+    "success": "Успешно!",
     "synchronization": "Синхронизация",
     "synchronizing": "Синхронизация",
     "syncsitesuccess": "Данные синхронизации сайта и все кэши недействительны.",
diff --git a/www/core/components/settings/lang/sv.json b/www/core/components/settings/lang/sv.json
index 935618d25dd..50ab6aae45a 100644
--- a/www/core/components/settings/lang/sv.json
+++ b/www/core/components/settings/lang/sv.json
@@ -1,5 +1,6 @@
 {
     "about": "Om",
+    "appname": "Moodle Mobile {{version}}",
     "appready": "Appen är redo",
     "cacheexpirationtime": "Cache utgångs tid (millisekunder)",
     "cordovadevicemodel": "",
@@ -11,6 +12,7 @@
     "currentlanguage": "Aktuellt språk",
     "deletesitefiles": "Är du säker på att du vill ta bort de nedladdade filerna från den här webbplatsen?",
     "deletesitefilestitle": "Ta bort platsfiler",
+    "development": "Utveckling",
     "deviceinfo": "Info mobil enhet",
     "deviceos": "Mobil enhet operativsystem",
     "devicewebworkers": "Enheten stödjer Web Workers",
@@ -40,6 +42,7 @@
     "sites": "Webbsidor",
     "spaceusage": "Utrymmesanvändning",
     "storagetype": "Lagringstyp",
+    "success": "Framgång!",
     "synchronization": "Synkronisering",
     "synchronizenow": "Synkronisera nu",
     "synchronizing": "Synkronisera",
diff --git a/www/core/components/settings/lang/tr.json b/www/core/components/settings/lang/tr.json
index b450a65faba..36d39aedfd9 100644
--- a/www/core/components/settings/lang/tr.json
+++ b/www/core/components/settings/lang/tr.json
@@ -1,8 +1,10 @@
 {
     "about": "Hakkında",
+    "appname": "Moodle Mobile {{version}}",
     "cacheexpirationtime": "Önbellek zaman aşımı (milisaniye)",
     "currentlanguage": "Geçerli dil",
     "deletesitefiles": "Bu siteden indirdiğiniz dosyaları silmek istediğinizden eminmisiniz?",
+    "development": "Gelişmiş ayarlar",
     "disableall": "Bildirimleri devre dışı bırak",
     "disabled": "Devre dışı bırakıldı",
     "enabledebugging": "Hata ayıklamayı etkinleştir",
diff --git a/www/core/components/settings/lang/zh-cn.json b/www/core/components/settings/lang/zh-cn.json
index 2e75e8a5170..6ac933eaf19 100644
--- a/www/core/components/settings/lang/zh-cn.json
+++ b/www/core/components/settings/lang/zh-cn.json
@@ -3,6 +3,7 @@
     "cacheexpirationtime": "缓存过期时间（毫秒）",
     "currentlanguage": "当前语言",
     "deletesitefiles": "您确定要删除从本站下载的文件？",
+    "development": "开发",
     "disableall": "临时禁用通知",
     "disabled": "禁用",
     "enabledebugging": "启用调试功能",
@@ -15,5 +16,6 @@
     "settings": "设置",
     "sites": "网站",
     "spaceusage": "空间使用情况",
+    "synchronization": "同步",
     "total": "总共"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/zh-tw.json b/www/core/components/settings/lang/zh-tw.json
index 7ee451f999e..66e3782719f 100644
--- a/www/core/components/settings/lang/zh-tw.json
+++ b/www/core/components/settings/lang/zh-tw.json
@@ -1,5 +1,6 @@
 {
     "about": "關於",
+    "appname": "Moodle行動版{{version}}",
     "appready": "應用程式已就緒",
     "cacheexpirationtime": "快取到期時間(毫秒)",
     "cannotsyncoffline": "離線狀態無法進行同步",
@@ -14,6 +15,7 @@
     "currentlanguage": "選定語言",
     "deletesitefiles": "您確定想從這個網站位置刪除已下載的檔案?",
     "deletesitefilestitle": "刪除網站檔案",
+    "development": "開發",
     "deviceinfo": "裝置資訊",
     "deviceos": "裝置作業系統",
     "devicewebworkers": "裝置網路工作站已支援",
@@ -46,6 +48,7 @@
     "sites": "網站",
     "spaceusage": "使用空間",
     "storagetype": "儲存類型",
+    "success": "成功!",
     "synchronization": "同步",
     "synchronizenow": "立即同步",
     "synchronizing": "同步中",
diff --git a/www/core/components/sidemenu/lang/fa.json b/www/core/components/sidemenu/lang/fa.json
index b659e9b546e..7d4184a0d64 100644
--- a/www/core/components/sidemenu/lang/fa.json
+++ b/www/core/components/sidemenu/lang/fa.json
@@ -1,7 +1,8 @@
 {
+    "appsettings": "تنظیمات برنامه",
     "changesite": "خروج",
     "help": "راهنما",
-    "logout": "خروج از سایت",
-    "mycourses": "درسهای من",
+    "logout": "خروج",
+    "mycourses": "درس‌های من",
     "website": "پایگاه اینترنتی"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/nl.json b/www/core/components/sidemenu/lang/nl.json
index 81a81fdbaac..d06e70ec6d8 100644
--- a/www/core/components/sidemenu/lang/nl.json
+++ b/www/core/components/sidemenu/lang/nl.json
@@ -2,7 +2,7 @@
     "appsettings": "App instellingen",
     "changesite": "Naar andere site",
     "help": "Help",
-    "logout": "Naar andere site",
+    "logout": "Afmelden",
     "mycourses": "Mijn cursussen",
     "togglemenu": "Menu schakelen",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/zh-cn.json b/www/core/components/sidemenu/lang/zh-cn.json
index 045f90c1630..ea6cd6e91e1 100644
--- a/www/core/components/sidemenu/lang/zh-cn.json
+++ b/www/core/components/sidemenu/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "changesite": "注销",
     "help": "帮助",
-    "logout": "退出",
+    "logout": "注销",
     "mycourses": "我的课程",
     "website": "网站"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/cs.json b/www/core/components/user/lang/cs.json
index 1a2f2c18086..30062f8104c 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -18,6 +18,7 @@
     "phone1": "Telefon",
     "phone2": "Mobil",
     "roles": "Role",
+    "sendemail": "Email",
     "student": "Student",
     "teacher": "Učitel bez práva upravovat",
     "viewprofile": "Zobrazit profil",
diff --git a/www/core/components/user/lang/nl.json b/www/core/components/user/lang/nl.json
index 3b0659ae222..5fa389b05fd 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -18,6 +18,7 @@
     "phone1": "Telefoon",
     "phone2": "Mobiele telefoon",
     "roles": "Rollen",
+    "sendemail": "E-mail",
     "student": "Leerling",
     "teacher": "Leraar zonder bewerken",
     "viewprofile": "Bekijk profiel",
diff --git a/www/core/components/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index 6f32cf4b259..a9530813c54 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -18,6 +18,7 @@
     "phone1": "Telefone",
     "phone2": "Celular",
     "roles": "Papéis",
+    "sendemail": "Email",
     "student": "Estudante",
     "teacher": "Professor não-editor",
     "viewprofile": "Ver perfil",
diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index 942118016c5..2f831bf7266 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -54,17 +54,17 @@
     "maxsizeandattachments": "الحجم الأقصى للملفات الجديدة: {{$a.size}}, أقصى عدد للمرفقات: {{$a.attachments}}",
     "min": "الحد الأدنى",
     "mins": "الأقل",
-    "mod_assign": null,
+    "mod_assign": "مهمة",
     "mod_assignment": "مهمة",
     "mod_book": "كتاب",
     "mod_chat": "محادثة",
-    "mod_choice": "الاختيار",
+    "mod_choice": "اختيار",
     "mod_data": "قاعدة بيانات",
     "mod_database": "قاعدة بيانات",
-    "mod_feedback": "إفادة",
+    "mod_feedback": "تغذية راجعة",
     "mod_file": "ملف",
     "mod_folder": "مجلد",
-    "mod_forum": "المنتدى",
+    "mod_forum": "منتدى",
     "mod_label": "ملصق",
     "mod_lesson": "درس",
     "mod_lti": null,
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index b58c5bf07c1..c54034c1df4 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -56,7 +56,7 @@
     "mod_book": "Книга",
     "mod_chat": "Чат",
     "mod_choice": "Избор",
-    "mod_data": "База данни",
+    "mod_data": "База от данни",
     "mod_database": "База от данни",
     "mod_external-tool": "Външен инструмент",
     "mod_feedback": "Обратна връзка",
@@ -68,14 +68,14 @@
     "mod_imscp": "Пакет с IMS съдържание",
     "mod_label": "Етикет",
     "mod_lesson": "Урок",
-    "mod_lti": null,
+    "mod_lti": "Външен инструмент",
     "mod_page": "Страница",
     "mod_quiz": "Тест",
     "mod_resource": "Ресурс",
     "mod_scorm": "SCORM пакет",
-    "mod_survey": "Анкета",
+    "mod_survey": "Проучване",
     "mod_url": "URL",
-    "mod_wiki": "Уики",
+    "mod_wiki": "Wiki",
     "moduleintro": "Описание",
     "name": "Име",
     "networkerrormsg": "Мрежата не е разрешена или не работи",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 67fcd220cff..5c8b4cb3c37 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -53,6 +53,7 @@
     "download": "Baixa",
     "downloading": "S'està descarregant",
     "edit": "Edita",
+    "elementseparator": ",",
     "error": "Error",
     "errorchangecompletion": "S'ha produït un error en carregar l'estat de la compleció. Si us plau torneu a intentar-ho.",
     "errordeletefile": "S'ha produït un error en eliminar el fitxer. Torneu-ho a provar més tard.",
@@ -68,6 +69,7 @@
     "errorrenamefile": "S'ha produït un error en reanomenar el fitxer. Torneu-ho a provar més tard.",
     "errorsync": "S'ha produït un error durant la sincronització. Torneu-ho a provar més tard.",
     "errorsyncblocked": "Aquest/a {{$a}} no es pot sincronitzar ara mateix perquè ja hi ha un procés en marxa. Torneu-ho a provar més tard. Si el problema persisteix, reinicieu l'aplicació.",
+    "fieldvalueseparator": ":",
     "filename": "Nom de fitxer",
     "filenameexist": "Ja existeix un fitxer amb el nom: {{$a}}",
     "folder": "Carpeta",
@@ -103,7 +105,7 @@
     "mod_data": "Base de dades",
     "mod_database": "Base de dades",
     "mod_external-tool": "Eina externa",
-    "mod_feedback": "Retroacció",
+    "mod_feedback": "Retroalimentació",
     "mod_file": "Fitxer",
     "mod_folder": "Carpeta",
     "mod_forum": "Fòrum",
@@ -112,7 +114,7 @@
     "mod_imscp": "Paquet de contingut IMS",
     "mod_label": "Etiqueta",
     "mod_lesson": "Lliçó",
-    "mod_lti": "LTI",
+    "mod_lti": "Eina externa",
     "mod_page": "Pàgina",
     "mod_quiz": "Qüestionari",
     "mod_resource": "Fitxer",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index c3efd1d141d..b8311928487 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -25,10 +25,12 @@
     "completion-alt-manual-y": "Splněno: {{$a}}. Výběrem označíte jako nesplněné.",
     "confirmcanceledit": "Jste si jisti, že chcete opustit tuto stránku? Všechny změny budou ztraceny.",
     "confirmdeletefile": "Jste si jisti, že chcete odstranit tento soubor?",
+    "confirmloss": "Jsi si jistý? Všechny změny budou ztraceny.",
     "confirmopeninbrowser": "Chcete jej otevřít v prohlížeči?",
     "content": "Obsah",
     "contenteditingsynced": "Obsah, který upravujete byl synchronizován.",
     "continue": "Pokračovat",
+    "copiedtoclipboard": "Text byl zkopírován do schránky",
     "course": "Kurz",
     "coursedetails": "Podrobnosti kurzu",
     "currentdevice": "Aktuální zařízení",
@@ -52,6 +54,7 @@
     "download": "Stáhnout",
     "downloading": "Stahování",
     "edit": "Upravit",
+    "elementseparator": ",",
     "error": "Chyba",
     "errorchangecompletion": "Při změně stavu dokončení došlo k chybě. Prosím zkuste to znovu.",
     "errordeletefile": "Chyba při odstraňování souboru. Prosím zkuste to znovu.",
@@ -60,12 +63,14 @@
     "errorfileexistssamename": "Soubor s tímto názvem již existuje.",
     "errorinvalidform": "Formulář obsahuje neplatná data. Nezapomeňte prosím vyplnit všechna požadovaná pole a platná data .",
     "errorinvalidresponse": "Dostali jste neplatnou odpověď. Pokud chyba přetrvává, obraťte se na správce Moodle .",
+    "errorloadingcontent": "Chyba při načítání obsahu.",
     "erroropenfilenoapp": "Chyba při otevírání souboru: žádnou aplikací nelze otevřít tento typ souboru.",
     "erroropenfilenoextension": "Chyba při otevírání souboru: soubor nemá příponu.",
     "erroropenpopup": "Tato aktivita se pokouší otevřít vyskakovací okno. Tato možnost není v této aplikaci podporována.",
     "errorrenamefile": "Chyba při přejmenování souboru. Prosím zkuste to znovu.",
     "errorsync": "Při synchronizaci došlo k chybě. Zkuste to prosím znovu.",
     "errorsyncblocked": "{{$a}} nelze nyní synchronizovat z důvodu probíhajícího procesu. Zkuste to prosím znovu později. Pokud problém přetrvává, zkuste restartovat aplikaci.",
+    "fieldvalueseparator": ":",
     "filename": "Název souboru",
     "filenameexist": "Jméno souboru již existuje: {{$a}}",
     "folder": "Složka",
@@ -98,7 +103,7 @@
     "mod_book": "Kniha",
     "mod_chat": "Chat",
     "mod_choice": "Anketa",
-    "mod_data": "Databáze",
+    "mod_data": "Databáse",
     "mod_database": "Databáse",
     "mod_external-tool": "Externí nástroj",
     "mod_feedback": "Dotazník",
@@ -186,6 +191,8 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Herdekfilek!",
     "unexpectederror": "Neočekávaná chyba. Zavřete a znovu otevřete aplikaci a zkuste to znovu, prosím",
+    "unicodenotsupported": "Text Unicode jako emodži nejsou na těchto stránkách podporovány, text bude zaslán po odstranění těchto znaků.",
+    "unicodenotsupportedcleanerror": "Při čištění Unicode znaků byl nalezen prázdný text.",
     "unknown": "Neznámý",
     "unlimited": "Neomezeno",
     "unzipping": "Rozbalení",
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index b50e989cc6f..76a68bba6f1 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -77,7 +77,7 @@
     "mod_assignment": "Opgave",
     "mod_book": "Bog",
     "mod_chat": "Chat",
-    "mod_choice": "Afstemning",
+    "mod_choice": "Valg",
     "mod_data": "Database",
     "mod_database": "Database",
     "mod_external-tool": "Eksternt værktøj",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 775bdec9b20..4d0c426ded0 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -54,6 +54,7 @@
     "download": "Herunterladen",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
+    "elementseparator": ";",
     "error": "Fehler",
     "errorchangecompletion": "Fehler beim Ändern des Abschlussstatus. Versuchen Sie es noch einmal.",
     "errordeletefile": "Fehler beim Löschen der Datei. Versuchen Sie es noch einmal.",
@@ -69,6 +70,7 @@
     "errorrenamefile": "Fehler beim Umbenennen der Datei. Versuchen Sie es noch einmal.",
     "errorsync": "Fehler beim Synchronisieren. Versuchen Sie es noch einmal.",
     "errorsyncblocked": "Diese(s/r) {{$ a}} kann im Moment nicht synchronisiert werden. Versuchen Sie es später noch einmal. Falls das Problem weiterhin besteht, sollten Sie die App neu starten.",
+    "fieldvalueseparator": ":",
     "filename": "Dateiname",
     "filenameexist": "Dateiname existiert bereits: {{$a}}",
     "folder": "Verzeichnis",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index 3d8094f4a9c..d7a4e12dff2 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -51,6 +51,7 @@
     "download": "Μεταφόρτωση",
     "downloading": "Κατέβασμα",
     "edit": "Επεξεργασία ",
+    "elementseparator": ",",
     "error": "Σφάλμα",
     "errorchangecompletion": "Παρουσιάστηκε σφάλμα κατά την αλλαγή της κατάστασης ολοκλήρωσης. Παρακαλώ προσπαθήστε ξανά.",
     "errordeletefile": "Σφάλμα κατά τη διαγραφή του αρχείου. Παρακαλώ προσπαθήστε ξανά.",
@@ -91,7 +92,7 @@
     "maxsizeandattachments": "Μέγιστο μέγεθος για νέα αρχεία: {{$a.size}}, μέγιστος αριθμός συνημμένων: {{$a.attachments}}",
     "min": "λεπτό",
     "mins": "λεπτά",
-    "mod_assign": null,
+    "mod_assign": "Εργασία",
     "mod_assignment": "Εργασία",
     "mod_book": "Βιβλίο",
     "mod_chat": "Συζήτηση",
@@ -102,17 +103,17 @@
     "mod_feedback": "Ανατροφοδότηση",
     "mod_file": "Αρχείο",
     "mod_folder": "Φάκελος",
-    "mod_forum": "Ομάδα Συζητήσεων",
+    "mod_forum": "Forum",
     "mod_glossary": "Γλωσσάριο",
     "mod_ims": "IMS πακέτο περιεχομένου",
     "mod_imscp": "IMS πακέτο περιεχομένου",
     "mod_label": "Ετικέτα",
-    "mod_lesson": "Ενότητα",
-    "mod_lti": null,
+    "mod_lesson": "Μάθημα",
+    "mod_lti": "Εξωτερικό εργαλείο",
     "mod_page": "Σελίδα",
     "mod_quiz": "Κουίζ",
     "mod_resource": "Πόρος",
-    "mod_scorm": "πακέτο SCORM",
+    "mod_scorm": "Πακέτο SCORM",
     "mod_survey": "Έρευνα",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index 8de7b28aff1..e955ca514e5 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -54,6 +54,7 @@
     "download": "Descargar",
     "downloading": "Descargando",
     "edit": "Editar",
+    "elementseparator": ",",
     "error": "Error",
     "errorchangecompletion": "Ocurrió un error al cambiar el estatus de finalización. Por favor inténtelo nuevamente.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo nuevamente.",
@@ -69,6 +70,7 @@
     "errorrenamefile": "Error al renombrar el archivo. Por favor inténtelo nuevamente.",
     "errorsync": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente más tarde.",
     "errorsyncblocked": "Este/a {{$a}} no puede sincronizarse ahorita porque hay un proceso trabajando. Por favor inténtelo nuevamente más tarde. Si el problema persiste, intente reiniciar la App.",
+    "fieldvalueseparator": ":",
     "filename": "Nombre del archivo",
     "filenameexist": "El archivo ya existe: {{$a}}",
     "folder": "Carpeta",
@@ -101,7 +103,7 @@
     "mod_book": "Libro",
     "mod_chat": "Chat",
     "mod_choice": "Elección",
-    "mod_data": "Base de datos",
+    "mod_data": "BasedeDatos",
     "mod_database": "BasedeDatos",
     "mod_external-tool": "Herramienta externa",
     "mod_feedback": "Retroalimentación",
@@ -118,7 +120,7 @@
     "mod_quiz": "Examen",
     "mod_resource": "Recurso",
     "mod_scorm": "Paquete SCORM",
-    "mod_survey": "Encuesta predefinida",
+    "mod_survey": "Encuesta",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Taller",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index 3c0eceb2f94..444d54b807e 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -51,6 +51,7 @@
     "download": "Descargar",
     "downloading": "Descargando...",
     "edit": "Editar",
+    "elementseparator": ",",
     "error": "Error",
     "errorchangecompletion": "Ha ocurrido un error cargando el grado de realización. Por favor inténtalo de nuevo.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo de nuevo.",
@@ -96,11 +97,11 @@
     "mod_assignment": "Tarea",
     "mod_book": "Libro",
     "mod_chat": "Chat",
-    "mod_choice": "Consulta",
+    "mod_choice": "Elección",
     "mod_data": "Base de datos",
     "mod_database": "Base de datos",
     "mod_external-tool": "Herramienta externa",
-    "mod_feedback": "Módulo de encuesta",
+    "mod_feedback": "Retroalimentación",
     "mod_file": "Recurso",
     "mod_folder": "Directorio",
     "mod_forum": "Foro",
@@ -109,12 +110,12 @@
     "mod_imscp": "Paquete de contenidos IMS",
     "mod_label": "Etiqueta",
     "mod_lesson": "Lección",
-    "mod_lti": "LTI",
+    "mod_lti": "Herramienta externa",
     "mod_page": "Página",
     "mod_quiz": "Cuestionario",
     "mod_resource": "Recurso",
     "mod_scorm": "Paquete SCORM",
-    "mod_survey": "Encuesta predefinida",
+    "mod_survey": "Encuesta",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Taller",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index b0ec2d0645b..a6d6b8ca4b5 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -53,6 +53,7 @@
     "download": "Jaitsi",
     "downloading": "Jaisten",
     "edit": "Editatu",
+    "elementseparator": ",",
     "error": "Errorea",
     "errorchangecompletion": "Errorea gertatu da osaketa-egoera aldatzean. Mesedez saiatu berriz.",
     "errordeletefile": "Errorea fitxategia ezabatzean. Mesedez, saiatu berriz.",
@@ -68,6 +69,7 @@
     "errorrenamefile": "Errorea izena berrizendatzean. Mesedez, saiatu berriz.",
     "errorsync": "Errorea gertatu da sinkronizatzean. Mesedez, saiatu berriz.",
     "errorsyncblocked": "{{$a}} hau ezin izan da orain sinkronizatu prozesu bat martxan dagoelako. Mesedez, saiatu berriz beranduago. Arazoa errepikatzen bada, saiatu app-a berrabiarazten.",
+    "fieldvalueseparator": ":",
     "filename": "Fitxategiaren izena",
     "filenameexist": "Fitxategi-izena dagoeneko existitzen da: {{$a}}",
     "folder": "Karpeta",
@@ -98,12 +100,12 @@
     "mod_assign": "Zeregina",
     "mod_assignment": "Zeregina",
     "mod_book": "Liburua",
-    "mod_chat": "Txat-gela",
+    "mod_chat": "Txata",
     "mod_choice": "Kontsulta",
     "mod_data": "Datu-basea",
     "mod_database": "Datu-basea",
     "mod_external-tool": "Kanpoko tresna",
-    "mod_feedback": "Inkesta",
+    "mod_feedback": "Feedback-a",
     "mod_file": "Fitxategia",
     "mod_folder": "Karpeta",
     "mod_forum": "Foroa",
diff --git a/www/core/lang/fa.json b/www/core/lang/fa.json
index 41e61af53b7..959e4ea3e48 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -3,7 +3,7 @@
     "areyousure": "آیا مطمئن هستید؟",
     "back": "بازگشت",
     "cancel": "انصراف",
-    "cannotconnect": "امکان اتصال به سایت وکودندارد.نشانی سایت و اطلاعات ورود را بررسی کنید",
+    "cannotconnect": "اتصال به سایت ممکن نبود. بررسی کنید که نشانی سایت را درست وارد کرده باشید و اینکه سایت شما از مودل ۲٫۴ یا جدیدتر استفاده کند.",
     "category": "طبقه",
     "choose": "انتخاب کنید",
     "choosedots": "انتخاب کنید...",
@@ -17,11 +17,15 @@
     "completion-alt-auto-y": "تکمیل شده است",
     "completion-alt-manual-n": "کامل نشده است؛ انتخاب کنید تا به عنوان کامل شده علامت بخورد",
     "completion-alt-manual-y": "کامل شده است؛ انتخاب کنید تا به عنوان کامل شده علامت بخورد",
+    "confirmcanceledit": "آیا مطمئنید که می‌خواهید این صفحه را ترک کنید؟ تمام تغییرات از بین خواهند رفت.",
     "confirmdeletefile": "آیا مطمئنید که می‌خواهید این فایل را حذف کنید؟",
+    "confirmloss": "آیا مطمئن هستید؟ تمام تغییرات از بین خواهند رفت.",
     "content": "محتوا",
     "continue": "ادامه",
     "course": "درس",
     "coursedetails": "جزئیات درس",
+    "currentdevice": "دستگاه فعلی",
+    "datastoredoffline": "ارسال اطلاعات ناموفق بود. اطلاعات روی دستگاه ذخیره شد و بعدا به‌طور خودکار فرستاده خواهد شد.",
     "date": "تاریخ",
     "day": "روز",
     "days": "روز",
@@ -33,6 +37,7 @@
     "download": "دریافت",
     "edit": "ویرایش ",
     "error": "خطا",
+    "errordownloading": "خطا در دانلود فایل",
     "folder": "پوشه",
     "forcepasswordchangenotice": "برای پیش‌روی باید رمز ورود خود را تغییر دهید.",
     "fulllistofcourses": "همهٔ درس‌ها",
@@ -42,12 +47,13 @@
     "hide": "پنهان کردن",
     "hour": "ساعت",
     "hours": "ساعت",
+    "imageviewer": "نمایشگر تصویر",
     "info": "توضیحات",
     "labelsep": ":&nbsp;",
     "lastmodified": "آخرین تغییر",
     "listsep": ",",
     "loading": "بارگذاری",
-    "lostconnection": "اتصال قطع شد.اطلاعات توکن معتبر نیست",
+    "lostconnection": "اطلاعات توکن شناسایی شما معتبر نیست یا منقضی شده است. باید دوباره به سایت متصل شوید.",
     "maxsizeandattachments": "حداکثر اندازه برای فایل‌های جدید: {{$a.size}}، حداکثر تعداد فایل‌های پیوست: {{$a.attachments}}",
     "min": "دقیقه",
     "mins": "دقیقه",
@@ -80,10 +86,12 @@
     "numwords": "{{$a}} کلمه",
     "offline": "آفلاین",
     "online": "آنلاین",
+    "openinbrowser": "باز کردن در مرورگر",
     "pagea": "صفحه {{$a}}",
     "phone": "تلفن",
     "pictureof": "عکس {{$a}}",
     "previous": "قبلی",
+    "pulltorefresh": "برای تازه‌سازی بکشید",
     "refresh": "تازه‌سازی",
     "required": "الزامی بودن",
     "save": "ذخیره",
@@ -97,11 +105,13 @@
     "sending": "ارسال کردن",
     "serverconnection": "خطا در اتصال به کارگزار",
     "show": "نمایش",
+    "showmore": "نمایش بیشتر...",
     "site": "سایت",
     "sizeb": "بایت",
     "sizegb": "گیگابایت",
     "sizekb": "کیلوبایت",
     "sizemb": "مگابایت",
+    "sorry": "متاسفیم...",
     "start": "آغاز",
     "submit": "ارسال",
     "success": "موفق",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index b1d51078985..46ac02950b7 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -54,6 +54,7 @@
     "download": "Télécharger",
     "downloading": "Téléchargement en cours",
     "edit": "Modifier",
+    "elementseparator": ",",
     "error": "Erreur",
     "errorchangecompletion": "Une erreur est survenue lors du changement de l'état d'achèvement. Veuillez essayer à nouveau.",
     "errordeletefile": "Erreur lors de la suppression du fichier. Veuillez essayer à nouveau.",
@@ -69,6 +70,7 @@
     "errorrenamefile": "Erreur lors du renommage du fichier. Veuillez essayer à nouveau.",
     "errorsync": "Une erreur est survenue lors de la synchronisation. Veuillez essayer plus tard.",
     "errorsyncblocked": "Ce {{$a}} ne peut pas être synchronisé à l'instant en raison d'une tâche en cours. Veuillez essayer plus tard. Si le problème persiste, veuillez relancer l'app.",
+    "fieldvalueseparator": ":",
     "filename": "Nom de fichier",
     "filenameexist": "Le nom de fichier existe déjà : {{$a}}",
     "folder": "Dossier",
@@ -189,7 +191,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Aïe !",
     "unexpectederror": "Erreur inattendue. Veuillez fermer et rouvrir l'app pour continuer",
-    "unicodenotsupported": "Le texte encodé en Unicode, par exemple les emojis, ne sont pas supportés sur ce site. Ces caractères seront supprimé avant l'envoi.",
+    "unicodenotsupported": "Les caractères encodés en Unicode, par exemple les emojis, ne sont pas supportés sur ce site. Ces caractères seront supprimés avant l'envoi.",
     "unicodenotsupportedcleanerror": "Un texte vide a été rencontré lors du nettoyage des caractères Unicode.",
     "unknown": "Inconnu",
     "unlimited": "Illimité",
diff --git a/www/core/lang/he.json b/www/core/lang/he.json
index 47bc8596120..e20a18bd9af 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -74,20 +74,20 @@
     "mod_feedback": "שאלון מותנה",
     "mod_file": "קובץ",
     "mod_folder": "תיקיה",
-    "mod_forum": "פורום (קבוצת־דיון)",
+    "mod_forum": "פורום",
     "mod_glossary": "אגרון מונחים",
     "mod_ims": "חבילת תוכן IMS",
     "mod_imscp": "חבילת תוכן IMS",
     "mod_label": "פסקה מעוצבת",
     "mod_lesson": "שיעור",
-    "mod_lti": "רכיב חיצוני (LTI)",
+    "mod_lti": "כלי חיצוני LTI",
     "mod_page": "דף תוכן מעוצב",
     "mod_quiz": "בוחן",
     "mod_resource": "משאב",
-    "mod_scorm": "חבילת SCORM",
-    "mod_survey": "תבנית סקרים מובנת",
+    "mod_scorm": "חבילת־לומדה SCORM",
+    "mod_survey": "תבנית סקרים מובנית",
     "mod_url": "קישור",
-    "mod_wiki": "ויקי (תוצר־משותף)",
+    "mod_wiki": "ויקי (תוצר משותף)",
     "mod_workshop": "הערכת־עמיתים",
     "moduleintro": "הנחיה לפעילות",
     "name": "שם",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index 2150dc7e90d..ef565c113a0 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -45,6 +45,7 @@
     "download": "Scarica",
     "downloading": "Scaricamento in corso",
     "edit": "Modifica",
+    "elementseparator": ",",
     "error": "Errore",
     "errorchangecompletion": "Si è verificato un errore durante la modifica dello stato di completamento. Per favore riprova.",
     "errordeletefile": "Si è verificato un errore durante l'eliminazione del file. Per favore riprova.",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 1fa825cfd25..19ab070955f 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -51,6 +51,7 @@
     "download": "Atsisiųsti",
     "downloading": "Siunčiama",
     "edit": "Redaguoti",
+    "elementseparator": ",",
     "error": "Klaida",
     "errorchangecompletion": "Klaida keičiant baigimo būseną. Pabandykite dar kartą.",
     "errordeletefile": "Klaida trinant failą. Pabandykite dar kartą.",
@@ -95,28 +96,28 @@
     "mod_assign": "Užduotis",
     "mod_assignment": "Užduotis",
     "mod_book": "Knyga",
-    "mod_chat": "Pokalbis",
+    "mod_chat": "Pokalbiai",
     "mod_choice": "Pasirinkimas",
     "mod_data": "Duomenų bazė",
     "mod_database": "Duomenų bazė",
     "mod_external-tool": "Išorinis įrankis",
-    "mod_feedback": "Atsiliepimas",
+    "mod_feedback": "Grįžtamasis ryšys",
     "mod_file": "Failas",
     "mod_folder": "Aplankas",
-    "mod_forum": "Diskusijos",
+    "mod_forum": "Forumas",
     "mod_glossary": "Žodynėlis",
     "mod_ims": "IMS turinio paketas",
     "mod_imscp": "IMS turinio paketas",
     "mod_label": "Etiketė",
     "mod_lesson": "Pamoka",
-    "mod_lti": "LTI",
+    "mod_lti": "Išorinis įrankis",
     "mod_page": "Puslapis",
     "mod_quiz": "Testas",
     "mod_resource": "Šaltinis",
     "mod_scorm": "SCORM paketas",
     "mod_survey": "Apklausa",
     "mod_url": "URL",
-    "mod_wiki": "Vikis",
+    "mod_wiki": "Wiki",
     "mod_workshop": "Darbas grupėje",
     "moduleintro": "Aprašas",
     "mygroups": "Mano grupės",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index c50185c0577..cbb560fa711 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -25,10 +25,12 @@
     "completion-alt-manual-y": "Voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
     "confirmcanceledit": "Weet je zeker dat je deze pagina wil verlaten? Alle wijzigingen zullen verloren gaan.",
     "confirmdeletefile": "Wil je dit bestand echt verwijderen?",
+    "confirmloss": "Ben je zeker? Alle wijzigingen zullen verloren gaan.",
     "confirmopeninbrowser": "Wil je het openen in je browser?",
     "content": "Inhoud",
     "contenteditingsynced": "De inhoud die je aan het bewerken bent, is gesynchroniseerd.",
     "continue": "Ga door",
+    "copiedtoclipboard": "Tekst gekopieerd naar klembord",
     "course": "Cursus",
     "coursedetails": "Cursusdetails",
     "currentdevice": "Huidig apparaat",
@@ -52,6 +54,7 @@
     "download": "Download",
     "downloading": "Downloaden",
     "edit": "Bewerk",
+    "elementseparator": ",",
     "error": "Fout",
     "errorchangecompletion": "Er is een fout opgetreden tijdens het wijzigen van de voltooiingsstatus. Probeer opnieuw.",
     "errordeletefile": "Fout tijdens het verwijderen van het bestand. Probeer opnieuw.",
@@ -60,12 +63,14 @@
     "errorfileexistssamename": "Er is al een bestand met deze naam.",
     "errorinvalidform": "Het formulier bevat ongeldige gegevens. Zorg ervoor dat je alle vereiste velden hebt ingevuld en dat de gegevens geldig zijn.",
     "errorinvalidresponse": "Ongeldig antwoord gekregen. Contacteer je Moodle site-beheerder als het probleem zich blijft voordoen.",
+    "errorloadingcontent": "Fout bij het laden van inhoud.",
     "erroropenfilenoapp": "Fout bij het openen van het bestand: geen enkele app gevonden om dit soort bestand te openen.",
     "erroropenfilenoextension": "Fout bij het openen van het bestand: het bestand heeft geen extentie.",
     "erroropenpopup": "Deze activiteit probeert een popup te openen. Dit wordt niet ondersteund in deze app.",
     "errorrenamefile": "Fout bij het hernoemen van het bestand. Probeer opnieuw.",
     "errorsync": "Er is een fout opgetreden tijdens het synchroniseren. Probeer opnieuw.",
     "errorsyncblocked": "Deze {{$a}} kan nu niet gesynchroniseerd worden omdat er nog een ander proces anders bezig is. Probeer later opnieuw. Als het probleem blijft aanhouden, probeer dan de app te herstarten.",
+    "fieldvalueseparator": ":",
     "filename": "Bestandsnaam",
     "filenameexist": "Bestandsnaam bestaat al: {{$a}}",
     "folder": "Map",
@@ -101,7 +106,7 @@
     "mod_data": "Databank",
     "mod_database": "Databank",
     "mod_external-tool": "Externe tool",
-    "mod_feedback": "Feedbackformulier",
+    "mod_feedback": "Feedback",
     "mod_file": "Bestand",
     "mod_folder": "Map",
     "mod_forum": "Forum",
@@ -186,6 +191,8 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Ojee!",
     "unexpectederror": "Onverwachte fout. Sluit en heropen de applicatie om opnieuw te proberen.",
+    "unicodenotsupported": "Unicode tekst, zoals emojis, worden niet ondersteund op deze site. Er zal tekst gestuurd worden, waarbij deze tekens verloren gaan.",
+    "unicodenotsupportedcleanerror": "Er is lege tekst gevonden tijdens het opschonen van Unicode-tekens.",
     "unknown": "Onbekend",
     "unlimited": "Onbeperkt",
     "unzipping": "Unzippen",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 2ab084735d9..7e469df2a12 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -25,10 +25,12 @@
     "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
     "confirmcanceledit": "Você tem certeza que quer sair dessa página? Todas as mudanças serão perdidas.",
     "confirmdeletefile": "Você tem certeza que quer excluir este arquivo?",
+    "confirmloss": "Você tem certeza? Todas as alterações serão perdidas.",
     "confirmopeninbrowser": "Você quer abri-lo no navegador?",
     "content": "Conteúdo",
     "contenteditingsynced": "O conteúdo que você está editando foi sincronizado.",
     "continue": "Continuar",
+    "copiedtoclipboard": "Texto copiado para a área de transferência",
     "course": "Curso",
     "coursedetails": "Detalhes do curso",
     "currentdevice": "Dispositivo atual",
@@ -51,6 +53,7 @@
     "download": "Download",
     "downloading": "Baixando",
     "edit": "Editar",
+    "elementseparator": ",",
     "error": "Erro",
     "errorchangecompletion": "Ocorreu um erro ao alterar o status de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao excluir o arquivo. Por favor tente novamente.",
@@ -59,12 +62,14 @@
     "errorfileexistssamename": "Já existe um arquivo com esse nome.",
     "errorinvalidform": "O formulário contém dados inválidos. Por favor tenha certeza de preencher todos os campos necessários e se os dados estão válidos.",
     "errorinvalidresponse": "Resposta inválida recebida. Por favor, contate o administrador do site Moodle se o erro persistir.",
+    "errorloadingcontent": "Erro ao carregar o conteúdo.",
     "erroropenfilenoapp": "Erro ao abrir o arquivo: nenhum aplicativo encontrado para abrir esse tipo de arquivo.",
     "erroropenfilenoextension": "Erro ao abrir o arquivo: o arquivo não tem extensão.",
     "erroropenpopup": "Esta atividade está tentando abrir um pop-up. Isto não é suportado neste app.",
     "errorrenamefile": "Erro ao renomear o arquivo. Por favor, tente novamente.",
     "errorsync": "Um erro aconteceu quando estava sincronizando. Por favor tente novamente.",
     "errorsyncblocked": "Esse {{$a}} não pode ser sincronizado agora por causa de um processo em andamento. Por favor tente mais tarde. Se o problema persistir, tente reiniciar o aplicativo.",
+    "fieldvalueseparator": ":",
     "filename": "Nome do arquivo",
     "filenameexist": "O nome do arquivo já existe: {{$a}}",
     "folder": "Pasta",
@@ -95,12 +100,12 @@
     "mod_assign": "Tarefa",
     "mod_assignment": "Tarefa",
     "mod_book": "Livro",
-    "mod_chat": "Chat",
+    "mod_chat": "Bate-papo",
     "mod_choice": "Escolha",
-    "mod_data": "Base de dados",
+    "mod_data": "Banco de dados",
     "mod_database": "Banco de dados",
     "mod_external-tool": "Ferramenta externa",
-    "mod_feedback": "Pesquisa",
+    "mod_feedback": "Feedback",
     "mod_file": "Arquivo",
     "mod_folder": "Pasta",
     "mod_forum": "Fórum",
@@ -109,12 +114,12 @@
     "mod_imscp": "Conteúdo de pacote IMS",
     "mod_label": "Rótulo",
     "mod_lesson": "Lição",
-    "mod_lti": "LTI",
+    "mod_lti": "Ferramenta externa",
     "mod_page": "Página",
     "mod_quiz": "Questionário",
     "mod_resource": "Recurso",
-    "mod_scorm": "Pacote SCORM",
-    "mod_survey": "Pesquisa de avaliação",
+    "mod_scorm": "Pacote SCROM",
+    "mod_survey": "Pesquisa",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Workshop",
@@ -185,6 +190,8 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Erro inesperado. Por favor, feche e abra novamente o aplicativo para tentar novamente",
+    "unicodenotsupported": "Texto Unicode como emojis não são suportados neste site, o texto será enviado removendo esses caracteres.",
+    "unicodenotsupportedcleanerror": "Texto vazio foi encontrado ao limpar caracteres Unicode.",
     "unknown": "Desconhecido",
     "unlimited": "Ilimitado",
     "unzipping": "Descompactando",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index 5c1291ed00b..b36ec5e0e0d 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -53,6 +53,7 @@
     "download": "Descarregar",
     "downloading": "A descarregar",
     "edit": "Editar",
+    "elementseparator": ",",
     "error": "Erro",
     "errorchangecompletion": "Ocorreu um erro ao alterar o estado de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao apagar o ficheiro. Por favor, tente novamente.",
@@ -68,6 +69,7 @@
     "errorrenamefile": "Erro ao mudar o nome do ficheiro. Por favor, tente novamente.",
     "errorsync": "Ocorreu um erro durante a sincronização. Por favor, tente novamente.",
     "errorsyncblocked": "Não é possível sincronizar agora este {{$a}} devido a um outro processo já em andamento. Por favor, tente novamente mais tarde. Se o problema persistir, tente reiniciar a aplicação.",
+    "fieldvalueseparator": ":",
     "filename": "Nome do ficheiro",
     "filenameexist": "O nome do ficheiro já existe: {{$a}}",
     "folder": "Pasta",
@@ -117,7 +119,7 @@
     "mod_quiz": "Teste",
     "mod_resource": "Recurso",
     "mod_scorm": "Pacote SCORM",
-    "mod_survey": "Inquérito predefinido",
+    "mod_survey": "Inquérito",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Workshop",
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index deb5b67132e..a8102950e02 100644
--- a/www/core/lang/ro.json
+++ b/www/core/lang/ro.json
@@ -42,6 +42,7 @@
     "download": "Descarcă",
     "downloading": "Se descarcă",
     "edit": "Editează",
+    "elementseparator": ",",
     "error": "Eroare",
     "errorchangecompletion": "A apărut o eroare în timpul schimbării nivelului de completare a cursului. Încercați din nou!",
     "errordownloading": "A apărut o eroare la descărcarea fișierului.",
@@ -74,7 +75,7 @@
     "maxsizeandattachments": "Dimensiunea maximă pentru fișierele noi: {{$a.size}}, atașamente maxime: {{$a.attachments}}",
     "min": "min",
     "mins": "min",
-    "mod_assign": "Lucrare",
+    "mod_assign": "Temă",
     "mod_assignment": "Temă",
     "mod_book": "Carte",
     "mod_chat": "Chat",
@@ -90,8 +91,8 @@
     "mod_ims": "Pachet cu conținut IMS",
     "mod_imscp": "Pachet cu conținut IMS",
     "mod_label": "Etichetă",
-    "mod_lesson": "Lecţie",
-    "mod_lti": null,
+    "mod_lesson": "Lecție",
+    "mod_lti": "Instrument din afara aplicației",
     "mod_page": "Pagină",
     "mod_quiz": "Test",
     "mod_resource": "Resursă",
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index 51d7861fd1f..b0ccdb40434 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -37,6 +37,7 @@
     "download": "Скачать",
     "downloading": "Загрузка",
     "edit": "Редактировать",
+    "elementseparator": ",",
     "error": "Ошибка",
     "errordownloading": "Ошибка загрузки файла",
     "filename": "Имя файла",
@@ -80,7 +81,7 @@
     "mod_page": "Страница",
     "mod_quiz": "Тест",
     "mod_resource": "Ресурс",
-    "mod_scorm": "Пакет SCORM",
+    "mod_scorm": "SCORM-пакет",
     "mod_survey": "Анкета",
     "mod_url": "URL",
     "mod_wiki": "Вики",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index 41824b3f50e..473c171aa38 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -42,6 +42,7 @@
     "download": "Ladda ner",
     "downloading": "Laddar ner",
     "edit": "Redigera",
+    "elementseparator": ",",
     "error": "Fel",
     "errorchangecompletion": "Ett fel uppstod när du ändrade status för fullföljande. Var god försök igen.",
     "errordownloading": "Fel vid nedladdning av fil",
@@ -74,10 +75,10 @@
     "maxsizeandattachments": "Maximal storlek för nya filer: {{$a.size}}, max bilagor: {{$a.attachments}}",
     "min": "minut",
     "mins": "minuter",
-    "mod_assign": "Inlämningsuppgift",
+    "mod_assign": "Uppgift",
     "mod_assignment": "Uppgift",
     "mod_book": "Bok",
-    "mod_chat": "Direktsamtal",
+    "mod_chat": "Chat",
     "mod_choice": "Opinionsundersökning",
     "mod_data": "Databas",
     "mod_database": "Databas",
@@ -91,11 +92,11 @@
     "mod_imscp": "Innehållspaket av typ IMS",
     "mod_label": "Etikett",
     "mod_lesson": "Lektion",
-    "mod_lti": null,
+    "mod_lti": "External tool",
     "mod_page": "Sida",
     "mod_quiz": "Test",
     "mod_resource": "Resurs",
-    "mod_scorm": "SCORM-paket",
+    "mod_scorm": "Scormpaket",
     "mod_survey": "Färdig enkät",
     "mod_url": "URL/Webbadress",
     "mod_wiki": "Wiki",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index 4d3df8cb624..ce95ef58e73 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -64,7 +64,7 @@
     "mod_assign": "Ödev",
     "mod_book": "Kitap",
     "mod_chat": "Sohbet",
-    "mod_choice": "Anket",
+    "mod_choice": "Seçenek",
     "mod_data": "Veritabanı",
     "mod_database": "Veritabanı",
     "mod_external-tool": "Harici araç",
@@ -82,7 +82,7 @@
     "mod_quiz": "Sınav",
     "mod_resource": "Kaynak",
     "mod_scorm": "SCORM paketi",
-    "mod_survey": "Anket Formu",
+    "mod_survey": "Anket",
     "mod_url": "URL",
     "mod_wiki": "Wiki",
     "mod_workshop": "Çalıştay",
diff --git a/www/core/lang/zh-cn.json b/www/core/lang/zh-cn.json
index b97b6694361..68fba3c90fa 100644
--- a/www/core/lang/zh-cn.json
+++ b/www/core/lang/zh-cn.json
@@ -33,6 +33,7 @@
     "download": "下载",
     "edit": "编辑",
     "error": "错误",
+    "errordownloading": "下载文件时出错",
     "filename": "文件名",
     "folder": "文件夹",
     "forcepasswordchangenotice": "继续下去之前，您必须修改您的密码。",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index 5183ee101d5..e599a4db4c9 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -52,6 +52,7 @@
     "download": "下載",
     "downloading": "下載中",
     "edit": "編修",
+    "elementseparator": ",",
     "error": "錯誤",
     "errorchangecompletion": "更改完成狀態時發生錯誤. 請再試一次.",
     "errordeletefile": "刪除檔案時出錯. 請再試一次.",
@@ -93,15 +94,15 @@
     "maxsizeandattachments": "新檔案的最大容量： {{$a.size}} ，最多附件：{{$a.attachments}}",
     "min": "分鐘",
     "mins": "分鐘",
-    "mod_assign": "作業",
+    "mod_assign": "分配",
     "mod_assignment": "分配",
     "mod_book": "預定",
-    "mod_chat": "聊天室",
-    "mod_choice": "票選活動",
+    "mod_chat": "交談",
+    "mod_choice": "選擇",
     "mod_data": "資料庫",
     "mod_database": "資料庫",
     "mod_external-tool": "外部工具",
-    "mod_feedback": "回饋單",
+    "mod_feedback": "回饋",
     "mod_file": "檔案",
     "mod_folder": "資料夾",
     "mod_forum": "討論區",
@@ -109,15 +110,15 @@
     "mod_ims": "IMS內容套件",
     "mod_imscp": "IMS內容套件",
     "mod_label": "標籤",
-    "mod_lesson": "編序學習",
-    "mod_lti": "學習工具互通",
+    "mod_lesson": "課程",
+    "mod_lti": "外部工具",
     "mod_page": "分頁",
-    "mod_quiz": "測驗卷",
+    "mod_quiz": "測驗",
     "mod_resource": "資源",
-    "mod_scorm": "SCORM包裹",
-    "mod_survey": "問卷",
+    "mod_scorm": "SCORM套件",
+    "mod_survey": "調查",
     "mod_url": "網址",
-    "mod_wiki": "Wiki共筆",
+    "mod_wiki": "維基百科",
     "mod_workshop": "工作坊",
     "moduleintro": "說明",
     "mygroups": "我的群組",

From 42bd485d65340cefca044663d866a6c80f991ec8 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 19 May 2017 13:08:55 +0200
Subject: [PATCH 183/218] MOBILE-2103 release: Bump version number

---
 config.xml         | 2 +-
 www/config.json    | 4 ++--
 www/errorreport.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.xml b/config.xml
index ab278951601..762cadb9a29 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.moodle.moodlemobile" version="3.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.moodle.moodlemobile" version="3.3.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>Moodle Mobile</name>
   <description>Official Moodle Mobile app</description>
   <author href="http://moodle.com" email="juan@moodle.com">Juan Leyva</author>
diff --git a/www/config.json b/www/config.json
index a1a4fc25c2d..9539fb2d134 100644
--- a/www/config.json
+++ b/www/config.json
@@ -1,8 +1,8 @@
 {
     "app_id" : "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
-    "versioncode" : "2017",
-    "versionname" : "3.2.1",
+    "versioncode" : "2018",
+    "versionname" : "3.3.0",
     "cache_expiration_time" : 300000,
     "default_lang" : "en",
     "languages": {"ar": "عربي", "bg": "Български", "ca": "Català", "cs": "Čeština", "da": "Dansk", "de": "Deutsch","en": "English", "es": "Español", "es-mx": "Español - México", "eu": "Euskara", "fa": "فارسی", "fr" : "Français", "he" : "עברית", "hu": "magyar", "it": "Italiano", "ja": "日本語","nl": "Nederlands", "pl": "Polski", "pt-br": "Português - Brasil", "pt": "Português - Portugal", "ro": "Română", "ru": "Русский", "sv": "Svenska", "tr" : "Türkçe", "zh-cn" : "简体中文", "zh-tw" : "正體中文"},
diff --git a/www/errorreport.js b/www/errorreport.js
index a773fffef53..e1301956fd9 100644
--- a/www/errorreport.js
+++ b/www/errorreport.js
@@ -16,7 +16,7 @@
 // Using JS confirm function we are sure that the user get notified in a Mobile device.
 // This script should be added at the begining of the index.html and it should only use native javascript functions.
 
-var appVersion = '3.2.1 (2017)',
+var appVersion = '3.3.0 (2018)',
     reportInBackgroundName = 'mmCoreReportInBackground',
     errors = [],
     ignoredFiles = ['www/index.html#/site/mod_page', 'www/index.html#/site/mod_resource', 'www/index.html#/site/mm_course-section'],

From fb9dd11fca308d209401869cebf297a0cfade0eb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 19 May 2017 14:00:42 +0200
Subject: [PATCH 184/218] MOBILE-2103 calendar: Show repeated events only once

---
 www/addons/calendar/controllers/list.js |  3 ++-
 www/core/lib/util.js                    | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/www/addons/calendar/controllers/list.js b/www/addons/calendar/controllers/list.js
index 0cd5f0af77a..5ef1ab47781 100644
--- a/www/addons/calendar/controllers/list.js
+++ b/www/addons/calendar/controllers/list.js
@@ -87,7 +87,8 @@ angular.module('mm.addons.calendar')
                 if (refresh) {
                     $scope.events = events;
                 } else {
-                    $scope.events = $scope.events.concat(events);
+                    // Filter events with same ID. Repeated events are returned once per WS call, show them only once.
+                    $scope.events = $mmUtil.mergeArraysWithoutDuplicates($scope.events, events, 'id');
                 }
                 $scope.eventsLoaded = true;
                 $scope.canLoadMore = true;
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 3c52cc174f7..0edb004b4b3 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -2063,10 +2063,11 @@ angular.module('mm.core')
          * @name $mmUtil#mergeArraysWithoutDuplicates
          * @param  {Array} array1 The first array.
          * @param  {Array} array2 The second array.
+         * @param  {String} [key] Key of the property that must be unique. If not specified, the whole entry.
          * @return {Array}        Merged array.
          */
-        self.mergeArraysWithoutDuplicates = function(array1, array2) {
-            return self.uniqueArray(array1.concat(array2));
+        self.mergeArraysWithoutDuplicates = function(array1, array2, key) {
+            return self.uniqueArray(array1.concat(array2), key);
         };
 
         /**
@@ -2075,19 +2076,25 @@ angular.module('mm.core')
          * @module mm.core
          * @ngdoc method
          * @name $mmUtil#uniqueArray
-         * @param  {Array} array The array to treat.
-         * @return {Array}       Array without duplicate values.
+         * @param  {Array} array  The array to treat.
+         * @param  {String} [key] Key of the property that must be unique. If not specified, the whole entry.
+         * @return {Array}        Array without duplicate values.
          */
-        self.uniqueArray = function(array) {
-            var unique = [],
+        self.uniqueArray = function(array, key) {
+            var filtered = [],
+                unique = [],
                 len = array.length;
+
             for (var i = 0; i < len; i++) {
-                var value = array[i];
+                var entry = array[i],
+                    value = key ? entry[key] : entry;
                 if (unique.indexOf(value) == -1) {
                     unique.push(value);
+                    filtered.push(entry);
                 }
             }
-            return unique;
+
+            return filtered;
         };
 
         /**

From f3b9c27161ee1121f818fe54479cd3ff41448b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 19 May 2017 13:43:27 +0200
Subject: [PATCH 185/218] MOBILE-2103 course: Hide link of non available
 activities

---
 www/core/components/course/templates/module.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/core/components/course/templates/module.html b/www/core/components/course/templates/module.html
index 01037997d48..72beee6afcd 100644
--- a/www/core/components/course/templates/module.html
+++ b/www/core/components/course/templates/module.html
@@ -1,8 +1,8 @@
-<a id="mm-course-module-{{module.id}}" class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-click="action && action($event)" ng-class="{'item-media': icon, 'mm-not-clickable': !action, 'item-dimmed': module.visible === 0 || module.uservisible === false}" ng-controller="module._controller" title="{{ module.name }}" ng-if="module.visibleoncoursepage !== 0">
+<a id="mm-course-module-{{module.id}}" class="item item-text-wrap mm-course-module-handler clearfix {{class}}" ng-click="module.uservisible !== false && action && action($event)" ng-class="{'item-media': icon, 'mm-not-clickable': !action || module.uservisible === false, 'item-dimmed': module.visible === 0 || module.uservisible === false}" ng-controller="module._controller" title="{{ module.name }}" ng-if="module.visibleoncoursepage !== 0">
 
     <img ng-src="{{ icon }}" alt="" role="presentation" ng-if="icon">
 
-    <div class="buttons mm-module-buttons" ng-class="{'mm-button-completion': module.completionstatus}" ng-if="(buttons && buttons.length > 0) || spinner || module.completionstatus">
+    <div class="buttons mm-module-buttons" ng-class="{'mm-button-completion': module.completionstatus}" ng-if="module.uservisible !== false && ((buttons && buttons.length > 0) || spinner || module.completionstatus)">
         <mm-completion ng-if="module.completionstatus" completion="module.completionstatus" module-name="module.name" after-change="completionChanged"></mm-completion>
 
         <button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon" aria-label="{{ button.label | translate }}">

From 5ebf7b0a71c5a7f9ae945351368fdca5b836e254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 19 May 2017 14:23:24 +0200
Subject: [PATCH 186/218] MOBILE-2103 feedback: Recover last completed values
 for first page

---
 www/addons/mod/feedback/services/feedback.js         | 10 +++++++++-
 www/addons/mod/feedback/services/helper.js           |  2 +-
 www/addons/mod/feedback/services/prefetch_handler.js | 11 +++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 1d61b96f7c2..7706c3ee3fc 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -564,8 +564,16 @@ angular.module('mm.addons.mod_feedback')
          */
         function fillValues(feedbackId, items, offline, ignoreCache, siteId) {
             return self.getCurrentValues(feedbackId, offline, ignoreCache, siteId).then(function(valuesArray) {
-                var values = {};
+                if (valuesArray.length == 0) {
+                    // Try sending empty values to get the last completed attempt values.
+                    return self.processPage(feedbackId, 0, {}).then(function() {
+                        return self.getCurrentValues(feedbackId, offline, ignoreCache, siteId);
+                    });
+                }
+                return valuesArray;
 
+            }).then(function(valuesArray) {
+                var values = {};
                 angular.forEach(valuesArray, function(value) {
                     values[value.item] = value.value;
                 });
diff --git a/www/addons/mod/feedback/services/helper.js b/www/addons/mod/feedback/services/helper.js
index 92c5cd1893d..1ab0a761512 100644
--- a/www/addons/mod/feedback/services/helper.js
+++ b/www/addons/mod/feedback/services/helper.js
@@ -171,7 +171,7 @@ angular.module('mm.addons.mod_feedback')
             var range = item.presentation.split($mmaModFeedback.FEEDBACK_LINE_SEP) || [];
             item.rangefrom = range.length > 0 ? parseInt(range[0], 10) || '' : '';
             item.rangeto = range.length > 1 ? parseInt(range[1], 10) || '' : '';
-            item.value = typeof item.rawValue != "undefined" ? item.rawValue : "";
+            item.value = typeof item.rawValue != "undefined" ? parseFloat(item.rawValue) : "";
 
             return item;
         }
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index f133f21fcb6..5d02e2e1ced 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -236,8 +236,15 @@ angular.module('mm.addons.mod_feedback')
                 p2.push($mmaModFeedback.getItems(feedback.id, siteId));
 
                 if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
-                    p2.push($mmaModFeedback.getCurrentValues(feedback.id, false, true, siteId));
-                    p2.push($mmaModFeedback.getResumePage(feedback.id, false, true, siteId));
+                    // Send empty data, so it will recover last completed feedback attempt values.
+                    p2.push($mmaModFeedback.processPage(feedback.id, 0, {}, undefined, undefined, undefined, siteId).finally(function() {
+                        var p4 = [];
+
+                        p4.push($mmaModFeedback.getCurrentValues(feedback.id, false, true, siteId));
+                        p4.push($mmaModFeedback.getResumePage(feedback.id, false, true, siteId));
+
+                        return $q.all(p4);
+                    }));
                 }
 
                 return $q.all(p2);

From c0d8ad9d2dc3c0afe5c3673dce1e7b518861c4e1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 22 May 2017 09:28:25 +0200
Subject: [PATCH 187/218] MOBILE-2103 user: Show modal while uploading image

---
 www/core/components/user/controllers/profile.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/core/components/user/controllers/profile.js b/www/core/components/user/controllers/profile.js
index dbd32897c9c..2147cdbbda5 100644
--- a/www/core/components/user/controllers/profile.js
+++ b/www/core/components/user/controllers/profile.js
@@ -116,10 +116,13 @@ angular.module('mm.core.user')
         var filterMethods = ['album', 'camera'];
 
         return $mmFileUploaderHelper.selectAndUploadFile(maxSize, title, filterMethods).then(function(result) {
+            var modal = $mmUtil.showModalLoading('mm.core.sending', true);
             return $mmUser.changeProfilePicture(result.itemid, $scope.userId).then(function(profileimageurl) {
                 $mmEvents.trigger(mmUserProfilePictureUpdated, {userId: $scope.userId, picture: profileimageurl});
                 $mmSitesManager.updateSiteInfo($mmSite.getId());
                 $scope.refreshUser();
+            }).finally(function() {
+                modal.dismiss();
             });
         }).catch(function(message) {
             if (message) {

From 67c89452bce536ce511c67016f6d7495924cc642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 22 May 2017 09:38:00 +0200
Subject: [PATCH 188/218] MOBILE-2103 grades: Fix grade width on small tablets

---
 www/core/components/grades/scss/styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/core/components/grades/scss/styles.scss b/www/core/components/grades/scss/styles.scss
index c806a2b28d1..019d1f53bd9 100644
--- a/www/core/components/grades/scss/styles.scss
+++ b/www/core/components/grades/scss/styles.scss
@@ -60,7 +60,7 @@
   .itemcenter {
     @extend .item;
     padding: 10px;
-    white-space: nowrap;
+    white-space: normal;
   }
   .feedbacktext {
     padding-left: 10px;

From d4284e1ac1fcbb358260c2af13c1beb5755fd3d3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 22 May 2017 10:47:39 +0200
Subject: [PATCH 189/218] MOBILE-2103 strings: Apply Helen revision of new
 strings

---
 www/addons/mod/feedback/lang/en.json | 2 +-
 www/addons/mod/lesson/lang/en.json   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/feedback/lang/en.json b/www/addons/mod/feedback/lang/en.json
index 51913affb96..6b06ba37004 100644
--- a/www/addons/mod/feedback/lang/en.json
+++ b/www/addons/mod/feedback/lang/en.json
@@ -3,7 +3,7 @@
     "anonymous": "Anonymous",
     "anonymous_entries": "Anonymous entries ({{$a}})",
     "average": "Average",
-    "captchaofflinewarning" : "Feedback with captcha cannot be completed if not configured, offline mode or with the server down.",
+    "captchaofflinewarning" : "Feedback with captcha cannot be completed offline, or if not configured, or if the server is down.",
     "complete_the_form": "Answer the questions...",
     "completed_feedbacks": "Submitted answers",
     "continue_the_form": "Continue the form",
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 63e9e2860ab..903667efb1a 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -21,9 +21,9 @@
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
     "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
-    "errorreviewretakenotlast": "This attempt cannot be reviewed anymore because another attempt was finished.",
+    "errorreviewretakenotlast": "This attempt can no longer be reviewed because another attempt has been finished.",
     "finish": "Finish",
-    "finishretakeoffline": "This attempt has been finished in offline.",
+    "finishretakeoffline": "This attempt was finished offline.",
     "firstwrong": "You have answered incorrectly. Would you like to attempt the question again? (If you now answer the question correctly, it will not count towards your final score.)",
     "gotoendoflesson": "Go to the end of the lesson",
     "grade": "Grade",
@@ -74,7 +74,7 @@
     "timeremaining": "Time remaining",
     "timetaken": "Time taken",
     "unseenpageinbranch": "Unseen question within a content page",
-    "warningretakefinished": "The attempt was finished in the site.",
+    "warningretakefinished": "The attempt was finished on the website.",
     "welldone": "Well done!",
     "youhaveseen": "You have seen more than one page of this lesson already.<br />Do you want to start at the last page you saw?",
     "youranswer": "Your answer",

From b137a7da2892a3fc5eff9eb3d95c9b8903a1d16d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 22 May 2017 12:51:55 +0200
Subject: [PATCH 190/218] MOBILE-2103 contextmenu: Remove popover-open class to
 prevent Ionic bug

---
 www/core/directives/contextmenu.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/www/core/directives/contextmenu.js b/www/core/directives/contextmenu.js
index 111b6fd47da..4ae6abfbadd 100644
--- a/www/core/directives/contextmenu.js
+++ b/www/core/directives/contextmenu.js
@@ -85,6 +85,13 @@ angular.module('mm.core')
     function hideContextMenu(close) {
         if (close) {
             $scope.contextMenuPopover.hide();
+            $timeout(function() {
+                if (!document.querySelector('.popover-backdrop.active')) {
+                    // No popover open, remove class from body to prevent Ionic bug:
+                    // https://github.com/driftyco/ionic-v1/issues/53
+                    angular.element(document.body).removeClass('popover-open');
+                }
+            }, 1); // Using default hide time for popovers.
         }
     }
 
@@ -96,11 +103,15 @@ angular.module('mm.core')
 
     $scope.$on('$destroy', function() {
         if ($scope.contextMenuPopover) {
+            hideContextMenu(true);
             $scope.contextMenuPopover.remove();
         } else {
             // Directive destroyed before popover was initialized. Wait a bit and try again.
             $timeout(function() {
-                $scope.contextMenuPopover && $scope.contextMenuPopover.remove();
+                if ($scope.contextMenuPopover) {
+                    hideContextMenu(true);
+                    $scope.contextMenuPopover.remove();
+                }
             }, 200);
         }
     });

From e9d245375000f738c1d2108957f16909f7144f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 22 May 2017 13:36:32 +0200
Subject: [PATCH 191/218] MOBILE-2103 core: Fix some icons color

---
 scss/app.scss | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index aeda7ed1817..3a670e093c7 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -105,11 +105,24 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   }
 }
 
-.button .icon {
-  color: $positive;
+.button,
+.button.button-icon {
+  .icon,
+  &.active,
+  &.activated,
+  &.active .icon,
+  &.activated .icon {
+    color: $positive;
 
-  &.icon-accessory {
-    color: $item-icon-accessory-color;
+    &.assertive {
+      color: $assertive;
+    }
+    &.dark {
+      color: $dark;
+    }
+    &.icon-accessory {
+      color: $item-icon-accessory-color;
+    }
   }
 }
 
@@ -125,6 +138,12 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   color: $bar-content-text;
 }
 
+.item-delete .button.icon,
+.item-delete .button.icon.active,
+.item-delete .button.icon.actived {
+  color: $assertive;
+}
+
 // Setting the default button to button-outline positive.
 .button {
   &.button-light,
@@ -142,6 +161,10 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
     &.activated {
       box-shadow: none;
       color: $white;
+
+      .icon {
+        color: $white;
+      }
     }
   }
 
@@ -149,6 +172,10 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   &.activated {
     box-shadow: none;
     color: $white;
+
+    .icon {
+      color: $white;
+    }
   }
 
   &.button-dark {

From f1ff5350c12a5297cf388458f801b849905344af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 22 May 2017 16:43:11 +0200
Subject: [PATCH 192/218] MOBILE-2103 assign: Load feedback and submission
 plugins

---
 www/addons/mod/assign/directives/submission.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/assign/directives/submission.js b/www/addons/mod/assign/directives/submission.js
index 375387240b6..a225feb913f 100644
--- a/www/addons/mod/assign/directives/submission.js
+++ b/www/addons/mod/assign/directives/submission.js
@@ -231,11 +231,14 @@ angular.module('mm.addons.mod_assign')
                         $mmaModAssign.getSubmissionGradingStatusTranslationId(scope.grade.gradingStatus);
                 }
 
-                if (!scope.feedback) {
+                if (!scope.feedback || !scope.feedback.plugins) {
                     scope.feedback = {};
 
                     // Feedback plugins not present, we have to use assign configs to detect the plugins used.
                     scope.feedback.plugins = $mmaModAssignHelper.getPluginsEnabled(assign, 'assignfeedback');
+                    console.error(assign, scope.feedback.plugins);
+                } else {
+                    console.error(scope.feedback);
                 }
 
                 // Check if there's any offline data for this submission.
@@ -481,7 +484,7 @@ angular.module('mm.addons.mod_assign')
                     promises.push(feedbackController(scope, assign, response.feedback, courseId, moduleId, submitId));
 
                     // Check if there's any unsupported plugin for editing.
-                    if (!scope.userSubmission) {
+                    if (!scope.userSubmission || !scope.userSubmission.plugins) {
                         scope.userSubmission = {};
                         // Submission not created yet, we have to use assign configs to detect the plugins used.
                         scope.userSubmission.plugins = $mmaModAssignHelper.getPluginsEnabled(assign, 'assignsubmission');

From 525a3ecb2146d6b68a64b7b8090e6553fc3e3314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 22 May 2017 16:43:38 +0200
Subject: [PATCH 193/218] MOBILE-2103 forum: Delete not used strings

---
 www/addons/mod/forum/lang/ca.json    | 2 --
 www/addons/mod/forum/lang/cs.json    | 2 --
 www/addons/mod/forum/lang/da.json    | 2 --
 www/addons/mod/forum/lang/de.json    | 2 --
 www/addons/mod/forum/lang/el.json    | 2 --
 www/addons/mod/forum/lang/es-mx.json | 2 --
 www/addons/mod/forum/lang/es.json    | 2 --
 www/addons/mod/forum/lang/eu.json    | 2 --
 www/addons/mod/forum/lang/fr.json    | 2 --
 www/addons/mod/forum/lang/lt.json    | 2 --
 www/addons/mod/forum/lang/nl.json    | 2 --
 www/addons/mod/forum/lang/pt-br.json | 2 --
 www/addons/mod/forum/lang/pt.json    | 2 --
 www/addons/mod/forum/lang/ru.json    | 2 --
 www/addons/mod/forum/lang/zh-tw.json | 2 --
 15 files changed, 30 deletions(-)

diff --git a/www/addons/mod/forum/lang/ca.json b/www/addons/mod/forum/lang/ca.json
index 9b03a43476a..5f1be9cd58c 100644
--- a/www/addons/mod/forum/lang/ca.json
+++ b/www/addons/mod/forum/lang/ca.json
@@ -25,8 +25,6 @@
     "refreshdiscussions": "Actualitza els debats",
     "refreshposts": "Actualitza els missatges",
     "reply": "Respon",
-    "sortnewestfirst": "Mostra els més recents primer",
-    "sortoldestfirst": "Mostra els més antics primer",
     "subject": "Assumpte",
     "unread": "No llegit",
     "unreadpostsnumber": "{{$a}} missatges no llegits"
diff --git a/www/addons/mod/forum/lang/cs.json b/www/addons/mod/forum/lang/cs.json
index 0c872da170b..1477982359d 100644
--- a/www/addons/mod/forum/lang/cs.json
+++ b/www/addons/mod/forum/lang/cs.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Obnovit diskuse",
     "refreshposts": "Obnovit diskusní příspěvky",
     "reply": "Odpovědět",
-    "sortnewestfirst": "Zobrazit nejnovější",
-    "sortoldestfirst": "Zobrazit nejstarší",
     "subject": "Předmět",
     "unread": "Nepřečteno",
     "unreadpostsnumber": "Nepřečtené příspěvky: {{$a}}"
diff --git a/www/addons/mod/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index 5d5b273c23b..bdbd7c0a872 100644
--- a/www/addons/mod/forum/lang/da.json
+++ b/www/addons/mod/forum/lang/da.json
@@ -25,8 +25,6 @@
     "refreshdiscussions": "Genindlæs diskussioner",
     "refreshposts": "Genindlæs indlæg",
     "reply": "Svar",
-    "sortnewestfirst": "Vis nyeste først",
-    "sortoldestfirst": "Vis ældste først",
     "subject": "Emne",
     "unread": "Ikke læst",
     "unreadpostsnumber": "{{$a}} nye indlæg"
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index 52492263eb9..22814dbf13e 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Themen aktualisieren",
     "refreshposts": "Forenbeiträge aktualisieren",
     "reply": "Antworten",
-    "sortnewestfirst": "Neu zuerst",
-    "sortoldestfirst": "Alt zuerst",
     "subject": "Betreff",
     "unread": "Ungelesen",
     "unreadpostsnumber": "{{$a}} ungelesene Beiträge"
diff --git a/www/addons/mod/forum/lang/el.json b/www/addons/mod/forum/lang/el.json
index 4fbff1a9446..78bee38ce77 100644
--- a/www/addons/mod/forum/lang/el.json
+++ b/www/addons/mod/forum/lang/el.json
@@ -24,8 +24,6 @@
     "refreshdiscussions": "Ανανεώστε τις συζητήσεις",
     "refreshposts": "Ανανεώστε τα μηνύματα της συζήτησης",
     "reply": "Απάντηση",
-    "sortnewestfirst": "Εμφανίστε πρώτα τα νεότερα",
-    "sortoldestfirst": "Εμφανίστε πρώτα τα παλαιότερα",
     "subject": "Θέμα",
     "unread": "Μη αναγνωσμένο",
     "unreadpostsnumber": "{{$a}} μη αναγνωσμένες δημοσιεύσεις"
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index 13a2026b53c..c3743416512 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Refrescar discusiones",
     "refreshposts": "Refrescar publicaciones de discusiones",
     "reply": "Responder (réplica)",
-    "sortnewestfirst": "Mostrar primeramente los más nuevos",
-    "sortoldestfirst": "Mostrar primeramente los más antiguos",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"
diff --git a/www/addons/mod/forum/lang/es.json b/www/addons/mod/forum/lang/es.json
index 616127e8155..2389777bf37 100644
--- a/www/addons/mod/forum/lang/es.json
+++ b/www/addons/mod/forum/lang/es.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Actualizar foro",
     "refreshposts": "Actualizar publicaciones del foro",
     "reply": "Responder",
-    "sortnewestfirst": "Mostrar los más nuevos primero",
-    "sortoldestfirst": "Mostrar los más antiguos primero",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"
diff --git a/www/addons/mod/forum/lang/eu.json b/www/addons/mod/forum/lang/eu.json
index 8d101ce7c90..7d41bf9eff3 100644
--- a/www/addons/mod/forum/lang/eu.json
+++ b/www/addons/mod/forum/lang/eu.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Freskatu eztabaidak",
     "refreshposts": "Freskatu eztabaidetako mezuak",
     "reply": "Erantzun",
-    "sortnewestfirst": "Erakutsi berrienak lehenago",
-    "sortoldestfirst": "Erakutsi zaharrenak lehenago",
     "subject": "Gaia",
     "unread": "Irakurri gabe",
     "unreadpostsnumber": "Irakurri gabeko {{$a}} mezu"
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index cdc750bf5ea..09bf43de5be 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Rafraîchir les discussions",
     "refreshposts": "Rafraîchir les messages des discussions",
     "reply": "Répondre",
-    "sortnewestfirst": "Afficher la plus récente en premier",
-    "sortoldestfirst": "Afficher la plus ancienne en premier",
     "subject": "Sujet",
     "unread": "Non lu",
     "unreadpostsnumber": "{{$a}} messages non lus"
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 4b8b79b3365..82a99a7e4f4 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Atnaujinti pokalbius",
     "refreshposts": "Atnaujinti pokalbių įrašus",
     "reply": "Atsakyti",
-    "sortnewestfirst": "Rodyti naujesnius",
-    "sortoldestfirst": "Rodyti senesnius",
     "subject": "Temos pavadinimas",
     "unread": "Neperskaityta",
     "unreadpostsnumber": "Neperskaitytų skelbimų: {{$a}}"
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 648c381b008..83fddedda47 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Discussie verversen",
     "refreshposts": "Discussieberichten verversen",
     "reply": "Antwoord",
-    "sortnewestfirst": "Toon nieuwste eerst",
-    "sortoldestfirst": "Toon oudste eerst",
     "subject": "Onderwerp",
     "unread": "Niet gelezen",
     "unreadpostsnumber": "{{$a}} ongelezen berichten"
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index 1e2d3378fe7..f7d9cf730e2 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -24,8 +24,6 @@
     "refreshdiscussions": "Atualizar discussões",
     "refreshposts": "Atualizar as postagens da discussão",
     "reply": "Responder",
-    "sortnewestfirst": "Exibir os mais novos primeiro",
-    "sortoldestfirst": "Exibir os mais velhos primeiro",
     "subject": "Assunto",
     "unread": "Não lida",
     "unreadpostsnumber": "{{$a}} mensagens não lidas"
diff --git a/www/addons/mod/forum/lang/pt.json b/www/addons/mod/forum/lang/pt.json
index 7b09d8c15ca..8700ce438bd 100644
--- a/www/addons/mod/forum/lang/pt.json
+++ b/www/addons/mod/forum/lang/pt.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "Atualizar tópicos de discussão",
     "refreshposts": "Atualizar repostas dos tópicos de discussão",
     "reply": "Responder",
-    "sortnewestfirst": "Mostrar mais recentes primeiro",
-    "sortoldestfirst": "Mostrar mais antigos primeiro",
     "subject": "Assunto",
     "unread": "Não lidas",
     "unreadpostsnumber": "{{$a}} mensagens não lidas"
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index 64b3bb7d575..a671ae7d23e 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -24,8 +24,6 @@
     "posttoforum": "Отправить в форум",
     "re": "Re:",
     "reply": "Ответить",
-    "sortnewestfirst": "Отобразить сначала новые",
-    "sortoldestfirst": "Отобразить сначала старые",
     "subject": "Тема",
     "unread": "Непрочтенные",
     "unreadpostsnumber": "Непрочитанных сообщений - {{$a}}"
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index 7184cb121a0..a2d74d28770 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -26,8 +26,6 @@
     "refreshdiscussions": "更新討論區",
     "refreshposts": "更新討論區貼文",
     "reply": "回應",
-    "sortnewestfirst": "優先顯示最新的項目",
-    "sortoldestfirst": "優先顯示最早的項目",
     "subject": "主旨",
     "unread": "未閱讀",
     "unreadpostsnumber": "{{$a}}篇未閱讀的貼文"

From 57d42deaa85b667b245f5861491c4efe564e82f1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 23 May 2017 09:03:22 +0200
Subject: [PATCH 194/218] MOBILE-2103 lang: Fix translate refresh

---
 www/core/lib/lang.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/www/core/lib/lang.js b/www/core/lib/lang.js
index ea801063ed7..0800ef6a22c 100644
--- a/www/core/lib/lang.js
+++ b/www/core/lib/lang.js
@@ -39,11 +39,15 @@ angular.module('mm.core')
      * @return {Promise}        Promise resolved when the change is finished.
      */
     self.changeCurrentLanguage = function(language) {
-        var p1 = $translate.use(language),
-            p2 = $mmConfig.set('current_language', language);
+        var promises = [];
+
+        promises.push($translate.use(language));
+        promises.push($translate.preferredLanguage(language));
+        promises.push($mmConfig.set('current_language', language));
+
         moment.locale(language);
         currentLanguage = language;
-        return $q.all([p1, p2]);
+        return $q.all(promises);
     };
 
     /**
@@ -189,15 +193,7 @@ angular.module('mm.core')
      */
     self.registerLanguageFolder = function(path) {
         $translatePartialLoader.addPart(path);
-        // We refresh the languages one by one because if we refresh all of them at once and 1 file isn't found
-        // then no language will be loaded. This way if 1 language file is missing only that language won't be refreshed.
-        var promises = [];
-        promises.push($translate.refresh(currentLanguage));
-        if (currentLanguage !== fallbackLanguage) {
-            // Refresh fallback language.
-            promises.push($translate.refresh(fallbackLanguage));
-        }
-        return $q.all(promises);
+        return $translate.refresh();
     };
 
     /**
@@ -306,6 +302,7 @@ angular.module('mm.core')
     $ionicPlatform.ready(function() {
         $mmLang.getCurrentLanguage().then(function(language) {
             $translate.use(language);
+            $translate.preferredLanguage(language);
             moment.locale(language);
         });
     });

From 1b98e81e0485204f3bca97d453fea12670100de9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 23 May 2017 10:00:04 +0200
Subject: [PATCH 195/218] MOBILE-2103 chat: Update sessionstart string

---
 www/addons/mod/chat/controllers/index.js | 8 ++++++--
 www/addons/mod/chat/lang/en.json         | 2 +-
 www/addons/mod/chat/templates/index.html | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/www/addons/mod/chat/controllers/index.js b/www/addons/mod/chat/controllers/index.js
index 6b5f4fe294d..855c40082c2 100644
--- a/www/addons/mod/chat/controllers/index.js
+++ b/www/addons/mod/chat/controllers/index.js
@@ -42,13 +42,17 @@ angular.module('mm.addons.mod_chat')
             $scope.title = chat.name || $scope.title;
             $scope.description = chat.intro || $scope.description;
             $scope.chatId = chat.id;
-            $scope.chatScheduled = '';
 
             var now = $mmUtil.timestamp();
             var span = chat.chattime - now;
 
             if (chat.chattime && chat.schedule > 0 && span > 0) {
-                $scope.chatScheduled = $mmUtil.formatTimeInstant(span);
+                $scope.chatInfo = {
+                    date: moment(chat.chattime * 1000).format('LLL'),
+                    fromnow: $mmUtil.formatTimeInstant(span)
+                };
+            } else {
+                $scope.chatInfo = false;
             }
 
         }, function(error) {
diff --git a/www/addons/mod/chat/lang/en.json b/www/addons/mod/chat/lang/en.json
index 6f42086f6a9..40cdf428766 100644
--- a/www/addons/mod/chat/lang/en.json
+++ b/www/addons/mod/chat/lang/en.json
@@ -14,6 +14,6 @@
     "mustbeonlinetosendmessages": "You must be online to send messages",
     "nomessages": "No messages yet",
     "send": "Send",
-    "sessionstart": "The next chat session will start in {{$a}}",
+    "sessionstart": "The next chat session will start on {{$a.date}}, ({{$a.fromnow}} from now)",
     "talk": "Talk"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/templates/index.html b/www/addons/mod/chat/templates/index.html
index 101cb9e6bf5..5acf60df7ce 100644
--- a/www/addons/mod/chat/templates/index.html
+++ b/www/addons/mod/chat/templates/index.html
@@ -13,8 +13,8 @@
         <mm-loading hide-until="chatLoaded">
             <mm-course-mod-description watch="true" description="description" component="{{component}}" component-id="{{componentId}}"></mm-course-mod-description>
 
-            <div class="mm-info-card-icon" ng-if="chatScheduled != ''">
-                <i class="icon ion-clock padding"></i> {{ 'mma.mod_chat.sessionstart' | translate:{$a: chatScheduled} }}
+            <div class="mm-info-card-icon" ng-if="chatInfo">
+                <i class="icon ion-clock padding"></i> {{ 'mma.mod_chat.sessionstart' | translate:{$a: chatInfo} }}
             </div>
 
             <a class="button button-block button-positive" ui-sref="site.mod_chat-chat({chatid: chatId, title: title, courseid: courseid})">{{ 'mma.mod_chat.enterchat' | translate }}</a>

From 286bf456cdaca6c44cb125260eb50f5f2455cb41 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 23 May 2017 10:20:01 +0200
Subject: [PATCH 196/218] MOBILE-2103 chat: Show modal while sending

---
 www/addons/mod/chat/controllers/chat.js | 28 +++++++++++--------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/www/addons/mod/chat/controllers/chat.js b/www/addons/mod/chat/controllers/chat.js
index 40084e4838e..635fcf3be4c 100644
--- a/www/addons/mod/chat/controllers/chat.js
+++ b/www/addons/mod/chat/controllers/chat.js
@@ -64,7 +64,7 @@ angular.module('mm.addons.mod_chat')
         $mmaModChat.getChatUsers($scope.chatsid).then(function(data) {
             $scope.chatUsers = data.users;
         }).catch(function(error) {
-            showError(error, 'mma.mod_chat.errorwhilegettingchatusers');
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhilegettingchatusers', true);
         }).finally(function() {
             $scope.usersLoaded = true;
         });
@@ -104,16 +104,6 @@ angular.module('mm.addons.mod_chat')
         });
     }
 
-    // Show error modal.
-    function showError(error, defaultMessage) {
-        if (typeof error === 'string') {
-            $mmUtil.showErrorModal(error);
-        } else {
-            $mmUtil.showErrorModal(defaultMessage, true);
-        }
-        return $q.reject();
-    }
-
     // Start the polling to get chat messages periodically.
     function startPolling() {
         // We already have the polling in place.
@@ -145,7 +135,8 @@ angular.module('mm.addons.mod_chat')
                     $interval.cancel($scope.polling);
                     $scope.polling = undefined;
                 }
-                return showError(error, 'mma.mod_chat.errorwhileretrievingmessages');
+                $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhileretrievingmessages', true);
+                return $q.reject();
             });
         }).finally(function() {
             pollingRunning = false;
@@ -175,17 +166,20 @@ angular.module('mm.addons.mod_chat')
         }
         text = $mmText.replaceNewLines(text, '<br>');
 
+        var modal = $mmUtil.showModalLoading('mm.core.sending', true);
         $mmaModChat.sendMessage($scope.chatsid, text, beep).then(function() {
             if (beep === '') {
                 $scope.newMessage.text = '';
             }
             getMessagesInterval(); // Update messages to show the sent message.
-        }, function(error) {
+        }).catch(function(error) {
             // Only close the keyboard if an error happens, we want the user to be able to send multiple
             // messages withoutthe keyboard being closed.
             $mmApp.closeKeyboard();
 
-            showError(error, 'mma.mod_chat.errorwhilesendingmessage');
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhilesendingmessage', true);
+        }).finally(function() {
+            modal.dismiss();
         });
     };
 
@@ -206,10 +200,12 @@ angular.module('mm.addons.mod_chat')
         return getMessages().then(function() {
             startPolling();
         }).catch(function(error) {
-            return showError(error, 'mma.mod_chat.errorwhileretrievingmessages');
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhileretrievingmessages', true);
+            $ionicHistory.goBack();
+            return $q.reject();
         });
     }, function(error) {
-        showError(error, 'mma.mod_chat.errorwhileconnecting');
+        $mmUtil.showErrorModalDefault(error, 'mma.mod_chat.errorwhileconnecting', true);
         $ionicHistory.goBack();
     }).finally(function() {
         $scope.loaded = true;

From aca727e00c17068ec44b58a72733dde9fd18cab9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 23 May 2017 10:37:53 +0200
Subject: [PATCH 197/218] MOBILE-2103 chat: Don't show border in user buttons
 in iOS

---
 www/addons/mod/chat/scss/styles.scss     | 9 +++++++++
 www/addons/mod/chat/templates/users.html | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/chat/scss/styles.scss b/www/addons/mod/chat/scss/styles.scss
index 1ce1a06dec7..9e5cf104ebe 100644
--- a/www/addons/mod/chat/scss/styles.scss
+++ b/www/addons/mod/chat/scss/styles.scss
@@ -43,4 +43,13 @@ $mma-chat-notice-badge: "stable" !default;
       border: 0;
     }
   }
+
+  .button-bar {
+    padding: 0;
+    border: 0;
+
+    .button {
+      border: 0;
+    }
+  }
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/templates/users.html b/www/addons/mod/chat/templates/users.html
index f6d5325ec27..4144857edfc 100644
--- a/www/addons/mod/chat/templates/users.html
+++ b/www/addons/mod/chat/templates/users.html
@@ -10,12 +10,12 @@ <h1 class="title">{{ 'mma.mod_chat.currentusers' | translate }}</h1>
                     <div class="item item-avatar">
                         <img ng-src="{{user.profileimageurl}}" alt="{{ 'mm.core.pictureof' | translate:{$a: user.fullname} }}" mm-external-content>
                         <mm-format-text>{{user.fullname}}</mm-format-text>
-                        <div class="item tabs tabs-secondary tabs-icon-left" ng-if="currentUserId != user.id && !isAppOffline()">
-                            <a class="tab-item" ng-click="talkTo(user.fullname)">
+                        <div class="item button-bar" ng-if="currentUserId != user.id && !isAppOffline()">
+                            <a class="button button-icon-left" ng-click="talkTo(user.fullname)">
                                 <i class="icon ion-chatbox"></i>
                                 {{ 'mma.mod_chat.talk' | translate}}
                             </a>
-                            <a class="tab-item" ng-click="beepTo(user.id)">
+                            <a class="button button-icon-left" ng-click="beepTo(user.id)">
                                 <i class="icon ion-ios-bell"></i>
                                 {{ 'mma.mod_chat.beep' | translate}}
                             </a>

From 438802bc0e853e1f56db53a3a260b73fa68238da Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 23 May 2017 11:09:26 +0200
Subject: [PATCH 198/218] MOBILE-2103 lang: Update some language strings

---
 www/addons/files/lang/en.json          | 2 +-
 www/addons/messages/lang/en.json       | 4 ++--
 www/addons/mod/assign/lang/en.json     | 2 +-
 www/addons/mod/choice/lang/en.json     | 4 ++--
 www/addons/mod/forum/lang/en.json      | 2 +-
 www/core/components/login/lang/en.json | 2 +-
 www/core/components/user/lang/en.json  | 2 +-
 www/core/lang/en.json                  | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/www/addons/files/lang/en.json b/www/addons/files/lang/en.json
index 1d84c6e983e..b580e44a100 100644
--- a/www/addons/files/lang/en.json
+++ b/www/addons/files/lang/en.json
@@ -5,7 +5,7 @@
     "emptyfilelist": "There are no files to show.",
     "erroruploadnotworking": "Unfortunately it is currently not possible to upload files to your site.",
     "files": "My files",
-    "privatefiles": "My private files",
+    "privatefiles": "Private files",
     "myprivatefilesdesc": "The files that are available in your private area on this Moodle site.",
     "sitefiles": "Site files",
     "sitefilesdesc": "The other files that are available to you on this Moodle site.",
diff --git a/www/addons/messages/lang/en.json b/www/addons/messages/lang/en.json
index 104c8fc26c7..e7fb7724737 100644
--- a/www/addons/messages/lang/en.json
+++ b/www/addons/messages/lang/en.json
@@ -18,9 +18,9 @@
     "message": "Message",
     "messages": "Messages",
     "mustbeonlinetosendmessages": "You must be online to send messages",
-    "newmessage": "New message...",
+    "newmessage": "New message",
     "newmessages": "New messages",
-    "nomessages": "No messages.",
+    "nomessages": "No messages",
     "nousersfound": "No users found",
     "removecontact": "Remove contact",
     "removecontactconfirm": "Contact will be removed from your contacts list.",
diff --git a/www/addons/mod/assign/lang/en.json b/www/addons/mod/assign/lang/en.json
index 563c3048d1a..16f95b9dd48 100644
--- a/www/addons/mod/assign/lang/en.json
+++ b/www/addons/mod/assign/lang/en.json
@@ -40,7 +40,7 @@
     "gradeoutof": "Grade out of {{$a}}",
     "gradingstatus": "Grading status",
     "groupsubmissionsettings": "Group submission settings",
-    "hiddenuser": "Participant ",
+    "hiddenuser": "Participant",
     "latesubmissions": "Late submissions",
     "latesubmissionsaccepted": "Allowed until {{$a}}",
     "markingworkflowstate": "Marking workflow state",
diff --git a/www/addons/mod/choice/lang/en.json b/www/addons/mod/choice/lang/en.json
index 4edc4ff278a..9a7fcc1bf51 100644
--- a/www/addons/mod/choice/lang/en.json
+++ b/www/addons/mod/choice/lang/en.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "The results are not currently viewable.",
     "notopenyet": "Sorry, this activity is not available until {{$a}}",
-    "numberofuser": "Number of participants",
-    "numberofuserinpercentage": "Percentage of participants",
+    "numberofuser": "Number of responses",
+    "numberofuserinpercentage": "Percentage of responses",
     "previewonly": "This is just a preview of the available options for this activity. You will not be able to submit your choice until {{$a}}.",
     "removemychoice": "Remove my choice",
     "responses": "Responses",
diff --git a/www/addons/mod/forum/lang/en.json b/www/addons/mod/forum/lang/en.json
index 58beac06eef..a8d01dc2f5d 100644
--- a/www/addons/mod/forum/lang/en.json
+++ b/www/addons/mod/forum/lang/en.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Discussion subscription",
     "edit": "Edit",
     "erroremptymessage": "Post message cannot be empty",
-    "erroremptysubject": "Post subject cannot be empty",
+    "erroremptysubject": "Post subject cannot be empty.",
     "errorgetforum": "Error getting forum data.",
     "errorgetgroups": "Error getting group settings.",
     "forumnodiscussionsyet": "There are no discussion topics yet in this forum.",
diff --git a/www/core/components/login/lang/en.json b/www/core/components/login/lang/en.json
index af23eb1c22c..1d6afdd9c3a 100644
--- a/www/core/components/login/lang/en.json
+++ b/www/core/components/login/lang/en.json
@@ -28,7 +28,7 @@
     "invalidmoodleversion": "Invalid Moodle version. The minium version required is 2.4.",
     "invalidsite": "The site URL is invalid.",
     "invalidtime": "Invalid time",
-    "invalidurl": "Invalid URL",
+    "invalidurl": "Invalid URL specified",
     "invalidvaluemax": "The maximum value is {{$a}}",
     "invalidvaluemin": "The minimum value is {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobile Additional Features check returned an unexpected response, you will be authenticated using the standard Mobile service.",
diff --git a/www/core/components/user/lang/en.json b/www/core/components/user/lang/en.json
index 254d66c652c..bb282dc49b0 100644
--- a/www/core/components/user/lang/en.json
+++ b/www/core/components/user/lang/en.json
@@ -16,7 +16,7 @@
     "manager": "Manager",
     "newpicture": "New picture",
     "phone1": "Phone",
-    "phone2": "Mobile",
+    "phone2": "Mobile phone",
     "roles": "Roles",
     "sendemail": "Email",
     "student": "Student",
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 3025c70b7df..3870dcb79dd 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -160,7 +160,7 @@
     "requireduserdatamissing": "This user lacks some required profile data. Please, fill this data in your Moodle and try again.<br>{{$a}}",
     "retry": "Retry",
     "save": "Save",
-    "search": "Search",
+    "search": " Search...",
     "searching": "Searching",
     "searchresults": "Search results",
     "sec" : "sec",
@@ -181,7 +181,7 @@
     "sorry": "Sorry...",
     "start": "Start",
     "submit": "Submit",
-    "success": "Success!",
+    "success": "Success",
     "tablet": "Tablet",
     "teachers": "Teachers",
     "thereisdatatosync": "There are offline {{$a}} to be synchronized.",

From 4de906cd4cdaf64e7ea76b0757d744caba93d03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 23 May 2017 11:14:11 +0200
Subject: [PATCH 199/218] MOBILE-2103 feedback: Pre-process page only online

---
 www/addons/mod/feedback/services/feedback.js         | 4 +++-
 www/addons/mod/feedback/services/prefetch_handler.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/feedback/services/feedback.js b/www/addons/mod/feedback/services/feedback.js
index 7706c3ee3fc..f92cdff7a51 100644
--- a/www/addons/mod/feedback/services/feedback.js
+++ b/www/addons/mod/feedback/services/feedback.js
@@ -566,8 +566,10 @@ angular.module('mm.addons.mod_feedback')
             return self.getCurrentValues(feedbackId, offline, ignoreCache, siteId).then(function(valuesArray) {
                 if (valuesArray.length == 0) {
                     // Try sending empty values to get the last completed attempt values.
-                    return self.processPage(feedbackId, 0, {}).then(function() {
+                    return self.processPageOnline(feedbackId, 0, {}, undefined, siteId).then(function() {
                         return self.getCurrentValues(feedbackId, offline, ignoreCache, siteId);
+                    }).catch(function() {
+                        // Ignore errors
                     });
                 }
                 return valuesArray;
diff --git a/www/addons/mod/feedback/services/prefetch_handler.js b/www/addons/mod/feedback/services/prefetch_handler.js
index 5d02e2e1ced..74b7ee0dc85 100644
--- a/www/addons/mod/feedback/services/prefetch_handler.js
+++ b/www/addons/mod/feedback/services/prefetch_handler.js
@@ -237,7 +237,7 @@ angular.module('mm.addons.mod_feedback')
 
                 if (accessData.cancomplete && accessData.cansubmit && !accessData.isempty) {
                     // Send empty data, so it will recover last completed feedback attempt values.
-                    p2.push($mmaModFeedback.processPage(feedback.id, 0, {}, undefined, undefined, undefined, siteId).finally(function() {
+                    p2.push($mmaModFeedback.processPageOnline(feedback.id, 0, {}, undefined, siteId).finally(function() {
                         var p4 = [];
 
                         p4.push($mmaModFeedback.getCurrentValues(feedback.id, false, true, siteId));

From bee6cf366249b7b2ac92dc569121b5ba0a49b6d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 22 May 2017 16:43:38 +0200
Subject: [PATCH 200/218] MOBILE-2103 assign: Check offline data when leaving
 feedback

---
 upgrade.txt                                   |  1 +
 .../mod/assign/controllers/feedbackedit.js    |  2 +-
 .../mod/assign/directives/submission.js       | 10 +++----
 .../mod/assign/feedback/comments/handlers.js  | 30 ++++++++++++++-----
 .../mod/assign/services/feedbackdelegate.js   |  7 +++--
 www/addons/mod/assign/services/helper.js      | 29 +++++++++---------
 6 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/upgrade.txt b/upgrade.txt
index e73d6c358bf..60e7bd17501 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -15,6 +15,7 @@ information provided here is intended especially for developers.
  * The function $mmUtil#getMimeType has been deprecated. Please use $mmUtil#getMimeTypeFromUrl instead.
  * The functions $mmFilepool#invalidateAllFiles and $mmFilepool#invalidateFilesByComponent now accept a new param onlyUnknown which defaults to true, so it only invalidates some of the files. It is advised to use onlyUnknown=true to decrease the network usage and improve the app's performance.
  * The directive mm-loading no longer accepts the param loadingPaddingTop since now the spinner is centered vertically.
+ * Assignment feedback delegates hasDataChanged now accepts userId in order to manage offline data.
 
 === 3.2.1 ===
 
diff --git a/www/addons/mod/assign/controllers/feedbackedit.js b/www/addons/mod/assign/controllers/feedbackedit.js
index efa0b24cdb5..df78dc488d6 100644
--- a/www/addons/mod/assign/controllers/feedbackedit.js
+++ b/www/addons/mod/assign/controllers/feedbackedit.js
@@ -53,7 +53,7 @@ angular.module('mm.addons.mod_assign')
 
     // Check if data has changed.
     function hasDataChanged() {
-        return $mmaModAssignFeedbackDelegate.hasPluginDataChanged($scope.assign, $scope.plugin, getInputData()).catch(function() {
+        return $mmaModAssignFeedbackDelegate.hasPluginDataChanged($scope.assign, $scope.userId, $scope.plugin, getInputData()).catch(function() {
             // Ignore errors.
             return true;
         });
diff --git a/www/addons/mod/assign/directives/submission.js b/www/addons/mod/assign/directives/submission.js
index a225feb913f..ecac76d7824 100644
--- a/www/addons/mod/assign/directives/submission.js
+++ b/www/addons/mod/assign/directives/submission.js
@@ -233,12 +233,8 @@ angular.module('mm.addons.mod_assign')
 
                 if (!scope.feedback || !scope.feedback.plugins) {
                     scope.feedback = {};
-
                     // Feedback plugins not present, we have to use assign configs to detect the plugins used.
                     scope.feedback.plugins = $mmaModAssignHelper.getPluginsEnabled(assign, 'assignfeedback');
-                    console.error(assign, scope.feedback.plugins);
-                } else {
-                    console.error(scope.feedback);
                 }
 
                 // Check if there's any offline data for this submission.
@@ -254,10 +250,13 @@ angular.module('mm.addons.mod_assign')
                                 scope.grade.grade = data.grade;
                                 scope.gradingStatusTranslationId = 'mma.mod_assign.gradenotsynced';
                                 scope.gradingClass = "";
+                                originalGrades.grade = scope.grade.grade;
                             }
 
                             scope.grade.applyToAll = data.applytoall;
                             scope.grade.addAttempt = data.addattempt;
+                            originalGrades.applyToAll = scope.grade.applyToAll;
+                            originalGrades.addAttempt = scope.grade.addAttempt;
 
                             if (data.outcomes && Object.keys(data.outcomes).length) {
                                 angular.forEach(scope.gradeInfo.outcomes, function(outcome) {
@@ -265,6 +264,7 @@ angular.module('mm.addons.mod_assign')
                                         // If outcome has been modified from gradebook, do not use offline.
                                         if (outcome.modified < data.timemodified) {
                                             outcome.selectedId = data.outcomes[outcome.itemNumber];
+                                            originalGrades.outcomes[outcome.id] = outcome.selectedId;
                                         }
                                     }
                                 });
@@ -822,7 +822,7 @@ angular.module('mm.addons.mod_assign')
                 }
 
                 if (scope.feedback && scope.feedback.plugins) {
-                    return $mmaModAssignHelper.hasFeedbackDraftData(scope.assign.id, submitId, scope.feedback).catch(function() {
+                    return $mmaModAssignHelper.hasFeedbackDataChanged(scope.assign, submitId, scope.feedback).catch(function() {
                         // Error ocurred, omit error as not modified.
                         return $q.when(false);
                     });
diff --git a/www/addons/mod/assign/feedback/comments/handlers.js b/www/addons/mod/assign/feedback/comments/handlers.js
index d0502ca2495..0c972989063 100644
--- a/www/addons/mod/assign/feedback/comments/handlers.js
+++ b/www/addons/mod/assign/feedback/comments/handlers.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_assign')
  * @ngdoc service
  * @name $mmaModAssignFeedbackCommentsHandler
  */
-.factory('$mmaModAssignFeedbackCommentsHandler', function($mmText, $mmSite, $mmUtil) {
+.factory('$mmaModAssignFeedbackCommentsHandler', function($mmText, $mmSite, $mmUtil, $mmaModAssignOffline) {
 
     var self = {},
         drafts = {};
@@ -97,15 +97,29 @@ angular.module('mm.addons.mod_assign')
      * @param  {Object} assign     Assignment.
      * @param  {Object} plugin     Plugin.
      * @param  {Object} inputData  Data entered in the feedback form.
+     * @param  {Number} userId     User Id.
      * @return {Promise}           Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    self.hasDataChanged = function(assign, plugin, inputData) {
-        // Check if text has changed.
-        if (typeof plugin.originalText != 'undefined') {
-            return plugin.originalText != inputData.assignfeedbackcomments_editor;
-        } else {
-            return false;
-        }
+    self.hasDataChanged = function(assign, plugin, inputData, userId) {
+        // Get it from plugin or offline.
+        return $mmaModAssignOffline.getSubmissionGrade(assign.id, userId).catch(function() {
+            // No offline data found.
+        }).then(function(data) {
+            if (data && data.plugindata && data.plugindata.assignfeedbackcomments_editor) {
+                return data.plugindata.assignfeedbackcomments_editor.text;
+            }
+            // No offline data found, get text from plugin.
+            return plugin.originalText || "";
+        }).then(function(initialText) {
+            var text = getTextToSubmit(plugin, inputData);
+            if (typeof text == "undefined") {
+                return false;
+            }
+            text = text.text || text;
+
+            // Check if text has changed.
+            return initialText != text;
+        });
     };
 
     /**
diff --git a/www/addons/mod/assign/services/feedbackdelegate.js b/www/addons/mod/assign/services/feedbackdelegate.js
index b9b97d8633c..68f1e3b2f2e 100644
--- a/www/addons/mod/assign/services/feedbackdelegate.js
+++ b/www/addons/mod/assign/services/feedbackdelegate.js
@@ -118,14 +118,15 @@ angular.module('mm.addons.mod_assign')
      * @ngdoc method
      * @name $mmaModAssignFeedbackDelegate#hasPluginDataChanged
      * @param  {Object} assign     Assignment.
+     * @param  {Number} userId     User Id.
      * @param  {Object} plugin     Plugin.
      * @param  {Object} inputData  Data entered in the submission form.
      * @return {Promise}           Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    self.hasPluginDataChanged = function(assign, plugin, inputData) {
+    self.hasPluginDataChanged = function(assign, userId, plugin, inputData) {
         var handler = self.getPluginHandler(plugin.type);
         if (handler && handler.hasDataChanged) {
-            return $q.when(handler.hasDataChanged(assign, plugin, inputData));
+            return $q.when(handler.hasDataChanged(assign, plugin, inputData, userId));
         }
         return $q.when(false);
     };
@@ -343,7 +344,7 @@ angular.module('mm.addons.mod_assign')
      *                                                           based in the draft data saved.
      *                             - getFeedbackDataToDraft(plugin, inputData) Optional.
      *                                                           Get feedback data base in the input data to save as draft.
-     *                             - hasDataChanged(assign, plugin, inputData) (Promise|Boolean) Optional.
+     *                             - hasDataChanged(assign, plugin, inputData, userId) (Promise|Boolean) Optional.
      *                                                           Check if the feedback data has changed for this plugin.
      *                             - getDraft(assignId, userId, siteId) (Object|Boolean) Optional.
      *                                                           Return the draft saved data of the feedback plugin.
diff --git a/www/addons/mod/assign/services/helper.js b/www/addons/mod/assign/services/helper.js
index fdb481f8668..43b91d524ff 100644
--- a/www/addons/mod/assign/services/helper.js
+++ b/www/addons/mod/assign/services/helper.js
@@ -271,34 +271,35 @@ angular.module('mm.addons.mod_assign')
     };
 
     /**
-     * Check if the feedback has draft data for a certain submission and assign.
+     * Check if the feedback data has changed for a certain submission and assign.
      *
      * @module mm.addons.mod_assign
      * @ngdoc method
-     * @name $mmaModAssignHelper#hasFeedbackDraftData
-     * @param  {Number} assignId        Assignment Id.
+     * @name $mmaModAssignHelper#hasFeedbackDataChanged
+     * @param  {Object} assign        Assignment.
      * @param  {Number} userId          User Id.
      * @param  {Object} feedback        Feedback data.
-     * @param  {String} [siteId]        Site ID. If not defined, current site.
      * @return {Promise}                Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    self.hasFeedbackDraftData = function(assignId, userId, feedback, siteId) {
-        var hasDraft = false,
+    self.hasFeedbackDataChanged = function(assign, userId, feedback) {
+        var hasChanged = false,
             promises = [];
 
         angular.forEach(feedback.plugins, function(plugin) {
-            promises.push($mmaModAssignFeedbackDelegate.hasPluginDraftData(assignId, userId, plugin, siteId)
-                    .then(function(draft) {
-                if (draft) {
-                    hasDraft = true;
-                }
-            }).catch(function() {
-                // Ignore errors.
+            promises.push(self.prepareFeedbackPluginData(assign.id, userId, feedback).then(function(inputData) {
+                return $mmaModAssignFeedbackDelegate.hasPluginDataChanged(assign, userId, plugin, inputData)
+                        .then(function(changed) {
+                    if (changed) {
+                        hasChanged = true;
+                    }
+                }).catch(function() {
+                    // Ignore errors.
+                });
             }));
         });
 
         return $mmUtil.allPromises(promises).then(function() {
-            return hasDraft;
+            return hasChanged;
         });
     };
 

From 1bca69dafe40adefd40872733423404cfb71a7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 23 May 2017 13:08:15 +0200
Subject: [PATCH 201/218] MOBILE-2103 core: Fix timer styles

---
 www/addons/mod/quiz/scss/styles.scss          | 30 +++++++++++++++----
 www/addons/mod/quiz/templates/player.html     |  2 +-
 .../mod/quiz/templates/preflight-modal.html   |  2 +-
 www/core/directives/timer.js                  |  2 +-
 www/core/scss/styles.scss                     | 23 +++++++-------
 www/core/templates/timer.html                 | 10 +++----
 6 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/www/addons/mod/quiz/scss/styles.scss b/www/addons/mod/quiz/scss/styles.scss
index f7381465017..b46df9b646a 100644
--- a/www/addons/mod/quiz/scss/styles.scss
+++ b/www/addons/mod/quiz/scss/styles.scss
@@ -38,16 +38,34 @@ p.mma-mod-quiz-warning {
 
 // Remove padding-top and bottom from navigation bar to minimize height used.
 .mma-mod-quiz-subheader {
-  .row {
-    padding-top: 0px;
-    padding-bottom: 0px;
-  }
-  .col {
+  padding-top: 0px;
+  padding-bottom: 0px;
+
+  .row, .col {
     padding-top: 0px;
     padding-bottom: 0px;
   }
   .mm-timer {
-    line-height: $button-bar-button-height
+    min-height: 41px;
+    border: 0;
+    padding: 2px 0 1px 25px;
+
+    .icon {
+      left: 0;
+      font-size: $item-font-size * 3 /2;
+    }
+
+    label {
+      font-size: $item-font-size - 2;
+    }
+
+    span {
+      display: block;
+    }
+
+    span.mm-timesup {
+      line-height: 40px;
+    }
   }
 }
 
diff --git a/www/addons/mod/quiz/templates/player.html b/www/addons/mod/quiz/templates/player.html
index d2189cf3dd5..e9194e0fe86 100644
--- a/www/addons/mod/quiz/templates/player.html
+++ b/www/addons/mod/quiz/templates/player.html
@@ -19,7 +19,7 @@
             </div>
         </div>
     </ion-header-bar>
-    <ion-content padding="true" mm-state-class delegate-handle="mmaModQuizPlayerScroll" ng-class="{'has-subheader': dataLoaded && questions.length && !quizAborted && !showSummary}">
+    <ion-content mm-state-class delegate-handle="mmaModQuizPlayerScroll" ng-class="{'has-subheader': dataLoaded && questions.length && !quizAborted && !showSummary}">
         <mm-loading hide-until="dataLoaded">
             <div class="list padding" ng-if="!attempt">
                 <button class="button button-block" ng-click="start()">{{ 'mma.mod_quiz.startattempt' | translate }}</button>
diff --git a/www/addons/mod/quiz/templates/preflight-modal.html b/www/addons/mod/quiz/templates/preflight-modal.html
index c85f85902bf..4ab1869ad99 100644
--- a/www/addons/mod/quiz/templates/preflight-modal.html
+++ b/www/addons/mod/quiz/templates/preflight-modal.html
@@ -7,7 +7,7 @@ <h1 class="title">{{ preflightModalTitle | translate}}</h1>
         <form class="list">
             <mma-quiz-access-rule ng-repeat="directive in accessRulesDirectives"></mma-quiz-access-rule>
             <div class="item">
-                <button class="button button-block" ng-click="start(true)">{{ 'mm.core.send' | translate }}</button>
+                <button class="button button-block button-positive" ng-click="start(true)">{{ 'mm.core.send' | translate }}</button>
             </div>
         </form>
     </ion-content>
diff --git a/www/core/directives/timer.js b/www/core/directives/timer.js
index b96f0cd16a6..35b32de9bb2 100644
--- a/www/core/directives/timer.js
+++ b/www/core/directives/timer.js
@@ -50,7 +50,7 @@ angular.module('mm.core')
                 timeInterval;
 
             // Add mm-timer class.
-            element.addClass('mm-timer');
+            element.addClass('mm-timer item item-icon-left');
             scope.text = attrs.timerText || '';
 
             // Check time left every 200ms.
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 023c76ed3ec..d2941757c0a 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -817,32 +817,29 @@ p.mm-error { // Deprecated, use one of the above mm-error classes.
 // Timer.
 mm-timer {
   display: block;
-}
 
-// Style timer in items.
-mm-timer.mm-timer .item {
   span, label {
-    color: $item-default-text;
     font-size: $item-font-size;
+    color: $item-default-text;
   }
   span {
     font-weight: bold;
   }
-}
 
-// Create the timer warning colors. Go from $mm-timer-color to $mm-timer-warn-color.
-@for $i from 0 through $mm-timer-iterations {
-  mm-timer.mm-timer.mm-timer-timeleft-#{$i} .item {
-    background-color: mix($mm-timer-color, $mm-timer-warn-color, ($i / $mm-timer-iterations) * 100);
-    @if $i <= $mm-timer-iterations / 2 {
-      label, span, i {
-        color: $white;
+  // Create the timer warning colors. Go from $mm-timer-color to $mm-timer-warn-color.
+  @for $i from 0 through $mm-timer-iterations {
+    &.mm-timer-timeleft-#{$i} {
+      background-color: mix($mm-timer-color, $mm-timer-warn-color, ($i / $mm-timer-iterations) * 100);
+      @if $i <= $mm-timer-iterations / 2 {
+        label, span, i {
+          color: $white;
+        }
       }
     }
-
   }
 }
 
+
 .mm-monospaced {
   font-family: Andale Mono,Monaco,Courier New,DejaVu Sans Mono,monospace;
 }
diff --git a/www/core/templates/timer.html b/www/core/templates/timer.html
index 6ee19584c0f..6afcd4858ae 100644
--- a/www/core/templates/timer.html
+++ b/www/core/templates/timer.html
@@ -1,6 +1,4 @@
-<div class="item item-text-wrap item-icon-left">
-    <i class="icon ion-clock"></i>
-    <label ng-if="text">{{text}} </label>
-	<span ng-if="timeLeft > 0">{{ timeLeft | mmSecondsToHMS }}</span>
-	<span ng-if="timeLeft <= 0">{{ 'mm.core.timesup' | translate }}</span>
-</div>
\ No newline at end of file
+<i class="icon ion-clock"></i>
+<label ng-if="timeLeft > 0 && text">{{text}} </label>
+<span ng-if="timeLeft > 0">{{ timeLeft | mmSecondsToHMS }}</span>
+<span class="mm-timesup" ng-if="timeLeft <= 0">{{ 'mm.core.timesup' | translate }}</span>

From 4b73da603d2cff787b1d35aaf2364b8d9f4c3a0b Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Tue, 23 May 2017 14:21:51 +0200
Subject: [PATCH 202/218] MOBILE-2103 release: Automatic translation

---
 www/addons/badges/lang/sv.json                |  2 +-
 www/addons/calendar/lang/ar.json              |  2 +-
 www/addons/calendar/lang/cs.json              |  4 +-
 www/addons/calendar/lang/da.json              |  2 +-
 www/addons/calendar/lang/de.json              |  4 +-
 www/addons/calendar/lang/es-mx.json           |  2 +-
 www/addons/calendar/lang/es.json              |  2 +-
 www/addons/calendar/lang/fa.json              |  4 +-
 www/addons/calendar/lang/fr.json              |  2 +-
 www/addons/calendar/lang/he.json              |  4 +-
 www/addons/calendar/lang/hu.json              |  1 +
 www/addons/calendar/lang/it.json              |  2 +-
 www/addons/calendar/lang/ja.json              |  2 +-
 www/addons/calendar/lang/nl.json              |  2 +-
 www/addons/calendar/lang/pt-br.json           |  2 +-
 www/addons/calendar/lang/sv.json              |  2 +-
 www/addons/calendar/lang/zh-tw.json           |  2 +-
 www/addons/competency/lang/ar.json            |  5 +-
 www/addons/competency/lang/bg.json            |  2 +-
 www/addons/competency/lang/ca.json            | 15 ++--
 www/addons/competency/lang/cs.json            | 17 ++--
 www/addons/competency/lang/da.json            | 15 ++--
 www/addons/competency/lang/de.json            | 17 ++--
 www/addons/competency/lang/el.json            |  5 +-
 www/addons/competency/lang/es-mx.json         | 15 ++--
 www/addons/competency/lang/es.json            | 11 ++-
 www/addons/competency/lang/eu.json            | 11 ++-
 www/addons/competency/lang/fa.json            | 19 ++---
 www/addons/competency/lang/fr.json            | 13 ++-
 www/addons/competency/lang/he.json            | 20 ++---
 www/addons/competency/lang/hu.json            | 12 +--
 www/addons/competency/lang/it.json            | 17 ++--
 www/addons/competency/lang/ja.json            | 12 +--
 www/addons/competency/lang/lt.json            | 15 ++--
 www/addons/competency/lang/nl.json            | 17 ++--
 www/addons/competency/lang/pl.json            | 10 +--
 www/addons/competency/lang/pt-br.json         | 13 ++-
 www/addons/competency/lang/pt.json            | 15 ++--
 www/addons/competency/lang/ro.json            |  4 +-
 www/addons/competency/lang/ru.json            | 15 ++--
 www/addons/competency/lang/sv.json            | 14 ++--
 www/addons/competency/lang/tr.json            | 13 ++-
 www/addons/competency/lang/zh-cn.json         |  6 +-
 www/addons/competency/lang/zh-tw.json         | 15 ++--
 www/addons/coursecompletion/lang/ar.json      | 18 ++--
 www/addons/coursecompletion/lang/bg.json      | 10 +--
 www/addons/coursecompletion/lang/ca.json      | 14 ++--
 www/addons/coursecompletion/lang/cs.json      | 26 +++---
 www/addons/coursecompletion/lang/da.json      | 24 +++---
 www/addons/coursecompletion/lang/de.json      | 22 ++---
 www/addons/coursecompletion/lang/el.json      |  4 +-
 www/addons/coursecompletion/lang/es-mx.json   | 24 +++---
 www/addons/coursecompletion/lang/es.json      |  8 +-
 www/addons/coursecompletion/lang/eu.json      | 14 ++--
 www/addons/coursecompletion/lang/fa.json      | 10 +--
 www/addons/coursecompletion/lang/fr.json      |  6 +-
 www/addons/coursecompletion/lang/he.json      | 24 +++---
 www/addons/coursecompletion/lang/hu.json      | 10 +--
 www/addons/coursecompletion/lang/it.json      | 14 ++--
 www/addons/coursecompletion/lang/ja.json      |  6 +-
 www/addons/coursecompletion/lang/lt.json      | 20 ++---
 www/addons/coursecompletion/lang/nl.json      | 18 ++--
 www/addons/coursecompletion/lang/pl.json      | 10 +--
 www/addons/coursecompletion/lang/pt-br.json   | 22 ++---
 www/addons/coursecompletion/lang/pt.json      | 18 ++--
 www/addons/coursecompletion/lang/ro.json      | 26 +++---
 www/addons/coursecompletion/lang/ru.json      | 26 +++---
 www/addons/coursecompletion/lang/sv.json      | 22 ++---
 www/addons/coursecompletion/lang/tr.json      |  8 +-
 www/addons/coursecompletion/lang/zh-cn.json   | 12 +--
 www/addons/coursecompletion/lang/zh-tw.json   | 24 +++---
 www/addons/files/lang/ar.json                 | 24 +-----
 www/addons/files/lang/bg.json                 |  8 +-
 www/addons/files/lang/ca.json                 | 30 +------
 www/addons/files/lang/cs.json                 | 30 +------
 www/addons/files/lang/da.json                 | 29 +------
 www/addons/files/lang/de.json                 | 32 +-------
 www/addons/files/lang/el.json                 | 28 +------
 www/addons/files/lang/es-mx.json              | 30 +------
 www/addons/files/lang/es.json                 | 28 +------
 www/addons/files/lang/eu.json                 | 30 +------
 www/addons/files/lang/fa.json                 |  7 +-
 www/addons/files/lang/fr.json                 | 30 +------
 www/addons/files/lang/he.json                 | 10 +--
 www/addons/files/lang/hu.json                 |  6 +-
 www/addons/files/lang/it.json                 | 30 +------
 www/addons/files/lang/ja.json                 |  6 +-
 www/addons/files/lang/lt.json                 | 28 +------
 www/addons/files/lang/nl.json                 | 30 +------
 www/addons/files/lang/pl.json                 |  6 +-
 www/addons/files/lang/pt-br.json              | 30 +------
 www/addons/files/lang/pt.json                 | 30 +------
 www/addons/files/lang/ro.json                 | 12 +--
 www/addons/files/lang/ru.json                 | 28 +------
 www/addons/files/lang/sv.json                 | 10 +--
 www/addons/files/lang/tr.json                 | 11 +--
 www/addons/files/lang/zh-cn.json              | 12 +--
 www/addons/files/lang/zh-tw.json              | 32 +-------
 www/addons/frontpage/lang/ar.json             |  3 +-
 www/addons/frontpage/lang/bg.json             |  3 +-
 www/addons/frontpage/lang/ca.json             |  3 +-
 www/addons/frontpage/lang/cs.json             |  3 +-
 www/addons/frontpage/lang/da.json             |  5 +-
 www/addons/frontpage/lang/de.json             |  3 +-
 www/addons/frontpage/lang/el.json             |  3 +-
 www/addons/frontpage/lang/es-mx.json          |  1 -
 www/addons/frontpage/lang/es.json             |  3 +-
 www/addons/frontpage/lang/eu.json             |  1 -
 www/addons/frontpage/lang/fa.json             |  2 +-
 www/addons/frontpage/lang/fr.json             |  3 +-
 www/addons/frontpage/lang/he.json             |  3 +-
 www/addons/frontpage/lang/hu.json             |  2 +-
 www/addons/frontpage/lang/it.json             |  1 -
 www/addons/frontpage/lang/ja.json             |  3 +-
 www/addons/frontpage/lang/lt.json             |  1 -
 www/addons/frontpage/lang/nl.json             |  1 -
 www/addons/frontpage/lang/pl.json             |  2 +-
 www/addons/frontpage/lang/pt-br.json          |  5 +-
 www/addons/frontpage/lang/pt.json             |  3 +-
 www/addons/frontpage/lang/ro.json             |  1 -
 www/addons/frontpage/lang/ru.json             |  5 +-
 www/addons/frontpage/lang/sv.json             |  3 +-
 www/addons/frontpage/lang/tr.json             |  4 +-
 www/addons/frontpage/lang/zh-cn.json          |  2 +-
 www/addons/frontpage/lang/zh-tw.json          |  3 +-
 www/addons/grades/lang/bg.json                |  3 +-
 www/addons/grades/lang/ca.json                |  3 +-
 www/addons/grades/lang/cs.json                |  1 -
 www/addons/grades/lang/da.json                |  3 +-
 www/addons/grades/lang/de.json                |  1 -
 www/addons/grades/lang/el.json                |  3 +-
 www/addons/grades/lang/es-mx.json             |  1 -
 www/addons/grades/lang/es.json                |  1 -
 www/addons/grades/lang/eu.json                |  3 +-
 www/addons/grades/lang/fr.json                |  3 +-
 www/addons/grades/lang/he.json                |  3 +-
 www/addons/grades/lang/it.json                |  1 -
 www/addons/grades/lang/ja.json                |  1 -
 www/addons/grades/lang/lt.json                |  1 -
 www/addons/grades/lang/nl.json                |  1 -
 www/addons/grades/lang/pt-br.json             |  1 -
 www/addons/grades/lang/pt.json                |  1 -
 www/addons/grades/lang/ro.json                |  3 +-
 www/addons/grades/lang/ru.json                |  1 -
 www/addons/grades/lang/sv.json                |  2 +-
 www/addons/grades/lang/tr.json                |  1 -
 www/addons/grades/lang/zh-cn.json             |  1 -
 www/addons/grades/lang/zh-tw.json             |  1 -
 www/addons/messages/lang/ar.json              | 10 +--
 www/addons/messages/lang/bg.json              | 10 +--
 www/addons/messages/lang/ca.json              | 10 +--
 www/addons/messages/lang/cs.json              | 10 +--
 www/addons/messages/lang/da.json              |  8 +-
 www/addons/messages/lang/de.json              | 17 ++--
 www/addons/messages/lang/el.json              |  8 +-
 www/addons/messages/lang/es-mx.json           | 12 +--
 www/addons/messages/lang/es.json              |  8 +-
 www/addons/messages/lang/eu.json              | 10 +--
 www/addons/messages/lang/fa.json              |  8 +-
 www/addons/messages/lang/fr.json              | 20 ++---
 www/addons/messages/lang/he.json              | 20 ++---
 www/addons/messages/lang/hu.json              |  6 +-
 www/addons/messages/lang/it.json              | 12 +--
 www/addons/messages/lang/ja.json              | 14 ++--
 www/addons/messages/lang/lt.json              |  8 +-
 www/addons/messages/lang/nl.json              | 20 ++---
 www/addons/messages/lang/pl.json              |  6 +-
 www/addons/messages/lang/pt-br.json           | 13 ++-
 www/addons/messages/lang/pt.json              |  7 +-
 www/addons/messages/lang/ro.json              |  9 +-
 www/addons/messages/lang/ru.json              | 16 ++--
 www/addons/messages/lang/sv.json              | 12 +--
 www/addons/messages/lang/tr.json              | 10 +--
 www/addons/messages/lang/zh-cn.json           |  4 +-
 www/addons/messages/lang/zh-tw.json           | 16 ++--
 www/addons/mod/assign/lang/el.json            |  2 +-
 www/addons/mod/assign/lang/he.json            |  2 +-
 www/addons/mod/assign/lang/ja.json            |  2 +-
 www/addons/mod/assign/lang/nl.json            |  2 +-
 www/addons/mod/assign/lang/pt.json            |  2 +-
 www/addons/mod/assign/lang/tr.json            |  2 +-
 www/addons/mod/choice/lang/ar.json            |  2 +-
 www/addons/mod/choice/lang/ca.json            |  4 +-
 www/addons/mod/choice/lang/cs.json            |  4 +-
 www/addons/mod/choice/lang/da.json            |  4 +-
 www/addons/mod/choice/lang/de.json            |  4 +-
 www/addons/mod/choice/lang/el.json            |  4 +-
 www/addons/mod/choice/lang/es-mx.json         |  4 +-
 www/addons/mod/choice/lang/es.json            |  4 +-
 www/addons/mod/choice/lang/eu.json            |  4 +-
 www/addons/mod/choice/lang/fr.json            |  4 +-
 www/addons/mod/choice/lang/it.json            |  4 +-
 www/addons/mod/choice/lang/lt.json            |  4 +-
 www/addons/mod/choice/lang/nl.json            |  4 +-
 www/addons/mod/choice/lang/pt-br.json         |  4 +-
 www/addons/mod/choice/lang/pt.json            |  4 +-
 www/addons/mod/choice/lang/ro.json            |  4 +-
 www/addons/mod/choice/lang/sv.json            |  4 +-
 www/addons/mod/choice/lang/zh-tw.json         |  4 +-
 www/addons/mod/feedback/lang/zh-tw.json       |  2 +-
 www/addons/mod/folder/lang/ca.json            |  2 +-
 www/addons/mod/folder/lang/cs.json            |  2 +-
 www/addons/mod/folder/lang/da.json            |  2 +-
 www/addons/mod/folder/lang/de.json            |  2 +-
 www/addons/mod/folder/lang/es-mx.json         |  2 +-
 www/addons/mod/folder/lang/eu.json            |  2 +-
 www/addons/mod/folder/lang/fr.json            |  2 +-
 www/addons/mod/folder/lang/he.json            |  2 +-
 www/addons/mod/folder/lang/it.json            |  2 +-
 www/addons/mod/folder/lang/lt.json            |  2 +-
 www/addons/mod/folder/lang/nl.json            |  2 +-
 www/addons/mod/folder/lang/pt-br.json         |  2 +-
 www/addons/mod/folder/lang/pt.json            |  2 +-
 www/addons/mod/folder/lang/ro.json            |  2 +-
 www/addons/mod/folder/lang/zh-tw.json         |  2 +-
 www/addons/mod/forum/lang/da.json             |  2 +-
 www/addons/mod/forum/lang/de.json             |  2 +-
 www/addons/mod/forum/lang/es-mx.json          |  2 +-
 www/addons/mod/forum/lang/fr.json             |  2 +-
 www/addons/mod/forum/lang/he.json             |  2 +-
 www/addons/mod/forum/lang/it.json             |  2 +-
 www/addons/mod/forum/lang/lt.json             |  2 +-
 www/addons/mod/forum/lang/nl.json             |  2 +-
 www/addons/mod/forum/lang/pt-br.json          |  2 +-
 www/addons/mod/forum/lang/ro.json             |  2 +-
 www/addons/mod/forum/lang/ru.json             |  2 +-
 www/addons/mod/forum/lang/sv.json             |  2 +-
 www/addons/mod/forum/lang/zh-tw.json          |  4 +-
 www/addons/mod/glossary/lang/ar.json          |  4 +-
 www/addons/mod/glossary/lang/bg.json          |  2 +-
 www/addons/mod/glossary/lang/ca.json          |  6 +-
 www/addons/mod/glossary/lang/cs.json          |  4 +-
 www/addons/mod/glossary/lang/da.json          |  4 +-
 www/addons/mod/glossary/lang/de.json          |  4 +-
 www/addons/mod/glossary/lang/el.json          |  8 +-
 www/addons/mod/glossary/lang/es-mx.json       |  4 +-
 www/addons/mod/glossary/lang/es.json          |  4 +-
 www/addons/mod/glossary/lang/eu.json          |  4 +-
 www/addons/mod/glossary/lang/fa.json          |  6 +-
 www/addons/mod/glossary/lang/fr.json          |  4 +-
 www/addons/mod/glossary/lang/he.json          |  2 +-
 www/addons/mod/glossary/lang/hu.json          |  4 +-
 www/addons/mod/glossary/lang/it.json          |  2 +-
 www/addons/mod/glossary/lang/ja.json          |  4 +-
 www/addons/mod/glossary/lang/lt.json          |  6 +-
 www/addons/mod/glossary/lang/nl.json          |  4 +-
 www/addons/mod/glossary/lang/pl.json          |  2 +-
 www/addons/mod/glossary/lang/pt-br.json       |  4 +-
 www/addons/mod/glossary/lang/pt.json          |  4 +-
 www/addons/mod/glossary/lang/ro.json          |  6 +-
 www/addons/mod/glossary/lang/ru.json          |  4 +-
 www/addons/mod/glossary/lang/sv.json          |  4 +-
 www/addons/mod/glossary/lang/tr.json          |  2 +-
 www/addons/mod/glossary/lang/zh-cn.json       |  2 +-
 www/addons/mod/glossary/lang/zh-tw.json       |  4 +-
 www/addons/mod/label/lang/ca.json             |  3 +-
 www/addons/mod/label/lang/cs.json             |  3 +-
 www/addons/mod/label/lang/da.json             |  3 +-
 www/addons/mod/label/lang/de.json             |  3 +-
 www/addons/mod/label/lang/el.json             |  3 +-
 www/addons/mod/label/lang/es-mx.json          |  3 +-
 www/addons/mod/label/lang/es.json             |  3 +-
 www/addons/mod/label/lang/eu.json             |  3 +-
 www/addons/mod/label/lang/fa.json             |  2 +-
 www/addons/mod/label/lang/fr.json             |  3 +-
 www/addons/mod/label/lang/he.json             |  3 +-
 www/addons/mod/label/lang/it.json             |  3 +-
 www/addons/mod/label/lang/lt.json             |  3 +-
 www/addons/mod/label/lang/nl.json             |  3 +-
 www/addons/mod/label/lang/pt-br.json          |  3 +-
 www/addons/mod/label/lang/pt.json             |  3 +-
 www/addons/mod/label/lang/ro.json             |  3 +-
 www/addons/mod/label/lang/ru.json             |  3 +-
 www/addons/mod/label/lang/sv.json             |  3 +-
 www/addons/mod/label/lang/zh-tw.json          |  3 +-
 www/addons/mod/lesson/lang/ar.json            |  2 +-
 www/addons/mod/quiz/lang/fr.json              |  2 +-
 www/addons/mod/scorm/lang/ca.json             |  1 -
 www/addons/mod/scorm/lang/cs.json             |  1 -
 www/addons/mod/scorm/lang/da.json             |  1 -
 www/addons/mod/scorm/lang/de.json             |  1 -
 www/addons/mod/scorm/lang/el.json             |  1 -
 www/addons/mod/scorm/lang/es-mx.json          |  1 -
 www/addons/mod/scorm/lang/es.json             |  1 -
 www/addons/mod/scorm/lang/eu.json             |  1 -
 www/addons/mod/scorm/lang/fr.json             |  1 -
 www/addons/mod/scorm/lang/it.json             |  1 -
 www/addons/mod/scorm/lang/lt.json             |  1 -
 www/addons/mod/scorm/lang/nl.json             |  1 -
 www/addons/mod/scorm/lang/pt-br.json          |  1 -
 www/addons/mod/scorm/lang/pt.json             |  1 -
 www/addons/mod/scorm/lang/ro.json             |  1 -
 www/addons/mod/scorm/lang/ru.json             |  1 -
 www/addons/mod/scorm/lang/sv.json             |  1 -
 www/addons/mod/scorm/lang/tr.json             |  1 -
 www/addons/mod/scorm/lang/zh-tw.json          |  1 -
 www/addons/mod/survey/lang/ar.json            |  2 +-
 www/addons/mod/survey/lang/ja.json            |  2 +-
 www/addons/mod/survey/lang/pl.json            |  2 +-
 www/addons/mod/wiki/lang/ar.json              |  2 +-
 www/addons/mod/wiki/lang/bg.json              |  4 +-
 www/addons/mod/wiki/lang/ca.json              |  2 +-
 www/addons/mod/wiki/lang/cs.json              |  2 +-
 www/addons/mod/wiki/lang/da.json              |  2 +-
 www/addons/mod/wiki/lang/de.json              |  2 +-
 www/addons/mod/wiki/lang/el.json              |  4 +-
 www/addons/mod/wiki/lang/es-mx.json           |  2 +-
 www/addons/mod/wiki/lang/es.json              |  2 +-
 www/addons/mod/wiki/lang/eu.json              |  2 +-
 www/addons/mod/wiki/lang/fa.json              |  2 +-
 www/addons/mod/wiki/lang/fr.json              |  2 +-
 www/addons/mod/wiki/lang/he.json              |  2 +-
 www/addons/mod/wiki/lang/hu.json              |  2 +-
 www/addons/mod/wiki/lang/it.json              |  2 +-
 www/addons/mod/wiki/lang/ja.json              |  2 +-
 www/addons/mod/wiki/lang/lt.json              |  2 +-
 www/addons/mod/wiki/lang/nl.json              |  2 +-
 www/addons/mod/wiki/lang/pl.json              |  2 +-
 www/addons/mod/wiki/lang/pt-br.json           |  2 +-
 www/addons/mod/wiki/lang/pt.json              |  2 +-
 www/addons/mod/wiki/lang/ro.json              |  4 +-
 www/addons/mod/wiki/lang/ru.json              |  2 +-
 www/addons/mod/wiki/lang/sv.json              |  2 +-
 www/addons/mod/wiki/lang/tr.json              |  2 +-
 www/addons/mod/wiki/lang/zh-cn.json           |  2 +-
 www/addons/mod/wiki/lang/zh-tw.json           |  2 +-
 www/addons/myoverview/lang/cs.json            | 19 ++++-
 www/addons/myoverview/lang/de.json            | 19 ++++-
 www/addons/myoverview/lang/es-mx.json         | 19 ++++-
 www/addons/myoverview/lang/es.json            | 19 ++++-
 www/addons/myoverview/lang/eu.json            | 19 ++++-
 www/addons/myoverview/lang/fa.json            | 17 +++-
 www/addons/myoverview/lang/fr.json            | 17 +++-
 www/addons/myoverview/lang/he.json            | 19 ++++-
 www/addons/myoverview/lang/hu.json            | 19 ++++-
 www/addons/myoverview/lang/it.json            | 19 ++++-
 www/addons/myoverview/lang/ja.json            | 17 +++-
 www/addons/myoverview/lang/nl.json            | 19 ++++-
 www/addons/myoverview/lang/zh-tw.json         | 19 ++++-
 www/addons/notes/lang/ar.json                 |  2 +-
 www/addons/notes/lang/bg.json                 |  2 +-
 www/addons/notes/lang/ca.json                 |  2 +-
 www/addons/notes/lang/cs.json                 |  2 +-
 www/addons/notes/lang/da.json                 |  2 +-
 www/addons/notes/lang/de.json                 |  2 +-
 www/addons/notes/lang/el.json                 |  2 +-
 www/addons/notes/lang/es-mx.json              |  2 +-
 www/addons/notes/lang/eu.json                 |  2 +-
 www/addons/notes/lang/fr.json                 |  2 +-
 www/addons/notes/lang/he.json                 |  2 +-
 www/addons/notes/lang/it.json                 |  2 +-
 www/addons/notes/lang/lt.json                 |  2 +-
 www/addons/notes/lang/nl.json                 |  2 +-
 www/addons/notes/lang/pt-br.json              |  2 +-
 www/addons/notes/lang/pt.json                 |  2 +-
 www/addons/notes/lang/ro.json                 |  2 +-
 www/addons/notes/lang/ru.json                 |  2 +-
 www/addons/notes/lang/sv.json                 |  2 +-
 www/addons/notes/lang/zh-tw.json              |  2 +-
 www/addons/notifications/lang/ar.json         |  2 +-
 www/addons/notifications/lang/de.json         |  4 +-
 www/addons/notifications/lang/es.json         |  2 +-
 www/addons/notifications/lang/eu.json         |  2 +-
 www/addons/notifications/lang/fa.json         |  2 +-
 www/addons/notifications/lang/he.json         |  2 +-
 www/addons/notifications/lang/lt.json         |  2 +-
 www/addons/notifications/lang/nl.json         |  2 +-
 www/addons/notifications/lang/pt-br.json      |  4 +-
 www/addons/notifications/lang/sv.json         |  2 +-
 www/addons/notifications/lang/zh-tw.json      |  2 +-
 www/addons/participants/lang/ar.json          |  2 +-
 www/addons/participants/lang/ca.json          |  2 +-
 www/addons/participants/lang/cs.json          |  4 +-
 www/addons/participants/lang/da.json          |  2 +-
 www/addons/participants/lang/de.json          |  4 +-
 www/addons/participants/lang/el.json          |  2 +-
 www/addons/participants/lang/es-mx.json       |  2 +-
 www/addons/participants/lang/es.json          |  2 +-
 www/addons/participants/lang/eu.json          |  2 +-
 www/addons/participants/lang/fa.json          |  2 +-
 www/addons/participants/lang/fr.json          |  2 +-
 www/addons/participants/lang/he.json          |  2 +-
 www/addons/participants/lang/hu.json          |  2 +-
 www/addons/participants/lang/it.json          |  4 +-
 www/addons/participants/lang/ja.json          |  2 +-
 www/addons/participants/lang/lt.json          |  2 +-
 www/addons/participants/lang/nl.json          |  2 +-
 www/addons/participants/lang/pl.json          |  2 +-
 www/addons/participants/lang/pt-br.json       |  2 +-
 www/addons/participants/lang/pt.json          |  4 +-
 www/addons/participants/lang/ro.json          |  4 +-
 www/addons/participants/lang/ru.json          |  2 +-
 www/addons/participants/lang/sv.json          |  2 +-
 www/addons/participants/lang/tr.json          |  2 +-
 www/addons/participants/lang/zh-cn.json       |  2 +-
 www/addons/participants/lang/zh-tw.json       |  2 +-
 www/core/components/course/lang/ar.json       |  4 +-
 www/core/components/course/lang/bg.json       |  4 +-
 www/core/components/course/lang/ca.json       |  9 +-
 www/core/components/course/lang/cs.json       |  9 +-
 www/core/components/course/lang/da.json       |  7 +-
 www/core/components/course/lang/de.json       |  9 +-
 www/core/components/course/lang/el.json       |  7 +-
 www/core/components/course/lang/es-mx.json    | 11 +--
 www/core/components/course/lang/es.json       | 11 +--
 www/core/components/course/lang/eu.json       |  9 +-
 www/core/components/course/lang/fa.json       |  5 +-
 www/core/components/course/lang/fr.json       |  9 +-
 www/core/components/course/lang/he.json       |  6 +-
 www/core/components/course/lang/hu.json       |  4 +-
 www/core/components/course/lang/it.json       |  7 +-
 www/core/components/course/lang/ja.json       |  2 +-
 www/core/components/course/lang/lt.json       | 11 +--
 www/core/components/course/lang/nl.json       |  9 +-
 www/core/components/course/lang/pl.json       |  4 +-
 www/core/components/course/lang/pt-br.json    | 13 +--
 www/core/components/course/lang/pt.json       |  9 +-
 www/core/components/course/lang/ro.json       |  9 +-
 www/core/components/course/lang/ru.json       |  6 +-
 www/core/components/course/lang/sv.json       |  7 +-
 www/core/components/course/lang/tr.json       |  4 +-
 www/core/components/course/lang/zh-cn.json    |  2 +-
 www/core/components/course/lang/zh-tw.json    | 11 +--
 www/core/components/courses/lang/ar.json      | 12 +--
 www/core/components/courses/lang/bg.json      |  6 +-
 www/core/components/courses/lang/ca.json      | 12 +--
 www/core/components/courses/lang/cs.json      | 16 ++--
 www/core/components/courses/lang/da.json      | 12 +--
 www/core/components/courses/lang/de.json      | 14 ++--
 www/core/components/courses/lang/el.json      | 14 ++--
 www/core/components/courses/lang/es-mx.json   |  8 +-
 www/core/components/courses/lang/es.json      | 10 +--
 www/core/components/courses/lang/eu.json      | 14 ++--
 www/core/components/courses/lang/fa.json      | 16 ++--
 www/core/components/courses/lang/fr.json      | 12 +--
 www/core/components/courses/lang/he.json      |  8 +-
 www/core/components/courses/lang/hu.json      | 10 +--
 www/core/components/courses/lang/it.json      | 10 +--
 www/core/components/courses/lang/ja.json      | 10 +--
 www/core/components/courses/lang/lt.json      | 14 ++--
 www/core/components/courses/lang/nl.json      | 14 ++--
 www/core/components/courses/lang/pl.json      | 12 +--
 www/core/components/courses/lang/pt-br.json   | 12 +--
 www/core/components/courses/lang/pt.json      | 16 ++--
 www/core/components/courses/lang/ro.json      | 14 ++--
 www/core/components/courses/lang/ru.json      | 10 +--
 www/core/components/courses/lang/sv.json      | 14 ++--
 www/core/components/courses/lang/tr.json      | 16 ++--
 www/core/components/courses/lang/zh-cn.json   |  6 +-
 www/core/components/courses/lang/zh-tw.json   | 14 ++--
 www/core/components/fileuploader/lang/ar.json |  8 +-
 www/core/components/fileuploader/lang/bg.json |  4 +-
 www/core/components/fileuploader/lang/ca.json |  8 +-
 www/core/components/fileuploader/lang/cs.json | 10 +--
 www/core/components/fileuploader/lang/da.json |  6 +-
 www/core/components/fileuploader/lang/de.json |  6 +-
 www/core/components/fileuploader/lang/el.json |  8 +-
 .../components/fileuploader/lang/es-mx.json   |  8 +-
 www/core/components/fileuploader/lang/es.json |  6 +-
 www/core/components/fileuploader/lang/eu.json |  8 +-
 www/core/components/fileuploader/lang/fa.json |  2 +-
 www/core/components/fileuploader/lang/fr.json | 10 +--
 www/core/components/fileuploader/lang/he.json |  8 +-
 www/core/components/fileuploader/lang/hu.json |  6 +-
 www/core/components/fileuploader/lang/it.json | 10 +--
 www/core/components/fileuploader/lang/ja.json |  6 +-
 www/core/components/fileuploader/lang/lt.json |  8 +-
 www/core/components/fileuploader/lang/nl.json | 12 +--
 www/core/components/fileuploader/lang/pl.json |  6 +-
 .../components/fileuploader/lang/pt-br.json   |  8 +-
 www/core/components/fileuploader/lang/pt.json | 10 +--
 www/core/components/fileuploader/lang/ro.json |  8 +-
 www/core/components/fileuploader/lang/ru.json |  8 +-
 www/core/components/fileuploader/lang/sv.json |  6 +-
 www/core/components/fileuploader/lang/tr.json |  6 +-
 .../components/fileuploader/lang/zh-cn.json   |  6 +-
 .../components/fileuploader/lang/zh-tw.json   | 10 +--
 www/core/components/grades/lang/ar.json       | 16 ++--
 www/core/components/grades/lang/bg.json       | 10 +--
 www/core/components/grades/lang/ca.json       | 10 +--
 www/core/components/grades/lang/cs.json       | 10 +--
 www/core/components/grades/lang/da.json       | 14 ++--
 www/core/components/grades/lang/de.json       |  8 +-
 www/core/components/grades/lang/el.json       |  2 +-
 www/core/components/grades/lang/es-mx.json    |  6 +-
 www/core/components/grades/lang/es.json       |  8 +-
 www/core/components/grades/lang/eu.json       | 12 +--
 www/core/components/grades/lang/fa.json       |  2 +-
 www/core/components/grades/lang/fr.json       |  6 +-
 www/core/components/grades/lang/he.json       | 16 ++--
 www/core/components/grades/lang/hu.json       |  6 +-
 www/core/components/grades/lang/it.json       |  2 +-
 www/core/components/grades/lang/ja.json       | 12 +--
 www/core/components/grades/lang/lt.json       |  2 +-
 www/core/components/grades/lang/nl.json       | 10 +--
 www/core/components/grades/lang/pl.json       | 16 ++--
 www/core/components/grades/lang/pt-br.json    | 10 +--
 www/core/components/grades/lang/pt.json       |  6 +-
 www/core/components/grades/lang/ro.json       | 10 +--
 www/core/components/grades/lang/ru.json       | 10 +--
 www/core/components/grades/lang/sv.json       | 12 +--
 www/core/components/grades/lang/tr.json       | 14 ++--
 www/core/components/grades/lang/zh-cn.json    |  8 +-
 www/core/components/grades/lang/zh-tw.json    |  8 +-
 www/core/components/login/lang/ar.json        |  6 +-
 www/core/components/login/lang/bg.json        |  4 +-
 www/core/components/login/lang/ca.json        |  8 +-
 www/core/components/login/lang/cs.json        | 14 ++--
 www/core/components/login/lang/da.json        | 10 +--
 www/core/components/login/lang/de.json        | 10 +--
 www/core/components/login/lang/el.json        |  6 +-
 www/core/components/login/lang/es-mx.json     | 10 +--
 www/core/components/login/lang/es.json        | 10 +--
 www/core/components/login/lang/eu.json        | 12 ++-
 www/core/components/login/lang/fa.json        |  6 +-
 www/core/components/login/lang/fr.json        | 10 +--
 www/core/components/login/lang/he.json        |  7 +-
 www/core/components/login/lang/hu.json        |  6 +-
 www/core/components/login/lang/it.json        | 10 +--
 www/core/components/login/lang/ja.json        |  6 +-
 www/core/components/login/lang/lt.json        | 10 +--
 www/core/components/login/lang/nl.json        | 12 ++-
 www/core/components/login/lang/pl.json        |  4 +-
 www/core/components/login/lang/pt-br.json     | 12 ++-
 www/core/components/login/lang/pt.json        | 12 ++-
 www/core/components/login/lang/ro.json        | 16 ++--
 www/core/components/login/lang/ru.json        |  6 +-
 www/core/components/login/lang/sv.json        | 10 +--
 www/core/components/login/lang/tr.json        | 16 ++--
 www/core/components/login/lang/zh-cn.json     |  4 +-
 www/core/components/login/lang/zh-tw.json     | 14 ++--
 www/core/components/question/lang/ar.json     | 12 +--
 www/core/components/question/lang/bg.json     | 12 +--
 www/core/components/question/lang/ca.json     | 12 +--
 www/core/components/question/lang/cs.json     | 14 ++--
 www/core/components/question/lang/da.json     |  8 +-
 www/core/components/question/lang/de.json     | 10 +--
 www/core/components/question/lang/el.json     |  4 +-
 www/core/components/question/lang/es-mx.json  | 12 +--
 www/core/components/question/lang/es.json     | 12 +--
 www/core/components/question/lang/eu.json     | 10 +--
 www/core/components/question/lang/fa.json     |  4 +-
 www/core/components/question/lang/fr.json     |  6 +-
 www/core/components/question/lang/he.json     | 12 +--
 www/core/components/question/lang/hu.json     |  6 +-
 www/core/components/question/lang/it.json     | 12 +--
 www/core/components/question/lang/ja.json     |  8 +-
 www/core/components/question/lang/lt.json     | 14 ++--
 www/core/components/question/lang/nl.json     |  8 +-
 www/core/components/question/lang/pl.json     | 10 +--
 www/core/components/question/lang/pt-br.json  | 12 +--
 www/core/components/question/lang/pt.json     | 10 +--
 www/core/components/question/lang/ro.json     | 10 +--
 www/core/components/question/lang/ru.json     |  6 +-
 www/core/components/question/lang/sv.json     |  6 +-
 www/core/components/question/lang/tr.json     |  8 +-
 www/core/components/question/lang/zh-cn.json  | 10 +--
 www/core/components/question/lang/zh-tw.json  | 16 ++--
 www/core/components/settings/lang/ar.json     |  7 +-
 www/core/components/settings/lang/bg.json     |  9 +-
 www/core/components/settings/lang/ca.json     |  9 +-
 www/core/components/settings/lang/cs.json     |  9 +-
 www/core/components/settings/lang/da.json     | 15 ++--
 www/core/components/settings/lang/de.json     | 17 ++--
 www/core/components/settings/lang/el.json     |  6 +-
 www/core/components/settings/lang/es-mx.json  | 11 +--
 www/core/components/settings/lang/es.json     |  7 +-
 www/core/components/settings/lang/eu.json     |  9 +-
 www/core/components/settings/lang/fa.json     |  7 +-
 www/core/components/settings/lang/fr.json     | 13 ++-
 www/core/components/settings/lang/he.json     | 12 ++-
 www/core/components/settings/lang/hu.json     | 10 +--
 www/core/components/settings/lang/it.json     |  7 +-
 www/core/components/settings/lang/ja.json     | 11 ++-
 www/core/components/settings/lang/lt.json     |  5 +-
 www/core/components/settings/lang/nl.json     |  7 +-
 www/core/components/settings/lang/pl.json     |  6 +-
 www/core/components/settings/lang/pt-br.json  | 13 ++-
 www/core/components/settings/lang/pt.json     | 11 +--
 www/core/components/settings/lang/ro.json     | 11 +--
 www/core/components/settings/lang/ru.json     |  9 +-
 www/core/components/settings/lang/sv.json     | 11 +--
 www/core/components/settings/lang/tr.json     |  8 +-
 www/core/components/settings/lang/zh-cn.json  |  9 +-
 www/core/components/settings/lang/zh-tw.json  |  9 +-
 www/core/components/sharedfiles/lang/ar.json  |  2 +-
 www/core/components/sharedfiles/lang/ca.json  |  2 +-
 www/core/components/sharedfiles/lang/cs.json  |  2 +-
 www/core/components/sharedfiles/lang/de.json  |  2 +-
 .../components/sharedfiles/lang/es-mx.json    |  2 +-
 www/core/components/sharedfiles/lang/eu.json  |  2 +-
 www/core/components/sharedfiles/lang/it.json  |  2 +-
 www/core/components/sharedfiles/lang/lt.json  |  4 +-
 www/core/components/sharedfiles/lang/pt.json  |  2 +-
 www/core/components/sharedfiles/lang/sv.json  |  2 +-
 www/core/components/sharedfiles/lang/tr.json  |  2 +-
 .../components/sharedfiles/lang/zh-tw.json    |  4 +-
 www/core/components/sidemenu/lang/ar.json     |  4 +-
 www/core/components/sidemenu/lang/ca.json     |  2 +-
 www/core/components/sidemenu/lang/cs.json     |  4 +-
 www/core/components/sidemenu/lang/es-mx.json  |  2 +-
 www/core/components/sidemenu/lang/eu.json     |  2 +-
 www/core/components/sidemenu/lang/fa.json     |  4 +-
 www/core/components/sidemenu/lang/he.json     |  2 +-
 www/core/components/sidemenu/lang/lt.json     |  4 +-
 www/core/components/sidemenu/lang/nl.json     |  2 +-
 www/core/components/sidemenu/lang/pl.json     |  2 +-
 www/core/components/sidemenu/lang/ro.json     |  2 +-
 www/core/components/sidemenu/lang/zh-cn.json  |  2 +-
 www/core/components/sidemenu/lang/zh-tw.json  |  4 +-
 www/core/components/user/lang/ar.json         | 14 ++--
 www/core/components/user/lang/bg.json         | 10 +--
 www/core/components/user/lang/ca.json         |  6 +-
 www/core/components/user/lang/cs.json         | 12 +--
 www/core/components/user/lang/da.json         |  6 +-
 www/core/components/user/lang/de.json         | 12 +--
 www/core/components/user/lang/el.json         |  4 +-
 www/core/components/user/lang/es-mx.json      |  8 +-
 www/core/components/user/lang/es.json         |  4 +-
 www/core/components/user/lang/eu.json         | 16 ++--
 www/core/components/user/lang/fa.json         | 12 +--
 www/core/components/user/lang/fr.json         | 14 ++--
 www/core/components/user/lang/he.json         | 16 ++--
 www/core/components/user/lang/hu.json         |  6 +-
 www/core/components/user/lang/it.json         | 12 +--
 www/core/components/user/lang/ja.json         | 12 +--
 www/core/components/user/lang/lt.json         | 12 +--
 www/core/components/user/lang/nl.json         |  8 +-
 www/core/components/user/lang/pl.json         |  8 +-
 www/core/components/user/lang/pt-br.json      | 14 ++--
 www/core/components/user/lang/pt.json         | 12 +--
 www/core/components/user/lang/ro.json         | 14 ++--
 www/core/components/user/lang/ru.json         |  8 +-
 www/core/components/user/lang/sv.json         | 12 +--
 www/core/components/user/lang/tr.json         | 16 ++--
 www/core/components/user/lang/zh-cn.json      |  8 +-
 www/core/components/user/lang/zh-tw.json      | 14 ++--
 www/core/lang/ar.json                         | 36 ++++----
 www/core/lang/bg.json                         | 36 ++++----
 www/core/lang/ca.json                         | 54 ++++++------
 www/core/lang/cs.json                         | 56 ++++++-------
 www/core/lang/da.json                         | 52 ++++++------
 www/core/lang/de.json                         | 72 ++++++++--------
 www/core/lang/el.json                         | 59 +++++++------
 www/core/lang/es-mx.json                      | 74 ++++++++---------
 www/core/lang/es.json                         | 49 ++++++-----
 www/core/lang/eu.json                         | 48 ++++++-----
 www/core/lang/fa.json                         | 32 ++++----
 www/core/lang/fr.json                         | 62 +++++++-------
 www/core/lang/he.json                         | 68 +++++++--------
 www/core/lang/hu.json                         | 40 ++++-----
 www/core/lang/it.json                         | 67 ++++++++-------
 www/core/lang/ja.json                         | 24 +++---
 www/core/lang/lt.json                         | 65 ++++++++-------
 www/core/lang/nl.json                         | 82 +++++++++----------
 www/core/lang/pl.json                         | 40 ++++-----
 www/core/lang/pt-br.json                      | 68 ++++++++-------
 www/core/lang/pt.json                         | 74 ++++++++---------
 www/core/lang/ro.json                         | 73 ++++++++---------
 www/core/lang/ru.json                         | 45 +++++-----
 www/core/lang/sv.json                         | 53 ++++++------
 www/core/lang/tr.json                         | 54 ++++++------
 www/core/lang/zh-cn.json                      | 36 ++++----
 www/core/lang/zh-tw.json                      | 71 ++++++++--------
 664 files changed, 2795 insertions(+), 3388 deletions(-)

diff --git a/www/addons/badges/lang/sv.json b/www/addons/badges/lang/sv.json
index 4c67f9031ef..878282c5e4f 100644
--- a/www/addons/badges/lang/sv.json
+++ b/www/addons/badges/lang/sv.json
@@ -1,6 +1,6 @@
 {
     "badgedetails": "Detaljer för märke",
-    "badges": "Badges",
+    "badges": "Märken",
     "contact": "Kontakt",
     "dateawarded": "Utfärdandedatum",
     "expirydate": "Förfallodatum",
diff --git a/www/addons/calendar/lang/ar.json b/www/addons/calendar/lang/ar.json
index 23e2ee91b94..9bece3c914d 100644
--- a/www/addons/calendar/lang/ar.json
+++ b/www/addons/calendar/lang/ar.json
@@ -3,5 +3,5 @@
     "errorloadevent": "خطأ في تحميل الحدث",
     "errorloadevents": "خطأ في تحميل الأحداث",
     "noevents": "لا يوجد أي أحداث",
-    "notifications": "الإشعارات"
+    "notifications": "إشعارات"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index 93d27c11dce..dc0b5327079 100644
--- a/www/addons/calendar/lang/cs.json
+++ b/www/addons/calendar/lang/cs.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Výchozí čas oznámení",
     "errorloadevent": "Chyba při načítání události.",
     "errorloadevents": "Chyba při načítání událostí.",
-    "noevents": "Nejsou žádné události",
-    "notifications": "Upozornění"
+    "noevents": "Žádné nadcházející činnosti",
+    "notifications": "Oznámení"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/da.json b/www/addons/calendar/lang/da.json
index 6826baea7eb..3731c7e4ad3 100644
--- a/www/addons/calendar/lang/da.json
+++ b/www/addons/calendar/lang/da.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fejl ved indlæsning af begivenhed.",
     "errorloadevents": "Fejl ved indlæsning af begivenheder.",
     "noevents": "Der er ingen begivenheder",
-    "notifications": "Notifikationer"
+    "notifications": "Underretninger"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/de.json b/www/addons/calendar/lang/de.json
index ee64dc04300..ba88248af7f 100644
--- a/www/addons/calendar/lang/de.json
+++ b/www/addons/calendar/lang/de.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standardmäßige Benachrichtigungszeit",
     "errorloadevent": "Fehler beim Laden des Kalendereintrags",
     "errorloadevents": "Fehler beim Laden der Kalendereinträge",
-    "noevents": "Keine Kalendereinträge",
-    "notifications": "Benachrichtigung"
+    "noevents": "Keine anstehenden Aktivitäten fällig",
+    "notifications": "Benachrichtigungen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es-mx.json b/www/addons/calendar/lang/es-mx.json
index 872b31813b4..d54a5abc6ad 100644
--- a/www/addons/calendar/lang/es-mx.json
+++ b/www/addons/calendar/lang/es-mx.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificación por defecto",
     "errorloadevent": "Error al cargar evento.",
     "errorloadevents": "Error al cargar eventos.",
-    "noevents": "No hay eventos",
+    "noevents": "No hay actividades próximas pendientes",
     "notifications": "Notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es.json b/www/addons/calendar/lang/es.json
index 39bf009cfb6..7125c2b6049 100644
--- a/www/addons/calendar/lang/es.json
+++ b/www/addons/calendar/lang/es.json
@@ -2,6 +2,6 @@
     "calendarevents": "Eventos de calendario",
     "errorloadevent": "Error cargando el evento.",
     "errorloadevents": "Error cargando los eventos.",
-    "noevents": "No hay eventos",
+    "noevents": "No hay actividades próximas pendientes",
     "notifications": "Notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 109ac4e7ec6..344affea7df 100644
--- a/www/addons/calendar/lang/fa.json
+++ b/www/addons/calendar/lang/fa.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "زمان پیش‌فرض اطلاع‌رسانی",
     "errorloadevent": "خطا در بارگیری رویداد.",
     "errorloadevents": "خطا در بارگیری رویدادها.",
-    "noevents": "هیچ رویدادی نیست",
-    "notifications": "هشدارها"
+    "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
+    "notifications": "اطلاعیه‌ها"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fr.json b/www/addons/calendar/lang/fr.json
index 79e2b2edcac..9281fbdabb5 100644
--- a/www/addons/calendar/lang/fr.json
+++ b/www/addons/calendar/lang/fr.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Heure de notification par défaut",
     "errorloadevent": "Erreur de chargement de l'événement",
     "errorloadevents": "Erreur de chargement des événements",
-    "noevents": "Il n'y a pas d'événement",
+    "noevents": "Aucune activité",
     "notifications": "Notifications"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/he.json b/www/addons/calendar/lang/he.json
index 368fb1895c4..dbd55cacb5f 100644
--- a/www/addons/calendar/lang/he.json
+++ b/www/addons/calendar/lang/he.json
@@ -2,6 +2,6 @@
     "calendarevents": "אירועי לוח שנה",
     "errorloadevent": "שגיאה בטעינת האירוע.",
     "errorloadevents": "שגיאה בטעינת האירועים.",
-    "noevents": "אין אירועים",
-    "notifications": "התראות"
+    "noevents": "לא קיימות פעילויות עתידיות להן מועד הגשה",
+    "notifications": "הודעות"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/hu.json b/www/addons/calendar/lang/hu.json
index e4d79c9ecf7..c353b445809 100644
--- a/www/addons/calendar/lang/hu.json
+++ b/www/addons/calendar/lang/hu.json
@@ -1,3 +1,4 @@
 {
+    "noevents": "Nincs esedékes tevékenység",
     "notifications": "Értesítések"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/it.json b/www/addons/calendar/lang/it.json
index 7dda0726c1e..bd05740cedc 100644
--- a/www/addons/calendar/lang/it.json
+++ b/www/addons/calendar/lang/it.json
@@ -2,6 +2,6 @@
     "calendarevents": "Eventi nel calendario",
     "errorloadevent": "Si è verificato un errore durante il caricamento degli eventi.",
     "errorloadevents": "Si è verificato un errore durante il caricamento degli eventi.",
-    "noevents": "Non ci sono eventi",
+    "noevents": "Non ci sono attività da svolgere",
     "notifications": "Notifiche"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/ja.json b/www/addons/calendar/lang/ja.json
index 75664f413b3..5064bdee92f 100644
--- a/www/addons/calendar/lang/ja.json
+++ b/www/addons/calendar/lang/ja.json
@@ -1,4 +1,4 @@
 {
-    "noevents": "イベントはありません",
+    "noevents": "到来する活動期限はありません。",
     "notifications": "通知"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/nl.json b/www/addons/calendar/lang/nl.json
index 5c7174a3165..16546e8a4ee 100644
--- a/www/addons/calendar/lang/nl.json
+++ b/www/addons/calendar/lang/nl.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standaard notificatietijd",
     "errorloadevent": "Fout bij het laden van de gebeurtenis.",
     "errorloadevents": "Fout bij het laden van de gebeurtenissen.",
-    "noevents": "Er zijn geen gebeurtenissen",
+    "noevents": "Er zijn geen verwachte activiteiten",
     "notifications": "Meldingen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index b348e89bed4..77451b11a5d 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
     "noevents": "Sem eventos",
-    "notifications": "Notificação"
+    "notifications": "Notificações"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sv.json b/www/addons/calendar/lang/sv.json
index d5ac5c127d0..7599b1d1f89 100644
--- a/www/addons/calendar/lang/sv.json
+++ b/www/addons/calendar/lang/sv.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fel vid inläsning av händelse.",
     "errorloadevents": "Fel vid inläsning av händelser",
     "noevents": "Det finns inga händelser",
-    "notifications": "Notifikationer"
+    "notifications": "Meddelande"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/zh-tw.json b/www/addons/calendar/lang/zh-tw.json
index f880be3d54c..a6d35c00472 100644
--- a/www/addons/calendar/lang/zh-tw.json
+++ b/www/addons/calendar/lang/zh-tw.json
@@ -2,6 +2,6 @@
     "calendarevents": "行事曆",
     "errorloadevent": "載入事件時出現錯誤",
     "errorloadevents": "載入事件時出現錯誤",
-    "noevents": "沒有事件",
+    "noevents": "沒有即將到期的活動",
     "notifications": "通知"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ar.json b/www/addons/competency/lang/ar.json
index 90425c007dd..546b0528429 100644
--- a/www/addons/competency/lang/ar.json
+++ b/www/addons/competency/lang/ar.json
@@ -1,12 +1,11 @@
 {
     "activities": "أنشطة",
-    "duedate": "تاريخ تقديم مهمة",
+    "duedate": "موعد التسليم",
     "errornocompetenciesfound": "لا يوجد أي قدرات موجودة",
-    "mylearningplans": "خططي للتعلم",
     "myplans": "خططي للتعلم",
     "nocompetencies": "لا يوجد أي قدرات",
     "path": "مسار",
     "progress": "تقدّم الطالب",
-    "status": "الحالة",
+    "status": "السماح بدخول ضيف",
     "template": "قالب"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/bg.json b/www/addons/competency/lang/bg.json
index 3b3a332e5fb..34c3faee740 100644
--- a/www/addons/competency/lang/bg.json
+++ b/www/addons/competency/lang/bg.json
@@ -6,6 +6,6 @@
     "myplans": "Моите учебни планове",
     "noplanswerecreated": "Не бяха създадени учебни планове.",
     "path": "Път",
-    "status": "Състояние",
+    "status": "Позволяване достъп като гост",
     "template": "Шаблон"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index 20b5e09e58f..91a5c0fde71 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -3,25 +3,24 @@
     "competenciesmostoftennotproficientincourse": "Competències que més sovint no s'assoleixen en aquest curs",
     "coursecompetencies": "Competències del curs",
     "crossreferencedcompetencies": "Competències referenciades",
-    "duedate": "Data de venciment",
+    "duedate": "Data límit",
     "errornocompetenciesfound": "No s'han trobat competències",
     "evidence": "Evidència",
     "learningplancompetencies": "Competències del pla d'aprenentatge",
     "learningplans": "Plans d'aprenentatge",
-    "mylearningplans": "Els meus plans d'aprenentatge",
     "myplans": "Els meus plans d'aprenentatge",
     "noactivities": "Cap activitat",
-    "nocompetencies": "Cap competència",
+    "nocompetencies": "No s'han creat competències en aquest marc.",
     "nocrossreferencedcompetencies": "No hi ha competències amb referències a aquesta.",
     "noevidence": "Cap evidència",
     "noplanswerecreated": "No s'ha creat cap pla d'aprenentatge.",
-    "path": "Camí",
+    "path": "Ruta:",
     "proficient": "Superada",
-    "progress": "Progrés de l'estudiant",
-    "rating": "Valoració",
+    "progress": "Progrés",
+    "rating": "Qualificació",
     "reviewstatus": "Estat de la revisió",
-    "status": "Estat",
-    "template": "Plantilla",
+    "status": "Permetre l'accés de visitants",
+    "template": "Plantilla de pla d'aprenentatge",
     "xcompetenciesproficientoutofy": "{{$a.x}} de {{$a.y}} competències superades",
     "xcompetenciesproficientoutofyincourse": "Heu superat {{$a.x}} de {{$a.y}} competències en aquest curs."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index 9c3ef7338a3..2e584cd9176 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Hodnocení kompetencí v tomto kurzu nemají vliv na studijní plány.",
     "coursecompetencyratingsarepushedtouserplans": "Hodnocení kompetencí v tomto kurzu jsou okamžitě aktualizovány v studijních plánech.",
     "crossreferencedcompetencies": "Průřezové kompetence",
-    "duedate": "Termín odevzdání",
+    "duedate": "Termín dokončení",
     "errornocompetenciesfound": "Nebyly nalezeny žádné kompetence",
     "evidence": "Evidence",
     "learningplancompetencies": "Kompetence studijního plánu",
     "learningplans": "Studijní plány",
-    "mylearningplans": "Můj studijní plán",
-    "myplans": "Můj studijní plán",
-    "noactivities": "Žádné aktivity",
-    "nocompetencies": "Žádné kompetence",
+    "myplans": "Mé studijní plány",
+    "noactivities": "Žádné činnosti",
+    "nocompetencies": "V tomto rámci nebyly vytvořeny žádné kompetence.",
     "nocrossreferencedcompetencies": "K této kompetenci nebyly spojeny další průřezové kompetence.",
     "noevidence": "Bez záznamu",
     "noplanswerecreated": "Nebyly vytvořeny žádné studijní plány.",
-    "path": "Cesta",
+    "path": "Cesta:",
     "proficient": "Splněno",
-    "progress": "Pokrok studenta",
+    "progress": "Pokrok",
     "rating": "Hodnocení",
     "reviewstatus": "Stav revize",
-    "status": "Stav",
-    "template": "Šablona",
+    "status": "Povolit přístup pro hosty",
+    "template": "Šablona studijního plánu",
     "xcompetenciesproficientoutofy": "máte splněno {{$a.x}} z {{$a.y}} kompetencí",
     "xcompetenciesproficientoutofyincourse": "V tomto kurzu máte splněno {{$a.x}} z {{$a.y}} kompetencí."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/da.json b/www/addons/competency/lang/da.json
index 6a8244c24cc..b469e30cc5e 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -1,24 +1,23 @@
 {
-    "activities": " Aktiviteter",
+    "activities": "Aktiviteter",
     "coursecompetencies": "Kursuskompetencer",
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetencebedømmelser på dette kursus påvirker ikke læringsplaner.",
     "coursecompetencyratingsarepushedtouserplans": "Kompetencebedømmelser på dette kursus opdateres straks i læringsplaner.",
     "crossreferencedcompetencies": "Kryds-refererede kompetencer",
-    "duedate": "Afleveringsdato",
+    "duedate": "Udløbsdato",
     "errornocompetenciesfound": "Ingen kompetencer fundet",
     "evidence": "Vidnesbyrd",
     "learningplancompetencies": "Læringsplankompetencer",
     "learningplans": "Læringsplaner",
-    "mylearningplans": "Mine læringsplaner",
     "myplans": "Mine læringsplaner",
     "noactivities": "Ingen aktiviteter",
-    "nocompetencies": "Ingen kompetencer",
+    "nocompetencies": "Ingen kompetencer er oprettet i denne ramme.",
     "nocrossreferencedcompetencies": "Ingen andre kompetencer er krydsrefereret til denne kompetence.",
     "noevidence": "Ingen vidnesbyrd",
     "noplanswerecreated": "Der blev ikke oprettet nogen læringsplaner.",
-    "path": "Sti",
-    "progress": "Studerendes fremskridt",
+    "path": "Sti:",
+    "progress": "Progression",
     "rating": "Bedømmelse",
-    "status": "Status",
-    "template": "Skabelon"
+    "status": "Tillad gæsteadgang",
+    "template": "Læringsplanskabelon"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index b005d234dec..744b6c16535 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetenzbewertungen in diesem Kurs beeinflussen keine Lernpläne.",
     "coursecompetencyratingsarepushedtouserplans": "Kompetenzbewertungen in diesem Kurs werden sofort in den Lernplänen aktualisiert.",
     "crossreferencedcompetencies": "Querverwiesene Kompetenzen",
-    "duedate": "Abgabeende",
+    "duedate": "Abgabedatum",
     "errornocompetenciesfound": "Keine Kompetenzen gefunden",
-    "evidence": "Evidenz",
+    "evidence": "Beleg",
     "learningplancompetencies": "Kompetenzen des Lernplans",
     "learningplans": "Lernpläne",
-    "mylearningplans": "Meine Lernpläne",
     "myplans": "Meine Lernpläne",
     "noactivities": "Keine Aktivitäten",
-    "nocompetencies": "Keine Kompetenzen",
+    "nocompetencies": "Für diesen Kompetenzrahmen wurden keine Kompetenzen angelegt.",
     "nocrossreferencedcompetencies": "Keine anderen Kompetenzen wurden zu dieser Kompetenz referiert.",
     "noevidence": "Keine Belege",
     "noplanswerecreated": "Bisher sind keine Lernpläne angelegt.",
-    "path": "Pfad",
+    "path": "Pfad:",
     "proficient": "Erfahren",
-    "progress": "Bearbeitungsstand",
-    "rating": "Bewertung",
+    "progress": "Fortschritt",
+    "rating": "Wertung",
     "reviewstatus": "Überprüfungsstatus",
-    "status": "Status",
-    "template": "Vorlage",
+    "status": "Gastzugang erlauben",
+    "template": "Lernplanvorlage",
     "xcompetenciesproficientoutofy": "{{$a.x}} von {{$a.y}} Kompetenzen sind eingeübt",
     "xcompetenciesproficientoutofyincourse": "Du bist in {{$a.x}} von {{$a.y}} Kompetenzen geübt"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/el.json b/www/addons/competency/lang/el.json
index 524b6206fe8..940c9116122 100644
--- a/www/addons/competency/lang/el.json
+++ b/www/addons/competency/lang/el.json
@@ -1,11 +1,10 @@
 {
     "activities": "Δραστηριότητες",
-    "duedate": "Καταληκτική ημερομηνία",
+    "duedate": "Ημερομηνία εκπνοής",
     "errornocompetenciesfound": "Δεν βρέθηκαν ικανότητες",
-    "mylearningplans": "Το μαθησιακό πλάνο μου",
     "nocompetencies": "Δεν βρέθηκαν ικανότητες",
     "path": "Διαδρομή",
     "progress": "Πρόοδος μαθητών",
-    "status": "Κατάσταση",
+    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
     "template": "Πρότυπο"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index d924545ee14..b6b1c272d25 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Las valoraciones de competencia en este curso no afectan a los planes de aprendizaje.",
     "coursecompetencyratingsarepushedtouserplans": "Las valoraciones de competencia en este curso son actualizadas inmediatamente dentro de planes de aprendizaje.",
     "crossreferencedcompetencies": "Competencias con referencias-cruzadas",
-    "duedate": "Fecha de entrega",
+    "duedate": "Fecha prometida/esperada",
     "errornocompetenciesfound": "No se encontraron competencias",
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "Planes de aprendizaje",
-    "mylearningplans": "Mis planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
-    "nocompetencies": "Sin competencias",
+    "nocompetencies": "No se han creado competencias en esta estructura.",
     "nocrossreferencedcompetencies": "No se han referenciado cruzadamente otras competencias con esta competencia.",
     "noevidence": "Sin evidencia",
     "noplanswerecreated": "No se crearon planes de aprendizaje.",
-    "path": "Ruta",
+    "path": "Ruta:",
     "proficient": "Dominio/pericia",
-    "progress": "Progreso del estudiante",
-    "rating": "Valuación (rating)",
+    "progress": "Progreso",
+    "rating": "Valoración",
     "reviewstatus": "Revisar estatus",
-    "status": "Estatus",
-    "template": "Plantilla",
+    "status": "Se permite el acceso de invitados",
+    "template": "Plantilla de plan de aprendizaje",
     "xcompetenciesproficientoutofy": "{{$a.x}} de un total de {{$a.y}} competencias se tienen dominadas",
     "xcompetenciesproficientoutofyincourse": "Usted es capaz/perito/experto en {{$a.x}} de un total de {{$a.y}} competencias en este curso."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/es.json b/www/addons/competency/lang/es.json
index 40406ead3e2..f2300d130e0 100644
--- a/www/addons/competency/lang/es.json
+++ b/www/addons/competency/lang/es.json
@@ -5,23 +5,22 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Las calificaciones de competencias de este curso no afectan los planes de aprendizaje.",
     "coursecompetencyratingsarepushedtouserplans": "Las calificaciones de competencias en este curso actualizan de inmediato los planes de aprendizaje.",
     "crossreferencedcompetencies": "Competencias referenciadas",
-    "duedate": "Fecha de entrega",
+    "duedate": "Fecha límite",
     "errornocompetenciesfound": "No se encontraron competencias",
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "Planes de aprendizaje",
-    "mylearningplans": "Mis planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
-    "nocompetencies": "Sin competencias",
+    "nocompetencies": "No se han creado competencias para este marco.",
     "nocrossreferencedcompetencies": "No se han referenciado otras competencias a esta competencia.",
     "noevidence": "Sin evidencias",
     "path": "Ruta",
     "proficient": "Superada",
-    "progress": "Progreso del estudiante",
-    "rating": "Clasificación",
+    "progress": "Avance",
+    "rating": "Calificación",
     "reviewstatus": "Estado de la revisión",
-    "status": "Estado",
+    "status": "Se permite el acceso de invitados",
     "template": "Plantilla",
     "xcompetenciesproficientoutofy": "{{$a.x}} de {{$a.y}} competencias superadas",
     "xcompetenciesproficientoutofyincourse": "Has superado {{$a.x}} de las {{$a.y}} competencias del curso."
diff --git a/www/addons/competency/lang/eu.json b/www/addons/competency/lang/eu.json
index 9c97e3c153f..43617aa4e31 100644
--- a/www/addons/competency/lang/eu.json
+++ b/www/addons/competency/lang/eu.json
@@ -7,17 +7,16 @@
     "evidence": "Ebidentzia",
     "learningplancompetencies": "Ikasketa-planaren gaitasunak",
     "learningplans": "Ikasketa-planak",
-    "mylearningplans": "Nire ikasketa-planak",
     "myplans": "Nire ikasketa-planak",
     "noactivities": "Ez dago jarduerarik",
-    "nocompetencies": "Gaitasunik ez",
+    "nocompetencies": "Ezin izan gaitasunik sortu marko honetan.",
     "noevidence": "Ez dago ebidentziarik",
     "noplanswerecreated": "Ez da ikasketa-planik sortu.",
-    "path": "Bidea",
+    "path": "Bidea:",
     "proficient": "Gai",
-    "progress": "Ikaslearen aurrerapena",
+    "progress": "Aurrerapena",
     "rating": "Puntuazioa",
     "reviewstatus": "Berrikusi egora",
-    "status": "Egoera",
-    "template": "Txantiloia"
+    "status": "Bisitarien sarbidea baimendu",
+    "template": "Ikasketa-planerako txantiloia"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/fa.json b/www/addons/competency/lang/fa.json
index 209f8a9cc31..d435e4ecaa6 100644
--- a/www/addons/competency/lang/fa.json
+++ b/www/addons/competency/lang/fa.json
@@ -1,26 +1,25 @@
 {
     "activities": "فعالیت‌ها",
     "coursecompetencies": "شایستگی‌های درس",
-    "coursecompetencyratingsarenotpushedtouserplans": "امتیازهای شایستگی‌ها در این درس تاثیری در برنامه‌های آموزشی ندارند.",
-    "coursecompetencyratingsarepushedtouserplans": "امتیازهای شایستگی‌ها در این درس بلافاصله در برنامه‌های آموزشی به‌روز می‌شوند.",
+    "coursecompetencyratingsarenotpushedtouserplans": "امتیازهای شایستگی‌ها در این درس تاثیری در برنامه‌های یادگیری ندارند.",
+    "coursecompetencyratingsarepushedtouserplans": "امتیازهای شایستگی‌ها در این درس بلافاصله در برنامه‌های یادگیری به‌روز می‌شوند.",
     "crossreferencedcompetencies": "شایستگی‌های دارای ارجاع متقابل",
-    "duedate": "مهلت تحویل",
+    "duedate": "مهلت",
     "errornocompetenciesfound": "هیچ شایستگی‌ای پیدا نشد",
     "evidence": "مدرک",
-    "learningplancompetencies": "شایستگی‌های برنامه آموزشی",
+    "learningplancompetencies": "شایستگی‌های برنامه یادگیری",
     "learningplans": "برنامه‌های آزموشی",
-    "mylearningplans": "برنامه‌های آموزشی من",
-    "myplans": "برنامه‌های آموزشی من",
+    "myplans": "برنامه‌های یادگیری من",
     "nocrossreferencedcompetencies": "هیچ شایستگی دیگری به این شایستگی به‌طور متقابل ارجاع داده نشده است.",
     "noevidence": "بدون مدرک",
     "noplanswerecreated": "هیچ برنامهٔ یادگیری‌ای ساخته نشده است.",
-    "path": "مسیر",
+    "path": "مسیر:",
     "proficient": "کسب مهارت",
-    "progress": "پیشروی شاگردان",
+    "progress": "پیشروی",
     "rating": "امتیاز",
     "reviewstatus": "بازبینی وضعیت",
-    "status": "وضعیت",
-    "template": "الگو",
+    "status": "اجازهٔ ورود به عنوان مهمان",
+    "template": "الگوی برنامه یادگیری",
     "xcompetenciesproficientoutofy": "در {{$a.x}} شایستگی از مجموع {{$a.y}} شایستگی مهارت کسب شده است",
     "xcompetenciesproficientoutofyincourse": "شما در {{$a.x}} شایستگی از {{$a.y}} شایستگی ماهر هستید."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index bf16110e08f..f8af723914c 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Les évaluations de compétences de ce cours n'ont pas d'influence sur les plans de formation.",
     "coursecompetencyratingsarepushedtouserplans": "Les évaluations de compétences de ce cours sont immédiatement reportées dans les plans de formation.",
     "crossreferencedcompetencies": "Compétences transversales",
-    "duedate": "Date de remise",
+    "duedate": "Délai d'achèvement",
     "errornocompetenciesfound": "Aucune compétence trouvée",
     "evidence": "Preuve",
     "learningplancompetencies": "Compétences du plan de formation",
     "learningplans": "Plans de formation",
-    "mylearningplans": "Mes plans de formation",
     "myplans": "Mes plans de formation",
     "noactivities": "Aucune activité",
-    "nocompetencies": "Aucune compétence",
+    "nocompetencies": "Aucune compétence n'a été créée dans ce référentiel.",
     "nocrossreferencedcompetencies": "Aucune autre compétence n'est transversale pour cette compétence.",
     "noevidence": "Aucune preuve d'acquis",
     "noplanswerecreated": "Aucun plan de formation n'a été créé.",
-    "path": "Chemin",
+    "path": "Chemin :",
     "proficient": "Compétence acquise",
-    "progress": "Suivi des activités des participants",
+    "progress": "Progrès",
     "rating": "Évaluation",
     "reviewstatus": "Statut de validation",
-    "status": "Statut",
-    "template": "Modèle",
+    "status": "Permettre l'accès anonyme",
+    "template": "Modèle de plan de formation",
     "xcompetenciesproficientoutofy": "{{$a.x}} compétences sur {{$a.y}} sont acquises",
     "xcompetenciesproficientoutofyincourse": "Vous avez acquis {{$a.x}} compétences sur {{$a.y}} dans ce cours."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/he.json b/www/addons/competency/lang/he.json
index 0468bcefe15..95d0a41b64a 100644
--- a/www/addons/competency/lang/he.json
+++ b/www/addons/competency/lang/he.json
@@ -2,26 +2,26 @@
     "activities": "פעילויות",
     "competenciesmostoftennotproficientincourse": "מיומנויות בהן אינכם בקיאים בקורס זה",
     "coursecompetencies": "מיומנויות הקורס",
-    "coursecompetencyratingsarenotpushedtouserplans": "השלמת מיומנויות בקורס זה לא מתעדכנות בתוכניות הלימודים",
-    "coursecompetencyratingsarepushedtouserplans": "מצב רכישת מיומנות כתוצאה מהשלמת פעילות בקורס, מתעדכן באופן מידי בתוכניות הלימוד.",
+    "coursecompetencyratingsarenotpushedtouserplans": "השלמת מיומנויות בקורס זה לא מתעדכנות בתוכניות־הלימוד",
+    "coursecompetencyratingsarepushedtouserplans": "מצב רכישת מיומנות כתוצאה מהשלמת פעילות בקורס, מתעדכן באופן מידי בתוכניות־הלימוד.",
     "crossreferencedcompetencies": "מקושר למיומנויות",
     "duedate": "עד לתאריך",
-    "evidence": "סימוכין",
-    "learningplancompetencies": "מיומנויות תוכנית־הלימודים",
-    "learningplans": "תוכניות־לימודים",
+    "evidence": "ראיה לבקיאות",
+    "learningplancompetencies": "מיומנויות תוכנית־הלימוד",
+    "learningplans": "תוכניות־לימוד",
     "myplans": "תוכניות הלימודים שלי",
     "noactivities": "לא מקושר לאף פעילות בקורס",
     "nocompetencies": "טרם נוצרה מיומנות כלשהי באוסף־מיומנויות זה.",
     "nocrossreferencedcompetencies": "אף מיומנות לא מקושרת למיומנות זו.",
     "noevidence": "טרם צורפה ראיה לבקיאות",
-    "noplanswerecreated": "טרם נוצרו תוכניות לימודים.",
+    "noplanswerecreated": "טרם נוצרו תוכניות־לימוד.",
     "path": "נתיב",
     "proficient": "בקיאות",
-    "progress": "מעקב התקדמות למידה",
-    "rating": "דירוג",
+    "progress": "התקדמות",
+    "rating": "דרוג",
     "reviewstatus": "סקירת מצב",
-    "status": "מצב",
-    "template": "תבנית",
+    "status": "הקורס זמין לאורחים",
+    "template": "תבנית תוכנית־לימוד",
     "xcompetenciesproficientoutofy": "בקיאות ב {{$a.x}} מיומנויות מתוך {{$a.y}}",
     "xcompetenciesproficientoutofyincourse": "רכשתם בקיאות ב {{$a.x}} מתוך {{$a.y}} המיומנויות בקורס זה."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/hu.json b/www/addons/competency/lang/hu.json
index 101f0f9a6a0..cc80f882d34 100644
--- a/www/addons/competency/lang/hu.json
+++ b/www/addons/competency/lang/hu.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "A kurzus készségbesorolásai nem érintik a tanulási terveket.",
     "coursecompetencyratingsarepushedtouserplans": "A kurzus készségbesorolásai azonnal frissülnek a tanulási tervekben.",
     "crossreferencedcompetencies": "Kereszthivatkozott készségek",
-    "duedate": "Határidő",
+    "duedate": "Esedékesség",
     "evidence": "Bizonyíték",
     "learningplancompetencies": "Tanulási tervhez tartozó készségek",
     "learningplans": "Tanulási tervek",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "A készséghez kereszthivatkozással nem kapcsolódik más készség.",
     "noevidence": "Nincs bizonyíték",
     "noplanswerecreated": "Nem jött létre tanulási terv.",
-    "path": "Útvonal",
+    "path": "Útvonal:",
     "proficient": "Sikeres",
-    "progress": "A tanuló előmenetele",
-    "rating": "Értékelés",
+    "progress": "Előmenetel",
+    "rating": "Besorolás",
     "reviewstatus": "Ellenőrzés állapota",
-    "status": "Állapot",
-    "template": "Sablon",
+    "status": "Vendégkénti belépés engedélyezése",
+    "template": "Tanulási tervsablon",
     "xcompetenciesproficientoutofy": "{{$a.x}} / {{$a.y}} készség eredményes",
     "xcompetenciesproficientoutofyincourse": "Ön a kurzusban  {{$a.y}} közül {{$a.x}} készség tekintetében eredményesnek bizonyul."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index 8e2551a9b4f..aedcc17cab4 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Le valutazioni delle competenze nel corso non si riflettono nei piani di formazione.",
     "coursecompetencyratingsarepushedtouserplans": "Le valutazione delle competenze nel corso si riflettono immediatamente nei piani di formazione.",
     "crossreferencedcompetencies": "Competenze con riferimento incrociato",
-    "duedate": "Termine consegne",
+    "duedate": "Data di scadenza",
     "errornocompetenciesfound": "Non sono state trovate competenze",
-    "evidence": "Verifica",
+    "evidence": "Attestazione",
     "learningplancompetencies": "Competenze del piano di formazione",
     "learningplans": "Piani di formazione",
-    "mylearningplans": "I miei piani formativi",
-    "myplans": "I miei piani formativi",
+    "myplans": "I miei piani di formazione",
     "noactivities": "Nessuna attività.",
-    "nocompetencies": "Non sono presenti competenze",
+    "nocompetencies": "Questo quadro non ha competenze",
     "nocrossreferencedcompetencies": "Non ci sono competenze con riferimenti incrociati a questa competenza",
     "noevidence": "Non sono presenti attestazioni.",
     "noplanswerecreated": "Non sono stati creati piani di formazione",
-    "path": "Percorso",
+    "path": "Percorso:",
     "proficient": "Esperto",
-    "progress": "Situazione dello studente",
+    "progress": "Avanzamento",
     "rating": "Valutazione",
     "reviewstatus": "Stato della revisione",
-    "status": "Stato",
-    "template": "Modello",
+    "status": "Consenti l'accesso agli ospiti",
+    "template": "Modello di piano di formazione",
     "xcompetenciesproficientoutofy": "{{$a.x}} competenze su {{$a.y}} sono a livello di esperto",
     "xcompetenciesproficientoutofyincourse": "Possiedi un livello di esperto in {{$a.x}} competenze su {{$a.y}} competenze di questo corso."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ja.json b/www/addons/competency/lang/ja.json
index f644259151c..0ed9aba2752 100644
--- a/www/addons/competency/lang/ja.json
+++ b/www/addons/competency/lang/ja.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "このコース内でのコンピテンシー評定は学習プランに影響しません。",
     "coursecompetencyratingsarepushedtouserplans": "このコース内でのコンピテンシー評定は学習プラン内ですぐに更新されます。",
     "crossreferencedcompetencies": "クロスリファレンスコンピテンシー",
-    "duedate": "終了日時",
+    "duedate": "期限",
     "evidence": "エビデンス",
     "learningplancompetencies": "学習プランコンピテンシー",
     "learningplans": "学習プラン",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "このコンピテンシーに相互参照されている他のコンピテンシーはありません。",
     "noevidence": "エビデンスなし",
     "noplanswerecreated": "学習プランは作成されませんでした。",
-    "path": "パス",
+    "path": "パス:",
     "proficient": "熟達",
-    "progress": "学生の進捗",
-    "rating": "評価",
+    "progress": "進捗",
+    "rating": "評定",
     "reviewstatus": "レビューステータス",
-    "status": "状態",
-    "template": "テンプレート",
+    "status": "ゲストアクセスを許可する",
+    "template": "学習プランテンプレート",
     "xcompetenciesproficientoutofy": "{{$a.x}} / {{$a.y}} のコンピテンシーで熟達しています。",
     "xcompetenciesproficientoutofyincourse": "あなたはこのコースに関して {{$a.x}} / {{$a.y}} のコンピテンシーで熟達しています。"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/lt.json b/www/addons/competency/lang/lt.json
index 5d1638d202f..9135a29feee 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -1,20 +1,19 @@
 {
-    "activities": "Veikla",
+    "activities": "Veiklos",
     "coursecompetencies": "Kurso kompetencijos",
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetencijų reitingai šiame kurse neturi įtakos mokymosi planams.",
-    "duedate": "Data pristatymui",
+    "duedate": "Terminas",
     "errornocompetenciesfound": "Kompetencijų nerasta",
     "evidence": "Įrodymas",
     "learningplancompetencies": "Mokymosi plano kompetencijos",
     "learningplans": "Mokymosi planai",
-    "mylearningplans": "Mano mokymosi planai",
     "myplans": "Mano mokymosi planai",
     "noactivities": "Nėra veiklų",
-    "nocompetencies": "Nėra kompetencijų",
+    "nocompetencies": "Šioje sistemoje nebuvo sukurta kompetencijų.",
     "noplanswerecreated": "Nebuvo sukurta mokymosi planų.",
     "path": "Kelias",
-    "progress": "Besimokančiojo pažanga",
-    "rating": "Vertinimas",
-    "status": "Būsena",
-    "template": "Šablonas"
+    "progress": "Progresas",
+    "rating": "Reitingas",
+    "status": "Leisti svečio prieigą",
+    "template": "Mokymosi plano šablonas"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index 896d0dddd81..8f923295c43 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Competentiebeoordelingen in deze cursus hebben geen invloed op studieplannnen.",
     "coursecompetencyratingsarepushedtouserplans": "Competentiebeoordelingen in deze cursus worden onmiddellijk aangepast in studieplannen.",
     "crossreferencedcompetencies": "Competenties met kruisverwijzingen",
-    "duedate": "Uiterste inleverdatum",
+    "duedate": "Einddatum",
     "errornocompetenciesfound": "Geen competenties gevonden",
     "evidence": "Bewijs",
     "learningplancompetencies": "Studieplan competenties",
     "learningplans": "Studieplannen",
-    "mylearningplans": "Mijn leerplannen",
-    "myplans": "Mijn leerplannen",
+    "myplans": "Mijn studieplannen",
     "noactivities": "Geen activiteiten",
-    "nocompetencies": "Geen competenties",
+    "nocompetencies": "Er zijn nog geen competenties gemaakt in dit framework",
     "nocrossreferencedcompetencies": "Er zijn geen andere competenties met een kruisverwijzing naar deze competentie.",
     "noevidence": "Geen bewijs",
     "noplanswerecreated": "Er zijn nog geen studieplannen gemaakt",
-    "path": "Pad",
-    "proficient": "Geslaaagd",
-    "progress": "Vooruitgang leerling",
+    "path": "Pad:",
+    "proficient": "Geslaagd",
+    "progress": "Vordering",
     "rating": "Beoordeling",
     "reviewstatus": "Beoordelingsstatus",
-    "status": "Status",
-    "template": "Sjabloon",
+    "status": "Gasttoegang toestaan",
+    "template": "Studieplansjabloon",
     "xcompetenciesproficientoutofy": "{{$a.x}} van de  {{$a.y}} competenties zijn bekwaam",
     "xcompetenciesproficientoutofyincourse": "Je bent bekwaam in {{$a.x}} van de {{$a.y}} competenties in deze cursus."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/pl.json b/www/addons/competency/lang/pl.json
index 2b72a64195a..8cabf83f795 100644
--- a/www/addons/competency/lang/pl.json
+++ b/www/addons/competency/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "activities": "Aktywności",
     "coursecompetencies": "Kompetencje kursu",
-    "duedate": "Termin oddania",
+    "duedate": "Termin",
     "evidence": "Dowód",
     "learningplancompetencies": "Kompetencje planu nauczania",
     "learningplans": "Plany nauczania",
@@ -10,10 +10,10 @@
     "nocompetencies": "Nie utworzono żadnych kompetencji w tych ramach kwalifikacji.",
     "noevidence": "Brak dowodów",
     "noplanswerecreated": "Nie utworzono planów uczenia się.",
-    "path": "Ścieżka",
-    "progress": "Postępy studenta w nauce",
+    "path": "Ścieżka:",
+    "progress": "Postęp",
     "rating": "Ocena",
     "reviewstatus": "Status przeglądu",
-    "status": "Status",
-    "template": "Szablon"
+    "status": "Zezwól na dostęp gości",
+    "template": "Szablon planu uczenia się."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index bb9013f1f72..b63b0689b05 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Avaliações de competência neste curso não afetam os planos de aprendizagem.",
     "coursecompetencyratingsarepushedtouserplans": "Avaliações de competência neste curso são atualizadas imediatamente nos planos de aprendizagem.",
     "crossreferencedcompetencies": "Competências referenciadas",
-    "duedate": "Data de entrega",
+    "duedate": "Prazo",
     "errornocompetenciesfound": "Nenhuma competência encontrada",
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
-    "mylearningplans": "Meus planos de aprendizagem",
     "myplans": "Meus planos de aprendizagem",
     "noactivities": "Sem atividades",
-    "nocompetencies": "Nenhuma competência",
+    "nocompetencies": "Nenhuma competência foi criada para esta estrutura.",
     "nocrossreferencedcompetencies": "Nenhuma outra competência foi referenciada a esta competência.",
     "noevidence": "Nenhuma evidência",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
-    "path": "Caminho",
+    "path": "Caminho:",
     "proficient": "Proficiente",
-    "progress": "Progresso do aluno",
+    "progress": "Progresso",
     "rating": "Avaliação",
     "reviewstatus": "Estado da revisão",
-    "status": "Status",
-    "template": "Modelo",
+    "status": "Permitir o acesso de visitantes",
+    "template": "Modelo de plano de aprendizagem",
     "xcompetenciesproficientoutofy": "{{$a.x}} de {{$a.y}} competências são proficiêntes",
     "xcompetenciesproficientoutofyincourse": "Você é proficiente em {{$a.x}} de {{$a.y}} competências  neste curso."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/pt.json b/www/addons/competency/lang/pt.json
index 16d560a1fde..ef6c73e845b 100644
--- a/www/addons/competency/lang/pt.json
+++ b/www/addons/competency/lang/pt.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "As avaliações das competências nesta disciplina não afetam os planos de aprendizagem.",
     "coursecompetencyratingsarepushedtouserplans": "As avaliações das competências nesta disciplina são automaticamente atualizadas nos planos de aprendizagem.",
     "crossreferencedcompetencies": "Competências referenciadas",
-    "duedate": "Data limite para submeter trabalhos",
+    "duedate": "Data limite",
     "errornocompetenciesfound": "Competências não encontradas",
-    "evidence": "Evidência",
+    "evidence": "Comprovativo",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
-    "mylearningplans": "Meus planos de aprendizagem",
     "myplans": "Os meus planos de aprendizagem",
     "noactivities": "Nenhuma atividade associada",
-    "nocompetencies": "Sem competências",
+    "nocompetencies": "Ainda não foram criadas competências neste quadro.",
     "nocrossreferencedcompetencies": "Nenhuma competência foi referenciada a esta competência.",
     "noevidence": "Não foi adicionado nenhum comprovativo",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
-    "path": "Caminho",
+    "path": "Localização:",
     "proficient": "Proficiente",
-    "progress": "Progresso do aluno",
+    "progress": "Progresso",
     "rating": "Avaliação",
     "reviewstatus": "Estado da revisão",
-    "status": "Estado",
-    "template": "Modelo",
+    "status": "Permitir o acesso de visitantes",
+    "template": "Modelo de plano de aprendizagem",
     "xcompetenciesproficientoutofy": "Tem proficiência em {{$a.x}} de {{$a.y}} competências",
     "xcompetenciesproficientoutofyincourse": "Tem proficiência em {{$a.x}} de {{$a.y}} competências nesta disciplina"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ro.json b/www/addons/competency/lang/ro.json
index 63d6243c09f..1578e6ba3fd 100644
--- a/www/addons/competency/lang/ro.json
+++ b/www/addons/competency/lang/ro.json
@@ -1,10 +1,10 @@
 {
-    "activities": "Activităţi",
+    "activities": "Activități",
     "duedate": "Termen de predare",
     "evidence": "Evidență",
     "path": "Cale",
     "progress": "Progres student",
     "rating": "Rating",
-    "status": "Status",
+    "status": "Permite accesul vizitatorilor",
     "template": "Șablon"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ru.json b/www/addons/competency/lang/ru.json
index c4ed3c620f7..230b243b4f9 100644
--- a/www/addons/competency/lang/ru.json
+++ b/www/addons/competency/lang/ru.json
@@ -1,28 +1,27 @@
 {
-    "activities": "Элементы курса",
+    "activities": "Элементы",
     "competenciesmostoftennotproficientincourse": "Компетенции, которые чаще всего оказываются не освоенными в этом курсе",
     "coursecompetencies": "Компетенции курса",
     "coursecompetencyratingsarenotpushedtouserplans": "Рейтинги компетенций из этого курса не влияют на учебные планы.",
     "coursecompetencyratingsarepushedtouserplans": "Рейтинги компетенций из этого курса сразу же обновляются в учебных планах.",
     "crossreferencedcompetencies": "Перекрестные компетенции",
-    "duedate": "Последний срок сдачи",
-    "evidence": "Подтверждение",
+    "duedate": "Срок выполнения",
+    "evidence": "Доказательство",
     "learningplancompetencies": "Компетенции учебного плана",
     "learningplans": "Учебные планы",
-    "mylearningplans": "Мои учебные планы",
     "myplans": "Мои учебные планы",
     "noactivities": "Нет элементов",
     "nocompetencies": "Нет компетенций, созданных в этом фреймворке.",
     "nocrossreferencedcompetencies": "Нет других компетенций, перекрестно ссылающихся на эту компетенцию.",
     "noevidence": "Нет доказательств",
     "noplanswerecreated": "Учебные планы не были созданы.",
-    "path": "Путь",
+    "path": "Путь:",
     "proficient": "Освоено",
-    "progress": "Достижения студента",
+    "progress": "В процессе",
     "rating": "Рейтинг",
     "reviewstatus": "Статус пересмотра",
-    "status": "Статус",
-    "template": "Шаблон",
+    "status": "Разрешить гостевой доступ",
+    "template": "Шаблон учебного плана",
     "xcompetenciesproficientoutofy": "{{$a.x}} из {{$a.y}} компетенций освоены",
     "xcompetenciesproficientoutofyincourse": "Вы освоили {{$a.x}} из {{$a.y}} компетенций в этом курсе."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/sv.json b/www/addons/competency/lang/sv.json
index a87634db442..74cdccdfedb 100644
--- a/www/addons/competency/lang/sv.json
+++ b/www/addons/competency/lang/sv.json
@@ -5,8 +5,8 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Bedömning av kompetenser i denna kurs kommer inte att påverka studieplaner.",
     "coursecompetencyratingsarepushedtouserplans": "Bedömning av kompetenser i denna kurs uppdateras omedelbart i studieplanerna.",
     "crossreferencedcompetencies": "Korsrefererade kompetenser.",
-    "duedate": "Stoppdatum/tid",
-    "evidence": "Bevis",
+    "duedate": "Sista datum",
+    "evidence": "Verifiering",
     "learningplancompetencies": "Kompetenser i studieplaner",
     "learningplans": "Studieplaner",
     "myplans": "Mina studieplaner",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "Inga andra kompetenser har korsrefererats till denna kompetens.",
     "noevidence": "Inga verifieringar",
     "noplanswerecreated": "Inga studieplaner var skapade.",
-    "path": "Sökväg",
+    "path": "Sökväg:",
     "proficient": "Kunnig",
-    "progress": "Kursdeltagares progression",
-    "rating": "Betygssättning/omdömen",
+    "progress": "Utveckling",
+    "rating": "Bedömning",
     "reviewstatus": "Granska status",
-    "status": "Status",
-    "template": "Mall",
+    "status": "Tillåt gäster",
+    "template": "Mall för studieplan",
     "xcompetenciesproficientoutofy": "{{$a.x}} av {{$a.y}} kompetenser är uppnådda",
     "xcompetenciesproficientoutofyincourse": "Du har uppnått  {{$a.x}} av {{$a.y}} kompetenser i denna kurs.."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/tr.json b/www/addons/competency/lang/tr.json
index e61b42445f4..c9004bec886 100644
--- a/www/addons/competency/lang/tr.json
+++ b/www/addons/competency/lang/tr.json
@@ -5,24 +5,23 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Bu dersin yetkinlik dereceleri öğrenme planlarını etkilemez.",
     "coursecompetencyratingsarepushedtouserplans": "Bu dersin yetkinlik dereceleri öğrenme planlarında anında güncellenir.",
     "crossreferencedcompetencies": "Çapraz referanslı yetkinlikler",
-    "duedate": "Son teslim tarihi",
-    "evidence": "Kanıt",
+    "duedate": "Bitiş tarihi",
+    "evidence": "Öğrenme kanıtı",
     "learningplancompetencies": "Öğrenme planı yetkinlikleri",
     "learningplans": "Öğrenme planları",
-    "mylearningplans": "Eğitim Planlarım",
     "myplans": "Benim öğrenme planlarım",
     "noactivities": "Etkinlikler yok",
     "nocompetencies": "Bu çerçevede hiçbir yetkinlik oluşturulmamıştır.",
     "nocrossreferencedcompetencies": "Bu yetkinliğe çapraz referanslı başka yetkinlik bulunmamaktadır.",
     "noevidence": "Öğrenme kanıtı yok",
     "noplanswerecreated": "Hiçbir öğrenme planı oluşturulmadı.",
-    "path": "Yol",
+    "path": "Yol:",
     "proficient": "Yeterli",
-    "progress": "Öğrenci ilerlemesi",
+    "progress": "İlerleme",
     "rating": "Derecelendirme",
     "reviewstatus": "İnceleme durumu",
-    "status": "Durum",
-    "template": "Şablon",
+    "status": "Konuk erişimine izin ver",
+    "template": "Öğrenme planı şablonu",
     "xcompetenciesproficientoutofy": "{{$a.y}} yetkinliğinden {{$a.x}} dışarıda yeterli",
     "xcompetenciesproficientoutofyincourse": "Bu derste {{$a.y}} yetkinliğin dışında {{$a.x}} yeterliliğe sahibisiniz."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/zh-cn.json b/www/addons/competency/lang/zh-cn.json
index e22e787d956..e6973f6a203 100644
--- a/www/addons/competency/lang/zh-cn.json
+++ b/www/addons/competency/lang/zh-cn.json
@@ -2,15 +2,15 @@
     "activities": "活动",
     "competenciesmostoftennotproficientincourse": "在这门课程中你有太多不精通的能力",
     "coursecompetencies": "课程能力",
-    "duedate": "截止时间",
+    "duedate": "截止日",
     "evidence": "凭据",
     "noactivities": "没有设置活动",
     "path": "路径",
     "proficient": "精通",
     "progress": "学生进度",
     "rating": "正在评分",
-    "status": "状态",
-    "template": "模板",
+    "status": "允许访客访问",
+    "template": "学习计划模板",
     "xcompetenciesproficientoutofy": "{{$a.y}}个能力中的{{$a.x}}是精通的",
     "xcompetenciesproficientoutofyincourse": "你精通这门课程{{$a.y}}个能力中的{{$a.x}}个。"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/zh-tw.json b/www/addons/competency/lang/zh-tw.json
index bbafffe7c4e..9d27ee941d6 100644
--- a/www/addons/competency/lang/zh-tw.json
+++ b/www/addons/competency/lang/zh-tw.json
@@ -5,25 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "在這一課程的核心能力評等不會影響學習計畫",
     "coursecompetencyratingsarepushedtouserplans": "在這一課程的核心能力評等在學習計畫上會立即更新",
     "crossreferencedcompetencies": "交互參照的核心能力",
-    "duedate": "規定繳交時間",
+    "duedate": "截止日期",
     "errornocompetenciesfound": "找不到能使用的功能",
     "evidence": "證據",
     "learningplancompetencies": "學習計畫核心能力",
     "learningplans": "學習計畫",
-    "mylearningplans": "我的學習計畫",
     "myplans": "我的學習計畫",
     "noactivities": "沒有活動",
-    "nocompetencies": "沒有功能",
+    "nocompetencies": "在這一架構中沒有核心能力被建立",
     "nocrossreferencedcompetencies": "沒有其他核心能力被交互參照這一核心能力",
     "noevidence": "沒有證據",
     "noplanswerecreated": "沒有學習計畫被建立",
-    "path": "路徑",
+    "path": "路徑：",
     "proficient": "精熟",
-    "progress": "學生進度",
-    "rating": "評比",
+    "progress": "進度",
+    "rating": "評等",
     "reviewstatus": "審查狀況",
-    "status": "狀態",
-    "template": "範本",
+    "status": "允許訪客瀏覽",
+    "template": "學習計畫樣版",
     "xcompetenciesproficientoutofy": "在{{$a.y}}個核心能力中有{{$a.x}}個已經精熟",
     "xcompetenciesproficientoutofyincourse": "在此課程中有{{$a.y}}個核心能力，你已經精熟{{$a.x}}個。"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ar.json b/www/addons/coursecompletion/lang/ar.json
index f88bc955bca..99d421ba9d2 100644
--- a/www/addons/coursecompletion/lang/ar.json
+++ b/www/addons/coursecompletion/lang/ar.json
@@ -1,21 +1,21 @@
 {
-    "complete": "مكتمل",
+    "complete": "تم/كامل",
     "completecourse": "مقرر مكتمل",
-    "completed": "تم إكمال المقرر",
+    "completed": "تم",
     "completiondate": "تاريخ إكمال المقرر",
     "couldnotloadreport": "لا يمكن تحميل تقرير إكمال المقرر، الرجاء المحاولة في وقت آخر",
-    "coursecompletion": "إكمال المقرر",
-    "criteria": "المعايير",
-    "criteriagroup": "معايير المجموعة",
+    "coursecompletion": "إكمال المقرر الدراسي",
+    "criteria": "معايير",
+    "criteriagroup": "مجموعة المعايير",
     "criteriarequiredall": "كل المعايير في الأسفل مطلوبة",
-    "criteriarequiredany": "أي معايير في الأسفل مطلوبة",
+    "criteriarequiredany": "أي معيار في الأسفل مطلوب",
     "inprogress": "قيد التنفيذ",
-    "manualselfcompletion": "إكمال ذاتي يدوي",
+    "manualselfcompletion": "إكمال يدوي ذاتي",
     "notyetstarted": "لم يبدأ بعد",
-    "pending": "قيد الانتظار",
+    "pending": "معلق",
     "required": "مطلوب",
     "requiredcriteria": "المعايير المطلوبة",
     "requirement": "المتطلبات",
-    "status": "الحالة",
+    "status": "السماح بدخول ضيف",
     "viewcoursereport": "عرض تقرير المقرر"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/bg.json b/www/addons/coursecompletion/lang/bg.json
index e60bae81321..ba9a2e7620d 100644
--- a/www/addons/coursecompletion/lang/bg.json
+++ b/www/addons/coursecompletion/lang/bg.json
@@ -1,14 +1,14 @@
 {
-    "complete": "Завършен",
-    "completed": "Завършено",
-    "coursecompletion": "Завършване на курса",
+    "complete": "Отговорен",
+    "completed": "Приключен",
+    "coursecompletion": "Напредване в курса",
     "criteria": "Критерии",
     "criteriagroup": "Група критерии",
     "criteriarequiredall": "Всички критерии по-долу са задължителни",
     "criteriarequiredany": "Някои критерии по-долу са задължителни",
     "inprogress": "Не е приключен",
     "manualselfcompletion": "Ръчно самоотбелязване на завършването",
-    "required": "Задължително",
-    "status": "Състояние",
+    "required": "Задължителен",
+    "status": "Позволяване достъп като гост",
     "viewcoursereport": "Вижте отчет за курса"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ca.json b/www/addons/coursecompletion/lang/ca.json
index c8c2a11d5e0..9a551225fed 100644
--- a/www/addons/coursecompletion/lang/ca.json
+++ b/www/addons/coursecompletion/lang/ca.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Complet",
+    "complete": "Completa",
     "completecourse": "Curs complet",
     "completed": "Completat",
     "completiondate": "Data de compleció",
     "couldnotloadreport": "No es pot carregar l'informe de compleció del curs, torneu a intentar-ho més tard.",
-    "coursecompletion": "Compleció del curs",
+    "coursecompletion": "Els usuaris han de completar aquest curs.",
     "criteria": "Criteris",
     "criteriagroup": "Grup de criteris",
-    "criteriarequiredall": "Calen tots els criteris del dessota",
-    "criteriarequiredany": "Cal qualsevol dels criteris del dessota",
+    "criteriarequiredall": "Cal que es compleixin tots els criteris que es mostren a continuació",
+    "criteriarequiredany": "Cal que es compleixi algun dels criteris que es mostren a continuació",
     "inprogress": "En curs",
     "manualselfcompletion": "Auto-compleció manual",
     "notyetstarted": "No s'ha començat encara",
-    "pending": "Pendents",
-    "required": "Necessari",
+    "pending": "Pendent",
+    "required": "Requerit",
     "requiredcriteria": "Criteri requerit",
     "requirement": "Requisit",
-    "status": "Estat",
+    "status": "Permetre l'accés de visitants",
     "viewcoursereport": "Visualitza l'informe del curs"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/cs.json b/www/addons/coursecompletion/lang/cs.json
index f54632d92c0..ba2add0dc81 100644
--- a/www/addons/coursecompletion/lang/cs.json
+++ b/www/addons/coursecompletion/lang/cs.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Absolvováno",
+    "complete": "Hotovo",
     "completecourse": "Absolvovaný kurz",
-    "completed": "Splněno",
+    "completed": "Dokončeno",
     "completiondate": "Datum ukončení",
     "couldnotloadreport": "Nelze načíst zprávu o absolvování kurzu, zkuste to prosím později.",
-    "coursecompletion": "Absolvování kurzu",
-    "criteria": "Kritéria",
+    "coursecompletion": "Studenti musí absolvovat tento kurz",
+    "criteria": "Podmínky",
     "criteriagroup": "Skupina podmínek",
-    "criteriarequiredall": "Jsou požadovány všechny podmínky",
-    "criteriarequiredany": "Je požadována libovolná podmínka",
-    "inprogress": "Probíhá",
-    "manualselfcompletion": "Ručně nastavené absolvování kurzu samotným studentem",
+    "criteriarequiredall": "Všechny podmínky musí být splněny",
+    "criteriarequiredany": "Jakákoli z podmínek musí být splněna",
+    "inprogress": "Probíhající",
+    "manualselfcompletion": "Označení absolvování kurzu samotným studentem",
     "notyetstarted": "Zatím nezačalo",
-    "pending": "Čeká",
-    "required": "Požadováno",
-    "requiredcriteria": "Požadovaná kriteria",
+    "pending": "Probíhající",
+    "required": "Povinné",
+    "requiredcriteria": "Vyžadované podmínky",
     "requirement": "Požadavek",
-    "status": "Status",
-    "viewcoursereport": "Zobrazit sestavu kurzu"
+    "status": "Povolit přístup pro hosty",
+    "viewcoursereport": "Zobrazit přehled kurzu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/da.json b/www/addons/coursecompletion/lang/da.json
index 9d2cdeb93a0..87f94706c77 100644
--- a/www/addons/coursecompletion/lang/da.json
+++ b/www/addons/coursecompletion/lang/da.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Fuldfør",
+    "complete": "Gennemført",
     "completecourse": "Fuldfør kursus",
-    "completed": "Fuldført",
+    "completed": "Færdigt",
     "completiondate": "Afslutningsdato",
     "couldnotloadreport": "Kunne ikke indlæse rapporten vedrørende  kursusfuldførelse, prøv igen senere.",
-    "coursecompletion": "Kursusfuldførelse",
-    "criteria": "Kriterier",
-    "criteriagroup": "Gruppe af kriterier",
-    "criteriarequiredall": "Alle nedenstående kriterier er påkrævet",
-    "criteriarequiredany": "Hvilken som helst af nedenstående kriterier er påkrævet",
-    "inprogress": "I gang",
-    "manualselfcompletion": "Manuel markering af færdiggørelse",
-    "notyetstarted": "Endnu ikke startet",
+    "coursecompletion": "Brugere skal gennemføre dette kursus.",
+    "criteria": "Kriterie",
+    "criteriagroup": "Kriteriegruppe",
+    "criteriarequiredall": "Alle kriterier herunder er påkrævet",
+    "criteriarequiredany": "Ethvert kriterium herunder er påkrævet",
+    "inprogress": "Under udførelse",
+    "manualselfcompletion": "Manuel selvregistrering af gennemførelse",
+    "notyetstarted": "Ikke begyndt endnu",
     "pending": "Afventer",
     "required": "Krævet",
-    "requiredcriteria": "Krævet kriterie",
+    "requiredcriteria": "Påkrævede kriterier",
     "requirement": "Krav",
-    "status": "Status",
+    "status": "Tillad gæsteadgang",
     "viewcoursereport": "Se kursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/de.json b/www/addons/coursecompletion/lang/de.json
index 7125646d332..926a8f3eed6 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Abschließen",
+    "complete": "Vollständig",
     "completecourse": "Kurs abschließen",
     "completed": "Abgeschlossen",
     "completiondate": "Abschlussdatum",
     "couldnotloadreport": "Fehler beim Laden des Kursabschlussberichts. Versuchen Sie es später noch einmal.",
-    "coursecompletion": "Kursabschluss",
+    "coursecompletion": "Teilnehmer/innen müssen diesen Kurs abschließen.",
     "criteria": "Kriterien",
     "criteriagroup": "Kriteriengruppe",
-    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig.",
-    "criteriarequiredany": "Ein nachfolgendes Kriterium ist notwendig.",
-    "inprogress": "In Arbeit",
-    "manualselfcompletion": "Manueller Selbstabschluss",
-    "notyetstarted": "Nicht begonnen",
-    "pending": "Nicht erledigt",
+    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig",
+    "criteriarequiredany": "Eine der nachfolgenden Kriterien ist notwendig",
+    "inprogress": "Laufend",
+    "manualselfcompletion": "Manueller eigener Abschluss",
+    "notyetstarted": "Noch nicht begonnen",
+    "pending": "Wartend",
     "required": "Notwendig",
-    "requiredcriteria": "Notwendige Kriterien",
+    "requiredcriteria": "Notwendiges Kriterium",
     "requirement": "Anforderung",
-    "status": "Status",
-    "viewcoursereport": "Kursbericht anzeigen"
+    "status": "Gastzugang erlauben",
+    "viewcoursereport": "Kursbericht ansehen"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index 555b60517bd..b05cb6dcd92 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -16,6 +16,6 @@
     "required": "Απαιτείται",
     "requiredcriteria": "Απαιτούμενα κριτήρια",
     "requirement": "Απαίτηση",
-    "status": "Κατάσταση",
-    "viewcoursereport": "Δείτε την αναφορά μαθήματος"
+    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
+    "viewcoursereport": "Προβολή αναφορά μαθήματος"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es-mx.json b/www/addons/coursecompletion/lang/es-mx.json
index 0252ef2ea82..72d16395f3d 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Completada",
     "completecourse": "Curso completo",
-    "completed": "Completado",
+    "completed": "Finalizado",
     "completiondate": "Fecha de terminación",
     "couldnotloadreport": "No pudo cargarse el reporte de finalización del curso; por favor inténtelo más tarde.",
-    "coursecompletion": "Finalización del curso",
-    "criteria": "Criterio",
-    "criteriagroup": "Grupo de criterio",
-    "criteriarequiredall": "Todos los criterios debajo son necesarios",
-    "criteriarequiredany": "Cualquiera de los criterios debajo es necesarios",
-    "inprogress": "en progreso",
-    "manualselfcompletion": "Auto finalización manual",
-    "notyetstarted": "Todavía no iniciado",
+    "coursecompletion": "Los usuarios deben completar este curso.",
+    "criteria": "Criterios",
+    "criteriagroup": "Grupo de criterios",
+    "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
+    "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
+    "inprogress": "En progreso",
+    "manualselfcompletion": "Auto-finalizar manualmente",
+    "notyetstarted": "Aún no ha comenzado",
     "pending": "Pendiente",
     "required": "Requerido",
-    "requiredcriteria": "Criterio requerido",
+    "requiredcriteria": "Criterios necesarios",
     "requirement": "Requisito",
-    "status": "Estatus",
+    "status": "Se permite el acceso de invitados",
     "viewcoursereport": "Ver reporte del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es.json b/www/addons/coursecompletion/lang/es.json
index 89ef5e6ecd0..09c4a3032af 100644
--- a/www/addons/coursecompletion/lang/es.json
+++ b/www/addons/coursecompletion/lang/es.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completado",
+    "complete": "Finalizado",
     "completecourse": "Curso completado",
     "completed": "Finalizado",
     "completiondate": "Fecha de finalización",
     "couldnotloadreport": "No se puede cargar el informe de finalización del curso, por favor inténtalo de nuevo más tarde.",
-    "coursecompletion": "Finalización del curso",
+    "coursecompletion": "Los usuarios deben finalizar este curso.",
     "criteria": "Criterios",
     "criteriagroup": "Grupo de criterios",
     "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
     "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
-    "inprogress": "En curso",
+    "inprogress": "En progreso",
     "manualselfcompletion": "Autocompletar manualmente",
     "notyetstarted": "Aún no comenzado",
     "pending": "Pendiente",
     "required": "Obligatorio",
     "requiredcriteria": "Criterios necesarios",
     "requirement": "Requisito",
-    "status": "Estado",
+    "status": "Se permite el acceso de invitados",
     "viewcoursereport": "Ver informe del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/eu.json b/www/addons/coursecompletion/lang/eu.json
index 4735d6035c9..f9e4e0ed228 100644
--- a/www/addons/coursecompletion/lang/eu.json
+++ b/www/addons/coursecompletion/lang/eu.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Osoa",
+    "complete": "Osatu",
     "completecourse": "Ikastaroa osatu",
-    "completed": "Osatuta",
+    "completed": "Osatua",
     "completiondate": "Osaketa-data",
     "couldnotloadreport": "Ezin izan da ikastaro-osaketaren txostena kargatu, mesedez saiatu beranduago.",
-    "coursecompletion": "Ikastaro-osaketa",
+    "coursecompletion": "Erabiltzaileek ikastaro hau osatu behar dute",
     "criteria": "Irizpidea",
     "criteriagroup": "Irizpide-multzoa",
     "criteriarequiredall": "Beheko irizpide guztiak dira beharrezko",
     "criteriarequiredany": "Beheko hainbat irizpide dira beharrezko",
-    "inprogress": "Ari da",
+    "inprogress": "Martxan",
     "manualselfcompletion": "Norberak eskuz osatu",
     "notyetstarted": "Ez da hasi",
-    "pending": "Egin gabe",
-    "required": "Beharrezkoa",
+    "pending": "Zain",
+    "required": "Beharrekoa",
     "requiredcriteria": "Irizpidea behar da",
     "requirement": "Eskakizuna",
-    "status": "Egoera",
+    "status": "Bisitarien sarbidea baimendu",
     "viewcoursereport": "Ikastaroaren txostena ikusi"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fa.json b/www/addons/coursecompletion/lang/fa.json
index 5800f75ef35..e785f269e31 100644
--- a/www/addons/coursecompletion/lang/fa.json
+++ b/www/addons/coursecompletion/lang/fa.json
@@ -1,7 +1,7 @@
 {
     "complete": "کامل",
-    "completed": "کامل شد",
-    "coursecompletion": "اتمام درس",
+    "completed": "کامل شده",
+    "coursecompletion": "کاربر باید این درس را تکمیل کند.",
     "criteria": "ضابطه",
     "criteriagroup": "گروه ضوابط",
     "criteriarequiredall": "تمام ضوابط زیر باید برآورده شوند",
@@ -10,8 +10,8 @@
     "manualselfcompletion": "علامت زدن به عنوان کامل توسط خود افراد",
     "notyetstarted": "هنوز شروع نشده است",
     "pending": "معلق",
-    "required": "لازم است",
+    "required": "اجباری",
     "requiredcriteria": "ضوابط مورد نیاز",
-    "status": "وضعیت",
-    "viewcoursereport": "مشاهدهٔ گزارش درس"
+    "status": "اجازهٔ ورود به عنوان مهمان",
+    "viewcoursereport": "مشاهده گزارش درس"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fr.json b/www/addons/coursecompletion/lang/fr.json
index 9b7c1642571..5f763cc0ad5 100644
--- a/www/addons/coursecompletion/lang/fr.json
+++ b/www/addons/coursecompletion/lang/fr.json
@@ -4,7 +4,7 @@
     "completed": "Terminé",
     "completiondate": "Date d'achèvement",
     "couldnotloadreport": "Impossible de charger le rapport d'achèvement de cours. Veuillez essayer plus tard.",
-    "coursecompletion": "Achèvement du cours",
+    "coursecompletion": "Les participants doivent achever ce cours.",
     "criteria": "Critères",
     "criteriagroup": "Groupe de critères",
     "criteriarequiredall": "Tous les critères ci-dessous sont requis",
@@ -16,6 +16,6 @@
     "required": "Requis",
     "requiredcriteria": "Critères requis",
     "requirement": "Condition",
-    "status": "Statut",
-    "viewcoursereport": "Afficher le rapport du cours"
+    "status": "Permettre l'accès anonyme",
+    "viewcoursereport": "Consulter le rapport du cours"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/he.json b/www/addons/coursecompletion/lang/he.json
index dca12273f76..bea3b53f5bb 100644
--- a/www/addons/coursecompletion/lang/he.json
+++ b/www/addons/coursecompletion/lang/he.json
@@ -1,20 +1,20 @@
 {
-    "complete": "השלמה",
+    "complete": "הושלם",
     "completecourse": "השלמת קורס",
     "completed": "הושלם",
     "completiondate": "תאריך השלמה",
-    "coursecompletion": "השלמת קורס",
-    "criteria": "מדד־הערכה",
-    "criteriagroup": "קבוצת מדדיי־הערכה",
-    "criteriarequiredall": "כל מדדיי־הערכה להלן נדרשים",
-    "criteriarequiredany": "אחד ממדדיי־הערכה להלן נדרש",
-    "inprogress": "בתהליך",
-    "manualselfcompletion": "הזנת השלמה עצמית",
-    "notyetstarted": "עדיין לא החל",
-    "pending": "בהמתנה",
+    "coursecompletion": "לומדים חייבים להשלים קורס זה.",
+    "criteria": "תנאי",
+    "criteriagroup": "קבוצת תנאים",
+    "criteriarequiredall": "כל התנאים המצויינים מטה נדרשים",
+    "criteriarequiredany": "לפחות אחד מהתנאים המצויינים מטה נדרשים",
+    "inprogress": "בלמידה",
+    "manualselfcompletion": "השלמה עצמאית ידנית",
+    "notyetstarted": "עדיין לא התחיל",
+    "pending": "ממתין",
     "required": "נדרש",
-    "requiredcriteria": "מדד־הערכה נדרש",
+    "requiredcriteria": "תנאי נדרש",
     "requirement": "דרישה",
-    "status": "מצב",
+    "status": "הקורס זמין לאורחים",
     "viewcoursereport": "צפיה בדוח הקורס"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/hu.json b/www/addons/coursecompletion/lang/hu.json
index d07a78bbda4..1522098017e 100644
--- a/www/addons/coursecompletion/lang/hu.json
+++ b/www/addons/coursecompletion/lang/hu.json
@@ -1,17 +1,17 @@
 {
-    "complete": "Teljes",
-    "completed": "Teljesítve",
-    "coursecompletion": "Kurzus teljesítése",
+    "complete": "Kész",
+    "completed": "Kész",
+    "coursecompletion": "A tanulóknak teljesíteni kell ezt a kurzust",
     "criteria": "Követelmények",
     "criteriagroup": "Követelménycsoport",
     "criteriarequiredall": "Az összes alábbi követelmény teljesítendő",
     "criteriarequiredany": "Bármely alábbi követelmény teljesítendő",
-    "inprogress": "Folyamatban",
+    "inprogress": "Folyamatban lévő",
     "manualselfcompletion": "Saját teljesítés kézzel",
     "notyetstarted": "Még nem kezdődött el",
     "pending": "Függőben",
     "required": "Kitöltendő",
     "requiredcriteria": "Előírt követelmények",
-    "status": "Állapot",
+    "status": "Vendégkénti belépés engedélyezése",
     "viewcoursereport": "Kurzusjelentés megtekintése"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/it.json b/www/addons/coursecompletion/lang/it.json
index 6521061e031..cac35851b3a 100644
--- a/www/addons/coursecompletion/lang/it.json
+++ b/www/addons/coursecompletion/lang/it.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completato",
+    "complete": "Completo",
     "completecourse": "Corso completato",
     "completed": "Completato",
     "completiondate": "Data di completamento",
     "couldnotloadreport": "Non è stato possibile caricare il report di completamento del corso, per favore riporva.",
-    "coursecompletion": "Completamento del corso",
+    "coursecompletion": "Gli utenti devono completare il corso",
     "criteria": "Criteri",
     "criteriagroup": "Gruppo di criteri",
     "criteriarequiredall": "E' richiesto il soddisfacimento di tutti i criteri elencati",
     "criteriarequiredany": "E' richiesto il soddisfacimento di almeno uno dei criteri elencati",
-    "inprogress": "In svolgimento",
+    "inprogress": "in svolgimento",
     "manualselfcompletion": "Conferma personale di completamento",
-    "notyetstarted": "Non iniziato",
+    "notyetstarted": "Non ancora iniziato",
     "pending": "In attesa",
-    "required": "Da soddisfare",
+    "required": "Obbligatorio",
     "requiredcriteria": "Criteri da soddisfare",
     "requirement": "Requisito",
-    "status": "Stato",
-    "viewcoursereport": "Visualizza report del corso"
+    "status": "Consenti l'accesso agli ospiti",
+    "viewcoursereport": "Visualizza il report del corso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ja.json b/www/addons/coursecompletion/lang/ja.json
index b33ab4fa0fe..0ed8cf0bc71 100644
--- a/www/addons/coursecompletion/lang/ja.json
+++ b/www/addons/coursecompletion/lang/ja.json
@@ -1,7 +1,7 @@
 {
-    "complete": "詳細",
+    "complete": "完了",
     "completed": "完了",
-    "coursecompletion": "コース完了",
+    "coursecompletion": "ユーザはこのコースを完了する必要があります。",
     "criteria": "クライテリア",
     "criteriagroup": "クライテリアグループ",
     "criteriarequiredall": "下記のクライテリアすべてが必須である",
@@ -12,6 +12,6 @@
     "pending": "保留",
     "required": "必須",
     "requiredcriteria": "必須クライテリア",
-    "status": "状態",
+    "status": "ゲストアクセスを許可する",
     "viewcoursereport": "コースレポートを表示する"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/lt.json b/www/addons/coursecompletion/lang/lt.json
index c6813474cf2..bb13b86372b 100644
--- a/www/addons/coursecompletion/lang/lt.json
+++ b/www/addons/coursecompletion/lang/lt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Visas",
+    "complete": "Baigta",
     "completecourse": "Visa kursų medžiaga",
     "completed": "Užbaigta",
     "completiondate": "Užbaigimo data",
     "couldnotloadreport": "Nepavyko įkelti kursų baigimo ataskaitos, prašome pabandyti vėliau.",
-    "coursecompletion": "Kursų užbaigimas",
+    "coursecompletion": "Naudotojas turi baigti šį kursą.",
     "criteria": "Kriterijai",
     "criteriagroup": "Kriterijų grupė",
-    "criteriarequiredall": "Visi žemiau esantys kriterijai yra privalomi",
-    "criteriarequiredany": "Kiekvienas kriterijus, esantis žemiau, yra privalomas",
-    "inprogress": "Nebaigta",
-    "manualselfcompletion": "Savarankiško mokymosi vadovas",
-    "notyetstarted": "Nepradėta",
+    "criteriarequiredall": "Visi žemiau pateikti kriterijai yra būtini",
+    "criteriarequiredany": "Bet kuris žemiau pateiktas kriterijus yra būtinas",
+    "inprogress": "Atliekama",
+    "manualselfcompletion": "Savas užbaigimas neautomatiniu būdu",
+    "notyetstarted": "Dar nepradėta",
     "pending": "Laukiama",
-    "required": "Privaloma",
-    "requiredcriteria": "Privalomi kriterijai",
+    "required": "Privalomas",
+    "requiredcriteria": "Būtini kriterijai",
     "requirement": "Būtina sąlyga",
-    "status": "Būsena",
+    "status": "Leisti svečio prieigą",
     "viewcoursereport": "Peržiūrėti kursų ataskaitą"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/nl.json b/www/addons/coursecompletion/lang/nl.json
index 78f31da0ac9..a6a621c5fa0 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Voltooi",
+    "complete": "Volledig",
     "completecourse": "Voltooi cursus",
-    "completed": "Voltooid",
+    "completed": "Volledig",
     "completiondate": "Voltooiingsdatum",
     "couldnotloadreport": "Kon het voltooiingsrapport van de cursus niet laden. Probeer later opnieuw.",
-    "coursecompletion": "Cursus voltooiing",
+    "coursecompletion": "Leerlingen moeten deze cursus voltooien.",
     "criteria": "Criteria",
     "criteriagroup": "Criteria groep",
     "criteriarequiredall": "Alle onderstaande criteria zijn vereist",
-    "criteriarequiredany": "Alle onderstaande criteria zijn vereist",
-    "inprogress": "Bezig",
-    "manualselfcompletion": "Handmatige zelf-voltooiing",
-    "notyetstarted": "Nog niet gestart",
-    "pending": "Nog bezig",
+    "criteriarequiredany": "Al onderstaande criteria zijn vereist",
+    "inprogress": "Actief",
+    "manualselfcompletion": "Manueel voltooien",
+    "notyetstarted": "Nog niet begonnen",
+    "pending": "In behandeling",
     "required": "Vereist",
     "requiredcriteria": "Vereiste criteria",
     "requirement": "Vereiste",
-    "status": "Status",
+    "status": "Gasttoegang toestaan",
     "viewcoursereport": "Bekijk cursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pl.json b/www/addons/coursecompletion/lang/pl.json
index db69489a520..a9d8c51e844 100644
--- a/www/addons/coursecompletion/lang/pl.json
+++ b/www/addons/coursecompletion/lang/pl.json
@@ -1,7 +1,7 @@
 {
-    "complete": "Pełna wersja",
-    "completed": "Ukończony",
-    "coursecompletion": "Ukończenie kursu",
+    "complete": "Zakończone",
+    "completed": "Zakończone",
+    "coursecompletion": "Użytkownicy muszą ukończyć ten kurs.",
     "criteria": "Kryteria",
     "criteriagroup": "Grupa kryteriów",
     "criteriarequiredall": "Wszystkie poniższe kryteria są wymagane",
@@ -9,9 +9,9 @@
     "inprogress": "W toku",
     "manualselfcompletion": "Samodzielne oznaczenie ukończenia",
     "notyetstarted": "Jeszcze nie rozpoczęto",
-    "pending": "Oczekujący",
+    "pending": "Oczekujące",
     "required": "Wymagane",
     "requiredcriteria": "Wymagane kryteria",
-    "status": "Status",
+    "status": "Zezwól na dostęp gości",
     "viewcoursereport": "Zobacz raport kursu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt-br.json b/www/addons/coursecompletion/lang/pt-br.json
index da82565edc9..ca01e849231 100644
--- a/www/addons/coursecompletion/lang/pt-br.json
+++ b/www/addons/coursecompletion/lang/pt-br.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Concluído",
+    "complete": "Completo",
     "completecourse": "Curso concluído",
-    "completed": "Completado",
+    "completed": "Concluído",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão do curso, por favor tente novamente mais tarde.",
-    "coursecompletion": "Conclusão do curso",
+    "coursecompletion": "Participantes precisam completar este curso.",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
     "criteriarequiredall": "Todos os critérios abaixo são necessários",
-    "criteriarequiredany": "Quaisquer critérios abaixo são necessários",
-    "inprogress": "Em progresso",
-    "manualselfcompletion": "Auto conclusão manual",
-    "notyetstarted": "Ainda não começou",
+    "criteriarequiredany": "Qualquer um dos critérios abaixo são necessários",
+    "inprogress": "Em andamento",
+    "manualselfcompletion": "Conclusão manual por si mesmo",
+    "notyetstarted": "Não iniciado ainda",
     "pending": "Pendente",
-    "required": "Necessário",
-    "requiredcriteria": "Critério necessário",
+    "required": "Obrigatório",
+    "requiredcriteria": "Critérios exigidos",
     "requirement": "Exigência",
-    "status": "Condição",
-    "viewcoursereport": "Ver relatório de curso"
+    "status": "Permitir o acesso de visitantes",
+    "viewcoursereport": "Ver relatório do curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt.json b/www/addons/coursecompletion/lang/pt.json
index 5f2bd4dc942..9f7d87e4c5f 100644
--- a/www/addons/coursecompletion/lang/pt.json
+++ b/www/addons/coursecompletion/lang/pt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Concluído",
+    "complete": "Respondida",
     "completecourse": "Disciplina concluída",
-    "completed": "Concluído",
+    "completed": "Completo",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão da disciplina, por favor tente mais tarde.",
-    "coursecompletion": "Conclusão da disciplina",
+    "coursecompletion": "Os utilizadores têm de completar esta disciplina",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
-    "criteriarequiredall": "É exigido o cumprimento de todos os critérios abaixo",
-    "criteriarequiredany": "É exigido o cumprimento de qualquer um dos critérios abaixo",
+    "criteriarequiredall": "Todos os critérios abaixo são exigidos",
+    "criteriarequiredany": "Qualquer dos critérios abaixo é necessário",
     "inprogress": "Em progresso",
     "manualselfcompletion": "Conclusão manual pelo próprio",
-    "notyetstarted": "Não iniciou",
+    "notyetstarted": "Ainda não iniciou",
     "pending": "Pendente",
-    "required": "Exigido",
-    "requiredcriteria": "Critério exigido",
+    "required": "Obrigatório",
+    "requiredcriteria": "Critério obrigatório",
     "requirement": "Requisito",
-    "status": "Estado",
+    "status": "Permitir o acesso de visitantes",
     "viewcoursereport": "Ver relatório da disciplina"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ro.json b/www/addons/coursecompletion/lang/ro.json
index 46b9f21bb93..abe5ed918c8 100644
--- a/www/addons/coursecompletion/lang/ro.json
+++ b/www/addons/coursecompletion/lang/ro.json
@@ -1,21 +1,21 @@
 {
     "complete": "Complet",
     "completecourse": "Curs complet",
-    "completed": "Complet",
+    "completed": "Finalizat",
     "completiondate": "Data limita până la completarea acțiunii",
     "couldnotloadreport": "Raportul cu privire la situația completării cursului nu se poate încărca, încercați mai târziu.",
-    "coursecompletion": "Completarea cursului",
+    "coursecompletion": "Utilizatorul trebuie să completeze acest curs.",
     "criteria": "Criterii",
-    "criteriagroup": "Criterii pentru grup",
-    "criteriarequiredall": "Indeplinirea următoarelor criterii este obligatorie",
-    "criteriarequiredany": "Oricare din urmatoarele criterii sunt obligatorii",
-    "inprogress": "În progres",
-    "manualselfcompletion": "Autocompletare",
-    "notyetstarted": "Înca nu a început",
-    "pending": "În asteptare",
-    "required": "Obligatoriu",
-    "requiredcriteria": "Criterii obligatorii",
+    "criteriagroup": "Grup criterii",
+    "criteriarequiredall": "Toate criteriile de mai jos sunt necesare",
+    "criteriarequiredany": "Oricare dintre criteriile de mai jos sunt necesare",
+    "inprogress": "În curs",
+    "manualselfcompletion": "Auto-finalizare manuală",
+    "notyetstarted": "Nu a fost încă început",
+    "pending": "În așteptare",
+    "required": "Necesar",
+    "requiredcriteria": "Criteriu necesar",
     "requirement": "Cerințe",
-    "status": "Situație",
-    "viewcoursereport": "Vizualizați raportul despre curs"
+    "status": "Permite accesul vizitatorilor",
+    "viewcoursereport": "Vezi raportul cursului"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ru.json b/www/addons/coursecompletion/lang/ru.json
index dbd50c8ad09..ad7b8ac320c 100644
--- a/www/addons/coursecompletion/lang/ru.json
+++ b/www/addons/coursecompletion/lang/ru.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Завершить",
+    "complete": "Выполнен",
     "completecourse": "Завершить курс",
-    "completed": "Завершен",
+    "completed": "Завершено",
     "completiondate": "Дата завершения",
-    "coursecompletion": "Завершение курса",
+    "coursecompletion": "Пользователи должны завершить этот курс.",
     "criteria": "Критерии",
-    "criteriagroup": "Критерии группы",
-    "criteriarequiredall": "Все приведенные ниже критерии являются обязательными",
-    "criteriarequiredany": "Некоторые из нижеуказанных критериев обязательны",
-    "inprogress": "В прогрессе",
-    "manualselfcompletion": "Ручное самостоятельное завершение",
-    "notyetstarted": "Еще не начался",
-    "pending": "На рассмотрении",
-    "required": "Необходимый",
+    "criteriagroup": "Группа критериев",
+    "criteriarequiredall": "Требуются соответствие всем указанным ниже критериям",
+    "criteriarequiredany": "Требуется соответствие любому из указанных ниже критериев",
+    "inprogress": "В процессе",
+    "manualselfcompletion": "Пользователь может сам поставить отметку о выполнении",
+    "notyetstarted": "Еще не началось",
+    "pending": "Ожидаемые",
+    "required": "Обязательно",
     "requiredcriteria": "Необходимые критерии",
     "requirement": "Требование",
-    "status": "Статус",
-    "viewcoursereport": "Посмотреть отчет курса"
+    "status": "Разрешить гостевой доступ",
+    "viewcoursereport": "Просмотреть отчет по курсу"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index 1a9665c3d8e..a6e9b4208a6 100644
--- a/www/addons/coursecompletion/lang/sv.json
+++ b/www/addons/coursecompletion/lang/sv.json
@@ -1,21 +1,21 @@
 {
     "complete": "Komplett",
     "completecourse": "",
-    "completed": "Fullföljt",
+    "completed": "Slutfört",
     "completiondate": "Datum för fullföljande",
     "couldnotloadreport": "Det gick inte att läsa in rapporten för fullföljande av kursen, vänligen försök igen senare .",
-    "coursecompletion": "Fullföljande av kurs",
-    "criteria": "Villkor",
-    "criteriagroup": "Villkor grupp",
-    "criteriarequiredall": "Alla villkor nedan måste vara uppfyllda",
-    "criteriarequiredany": "Något villkor nedan måste vara uppfylld",
-    "inprogress": "Pågående",
-    "manualselfcompletion": "Manuell fullföljande av deltagare",
-    "notyetstarted": "Ännu inte börjat",
+    "coursecompletion": "Studerande måste slutföra den här kursen.",
+    "criteria": "Kriterier",
+    "criteriagroup": "Kriterier för grupp",
+    "criteriarequiredall": "Alla kriterier är obligatoriska",
+    "criteriarequiredany": "Alla kriterier nedan är obligatoriska",
+    "inprogress": "Pågår",
+    "manualselfcompletion": "Studenten markerar själv som fullföljd",
+    "notyetstarted": "Har ännu inte påbörjats",
     "pending": "Avvaktar",
     "required": "Obligatorisk",
-    "requiredcriteria": "Obligatorisk villkor",
+    "requiredcriteria": "Obligatoriskt kriterium",
     "requirement": "Krav",
-    "status": "Status",
+    "status": "Tillåt gäster",
     "viewcoursereport": "Visa kursrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/tr.json b/www/addons/coursecompletion/lang/tr.json
index 4353efddef4..548a8574418 100644
--- a/www/addons/coursecompletion/lang/tr.json
+++ b/www/addons/coursecompletion/lang/tr.json
@@ -1,17 +1,17 @@
 {
-    "complete": "Tamamlanmış",
+    "complete": "Tamamlandı",
     "completed": "Tamamlandı",
-    "coursecompletion": "Kurs tamamlama",
+    "coursecompletion": "Kullanıcılar bu dersi tamamlamalıdır",
     "criteria": "Ölçüt",
     "criteriagroup": "Ölçüt Grubu",
     "criteriarequiredall": "Aşağıdaki ölçütlerin tümü gereklidir",
     "criteriarequiredany": "Aşağıdaki herhangi bir kriter gereklidir",
-    "inprogress": "Devam ediyor",
+    "inprogress": "Devam etmekte",
     "manualselfcompletion": "Kendi kendine elle tamamlama",
     "notyetstarted": "Henüz başlamadı",
     "pending": "Bekliyor",
     "required": "Gerekli",
     "requiredcriteria": "Gerekli Ölçüt",
-    "status": "Durum",
+    "status": "Konuk erişimine izin ver",
     "viewcoursereport": "Kurs raporunu görüntüle"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/zh-cn.json b/www/addons/coursecompletion/lang/zh-cn.json
index b17bf0c2487..46a98830ede 100644
--- a/www/addons/coursecompletion/lang/zh-cn.json
+++ b/www/addons/coursecompletion/lang/zh-cn.json
@@ -1,17 +1,17 @@
 {
-    "complete": "完全",
+    "complete": "完成",
     "completed": "已完成",
-    "coursecompletion": "修完课程",
+    "coursecompletion": "用户必须完成此课程。",
     "criteria": "条件",
     "criteriagroup": "条件组",
     "criteriarequiredall": "必须满足以下条件",
     "criteriarequiredany": "必须满足下列任一条件",
-    "inprogress": "处理中",
+    "inprogress": "进行中",
     "manualselfcompletion": "手动自设完成",
     "notyetstarted": "还未开始",
-    "pending": "等待中",
-    "required": "必需的",
+    "pending": "待决",
+    "required": "必须回答",
     "requiredcriteria": "必备条件",
-    "status": "状态",
+    "status": "允许访客访问",
     "viewcoursereport": "查看课程报告"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/zh-tw.json b/www/addons/coursecompletion/lang/zh-tw.json
index 55f600fc398..c0deca8eec7 100644
--- a/www/addons/coursecompletion/lang/zh-tw.json
+++ b/www/addons/coursecompletion/lang/zh-tw.json
@@ -4,18 +4,18 @@
     "completed": "已完成",
     "completiondate": "完成日期",
     "couldnotloadreport": "無法載入課程完成報表,請稍後再試.",
-    "coursecompletion": "課程完成度",
-    "criteria": "條件",
-    "criteriagroup": "條件群組",
-    "criteriarequiredall": "以下所有的條件都為必填",
-    "criteriarequiredany": "以下任何條件都為必須",
-    "inprogress": "處理中",
+    "coursecompletion": "用戶必須完成這一課程",
+    "criteria": "規準",
+    "criteriagroup": "各種判斷條件",
+    "criteriarequiredall": "必須滿足以下所有條件",
+    "criteriarequiredany": "必須滿足以下任一條件",
+    "inprogress": "進行中",
     "manualselfcompletion": "手動自我完成",
-    "notyetstarted": "還沒有開始",
-    "pending": "暫緩",
-    "required": "必須的",
-    "requiredcriteria": "必須條件",
+    "notyetstarted": "尚未開始",
+    "pending": "待決",
+    "required": "必要的",
+    "requiredcriteria": "必要條件",
     "requirement": "需要",
-    "status": "狀態",
-    "viewcoursereport": "檢視課程報表"
+    "status": "允許訪客瀏覽",
+    "viewcoursereport": "查看課程報告"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ar.json b/www/addons/files/lang/ar.json
index 1a2b6a545b5..2ab44cda49c 100644
--- a/www/addons/files/lang/ar.json
+++ b/www/addons/files/lang/ar.json
@@ -1,28 +1,8 @@
 {
-    "audio": "صوت",
-    "camera": "آلة التصوير",
     "couldnotloadfiles": "لا يمكن تحميل قائمة الملفات",
-    "downloading": "يتم التنزيل",
     "emptyfilelist": "لا يوجد ملفات للعرض",
-    "errorcapturingaudio": "خطأ في إلتقاط الصوت",
-    "errorcapturingimage": "خطأ في إلتقاط الصورة",
-    "errorcapturingvideo": "خطأ في إلتقاط الفيديو",
-    "errorgettingimagealbum": "خطأ في الحصول على الصورة من ألبوم الصور",
-    "errormustbeonlinetoupload": "لابد ان تكون متصل بالأنترنت لكي ترفع الملفات",
-    "errornoapp": "لا يوجود لديك تطبيق مثبت لتنفيذ هذا الإجراء",
-    "errorreadingfile": "خطأ في قراءة الملف",
-    "errorreceivefilenosites": "لا يوجد مواقع مخزنة. من فضلك أضف موقع قبل محاولة رفع ملف",
-    "errorwhileuploading": "حدث خطأ أثناء رفع الملف",
-    "files": "ملفاتي الخاصة",
-    "fileuploaded": "تم رفع الملف بنجاح",
-    "myfiles": "ملفاتي",
-    "myprivatefiles": "ملفاتي الخاصة",
-    "photoalbums": "ألبوم صور",
+    "files": "ملفات",
     "privatefiles": "ملفات خاصة",
-    "readingfile": "يتم قراءة الملف",
     "sitefiles": "ملفات الموقع",
-    "success": "تم بنجاح",
-    "uploadfiles": "رفع ملفات",
-    "uploading": "يتم الرفع",
-    "video": "فيديو"
+    "uploadfiles": "إرسل ملفات التغذية الراجعة"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/bg.json b/www/addons/files/lang/bg.json
index 8ab069ff1ca..01ac698ccdf 100644
--- a/www/addons/files/lang/bg.json
+++ b/www/addons/files/lang/bg.json
@@ -3,14 +3,10 @@
     "clicktoupload": "Натиснете бутона по-долу за да качите файловете в секция \"Вашите частни файлове\".",
     "couldnotloadfiles": "Списъкът с файлове не можа да бъде зареден.",
     "emptyfilelist": "Няма файлове, които да бъдат показани.",
-    "errorreceivefilenosites": "Няма записани сайтове. Моля добавете сайтове, преди да се опитвате да качите файл.",
-    "files": "Моите лични файлове",
-    "myfiles": "Моите файлове",
-    "myprivatefiles": "Моите лични файлове",
+    "files": "Файлове",
     "myprivatefilesdesc": "Файловете, които са налични във Вашата лична област на сайта.",
     "privatefiles": "Лични файлове",
     "sitefiles": "Файлове от сайта",
     "sitefilesdesc": "Други файлоне, които са достъпни за Вас на този Moodle сайт.",
-    "success": "Успех!",
-    "uploadfiles": "Качване на файлове"
+    "uploadfiles": "Изпрати файлове с обратна връзка"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ca.json b/www/addons/files/lang/ca.json
index 61aed4639aa..90887bf7b3f 100644
--- a/www/addons/files/lang/ca.json
+++ b/www/addons/files/lang/ca.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Teniu en compte que l'administrador de Moodle ha desactivat la descàrrega d'arxius; podeu visualitzar els arxius, però no descarregar-los.",
-    "audio": "Àudio",
-    "camera": "Càmera",
-    "chooseaccountuploadfile": "Escolliu un compte on pujar el fitxer",
     "clicktoupload": "Feu clic al botó del dessota per pujar arxius a l'àrea del vostres fitxers.",
-    "confirmuploadfile": "Esteu a punt de pujar {{size}}. Voleu continuar?",
     "couldnotloadfiles": "La llista d'arxius no s'ha pogut carregar.",
-    "downloading": "S'està descarregant",
-    "emptyfilelist": "No hi ha fitxers per mostrar.",
-    "errorcapturingaudio": "S'ha produït un error en capturar l'àudio.",
-    "errorcapturingimage": "S'ha produït un error en capturar la imatge.",
-    "errorcapturingvideo": "S'ha produït un error en capturar el vídeo.",
-    "errorgettingimagealbum": "S'ha produït un error en recuperar la imatge de l'àlbum.",
-    "errormustbeonlinetoupload": "Heu de tenir connexió a la xarxa per a pujar fitxers.",
-    "errornoapp": "No teniu cap aplicació instal·lada per a realitzar aquesta acció.",
-    "errorreadingfile": "S'ha produït un error en llegir el fitxer.",
-    "errorreceivefilenosites": "No hi ha llocs web emmagatzemats. Afegiu un lloc abans d'intentar pujar un arxiu.",
+    "emptyfilelist": "No hi ha fitxers per mostrar",
     "erroruploadnotworking": "No es poden pujar fitxers al vostre lloc ara mateix.",
-    "errorwhiledownloading": "S'ha produït un error durant la descàrrega del fitxer.",
-    "errorwhilerecordingaudio": "S'ha produït un error durant l'enregistrament de l'àudio.",
-    "errorwhileuploading": "S'ha produït un error durant la càrrega del fitxer.",
-    "files": "Els meus fitxers privats",
-    "fileuploaded": "S'ha penjat el fitxer amb èxit.",
-    "myfiles": "Els meus fitxers",
-    "myprivatefiles": "Els meus fitxers privats",
+    "files": "Fitxers",
     "myprivatefilesdesc": "Els arxius que teniu disponibles a la vostra àrea privada en aquest lloc Moodle.",
-    "photoalbums": "Àlbums de fotos",
     "privatefiles": "Fitxers privats",
-    "readingfile": "S'està llegint un fitxer",
     "sitefiles": "Fitxers del lloc",
     "sitefilesdesc": "Els altres arxius que es troben disponibles en aquest lloc Moodle.",
-    "success": "Èxit!",
-    "uploadfiles": "Puja fitxers",
-    "uploading": "S'està pujant",
-    "video": "Vídeo"
+    "uploadfiles": "Envia fitxers de retroacció"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/cs.json b/www/addons/files/lang/cs.json
index 2e5efab57fc..becf830a35d 100644
--- a/www/addons/files/lang/cs.json
+++ b/www/addons/files/lang/cs.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Upozorňujeme, že správce Moodle zakázal stahování souborů, soubory si můžete prohlížet, ale ne stáhnout.",
-    "audio": "Audio",
-    "camera": "Fotoaparát",
-    "chooseaccountuploadfile": "Vyberte účet, pod kterým chcete nahrát soubor.",
     "clicktoupload": "Kliknutím na tlačítko níže nahrát soubory do vašich osobních souborů.",
-    "confirmuploadfile": "Chystáte nahrát {{$a}}. Jste si jisti, že chcete pokračovat?",
     "couldnotloadfiles": "Seznam souborů, které nelze načíst .",
-    "downloading": "Stahování",
-    "emptyfilelist": "Žádný soubor k zobrazení.",
-    "errorcapturingaudio": "Chyba snímání zvuku.",
-    "errorcapturingimage": "Chyba snímání obrazu.",
-    "errorcapturingvideo": "Chyba snímání videa.",
-    "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
-    "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
-    "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
-    "errorreadingfile": "Chyba při čtení souboru.",
-    "errorreceivefilenosites": "Nejsou uloženy žádné stránky. Než se pokusíte nahrát soubor, přidejte prosím stránku.",
+    "emptyfilelist": "Žádný soubor k zobrazení",
     "erroruploadnotworking": "Bohužel v současné době není možné nahrávat na stránky vašeho Moodle.",
-    "errorwhiledownloading": "Při pokusu o stahování souboru došlo k chybě .",
-    "errorwhilerecordingaudio": "Při pokusu o nahrání zvuku došlo k chybě .",
-    "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
-    "files": "Osobní soubory",
-    "fileuploaded": "Soubor byl úspěšně nahrán.",
-    "myfiles": "Moje soubory",
-    "myprivatefiles": "Osobní soubory",
+    "files": "Soubory",
     "myprivatefilesdesc": "Soubory, které jsou dostupné v soukromé oblasti na těchto stránkách Moodle.",
-    "photoalbums": "Fotoalba",
     "privatefiles": "Osobní soubory",
-    "readingfile": "Čtení souboru",
     "sitefiles": "Soubory stránek",
     "sitefilesdesc": "Další soubory, které jsou dostupné na těchto stránkách Moodle.",
-    "success": "Úspěch!",
-    "uploadfiles": "Nahrát soubory",
-    "uploading": "Nahrávání",
-    "video": "Video"
+    "uploadfiles": "Poslat zpětnovazební soubory"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/da.json b/www/addons/files/lang/da.json
index 56ea8289414..5f9d7d54b3b 100644
--- a/www/addons/files/lang/da.json
+++ b/www/addons/files/lang/da.json
@@ -1,34 +1,13 @@
 {
     "admindisableddownload": "Bemærk venligst at din Moodleadministrator har deaktiveret download af filer. Du kan se filerne men ikke downloade dem.",
-    "audio": "Lyd",
-    "camera": "Kamera",
-    "chooseaccountuploadfile": "Vælg en konto filen skal uploades til",
     "clicktoupload": "Klik på knappen nedenfor for at uploade filer til dine private filer.",
-    "confirmuploadfile": "Du er ved at uploade {{size}}. Er du sikker på at du vil fortsætte",
     "couldnotloadfiles": "Fillisten kunne ikke hentes",
-    "downloading": "Downloader",
-    "emptyfilelist": "Der er ingen filer at vise.",
-    "errorgettingimagealbum": "Fejl ved hentning af billede fra album.",
-    "errormustbeonlinetoupload": "Du skal være online for at uploade",
-    "errornoapp": "Du har ikke en app installeret der kan udføre denne handling.",
-    "errorreadingfile": "Fejl ved læsning af filen",
-    "errorreceivefilenosites": "Der er ingen gemte websider. Tilføj en webside inden du prøver at uploade en fil.",
+    "emptyfilelist": "Der er ingen filer at vise",
     "erroruploadnotworking": "Desværre er det p.t. ikke muligt at uploade filer til dit site.",
-    "errorwhiledownloading": "Der opstod en fejl ved forsøg på download af filen.",
-    "errorwhilerecordingaudio": "Der opstod en fejl under forsøg på at optage lyd.",
-    "errorwhileuploading": "Der opstod en fejl under upload af fil.",
-    "files": "Mine private filer",
-    "fileuploaded": "Filen er uoloadet.",
-    "myfiles": "Mine filer",
-    "myprivatefiles": "Mine private filer",
+    "files": "Filer",
     "myprivatefilesdesc": "Filerne som er tilgængelige i dit private område på dette Moodlewebsted.",
-    "photoalbums": "Fotoalbum",
     "privatefiles": "Private filer",
-    "readingfile": "Læser fil",
-    "sitefiles": "Webside filer",
+    "sitefiles": "Site filer",
     "sitefilesdesc": "De andre filer som er tilgængelige for dig på denne Moodlewebside.",
-    "success": "Succes!",
-    "uploadfiles": "Upload filer",
-    "uploading": "Uploader",
-    "video": "Video"
+    "uploadfiles": "Send feedbackfiler"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/de.json b/www/addons/files/lang/de.json
index 59be6e84477..16517d7cc60 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Sie können nur die Dateiliste sehen.",
-    "audio": "Audio",
-    "camera": "Kamera",
-    "chooseaccountuploadfile": "Wählen Sie ein Nutzerkonto, um die Datei zu speichern.",
     "clicktoupload": "Tippen Sie auf die Taste, um Dateien in 'Meine Dateien' hochzuladen.",
-    "confirmuploadfile": "Möchten Sie wirklich {{size}} hochladen?",
     "couldnotloadfiles": "Die Dateiliste konnte nicht geladen werden.",
-    "downloading": "Herunterladen ...",
-    "emptyfilelist": "Keine Dateien",
-    "errorcapturingaudio": "Fehler bei der Audioaufnahme",
-    "errorcapturingimage": "Fehler beim Fotografieren",
-    "errorcapturingvideo": "Fehler bei der Videoaufnahme",
-    "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
-    "errormustbeonlinetoupload": "Sie müssen online sein, um Dateien hochzuladen.",
-    "errornoapp": "Sie haben keine App installiert, um diese Aktion durchzuführen.",
-    "errorreadingfile": "Fehler beim Lesen der Datei",
-    "errorreceivefilenosites": "Keine Website gespeichert. Fügen Sie zuerst eine Website hinzu, bevor Sie das Hochladen einer Datei versuchen.",
+    "emptyfilelist": "Es liegen keine Dateien vor",
     "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
-    "errorwhiledownloading": "Fehler beim Herunterladen der Datei",
-    "errorwhilerecordingaudio": "Fehler bei der Audioaufnahme",
-    "errorwhileuploading": "Fehler beim Hochladen der Datei",
-    "files": "Meine Dateien",
-    "fileuploaded": "Die Datei wurde erfolgreich hochgeladen.",
-    "myfiles": "Meine Dateien",
-    "myprivatefiles": "Meine Dateien",
+    "files": "Dateien",
     "myprivatefilesdesc": "Diese Dateien liegen in Ihrem persönlichen Bereich auf dieser Website.",
-    "photoalbums": "Fotoalbum",
     "privatefiles": "Meine Dateien",
-    "readingfile": "Datei lesen",
-    "sitefiles": "Dateien der Webseite",
+    "sitefiles": "Dateien",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
-    "success": "Fertig!",
-    "uploadfiles": "Dateien hochladen",
-    "uploading": "Hochladen",
-    "video": "Video"
+    "uploadfiles": "Feedbackdateien senden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/el.json b/www/addons/files/lang/el.json
index e535f6bf57c..105bb0c0877 100644
--- a/www/addons/files/lang/el.json
+++ b/www/addons/files/lang/el.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Παρακαλω λάβετε υπόψιν ότι ο διαχειριστής του Moodle site σας απενεργοποίησε τις λήψεις αρχείων, μπορείτε να περιηγηθείτε μέσα στα αρχεία, αλλά όχι να τα κατεβάσετε.",
-    "audio": "Audio",
-    "camera": "Κάμερα",
-    "chooseaccountuploadfile": "Επιλέξτε έναν λογαριασμό για να μεταφορτώσετε το αρχείο",
     "clicktoupload": "Κάντε κλικ στο παρακάτω κουμπί για να μεταφορτώσετε αρχεία στους προσωπικούς σας φακέλους.",
-    "confirmuploadfile": "Πρόκειται να ανεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "couldnotloadfiles": "Η λίστα των αρχείων δεν φορτώθηκε.",
-    "downloading": "Μεταφόρτωση",
     "emptyfilelist": "Δεν υπαρχουν αρχεία.",
-    "errorcapturingaudio": "Σφάλμα καταγραφής ήχου.",
-    "errorcapturingimage": "Σφάλμα λήψης εικόνας.",
-    "errorcapturingvideo": "Σφάλμα καταγραφής βίντεο.",
-    "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από τη συλλογή.",
-    "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
-    "errornoapp": "Δεν έχετε εγκατεστημένη κάποια εφαρμογή για να εκτελεστεί αυτή η ενέργεια.",
-    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
-    "errorreceivefilenosites": "Δεν υπάρχουν αποθηκευμένα sites. Παρακαλώ προσθέστε ένα site πριν προσπαθήσετε να φορτώσετε ένα αρχείο.",
     "erroruploadnotworking": "Δυστυχώς, προσωρινά δεν είναι δυνατό να ανεβάσετε τα αρχεία στο site σας.",
-    "errorwhiledownloading": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια να κατεβάσετε το αρχείο.",
-    "errorwhilerecordingaudio": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια καταγραφής ήχου.",
-    "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά τη μεταφόρτωση αρχείων.",
     "files": "Αρχεία",
-    "fileuploaded": "Αυτό το αρχείο ανέβηκε επιτυχώς.",
-    "myfiles": "Τα αρχεία μου",
-    "myprivatefiles": "Τα προσωπικά αρχεία μου",
     "myprivatefilesdesc": "Τα αρχεία που είναι διαθέσιμα στο προσωπικό χώρο σας σε αυτό το Moodle site.",
-    "photoalbums": "Συλλογή εικόνων",
     "privatefiles": "Προσωπικά αρχεία",
-    "readingfile": "Διάβασμα αρχείου",
-    "sitefiles": "Τα αρχεία του site",
+    "sitefiles": "Αρχεία του ιστοχώρου",
     "sitefilesdesc": "Άλλα αρχεία που είναι στη διάθεσή σας σε αυτό το site Moodle.",
-    "success": "Επιτυχία!",
-    "uploadfiles": "Μεταφορτώστε αρχεία",
-    "uploading": "Μεταφόρτωση",
-    "video": "Βίντεο"
+    "uploadfiles": "Αποστολή αρχείου ανατροφοδότησης"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es-mx.json b/www/addons/files/lang/es-mx.json
index 0da9a6aecc5..3a779e4d667 100644
--- a/www/addons/files/lang/es-mx.json
+++ b/www/addons/files/lang/es-mx.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ver los archivos pero no puede descargarlos.",
-    "audio": "Audio",
-    "camera": "Cámara",
-    "chooseaccountuploadfile": "Elija una cuanta a donde subirle el archivo.",
     "clicktoupload": "Haga click en el botón inferior para subir archivos a sus archivos privados.",
-    "confirmuploadfile": "Usted está a punto de subir {{size}}. ¿Está Usted seguro de querer continuar?",
     "couldnotloadfiles": "La lista de archivos no pudo cargarse.",
-    "downloading": "Descargando",
-    "emptyfilelist": "No hay archivos para mostrar.",
-    "errorcapturingaudio": "Error al capturar audio.",
-    "errorcapturingimage": "Error al capturar imagen.",
-    "errorcapturingvideo": "Error al capturar video.",
-    "errorgettingimagealbum": "Error al obtener imagen del álbum.",
-    "errormustbeonlinetoupload": "Usted necesita estar conectado en-línea para subir archivos.",
-    "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
-    "errorreadingfile": "Error al leer el archivo.",
-    "errorreceivefilenosites": "No hay archivos almacenados. Por favor, añada un sitio antes de intentar subir un archivo.",
+    "emptyfilelist": "No hay archivos que mostrar",
     "erroruploadnotworking": "Desafortunadamente ahorita no es posible subir archivos a su sitio.",
-    "errorwhiledownloading": "Ocurrió un error al intentar descargar el archivo.",
-    "errorwhilerecordingaudio": "Ocurrió un error al intentar grabar audio.",
-    "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
-    "files": "Mis archivos privados",
-    "fileuploaded": "El archivo fue subido exitosamente.",
-    "myfiles": "Mis archivos",
-    "myprivatefiles": "Mis archivos privados",
+    "files": "Archivos",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
-    "photoalbums": "Álbum de fotos",
     "privatefiles": "Archivos privados",
-    "readingfile": "Leyendo archivo",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "success": "¡Éxito!",
-    "uploadfiles": "Subir archivos",
-    "uploading": "Subiendo",
-    "video": "Video"
+    "uploadfiles": "Mandar archivos de retroalimentación"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es.json b/www/addons/files/lang/es.json
index 741ecf09583..7521ea196f2 100644
--- a/www/addons/files/lang/es.json
+++ b/www/addons/files/lang/es.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ojear los archivos pero no puede descargarlos.",
-    "audio": "Audio",
-    "camera": "Cámara",
-    "chooseaccountuploadfile": "Elija una cuanta donde subir el archivo.",
     "clicktoupload": "Clic en el botón inferior para subir archivos a su zona de archivos privados.",
-    "confirmuploadfile": "Está a punto de subir {{size}}. ¿Está seguro de que desea continuar?",
     "couldnotloadfiles": "La lista de archivos no ha podido cargarse.",
-    "downloading": "Descargando",
     "emptyfilelist": "No hay archivos que mostrar",
-    "errorcapturingaudio": "Error capturando audio.",
-    "errorcapturingimage": "Error capturando imagen.",
-    "errorcapturingvideo": "Error capturando vídeo.",
-    "errorgettingimagealbum": "Error obteniendo imagen del album.",
-    "errormustbeonlinetoupload": "Necesitas tener conexión para subir archivos.",
-    "errornoapp": "No dispone de una app instalada para realizar esta acción.",
-    "errorreadingfile": "Error leyendo archivo.",
-    "errorreceivefilenosites": "No hay archivos almacenados. Por favor, añada un sitio antes de intentar subir un archivo.",
     "erroruploadnotworking": "Desafortunadamente en estos momentos no es posible subir archivos al sitio.",
-    "errorwhiledownloading": "Ocurrió un error al intentar descargar el archivo.",
-    "errorwhilerecordingaudio": "Ocurrió un error al intentar grabar audio.",
-    "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
-    "files": "Mis archivos privados",
-    "fileuploaded": "El archivo fue subido correctamente.",
-    "myfiles": "Mis archivos",
-    "myprivatefiles": "Mis archivos privados",
+    "files": "Ficheros",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
-    "photoalbums": "Álbum de fotos",
     "privatefiles": "Ficheros privados",
-    "readingfile": "Leyendo archivo",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "success": "Éxito",
-    "uploadfiles": "Subir archivos",
-    "uploading": "Subiendo",
-    "video": "Vídeo"
+    "uploadfiles": "Mandar archivos de retroalimentación"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/eu.json b/www/addons/files/lang/eu.json
index 3c92814d15f..4648a027001 100644
--- a/www/addons/files/lang/eu.json
+++ b/www/addons/files/lang/eu.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Mesedez ohartu zaitez zure Moodle administratzaileak fitxategien jaitsiera ezgaitu duela, fitxategiak arakatu ditzakezu baina ezin dituzu jaitsi.",
-    "audio": "Audioa",
-    "camera": "Kamera",
-    "chooseaccountuploadfile": "Aukeratu kontu bat fitxategiak bertara igotzeko.",
     "clicktoupload": "Klik egin beheko botoian fitxategiak zure gune pribatura igotzeko.",
-    "confirmuploadfile": "{{size}} igotzera zoaz. Ziur al zaude aurrera egin nahi duzula?",
     "couldnotloadfiles": "Ezin izan da fitxategien zerrenda kargatu.",
-    "downloading": "Jaisten",
-    "emptyfilelist": "Ez dago fitxategirik erakusteko.",
-    "errorcapturingaudio": "Errorea audioa atzitzean.",
-    "errorcapturingimage": "Errorea irudia atzitzean.",
-    "errorcapturingvideo": "Errorea bideoa atzitzean.",
-    "errorgettingimagealbum": "Errorea irudia albumetik hartzean.",
-    "errormustbeonlinetoupload": "Online egon behar zara fitxategiak igo ahal izateko.",
-    "errornoapp": "Ez duzu ekintza hau burutzeko app-ik instalatuta.",
-    "errorreadingfile": "Errorea fitxategia irakurtzean.",
-    "errorreceivefilenosites": "Ez dago gordetako gunerik. Mesedez gehitu gune bat fitxategia igotzen saiatu baino lehen.",
+    "emptyfilelist": "Ez dago erakusteko fitxategirik",
     "erroruploadnotworking": "Zoritxarrez une honetan ezin dira fitxategiak zure gunera igo.",
-    "errorwhiledownloading": "Errorea gertatu da fitxategia jaisten saiatzean.",
-    "errorwhilerecordingaudio": "Errorea gertatu da audioa grabatzen saiatzean.",
-    "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
-    "files": "Nire fitxategi pribatuak",
-    "fileuploaded": "Fitxategia ondo igo da.",
-    "myfiles": "Nire fitxategiak",
-    "myprivatefiles": "Nire fitxategi pribatuak",
+    "files": "Fitxategiak",
     "myprivatefilesdesc": "Moodle gune honetako zure gune pribatuan eskuragarri dauden fitxategiak.",
-    "photoalbums": "Argazki albumak",
     "privatefiles": "Fitxategi pribatuak",
-    "readingfile": "Fitxategia irakurtzen",
     "sitefiles": "Guneko fitxategiak",
     "sitefilesdesc": "Zure Moodle gunean eskuragarri dauden beste fitxategiak.",
-    "success": "Ondo!",
-    "uploadfiles": "Igo fitxategiak",
-    "uploading": "Igotzen",
-    "video": "Bideoa"
+    "uploadfiles": "bidali feedback-fitxategiak"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fa.json b/www/addons/files/lang/fa.json
index afdb485efb6..62c44d00e0b 100644
--- a/www/addons/files/lang/fa.json
+++ b/www/addons/files/lang/fa.json
@@ -1,10 +1,7 @@
 {
     "admindisableddownload": "لطفا در نظر داشته باشید که مدیر سایت شما دریافت فایل‌ها را غیرفعال کرده است. شما می‌توانید فایل‌ها را مرور کنید، ولی نمی‌توانید آنها را روی دستگاه خود دریافت کنید.",
-    "camera": "دوربین",
-    "confirmuploadfile": "شما در آستانهٔ ارسال {{size}} هستید. آیا مطمئن هستید که می‌خواهید ادامه دهید؟",
-    "files": "فایلهای من",
-    "myfiles": "فایل‌های من",
+    "files": "فایل‌ها",
     "privatefiles": "فایل‌های شخصی",
-    "sitefiles": "فایلهای سایت",
+    "sitefiles": "فایل‌های سایت",
     "uploadfiles": "ارسال فایل‌های بازخورد"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fr.json b/www/addons/files/lang/fr.json
index 944b62fdd52..ce819c482cb 100644
--- a/www/addons/files/lang/fr.json
+++ b/www/addons/files/lang/fr.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "L'administrateur de votre Moodle a désactivé le téléchargement des fichiers. Vous pouvez les consulter, mais pas les télécharger.",
-    "audio": "Audio",
-    "camera": "Caméra",
-    "chooseaccountuploadfile": "Sélectionner un compte vers lequel déposer le fichier.",
     "clicktoupload": "Cliquer sur le bouton ci-dessous pour déposer les fichiers dans vos fichiers personnels.",
-    "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
     "couldnotloadfiles": "La liste des fichiers n'a pas pu être chargée.",
-    "downloading": "Téléchargement",
-    "emptyfilelist": "Aucun fichier à afficher.",
-    "errorcapturingaudio": "Erreur d'enregistrement audio.",
-    "errorcapturingimage": "Erreur lors de la capture de l'image.",
-    "errorcapturingvideo": "Erreur lors de la capture vidéo.",
-    "errorgettingimagealbum": "Erreur lors de la récupération de l'image dans l'album.",
-    "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
-    "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
-    "errorreadingfile": "Erreur lecture du fichier.",
-    "errorreceivefilenosites": "Aucun site enregistré. Veuillez ajouter un site avant de déposer un fichier.",
+    "emptyfilelist": "Il n'y a pas de fichier à afficher",
     "erroruploadnotworking": "Il n'est actuellement pas possible de déposer des fichiers sur votre site.",
-    "errorwhiledownloading": "Une erreur est survenue lors du téléchargement du fichier.",
-    "errorwhilerecordingaudio": "Une erreur est survenue lors de l'enregistrement du son.",
-    "errorwhileuploading": "Une erreur est survenue durant le dépôt du fichier.",
-    "files": "Mes fichiers personnels",
-    "fileuploaded": "Le fichier a été déposé.",
-    "myfiles": "Mes fichiers",
-    "myprivatefiles": "Mes fichiers personnels",
+    "files": "Fichiers",
     "myprivatefilesdesc": "Les fichiers disponibles dans votre zone privée sur cette plateforme Moodle.",
-    "photoalbums": "Albums de photos",
     "privatefiles": "Fichiers personnels",
-    "readingfile": "Lecture du fichier",
     "sitefiles": "Fichiers du site",
     "sitefilesdesc": "Les autres fichiers disponibles sur cette plateforme Moodle.",
-    "success": "Succès !",
-    "uploadfiles": "Déposer des fichiers",
-    "uploading": "Dépôt en cours",
-    "video": "Vidéo"
+    "uploadfiles": "Envoyer des fichiers de feedback"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/he.json b/www/addons/files/lang/he.json
index f650a693ed6..6f612548ac8 100644
--- a/www/addons/files/lang/he.json
+++ b/www/addons/files/lang/he.json
@@ -2,15 +2,11 @@
     "admindisableddownload": "יש לשים לב כי מנהל/ת אתר המוודל שלך, ביטל/ה את אפשרות להורדת הקבצים. באפשרותך לעיין בקבצים אך לא להורידם.",
     "clicktoupload": "להעלאת הקבצים לקבצים הפרטיים שלך, יש להקליק על הכפתור למטה.",
     "couldnotloadfiles": "לא ניתן לטעון את רשימת הקבצים.",
-    "emptyfilelist": "אין קבצים להצגה.",
-    "errorreceivefilenosites": "לא קיימים אתרים שמורים. יש להוסף אתר לפני הניסיון להעלות קובץ.",
-    "files": "הקבצים הפרטיים שלי",
-    "myfiles": "הקבצים שלי",
-    "myprivatefiles": "הקבצים הפרטיים שלי",
+    "emptyfilelist": "אין קבצים להציג",
+    "files": "קבצים",
     "myprivatefilesdesc": "הקבצים הזמינים לך באזור הפרטי באתר מוודל זה.",
     "privatefiles": "הקבצים שלי",
     "sitefiles": "קבצי האתר",
     "sitefilesdesc": "הקבצים האחרים הזמינים לך באתר מוודל זה.",
-    "success": "הצלחה!",
-    "uploadfiles": "העלה קבצים"
+    "uploadfiles": "שליחת קובצי משוב"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/hu.json b/www/addons/files/lang/hu.json
index 7945e5fbacb..a9b2a7edf03 100644
--- a/www/addons/files/lang/hu.json
+++ b/www/addons/files/lang/hu.json
@@ -1,7 +1,7 @@
 {
     "emptyfilelist": "Nincs megjeleníthető állomány",
-    "files": "Saját állományaim",
+    "files": "Állományok",
     "privatefiles": "Saját állományaim",
-    "sitefiles": "A portálon levő fájlok",
-    "uploadfiles": "Feltölthet állományokat"
+    "sitefiles": "Portál állományai",
+    "uploadfiles": "Visszajelzések elküldése"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/it.json b/www/addons/files/lang/it.json
index 49674385421..d9b1f96d205 100644
--- a/www/addons/files/lang/it.json
+++ b/www/addons/files/lang/it.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "L'amministratore del sito Moodle ha disabilitato il download dei file. Puoi navigare tra i file ma non potrai scaricarli.",
-    "audio": "Audio",
-    "camera": "Camera",
-    "chooseaccountuploadfile": "Scegli l'account dove caricare il file.",
     "clicktoupload": "Fai click sul pulsante sotto per caricare i file nei File personali",
-    "confirmuploadfile": "Stai per caricare {{size}}. Sei sicuro di continuare?",
     "couldnotloadfiles": "Non è stato possibile caricare l'elenco dei file.",
-    "downloading": "Scaricamento in corso",
-    "emptyfilelist": "Non ci sono file da visualizzare.",
-    "errorcapturingaudio": "Si è verificato un errore durante la registrazione dell'audio.",
-    "errorcapturingimage": "Si è verificato un errore durante l'acquisizione dell'immagine.",
-    "errorcapturingvideo": "Si è verificato un errore durante l'acquisizione del video.",
-    "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
-    "errormustbeonlinetoupload": "Per caricar file devi essere online.",
-    "errornoapp": "Non hai un'app per svolgere questa azione.",
-    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
-    "errorreceivefilenosites": "Non ci sono siti memorizzati. Devi aggiungere un sito prima di poter caricare file.",
+    "emptyfilelist": "Non ci sono file da visualizzare",
     "erroruploadnotworking": "Al momento non è possibile caricare file sul sito.",
-    "errorwhiledownloading": "Si è verificato un errore durante lo scaricamento del file.",
-    "errorwhilerecordingaudio": "Si è verificato un errore durante la registrazione dell'audio.",
-    "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
-    "files": "File personali",
-    "fileuploaded": "Il file è stato caricato correttamente.",
-    "myfiles": "I miei file",
-    "myprivatefiles": "File personali",
+    "files": "File",
     "myprivatefilesdesc": "I file memorizzati nell'omonima area di Moodle",
-    "photoalbums": "Album fotografico",
     "privatefiles": "File personali",
-    "readingfile": "Lettura del file in corso",
     "sitefiles": "File del sito",
     "sitefilesdesc": "Altri file del sito Moodle ai quali puoi accedere.",
-    "success": "Effettuato correttamente!",
-    "uploadfiles": "Carica file",
-    "uploading": "Caricamento in corso",
-    "video": "Video"
+    "uploadfiles": "Invia file di commento"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ja.json b/www/addons/files/lang/ja.json
index c744c4a763c..0f3df892d31 100644
--- a/www/addons/files/lang/ja.json
+++ b/www/addons/files/lang/ja.json
@@ -1,9 +1,7 @@
 {
     "emptyfilelist": "表示するファイルはありません。",
-    "errorreceivefilenosites": "登録されているサイトがありません。ファイルをアップロードする前にサイトを追加してください。",
-    "files": "マイファイル",
-    "myfiles": "マイファイル",
+    "files": "ファイル",
     "privatefiles": "プライベートファイル",
     "sitefiles": "サイトファイル",
-    "uploadfiles": "ファイルをアップロードできる"
+    "uploadfiles": "フィードバックファイルを送信する"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/lt.json b/www/addons/files/lang/lt.json
index 524a98ebaf5..1e5b2c5b2f2 100644
--- a/www/addons/files/lang/lt.json
+++ b/www/addons/files/lang/lt.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Primename, kad Moodle administratorius panaikino galimybę parsisiųsti failus, failų atsisiųsti negalima, galite tik naršyti.",
-    "audio": "Garsas",
-    "camera": "Vaizdas",
-    "chooseaccountuploadfile": "Pasirinkite paskyrą „įkelti failą į“.",
     "clicktoupload": "Paspauskite mygtuką, esantį žemiau, kad galėtumėte atsisiųsti failus į privatų aplanką.",
-    "confirmuploadfile": "Jūs ketinate įkelti {{size}}. Ar norite tęsti?",
     "couldnotloadfiles": "Negalima užkrauti failų sąrašo.",
-    "downloading": "Siunčiama",
-    "emptyfilelist": "Nėra ką rodyti.",
-    "errorcapturingaudio": "Klaida fiksuojant garsą.",
-    "errorcapturingimage": "Klaida fiksuojant paveiksliuką.",
-    "errorcapturingvideo": "Klaida fiksuojant vaizdo įrašą.",
-    "errorgettingimagealbum": "Klaida perkeliant paveiksliuką iš albumo.",
-    "errormustbeonlinetoupload": "Norėdamas įkelti failus, turite prisijungti .",
-    "errornoapp": "Norint atlikti šiuos veiksmus, reikia atsisiųsti programėlę.",
-    "errorreadingfile": "Klaida skaitant failą.",
-    "errorreceivefilenosites": "Svetainė nenurodyta. Prašome ją nurodyti prieš keliant failus.",
+    "emptyfilelist": "Nėra rodytinų failų",
     "erroruploadnotworking": "Deja, failo į pasirinktą svetainę įkelti negalima.",
-    "errorwhiledownloading": "Klaida atsisiunčiant failą.",
-    "errorwhilerecordingaudio": "Įrašymo klaida.",
-    "errorwhileuploading": "Atsisiuntimo klaida.",
     "files": "Failai",
-    "fileuploaded": "Failas sėkmingai atsiųstas.",
-    "myfiles": "Mano failai",
-    "myprivatefiles": "Asmeniniai failai",
     "myprivatefilesdesc": "Jūsų privatūs failai Moodle svetainėje.",
-    "photoalbums": "Nuotraukų albumas",
     "privatefiles": "Asmeniniai failai",
-    "readingfile": "Skaitomas failas",
     "sitefiles": "Svetainės failai",
     "sitefilesdesc": "Kiti failai Moodle svetainėje",
-    "success": "Sėkmė!",
-    "uploadfiles": "Įkelti failus",
-    "uploading": "Įkeliama",
-    "video": "Vaizdo įrašas"
+    "uploadfiles": "Siųsti grįžtamojo ryšio failus"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/nl.json b/www/addons/files/lang/nl.json
index a0eca312bb8..e4f5e1dc248 100644
--- a/www/addons/files/lang/nl.json
+++ b/www/addons/files/lang/nl.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Je Moodle beheerder heeft het downloaden van bestanden uitgeschakeld. Je kunt door de bestandenlijst bladeren, maar ze niet downloaden.",
-    "audio": "Audio",
-    "camera": "Camera",
-    "chooseaccountuploadfile": "Kies een account om dit bestand naar toe te sturen.",
     "clicktoupload": "Klik op onderstaande knop om bestanden naar je privé-bestanden te uploaden.",
-    "confirmuploadfile": "Je gaat {{size}} uploaden. Wil je verder gaan?",
     "couldnotloadfiles": "De bestandenlijst kon niet geladen worden.",
-    "downloading": "Aan het downloaden",
-    "emptyfilelist": "Er zijn geen bestanden te tonen.",
-    "errorcapturingaudio": "Fout bij de audio-opname.",
-    "errorcapturingimage": "Fout bij de foto-opname.",
-    "errorcapturingvideo": "Fout bij de video-opname.",
-    "errorgettingimagealbum": "Fout bij het ophalen van een afbeelding uit het album.",
-    "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
-    "errornoapp": "Je hebt geen app geïnstalleerd om deze actie mee uit te voeren.",
-    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
-    "errorreceivefilenosites": "Er zijn geen sites bewaard. Voeg een site toe voor je een bestand probeert te uploaden.",
+    "emptyfilelist": "Er zijn geen bestanden om te tonen",
     "erroruploadnotworking": "Jammer genoeg kun je op dit ogenblik geen bestanden uploaden naar de site.",
-    "errorwhiledownloading": "Er is een fout opgetreden bij het downloaden van het bestand.",
-    "errorwhilerecordingaudio": "Er is een fout opgetreden tijdens het opnemen van audio.",
-    "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
-    "files": "Mijn privé-bestanden",
-    "fileuploaded": "Het uploaden van het bestand is gelukt.",
-    "myfiles": "Mijn bestanden",
-    "myprivatefiles": "Mijn privé-bestanden",
+    "files": "Bestanden",
     "myprivatefilesdesc": "Jouw bestanden op deze Moodle-site.",
-    "photoalbums": "Foto-albums",
     "privatefiles": "Privébestanden",
-    "readingfile": "Bestand lezen",
     "sitefiles": "Sitebestanden",
     "sitefilesdesc": "Andere bestanden op deze Moodle-site.",
-    "success": "Succes!",
-    "uploadfiles": "Bestanden uploaden",
-    "uploading": "Aan het uploaden",
-    "video": "Video"
+    "uploadfiles": "Stuur feedbackbestanden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pl.json b/www/addons/files/lang/pl.json
index 10184b669d2..43f2b4b7ea6 100644
--- a/www/addons/files/lang/pl.json
+++ b/www/addons/files/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "emptyfilelist": "Brak plików do wyświetlenia",
-    "files": "Moje pliku",
+    "files": "Pliki",
     "privatefiles": "Prywatne pliki",
-    "sitefiles": "Pliki strony",
-    "uploadfiles": "Może przesłać pliki"
+    "sitefiles": "Pliki serwisu",
+    "uploadfiles": "Wyślij pliki informacji zwrotnej"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt-br.json b/www/addons/files/lang/pt-br.json
index 2560de0dc8d..2c3c45d9555 100644
--- a/www/addons/files/lang/pt-br.json
+++ b/www/addons/files/lang/pt-br.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Por favor note que o administrador do Moodle desativou downloads de arquivos, você pode navegar através dos arquivos, mas não baixá-los.",
-    "audio": "Áudio",
-    "camera": "Câmera",
-    "chooseaccountuploadfile": "Escolha uma conta para a qual enviar o arquivo.",
     "clicktoupload": "Clique no botão abaixo para enviar para seus arquivos privados.",
-    "confirmuploadfile": "Você está prestes a enviar um arquivo de {{size}}. Você tem certeza que quer continuar?",
     "couldnotloadfiles": "A lista de arquivos não pode ser carregada.",
-    "downloading": "Baixando",
-    "emptyfilelist": "Não há arquivos para mostrar.",
-    "errorcapturingaudio": "Erro ao capturar áudio.",
-    "errorcapturingimage": "Erro ao capturar imagem.",
-    "errorcapturingvideo": "Erro ao capturar vídeo.",
-    "errorgettingimagealbum": "Erro ao receber a imagem do álbum.",
-    "errormustbeonlinetoupload": "Você tem que estar online para enviar arquivos.",
-    "errornoapp": "Você não tem um aplicativo instalado que possa fazer essa ação.",
-    "errorreadingfile": "Erro ao ler o arquivo.",
-    "errorreceivefilenosites": "Não existem sites armazenados. Por favor adicione um site antes de enviar um arquivo.",
+    "emptyfilelist": "Não há arquivos para exibir",
     "erroruploadnotworking": "Infelizmente é impossível enviar arquivos para o seu site.",
-    "errorwhiledownloading": "Ocorreu um erro ao tentar baixar o arquivo.",
-    "errorwhilerecordingaudio": "Ocorreu um erro ao tentar gravar o áudio.",
-    "errorwhileuploading": "Ocorreu um erro durante o envio do arquivo.",
-    "files": "Meus arquivos privados",
-    "fileuploaded": "O arquivo foi enviado com sucesso.",
-    "myfiles": "Meus arquivos",
-    "myprivatefiles": "Meus arquivos privados",
+    "files": "Arquivos",
     "myprivatefilesdesc": "Os arquivos que estão disponíveis em sua área de arquivos privados nesse site Moodle.",
-    "photoalbums": "Álbum de fotos",
     "privatefiles": "Arquivos privados",
-    "readingfile": "Lendo o arquivo",
     "sitefiles": "Arquivos do site",
     "sitefilesdesc": "Os outros arquivos que estão disponíveis a você neste site Moodle.",
-    "success": "Sucesso!",
-    "uploadfiles": "Enviar arquivos",
-    "uploading": "Enviando",
-    "video": "Vídeo"
+    "uploadfiles": "Enviar arquivos de feedback"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt.json b/www/addons/files/lang/pt.json
index b256bcb4afa..aad6d0a66be 100644
--- a/www/addons/files/lang/pt.json
+++ b/www/addons/files/lang/pt.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "Tenha en atenção que o administrador do Moodle desativou a opção de descarregar ficheiros. Poderá navegar nos ficheiros mas não conseguirá descarregá-los.",
-    "audio": "Audio",
-    "camera": "Câmara",
-    "chooseaccountuploadfile": "Escolha uma conta para onde carregar o ficheiro.",
     "clicktoupload": "Clique no botão abaixo para carregar ficheiros para os seus ficheiros privados.",
-    "confirmuploadfile": "Está prestes a carregar {{size}}. Tem a certeza que pretende continuar?",
     "couldnotloadfiles": "Não foi possível carregar a lista de ficheiros",
-    "downloading": "A descarregar",
-    "emptyfilelist": "Não há ficheiros",
-    "errorcapturingaudio": "Erro na captura do áudio.",
-    "errorcapturingimage": "Erro na captura da imagem.",
-    "errorcapturingvideo": "Erro ao capturar vídeo.",
-    "errorgettingimagealbum": "Erro ao obter a imagem do álbum.",
-    "errormustbeonlinetoupload": "Precisa estar online para carregar ficheiross.",
-    "errornoapp": "Não tem aplicação instalada para executar esta ação.",
-    "errorreadingfile": "Erro ao ler ficheiro.",
-    "errorreceivefilenosites": "Não existem sites armazenados. Por favor adicione um site antes de carregar um ficheiro.",
+    "emptyfilelist": "Este repositório está vazio",
     "erroruploadnotworking": "Infelizmente não é possível carregar ficheiros para o seu site.",
-    "errorwhiledownloading": "Ocorreu um erro ao tentar descarregar o ficheiro.",
-    "errorwhilerecordingaudio": "Ocorreu um erro ao tentar gravar áudio.",
-    "errorwhileuploading": "Ocorreu um erro durante ao carregar o ficheiro.",
-    "files": "Meus ficheiros privados",
-    "fileuploaded": "O ficheiro foi carregado com sucesso.",
-    "myfiles": "Meus ficheiros",
-    "myprivatefiles": "Meus ficheiros privados",
+    "files": "Anexos",
     "myprivatefilesdesc": "Ficheiros disponíveis na sua área privada neste site Moodle",
-    "photoalbums": "Álbum de fotografias",
     "privatefiles": "Ficheiros privados",
-    "readingfile": "A ler ficheiro",
     "sitefiles": "Ficheiros do site",
     "sitefilesdesc": "Os outros ficheiros que estão disponíveis para si neste site Moodle.",
-    "success": "Sucesso!",
-    "uploadfiles": "Carregar ficheiros",
-    "uploading": "A carregar",
-    "video": "Vídeo"
+    "uploadfiles": "Enviar ficheiros de feedback"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ro.json b/www/addons/files/lang/ro.json
index 9b9f147bc0b..d8113b20c3d 100644
--- a/www/addons/files/lang/ro.json
+++ b/www/addons/files/lang/ro.json
@@ -2,15 +2,11 @@
     "admindisableddownload": "Atenție! Administratorul platformei a dezactivat descărcarea de fișiere; puteți accesa fișierele dar nu le puteți descărca.",
     "clicktoupload": "Apăsați butonul de mai jos pentru a încarcă fișierele în contul dumneavoastră.",
     "couldnotloadfiles": "Lista fișierelor nu a putut fi încărcată.",
-    "emptyfilelist": "Nu sunt fișiere disponibile.",
-    "errorreceivefilenosites": "Nu aveți stocat niciun sit. Adăugați un sit înainte de a încărca un fișier.",
-    "files": "Fisiere personale",
-    "myfiles": "Fișierele mele",
-    "myprivatefiles": "Fisiere personale",
+    "emptyfilelist": "Nu există fișiere",
+    "files": "Fișiere",
     "myprivatefilesdesc": "Fișierele disponibile din zona personală, pe care o dețineți pe acest site.",
     "privatefiles": "Fișiere private",
-    "sitefiles": "Fișierele disponibile pe site",
+    "sitefiles": "Fişiere site",
     "sitefilesdesc": "Alte fișiere disponibile pe acest site.",
-    "success": "Succes!",
-    "uploadfiles": "Încărcați mai multe fișiere"
+    "uploadfiles": "Trimite fișiere de feedback"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ru.json b/www/addons/files/lang/ru.json
index a334bae34e4..10418095e77 100644
--- a/www/addons/files/lang/ru.json
+++ b/www/addons/files/lang/ru.json
@@ -1,36 +1,12 @@
 {
     "admindisableddownload": "Обратите внимание, что администратор Moodle отключил скачивание файлов. Вы можете просмотреть файлы, но не скачать их.",
-    "audio": "Аудио",
-    "camera": "Камера",
-    "chooseaccountuploadfile": "Выбрать учетную запись для загрузки файла",
     "clicktoupload": "Нажмите внизу кнопку для загрузки файлов в свои личные файлы.",
-    "confirmuploadfile": "Вы собираетесь загрузить {{size}}. Вы уверены, что хотите продолжить?",
     "couldnotloadfiles": "Файлы из списка не могут быть загружены",
-    "downloading": "Загрузка",
     "emptyfilelist": "Нет файлов для отображения",
-    "errorcapturingaudio": "Ошибка захвата звука",
-    "errorcapturingimage": "Ошибка захвата изображения",
-    "errorcapturingvideo": "Ошибка захвата видео",
-    "errorgettingimagealbum": "Ошибка получения изображения из альбома",
-    "errormustbeonlinetoupload": "Вы должны на сайте, чтобы загружать файлы.",
-    "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
-    "errorreadingfile": "Ошибка при чтении файла",
-    "errorreceivefilenosites": "Нет сайта для хранения. Пожалуйста, добавьте сайт, прежде чем пытаться загрузить файл",
-    "errorwhiledownloading": "Произошла ошибка при попытке загрузки файла",
-    "errorwhilerecordingaudio": "Произошла ошибка при попытке записи аудио",
-    "errorwhileuploading": "Произошла ошибка во время загрузки файла",
-    "files": "Мои личные файлы",
-    "fileuploaded": "Файл загружен",
-    "myfiles": "Мои файлы",
-    "myprivatefiles": "Мои личные файлы",
+    "files": "Файлы",
     "myprivatefilesdesc": "Файлы, которые доступны Вам в личном кабинете на этом сайте Moodle.",
-    "photoalbums": "Фотоальбомы",
     "privatefiles": "Личные файлы",
-    "readingfile": "Чтение файла",
     "sitefiles": "Файлы сайта",
     "sitefilesdesc": "Другие файлы, доступные на этом сайте Moodle",
-    "success": "Успешно!",
-    "uploadfiles": "Загрузка файлов",
-    "uploading": "Загрузка",
-    "video": "Видео"
+    "uploadfiles": "Отправить файлы с отзывами"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/sv.json b/www/addons/files/lang/sv.json
index 437c3e99d8f..f50a7bb0372 100644
--- a/www/addons/files/lang/sv.json
+++ b/www/addons/files/lang/sv.json
@@ -3,14 +3,10 @@
     "clicktoupload": "Klicka på knappen nedan för att ladda upp filer till dina privata filer.",
     "couldnotloadfiles": "Listan över filer kunde inte läsas in.",
     "emptyfilelist": "Det finns inga filer att visa.",
-    "errorreceivefilenosites": "Det finns inga webbsidor sparade. Lägg till en sida innan du försöker ladda upp en fil.",
-    "files": "Mina privata filer",
-    "myfiles": "Mina filer",
-    "myprivatefiles": "Mina privata filer",
+    "files": "Filer",
     "myprivatefilesdesc": "De filer som finns i din privata område på denna Moodle webbplats.",
     "privatefiles": "Privata filer",
-    "sitefiles": "webbplats filer",
+    "sitefiles": "Webbplatsens filer",
     "sitefilesdesc": "De andra filer som är tillgängliga för dig på denna Moodle webbplats.",
-    "success": "Framgång!",
-    "uploadfiles": "Ladda upp filer"
+    "uploadfiles": "Skicka återkopplingsfiler"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/tr.json b/www/addons/files/lang/tr.json
index eea4b750c75..ec3b602ad1b 100644
--- a/www/addons/files/lang/tr.json
+++ b/www/addons/files/lang/tr.json
@@ -1,13 +1,6 @@
 {
-    "errorcapturingaudio": "Ses çalma hatası",
-    "errorcapturingvideo": "Video oynatma hatası",
-    "files": "Dosyalarım",
-    "fileuploaded": "Dosya yüklendi",
-    "myfiles": "Dosyalarım",
-    "photoalbums": "Fotoğraf albümleri",
+    "files": "Dosyalar",
     "privatefiles": "Kişisel dosyalar",
     "sitefiles": "Site dosyaları",
-    "uploadfiles": "Dosya yükleyebilir",
-    "uploading": "Yükleniyor",
-    "video": "Video"
+    "uploadfiles": "Geribildirim dosyaları gönder"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/zh-cn.json b/www/addons/files/lang/zh-cn.json
index c4da0041842..80e8e1c528c 100644
--- a/www/addons/files/lang/zh-cn.json
+++ b/www/addons/files/lang/zh-cn.json
@@ -1,13 +1,7 @@
 {
     "emptyfilelist": "没有可显示的文件",
-    "errorcapturingaudio": "捕捉音频时出错。",
-    "errorcapturingvideo": "捕捉视频时出错。",
-    "files": "我的文件",
-    "fileuploaded": "文件已成功上传。",
-    "myfiles": "我的文件",
+    "files": "文件",
     "privatefiles": "私人文件",
-    "sitefiles": "站点文件",
-    "uploadfiles": "可以上传文件",
-    "uploading": "上传中",
-    "video": "视频"
+    "sitefiles": "本站文件",
+    "uploadfiles": "发送反馈文件"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/zh-tw.json b/www/addons/files/lang/zh-tw.json
index 23885287d8d..7f0cc12450e 100644
--- a/www/addons/files/lang/zh-tw.json
+++ b/www/addons/files/lang/zh-tw.json
@@ -1,37 +1,13 @@
 {
     "admindisableddownload": "請注意, 您的Moodle管理員禁止檔案下載, 您可以瀏覽檔案, 但不能下載它們.",
-    "audio": "錄音",
-    "camera": "照相機",
-    "chooseaccountuploadfile": "選擇一個帳號去上傳檔案",
     "clicktoupload": "點選這個按鈕,將檔案上傳到你的個人檔案區",
-    "confirmuploadfile": "您即將上傳{{size}}. 您確定要繼續嗎？",
     "couldnotloadfiles": "這些檔案是不能被載入的",
-    "downloading": "下載中",
-    "emptyfilelist": "沒有檔案可以顯示",
-    "errorcapturingaudio": "截取錄音資料錯誤",
-    "errorcapturingimage": "截取畫面錯誤",
-    "errorcapturingvideo": "截取錄影資料錯誤",
-    "errorgettingimagealbum": "從相簿讀取影像檔發生錯誤",
-    "errormustbeonlinetoupload": "你必須上線才能上傳檔案",
-    "errornoapp": "您沒有安裝應用程式來執行此動作.",
-    "errorreadingfile": "讀取檔案發生錯誤",
-    "errorreceivefilenosites": "沒有儲存的網站. 請在嘗試上傳檔案之前新增一個網站.",
+    "emptyfilelist": "沒有可以顯示的檔案",
     "erroruploadnotworking": "很抱歉, 目前無法將檔案上傳到您的網站.",
-    "errorwhiledownloading": "當試著去下載檔案時發生錯誤",
-    "errorwhilerecordingaudio": "當試著去錄音時發生錯誤",
-    "errorwhileuploading": "上傳檔案時發生錯誤",
-    "files": "我的檔案",
-    "fileuploaded": "檔案上傳成功",
-    "myfiles": "我的檔案",
-    "myprivatefiles": "個人專用檔案",
+    "files": "檔案",
     "myprivatefilesdesc": "在此Moodle網站上, 您的私有區域中有可用的文件",
-    "photoalbums": "相簿",
     "privatefiles": "私人檔案",
-    "readingfile": "讀取檔案",
-    "sitefiles": "網站公用檔案",
+    "sitefiles": "網站檔案",
     "sitefilesdesc": "您在此Moodle網站上有可用的其他文件.",
-    "success": "成功!",
-    "uploadfiles": "上傳檔案",
-    "uploading": "上傳中",
-    "video": "錄影"
+    "uploadfiles": "送出回饋檔案"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ar.json b/www/addons/frontpage/lang/ar.json
index 1a14d85a4c1..6ab6e8a6bc1 100644
--- a/www/addons/frontpage/lang/ar.json
+++ b/www/addons/frontpage/lang/ar.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "الصفحة الرئيسية",
-    "sitehome": "الصفحة الرئيسية",
+    "sitehome": "صفحة الموقع",
     "sitenews": "أخبار الموقع"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/bg.json b/www/addons/frontpage/lang/bg.json
index d251b48bf26..80d1d3a78f4 100644
--- a/www/addons/frontpage/lang/bg.json
+++ b/www/addons/frontpage/lang/bg.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Заглавна страница",
-    "sitehome": "Заглавна страница",
+    "sitehome": "Начална страница",
     "sitenews": "Новини от сайта"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ca.json b/www/addons/frontpage/lang/ca.json
index 7a430c3a847..abb0156f26a 100644
--- a/www/addons/frontpage/lang/ca.json
+++ b/www/addons/frontpage/lang/ca.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Pàgina principal",
-    "sitehome": "Inici",
+    "sitehome": "Pàgina d'inici",
     "sitenews": "Notícies del lloc"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/cs.json b/www/addons/frontpage/lang/cs.json
index 97d5a3c4015..840b3fcf71b 100644
--- a/www/addons/frontpage/lang/cs.json
+++ b/www/addons/frontpage/lang/cs.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Titulní stránka",
-    "sitehome": "Domovská stránka",
+    "sitehome": "Titulní stránka",
     "sitenews": "Oznámení stránek"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/da.json b/www/addons/frontpage/lang/da.json
index dd3fb3e76ff..14f7474bfce 100644
--- a/www/addons/frontpage/lang/da.json
+++ b/www/addons/frontpage/lang/da.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Forside",
-    "sitehome": "Websteds hjem",
-    "sitenews": "Sitemeddelelser"
+    "sitehome": "Webstedets forside",
+    "sitenews": "Sitenyheder"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/de.json b/www/addons/frontpage/lang/de.json
index 8c3ca69ec5b..9cb19d53a76 100644
--- a/www/addons/frontpage/lang/de.json
+++ b/www/addons/frontpage/lang/de.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Startseite",
-    "sitehome": "Startseite",
+    "sitehome": "Website-Start",
     "sitenews": "Ankündigungen"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/el.json b/www/addons/frontpage/lang/el.json
index e327cf31466..e74db01da78 100644
--- a/www/addons/frontpage/lang/el.json
+++ b/www/addons/frontpage/lang/el.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Κεντρική σελίδα",
-    "sitehome": "Αρχική σελίδα",
+    "sitehome": "Αρχική σελίδα ιστοτόπου",
     "sitenews": "Νέα του ιστοχώρου"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es-mx.json b/www/addons/frontpage/lang/es-mx.json
index e2db2b8b52d..59a7b3f143c 100644
--- a/www/addons/frontpage/lang/es-mx.json
+++ b/www/addons/frontpage/lang/es-mx.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Portada",
     "sitehome": "Página inicial del sitio",
     "sitenews": "Anuncios del sitio"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es.json b/www/addons/frontpage/lang/es.json
index e332204ca4a..ab5299cdfde 100644
--- a/www/addons/frontpage/lang/es.json
+++ b/www/addons/frontpage/lang/es.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Página Principal",
-    "sitehome": "Inicio",
+    "sitehome": "Inicio del sitio",
     "sitenews": "Novedades del sitio"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/eu.json b/www/addons/frontpage/lang/eu.json
index a87e22dc7d6..2a21d6f7aa1 100644
--- a/www/addons/frontpage/lang/eu.json
+++ b/www/addons/frontpage/lang/eu.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Hasiera-orria",
     "sitehome": "Gunearen hasiera",
     "sitenews": "Gunearen berriak"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/fa.json b/www/addons/frontpage/lang/fa.json
index b90d5d69974..f082870df34 100644
--- a/www/addons/frontpage/lang/fa.json
+++ b/www/addons/frontpage/lang/fa.json
@@ -1,4 +1,4 @@
 {
-    "sitehome": "صفحهٔ اول",
+    "sitehome": "صفحهٔ اصلی سایت",
     "sitenews": "اعلانات سایت"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/fr.json b/www/addons/frontpage/lang/fr.json
index 427a48724d0..cb3a05c1714 100644
--- a/www/addons/frontpage/lang/fr.json
+++ b/www/addons/frontpage/lang/fr.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Page d'accueil",
-    "sitehome": "Plateforme",
+    "sitehome": "Accueil du site",
     "sitenews": "Annonces du site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/he.json b/www/addons/frontpage/lang/he.json
index accf17fcbd4..92fc15d4105 100644
--- a/www/addons/frontpage/lang/he.json
+++ b/www/addons/frontpage/lang/he.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "עמוד ראשי",
-    "sitehome": "עמוד ראשי",
+    "sitehome": "דף הבית",
     "sitenews": "חדשות האתר"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/hu.json b/www/addons/frontpage/lang/hu.json
index 60e40944fb6..c811b0444a5 100644
--- a/www/addons/frontpage/lang/hu.json
+++ b/www/addons/frontpage/lang/hu.json
@@ -1,4 +1,4 @@
 {
-    "sitehome": "Kezdőoldal",
+    "sitehome": "Portál kezdőoldala",
     "sitenews": "Portálhírek"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/it.json b/www/addons/frontpage/lang/it.json
index a941722fcb3..9490d0feb02 100644
--- a/www/addons/frontpage/lang/it.json
+++ b/www/addons/frontpage/lang/it.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Pagina home",
     "sitehome": "Home del sito",
     "sitenews": "Annunci del sito"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ja.json b/www/addons/frontpage/lang/ja.json
index fce19c38c5d..5decf0d2ec1 100644
--- a/www/addons/frontpage/lang/ja.json
+++ b/www/addons/frontpage/lang/ja.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "フロントページ",
-    "sitehome": "フロントページ",
+    "sitehome": "サイトホーム",
     "sitenews": "サイトアナウンスメント"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/lt.json b/www/addons/frontpage/lang/lt.json
index 7eeb8a3a4f9..95d9705bdc1 100644
--- a/www/addons/frontpage/lang/lt.json
+++ b/www/addons/frontpage/lang/lt.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Titulinis lapas",
     "sitehome": "Pagrindinis svetainės puslapis",
     "sitenews": "Svetainės skelbimai"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/nl.json b/www/addons/frontpage/lang/nl.json
index c9a8024a955..a94c7942487 100644
--- a/www/addons/frontpage/lang/nl.json
+++ b/www/addons/frontpage/lang/nl.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Startpagina",
     "sitehome": "Site startpagina",
     "sitenews": "Site-mededelingen"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pl.json b/www/addons/frontpage/lang/pl.json
index a1fc79e0828..f3332e566da 100644
--- a/www/addons/frontpage/lang/pl.json
+++ b/www/addons/frontpage/lang/pl.json
@@ -1,4 +1,4 @@
 {
-    "sitehome": "Strona startowa",
+    "sitehome": "Strona główna",
     "sitenews": "Aktualności"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt-br.json b/www/addons/frontpage/lang/pt-br.json
index 7eb94bf6ea0..660d141d9c4 100644
--- a/www/addons/frontpage/lang/pt-br.json
+++ b/www/addons/frontpage/lang/pt-br.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Página principal",
-    "sitehome": "Página inicial",
-    "sitenews": "Novidades"
+    "sitehome": "Página inicial do site",
+    "sitenews": "Avisos do site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt.json b/www/addons/frontpage/lang/pt.json
index 62b12b63065..9ca478b0f19 100644
--- a/www/addons/frontpage/lang/pt.json
+++ b/www/addons/frontpage/lang/pt.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Página principal",
-    "sitehome": "Página inicial",
+    "sitehome": "Página inicial do site",
     "sitenews": "Anúncios do site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ro.json b/www/addons/frontpage/lang/ro.json
index 5c338787d35..dc9350bc054 100644
--- a/www/addons/frontpage/lang/ro.json
+++ b/www/addons/frontpage/lang/ro.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Prima pagina",
     "sitehome": "Pagina principală",
     "sitenews": "Ştiri site"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/ru.json b/www/addons/frontpage/lang/ru.json
index dbd2facda41..caf1beca395 100644
--- a/www/addons/frontpage/lang/ru.json
+++ b/www/addons/frontpage/lang/ru.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Главная страница",
-    "sitehome": "Главная страница",
-    "sitenews": "Новости сайта"
+    "sitehome": "Домашняя страница",
+    "sitenews": "Объявления сайта"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/sv.json b/www/addons/frontpage/lang/sv.json
index be57af83981..5cb933e7711 100644
--- a/www/addons/frontpage/lang/sv.json
+++ b/www/addons/frontpage/lang/sv.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "Ingångssida",
-    "sitehome": "Webbsida hem",
+    "sitehome": "Hem för webbplats",
     "sitenews": "Webbplatsnyheter"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/tr.json b/www/addons/frontpage/lang/tr.json
index e3159c9addd..8732a99250c 100644
--- a/www/addons/frontpage/lang/tr.json
+++ b/www/addons/frontpage/lang/tr.json
@@ -1,4 +1,4 @@
 {
-    "sitehome": "Ön sayfa",
-    "sitenews": "Site haberleri"
+    "sitehome": "Site ana sayfası",
+    "sitenews": "Site duyuruları"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/zh-cn.json b/www/addons/frontpage/lang/zh-cn.json
index e2169b9f34a..1e0cc97e42a 100644
--- a/www/addons/frontpage/lang/zh-cn.json
+++ b/www/addons/frontpage/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
-    "sitehome": "首页",
+    "sitehome": "网站首页",
     "sitenews": "本站新闻"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/zh-tw.json b/www/addons/frontpage/lang/zh-tw.json
index 10fd23d8fa7..61f993318e9 100644
--- a/www/addons/frontpage/lang/zh-tw.json
+++ b/www/addons/frontpage/lang/zh-tw.json
@@ -1,5 +1,4 @@
 {
-    "frontpage": "首頁",
-    "sitehome": "首頁",
+    "sitehome": "網站首頁",
     "sitenews": "網站公告"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/bg.json b/www/addons/grades/lang/bg.json
index 6fb3aee6f38..02c842d1272 100644
--- a/www/addons/grades/lang/bg.json
+++ b/www/addons/grades/lang/bg.json
@@ -1,4 +1,3 @@
 {
-    "itemname": "Оценяване",
-    "viewgrades": "Преглед на оценките"
+    "viewgrades": "Разглеждане на оценки"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ca.json b/www/addons/grades/lang/ca.json
index 466e2340dfb..fccc6008fb7 100644
--- a/www/addons/grades/lang/ca.json
+++ b/www/addons/grades/lang/ca.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Element de qualificació",
     "nogradesreturned": "No s'han retornat qualificacions",
-    "viewgrades": "Visualitza les qualificacions"
+    "viewgrades": "Mostra les qualificacions"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/cs.json b/www/addons/grades/lang/cs.json
index 83049846fd4..d81f129f741 100644
--- a/www/addons/grades/lang/cs.json
+++ b/www/addons/grades/lang/cs.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Položka známky",
     "nogradesreturned": "Nebyly nalezeny žádné známky",
     "viewgrades": "Zobrazit známky"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/da.json b/www/addons/grades/lang/da.json
index 4a325ef7ec4..042fbae8632 100644
--- a/www/addons/grades/lang/da.json
+++ b/www/addons/grades/lang/da.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Emne til bedømmelse",
     "nogradesreturned": "Ingen karakterer returneret",
-    "viewgrades": "Vis bedømmelser"
+    "viewgrades": "Vis karakterer"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/de.json b/www/addons/grades/lang/de.json
index b46241900f1..e5cc9fa961b 100644
--- a/www/addons/grades/lang/de.json
+++ b/www/addons/grades/lang/de.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Bewertungsaspekt",
     "nogradesreturned": "Keine Bewertung zum Anzeigen vorhanden",
     "viewgrades": "Bewertungen anzeigen"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/el.json b/www/addons/grades/lang/el.json
index b7bd37ee00f..5517b193e17 100644
--- a/www/addons/grades/lang/el.json
+++ b/www/addons/grades/lang/el.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Βαθμολογία αντικειμένου",
     "nogradesreturned": "Δεν επιστράφηκε κανένας βαθμός",
-    "viewgrades": "Προβολή βαθμών"
+    "viewgrades": "Προβολή Βαθμών"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/es-mx.json b/www/addons/grades/lang/es-mx.json
index a69b255c454..694aa3a580f 100644
--- a/www/addons/grades/lang/es-mx.json
+++ b/www/addons/grades/lang/es-mx.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Ítem de calificación",
     "nogradesreturned": "No se han devuelto calificaciones",
     "viewgrades": "Ver calificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/es.json b/www/addons/grades/lang/es.json
index daff3a42fa5..694aa3a580f 100644
--- a/www/addons/grades/lang/es.json
+++ b/www/addons/grades/lang/es.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Elemento de calificación",
     "nogradesreturned": "No se han devuelto calificaciones",
     "viewgrades": "Ver calificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/eu.json b/www/addons/grades/lang/eu.json
index a2da159e978..64c9dc9d246 100644
--- a/www/addons/grades/lang/eu.json
+++ b/www/addons/grades/lang/eu.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Elementua kalifikatu",
     "nogradesreturned": "Ez da kalifikaziorik itzuli",
-    "viewgrades": "Kalifikazioak ikusi"
+    "viewgrades": "Ikusi kalifikazioak"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/fr.json b/www/addons/grades/lang/fr.json
index 61839e826ef..1c1ce861d2d 100644
--- a/www/addons/grades/lang/fr.json
+++ b/www/addons/grades/lang/fr.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Élément d'évaluation",
     "nogradesreturned": "Aucune note retournée",
-    "viewgrades": "Afficher les notes"
+    "viewgrades": "Affichage des notes"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/he.json b/www/addons/grades/lang/he.json
index 9fe92d0ae5c..f6450d5c884 100644
--- a/www/addons/grades/lang/he.json
+++ b/www/addons/grades/lang/he.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "פריט ציון",
     "nogradesreturned": "לא הוחזרו ציונים",
-    "viewgrades": "צפיה בציונים"
+    "viewgrades": "תצוגת ציונים"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/it.json b/www/addons/grades/lang/it.json
index 892207d58e2..883d830fb4f 100644
--- a/www/addons/grades/lang/it.json
+++ b/www/addons/grades/lang/it.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Elemento di valutazione",
     "nogradesreturned": "Non è stata ottenuta alcuna valutazione",
     "viewgrades": "Visualizza valutazioni"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ja.json b/www/addons/grades/lang/ja.json
index a756f630d3e..23abe78a3be 100644
--- a/www/addons/grades/lang/ja.json
+++ b/www/addons/grades/lang/ja.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "評定項目",
     "nogradesreturned": "評点がありません。",
     "viewgrades": "評定を表示する"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/lt.json b/www/addons/grades/lang/lt.json
index fc1809b6b53..eb0999f2672 100644
--- a/www/addons/grades/lang/lt.json
+++ b/www/addons/grades/lang/lt.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Įvertinti",
     "nogradesreturned": "Įverčių nepateikta",
     "viewgrades": "Peržiūrėti įverčius"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/nl.json b/www/addons/grades/lang/nl.json
index f4489bca2f5..a11f8e821e2 100644
--- a/www/addons/grades/lang/nl.json
+++ b/www/addons/grades/lang/nl.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Beoordelingsitem",
     "nogradesreturned": "Geen cijfers",
     "viewgrades": "Bekijk cijfers"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pt-br.json b/www/addons/grades/lang/pt-br.json
index 2105992ad37..a93815a0aca 100644
--- a/www/addons/grades/lang/pt-br.json
+++ b/www/addons/grades/lang/pt-br.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Item de nota",
     "nogradesreturned": "Nenhuma avaliação calculada",
     "viewgrades": "Ver notas"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pt.json b/www/addons/grades/lang/pt.json
index 759a7cf8365..1becbd39256 100644
--- a/www/addons/grades/lang/pt.json
+++ b/www/addons/grades/lang/pt.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Item de avaliação",
     "nogradesreturned": "Não foram devolvidas notas",
     "viewgrades": "Ver notas"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ro.json b/www/addons/grades/lang/ro.json
index 23c1becd038..711fb7c74e1 100644
--- a/www/addons/grades/lang/ro.json
+++ b/www/addons/grades/lang/ro.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Element al notei",
     "nogradesreturned": "Nu au fost returnate note",
-    "viewgrades": "Vedeți notele"
+    "viewgrades": "Afişează note"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ru.json b/www/addons/grades/lang/ru.json
index 87410fef2ad..733ed0c23e6 100644
--- a/www/addons/grades/lang/ru.json
+++ b/www/addons/grades/lang/ru.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Элемент оценки",
     "nogradesreturned": "Нет оценок",
     "viewgrades": "Просмотр оценок"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/sv.json b/www/addons/grades/lang/sv.json
index eac6027bd8c..738484e2a02 100644
--- a/www/addons/grades/lang/sv.json
+++ b/www/addons/grades/lang/sv.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Inga bokstavsbetyg har returnerats",
-    "viewgrades": "Visa betyg"
+    "viewgrades": "Visa betyg/omdömen"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/tr.json b/www/addons/grades/lang/tr.json
index 06231a7a90a..a9b8afc370a 100644
--- a/www/addons/grades/lang/tr.json
+++ b/www/addons/grades/lang/tr.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "Not ögesi",
     "nogradesreturned": "Hiç not yok",
     "viewgrades": "Notlara bak"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/zh-cn.json b/www/addons/grades/lang/zh-cn.json
index c4bcff223e8..61847c25ce4 100644
--- a/www/addons/grades/lang/zh-cn.json
+++ b/www/addons/grades/lang/zh-cn.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "评分项",
     "nogradesreturned": "未找到成绩",
     "viewgrades": "查看成绩"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/zh-tw.json b/www/addons/grades/lang/zh-tw.json
index ddf0abb9669..7dedc8d3d0c 100644
--- a/www/addons/grades/lang/zh-tw.json
+++ b/www/addons/grades/lang/zh-tw.json
@@ -1,5 +1,4 @@
 {
-    "itemname": "成績項目",
     "nogradesreturned": "未找到成績",
     "viewgrades": "檢視成績"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/ar.json b/www/addons/messages/lang/ar.json
index 49b1406b1df..09addb61436 100644
--- a/www/addons/messages/lang/ar.json
+++ b/www/addons/messages/lang/ar.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "أضف كجهة اتصال",
+    "addcontact": "أضف عنوان أتصال",
     "blockcontact": "أحجب عنوان  الأتصال",
     "blocknoncontacts": "امنع المستخدمين الذين ليسوا في قائمة اتصالاتي من مراسلتي",
     "contactlistempty": "قائمة الاتصال فارغة",
@@ -10,11 +10,11 @@
     "messages": "رسائل",
     "mustbeonlinetosendmessages": "لابد أن تكون متصل بالأنترنت لكي ترسل أي رسائل",
     "newmessage": "رسالة جديدة",
-    "nomessages": "لا يوجد رسائل",
-    "nousersfound": "لا يوجد مستخدمين",
+    "nomessages": "لا يوجد رساله/رسائل جديدة",
+    "nousersfound": "لا يوجد مستخدمون",
     "removecontact": "ازل عنوان الاتصال",
-    "send": "إرسل",
-    "sendmessage": "ارسل رسالة",
+    "send": "إرسال",
+    "sendmessage": "إرسل رسالة",
     "type_offline": "غير متصل",
     "type_online": "متصل",
     "type_search": "نتائج البحث",
diff --git a/www/addons/messages/lang/bg.json b/www/addons/messages/lang/bg.json
index b7899cc188a..29b451daeb9 100644
--- a/www/addons/messages/lang/bg.json
+++ b/www/addons/messages/lang/bg.json
@@ -1,22 +1,22 @@
 {
     "addcontact": "Добавяне на контакт",
-    "blockcontact": "Блокирай контакт",
+    "blockcontact": "Блокиране на контакт",
     "blocknoncontacts": "Блокирай съобщения от потребители извън списъка с контакти ",
     "contactlistempty": "Списъка с контакти е празен",
     "contactname": "Име на контакта",
-    "contacts": "Име",
+    "contacts": "Контакти",
     "deletemessage": "Изтриване на съобщение",
     "deletemessageconfirmation": "Сигурни ли сте, че искате да изтриете това съобщение? То ще бъде изтрито само от Вашето хранилище за съобщения и ще продължи да се вижда от изпращача или получателя.",
     "errorwhileretrievingcontacts": "Грешка при изчитането на списъка с контакти от сървъра.",
     "errorwhileretrievingdiscussions": "Грешка при изчитането на дискусиите от сървъра.",
     "errorwhileretrievingmessages": "Грешка при изчитането на съобщенията от сървъра.",
-    "message": "Текст на съобщението",
+    "message": "Съобщение",
     "messagenotsent": "Съобщението не беше изпратено. Моля опитайте пак по-късно.",
     "messagepreferences": "Предпочитания за съобщенията",
     "messages": "Съобщения",
     "mustbeonlinetosendmessages": "Трябва да сте онлайн, за да изпращате съобщения.",
     "newmessage": "Ново съобщение ...",
-    "nomessages": "Няма съобщения.",
+    "nomessages": "Няма чакащи съобщения",
     "nousersfound": "Не са намерени потребители",
     "removecontact": "Премахване на контакт",
     "send": "Изпращане",
@@ -26,5 +26,5 @@
     "type_online": "Онлайн",
     "type_search": "Резултати от търсенето",
     "type_strangers": "Други",
-    "unblockcontact": "Отключване на контакт"
+    "unblockcontact": "Разблокиране на контакт"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/ca.json b/www/addons/messages/lang/ca.json
index 088f4184539..04139bc73b4 100644
--- a/www/addons/messages/lang/ca.json
+++ b/www/addons/messages/lang/ca.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "Afegeix com a contacte",
+    "addcontact": "Afegeix contacte",
     "blockcontact": "Bloca contacte",
     "blockcontactconfirm": "Ja no rebreu més missatges d'aquest contacte.",
     "blocknoncontacts": "Impedeix que m'enviïn missatges els usuaris que no siguin a la meva llista de contactes",
@@ -13,18 +13,18 @@
     "errorwhileretrievingdiscussions": "S'ha produït un error mentre es recuperaven els debats del servidor.",
     "errorwhileretrievingmessages": "S'ha produït un error descarregant els missatges.",
     "loadpreviousmessages": "Carrega els missatges anteriors",
-    "message": "Cos del missatge",
+    "message": "Missatge",
     "messagenotsent": "El missatge no s'ha enviat. Si us plau, intenteu-ho més tard",
     "messages": "Missatges",
     "mustbeonlinetosendmessages": "Heu de tenir connexió a la xarxa per a enviar missatges",
-    "newmessage": "Nou missatge...",
+    "newmessage": "Missatge nou",
     "newmessages": "Nous missatges",
-    "nomessages": "No hi ha missatges.",
+    "nomessages": "No teniu missatges pendents",
     "nousersfound": "No s'han trobat usuaris",
     "removecontact": "Suprimeix contacte",
     "removecontactconfirm": "El contacte s'eliminarà de la vostra llista de contactes.",
     "send": "Envia",
-    "sendmessage": "Envia un missatge",
+    "sendmessage": "Envia missatge",
     "type_blocked": "Bloquejat",
     "type_offline": "Fora de línia",
     "type_online": "En línia",
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index a8db02553b9..90822283653 100644
--- a/www/addons/messages/lang/cs.json
+++ b/www/addons/messages/lang/cs.json
@@ -18,14 +18,14 @@
     "messagepreferences": "Nastavení zpráv",
     "messages": "Zprávy",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
-    "newmessage": "Nová zpráva...",
+    "newmessage": "Nová zpráva",
     "newmessages": "Nové zprávy",
-    "nomessages": "Žádné zprávy.",
-    "nousersfound": "Nebyl nalezen žádný uživatel",
-    "removecontact": "Odstranit kontakt",
+    "nomessages": "Žádné zprávy",
+    "nousersfound": "Nenalezeni žádní uživatelé",
+    "removecontact": "Odebrat kontakt",
     "removecontactconfirm": "Kontakt bude odstraněn ze seznamu kontaktů.",
     "send": "Odeslat",
-    "sendmessage": "Odeslat zprávu",
+    "sendmessage": "Poslat zprávu",
     "type_blocked": "Blokováno",
     "type_offline": "Offline",
     "type_online": "Online",
diff --git a/www/addons/messages/lang/da.json b/www/addons/messages/lang/da.json
index 41e4cc2882f..a77aadc57eb 100644
--- a/www/addons/messages/lang/da.json
+++ b/www/addons/messages/lang/da.json
@@ -11,13 +11,13 @@
     "errorwhileretrievingcontacts": "Fejl ved hentning af kontakter fra serveren",
     "errorwhileretrievingdiscussions": "Fejl ved hentning af diskussioner fra serveren",
     "errorwhileretrievingmessages": "Fejl ved hentning af beskeder fra serveren.",
-    "message": "Beskedtekst",
+    "message": "Besked",
     "messagenotsent": "Beskeden blev ikke sendt, prøv igen senere.",
     "messagepreferences": "Indstillinger for beskeder",
     "messages": "Beskeder",
     "mustbeonlinetosendmessages": "Du skal være online for at sende beskeder",
-    "newmessage": "Ny besked...",
-    "nomessages": "Ingen besked.",
+    "newmessage": "Ny besked",
+    "nomessages": "Ingen beskeder",
     "nousersfound": "Ingen brugere fundet",
     "removecontact": "Fjern kontakt",
     "send": "Send",
@@ -27,6 +27,6 @@
     "type_online": "Online",
     "type_search": "Søgeresultat",
     "type_strangers": "Andre",
-    "unblockcontact": "Lås kontakten op",
+    "unblockcontact": "Fjern blokering af kontakt",
     "warningmessagenotsent": "Kunne ikke sende besked(er) til brugeren {{user}}. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index 19ac3536b7d..f61929ee329 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -1,37 +1,36 @@
 {
     "addcontact": "Kontakt hinzufügen",
-    "blockcontact": "Kontakt blockieren",
+    "blockcontact": "Kontakt sperren",
     "blockcontactconfirm": "Sie werden von diesem Kontakt keine Mitteilungen mehr empfangen.",
-    "blocknoncontacts": "Unbekannte Personen sperren",
+    "blocknoncontacts": "Weitere Personen sperren",
     "contactlistempty": "Die Kontaktliste ist leer.",
     "contactname": "Name",
     "contacts": "Kontakte",
     "deletemessage": "Nachricht löschen",
     "deletemessageconfirmation": "Möchten Sie wirklich diese Nachricht löschen? Die Nachricht wird ausschließlich aus Ihrem Nachrichtenverlauf gelöscht, ist aber weiterhin bei der Person zu sehen, die Ihnen die Nachricht geschickt hat.",
     "errordeletemessage": "Fehler beim Löschen der Mitteilung",
-    "erroruseronlyacceptsmessagefromcontacts": "Fehler: Diese Person erlaubt den Empfang von Mitteilungen nur von ihren Kontakten.",
     "errorwhileretrievingcontacts": "Fehler beim Lesen der Kontakte vom Server",
     "errorwhileretrievingdiscussions": "Fehler beim Lesen der Themen vom Server",
     "errorwhileretrievingmessages": "Fehler beim Empfang der Mitteilungen vom Server",
     "loadpreviousmessages": "Vorherige Mitteilungen laden",
     "message": "Mitteilung",
     "messagenotsent": "Die Mitteilung wurde nicht gesendet. Versuchen Sie es später noch einmal.",
-    "messagepreferences": "Nachrichteneinstellungen",
-    "messages": "Nachrichten",
+    "messagepreferences": "Mitteilungen konfigurieren",
+    "messages": "Mitteilungen",
     "mustbeonlinetosendmessages": "Sie müssen online sein, um Mitteilungen zu senden",
-    "newmessage": "Neue Mitteilung ...",
+    "newmessage": "Neue Mitteilung",
     "newmessages": "Neue Mitteilungen",
     "nomessages": "Keine Mitteilungen",
-    "nousersfound": "Keine Personen gefunden",
+    "nousersfound": "Keine Nutzer/innen gefunden",
     "removecontact": "Kontakt entfernen",
     "removecontactconfirm": "Der Kontakt wird aus Ihrer Kontaktliste gelöscht.",
     "send": "Senden",
-    "sendmessage": "Nachricht senden",
+    "sendmessage": "Mitteilung senden",
     "type_blocked": "Blockiert",
     "type_offline": "Offline",
     "type_online": "Online",
     "type_search": "Suchergebnisse",
     "type_strangers": "Andere Personen",
-    "unblockcontact": "Kontakt freigeben",
+    "unblockcontact": "Kontakt aktivieren",
     "warningmessagenotsent": "Keine Mitteilung an {{user}} gesendet. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index 3476b0c695a..6976449017a 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -9,14 +9,14 @@
     "errorwhileretrievingcontacts": "Σφάλμα κατά την ανάκτηση των επαφών από το διακομιστή.",
     "errorwhileretrievingdiscussions": "Σφάλμα κατά την ανάκτηση των συζητήσεων από το διακομιστή.",
     "errorwhileretrievingmessages": "Σφάλμα κατά την ανάκτηση των μηνυμάτων από το διακομιστή.",
-    "message": "Σώμα μηνύματος",
+    "message": "Μήνυμα",
     "messagenotsent": "Το μήνυμα δεν στάλθηκε, δοκιμάστε ξανά αργότερα.",
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "newmessage": "Νέο μήνυμα...",
-    "nomessages": "Κανένα μήνυμα.",
-    "nousersfound": "Δεν βρέθηκαν χρήστες",
+    "newmessage": "Νέο μήνυμα",
+    "nomessages": "Δεν υπάρχουν μηνύματα σε αναμονή",
+    "nousersfound": "Δε βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "send": "Αποστολή",
     "sendmessage": "Αποστολή μηνύματος",
diff --git a/www/addons/messages/lang/es-mx.json b/www/addons/messages/lang/es-mx.json
index 793b24deac9..cb30898bdb8 100644
--- a/www/addons/messages/lang/es-mx.json
+++ b/www/addons/messages/lang/es-mx.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "Añadir como contacto",
+    "addcontact": "Añadir contacto",
     "blockcontact": "Bloquear contacto",
     "blockcontactconfirm": "Usted dejará de recibir mensajes de este contacto.",
     "blocknoncontacts": "Bloquear mensajes de usuarios que no figuren en mi lista de contactos",
@@ -13,16 +13,16 @@
     "errorwhileretrievingdiscussions": "Error al recuperar las discusiones del servidor.",
     "errorwhileretrievingmessages": "Error al recuperar los mensajes del servidor.",
     "loadpreviousmessages": "Cargar mensajes anteriores",
-    "message": "Cuerpo del mensaje",
+    "message": "Mensaje",
     "messagenotsent": "El mensaje no fue enviado; por favor inténtelo nuevamente después.",
     "messagepreferences": "Preferencias de Mensaje",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Usted debe de estar en-linea para enviar mensajes",
-    "newmessage": "Nuevo mensaje...",
+    "newmessage": "Nuevo mensaje",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "Sin mensajes.",
-    "nousersfound": "No se encontraron usuarios",
-    "removecontact": "Quitar contacto",
+    "nomessages": "No hay mensajes",
+    "nousersfound": "No se encuentran usuarios",
+    "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto será quitado de su lista de contactos.",
     "send": "Enviar",
     "sendmessage": "Enviar mensaje",
diff --git a/www/addons/messages/lang/es.json b/www/addons/messages/lang/es.json
index 5d7dae8282a..ffce3f75b23 100644
--- a/www/addons/messages/lang/es.json
+++ b/www/addons/messages/lang/es.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "Añadir como contacto",
+    "addcontact": "Añadir contacto",
     "blockcontact": "Bloquear contacto",
     "blocknoncontacts": "Bloquear mensajes de usuarios que no figuren en mi lista de contactos",
     "contactlistempty": "Lista de contactos vacía",
@@ -11,17 +11,17 @@
     "errorwhileretrievingcontacts": "Error al recuperar los contactos del servidor.",
     "errorwhileretrievingdiscussions": "Error al recuperar las discusiones del servidor.",
     "errorwhileretrievingmessages": "Error al recuperar los mensajes del servidor.",
-    "message": "Cuerpo del mensaje",
+    "message": "Mensaje",
     "messagenotsent": "El mensaje no fue enviado; por favor inténtelo nuevamente después.",
     "messagepreferences": "Preferencias de mensajes",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Debe conectarse para enviar mensajes",
-    "newmessage": "Nuevo mensaje...",
+    "newmessage": "Nuevo mensaje",
     "nomessages": "No hay mensajes en espera",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
     "send": "Enviar",
-    "sendmessage": "Enviar un mensaje",
+    "sendmessage": "Enviar mensaje",
     "type_blocked": "Bloqueado",
     "type_offline": "Desconectado",
     "type_online": "En línea",
diff --git a/www/addons/messages/lang/eu.json b/www/addons/messages/lang/eu.json
index eda860af7b5..45d02c19d0d 100644
--- a/www/addons/messages/lang/eu.json
+++ b/www/addons/messages/lang/eu.json
@@ -13,19 +13,19 @@
     "errorwhileretrievingdiscussions": "Errorea elkarrizketak zerbitzaritik jasotzean.",
     "errorwhileretrievingmessages": "Errorea mezuak zerbitzaritik jasotzean.",
     "loadpreviousmessages": "Kargatu aurreko mezuak",
-    "message": "Mezuren gurputza",
+    "message": "Mezua",
     "messagenotsent": "Mezua ez da bidali, mesedez saiatu beranduago.",
     "messagepreferences": "Mezuen hobespenak",
     "messages": "Mezuak",
     "mustbeonlinetosendmessages": "Online egon behar zara mezuak bidaltzeko.",
-    "newmessage": "Mezu berria...",
+    "newmessage": "Mezu berria",
     "newmessages": "Mezu beriak",
-    "nomessages": "Mezurik ez.",
+    "nomessages": "Ez duzu mezurik",
     "nousersfound": "Ez da erabiltzailerik aurkitu",
-    "removecontact": "Kontaktua ezabatu",
+    "removecontact": "Ezabatu kontaktua",
     "removecontactconfirm": "Kontaktua zure kontaktuen zerrendatik ezabatuko da.",
     "send": "Bidali",
-    "sendmessage": "Bidali mezua",
+    "sendmessage": "Mezua bidali",
     "type_blocked": "Blokeatuta",
     "type_offline": "Lineaz kanpo",
     "type_online": "Online",
diff --git a/www/addons/messages/lang/fa.json b/www/addons/messages/lang/fa.json
index f8289b8bc32..9e85892ad32 100644
--- a/www/addons/messages/lang/fa.json
+++ b/www/addons/messages/lang/fa.json
@@ -1,14 +1,14 @@
 {
-    "addcontact": "افزودن مخاطب",
+    "addcontact": "افزودن به مخاطبين",
     "blockcontact": "مسدود کردن مخاطب",
-    "blocknoncontacts": "جلوگیری از دریافت پیام افرادی که در لیست مخاطبین من نمی باشند.",
+    "blocknoncontacts": "افرادی که در لیست مخاطبین من نیستند نتوانند برای من پیام بفرستند",
     "contactlistempty": "لیست مخاطبین شما خالی است",
     "contactname": "نام مخاطب",
     "contacts": "مخاطبین",
     "errorwhileretrievingdiscussions": "خطا در دریافت مباحثه‌ها از کارگزار.",
-    "message": "متن پیام",
+    "message": "پیام",
     "messagepreferences": "ترجیحات پیام‌دهی",
-    "messages": "پیام های من",
+    "messages": "پیام‌ها",
     "newmessage": "پیام جدید",
     "nomessages": "هیچ پیغامی منتظر جواب نیست",
     "nousersfound": "کاربری پیدا نشد",
diff --git a/www/addons/messages/lang/fr.json b/www/addons/messages/lang/fr.json
index 91f57277015..c988ebada69 100644
--- a/www/addons/messages/lang/fr.json
+++ b/www/addons/messages/lang/fr.json
@@ -1,6 +1,6 @@
 {
-    "addcontact": "Ajouter un contact",
-    "blockcontact": "Bloquer le contact",
+    "addcontact": "Ajouter ce contact",
+    "blockcontact": "Bloquer ce contact",
     "blockcontactconfirm": "Vous ne recevrez plus de messages de ce contact.",
     "blocknoncontacts": "Empêcher les utilisateurs inconnus de m'envoyer des messages personnels",
     "contactlistempty": "La liste des contacts est vide",
@@ -13,24 +13,24 @@
     "errorwhileretrievingdiscussions": "Erreur lors de la récupération des discussions depuis le serveur.",
     "errorwhileretrievingmessages": "Erreur lors de la récupération des messages depuis le serveur.",
     "loadpreviousmessages": "Charger les messages antérieurs",
-    "message": "Corps du message",
+    "message": "Message personnel",
     "messagenotsent": "Ce message n'a pas été envoyé. Veuillez essayer plus tard.",
     "messagepreferences": "Préférences des messages",
-    "messages": "Messages",
+    "messages": "Messages personnels",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
-    "newmessage": "Nouveau message...",
+    "newmessage": "Nouveau message",
     "newmessages": "Nouveaux messages",
-    "nomessages": "Aucun message.",
-    "nousersfound": "Aucun utilisateur trouvé",
-    "removecontact": "Supprimer contact",
+    "nomessages": "Aucun message",
+    "nousersfound": "Aucun utilisateur n'a été trouvé",
+    "removecontact": "Supprimer ce contact",
     "removecontactconfirm": "Le contact sera retiré de votre liste.",
     "send": "Envoyer",
-    "sendmessage": "Envoyer un message",
+    "sendmessage": "Envoyer message personnel",
     "type_blocked": "Bloqué",
     "type_offline": "Hors ligne",
     "type_online": "En ligne",
     "type_search": "Résultats de recherche",
     "type_strangers": "Autres",
-    "unblockcontact": "Débloquer contact",
+    "unblockcontact": "Débloquer ce contact",
     "warningmessagenotsent": "Impossible d'envoyer de message à l'utilisateur {{user}}. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/he.json b/www/addons/messages/lang/he.json
index eab2c7dbf17..f6f5f5402ec 100644
--- a/www/addons/messages/lang/he.json
+++ b/www/addons/messages/lang/he.json
@@ -1,6 +1,6 @@
 {
-    "addcontact": "הוסף לרשימת אנשי קשר",
-    "blockcontact": "חסימת איש קשר",
+    "addcontact": "הוספת איש קשר",
+    "blockcontact": "חסימת איש הקשר",
     "blocknoncontacts": "חסימת כל המסרים החדשים מאנשים שלא נמצאים ברשימת אנשי הקשר שלי",
     "contactlistempty": "רשימת אנשי הקשר ריקה",
     "contactname": "שם איש קשר",
@@ -10,21 +10,21 @@
     "errorwhileretrievingcontacts": "שגיאה בזמן טעינת אנשי קשר מהשרת.",
     "errorwhileretrievingdiscussions": "שגיאה בזמן טעינת הדיונים מהשרת.",
     "errorwhileretrievingmessages": "שגיאה בזמן טעינת המסרים מהשרת.",
-    "message": "גוף ההודעה",
+    "message": "מסר",
     "messagenotsent": "מסר זה לא נשלח, אנא נסה שוב מאוחר יותר.",
-    "messagepreferences": "העדפות בהודעות",
+    "messagepreferences": "העדפות מסרים",
     "messages": "מסרים",
     "mustbeonlinetosendmessages": "עליך להיות מחובר/ת בכדי לשלוח מסר.",
-    "newmessage": "מסר חדש...",
-    "nomessages": "אין מסרים.",
-    "nousersfound": "לא נמצאו משתמשים",
-    "removecontact": "הסרת איש קשר",
-    "send": "שלח",
+    "newmessage": "הודעה חדשה",
+    "nomessages": "אין מסרים ממתינים",
+    "nousersfound": "לתשומת-לב",
+    "removecontact": "הסרת איש הקשר",
+    "send": "לשלוח",
     "sendmessage": "שליחת מסר",
     "type_blocked": "חסומים",
     "type_offline": "לא מחוברים",
     "type_online": "מחוברים",
     "type_search": "תוצאות חיפוש",
     "type_strangers": "אחרים",
-    "unblockcontact": "ביטול חסימת איש קשר"
+    "unblockcontact": "ביטול חסימת איש הקשר"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/hu.json b/www/addons/messages/lang/hu.json
index 22331eaa922..4b9bc7e02c1 100644
--- a/www/addons/messages/lang/hu.json
+++ b/www/addons/messages/lang/hu.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "Hozzáadás kapcsolatként",
+    "addcontact": "Kapcsolat hozzáadása",
     "blockcontact": "Kapcsolat zárolása",
     "blocknoncontacts": "Ismeretlenek üzeneteit ne kapjam meg",
     "contactlistempty": "Kapcsolatainak jegyzéke jelenleg üres.",
@@ -7,11 +7,11 @@
     "contacts": "Kapcsolatok",
     "deletemessage": "Üzenet törlése",
     "deletemessageconfirmation": "Biztosan törli az üzenetet? Az csak a korábbi üzeneteiből törlődik, az azt küldő vagy fogadó fél továbbra is láthatja.",
-    "message": "Üzenet törzsszövege",
+    "message": "Üzenet",
     "messagepreferences": "Üzenet beállításai",
     "messages": "Üzenetek",
     "newmessage": "Új üzenet",
-    "nomessages": "Nem várakozik üzenet",
+    "nomessages": "Nincs üzenet.",
     "nousersfound": "Nincs felhasználó",
     "removecontact": "Kapcsolat törlése",
     "send": "Küldés",
diff --git a/www/addons/messages/lang/it.json b/www/addons/messages/lang/it.json
index 730f54494ac..997e27210b3 100644
--- a/www/addons/messages/lang/it.json
+++ b/www/addons/messages/lang/it.json
@@ -11,17 +11,17 @@
     "errorwhileretrievingcontacts": "Si è verificato un errore durante la ricezione dei contatti dal server.",
     "errorwhileretrievingdiscussions": "Si è verificato un errore durante la ricezione delle discussioni dal server.",
     "errorwhileretrievingmessages": "Si è verificato un errore durante la ricezione dei messaggi dal server.",
-    "message": "Corpo del messaggio",
+    "message": "Messaggio",
     "messagenotsent": "Il messaggio non è stato inviato, per favore riprova più tardi.",
     "messagepreferences": "Preferenze messaggi",
     "messages": "Messaggi",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
-    "newmessage": "Nuovo messaggio...",
-    "nomessages": "Non ci sono messaggi.",
-    "nousersfound": "Non sono stati trovati utenti",
-    "removecontact": "Rimuovi contatto",
+    "newmessage": "Nuovo messaggio",
+    "nomessages": "Nessun messaggio",
+    "nousersfound": "Non trovato alcun utente",
+    "removecontact": "Cancella contatti",
     "send": "Invia",
-    "sendmessage": "Invia un messaggio",
+    "sendmessage": "Invia messaggio",
     "type_blocked": "Bloccato",
     "type_offline": "Offline",
     "type_online": "Online",
diff --git a/www/addons/messages/lang/ja.json b/www/addons/messages/lang/ja.json
index d4abe6509b7..caabf24157e 100644
--- a/www/addons/messages/lang/ja.json
+++ b/www/addons/messages/lang/ja.json
@@ -1,20 +1,20 @@
 {
-    "addcontact": "コンタクトに追加",
-    "blockcontact": "コンタクトをブロック",
+    "addcontact": "コンタクトに追加する",
+    "blockcontact": "受信拒否",
     "blocknoncontacts": "不明なユーザをブロックする",
     "contactlistempty": "コンタクトリストは空です。",
     "contactname": "連絡先",
     "contacts": "コンタクト",
     "deletemessage": "メッセージを削除する",
     "deletemessageconfirmation": "本当にこのメッセージを削除してもよろしいですか? あなたのメッセージング履歴からのみ削除され、メッセージを送受信したユーザはまだ閲覧することができます。",
-    "message": "メッセージ本文",
+    "message": "メッセージ",
     "messagepreferences": "メッセージプリファレンス",
     "messages": "メッセージ",
     "newmessage": "新しいメッセージ",
-    "nomessages": "未読メッセージはありません。",
+    "nomessages": "メッセージはありません。",
     "nousersfound": "ユーザは見つかりませんでした。",
-    "removecontact": "コンタクトを削除",
+    "removecontact": "コンタクトから削除する",
     "send": "送信",
-    "sendmessage": "メッセージ送信",
-    "unblockcontact": "コンタクトのブロックを解除"
+    "sendmessage": "メッセージを送信する",
+    "unblockcontact": "コンタクトの拒否を解除する"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/lt.json b/www/addons/messages/lang/lt.json
index a35a4a74272..32ed85f2598 100644
--- a/www/addons/messages/lang/lt.json
+++ b/www/addons/messages/lang/lt.json
@@ -9,14 +9,14 @@
     "errorwhileretrievingcontacts": "Klaida nuskaitant kontaktus iš serverio.",
     "errorwhileretrievingdiscussions": "Klaida nuskaitant diskusijas iš serverio.",
     "errorwhileretrievingmessages": "Klaida nuskaitant pranešimus iš serverio.",
-    "message": "Pranešimo tekstas",
+    "message": "Žinutė",
     "messagenotsent": "Žinutė nebuvo išsiųsta, pabandykite vėliau.",
     "messagepreferences": "Žinučių nuostatos",
     "messages": "Žinutės",
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite prisijungti",
-    "newmessage": "Nauja žinutė...",
-    "nomessages": "Žinučių nėra.",
-    "nousersfound": "Vartotojas nerastas",
+    "newmessage": "Nauja žinutė",
+    "nomessages": "Nėra žinučių",
+    "nousersfound": "Nerasta naudotojų",
     "removecontact": "Pašalinti kontaktą",
     "send": "Siųsti",
     "sendmessage": "Siųsti žinutę",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index 436885ecfdb..2c9ecfc57d8 100644
--- a/www/addons/messages/lang/nl.json
+++ b/www/addons/messages/lang/nl.json
@@ -1,11 +1,11 @@
 {
-    "addcontact": "Voeg contact toe",
-    "blockcontact": "Blokkeer contact",
+    "addcontact": "Voeg contactpersoon toe",
+    "blockcontact": "Blokkeer contactpersoon",
     "blockcontactconfirm": "Je zult geen berichten meer krijgen van deze contactpersoon.",
     "blocknoncontacts": "Blokkeer gebruikers  die niet op mijn contactenlijst staan",
     "contactlistempty": "De contactenlijst is leeg",
     "contactname": "Naam",
-    "contacts": "Contacten",
+    "contacts": "Contactpersonen",
     "deletemessage": "Verwijder bericht",
     "deletemessageconfirmation": "Weet je zeker dat je dit bericht wil verwijderen? Het zal alleen verwijderd worden van je berichtengeschiedenis. Het zal nog zichtbaar blijven voor de gebruiker die het bericht verstuurd of ontvangen heeft.",
     "errordeletemessage": "Fout bij het verwijderen van het bericht.",
@@ -13,24 +13,24 @@
     "errorwhileretrievingdiscussions": "Fout bij het ophalen van discussies van de server.",
     "errorwhileretrievingmessages": "Fout bij het ophalen van berichten van de server.",
     "loadpreviousmessages": "Laad vorige berichten",
-    "message": "Berichtinhoud",
+    "message": "Bericht",
     "messagenotsent": "Het bericht is niet verzonden. Probeer het later opnieuw.",
     "messagepreferences": "Berichten voorkeuren",
     "messages": "Berichten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
-    "newmessage": "Nieuw bericht...",
+    "newmessage": "Nieuw bericht",
     "newmessages": "Nieuwe berichten",
-    "nomessages": "Geen berichten.",
+    "nomessages": "Geen berichten",
     "nousersfound": "Geen gebruikers gevonden",
-    "removecontact": "Verwijder contact",
+    "removecontact": "Verwijder contactpersoon",
     "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
-    "send": "Stuur",
-    "sendmessage": "Stuur een bericht",
+    "send": "Verstuur",
+    "sendmessage": "Stuur bericht",
     "type_blocked": "Geblokkeerd",
     "type_offline": "Offline",
     "type_online": "Online",
     "type_search": "Zoekresultaten",
     "type_strangers": "Anderen",
-    "unblockcontact": "Contact deblokkeren",
+    "unblockcontact": "deblokkeer deze contactpersoon",
     "warningmessagenotsent": "Kon bericht(en) niet versturen naar gebruiker {{user}}. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/pl.json b/www/addons/messages/lang/pl.json
index ce7517a7cdd..6cb4279d4f9 100644
--- a/www/addons/messages/lang/pl.json
+++ b/www/addons/messages/lang/pl.json
@@ -1,13 +1,13 @@
 {
-    "addcontact": "Dodaj jako kontakt",
-    "blockcontact": "Zablokuj kontakt",
+    "addcontact": "Dodaj kontakt",
+    "blockcontact": "Blokuj kontakt",
     "blocknoncontacts": "Blokuj wiadomości od użytkowników spoza listy kontaktów",
     "contactlistempty": "Lista kontaktów jest pusta",
     "contactname": "Nazwa kontaktu",
     "contacts": "Kontakty",
     "deletemessage": "Usuń wiadomość",
     "deletemessageconfirmation": "Czy jesteś pewien, że chcesz usunąć tę wiadomość? Zostanie ona usunięta wyłącznie z twojej historii wiadomości, użytkownik który ją wysłał lub odebrał nadal będzie mógł ją wyświetlić.",
-    "message": "Treść wiadomości",
+    "message": "Wiadomość",
     "messagepreferences": "Preferencje wiadomości",
     "messages": "Wiadomości",
     "newmessage": "Nowa wiadomość",
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index e3087c02adb..d1ae86c8e24 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "Adicionar como contato",
+    "addcontact": "Acrescentar Contato",
     "blockcontact": "Bloquear contato",
     "blockcontactconfirm": "Você deixará de receber mensagens deste contato.",
     "blocknoncontacts": "Bloquear todas as mensagens de quem não estiver na minha lista de contatos",
@@ -9,23 +9,22 @@
     "deletemessage": "Excluir mensagem",
     "deletemessageconfirmation": "Tem certeza de que deseja excluir esta mensagem? Ela só será excluída do seu histórico de mensagens e ainda poderá ser vista pelo usuário que enviou ou recebeu a mensagem.",
     "errordeletemessage": "Erro enquanto excluía a mensagem.",
-    "erroruseronlyacceptsmessagefromcontacts": "O usuário somente aceita mensagens de contatos",
     "errorwhileretrievingcontacts": "Erro ao recuperar contatos a partir do servidor.",
     "errorwhileretrievingdiscussions": "Erro ao recuperar discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao recuperar as mensagens do servidor.",
     "loadpreviousmessages": "Carregar mensagens anteriores",
-    "message": "Corpo da mensagem",
+    "message": "Mensagem",
     "messagenotsent": "A mensagem não foi enviada. Por favor tente novamente mais tarde.",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Você precisa estar conectado para enviar mensagens.",
-    "newmessage": "Nova mensagem...",
+    "newmessage": "Nova Mensagem",
     "newmessages": "Novas mensagens",
-    "nomessages": "Não há mensagens.",
+    "nomessages": "Sem novas mensagens",
     "nousersfound": "Nenhum usuário encontrado",
-    "removecontact": "Remover contato",
+    "removecontact": "Eliminar contato",
     "removecontactconfirm": "O contato será removido da sua lista de contatos.",
     "send": "Enviar",
-    "sendmessage": "Envie uma mensagem",
+    "sendmessage": "Enviar mensagem",
     "type_blocked": "Bloqueado",
     "type_offline": "Offline",
     "type_online": "Online",
diff --git a/www/addons/messages/lang/pt.json b/www/addons/messages/lang/pt.json
index 2ecee753b1c..22d8a5385b2 100644
--- a/www/addons/messages/lang/pt.json
+++ b/www/addons/messages/lang/pt.json
@@ -9,19 +9,18 @@
     "deletemessage": "Apagar mensagem",
     "deletemessageconfirmation": "Tem a certeza que deseja apagar esta mensagem? A mesma será apagada apenas do seu histórico de mensagens, continuando visível para o utilizador que a enviou ou que recebeu a mensagem.",
     "errordeletemessage": "Erro ao eliminar a mensagem.",
-    "erroruseronlyacceptsmessagefromcontacts": "O utilizador apenas recebe mensagens dos seus contactos",
     "errorwhileretrievingcontacts": "Erro ao obter os contactos do servidor.",
     "errorwhileretrievingdiscussions": "Erro ao obter os tópicos de discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao obter as mensagens do servidor.",
     "loadpreviousmessages": "Carregar mensagens antigas",
-    "message": "Corpo da mensagem",
+    "message": "Mensagem",
     "messagenotsent": "A mensagem não foi enviada. Por favor, tente novamente mais tarde.",
     "messagepreferences": "Preferências das mensagens",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Precisa de estar online para enviar mensagens",
-    "newmessage": "Nova mensagem...",
+    "newmessage": "Nova mensagem",
     "newmessages": "Novas mensagens",
-    "nomessages": "Sem mensagens.",
+    "nomessages": "Sem mensagens",
     "nousersfound": "Nenhum utilizador encontrado",
     "removecontact": "Remover contacto",
     "removecontactconfirm": "O contacto será removido da sua lista de contactos.",
diff --git a/www/addons/messages/lang/ro.json b/www/addons/messages/lang/ro.json
index e8497ebbc3a..c3b70e79457 100644
--- a/www/addons/messages/lang/ro.json
+++ b/www/addons/messages/lang/ro.json
@@ -8,17 +8,16 @@
     "deletemessage": "Șterge mesaj",
     "deletemessageconfirmation": "Sunteți sigur că doriți să ștergeți acest mesaj? Va fi șters numai din istoricul mesajelor și va fi în continuare vizibil de către utilizatorul care a trimis sau a primit mesajul.",
     "errordeletemessage": "Eroare la ștergerea mesajului.",
-    "erroruseronlyacceptsmessagefromcontacts": "-",
     "errorwhileretrievingcontacts": "A apărut o eroare în găsirea contactelor pe server.",
     "errorwhileretrievingdiscussions": "A apărut o eroare în găsirea conversațiilor de pe server.",
     "errorwhileretrievingmessages": "A apărut o eroare în găsirea mesajelor de pe server.",
-    "message": "Conținut mesaj",
+    "message": "Mesaj",
     "messagenotsent": "Mesajul nu a fost expediat, vă rugăm să încercați mai târziu.",
     "messages": "Mesaje",
     "mustbeonlinetosendmessages": "Trebuie să fiți online pentru a putea trimite mesaje",
     "newmessage": "Mesaj nou!",
-    "nomessages": "Nu aveți mesaje.",
-    "nousersfound": "Nu au fost găsiți utilizatori",
+    "nomessages": "Nu există mesaje în aşteptare",
+    "nousersfound": "Nu s-au găsit utilizatori",
     "removecontact": "Şterge prieten din listă",
     "send": "Trimite",
     "sendmessage": "Trimite mesaj",
@@ -27,5 +26,5 @@
     "type_online": "Conectat",
     "type_search": "Caută rezultatele",
     "type_strangers": "Alții",
-    "unblockcontact": "Deblocați contactul"
+    "unblockcontact": "Deblochează utilizator"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/ru.json b/www/addons/messages/lang/ru.json
index ac3a6c3473b..763c739f876 100644
--- a/www/addons/messages/lang/ru.json
+++ b/www/addons/messages/lang/ru.json
@@ -1,26 +1,26 @@
 {
-    "addcontact": "Добавить контакт",
-    "blockcontact": "Заблокировать контакт",
+    "addcontact": "Добавить собеседника",
+    "blockcontact": "Блокировать сообщения от этого человека",
     "blocknoncontacts": "Не принимать сообщения от людей, которых нет в списке моих собеседников",
     "contactlistempty": "список контактов пуст",
     "contactname": "Имя контакта",
-    "contacts": "Контакты",
+    "contacts": "Собеседники",
     "deletemessage": "Удалить сообщение",
     "deletemessageconfirmation": "Вы уверены, что хотите удалить данное сообщение? Сообщение будет удалено лишь из списка сообщений и будет доступно для просмотра отправителем или получателем.",
     "errorwhileretrievingcontacts": "Ошибка при извлечении контактов с сервера",
     "errorwhileretrievingdiscussions": "Ошибка при получении обсуждения с сервера.",
     "errorwhileretrievingmessages": "Ошибка при получении сообщения с сервера",
     "loadpreviousmessages": "Загрузить предыдущее сообщение",
-    "message": "Текст сообщения",
+    "message": "Сообщение",
     "messagenotsent": "Сообщение не было отправлено. Повторите попытку позже.",
     "messagepreferences": "Настройки сообщений",
     "messages": "Сообщения",
     "mustbeonlinetosendmessages": "Вы должны быть на сайте, чтобы отправлять сообщения",
-    "newmessage": "Новое сообщение...",
+    "newmessage": "Новое сообщение",
     "newmessages": "Новые сообщения",
-    "nomessages": "Нет сообщений",
+    "nomessages": "Нет новых сообщений",
     "nousersfound": "Пользователи не найдены",
-    "removecontact": "Удалить контакт",
+    "removecontact": "Удалить собеседника из моего списка",
     "send": "Отправить",
     "sendmessage": "Отправить сообщение",
     "type_blocked": "Заблокировано",
@@ -28,5 +28,5 @@
     "type_online": "На сайте",
     "type_search": "Результаты поиска",
     "type_strangers": "Другие",
-    "unblockcontact": "Разблокировка контакта"
+    "unblockcontact": "Разблокировать сообщения от этого собеседника"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index af050541a24..1539f736369 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -11,20 +11,20 @@
     "errorwhileretrievingcontacts": "Fel vid hämtning av kontakter från servern.",
     "errorwhileretrievingdiscussions": "Fel vid hämtning  av diskussionerna från servern.",
     "errorwhileretrievingmessages": "Fel vid hämtning meddelanden från servern.",
-    "message": "Meddelandets brödtext",
+    "message": "Meddelande",
     "messagenotsent": "Meddelandet skickades inte, försök igen senare.",
     "messages": "Meddelanden",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
-    "newmessage": "Ny meddelande...",
-    "nomessages": "Inga meddelanden",
-    "nousersfound": "Inga användare hittades",
+    "newmessage": "Nytt meddelande",
+    "nomessages": "Inga avvaktande meddelanden",
+    "nousersfound": "Det gick inte att hitta några användare",
     "removecontact": "Ta bort kontakt",
     "send": "Skicka",
-    "sendmessage": "Skicka ett meddelande",
+    "sendmessage": "Skicka meddelande",
     "type_blocked": "blockerad",
     "type_offline": "Offline",
     "type_online": "Online",
     "type_search": "Sökresultat",
     "type_strangers": "Andra",
-    "unblockcontact": "Lås upp kontakt"
+    "unblockcontact": "Ta bort blockering av användare"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/tr.json b/www/addons/messages/lang/tr.json
index 3b1f963f17b..ad8dc3b2766 100644
--- a/www/addons/messages/lang/tr.json
+++ b/www/addons/messages/lang/tr.json
@@ -1,17 +1,17 @@
 {
-    "addcontact": "Rehbere ekle",
+    "addcontact": "Kişi ekle",
     "blockcontact": "Kişiyi engelle",
     "blocknoncontacts": "Tanımadığım kullanıcıları engelle",
     "contactlistempty": "Kişi listeniz şu anda boş",
     "contactname": "Adı",
     "contacts": "Kişiler",
-    "message": "Mesaj gövdesi",
+    "message": "Mesaj",
     "messagepreferences": "İleti tercihleri",
-    "messages": "Mesaj(lar)",
+    "messages": "Mesajlar",
     "newmessage": "Yeni ileti",
-    "nomessages": "İleti yok.",
+    "nomessages": "Yeni ileti yok",
     "nousersfound": "Kullanıcı bulunamadı",
-    "removecontact": "Kişiyi kaldır",
+    "removecontact": "Kişiyi sil",
     "send": "Gönder",
     "sendmessage": "Mesaj gönder",
     "type_blocked": "Engellendi",
diff --git a/www/addons/messages/lang/zh-cn.json b/www/addons/messages/lang/zh-cn.json
index 0466ffc5b7e..95fc354d0fb 100644
--- a/www/addons/messages/lang/zh-cn.json
+++ b/www/addons/messages/lang/zh-cn.json
@@ -1,12 +1,12 @@
 {
-    "addcontact": "添加为联系人",
+    "addcontact": "添加联系人",
     "blockcontact": "屏蔽联系人",
     "blocknoncontacts": "禁止不在联系人中的用户给我发消息",
     "contactlistempty": "您的联系人名单是空的",
     "contactname": "联系人",
     "contacts": "联系人",
     "deletemessage": "删除消息",
-    "message": "内容",
+    "message": "消息",
     "messages": "消息",
     "nomessages": "没有新消息",
     "nousersfound": "未找到用户",
diff --git a/www/addons/messages/lang/zh-tw.json b/www/addons/messages/lang/zh-tw.json
index 0d2164da77f..6933c72f05a 100644
--- a/www/addons/messages/lang/zh-tw.json
+++ b/www/addons/messages/lang/zh-tw.json
@@ -1,5 +1,5 @@
 {
-    "addcontact": "加入通訊錄",
+    "addcontact": "增加聯絡人",
     "blockcontact": "封鎖聯絡人",
     "blocknoncontacts": "僅接收通訊錄中的使用者所發送的簡訊。(其他都拒收)",
     "contactlistempty": "聯絡人清單沒有資料",
@@ -11,17 +11,17 @@
     "errorwhileretrievingcontacts": "從伺服器存取聯絡人時出錯",
     "errorwhileretrievingdiscussions": "從伺服器存取討論區時出錯",
     "errorwhileretrievingmessages": "從伺服器存取訊息時出錯",
-    "message": "訊息主文",
+    "message": "簡訊",
     "messagenotsent": "訊息未發送, 請稍後再試.",
     "messagepreferences": "簡訊偏好",
-    "messages": "我的簡訊",
+    "messages": "簡訊",
     "mustbeonlinetosendmessages": "您必須上線才能發送訊息",
-    "newmessage": "新訊息...",
-    "nomessages": "沒有任何訊息.",
-    "nousersfound": "沒有使用者",
+    "newmessage": "新簡訊",
+    "nomessages": "沒有待處理的簡訊",
+    "nousersfound": "找不到用戶",
     "removecontact": "刪除聯絡人",
-    "send": "傳送",
-    "sendmessage": "傳送訊息",
+    "send": "送出",
+    "sendmessage": "傳送簡訊",
     "type_blocked": "已停止",
     "type_offline": "離線",
     "type_online": "上線",
diff --git a/www/addons/mod/assign/lang/el.json b/www/addons/mod/assign/lang/el.json
index 321937193aa..bdc37c4dd93 100644
--- a/www/addons/mod/assign/lang/el.json
+++ b/www/addons/mod/assign/lang/el.json
@@ -41,7 +41,7 @@
     "numberofsubmittedassignments": "Υποβλήθηκε",
     "numberofteams": "Ομάδες",
     "numwords": "{{$a}} λέξεις",
-    "outof": "Από τα {{$a}}",
+    "outof": "{{$a.grade}} από ένα μέγιστο {{$a.maxgrade}}",
     "overdue": "<font color=\"red\">Η εργασία είναι εκπρόθεσμη για: {{$a}}</font>",
     "savechanges": "Αποθήκευση αλλαγών",
     "submission": "Υποβολή",
diff --git a/www/addons/mod/assign/lang/he.json b/www/addons/mod/assign/lang/he.json
index 634624ece1e..2173768d9f5 100644
--- a/www/addons/mod/assign/lang/he.json
+++ b/www/addons/mod/assign/lang/he.json
@@ -25,7 +25,7 @@
     "editingstatus": "מצב עריכה",
     "editsubmission": "עריכת ההגשה",
     "extensionduedate": "הארכת מועד הגשה",
-    "grade": "ציונים",
+    "grade": "ניקוד בפעילות",
     "graded": "נבדק",
     "gradedby": "נבדק על-ידי",
     "gradedon": "הציון ניתן על",
diff --git a/www/addons/mod/assign/lang/ja.json b/www/addons/mod/assign/lang/ja.json
index d7f86ec249e..8738b2818e6 100644
--- a/www/addons/mod/assign/lang/ja.json
+++ b/www/addons/mod/assign/lang/ja.json
@@ -25,7 +25,7 @@
     "editingstatus": "編集ステータス",
     "editsubmission": "提出を編集する",
     "extensionduedate": "延長提出期限",
-    "grade": "評点",
+    "grade": "評定",
     "graded": "評定済み",
     "gradedby": "評定者",
     "gradedon": "評定日時",
diff --git a/www/addons/mod/assign/lang/nl.json b/www/addons/mod/assign/lang/nl.json
index cb58014537a..6148bf53066 100644
--- a/www/addons/mod/assign/lang/nl.json
+++ b/www/addons/mod/assign/lang/nl.json
@@ -32,7 +32,7 @@
     "errorshowinginformation": "We kunnen de instuurinformatie niet tonen",
     "extensionduedate": "Extra tijd einddatum",
     "feedbacknotsupported": "Deze feedback wordt niet ondersteund door de app en het is mogelijk dat de informatie onvolledig is",
-    "grade": "Cijfer",
+    "grade": "Beoordeling",
     "graded": "Beoordeeld",
     "gradedby": "Beoordeeld door",
     "gradedon": "Beoordeeld op",
diff --git a/www/addons/mod/assign/lang/pt.json b/www/addons/mod/assign/lang/pt.json
index e2242d63f5e..6dd021409aa 100644
--- a/www/addons/mod/assign/lang/pt.json
+++ b/www/addons/mod/assign/lang/pt.json
@@ -32,7 +32,7 @@
     "errorshowinginformation": "Não é possível mostrar a informação da submissão",
     "extensionduedate": "Prolongamento da data limite",
     "feedbacknotsupported": "Este feedback não é suportado pela aplicação e pode não conter toda a informação",
-    "grade": "Avaliação",
+    "grade": "Nota",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
     "gradedon": "Avaliado em",
diff --git a/www/addons/mod/assign/lang/tr.json b/www/addons/mod/assign/lang/tr.json
index 72b0e0a2002..d56c55e9e46 100644
--- a/www/addons/mod/assign/lang/tr.json
+++ b/www/addons/mod/assign/lang/tr.json
@@ -25,7 +25,7 @@
     "editingstatus": "Durumu düzenleme",
     "editsubmission": "Gönderimi düzenle",
     "extensionduedate": "Ek sürenin bitiş tarihi",
-    "grade": "Not",
+    "grade": "Başarı notu",
     "graded": "Notlandırıldı",
     "gradedon": "Not verildi",
     "gradeoutof": "{{$a}} Dışarıdan notu",
diff --git a/www/addons/mod/choice/lang/ar.json b/www/addons/mod/choice/lang/ar.json
index 507d25fbe0c..60ff70d91f6 100644
--- a/www/addons/mod/choice/lang/ar.json
+++ b/www/addons/mod/choice/lang/ar.json
@@ -4,7 +4,7 @@
     "full": "(كامل)",
     "noresultsviewable": "حالياً لا يمكن معاينة النتائج",
     "notopenyet": "عذرا، هذا النشاط سيكون متوفر في {{$a}}",
-    "numberofuser": "عدد المشاركين",
+    "numberofuser": "عدد المستخدمين",
     "numberofuserinpercentage": "عدد المستخدمين كنسبة",
     "removemychoice": "استبعد خياري",
     "responses": "إجابات",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index fc6af3e2e89..c0a93b72130 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -6,8 +6,8 @@
     "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
-    "numberofuser": "Nombre de participants",
-    "numberofuserinpercentage": "Percentatge de participants",
+    "numberofuser": "Nombre de respostes",
+    "numberofuserinpercentage": "Percentatge de respostes (%)",
     "previewonly": "Això és sols una vista prèvia de les opcions disponibles en aquesta activitat. No esteu habilitat per enviar consultes fins {{$a}}.",
     "removemychoice": "Suprimeix la meva resposta",
     "responses": "Respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index aaa5ea9560c..f9a22aaf32e 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -6,8 +6,8 @@
     "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
     "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
-    "numberofuser": "Počet účastníků",
-    "numberofuserinpercentage": "Procentní podíl účastníků",
+    "numberofuser": "Počet odpovědí",
+    "numberofuserinpercentage": "Počet odpovědí v procentech",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
     "removemychoice": "Odstranit mou volbu",
     "responses": "Odpovědi",
diff --git a/www/addons/mod/choice/lang/da.json b/www/addons/mod/choice/lang/da.json
index 3ef6b107e4d..e462afcd51a 100644
--- a/www/addons/mod/choice/lang/da.json
+++ b/www/addons/mod/choice/lang/da.json
@@ -6,8 +6,8 @@
     "full": "(Fuld)",
     "noresultsviewable": "Resultaterne er ikke tilgængelige på nuværende tidspunkt.",
     "notopenyet": "Denne aktivitet er tilgængelig fra {{$a}}",
-    "numberofuser": "Antal deltagere",
-    "numberofuserinpercentage": "Procentdel af deltagerne",
+    "numberofuser": "Antal svar",
+    "numberofuserinpercentage": "Antal svar i procent",
     "previewonly": "Dette er en forhåndsvisning af de tilgængelige valgmuligheder i denne afstemning. Du kan ikke indsende dine valg før {{$a}}.",
     "removemychoice": "Slet mit valg",
     "responses": "Besvarelser",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index a7bea8a7061..be13d38af77 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -6,8 +6,8 @@
     "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
     "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
-    "numberofuser": "Anzahl",
-    "numberofuserinpercentage": "Prozent",
+    "numberofuser": "Anzahl der Antworten",
+    "numberofuserinpercentage": "Prozent der Antworten",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
     "responses": "Stimmabgaben",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 31602f11f93..4b17c064e80 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -4,8 +4,8 @@
     "full": "(Πλήρες)",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
     "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
-    "numberofuser": "Πλήθος συμμετεχόντων",
-    "numberofuserinpercentage": "Ποσοστό συμμετεχόντων",
+    "numberofuser": "Αριθμός απαντήσεων",
+    "numberofuserinpercentage": "Ποσοστό απαντήσεων",
     "removemychoice": "Διαγραφή της επιλογής μου",
     "responses": "Απαντήσεις",
     "responsesresultgraphdescription": "{{number}}% των χρηστών επέλεξε: {{text}}.",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index 41b15bb932f..ceddb82adc6 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentaje de participantes",
+    "numberofuser": "Número de respuestas",
+    "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/es.json b/www/addons/mod/choice/lang/es.json
index b14f860dda6..74076baa791 100644
--- a/www/addons/mod/choice/lang/es.json
+++ b/www/addons/mod/choice/lang/es.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentaje de participantes",
+    "numberofuser": "Número de respuestas",
+    "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esta es solamente una previsualización de las opciones disponibles para esta actividad. No podrá enviar su respuesta a la consulta hasta el {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/eu.json b/www/addons/mod/choice/lang/eu.json
index ceb6eff44db..62e0810b4c4 100644
--- a/www/addons/mod/choice/lang/eu.json
+++ b/www/addons/mod/choice/lang/eu.json
@@ -6,8 +6,8 @@
     "full": "(Beteta)",
     "noresultsviewable": "Emaitzak ezin dira orain ikusi",
     "notopenyet": "Barkatu, baina jarduera hau ez dago erabiltzeko moduan {{$a}} arte.",
-    "numberofuser": "Partaide-kopurua",
-    "numberofuserinpercentage": "Partaideen ehunekoa",
+    "numberofuser": "Erantzun-kopurua",
+    "numberofuserinpercentage": "Erantzunen portzentajea",
     "previewonly": "Hau jarduera honetan eskuragarri dauden aukeren aurrebista besterik ez da. Ezingo duzu zure erantzuna bidali {{$a}}-(e)ra arte.",
     "removemychoice": "Ezabatu nire aukera",
     "responses": "Erantzunak",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 05e3f3b9c99..9ca0f50c2ea 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -6,8 +6,8 @@
     "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
     "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
-    "numberofuser": "Nombre de participants",
-    "numberofuserinpercentage": "Pourcentage de participants",
+    "numberofuser": "Nombre de réponses",
+    "numberofuserinpercentage": "Pourcentage de réponses",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
     "responses": "Réponses",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index c44e97ee335..01597a9058a 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -6,8 +6,8 @@
     "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
     "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
-    "numberofuser": "Numero di partecipanti",
-    "numberofuserinpercentage": "Percentuale dei partecipanti",
+    "numberofuser": "Numero di risposte",
+    "numberofuserinpercentage": "Percentuale delle risposte",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
     "responses": "Scelte",
diff --git a/www/addons/mod/choice/lang/lt.json b/www/addons/mod/choice/lang/lt.json
index 94e682f5d51..ee1bf2c25c3 100644
--- a/www/addons/mod/choice/lang/lt.json
+++ b/www/addons/mod/choice/lang/lt.json
@@ -6,8 +6,8 @@
     "full": "(Visas)",
     "noresultsviewable": "Rezultatai dabar nematomi.",
     "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
-    "numberofuser": "Dalyvių skaičius",
-    "numberofuserinpercentage": "Dalyvių procentas",
+    "numberofuser": "Atsakymų skaičius",
+    "numberofuserinpercentage": "Atsakymų procentas",
     "previewonly": "Tai yra tik šios veiklos galimų variantų peržiūra. Savo pasirinkimo negalėsite pateikti iki {{$a}}.",
     "removemychoice": "Pašalinti mano pasirinkimą",
     "responses": "Atsakymai",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index b2be190c0c9..d7e7f4cd7f3 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -6,8 +6,8 @@
     "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
     "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
-    "numberofuser": "Aantal deelnemers",
-    "numberofuserinpercentage": "Deelnemerspercentage",
+    "numberofuser": "Aantal antwoorden",
+    "numberofuserinpercentage": "Percentage antwoorden",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
     "responses": "Antwoorden",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index f8fbe81990b..01fbb57c4c1 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -6,8 +6,8 @@
     "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
     "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentagem de participantes",
+    "numberofuser": "Número de usuários",
+    "numberofuserinpercentage": "Percentual de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
     "removemychoice": "Remover a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/pt.json b/www/addons/mod/choice/lang/pt.json
index a5b426bc80b..68e628591c5 100644
--- a/www/addons/mod/choice/lang/pt.json
+++ b/www/addons/mod/choice/lang/pt.json
@@ -6,8 +6,8 @@
     "full": "Completa",
     "noresultsviewable": "Os resultados da sondagem ainda não estão disponíveis.",
     "notopenyet": "Lamentamos mas esta atividade só estará disponível em {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Percentagem de participantes",
+    "numberofuser": "Número de respostas",
+    "numberofuserinpercentage": "Percentagem de respostas",
     "previewonly": "Esta é apenas uma pré-visualização das opções disponíveis para esta atividade. Não poderá submeter a sua escolha até {{$a}}.",
     "removemychoice": "Apagar a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/ro.json b/www/addons/mod/choice/lang/ro.json
index eb9c1bc300b..2133b57b951 100644
--- a/www/addons/mod/choice/lang/ro.json
+++ b/www/addons/mod/choice/lang/ro.json
@@ -4,8 +4,8 @@
     "full": "(plin)",
     "noresultsviewable": "În acest moment rezultatele nu pot fi vizualizate.",
     "notopenyet": "Ne pare rău, această activitate nu este disponibilă mai devreme de {{$a}}",
-    "numberofuser": "Numărul participanților",
-    "numberofuserinpercentage": "Procentul participanților",
+    "numberofuser": "Numărul de răspunsuri",
+    "numberofuserinpercentage": "Procentajul răspunsurilor",
     "previewonly": "Acesta este doar o prezentare a opțiunilor existente pentru această activitate. Nu veți putea trimite opțiunea dvs. până la {{$a}}.",
     "removemychoice": "Șterge alegerea mea",
     "responses": "Răspunsuri",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 62217bdb227..8ef6af50622 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
     "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
-    "numberofuser": "Antal deltagare",
-    "numberofuserinpercentage": "Procent av deltagarna",
+    "numberofuser": "Antal användare",
+    "numberofuserinpercentage": "Antalet användare i procent.",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
     "responses": "Svar",
diff --git a/www/addons/mod/choice/lang/zh-tw.json b/www/addons/mod/choice/lang/zh-tw.json
index fd45e3f3362..c97305fd6fa 100644
--- a/www/addons/mod/choice/lang/zh-tw.json
+++ b/www/addons/mod/choice/lang/zh-tw.json
@@ -6,8 +6,8 @@
     "full": "(已滿)",
     "noresultsviewable": "目前無法檢視票選結果",
     "notopenyet": "抱歉，這個活動在{{$a}}之前不能使用",
-    "numberofuser": "參與者人數",
-    "numberofuserinpercentage": "參與者百分比",
+    "numberofuser": "回應的人數",
+    "numberofuserinpercentage": "回應人數的百分比",
     "previewonly": "這只是這一活動的可用選項的預覽。你要等到{{$a}}才可以進行投票。",
     "removemychoice": "移除我的選擇",
     "responses": "答覆",
diff --git a/www/addons/mod/feedback/lang/zh-tw.json b/www/addons/mod/feedback/lang/zh-tw.json
index a940c584fdf..97aace4bc77 100644
--- a/www/addons/mod/feedback/lang/zh-tw.json
+++ b/www/addons/mod/feedback/lang/zh-tw.json
@@ -3,7 +3,7 @@
     "anonymous": "匿名",
     "anonymous_entries": "匿名輸入({{$a}})",
     "average": "平均數",
-    "complete_the_form": "填寫回饋單...",
+    "complete_the_form": "開始填寫回答...",
     "completed_feedbacks": "已回答",
     "continue_the_form": "繼續填表",
     "feedback_is_not_open": "這個回饋單還沒有開放",
diff --git a/www/addons/mod/folder/lang/ca.json b/www/addons/mod/folder/lang/ca.json
index b2f87d440ac..2208f493a4b 100644
--- a/www/addons/mod/folder/lang/ca.json
+++ b/www/addons/mod/folder/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hi ha fitxers per mostrar.",
+    "emptyfilelist": "No hi ha fitxers per mostrar",
     "errorwhilegettingfolder": "S'ha produït un error en recuperar les dades de la carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/cs.json b/www/addons/mod/folder/lang/cs.json
index 66b256adf4c..04e2822f6a0 100644
--- a/www/addons/mod/folder/lang/cs.json
+++ b/www/addons/mod/folder/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Žádný soubor k zobrazení.",
+    "emptyfilelist": "Žádný soubor k zobrazení",
     "errorwhilegettingfolder": "Chyba při načítání dat složky."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/da.json b/www/addons/mod/folder/lang/da.json
index 2337bed4841..c53b3a994ed 100644
--- a/www/addons/mod/folder/lang/da.json
+++ b/www/addons/mod/folder/lang/da.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Der er ingen filer at vise.",
+    "emptyfilelist": "Der er ingen filer at vise",
     "errorwhilegettingfolder": "Fejl ved hentning af mappedata."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/de.json b/www/addons/mod/folder/lang/de.json
index 022d05baeea..00b4ea2a954 100644
--- a/www/addons/mod/folder/lang/de.json
+++ b/www/addons/mod/folder/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Keine Dateien",
+    "emptyfilelist": "Es liegen keine Dateien vor",
     "errorwhilegettingfolder": "Fehler beim Laden der Verzeichnisdaten"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/es-mx.json b/www/addons/mod/folder/lang/es-mx.json
index 5b9563d5c0d..e2f470725df 100644
--- a/www/addons/mod/folder/lang/es-mx.json
+++ b/www/addons/mod/folder/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hay archivos para mostrar.",
+    "emptyfilelist": "No hay archivos que mostrar",
     "errorwhilegettingfolder": "Error al obtener datos de carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/eu.json b/www/addons/mod/folder/lang/eu.json
index 27a3ccc6636..07dae0aef65 100644
--- a/www/addons/mod/folder/lang/eu.json
+++ b/www/addons/mod/folder/lang/eu.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Ez dago fitxategirik erakusteko.",
+    "emptyfilelist": "Ez dago erakusteko fitxategirik",
     "errorwhilegettingfolder": "Errorea karpetaren datuak eskuratzean."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/fr.json b/www/addons/mod/folder/lang/fr.json
index 86d36f87890..e16e5c1aeb4 100644
--- a/www/addons/mod/folder/lang/fr.json
+++ b/www/addons/mod/folder/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Aucun fichier à afficher.",
+    "emptyfilelist": "Il n'y a pas de fichier à afficher",
     "errorwhilegettingfolder": "Erreur lors de l'obtention des données du dossier."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/he.json b/www/addons/mod/folder/lang/he.json
index 55811600621..1c2ec27977b 100644
--- a/www/addons/mod/folder/lang/he.json
+++ b/www/addons/mod/folder/lang/he.json
@@ -1,3 +1,3 @@
 {
-    "emptyfilelist": "אין קבצים להציג."
+    "emptyfilelist": "אין קבצים להציג"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/it.json b/www/addons/mod/folder/lang/it.json
index 93e13593395..b828249f904 100644
--- a/www/addons/mod/folder/lang/it.json
+++ b/www/addons/mod/folder/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Non ci sono file da visualizzare.",
+    "emptyfilelist": "Non ci sono file da visualizzare",
     "errorwhilegettingfolder": "Si è verificato un errore durante la ricezione dei dati della cartella."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/lt.json b/www/addons/mod/folder/lang/lt.json
index e174a7c5a50..a80a862764e 100644
--- a/www/addons/mod/folder/lang/lt.json
+++ b/www/addons/mod/folder/lang/lt.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Nėra ką rodyti.",
+    "emptyfilelist": "Nėra rodytinų failų",
     "errorwhilegettingfolder": "Klaida gaunant duomenis iš aplanko."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/nl.json b/www/addons/mod/folder/lang/nl.json
index 92b48519e9d..7b544820480 100644
--- a/www/addons/mod/folder/lang/nl.json
+++ b/www/addons/mod/folder/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Geen bestanden.",
+    "emptyfilelist": "Er zijn geen bestanden om te tonen",
     "errorwhilegettingfolder": "Fout bij het ophalen van de mapgegevens"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/pt-br.json b/www/addons/mod/folder/lang/pt-br.json
index 1588790327d..4e9c9589aa3 100644
--- a/www/addons/mod/folder/lang/pt-br.json
+++ b/www/addons/mod/folder/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Não há arquivos para mostrar",
+    "emptyfilelist": "Não há arquivos para exibir",
     "errorwhilegettingfolder": "Erro ao obter dados da pasta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/pt.json b/www/addons/mod/folder/lang/pt.json
index d197c86f233..74865d321a4 100644
--- a/www/addons/mod/folder/lang/pt.json
+++ b/www/addons/mod/folder/lang/pt.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Não há ficheiros para mostrar.",
+    "emptyfilelist": "Este repositório está vazio",
     "errorwhilegettingfolder": "Erro ao obter os dados da pasta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/ro.json b/www/addons/mod/folder/lang/ro.json
index a66c107ebcd..0277b91b35f 100644
--- a/www/addons/mod/folder/lang/ro.json
+++ b/www/addons/mod/folder/lang/ro.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Nu sunt fișiere disponibile pentru vizualizare.",
+    "emptyfilelist": "Nu există fișiere",
     "errorwhilegettingfolder": "A apărut o eroare la obținerea dosarului cu datele cerute."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/zh-tw.json b/www/addons/mod/folder/lang/zh-tw.json
index 5300a974982..d7ff3cf3a76 100644
--- a/www/addons/mod/folder/lang/zh-tw.json
+++ b/www/addons/mod/folder/lang/zh-tw.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "沒有檔案可以顯示",
+    "emptyfilelist": "沒有可以顯示的檔案",
     "errorwhilegettingfolder": "當讀取資料夾資料時發生錯誤"
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index bdbd7c0a872..38dca8ad7f1 100644
--- a/www/addons/mod/forum/lang/da.json
+++ b/www/addons/mod/forum/lang/da.json
@@ -9,7 +9,7 @@
     "discussionsubscription": "Abonnement på tråd",
     "edit": "Rediger",
     "erroremptymessage": "Indlægget kan ikke være tomt.",
-    "erroremptysubject": "Emnefeltet kan ikke være tomt",
+    "erroremptysubject": "Indlæggets emne kan ikke være tomt.",
     "errorgetforum": "Fejl ved hentning af forumdata.",
     "errorgetgroups": "Fejl ved hentning af gruppeindstillinger.",
     "forumnodiscussionsyet": "Der er endnu ingen indlæg i dette forum.",
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index 22814dbf13e..bee3c7cb0d4 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Themenabonnement",
     "edit": "Bearbeiten",
     "erroremptymessage": "Die Mitteilung darf nicht leer sein.",
-    "erroremptysubject": "Das Forenthema darf nicht leer sein.",
+    "erroremptysubject": "Der Betreff darf nicht leer sein.",
     "errorgetforum": "Fehler beim Laden der Forendaten",
     "errorgetgroups": "Fehler beim Laden der Gruppeneinstellungen",
     "forumnodiscussionsyet": "Keine Themen im Forum",
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index c3743416512..48404906707 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Suscripción a discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
-    "erroremptysubject": "El asunto de la publicación no puede estar vacío",
+    "erroremptysubject": "El asunto del mensaje no puede estar vacío.",
     "errorgetforum": "Error al obtener datos del foro.",
     "errorgetgroups": "Error al obtener configuraciones de grupo.",
     "forumnodiscussionsyet": "Todavía no hay tópicos de discusión en este foro.",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 09bf43de5be..566c52681f0 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Abonnement à la discussion",
     "edit": "Modifier",
     "erroremptymessage": "Un message ne peut pas être vide",
-    "erroremptysubject": "L'objet du message ne peut pas être vide",
+    "erroremptysubject": "L'objet d'un message ne peut pas être vide",
     "errorgetforum": "Erreur de récupération des données de forum.",
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
diff --git a/www/addons/mod/forum/lang/he.json b/www/addons/mod/forum/lang/he.json
index 585aef50b5f..665cc87e1b4 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -9,7 +9,7 @@
     "discussionsubscription": "מנוי לעדכונים בדיון",
     "edit": "עריכה",
     "erroremptymessage": "הודעת הפרסום איננה יכולה להיות ריקה",
-    "erroremptysubject": "נושא ההודעה אינו יכול להיות ריק",
+    "erroremptysubject": "הנושא הפרסום אינו יכול להיות ריק",
     "errorgetforum": "שגיאה בטעינת מידע הפורום.",
     "errorgetgroups": "שגיאה בטעינת הגדרות קבוצה.",
     "forumnodiscussionsyet": "עדיין לא קיימים נושאי דיונים בפורום זה.",
diff --git a/www/addons/mod/forum/lang/it.json b/www/addons/mod/forum/lang/it.json
index ad1b8b1ed8b..c54ee597c31 100644
--- a/www/addons/mod/forum/lang/it.json
+++ b/www/addons/mod/forum/lang/it.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Sottoscrizione della discussione",
     "edit": "Modifica",
     "erroremptymessage": "Il corpo del messaggio non può essere vuoto",
-    "erroremptysubject": "L'oggetto dell'intervento non può essere vuoto",
+    "erroremptysubject": "L'oggetto non può essere vuoto",
     "errorgetforum": "Si è verificato un errore durante la ricezione dei dati del forum.",
     "errorgetgroups": "Si è verificato un errore durante la ricezione delle impostazioni gruppo.",
     "forumnodiscussionsyet": "In questo forum non sono presenti discussioni",
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 82a99a7e4f4..93f37fba562 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Diskusijos prenumerata",
     "edit": "Redaguoti",
     "erroremptymessage": "Skelbimo žinutė negali būti tuščia",
-    "erroremptysubject": "Pranešimo temos langelis negali būti tuščias",
+    "erroremptysubject": "Skelbimo tema negali būti tuščia.",
     "errorgetforum": "Klaida gaunant forumo duomenis.",
     "errorgetgroups": "Klaida gaunant grupės nustatymus.",
     "forumnodiscussionsyet": "Pokalbio temų forume dar nėra.",
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 83fddedda47..8f7fe7dad45 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Inschrijving discussie",
     "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
-    "erroremptysubject": "Onderwerp mag niet leeg zijn",
+    "erroremptysubject": "Onderwerp kan niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
     "errorgetgroups": "Fout bij het ophalen van groepinstellingen.",
     "forumnodiscussionsyet": "Er zijn nog geen discussies in dit forum",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index f7d9cf730e2..aebbce61f21 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
-    "erroremptysubject": "Assunto não pode estar vazio",
+    "erroremptysubject": "O assunto da mensagem não pode ser vazio.",
     "errorgetforum": "Erro ao buscar dados de fórum.",
     "errorgetgroups": "Erro ao obter configurações do grupo.",
     "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda",
diff --git a/www/addons/mod/forum/lang/ro.json b/www/addons/mod/forum/lang/ro.json
index 99d4fc77c16..2dd31a2be41 100644
--- a/www/addons/mod/forum/lang/ro.json
+++ b/www/addons/mod/forum/lang/ro.json
@@ -7,7 +7,7 @@
     "discussion": "Discuție",
     "edit": "Modifică",
     "erroremptymessage": "Mesajul nu poate fi necompletat",
-    "erroremptysubject": "Subiectul nu poate rămâne necompletat",
+    "erroremptysubject": "Subiectul nu poate fi necompletat",
     "errorgetforum": "A apărut o eroare la obținerea datelor despre forum.",
     "errorgetgroups": "Eroare la obținerea setărilor pentru grup.",
     "forumnodiscussionsyet": "Nu există subiecte deschise în acest forum.",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index a671ae7d23e..d2d420c71b6 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Подписаться на эту тему.",
     "edit": "Редактировать",
     "erroremptymessage": "Сообщение не может быть пустым",
-    "erroremptysubject": "Заголовок сообщения не может быть пустым",
+    "erroremptysubject": "Тема сообщения не может быть пустой",
     "errorgetforum": "Ошибка при получении данных форума",
     "errorgetgroups": "Ошибка получения параметров группы",
     "forumnodiscussionsyet": "В этом форуме ещё нет тем для обсуждения",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 676e5ba9fa1..5d9eb54b6ad 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
-    "erroremptysubject": "Rubriken kan inte vara tom",
+    "erroremptysubject": "Ämnesrubriken för inlägget kan inte vara tom.",
     "errorgetforum": "Fel att få forum innehåll",
     "errorgetgroups": "Fel vid hämtning av gruppinställningar",
     "forumnodiscussionsyet": "Det finns inga diskussionsämnen ännu i detta forum.",
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index a2d74d28770..81db9790069 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -10,11 +10,11 @@
     "discussionsubscription": "議題訂閱",
     "edit": "編輯",
     "erroremptymessage": "貼文的訊息不能是空白",
-    "erroremptysubject": "貼文的標題不可以是空的",
+    "erroremptysubject": "貼文的主旨不能是空白",
     "errorgetforum": "讀取討論區資料發生錯誤",
     "errorgetgroups": "讀取群組設定發生錯誤",
     "forumnodiscussionsyet": "這個討論區還沒有討論主題",
-    "group": "群組",
+    "group": "分組",
     "message": "訊息",
     "modeflatnewestfirst": "以平舖方式呈現回應的貼文，最晚貼出的在前",
     "modeflatoldestfirst": "以平舖方式呈現回應的貼文，最早貼出的在前",
diff --git a/www/addons/mod/glossary/lang/ar.json b/www/addons/mod/glossary/lang/ar.json
index 1bbc36fb4a6..719582a5cf1 100644
--- a/www/addons/mod/glossary/lang/ar.json
+++ b/www/addons/mod/glossary/lang/ar.json
@@ -1,10 +1,10 @@
 {
-    "attachment": "مرفقات",
+    "attachment": "ملف مرفق",
     "browsemode": "النمط العرضي",
     "byauthor": "التجميع طبقا للمؤلف",
     "bynewestfirst": "الأحدث أولا",
     "byrecentlyupdated": "تم تحديثه مؤخرا",
     "bysearch": "بحث",
     "casesensitive": "مطابقة حالة الأحرف",
-    "categories": "تصنيفات المقررات الدراسية"
+    "categories": "فئات"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/bg.json b/www/addons/mod/glossary/lang/bg.json
index 7919151894c..593e987ab1a 100644
--- a/www/addons/mod/glossary/lang/bg.json
+++ b/www/addons/mod/glossary/lang/bg.json
@@ -2,5 +2,5 @@
     "attachment": "Прикачен файл",
     "browsemode": "Режим на преглеждане",
     "casesensitive": "Чувствителност главни/малки букви",
-    "categories": "Категории курсове"
+    "categories": "Категории"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/ca.json b/www/addons/mod/glossary/lang/ca.json
index 0fbd872e18b..a0af30fc35e 100644
--- a/www/addons/mod/glossary/lang/ca.json
+++ b/www/addons/mod/glossary/lang/ca.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Adjunt",
-    "browsemode": "Navegueu per les entrades",
+    "attachment": "Fitxer adjunt",
+    "browsemode": "Mode exploració",
     "byalphabet": "Alfabèticament",
     "byauthor": "Agrupat per autor",
     "bycategory": "Agrupa per categoria",
@@ -9,7 +9,7 @@
     "bysearch": "Cerca",
     "cannoteditentry": "No es pot editar l'entrada",
     "casesensitive": "Distingeix majúscules",
-    "categories": "Categories de cursos",
+    "categories": "Categories",
     "entriestobesynced": "Entrades per sincronitzar",
     "entrypendingapproval": "Aquesta entrada està pendent d'aprovació.",
     "errorloadingentries": "S'ha produït un error en carregar les entrades.",
diff --git a/www/addons/mod/glossary/lang/cs.json b/www/addons/mod/glossary/lang/cs.json
index 169ca928d6a..db30da2ce2e 100644
--- a/www/addons/mod/glossary/lang/cs.json
+++ b/www/addons/mod/glossary/lang/cs.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Příloha",
-    "browsemode": "Prohlížení příspěvků",
+    "browsemode": "Režim náhledu",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
     "bycategory": "Skupina podle kategorie",
@@ -9,7 +9,7 @@
     "bysearch": "Hledat",
     "cannoteditentry": "Záznam nelze upravit",
     "casesensitive": "Rozlišovat malá/VELKÁ",
-    "categories": "Kategorie kurzů",
+    "categories": "Kategorie",
     "entriestobesynced": "Příspěvky, které mají být synchronizovány",
     "entrypendingapproval": "Tato položka čeká na schválení",
     "errorloadingentries": "Při načítání položek došlo k chybě",
diff --git a/www/addons/mod/glossary/lang/da.json b/www/addons/mod/glossary/lang/da.json
index c741a5c2400..41338f8fc3e 100644
--- a/www/addons/mod/glossary/lang/da.json
+++ b/www/addons/mod/glossary/lang/da.json
@@ -1,13 +1,13 @@
 {
     "attachment": "Bilag",
-    "browsemode": "Skim indlæg",
+    "browsemode": "Forhåndsvisning",
     "byalphabet": "Alfabetisk",
     "byauthor": "Grupper efter forfatter",
     "bynewestfirst": "Nyeste først",
     "byrecentlyupdated": "Senest opdateret",
     "bysearch": "Søg",
     "casesensitive": "Store og små bogstaver",
-    "categories": "Kursuskategorier",
+    "categories": "Kategorier",
     "entrypendingapproval": "Dette opslag afventer godkendelse",
     "errorloadingentries": "Der opstod en fejl under indlæsning af opslag",
     "errorloadingentry": "Der opstod en fejl under indlæsning af opslaget",
diff --git a/www/addons/mod/glossary/lang/de.json b/www/addons/mod/glossary/lang/de.json
index 7eab596eedb..c5afa42c3fc 100644
--- a/www/addons/mod/glossary/lang/de.json
+++ b/www/addons/mod/glossary/lang/de.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anhang",
-    "browsemode": "Einträge durchblättern",
+    "browsemode": "Vorschaumodus",
     "byalphabet": "Alphabetisch",
     "byauthor": "Nach Autor/in",
     "bycategory": "Nach Kategorie",
@@ -9,7 +9,7 @@
     "bysearch": "Suchen",
     "cannoteditentry": "Eintrag nicht bearbeitbar",
     "casesensitive": "Groß-/Kleinschreibung",
-    "categories": "Kursbereiche",
+    "categories": "Kategorien",
     "entriestobesynced": "Einträge zum Synchronisieren",
     "entrypendingapproval": "Dieser Eintrag wartet auf eine Freigabe.",
     "errorloadingentries": "Fehler beim Laden von Einträgen",
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index c79bed26793..226aa549be7 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Συνημμένα",
-    "browsemode": "Περιήγηση στις καταχωρήσεις",
+    "attachment": "Επισυναπτόμενο",
+    "browsemode": "Φάση Προεπισκόπισης",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bynewestfirst": "Νεότερα πρώτα",
     "byrecentlyupdated": "Ανανεώθηκαν πρόσφατα",
     "bysearch": "Αναζήτηση",
-    "casesensitive": "Χρήση κανονικών εκφράσεων",
-    "categories": "Κατηγορίες μαθημάτων",
+    "casesensitive": "Διάκριση μικρών/κεφαλαίων",
+    "categories": "Κατηγορίες",
     "entrypendingapproval": "Εκκρεμεί η έγκριση για αυτή την καταχώρηση.",
     "errorloadingentries": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των καταχωρήσεων.",
     "errorloadingentry": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της καταχώρησης.",
diff --git a/www/addons/mod/glossary/lang/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index 750d734ad27..46307467a49 100644
--- a/www/addons/mod/glossary/lang/es-mx.json
+++ b/www/addons/mod/glossary/lang/es-mx.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Adjunto",
-    "browsemode": "Ver entradas",
+    "attachment": "Archivo adjunto",
+    "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoría",
diff --git a/www/addons/mod/glossary/lang/es.json b/www/addons/mod/glossary/lang/es.json
index 6b130513ae5..4c33c3904a5 100644
--- a/www/addons/mod/glossary/lang/es.json
+++ b/www/addons/mod/glossary/lang/es.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Adjunto",
-    "browsemode": "Navegar por las entradas",
+    "attachment": "Archivo adjunto",
+    "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupado por autor",
     "bynewestfirst": "El más reciente primero",
diff --git a/www/addons/mod/glossary/lang/eu.json b/www/addons/mod/glossary/lang/eu.json
index 86f1dfa7d42..96f4a794e08 100644
--- a/www/addons/mod/glossary/lang/eu.json
+++ b/www/addons/mod/glossary/lang/eu.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Eranskina",
-    "browsemode": "Aztertu sarrerak",
+    "browsemode": "Aurrebista-modua",
     "byalphabet": "Alfabetikoki",
     "byauthor": "Taldekatu egilearen arabera",
     "bycategory": "Taldekatu kategoriaren arabera",
@@ -9,7 +9,7 @@
     "bysearch": "Bilatu",
     "cannoteditentry": "Ezin da sarrera editatu",
     "casesensitive": "Letra larriak eta xeheak bereiziz",
-    "categories": "Ikastaro-kategoriak",
+    "categories": "Kategoriak",
     "entriestobesynced": "Sinkronizatu beharreko sarrerak",
     "entrypendingapproval": "Sarrera hau onarpenaren zain dago.",
     "errorloadingentries": "Errorea gertatu da sarrerak kargatzean.",
diff --git a/www/addons/mod/glossary/lang/fa.json b/www/addons/mod/glossary/lang/fa.json
index a0055ed1c39..b20b9564ef8 100644
--- a/www/addons/mod/glossary/lang/fa.json
+++ b/www/addons/mod/glossary/lang/fa.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "فایل پیوست",
-    "browsemode": "نوع نمایش",
+    "attachment": "فایل ضمیمه",
+    "browsemode": "حالت پیش‌نمایش",
     "casesensitive": "حساس بودن به بزرگ و کوچکی حروف",
-    "categories": "طبقه‌های درسی"
+    "categories": "طبقه‌ها"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/fr.json b/www/addons/mod/glossary/lang/fr.json
index c2481c2d394..976057ed4e7 100644
--- a/www/addons/mod/glossary/lang/fr.json
+++ b/www/addons/mod/glossary/lang/fr.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Annexe",
-    "browsemode": "Parcourir les articles",
+    "browsemode": "Mode prévisualisation",
     "byalphabet": "Alphabétiquement",
     "byauthor": "Grouper par auteur",
     "bycategory": "Grouper par catégorie",
@@ -9,7 +9,7 @@
     "bysearch": "Rechercher",
     "cannoteditentry": "Impossible de modifier l'article",
     "casesensitive": "Casse des caractères",
-    "categories": "Catégories de cours",
+    "categories": "Catégories",
     "entriestobesynced": "Articles à synchroniser",
     "entrypendingapproval": "Cet article est en attente d'approbation",
     "errorloadingentries": "Une erreur est survenue lors du chargement des articles.",
diff --git a/www/addons/mod/glossary/lang/he.json b/www/addons/mod/glossary/lang/he.json
index d1eeea671e9..6a915efc20f 100644
--- a/www/addons/mod/glossary/lang/he.json
+++ b/www/addons/mod/glossary/lang/he.json
@@ -2,5 +2,5 @@
     "attachment": "קובץ מצורף",
     "browsemode": "מצב תצוגה מקדימה",
     "casesensitive": "תלוי אותיות רישיות",
-    "categories": "קטגוריות קורסים"
+    "categories": "קטגוריות"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/hu.json b/www/addons/mod/glossary/lang/hu.json
index 0cf371e9e6f..69210832605 100644
--- a/www/addons/mod/glossary/lang/hu.json
+++ b/www/addons/mod/glossary/lang/hu.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Csatolt állomány:",
+    "attachment": "Csatolt állomány",
     "browsemode": "Előzetes megtekintés üzemmódja",
     "casesensitive": "Kis-/nagybetű különböző",
-    "categories": "Kurzuskategóriák"
+    "categories": "Kategóriák"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/it.json b/www/addons/mod/glossary/lang/it.json
index 07bd1bdbc9e..aa1cfe7fe09 100644
--- a/www/addons/mod/glossary/lang/it.json
+++ b/www/addons/mod/glossary/lang/it.json
@@ -4,7 +4,7 @@
     "byrecentlyupdated": "Aggiornati di recente",
     "bysearch": "Cerca",
     "casesensitive": "Rilevanza maiuscolo/minuscolo",
-    "categories": "Categorie di corso",
+    "categories": "Categorie",
     "entrypendingapproval": "Questa voce è in attesa di approvazione.",
     "errorloadingentries": "Si è verificato un errore durante il caricamento delle voci.",
     "errorloadingentry": "Si è verificato un errore durante il caricamento della voce.",
diff --git a/www/addons/mod/glossary/lang/ja.json b/www/addons/mod/glossary/lang/ja.json
index 3f5d6e65835..399ef6cd3c9 100644
--- a/www/addons/mod/glossary/lang/ja.json
+++ b/www/addons/mod/glossary/lang/ja.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "添付",
+    "attachment": "添付ファイル",
     "browsemode": "プレビューモード",
     "casesensitive": "大文字小文字の区別",
-    "categories": "コースカテゴリ"
+    "categories": "カテゴリ"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/lt.json b/www/addons/mod/glossary/lang/lt.json
index b9cb64fc2d8..23f3f7fe92b 100644
--- a/www/addons/mod/glossary/lang/lt.json
+++ b/www/addons/mod/glossary/lang/lt.json
@@ -1,13 +1,13 @@
 {
     "attachment": "Priedas",
-    "browsemode": "Peržiūrėti įrašus",
+    "browsemode": "Peržiūros režimas",
     "byalphabet": "Abėcėlės tvarka",
     "byauthor": "Pagal autorių",
     "bynewestfirst": "Naujausi",
     "byrecentlyupdated": "Neseniai atnaujinti",
     "bysearch": "Paieška",
-    "casesensitive": "Naudoti reguliariąsias išraiškas",
-    "categories": "Kursų kategorijos",
+    "casesensitive": "Didžiųjų ir mažųjų raidžių skyrimas",
+    "categories": "Kategorijos",
     "entrypendingapproval": "Patvirtinti įrašą.",
     "errorloadingentries": "Klaida keliant įrašus.",
     "errorloadingentry": "Klaida įkeliant įrašą.",
diff --git a/www/addons/mod/glossary/lang/nl.json b/www/addons/mod/glossary/lang/nl.json
index 34dd6c4e2b3..a7e834e6b2a 100644
--- a/www/addons/mod/glossary/lang/nl.json
+++ b/www/addons/mod/glossary/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bijlage",
-    "browsemode": "Blader door items",
+    "browsemode": "Probeermodus",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
     "bycategory": "Groepeer per categorie",
@@ -9,7 +9,7 @@
     "bysearch": "Zoek",
     "cannoteditentry": "Kan item niet bewerken",
     "casesensitive": "Gevoeligheid voor hoofd/kleine letters",
-    "categories": "Cursuscategorieën",
+    "categories": "Categorieën",
     "entriestobesynced": "Items niet gesynchroniseerd",
     "entrypendingapproval": "Dit item wacht op goedkeuring.",
     "errorloadingentries": "Fout bij het laden van de items.",
diff --git a/www/addons/mod/glossary/lang/pl.json b/www/addons/mod/glossary/lang/pl.json
index 02879ac416e..dc3225deb6a 100644
--- a/www/addons/mod/glossary/lang/pl.json
+++ b/www/addons/mod/glossary/lang/pl.json
@@ -2,5 +2,5 @@
     "attachment": "Załącznik",
     "browsemode": "Tryb przeglądania",
     "casesensitive": "Uwzględnianie wielkości liter",
-    "categories": "Kategorie kursów"
+    "categories": "Kategorie"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/pt-br.json b/www/addons/mod/glossary/lang/pt-br.json
index 809150ea25e..37cf8ed2dab 100644
--- a/www/addons/mod/glossary/lang/pt-br.json
+++ b/www/addons/mod/glossary/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexo",
-    "browsemode": "Navegar nas entradas",
+    "browsemode": "Prévia",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
@@ -9,7 +9,7 @@
     "bysearch": "Pesquisa",
     "cannoteditentry": "Não é possível editar o item",
     "casesensitive": "Considerar diferenças entre maiúsculas e minúsculas",
-    "categories": "Categorias de Cursos",
+    "categories": "Categorias",
     "entriestobesynced": "Itens a serem sincronizados",
     "entrypendingapproval": "A entrada está pendente de aprovação.",
     "errorloadingentries": "Ocorreu um erro enquanto carregava entradas.",
diff --git a/www/addons/mod/glossary/lang/pt.json b/www/addons/mod/glossary/lang/pt.json
index b1656926f76..c672ec0b9a3 100644
--- a/www/addons/mod/glossary/lang/pt.json
+++ b/www/addons/mod/glossary/lang/pt.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexo",
-    "browsemode": "Ver entradas",
+    "browsemode": "Modo de pré-visualização",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
@@ -9,7 +9,7 @@
     "bysearch": "Pesquisar",
     "cannoteditentry": "Não é possível editar a entrada",
     "casesensitive": "Respeitar maiúsculas/minúsculas",
-    "categories": "Categorias de disciplinas",
+    "categories": "Categorias",
     "entriestobesynced": "Entradas a ser sincronizadas",
     "entrypendingapproval": "Este termo aguarda aprovação.",
     "errorloadingentries": "Ocorreu um erro ao carregar os termos.",
diff --git a/www/addons/mod/glossary/lang/ro.json b/www/addons/mod/glossary/lang/ro.json
index de5cd6451be..18a7e73940c 100644
--- a/www/addons/mod/glossary/lang/ro.json
+++ b/www/addons/mod/glossary/lang/ro.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Atașament",
-    "browsemode": "Căutați în datele introduse",
+    "attachment": "Fişier ataşat",
+    "browsemode": "Mod Căutare",
     "byalphabet": "Alfabetic",
     "byauthor": "Grupare după autor",
     "bynewestfirst": "Cele mai noi sunt dispuse primele",
     "byrecentlyupdated": "Actualizări recente",
     "bysearch": "Căutare",
     "casesensitive": "Senzitivitate caractere",
-    "categories": "Categorii de cursuri",
+    "categories": "Categorii",
     "entrypendingapproval": "Această",
     "errorloadingentries": "A apărut o eroare la încărcarea intrărilor.",
     "errorloadingentry": "A apărut o eroare la încărcarea intrărilor.",
diff --git a/www/addons/mod/glossary/lang/ru.json b/www/addons/mod/glossary/lang/ru.json
index 0436f1b73c4..e92982cb4cb 100644
--- a/www/addons/mod/glossary/lang/ru.json
+++ b/www/addons/mod/glossary/lang/ru.json
@@ -1,10 +1,10 @@
 {
-    "attachment": "Вложение:",
+    "attachment": "Вложение",
     "browsemode": "Режим предпросмотра",
     "byalphabet": "Алфавитно",
     "byauthor": "Группировать по автору",
     "bycategory": "Группировать по категориям",
     "bysearch": "Поиск",
     "casesensitive": "Чувствительность ответа к регистру",
-    "categories": "Категории курсов"
+    "categories": "Категории"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/sv.json b/www/addons/mod/glossary/lang/sv.json
index 749a7157900..3cfa169d56c 100644
--- a/www/addons/mod/glossary/lang/sv.json
+++ b/www/addons/mod/glossary/lang/sv.json
@@ -1,13 +1,13 @@
 {
     "attachment": "Bilaga",
-    "browsemode": "Bläddrar bland poster",
+    "browsemode": "Läge för förhandsgranskning",
     "byalphabet": "Alfabetiskt",
     "byauthor": "Sortera efter författare",
     "bynewestfirst": "Nyaste först",
     "byrecentlyupdated": "Nyligen uppdaterade",
     "bysearch": "Sök",
     "casesensitive": "Stor eller liten bokstav gör  skillnad",
-    "categories": "Kurskategorier",
+    "categories": "Kategorier",
     "entrypendingapproval": "Detta inlägg väntar på godkännande",
     "errorloadingentries": "Ett fel uppstod vid inläsning av inläggen",
     "errorloadingentry": "Ett fel uppstod vid inläsning av inlägget",
diff --git a/www/addons/mod/glossary/lang/tr.json b/www/addons/mod/glossary/lang/tr.json
index 6caf77336cd..6acccdba883 100644
--- a/www/addons/mod/glossary/lang/tr.json
+++ b/www/addons/mod/glossary/lang/tr.json
@@ -2,5 +2,5 @@
     "attachment": "Dosya",
     "browsemode": "Önizleme Modu",
     "casesensitive": "Harf duyarlılığı",
-    "categories": "Kurs Kategorileri"
+    "categories": "Kategoriler"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/zh-cn.json b/www/addons/mod/glossary/lang/zh-cn.json
index 09e23447237..3af5cbb310e 100644
--- a/www/addons/mod/glossary/lang/zh-cn.json
+++ b/www/addons/mod/glossary/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "attachment": "附件",
     "browsemode": "预览模式",
     "casesensitive": "区分大小写字母",
-    "categories": "课程分类"
+    "categories": "类别"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/zh-tw.json b/www/addons/mod/glossary/lang/zh-tw.json
index 0e103895efd..3a604d7d573 100644
--- a/www/addons/mod/glossary/lang/zh-tw.json
+++ b/www/addons/mod/glossary/lang/zh-tw.json
@@ -1,13 +1,13 @@
 {
     "attachment": "附件",
-    "browsemode": "瀏覽條目",
+    "browsemode": "預覽模式",
     "byalphabet": "按字母順序排列",
     "byauthor": "以作者為分群",
     "bynewestfirst": "最新的優先",
     "byrecentlyupdated": "最近的更新",
     "bysearch": "搜尋",
     "casesensitive": "區分字母的大小寫",
-    "categories": "課程類別",
+    "categories": "題目分類",
     "entrypendingapproval": "這個項目已被暫緩核可",
     "errorloadingentries": "載入項目時發生錯誤",
     "errorloadingentry": "載入項目時發生錯誤",
diff --git a/www/addons/mod/label/lang/ca.json b/www/addons/mod/label/lang/ca.json
index bea219e03e2..129eb9e3838 100644
--- a/www/addons/mod/label/lang/ca.json
+++ b/www/addons/mod/label/lang/ca.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiqueta",
-    "taptoview": "Toqueu per veure l'etiqueta."
+    "label": "Etiqueta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/cs.json b/www/addons/mod/label/lang/cs.json
index 023eb441277..b88d433a998 100644
--- a/www/addons/mod/label/lang/cs.json
+++ b/www/addons/mod/label/lang/cs.json
@@ -1,4 +1,3 @@
 {
-    "label": "Popisek",
-    "taptoview": "Klepnutím zobrazíte popisek."
+    "label": "Popisek"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/da.json b/www/addons/mod/label/lang/da.json
index 47be40b82b2..24b44d12e7b 100644
--- a/www/addons/mod/label/lang/da.json
+++ b/www/addons/mod/label/lang/da.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiket",
-    "taptoview": "Tryk her for at se etiketten."
+    "label": "Etiket"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/de.json b/www/addons/mod/label/lang/de.json
index 56e9fe5f2bf..e325b1d3856 100644
--- a/www/addons/mod/label/lang/de.json
+++ b/www/addons/mod/label/lang/de.json
@@ -1,4 +1,3 @@
 {
-    "label": "Textfeld",
-    "taptoview": "Tippen Sie zum Anzeigen des Textfelds"
+    "label": "Textfeld"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/el.json b/www/addons/mod/label/lang/el.json
index c21721e8995..84d54ad2588 100644
--- a/www/addons/mod/label/lang/el.json
+++ b/www/addons/mod/label/lang/el.json
@@ -1,4 +1,3 @@
 {
-    "label": "Ετικέτα",
-    "taptoview": "Πατήστε για να δείτε την ετικέτα."
+    "label": "Ετικέτα"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/es-mx.json b/www/addons/mod/label/lang/es-mx.json
index 3bfae297d67..129eb9e3838 100644
--- a/www/addons/mod/label/lang/es-mx.json
+++ b/www/addons/mod/label/lang/es-mx.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiqueta",
-    "taptoview": "Elija para ver la etiqueta."
+    "label": "Etiqueta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/es.json b/www/addons/mod/label/lang/es.json
index 98f10a47c36..129eb9e3838 100644
--- a/www/addons/mod/label/lang/es.json
+++ b/www/addons/mod/label/lang/es.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiqueta",
-    "taptoview": "Toca para ver la etiqueta."
+    "label": "Etiqueta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/eu.json b/www/addons/mod/label/lang/eu.json
index fd6c915660d..79e176fef92 100644
--- a/www/addons/mod/label/lang/eu.json
+++ b/www/addons/mod/label/lang/eu.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiketa",
-    "taptoview": "Sakatu etiketa ikusteko."
+    "label": "Etiketa"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/fa.json b/www/addons/mod/label/lang/fa.json
index 2299f93f08c..d7f2573312e 100644
--- a/www/addons/mod/label/lang/fa.json
+++ b/www/addons/mod/label/lang/fa.json
@@ -1,3 +1,3 @@
 {
-    "label": "برچسب"
+    "label": "متن"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/fr.json b/www/addons/mod/label/lang/fr.json
index 443dfeea55e..6cf7f110617 100644
--- a/www/addons/mod/label/lang/fr.json
+++ b/www/addons/mod/label/lang/fr.json
@@ -1,4 +1,3 @@
 {
-    "label": "Étiquette",
-    "taptoview": "Tapoter pour voir l'étiquette"
+    "label": "Étiquette"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/he.json b/www/addons/mod/label/lang/he.json
index 817c39b0d05..232aff3b2bf 100644
--- a/www/addons/mod/label/lang/he.json
+++ b/www/addons/mod/label/lang/he.json
@@ -1,4 +1,3 @@
 {
-    "label": "תווית",
-    "taptoview": "הקליקו לצפיה בתווית."
+    "label": "תווית לשאלה מותנית (באנגלית)"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/it.json b/www/addons/mod/label/lang/it.json
index 26998a75f55..473ac682886 100644
--- a/www/addons/mod/label/lang/it.json
+++ b/www/addons/mod/label/lang/it.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etichetta",
-    "taptoview": "Tocca per visualizzare l'etichetta."
+    "label": "Etichetta"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/lt.json b/www/addons/mod/label/lang/lt.json
index 8ad40c27bd6..8aba433e8cd 100644
--- a/www/addons/mod/label/lang/lt.json
+++ b/www/addons/mod/label/lang/lt.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etiketė",
-    "taptoview": "Paspauskite peržiūrėti etiketę."
+    "label": "Žyma"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/nl.json b/www/addons/mod/label/lang/nl.json
index 3213dc6de44..817c10edebe 100644
--- a/www/addons/mod/label/lang/nl.json
+++ b/www/addons/mod/label/lang/nl.json
@@ -1,4 +1,3 @@
 {
-    "label": "Label",
-    "taptoview": "Tik om label te zien."
+    "label": "Label"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/pt-br.json b/www/addons/mod/label/lang/pt-br.json
index 041dadd0a90..fdfc1ff9392 100644
--- a/www/addons/mod/label/lang/pt-br.json
+++ b/www/addons/mod/label/lang/pt-br.json
@@ -1,4 +1,3 @@
 {
-    "label": "Rótulo",
-    "taptoview": "Clique para ver o rótulo"
+    "label": "Rótulo"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/pt.json b/www/addons/mod/label/lang/pt.json
index 3ec99abb8ef..afa1ad09ff3 100644
--- a/www/addons/mod/label/lang/pt.json
+++ b/www/addons/mod/label/lang/pt.json
@@ -1,4 +1,3 @@
 {
-    "label": "Separador",
-    "taptoview": "Clique para ver o separador."
+    "label": "Separador"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ro.json b/www/addons/mod/label/lang/ro.json
index ba27ef2881e..beae1b423cb 100644
--- a/www/addons/mod/label/lang/ro.json
+++ b/www/addons/mod/label/lang/ro.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etichetă",
-    "taptoview": "Apăsați pentru a vedea eticheta."
+    "label": "Etichetă"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/ru.json b/www/addons/mod/label/lang/ru.json
index c146a5c392a..974254476a8 100644
--- a/www/addons/mod/label/lang/ru.json
+++ b/www/addons/mod/label/lang/ru.json
@@ -1,4 +1,3 @@
 {
-    "label": "Пояснение",
-    "taptoview": "Нажмите для просмотра пояснения."
+    "label": "Пояснение"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/sv.json b/www/addons/mod/label/lang/sv.json
index 7921bbf40e4..f695fc848d9 100644
--- a/www/addons/mod/label/lang/sv.json
+++ b/www/addons/mod/label/lang/sv.json
@@ -1,4 +1,3 @@
 {
-    "label": "Etikett",
-    "taptoview": "Tryck här för att visa etiketten."
+    "label": "Etikett"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/zh-tw.json b/www/addons/mod/label/lang/zh-tw.json
index 640fd1a04ca..c1a016fd047 100644
--- a/www/addons/mod/label/lang/zh-tw.json
+++ b/www/addons/mod/label/lang/zh-tw.json
@@ -1,4 +1,3 @@
 {
-    "label": "標籤",
-    "taptoview": "點擊查看標籤"
+    "label": "標籤"
 }
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ar.json b/www/addons/mod/lesson/lang/ar.json
index e314397c4ae..a469b377ab6 100644
--- a/www/addons/mod/lesson/lang/ar.json
+++ b/www/addons/mod/lesson/lang/ar.json
@@ -36,7 +36,7 @@
     "review": "مراجعة",
     "reviewlesson": "مراجعة الدرس",
     "reviewquestionback": "نعم، أرغب في المحاولة ثانياً",
-    "submit": "سلم",
+    "submit": "سلم/قدم",
     "thatsthecorrectanswer": "هذه إجابة صحيحة",
     "thatsthewronganswer": "هذه إجابة خاطئة",
     "timeremaining": "الزمن المتبقى",
diff --git a/www/addons/mod/quiz/lang/fr.json b/www/addons/mod/quiz/lang/fr.json
index a04d3c84f41..5877d4c76d2 100644
--- a/www/addons/mod/quiz/lang/fr.json
+++ b/www/addons/mod/quiz/lang/fr.json
@@ -10,7 +10,7 @@
     "confirmclose": "Une fois la tentative envoyée, vous n'aurez plus la possibilité de modifier vos réponses pour cette tentative.",
     "confirmcontinueoffline": "La tentative n'a pas été synchronisée depuis {{$a}}. Si entretemps vous avez continué cette tentative avec un autre appareil, vous risquez de perdre des données.",
     "confirmleavequizonerror": "Une erreur est survenu lors de l'enregistrement des réponses. Voulez-vous vraiment quitter le test ?",
-    "confirmstart": "Ce test à une limite de temps de {{$a}}. Le temps commencera à être décompté dès le moment où vous commencerez votre tentative, et vous devrez l'envoyer avant la fin du compte à rebours. Voulez-vous commencer maintenant ?",
+    "confirmstart": "Ce test a une limite de temps de {{$a}}. Le temps commencera à être décompté dès le moment où vous commencerez votre tentative, et vous devrez l'envoyer avant la fin du compte à rebours. Voulez-vous commencer maintenant ?",
     "confirmstartheader": "Test avec limite de temps",
     "connectionerror": "Connexion réseau perdue (échec de l'enregistrement automatique).\n\nVeuillez prendre note de toutes les réponses que vous avez saisies sur cette page au cours des quelques dernières minutes, puis essayez de vous reconnecter.\n\nUne fois la connexion rétablie, vos réponses devraient être enregistrées et ce message disparaîtra.",
     "continueattemptquiz": "Continuer la dernière tentative",
diff --git a/www/addons/mod/scorm/lang/ca.json b/www/addons/mod/scorm/lang/ca.json
index a5a5ddadc0d..196c9ad1c08 100644
--- a/www/addons/mod/scorm/lang/ca.json
+++ b/www/addons/mod/scorm/lang/ca.json
@@ -32,7 +32,6 @@
     "highestattempt": "Intent més alt",
     "incomplete": "Incomplet",
     "lastattempt": "Darrer intent completat",
-    "lastsync": "Darrera sincronització",
     "mode": "Mode",
     "newattempt": "Comença un nou intent",
     "noattemptsallowed": "Nombre d'intents permesos",
diff --git a/www/addons/mod/scorm/lang/cs.json b/www/addons/mod/scorm/lang/cs.json
index e69a107f5c0..533ab1989ac 100644
--- a/www/addons/mod/scorm/lang/cs.json
+++ b/www/addons/mod/scorm/lang/cs.json
@@ -32,7 +32,6 @@
     "highestattempt": "Nejlepší pokus",
     "incomplete": "Nedokončeno",
     "lastattempt": "Poslední pokus",
-    "lastsync": "Poslední synchronizace",
     "mode": "Režim",
     "newattempt": "Začít nový pokus",
     "noattemptsallowed": "Počet povolených pokusů",
diff --git a/www/addons/mod/scorm/lang/da.json b/www/addons/mod/scorm/lang/da.json
index 8350d1e752d..b87612d58d4 100644
--- a/www/addons/mod/scorm/lang/da.json
+++ b/www/addons/mod/scorm/lang/da.json
@@ -32,7 +32,6 @@
     "highestattempt": "Højeste forsøg",
     "incomplete": "Ukomplet",
     "lastattempt": "Sidste fuldførte forsøg",
-    "lastsync": "Sidste synkronisering",
     "mode": "Tilstand",
     "newattempt": "Prøv et nyt forsøg",
     "noattemptsallowed": "Antal tilladte forsøg",
diff --git a/www/addons/mod/scorm/lang/de.json b/www/addons/mod/scorm/lang/de.json
index 3c08cd38a20..f9c2cd8d027 100644
--- a/www/addons/mod/scorm/lang/de.json
+++ b/www/addons/mod/scorm/lang/de.json
@@ -32,7 +32,6 @@
     "highestattempt": "Bester Versuch",
     "incomplete": "Unvollständig",
     "lastattempt": "Letzter vollständiger Versuch",
-    "lastsync": "Letztes Synchronisieren",
     "mode": "Einstellung",
     "newattempt": "Neuen Versuch beginnen",
     "noattemptsallowed": "Zahl zulässiger Versuche",
diff --git a/www/addons/mod/scorm/lang/el.json b/www/addons/mod/scorm/lang/el.json
index d68f024cfa9..a819301fbee 100644
--- a/www/addons/mod/scorm/lang/el.json
+++ b/www/addons/mod/scorm/lang/el.json
@@ -32,7 +32,6 @@
     "highestattempt": "Υψηλότερη βαθμολογία",
     "incomplete": "Μη ολοκληρωμένο",
     "lastattempt": "Τελευταία προσπάθεια",
-    "lastsync": "Τελευταίος συγχρονισμός",
     "mode": "Φάση",
     "newattempt": "Έναρξη νέας προσπάθειας",
     "noattemptsallowed": "Επιτρεπόμενος αριθμός προσπαθειών",
diff --git a/www/addons/mod/scorm/lang/es-mx.json b/www/addons/mod/scorm/lang/es-mx.json
index 0975f01dfc7..2c72808a5b1 100644
--- a/www/addons/mod/scorm/lang/es-mx.json
+++ b/www/addons/mod/scorm/lang/es-mx.json
@@ -32,7 +32,6 @@
     "highestattempt": "Intento más alto",
     "incomplete": "Incompleto",
     "lastattempt": "Último intento",
-    "lastsync": "Ultima sincronización",
     "mode": "Moda",
     "newattempt": "Comenzar un nuevo intento",
     "noattemptsallowed": "Número de intentos permitidos",
diff --git a/www/addons/mod/scorm/lang/es.json b/www/addons/mod/scorm/lang/es.json
index 83baeb100e5..518b5cf6da7 100644
--- a/www/addons/mod/scorm/lang/es.json
+++ b/www/addons/mod/scorm/lang/es.json
@@ -32,7 +32,6 @@
     "highestattempt": "Intento más alto",
     "incomplete": "Incompleto",
     "lastattempt": "Último intento",
-    "lastsync": "Última sincronización",
     "mode": "Moda",
     "newattempt": "Comenzar un nuevo intento",
     "noattemptsallowed": "Número de intentos permitidos",
diff --git a/www/addons/mod/scorm/lang/eu.json b/www/addons/mod/scorm/lang/eu.json
index f595303bee9..d6315ef6681 100644
--- a/www/addons/mod/scorm/lang/eu.json
+++ b/www/addons/mod/scorm/lang/eu.json
@@ -32,7 +32,6 @@
     "highestattempt": "Saiakera altuena",
     "incomplete": "Osatu gabea",
     "lastattempt": "Osatutako azken saiakera",
-    "lastsync": "Azken sinkronizazioa",
     "mode": "Modua",
     "newattempt": "Saiakera berria hasi",
     "noattemptsallowed": "Baimendutako saiakera-kopurua",
diff --git a/www/addons/mod/scorm/lang/fr.json b/www/addons/mod/scorm/lang/fr.json
index 8dbfe8172ba..5798f9a67eb 100644
--- a/www/addons/mod/scorm/lang/fr.json
+++ b/www/addons/mod/scorm/lang/fr.json
@@ -32,7 +32,6 @@
     "highestattempt": "Meilleure tentative",
     "incomplete": "Incomplet",
     "lastattempt": "Dernière tentative terminée",
-    "lastsync": "Dernière synchronisation",
     "mode": "Mode",
     "newattempt": "Commencer une nouvelle tentative",
     "noattemptsallowed": "Nombre de tentatives permises",
diff --git a/www/addons/mod/scorm/lang/it.json b/www/addons/mod/scorm/lang/it.json
index c5f5df6f781..8556f3bf7ab 100644
--- a/www/addons/mod/scorm/lang/it.json
+++ b/www/addons/mod/scorm/lang/it.json
@@ -32,7 +32,6 @@
     "highestattempt": "Tentativo migliore",
     "incomplete": "Incompleto",
     "lastattempt": "Ultimo tentativo completato",
-    "lastsync": "Sincronizzazione più recente",
     "mode": "Modalità",
     "newattempt": "Avvia un nuovo tentativo",
     "noattemptsallowed": "Numero di tentativi consentito",
diff --git a/www/addons/mod/scorm/lang/lt.json b/www/addons/mod/scorm/lang/lt.json
index 0ea8a51a742..5ff4711bf91 100644
--- a/www/addons/mod/scorm/lang/lt.json
+++ b/www/addons/mod/scorm/lang/lt.json
@@ -32,7 +32,6 @@
     "highestattempt": "Aukščiausiai įvertintas bandymas",
     "incomplete": "Neužbaigta",
     "lastattempt": "Paskutinis bandymas",
-    "lastsync": "Paskutinė sinchronizacija",
     "mode": "Režimas",
     "newattempt": "Pradėti naują bandymą",
     "noattemptsallowed": "Leidžiamų bandymų skaičius",
diff --git a/www/addons/mod/scorm/lang/nl.json b/www/addons/mod/scorm/lang/nl.json
index f9339060c67..0a418c7071f 100644
--- a/www/addons/mod/scorm/lang/nl.json
+++ b/www/addons/mod/scorm/lang/nl.json
@@ -32,7 +32,6 @@
     "highestattempt": "Beste poging",
     "incomplete": "Onvolledig",
     "lastattempt": "Laatste voltooide poging",
-    "lastsync": "Laatste synchronisatie",
     "mode": "Modus",
     "newattempt": "Begin een nieuwe poging",
     "noattemptsallowed": "Aantal toegelaten pogingen",
diff --git a/www/addons/mod/scorm/lang/pt-br.json b/www/addons/mod/scorm/lang/pt-br.json
index 31fc512e9df..458dcebee2a 100644
--- a/www/addons/mod/scorm/lang/pt-br.json
+++ b/www/addons/mod/scorm/lang/pt-br.json
@@ -32,7 +32,6 @@
     "highestattempt": "Tentativa mais alta",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa",
-    "lastsync": "Última sincronização",
     "mode": "Modalidade",
     "newattempt": "Começar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
diff --git a/www/addons/mod/scorm/lang/pt.json b/www/addons/mod/scorm/lang/pt.json
index 1486e4694ea..b3539194c48 100644
--- a/www/addons/mod/scorm/lang/pt.json
+++ b/www/addons/mod/scorm/lang/pt.json
@@ -32,7 +32,6 @@
     "highestattempt": "Tentativa com melhor nota",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa concluída",
-    "lastsync": "Última sincronização",
     "mode": "Modo",
     "newattempt": "Iniciar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
diff --git a/www/addons/mod/scorm/lang/ro.json b/www/addons/mod/scorm/lang/ro.json
index d8aa28568ff..24087ff80da 100644
--- a/www/addons/mod/scorm/lang/ro.json
+++ b/www/addons/mod/scorm/lang/ro.json
@@ -30,7 +30,6 @@
     "highestattempt": "Cea mai completă încercare de parcurgere",
     "incomplete": "Incomplet",
     "lastattempt": "Ultima încercare de parcurgere",
-    "lastsync": "Ultima sincronizare",
     "mode": "Mod",
     "newattempt": "Începe o nouă încercare de parcurgere",
     "noattemptsallowed": "Numărul de încercări permise",
diff --git a/www/addons/mod/scorm/lang/ru.json b/www/addons/mod/scorm/lang/ru.json
index 82a27dc1caa..2cc8016e9c1 100644
--- a/www/addons/mod/scorm/lang/ru.json
+++ b/www/addons/mod/scorm/lang/ru.json
@@ -25,7 +25,6 @@
     "highestattempt": "Лучшая попытка",
     "incomplete": "Не завершено",
     "lastattempt": "Завершена последняя попытка",
-    "lastsync": "Последняя синхронизация",
     "mode": "Режим",
     "newattempt": "Начать новую попытку",
     "noattemptsallowed": "Количество попыток",
diff --git a/www/addons/mod/scorm/lang/sv.json b/www/addons/mod/scorm/lang/sv.json
index 39178a38f12..6cbde1646b4 100644
--- a/www/addons/mod/scorm/lang/sv.json
+++ b/www/addons/mod/scorm/lang/sv.json
@@ -32,7 +32,6 @@
     "highestattempt": "Högsta försöket",
     "incomplete": "Inte komplett",
     "lastattempt": "Senaste försöket",
-    "lastsync": "Senaste synkronisering",
     "mode": "Läge",
     "newattempt": "Påbörja ett nytt försök",
     "noattemptsallowed": "Antal tillåtna försök",
diff --git a/www/addons/mod/scorm/lang/tr.json b/www/addons/mod/scorm/lang/tr.json
index f27a342aa68..244c50c5460 100644
--- a/www/addons/mod/scorm/lang/tr.json
+++ b/www/addons/mod/scorm/lang/tr.json
@@ -22,7 +22,6 @@
     "highestattempt": "En yüksek uygulama",
     "incomplete": "Tamamlanmadı",
     "lastattempt": "Son uygulama",
-    "lastsync": "Son senkronizasyon",
     "mode": "Mod",
     "newattempt": "Yeni bir uygulama başlat",
     "noattemptsallowed": "İzin verilen uygulama sayısı",
diff --git a/www/addons/mod/scorm/lang/zh-tw.json b/www/addons/mod/scorm/lang/zh-tw.json
index f2d8044e8c4..ec476e126b9 100644
--- a/www/addons/mod/scorm/lang/zh-tw.json
+++ b/www/addons/mod/scorm/lang/zh-tw.json
@@ -32,7 +32,6 @@
     "highestattempt": "最高使用次數",
     "incomplete": "不完整",
     "lastattempt": "最後完成的作答次",
-    "lastsync": "最後的同步",
     "mode": "模式",
     "newattempt": "開始新的使用",
     "noattemptsallowed": "允許作答的次數",
diff --git a/www/addons/mod/survey/lang/ar.json b/www/addons/mod/survey/lang/ar.json
index dd271b759c7..30dd1d2fed3 100644
--- a/www/addons/mod/survey/lang/ar.json
+++ b/www/addons/mod/survey/lang/ar.json
@@ -2,5 +2,5 @@
     "ifoundthat": "وجدت أن",
     "ipreferthat": "أفضل أن",
     "responses": "إجابات",
-    "results": "النتائج"
+    "results": "نتائج"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/ja.json b/www/addons/mod/survey/lang/ja.json
index 9880b35045a..f95e9e8cf86 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.json
@@ -2,6 +2,6 @@
     "ifoundthat": "私は次のことを発見しました:",
     "ipreferthat": "私は次のことが好きです:",
     "responses": "回答",
-    "results": "結果",
+    "results": "受験結果",
     "surveycompletednograph": "あなたはこの調査を完了しました。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/pl.json b/www/addons/mod/survey/lang/pl.json
index 3b9a9921b72..cc6f6480b61 100644
--- a/www/addons/mod/survey/lang/pl.json
+++ b/www/addons/mod/survey/lang/pl.json
@@ -2,6 +2,6 @@
     "ifoundthat": "Stwierdziłem, że",
     "ipreferthat": "Wolę to",
     "responses": "Odpowiedzi",
-    "results": "Wynik",
+    "results": "Wyniki",
     "surveycompletednograph": "Już wypełniłeś tą ankietę."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ar.json b/www/addons/mod/wiki/lang/ar.json
index 1bff5b0f91c..794020d3f62 100644
--- a/www/addons/mod/wiki/lang/ar.json
+++ b/www/addons/mod/wiki/lang/ar.json
@@ -6,7 +6,7 @@
     "newpagetitle": "عنواو صفحة جديد",
     "nocontent": "لا يوجد محتوى في هذه الصفحة",
     "notingroup": "لا ينتمي إلى مجموعة",
-    "page": "صفحة",
+    "page": "صفحة: {{$a}}",
     "pagename": "اسم الصفحة",
     "wrongversionlock": "قام مستخدم آخر بتحديث هذه الصفحة بينما كنت أنت تحررها، أصبحت تعديلاتك قديمة."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/bg.json b/www/addons/mod/wiki/lang/bg.json
index dbe95df13e3..cfe93c0370e 100644
--- a/www/addons/mod/wiki/lang/bg.json
+++ b/www/addons/mod/wiki/lang/bg.json
@@ -4,8 +4,8 @@
     "editingpage": "Редактиране на страница \"{{$a}}\"",
     "map": "Карта",
     "newpagetitle": "Заглавие на новата страница",
-    "notingroup": "Извинете, но трябва да сте част от групата за да видите тази дейност.",
-    "page": "Страница",
+    "notingroup": "За съжаление Вие трябва да се част от група за да виждате този форум.",
+    "page": "Страница: {{$a}}",
     "pagename": "Име на страница",
     "wrongversionlock": "Друг потребител редактира тази страница докато Вие редактирахте и Вашата редакция вече е остаряла."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ca.json b/www/addons/mod/wiki/lang/ca.json
index b827bb47066..fb0c7bfab1e 100644
--- a/www/addons/mod/wiki/lang/ca.json
+++ b/www/addons/mod/wiki/lang/ca.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Títol de la pàgina nova",
     "nocontent": "No hi ha contingut per a aquesta pàgina",
     "notingroup": "No en grup",
-    "page": "Pàgina",
+    "page": "Pàgina: {{$a}}",
     "pageexists": "Aquesta pàgina ja existeix.",
     "pagename": "Nom de la pàgina",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/cs.json b/www/addons/mod/wiki/lang/cs.json
index 89723ca1da7..052676bb598 100644
--- a/www/addons/mod/wiki/lang/cs.json
+++ b/www/addons/mod/wiki/lang/cs.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nový název stránky",
     "nocontent": "Pro tuto stránku není obsah",
     "notingroup": "Není ve skupině",
-    "page": "Stránka",
+    "page": "Stránka: {{$a}}",
     "pageexists": "Tato stránka již existuje.",
     "pagename": "Název stránky",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/da.json b/www/addons/mod/wiki/lang/da.json
index 9b83d403406..c888f404157 100644
--- a/www/addons/mod/wiki/lang/da.json
+++ b/www/addons/mod/wiki/lang/da.json
@@ -8,7 +8,7 @@
     "newpagetitle": "Ny sidetitel",
     "nocontent": "Der er intet indhold til denne side",
     "notingroup": "Ikke i gruppe",
-    "page": "Side",
+    "page": "Side: {{$a}}",
     "pageexists": "Denne side findes allerede.",
     "pagename": "Sidenavn",
     "subwiki": "Underwiki",
diff --git a/www/addons/mod/wiki/lang/de.json b/www/addons/mod/wiki/lang/de.json
index 7bb8187eaff..6fe1fc4dba9 100644
--- a/www/addons/mod/wiki/lang/de.json
+++ b/www/addons/mod/wiki/lang/de.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titel für neue Seite\n",
     "nocontent": "Kein Inhalt auf dieser Seite",
     "notingroup": "Nicht in Gruppen",
-    "page": "Seite",
+    "page": "Seite: {{$a}}",
     "pageexists": "Diese Seite existiert bereits.",
     "pagename": "Seitenname",
     "subwiki": "Teilwiki",
diff --git a/www/addons/mod/wiki/lang/el.json b/www/addons/mod/wiki/lang/el.json
index 801399e1135..8eec41f7ee2 100644
--- a/www/addons/mod/wiki/lang/el.json
+++ b/www/addons/mod/wiki/lang/el.json
@@ -2,8 +2,8 @@
     "errorloadingpage": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της σελίδας.",
     "errornowikiavailable": "Αυτό το wiki δεν έχει ακόμα περιεχόμενο.",
     "gowikihome": "Go Wiki home",
-    "notingroup": "Συγνώμη, αλλά θα πρέπει να είστε μέλος μιας ομάδας για να δείτε αυτήν τη δραστηριότητα",
-    "page": "Σελίδα",
+    "notingroup": "Συγγνώμη, αλλά πρέπει να είστε μέλος ομάδας για να δείτε αυτό την ομάδα συζητήσεων.",
+    "page": "Σελίδα: {{$a}}",
     "subwiki": "Subwiki",
     "titleshouldnotbeempty": "Ο τίτλος δεν πρέπει να είναι κενός",
     "viewpage": "Δείτε τη σελίδα",
diff --git a/www/addons/mod/wiki/lang/es-mx.json b/www/addons/mod/wiki/lang/es-mx.json
index cbd65b371f9..5a53592ed79 100644
--- a/www/addons/mod/wiki/lang/es-mx.json
+++ b/www/addons/mod/wiki/lang/es-mx.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Título nuevo de la página",
     "nocontent": "No hay contenido para esta página",
     "notingroup": "No está en un grupo",
-    "page": "Página",
+    "page": "Página: {{$a}}",
     "pageexists": "Esta página ya existe.",
     "pagename": "Nombre de página",
     "subwiki": "Sub-wiki",
diff --git a/www/addons/mod/wiki/lang/es.json b/www/addons/mod/wiki/lang/es.json
index b31f110029b..3bbe24f3157 100644
--- a/www/addons/mod/wiki/lang/es.json
+++ b/www/addons/mod/wiki/lang/es.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Título nuevo de la página",
     "nocontent": "No hay contenido para esta página",
     "notingroup": "No está en un grupo",
-    "page": "Página",
+    "page": "Página: {{$a}}",
     "pageexists": "Esta página ya existe.",
     "pagename": "Nombre de la página",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/eu.json b/www/addons/mod/wiki/lang/eu.json
index dee4d7b3f1e..f6b07f7639d 100644
--- a/www/addons/mod/wiki/lang/eu.json
+++ b/www/addons/mod/wiki/lang/eu.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Orri berriaren izenburua",
     "nocontent": "Ez dago edukirik orri honetarako",
     "notingroup": "Ez dago taldean",
-    "page": "Orria",
+    "page": "Orria: {{$a}}",
     "pageexists": "Orri hau badago dagoeneko.",
     "pagename": "Orriaren izena",
     "subwiki": "Azpiwikia",
diff --git a/www/addons/mod/wiki/lang/fa.json b/www/addons/mod/wiki/lang/fa.json
index 3ea0f81b588..645adbdab85 100644
--- a/www/addons/mod/wiki/lang/fa.json
+++ b/www/addons/mod/wiki/lang/fa.json
@@ -5,7 +5,7 @@
     "newpagetitle": "عنوان صفحهٔ جدید",
     "nocontent": "محتوایی برای این صفحه وجود ندارد",
     "notingroup": "بدون گروه",
-    "page": "صفحه",
+    "page": "صفحهٔ {{$a}}",
     "pageexists": "این صفحه در حال حاضر وجود دارد. در حال تغییر مسیر به صفحهٔ موجود.",
     "viewpage": "مشاهدهٔ صفحه",
     "wrongversionlock": "هنگامی که شما در حال ویرایش این صفحه بودید، کاربر دیگری آن را ویرایش کرد و محتوایش را تغییر داد."
diff --git a/www/addons/mod/wiki/lang/fr.json b/www/addons/mod/wiki/lang/fr.json
index 3d4ff31273f..e18eeba1d13 100644
--- a/www/addons/mod/wiki/lang/fr.json
+++ b/www/addons/mod/wiki/lang/fr.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titre de la nouvelle page",
     "nocontent": "Cette page n'a pas de contenu",
     "notingroup": "Pas dans le groupe",
-    "page": "Page",
+    "page": "Page : {{$a}}",
     "pageexists": "Cette page existe déjà.",
     "pagename": "Nom de page",
     "subwiki": "Sous-wiki",
diff --git a/www/addons/mod/wiki/lang/he.json b/www/addons/mod/wiki/lang/he.json
index 46bd85d687c..6d94870a86a 100644
--- a/www/addons/mod/wiki/lang/he.json
+++ b/www/addons/mod/wiki/lang/he.json
@@ -7,7 +7,7 @@
     "newpagetitle": "כותרת דף חדש",
     "nocontent": "אין תוכן לדף זה",
     "notingroup": "לא בקבוצה",
-    "page": "עמוד",
+    "page": "עמוד: {{$a}}",
     "pageexists": "הדף כבר קיים. הפנה אליו מחדש.",
     "pagename": "שם העמוד",
     "wrongversionlock": "משתמש אחר ערך את הדף הזה בזמן שאת/ה ערכת/ה. התוכן שלך לא ישמר."
diff --git a/www/addons/mod/wiki/lang/hu.json b/www/addons/mod/wiki/lang/hu.json
index 19b98951ec9..52eb1a43078 100644
--- a/www/addons/mod/wiki/lang/hu.json
+++ b/www/addons/mod/wiki/lang/hu.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Új oldalcím",
     "nocontent": "Az oldalhoz nincs tartalom",
     "notingroup": "Nem része a csoportnak",
-    "page": "Oldal",
+    "page": "Oldal: {{$a}}",
     "pageexists": "Az oldal már létezik. Átirányítás az oldalra.",
     "pagename": "Oldal neve",
     "wrongversionlock": "A szerkesztés közben egy másik felhasználó szerkesztette ezt az oldalt, így az Ön tartalma elavult."
diff --git a/www/addons/mod/wiki/lang/it.json b/www/addons/mod/wiki/lang/it.json
index 5acbfeed47e..188539ca68d 100644
--- a/www/addons/mod/wiki/lang/it.json
+++ b/www/addons/mod/wiki/lang/it.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titolo nuova pagina",
     "nocontent": "Questa pagina non ha contenuti",
     "notingroup": "Non è in un gruppo",
-    "page": "Pagina",
+    "page": "Pagina: {{$a}}",
     "pageexists": "La pagina esiste già.",
     "pagename": "Nome pagina",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/ja.json b/www/addons/mod/wiki/lang/ja.json
index fbfaad517e5..411c7bf9444 100644
--- a/www/addons/mod/wiki/lang/ja.json
+++ b/www/addons/mod/wiki/lang/ja.json
@@ -7,7 +7,7 @@
     "newpagetitle": "新しいページタイトル",
     "nocontent": "このページにはコンテンツがありません。",
     "notingroup": "グループ外",
-    "page": "ページ",
+    "page": "ページ: {{$a}}",
     "pageexists": "このページはすでに存在します。",
     "pagename": "ページ名",
     "wrongversionlock": "あなたが編集している間、別のユーザがこのページを編集しました。そのため、あなたのコンテンツは古くなりました。"
diff --git a/www/addons/mod/wiki/lang/lt.json b/www/addons/mod/wiki/lang/lt.json
index 52f7834015f..7523e9211c2 100644
--- a/www/addons/mod/wiki/lang/lt.json
+++ b/www/addons/mod/wiki/lang/lt.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Naujo puslapio pavadinimas",
     "nocontent": "Nėra šio puslapio turinio",
     "notingroup": "Nėra grupėje",
-    "page": "Puslapis",
+    "page": "Puslapis: {{$a}}",
     "pageexists": "Šis puslapis jau yra.",
     "pagename": "Puslapio pavadinimas",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/nl.json b/www/addons/mod/wiki/lang/nl.json
index 2d4ec194f27..de4427ee53d 100644
--- a/www/addons/mod/wiki/lang/nl.json
+++ b/www/addons/mod/wiki/lang/nl.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nieuwe paginatitel",
     "nocontent": "Er is geen inhoud voor deze pagina",
     "notingroup": "Niet in groep",
-    "page": "Pagina",
+    "page": "Pagina: {{$a}}",
     "pageexists": "Deze pagina bestaat al.",
     "pagename": "Paginanaam",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/pl.json b/www/addons/mod/wiki/lang/pl.json
index 8515710e26a..391b0fbc350 100644
--- a/www/addons/mod/wiki/lang/pl.json
+++ b/www/addons/mod/wiki/lang/pl.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Tytuł nowej strony",
     "nocontent": "Brak zawartości dla tej strony",
     "notingroup": "Nie w grupie",
-    "page": "Strona",
+    "page": "Strona: {{$a}}",
     "pageexists": "Ta strona już istnieje. Przekierowuje do niej.",
     "pagename": "Nazwa strony",
     "wrongversionlock": "Inny użytkownik edytował tę stronę w czasie, kiedy ty ją edytowałeś i twoja zawartość jest przestarzała."
diff --git a/www/addons/mod/wiki/lang/pt-br.json b/www/addons/mod/wiki/lang/pt-br.json
index 6c2036aa656..710e219e39c 100644
--- a/www/addons/mod/wiki/lang/pt-br.json
+++ b/www/addons/mod/wiki/lang/pt-br.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Novo título da página",
     "nocontent": "Não existe conteúdo para esta página",
     "notingroup": "Não existe no grupo",
-    "page": "Página",
+    "page": "Página: {{$a}}",
     "pageexists": "Esta página já existe. Redirecionado para ela.",
     "pagename": "Nome da página",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/pt.json b/www/addons/mod/wiki/lang/pt.json
index 83154bc5718..21749d0a238 100644
--- a/www/addons/mod/wiki/lang/pt.json
+++ b/www/addons/mod/wiki/lang/pt.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Novo título da página",
     "nocontent": "Não há nenhum conteúdo nesta página",
     "notingroup": "Não está em nenhum grupo",
-    "page": "Página",
+    "page": "Página: {{$a}}",
     "pageexists": "Esta página já existe.",
     "pagename": "Nome da página",
     "subwiki": "SubWiki",
diff --git a/www/addons/mod/wiki/lang/ro.json b/www/addons/mod/wiki/lang/ro.json
index 79fdc396e4f..2b0c326bec6 100644
--- a/www/addons/mod/wiki/lang/ro.json
+++ b/www/addons/mod/wiki/lang/ro.json
@@ -5,7 +5,7 @@
     "newpagehdr": "Pagină nouă",
     "newpagetitle": "Un nou titlu de pagină",
     "nocontent": "Nu există conținut pentru această pagină",
-    "notingroup": "Ne pare rău, dar trebuie să faceţi parte dintr-un grup pentru a putea vizualiza această activitate.",
-    "page": "Pagină",
+    "notingroup": "Ne pare rău, pentru a putea vizualiza acest forum trebuie să fiţi membru al unui grup.",
+    "page": "Pagina {{$a}}",
     "pagename": "Nume pagină"
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ru.json b/www/addons/mod/wiki/lang/ru.json
index d1aad170e59..efca795f742 100644
--- a/www/addons/mod/wiki/lang/ru.json
+++ b/www/addons/mod/wiki/lang/ru.json
@@ -9,7 +9,7 @@
     "newpagetitle": "Заголовок новой страницы",
     "nocontent": "Нет содержимого у этой страницы",
     "notingroup": "Не в группе",
-    "page": "Страница",
+    "page": "Страница: {{$a}}",
     "pageexists": "Такая страница уже существует.",
     "pagename": "Название страницы",
     "titleshouldnotbeempty": "Заголовок не должен быть пустым",
diff --git a/www/addons/mod/wiki/lang/sv.json b/www/addons/mod/wiki/lang/sv.json
index f9ebf16c762..43bd89b4601 100644
--- a/www/addons/mod/wiki/lang/sv.json
+++ b/www/addons/mod/wiki/lang/sv.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Ny titel på sida",
     "nocontent": "Det finns inget innehåll för den här sidan",
     "notingroup": "Inte i grupp",
-    "page": "Sida",
+    "page": "Sida:  {{$a}}",
     "pageexists": "Den här sidan finns redan, länkning dit pågår",
     "pagename": "Namn på sida",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/tr.json b/www/addons/mod/wiki/lang/tr.json
index 8ddfdfd95b3..f1167632e26 100644
--- a/www/addons/mod/wiki/lang/tr.json
+++ b/www/addons/mod/wiki/lang/tr.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Yeni sayfa başlığı",
     "nocontent": "Bu sayfa için içerik yok",
     "notingroup": "Grupta değil",
-    "page": "Sayfa",
+    "page": "Sayfa: {{$a}}",
     "pageexists": "Bu sayfa zaten var.",
     "pagename": "Sayfa adı",
     "wrongversionlock": "Başka bir kullanıcı sizin düzenlemeniz sırasında bu sayfayı düzenledi ve içeriğiniz geçersiz."
diff --git a/www/addons/mod/wiki/lang/zh-cn.json b/www/addons/mod/wiki/lang/zh-cn.json
index 1eb2563a117..4c35a760a4e 100644
--- a/www/addons/mod/wiki/lang/zh-cn.json
+++ b/www/addons/mod/wiki/lang/zh-cn.json
@@ -7,7 +7,7 @@
     "newpagetitle": "新页面标题",
     "nocontent": "此页面无内容",
     "notingroup": "不在小组内",
-    "page": "页",
+    "page": "页面：{{$a}}",
     "pageexists": "页面已存在。重定向到它",
     "pagename": "页码",
     "wrongversionlock": "在您正编辑此页面时，另一个人已经做了编辑，所以您的修改已过时。"
diff --git a/www/addons/mod/wiki/lang/zh-tw.json b/www/addons/mod/wiki/lang/zh-tw.json
index 14abc591524..4b5e9affdde 100644
--- a/www/addons/mod/wiki/lang/zh-tw.json
+++ b/www/addons/mod/wiki/lang/zh-tw.json
@@ -10,7 +10,7 @@
     "newpagetitle": "新頁面標題",
     "nocontent": "在這一頁裡沒有內容",
     "notingroup": "不在群體",
-    "page": "分頁",
+    "page": "頁面：{{$a}}",
     "pageexists": "這頁面已經存在。",
     "pagename": "頁面名稱",
     "subwiki": "Subwiki",
diff --git a/www/addons/myoverview/lang/cs.json b/www/addons/myoverview/lang/cs.json
index c09c509e2a5..6ea2733a682 100644
--- a/www/addons/myoverview/lang/cs.json
+++ b/www/addons/myoverview/lang/cs.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "Probíhá",
-    "nocourses": "Žádné dostupné informace o kurzech",
-    "pluginname": "Název repozitáře"
+    "future": "Budoucí",
+    "inprogress": "Probíhající",
+    "morecourses": "Další kurzy",
+    "next30days": "Následujících 30 dní",
+    "next7days": "Následujících 7 dní",
+    "nocourses": "Žádné kurzy",
+    "nocoursesfuture": "Žádné budoucí kurzy",
+    "nocoursesinprogress": "Žádné probíhající kurzy",
+    "nocoursespast": "Žádné minulé kurzy",
+    "noevents": "Žádné nadcházející činnosti",
+    "past": "Minulé",
+    "pluginname": "Přehled kurzů",
+    "recentlyoverdue": "Nedávno zpožděné",
+    "sortbycourses": "Řadit podle kurzů",
+    "sortbydates": "Řadit podle data",
+    "timeline": "Časová osa"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/de.json b/www/addons/myoverview/lang/de.json
index a8ecb7e9d63..5eeb1d65140 100644
--- a/www/addons/myoverview/lang/de.json
+++ b/www/addons/myoverview/lang/de.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "In Bearbeitung",
-    "nocourses": "Keine Kursinformationen",
-    "pluginname": "Name des Plugins"
+    "future": "Künftig",
+    "inprogress": "Laufend",
+    "morecourses": "Weitere Kurse",
+    "next30days": "Nächste 30 Tage",
+    "next7days": "Nächste 7 Tage",
+    "nocourses": "Keine Kurse",
+    "nocoursesfuture": "Keine künftigen Kurse",
+    "nocoursesinprogress": "Keine laufenden Kurse",
+    "nocoursespast": "Keine vergangenen Kurse",
+    "noevents": "Keine anstehenden Aktivitäten fällig",
+    "past": "Vergangen",
+    "pluginname": "Kursübersicht",
+    "recentlyoverdue": "Kürzlich überfällig",
+    "sortbycourses": "Nach Kurs sortieren",
+    "sortbydates": "Nach Datum sortieren",
+    "timeline": "Timeline"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/es-mx.json b/www/addons/myoverview/lang/es-mx.json
index 779472c9cfd..bc4930a6622 100644
--- a/www/addons/myoverview/lang/es-mx.json
+++ b/www/addons/myoverview/lang/es-mx.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "En curso",
-    "nocourses": "No hay información del curso para mostrar.",
-    "pluginname": "Nombre del plugin del repositorio"
+    "future": "Futuro",
+    "inprogress": "En progreso",
+    "morecourses": "Más cursos",
+    "next30days": "Siguientes 30 días",
+    "next7days": "Siguientes 7 días",
+    "nocourses": "Ningun curso",
+    "nocoursesfuture": "Sin cursos futuros",
+    "nocoursesinprogress": "Ningun curso en progreso",
+    "nocoursespast": "Sin cursos pasados",
+    "noevents": "No hay actividades próximas pendientes",
+    "past": "Pasado",
+    "pluginname": "Vista general del curso",
+    "recentlyoverdue": "Recientemente atrasado",
+    "sortbycourses": "Ordenar por cursos",
+    "sortbydates": "Ordenar por fechas",
+    "timeline": "Línea de tiempo"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/es.json b/www/addons/myoverview/lang/es.json
index e3cd26f006e..b796e0b88b4 100644
--- a/www/addons/myoverview/lang/es.json
+++ b/www/addons/myoverview/lang/es.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "En curso",
-    "nocourses": "No hay información del curso para mostrar.",
-    "pluginname": "Nombre de la extensión de repositorio"
+    "future": "Futuro",
+    "inprogress": "En progreso",
+    "morecourses": "Más cursos",
+    "next30days": "Próximos 30 días",
+    "next7days": "Próximos 7 días",
+    "nocourses": "Sin cursos",
+    "nocoursesfuture": "Sin cursos futuros",
+    "nocoursesinprogress": "Sin cursos en progreso",
+    "nocoursespast": "Sin cursos pasados",
+    "noevents": "No hay actividades próximas pendientes",
+    "past": "Pasado",
+    "pluginname": "Vista general de curso",
+    "recentlyoverdue": "Recientemente vencidas",
+    "sortbycourses": "Ordenar por curso",
+    "sortbydates": "Ordenar por fecha",
+    "timeline": "Línea de tiempo"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/eu.json b/www/addons/myoverview/lang/eu.json
index a63a4669460..63ad1570d13 100644
--- a/www/addons/myoverview/lang/eu.json
+++ b/www/addons/myoverview/lang/eu.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "Ari da",
-    "nocourses": "Ez dago ikastaroei buruzko informaziorik",
-    "pluginname": "Biltegi-pluginaren izena"
+    "future": "Etorkizunean",
+    "inprogress": "Martxan",
+    "morecourses": "Ikastaro gehiago",
+    "next30days": "Datozen 30 egunetan",
+    "next7days": "Datozen 7 egunetan",
+    "nocourses": "Ez dago ikastarorik",
+    "nocoursesfuture": "Ez dago ikastarorik etorkizunean",
+    "nocoursesinprogress": "",
+    "nocoursespast": "Ez dago ikastarorik iraganean",
+    "noevents": "",
+    "past": "Iragana",
+    "pluginname": "",
+    "recentlyoverdue": "",
+    "sortbycourses": "Ordenatu ikastaroen arabera",
+    "sortbydates": "Ordenatu dataren arabera",
+    "timeline": ""
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/fa.json b/www/addons/myoverview/lang/fa.json
index 5f4efdadc1a..b65311b72e2 100644
--- a/www/addons/myoverview/lang/fa.json
+++ b/www/addons/myoverview/lang/fa.json
@@ -1,5 +1,18 @@
 {
+    "future": "آینده",
     "inprogress": "در جریان",
-    "nocourses": "هیچ درسی برای نمایش وجود ندارد",
-    "pluginname": "نام پلاگین انباره"
+    "morecourses": "",
+    "next30days": "۳۰ روز بعدی",
+    "next7days": "۷ روز بعدی",
+    "nocourses": "درسی وجود ندارد",
+    "nocoursesfuture": "هیچ درسی برای آینده وجود ندارد",
+    "nocoursesinprogress": "هیچ درسِ درجریانی وجود ندارد",
+    "nocoursespast": "هیچ درسی برای گذشته وجود ندارد",
+    "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
+    "past": "گذشته",
+    "pluginname": "نمای کلی درس",
+    "recentlyoverdue": "",
+    "sortbycourses": "مرتب‌سازی بر اساس درس‌ها",
+    "sortbydates": "مرتب‌سازی بر اساس تاریخ‌ها",
+    "timeline": "جدول زمانی"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/fr.json b/www/addons/myoverview/lang/fr.json
index f80d60d9cde..266d636a4b5 100644
--- a/www/addons/myoverview/lang/fr.json
+++ b/www/addons/myoverview/lang/fr.json
@@ -1,5 +1,18 @@
 {
+    "future": "Futur",
     "inprogress": "En cours",
-    "nocourses": "Aucune information de cours à afficher.",
-    "pluginname": "Nom du plugin de dépôt"
+    "morecourses": "Plus de cours",
+    "next30days": "30 jours suivants",
+    "next7days": "7 jours suivants",
+    "nocourses": "Pas de cours",
+    "nocoursesfuture": "Pas de cours à venir",
+    "nocoursesinprogress": "Pas de cours en cours",
+    "nocoursespast": "Pas de cours dans le passé",
+    "noevents": "Aucune activité",
+    "past": "Passé",
+    "pluginname": "Vue d'ensemble du cours",
+    "recentlyoverdue": "Récemment en retard",
+    "sortbycourses": "Tri par cours",
+    "sortbydates": "Tri par date",
+    "timeline": "Chronologie"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/he.json b/www/addons/myoverview/lang/he.json
index b7b635566d9..2c8bcae7be2 100644
--- a/www/addons/myoverview/lang/he.json
+++ b/www/addons/myoverview/lang/he.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "בתהליך",
-    "nocourses": "אין מידע שניתן להציג על הקורס",
-    "pluginname": "שם תוסף המאגר"
+    "future": "עתידי",
+    "inprogress": "בלמידה",
+    "morecourses": "",
+    "next30days": "ב 30 הימים הבאים",
+    "next7days": "ב 7 הימים הבאים",
+    "nocourses": "טרם נרשמתם לקורס כלשהו",
+    "nocoursesfuture": "טרם נרשמתם לקורס עתידי כלשהו",
+    "nocoursesinprogress": "טרם נרשמתם לקורס המתרחש כעת",
+    "nocoursespast": "אינכם רשומים לקורס אשר הסתיימו",
+    "noevents": "לא קיימות פעילויות עתידיות להן מועד הגשה",
+    "past": "עבר",
+    "pluginname": "עדכונים בקורסים שלי",
+    "recentlyoverdue": "מועד־ההגשה עבר, לאחרונה",
+    "sortbycourses": "מיון לפי שמות קורסים",
+    "sortbydates": "מיון לפי תאריכים",
+    "timeline": "ציר־זמן"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/hu.json b/www/addons/myoverview/lang/hu.json
index 19022b6c99a..cd96b1685c4 100644
--- a/www/addons/myoverview/lang/hu.json
+++ b/www/addons/myoverview/lang/hu.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "Folyamatban",
-    "nocourses": "Nincs megjelenítendő kurzusinformáció.",
-    "pluginname": "Az adattár-segédprogram neve"
+    "future": "Jövőbeni",
+    "inprogress": "Folyamatban lévő",
+    "morecourses": "További kurzusok",
+    "next30days": "A következő 30 nap",
+    "next7days": "A következő 7 nap",
+    "nocourses": "Nincs kurzus",
+    "nocoursesfuture": "Nincs jövőbeni kurzus",
+    "nocoursesinprogress": "Nincs folyamatban lévő kurzus",
+    "nocoursespast": "Nincs korábbi kurzus",
+    "noevents": "Nincs esedékes tevékenység",
+    "past": "Korábbi",
+    "pluginname": "Kurzusáttekintés",
+    "recentlyoverdue": "Mostanában lejárt",
+    "sortbycourses": "Rendezés kurzusok szerint",
+    "sortbydates": "Rendezés dátum szerint",
+    "timeline": "Idősor"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/it.json b/www/addons/myoverview/lang/it.json
index 79fb59b2a1b..3e157ff6e5c 100644
--- a/www/addons/myoverview/lang/it.json
+++ b/www/addons/myoverview/lang/it.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "In corso",
-    "nocourses": "Non sono presenti informazioni sui corsi.",
-    "pluginname": "Nome plugin repository"
+    "future": "",
+    "inprogress": "",
+    "morecourses": "",
+    "next30days": "",
+    "next7days": "",
+    "nocourses": "Non ci sono corsi",
+    "nocoursesfuture": "",
+    "nocoursesinprogress": "Non ci sono corsi in svolgimento",
+    "nocoursespast": "",
+    "noevents": "Non ci sono attività da svolgere",
+    "past": "",
+    "pluginname": "Panoramica corsi",
+    "recentlyoverdue": "",
+    "sortbycourses": "Ordina per corso",
+    "sortbydates": "Ordina per data",
+    "timeline": "Cronologia"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/ja.json b/www/addons/myoverview/lang/ja.json
index 636c78e5c2e..3671d43e7ee 100644
--- a/www/addons/myoverview/lang/ja.json
+++ b/www/addons/myoverview/lang/ja.json
@@ -1,5 +1,18 @@
 {
+    "future": "今後",
     "inprogress": "進行中",
-    "nocourses": "表示するコース情報はありません。",
-    "pluginname": "リポジトリプラグイン名"
+    "morecourses": "コースをさらに",
+    "next30days": "次の30日",
+    "next7days": "次の7日",
+    "nocourses": "コースなし",
+    "nocoursesfuture": "今後のコースはありません。",
+    "nocoursesinprogress": "進行中のコースはありません。",
+    "nocoursespast": "過去のコースはありません。",
+    "noevents": "到来する活動期限はありません。",
+    "past": "過去",
+    "pluginname": "コース概要",
+    "recentlyoverdue": "最近の期限切れ",
+    "sortbycourses": "コースで並べ替える",
+    "sortbydates": "日付で並べ替える",
+    "timeline": "タイムライン"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/nl.json b/www/addons/myoverview/lang/nl.json
index a62672827d5..e351dee92a9 100644
--- a/www/addons/myoverview/lang/nl.json
+++ b/www/addons/myoverview/lang/nl.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "Bezig",
-    "nocourses": "Geen cursusinformatie",
-    "pluginname": "Opslagruimte plugin naam"
+    "future": "Toekomst",
+    "inprogress": "Actief",
+    "morecourses": "Meer cursussen",
+    "next30days": "Komende 30 dagen",
+    "next7days": "Komende 7 dagen",
+    "nocourses": "Geen cursussen",
+    "nocoursesfuture": "Geen toekomstige cursussen",
+    "nocoursesinprogress": "Geen actieve cursussen",
+    "nocoursespast": "Geen cursussen in verleden",
+    "noevents": "Er zijn geen verwachte activiteiten",
+    "past": "Verleden",
+    "pluginname": "Cursusoverzicht",
+    "recentlyoverdue": "Recent te laat",
+    "sortbycourses": "Op cursus sorteren",
+    "sortbydates": "Op datum sorteren",
+    "timeline": "Tijdlijn"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/zh-tw.json b/www/addons/myoverview/lang/zh-tw.json
index 63e62e180e2..18cfa0860fc 100644
--- a/www/addons/myoverview/lang/zh-tw.json
+++ b/www/addons/myoverview/lang/zh-tw.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "處理中",
-    "nocourses": "沒有課程資訊可以顯示",
-    "pluginname": "倉儲外掛套件名稱"
+    "future": "未來",
+    "inprogress": "進行中",
+    "morecourses": "更多課程",
+    "next30days": "下一月",
+    "next7days": "下一週",
+    "nocourses": "沒有課程",
+    "nocoursesfuture": "沒有未來的課程",
+    "nocoursesinprogress": "沒有進行中的課程",
+    "nocoursespast": "沒有過去的課程",
+    "noevents": "沒有即將到期的活動",
+    "past": "過去",
+    "pluginname": "課程概觀",
+    "recentlyoverdue": "",
+    "sortbycourses": "依課程排序",
+    "sortbydates": "依日期排序",
+    "timeline": "時間軸"
 }
\ No newline at end of file
diff --git a/www/addons/notes/lang/ar.json b/www/addons/notes/lang/ar.json
index 30b58e0c705..df8de0cf069 100644
--- a/www/addons/notes/lang/ar.json
+++ b/www/addons/notes/lang/ar.json
@@ -2,7 +2,7 @@
     "addnewnote": "إضافة ملاحظة جديدة",
     "coursenotes": "ملاحظات المقرر الدراسي",
     "note": "ملحوظة",
-    "notes": "ملاحظات",
+    "notes": "تحليلك وملاحظاتك الخاصة",
     "personalnotes": "ملاحظات شخصية",
     "publishstate": "السياق",
     "sitenotes": "ملاحظات الموقع"
diff --git a/www/addons/notes/lang/bg.json b/www/addons/notes/lang/bg.json
index 606e3b6a09d..89cc6664d9d 100644
--- a/www/addons/notes/lang/bg.json
+++ b/www/addons/notes/lang/bg.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Бележката създадена",
     "nonotes": "Все още няма бележки от този тип.",
     "note": "Бележка",
-    "notes": "Бележки",
+    "notes": "Вашият личен анализ и бележки",
     "personalnotes": "Лични бележки",
     "publishstate": "Контекст",
     "sitenotes": "Бележки за сайта"
diff --git a/www/addons/notes/lang/ca.json b/www/addons/notes/lang/ca.json
index 1c044e61b29..9367384a78e 100644
--- a/www/addons/notes/lang/ca.json
+++ b/www/addons/notes/lang/ca.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "S'ha creat la nota",
     "nonotes": "Encara no hi ha notes d'aquest tipus",
     "note": "Anotació",
-    "notes": "Anotacions",
+    "notes": "El teu anàlisi privat i les teves notes",
     "personalnotes": "Anotacions personals",
     "publishstate": "Context",
     "sitenotes": "Anotacions del lloc",
diff --git a/www/addons/notes/lang/cs.json b/www/addons/notes/lang/cs.json
index fd3b1a46f42..984816ff5e7 100644
--- a/www/addons/notes/lang/cs.json
+++ b/www/addons/notes/lang/cs.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Poznámka vytvořena",
     "nonotes": "Doposud neexistují žádné poznámky tohoto typu",
     "note": "Poznámka",
-    "notes": "Poznámky",
+    "notes": "Vaše soukromé postřehy a poznámky",
     "personalnotes": "Osobní poznámky",
     "publishstate": "Kontext",
     "sitenotes": "Poznámky stránek",
diff --git a/www/addons/notes/lang/da.json b/www/addons/notes/lang/da.json
index 3dadb18f0eb..cf35362b164 100644
--- a/www/addons/notes/lang/da.json
+++ b/www/addons/notes/lang/da.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Note oprettet",
     "nonotes": "Der er endnu ingen noter af denne type",
     "note": "Note",
-    "notes": "Noter",
+    "notes": "Dine private kommentarer og noter",
     "personalnotes": "Personlige noter",
     "publishstate": "Sammenhæng",
     "sitenotes": "Webstedsnoter",
diff --git a/www/addons/notes/lang/de.json b/www/addons/notes/lang/de.json
index b4ed60eb088..06d550d7211 100644
--- a/www/addons/notes/lang/de.json
+++ b/www/addons/notes/lang/de.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anmerkung angelegt",
     "nonotes": "Keine Anmerkungen",
     "note": "Anmerkung",
-    "notes": "Anmerkungen",
+    "notes": "Ihre persönliche Analyse und Anmerkungen",
     "personalnotes": "Meine Anmerkungen",
     "publishstate": "Kontext",
     "sitenotes": "Anmerkungen zur Website",
diff --git a/www/addons/notes/lang/el.json b/www/addons/notes/lang/el.json
index e796b19cabe..9bc5d02d49e 100644
--- a/www/addons/notes/lang/el.json
+++ b/www/addons/notes/lang/el.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Το σημείωμα δημιουργήθηκε",
     "nonotes": "Δεν υπάρχουν σημειώσεις αυτού του τύπου ακόμα",
     "note": "Σημείωση",
-    "notes": "Σημειώσεις",
+    "notes": "Οι προσωπικές σας αναλύσεις και σημειώσεις",
     "personalnotes": "Προσωπικές σημειώσεις",
     "publishstate": "Γενικό πλαίσιο",
     "sitenotes": "Σημειώσεις της ιστοσελίδας",
diff --git a/www/addons/notes/lang/es-mx.json b/www/addons/notes/lang/es-mx.json
index aabd17d948f..1c91ea47373 100644
--- a/www/addons/notes/lang/es-mx.json
+++ b/www/addons/notes/lang/es-mx.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Nota creada",
     "nonotes": "Todavía no hay notas de este tipo todavía",
     "note": "Nota",
-    "notes": "Notas",
+    "notes": "Su análisis privado y sus notas",
     "personalnotes": "Notas personales",
     "publishstate": "Contexto",
     "sitenotes": "Notas del sitio",
diff --git a/www/addons/notes/lang/eu.json b/www/addons/notes/lang/eu.json
index f8935fec248..8656c9594fd 100644
--- a/www/addons/notes/lang/eu.json
+++ b/www/addons/notes/lang/eu.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Oharra gehituta",
     "nonotes": "Oraindik ez dago mota honetako oharrik.",
     "note": "Oharra",
-    "notes": "Oharrak",
+    "notes": "Zure analisi pribatua eta oharrak",
     "personalnotes": "Ohar pertsonalak",
     "publishstate": "Testuingurua",
     "sitenotes": "Guneko oharrak",
diff --git a/www/addons/notes/lang/fr.json b/www/addons/notes/lang/fr.json
index 21d624c4af2..346f886976d 100644
--- a/www/addons/notes/lang/fr.json
+++ b/www/addons/notes/lang/fr.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Annotation créée",
     "nonotes": "Il n'y a pas encore d'annotation de ce type",
     "note": "Annotation",
-    "notes": "Annotations",
+    "notes": "Votre analyse et vos remarques personnelles",
     "personalnotes": "Annotations personnelles",
     "publishstate": "Contexte",
     "sitenotes": "Annotations du site",
diff --git a/www/addons/notes/lang/he.json b/www/addons/notes/lang/he.json
index 416427b2dec..2e3c5dd9644 100644
--- a/www/addons/notes/lang/he.json
+++ b/www/addons/notes/lang/he.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "הערה נוצרה",
     "nonotes": "עדיין לא קיימות הערות מסוג זה",
     "note": "הערה",
-    "notes": "הערות",
+    "notes": "ההערות והניתוח הפרטיים שלך.",
     "personalnotes": "הערות אישיות",
     "publishstate": "תוכן",
     "sitenotes": "הערות אתר",
diff --git a/www/addons/notes/lang/it.json b/www/addons/notes/lang/it.json
index 0e9b001f16c..90c300a1f85 100644
--- a/www/addons/notes/lang/it.json
+++ b/www/addons/notes/lang/it.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Creata annotazione",
     "nonotes": "Non sono presenti annotazioni di questo tipo.",
     "note": "Annotazione",
-    "notes": "Annotazioni",
+    "notes": "Le tue note e analisi",
     "personalnotes": "Annotazioni personali",
     "publishstate": "Contesto",
     "sitenotes": "Annotazioni del sito",
diff --git a/www/addons/notes/lang/lt.json b/www/addons/notes/lang/lt.json
index ac321d27d1b..e9213ee0c0e 100644
--- a/www/addons/notes/lang/lt.json
+++ b/www/addons/notes/lang/lt.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Užrašas sukurtas",
     "nonotes": "Nėra jokių šios temos užrašų",
     "note": "Užrašas",
-    "notes": "Užrašai",
+    "notes": "Pastabos",
     "personalnotes": "Asmeniniai užrašai",
     "publishstate": "Teksto ištrauka",
     "sitenotes": "Svetainės užrašai",
diff --git a/www/addons/notes/lang/nl.json b/www/addons/notes/lang/nl.json
index 49a0c0209c4..64e66285bed 100644
--- a/www/addons/notes/lang/nl.json
+++ b/www/addons/notes/lang/nl.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Notitie gemaakt",
     "nonotes": "Er zijn nog geen notities van dit type.",
     "note": "Notitie",
-    "notes": "Notities",
+    "notes": "Je persoonlijke analyse en aantekeningen",
     "personalnotes": "Persoonlijke notities",
     "publishstate": "Context",
     "sitenotes": "Site notities",
diff --git a/www/addons/notes/lang/pt-br.json b/www/addons/notes/lang/pt-br.json
index ce6908d1d3e..5634bc70e89 100644
--- a/www/addons/notes/lang/pt-br.json
+++ b/www/addons/notes/lang/pt-br.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anotação criada",
     "nonotes": "Não há mais anotações desse típo",
     "note": "Anotação",
-    "notes": "Anotações",
+    "notes": "Suas análises e anotações pessoais",
     "personalnotes": "Anotações pessoais",
     "publishstate": "Contexto",
     "sitenotes": "Anotações do site",
diff --git a/www/addons/notes/lang/pt.json b/www/addons/notes/lang/pt.json
index 28e62fa379b..5763cbe46e1 100644
--- a/www/addons/notes/lang/pt.json
+++ b/www/addons/notes/lang/pt.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anotação criada",
     "nonotes": "Ainda não existem anotações deste tipo",
     "note": "Anotação",
-    "notes": "Anotações",
+    "notes": "Análise privada e anotações",
     "personalnotes": "Anotações pessoais",
     "publishstate": "Contexto",
     "sitenotes": "Anotações do site",
diff --git a/www/addons/notes/lang/ro.json b/www/addons/notes/lang/ro.json
index 605a02f2299..1115becc8d5 100644
--- a/www/addons/notes/lang/ro.json
+++ b/www/addons/notes/lang/ro.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "A fost creată o notă",
     "nonotes": "Momentan nu există note de acest tip",
     "note": "Notă",
-    "notes": "Note",
+    "notes": "Analiza şi notele tale particulare",
     "personalnotes": "Note personale",
     "publishstate": "Context",
     "sitenotes": "Note de site",
diff --git a/www/addons/notes/lang/ru.json b/www/addons/notes/lang/ru.json
index ce3b230d19d..5b45804576d 100644
--- a/www/addons/notes/lang/ru.json
+++ b/www/addons/notes/lang/ru.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Заметка создана",
     "nonotes": "Тут нет заметок такого типа",
     "note": "Заметка",
-    "notes": "Заметки",
+    "notes": "Ваши анализы и заметки",
     "personalnotes": "Личные заметки",
     "publishstate": "Контекст",
     "sitenotes": "Заметки сайта",
diff --git a/www/addons/notes/lang/sv.json b/www/addons/notes/lang/sv.json
index 8fcd87edc6d..75049c59549 100644
--- a/www/addons/notes/lang/sv.json
+++ b/www/addons/notes/lang/sv.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anteckning skapade",
     "nonotes": "Det finns inga anteckningar av denna typ ännu",
     "note": "Anteckning",
-    "notes": "Anteckningar",
+    "notes": "Din privata analys och anteckningar",
     "personalnotes": "Personliga anteckningar",
     "publishstate": "Sammanhang",
     "sitenotes": "Webbplats anteckningar",
diff --git a/www/addons/notes/lang/zh-tw.json b/www/addons/notes/lang/zh-tw.json
index 6671dca17e8..2f1fd0f1429 100644
--- a/www/addons/notes/lang/zh-tw.json
+++ b/www/addons/notes/lang/zh-tw.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "註記已被建立",
     "nonotes": "還沒有這種類型的註記",
     "note": "註記",
-    "notes": "註記",
+    "notes": "您個人的分析和筆記",
     "personalnotes": "個人註記",
     "publishstate": "上下文",
     "sitenotes": "網站註記",
diff --git a/www/addons/notifications/lang/ar.json b/www/addons/notifications/lang/ar.json
index edbc8f11446..cab5daac101 100644
--- a/www/addons/notifications/lang/ar.json
+++ b/www/addons/notifications/lang/ar.json
@@ -1,5 +1,5 @@
 {
     "errorgetnotifications": "خطأ في الحصول على الإشعارات",
-    "notifications": "الإشعارات",
+    "notifications": "إشعارات",
     "therearentnotificationsyet": "لا توجد إشعارات"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/de.json b/www/addons/notifications/lang/de.json
index 04205092d35..cdd10eae826 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
-    "notificationpreferences": "Systemmitteilungen",
-    "notifications": "Systemmitteilungen",
+    "notificationpreferences": "Benachrichtigungen konfigurieren",
+    "notifications": "Benachrichtigungen",
     "therearentnotificationsyet": "Keine Mitteilungen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es.json b/www/addons/notifications/lang/es.json
index e73e272de69..dcd161eb585 100644
--- a/www/addons/notifications/lang/es.json
+++ b/www/addons/notifications/lang/es.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
-    "notificationpreferences": "Preferencias de notificaciones",
+    "notificationpreferences": "Preferencias de notificación",
     "notifications": "Notificaciones",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/eu.json b/www/addons/notifications/lang/eu.json
index 6e6ead0a624..53670d1e38d 100644
--- a/www/addons/notifications/lang/eu.json
+++ b/www/addons/notifications/lang/eu.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Errorea jakinarazpenak jasotzean",
-    "notificationpreferences": "Jakinarazpen hobespenak",
+    "notificationpreferences": "Jakinarazpenen hobespenak",
     "notifications": "Jakinarazpenak",
     "therearentnotificationsyet": "Ez dago jakinarazpenik"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/fa.json b/www/addons/notifications/lang/fa.json
index dcfecb86fba..4db075e4716 100644
--- a/www/addons/notifications/lang/fa.json
+++ b/www/addons/notifications/lang/fa.json
@@ -1,5 +1,5 @@
 {
     "notificationpreferences": "ترجیحات اطلاعیه‌ها",
-    "notifications": "هشدارها",
+    "notifications": "اطلاعیه‌ها",
     "therearentnotificationsyet": "هیچ هشداری وجود ندارد"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/he.json b/www/addons/notifications/lang/he.json
index 1c1591b94ed..465beb792a8 100644
--- a/www/addons/notifications/lang/he.json
+++ b/www/addons/notifications/lang/he.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "שגיאה בטעינת התראות",
     "notificationpreferences": "העדפות הודעות",
-    "notifications": "התראות",
+    "notifications": "הודעות",
     "therearentnotificationsyet": "אין התראות"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/lt.json b/www/addons/notifications/lang/lt.json
index 965ea666726..9487770171a 100644
--- a/www/addons/notifications/lang/lt.json
+++ b/www/addons/notifications/lang/lt.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Klaida gaunant pranešimus",
-    "notificationpreferences": "Pranešimų nustatymai",
+    "notificationpreferences": "Pranešimų nuostatos",
     "notifications": "Pranešimai",
     "therearentnotificationsyet": "Nėra jokių pranešimų"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/nl.json b/www/addons/notifications/lang/nl.json
index c9e19e6bce6..85ae7955a0e 100644
--- a/www/addons/notifications/lang/nl.json
+++ b/www/addons/notifications/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fout bij het ophalen van notificaties",
-    "notificationpreferences": "Notificatievoorkeuren",
+    "notificationpreferences": "Meldingen  voorkeuren",
     "notifications": "Meldingen",
     "therearentnotificationsyet": "Er zijn geen meldingen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/pt-br.json b/www/addons/notifications/lang/pt-br.json
index 33e2586486c..c7ff82adb19 100644
--- a/www/addons/notifications/lang/pt-br.json
+++ b/www/addons/notifications/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Erro ao receber notificações",
-    "notificationpreferences": "Preferência de notificações",
-    "notifications": "Notificação",
+    "notificationpreferences": "Preferências de notificação",
+    "notifications": "Notificações",
     "therearentnotificationsyet": "Não há notificações"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sv.json b/www/addons/notifications/lang/sv.json
index 2aa4e69322a..024d0fef099 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,5 +1,5 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
-    "notifications": "Meddelanden",
+    "notifications": "Meddelande",
     "therearentnotificationsyet": "Det finns inga meddelanden"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/zh-tw.json b/www/addons/notifications/lang/zh-tw.json
index f885ca29ff4..92e6514797c 100644
--- a/www/addons/notifications/lang/zh-tw.json
+++ b/www/addons/notifications/lang/zh-tw.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "取得通知資料發生錯誤",
-    "notificationpreferences": "通知偏好設定",
+    "notificationpreferences": "通知的偏好",
     "notifications": "通知",
     "therearentnotificationsyet": "沒有通知訊息"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ar.json b/www/addons/participants/lang/ar.json
index 8c013f870e2..6ba30232626 100644
--- a/www/addons/participants/lang/ar.json
+++ b/www/addons/participants/lang/ar.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "لم يتم العثور على مشاركين في هذا المقرر الدراسي",
-    "participants": "المشاركين"
+    "participants": "مشاركون"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ca.json b/www/addons/participants/lang/ca.json
index 3c6638a3af7..1c214eda823 100644
--- a/www/addons/participants/lang/ca.json
+++ b/www/addons/participants/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No s'han trobat participants per aquest curs",
+    "noparticipants": "No s'han trobat participants.",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/cs.json b/www/addons/participants/lang/cs.json
index 2092b03a730..4ae4dd88392 100644
--- a/www/addons/participants/lang/cs.json
+++ b/www/addons/participants/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Pro tento kurz nenalezeni účastníci",
-    "participants": "Účastníci"
+    "noparticipants": "Nebyl nalezen žádný účastník",
+    "participants": "Přispěvatelé"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/da.json b/www/addons/participants/lang/da.json
index 69f209799f8..28829f714a6 100644
--- a/www/addons/participants/lang/da.json
+++ b/www/addons/participants/lang/da.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Ingen deltagere fundet på dette kursus",
+    "noparticipants": "Ingen deltagere fundet.",
     "participants": "Deltagere"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/de.json b/www/addons/participants/lang/de.json
index 95a259f09bd..087591cfe5d 100644
--- a/www/addons/participants/lang/de.json
+++ b/www/addons/participants/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Keine Personen für diesen Kurs gefunden",
-    "participants": "Personen"
+    "noparticipants": "Keine Teilnehmer gefunden",
+    "participants": "Teilnehmer/innen"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/el.json b/www/addons/participants/lang/el.json
index 846f209c0b0..e1a786afbb1 100644
--- a/www/addons/participants/lang/el.json
+++ b/www/addons/participants/lang/el.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Δεν βρέθηκαν συμμετέχοντες σε αυτό το μάθημα",
+    "noparticipants": "Δε βρέθηκαν συμμετέχονες γι' αυτό το μάθημα",
     "participants": "Συμμετέχοντες"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es-mx.json b/www/addons/participants/lang/es-mx.json
index 56f80358ad5..5c6014bd522 100644
--- a/www/addons/participants/lang/es-mx.json
+++ b/www/addons/participants/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se encontraron participantes para este curso",
+    "noparticipants": "No se encontraron participantes.",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es.json b/www/addons/participants/lang/es.json
index c64b8bf86b4..62113ad2ef9 100644
--- a/www/addons/participants/lang/es.json
+++ b/www/addons/participants/lang/es.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se han encontrado participantes en este curso",
+    "noparticipants": "No se encontraron participantes en este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/eu.json b/www/addons/participants/lang/eu.json
index b716ea85dad..fbecb8a5f95 100644
--- a/www/addons/participants/lang/eu.json
+++ b/www/addons/participants/lang/eu.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Ez da parte-hartzailerik aurkitu ikastaro honetan",
+    "noparticipants": "Ez da partaiderik aurkitu.",
     "participants": "Partaideak"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/fa.json b/www/addons/participants/lang/fa.json
index 34112f687d7..90d51eaa038 100644
--- a/www/addons/participants/lang/fa.json
+++ b/www/addons/participants/lang/fa.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "این درس شرکت‌کننده‌ای ندارد",
+    "noparticipants": "هیچ شرکت‌کننده‌ای پیدا نشد.",
     "participants": "شرکت کنندگان"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/fr.json b/www/addons/participants/lang/fr.json
index fc97610a609..0a75ac6f8c8 100644
--- a/www/addons/participants/lang/fr.json
+++ b/www/addons/participants/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Aucun participant trouvé dans ce cours",
+    "noparticipants": "Aucun participant trouvé",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/he.json b/www/addons/participants/lang/he.json
index 669a9a80dfd..5c487a42ed3 100644
--- a/www/addons/participants/lang/he.json
+++ b/www/addons/participants/lang/he.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "לא נמצאו משתתפים עבור קורס זה",
+    "noparticipants": "טרם צורפו משתתפים.",
     "participants": "משתתפים"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/hu.json b/www/addons/participants/lang/hu.json
index 929c510a598..f1cb5cf7cf6 100644
--- a/www/addons/participants/lang/hu.json
+++ b/www/addons/participants/lang/hu.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "A kurzushoz nincsenek résztvevők!",
+    "noparticipants": "Nincs résztvevő.",
     "participants": "Résztvevők"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/it.json b/www/addons/participants/lang/it.json
index 0d16202be57..21d39dce004 100644
--- a/www/addons/participants/lang/it.json
+++ b/www/addons/participants/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "In questo corso non sono stati trovati partecipanti",
-    "participants": "Partecipanti"
+    "noparticipants": "Non sono stati trovati partecipanti.",
+    "participants": "Sono autorizzati ad inserire record"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ja.json b/www/addons/participants/lang/ja.json
index 8fbbcbb3976..ff5fe88970c 100644
--- a/www/addons/participants/lang/ja.json
+++ b/www/addons/participants/lang/ja.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "このコースには参加者が登録されていません。",
+    "noparticipants": "参加者は見つかりませんでした。",
     "participants": "参加者"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/lt.json b/www/addons/participants/lang/lt.json
index b675a2848f1..714a8ffda94 100644
--- a/www/addons/participants/lang/lt.json
+++ b/www/addons/participants/lang/lt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Dalyvaujančių šiuose kursuose nėra",
+    "noparticipants": "Nerasta šių kursų dalyvių",
     "participants": "Dalyviai"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/nl.json b/www/addons/participants/lang/nl.json
index 2beef686f18..a7b39b547fc 100644
--- a/www/addons/participants/lang/nl.json
+++ b/www/addons/participants/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Geen deelnemers gevonden in deze cursus",
+    "noparticipants": "Geen deelnemers gevonden",
     "participants": "Deelnemers"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pl.json b/www/addons/participants/lang/pl.json
index 5025bf740ec..adceacdf5a7 100644
--- a/www/addons/participants/lang/pl.json
+++ b/www/addons/participants/lang/pl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nie znaleziono uczestników w tym kursie",
+    "noparticipants": "Nie znaleziono uczestników.",
     "participants": "Uczestnicy"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt-br.json b/www/addons/participants/lang/pt-br.json
index 792fea1d8fd..a107a2f8ee1 100644
--- a/www/addons/participants/lang/pt-br.json
+++ b/www/addons/participants/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nenhum dos participantes encontrados para este curso",
+    "noparticipants": "Nenhum participante encontrado.",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt.json b/www/addons/participants/lang/pt.json
index e7a2e39536f..e10e9120f10 100644
--- a/www/addons/participants/lang/pt.json
+++ b/www/addons/participants/lang/pt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nenhum participante encontrado nesta disciplina",
-    "participants": "Participantes"
+    "noparticipants": "Não foram encontrados participantes.",
+    "participants": "Utilizadores"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ro.json b/www/addons/participants/lang/ro.json
index 57abb945354..0c2fa9e2bad 100644
--- a/www/addons/participants/lang/ro.json
+++ b/www/addons/participants/lang/ro.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nu au fost găsiți participanți la acest curs.",
-    "participants": "Participanți"
+    "noparticipants": "Nu există participanți la acest curs",
+    "participants": "Participanţi"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ru.json b/www/addons/participants/lang/ru.json
index 590333bcb2f..bcfa292346e 100644
--- a/www/addons/participants/lang/ru.json
+++ b/www/addons/participants/lang/ru.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Не найдены участники для этого курса.",
+    "noparticipants": "Участники не найдены.",
     "participants": "Участники"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sv.json b/www/addons/participants/lang/sv.json
index ab7780c8f28..54221f5de3f 100644
--- a/www/addons/participants/lang/sv.json
+++ b/www/addons/participants/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Inga deltagare hittades för kursen",
+    "noparticipants": "Inga deltagare funna.",
     "participants": "Deltagare"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/tr.json b/www/addons/participants/lang/tr.json
index 05e3c834e4a..307ef1e120f 100644
--- a/www/addons/participants/lang/tr.json
+++ b/www/addons/participants/lang/tr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Bu derste hiç katılımcı bulunamadı",
+    "noparticipants": "Hiçbir katılımcı bulunamadı.",
     "participants": "Katılımcılar"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-cn.json b/www/addons/participants/lang/zh-cn.json
index f2ce4c8e36a..4a9403ae5c7 100644
--- a/www/addons/participants/lang/zh-cn.json
+++ b/www/addons/participants/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "未找到此项课程的参与者",
-    "participants": "课程参与者"
+    "participants": "参与者"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-tw.json b/www/addons/participants/lang/zh-tw.json
index f2aba39a343..0cd5f5275e4 100644
--- a/www/addons/participants/lang/zh-tw.json
+++ b/www/addons/participants/lang/zh-tw.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "這個課程沒有參與者",
+    "noparticipants": "沒有發現參與者",
     "participants": "參與者"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ar.json b/www/core/components/course/lang/ar.json
index ab7fafab59b..09e2bceac89 100644
--- a/www/core/components/course/lang/ar.json
+++ b/www/core/components/course/lang/ar.json
@@ -1,8 +1,8 @@
 {
     "allsections": "كل الأقسام",
-    "contents": "المحتويات",
+    "contents": "محتويات",
     "couldnotloadsections": "لم يتم تحميل كل الأقسام، من فضلك حاول مرة أخرى لاحقاَ",
     "errordownloadingsection": "خطأ عن تنزيل الأقسام",
     "hiddenfromstudents": "مخفي عن الطلاب",
-    "showall": "عرض الكل"
+    "showall": "أعرض جميع الأسئلة في صفحة واحدة"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/bg.json b/www/core/components/course/lang/bg.json
index 27e55810940..5efc587d297 100644
--- a/www/core/components/course/lang/bg.json
+++ b/www/core/components/course/lang/bg.json
@@ -3,9 +3,7 @@
     "contents": "Съдържание",
     "couldnotloadsectioncontent": "Неуспех при зареждането на съдържанието на секцията, моля опитайте пак по-късно.",
     "couldnotloadsections": "Неуспех при зареждането на секциите, моля опитайте отново.",
-    "gotothesite": "Отиди към сайта.",
     "hiddenfromstudents": "Скрит от ученици",
     "nocontentavailable": "В момента няма достъпно съдържание.",
-    "showall": "Показване на всичко",
-    "whoops": "Опс!"
+    "showall": "Показване на всички въпроси на една страница"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index 7ab8b932f97..840bea85604 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "La vostra organització ha desactivat aquesta activitat a l'app mòbil.",
-    "activitynotyetviewable": "Aquesta activitat encara no es pot visualitzar a l'aplicació.",
-    "activitynotyetviewablegothere": "Aquest tipus d'activitat o recurs encara no està disponible per ser visualitzat des de l'aplicació, cliqueu al botó de més avall per accedir-hi des del web.",
     "activitynotyetviewableinapp": "Estem treballant per donar suport a l'activitat {{$a}}.",
     "activitynotyetviewableremoteaddon": "La vostra organització ha instal·lat un complement que encara no és compatible amb l'aplicació.",
     "activitynotyetviewablesiteupgradeneeded": "El Moodle de la vostra organització necessita una actualització.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Contacteu l'administrador del lloc i digueu-li que voleu fer servir aquesta activitat a Moodle Mobile.",
     "confirmdeletemodulefiles": "Confirmeu que voleu eliminar els fitxers d'aquest mòdul?",
     "confirmdownload": "Esteu a punt de descarregar {{size}}. Segur que voleu continuar?",
-    "confirmdownloadsection": "Esteu a punt de descarregar {{size}}. Segur que voleu continuar?",
     "confirmdownloadunknownsize": "No es pot calcular la mida de la descàrrega. Segur que voleu continuar?",
     "confirmpartialdownloadsize": "Ara descarregareu {{size}} <strong>com a mínim</strong>. Confirmeu que voleu continuar?",
     "contents": "Continguts",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "No s'ha pogut carregar les seccions, si us plau, torneu-ho a provar més tard.",
     "errordownloadingsection": "S'ha produït un error en descarregar la secció.",
     "errorgetmodule": "S'ha produït un error en recuperar les dades del mòdul.",
-    "gotothesite": "Vés al web",
     "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
-    "showall": "Mostra-ho tot",
-    "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu.",
-    "whoops": "Renoi!"
+    "showall": "Mostra totes les preguntes en una pàgina",
+    "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index 5ccb9f1241c..c9c69290ccd 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Vaše organizace zakázal tuto činnost v mobilní aplikaci.",
-    "activitynotyetviewable": "Tato činnost ještě není v aplikaci zobrazitelná.",
-    "activitynotyetviewablegothere": "Tato činnost nebo zdroj ještě není v aplikaci zobrazitelná, pro přístup z webu klikněte na tlačítko dole.",
     "activitynotyetviewableinapp": "Pracujeme na úpravě aktivity {{$a}}.",
     "activitynotyetviewableremoteaddon": "Tato aktivita je doplněk třetí strany, který ještě není aplikací podporován.",
     "activitynotyetviewablesiteupgradeneeded": "Instalace Moodle vaší organizace je třeba aktualizovat.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Obraťte se na správce webu a řekněte mu, že tuto činnost chcete používat s mobilní Moodle  aplikací.",
     "confirmdeletemodulefiles": "Jste si jisti, že chcete odstranit tyto soubory modulu?",
     "confirmdownload": "Chystáte se stahovat {{velikost}}. Jste si jisti, že chcete pokračovat?",
-    "confirmdownloadsection": "Chystáte se stahovat {{velikost}}. Jste si jisti, že chcete pokračovat?",
     "confirmdownloadunknownsize": "Nebyli jsme schopni vypočítat velikost stahování. Jste si jisti, že stahování chcete?",
     "confirmpartialdownloadsize": "Chystáte se stáhnout <strong> alespoň </strong> {{size}}. Jste si jisti, že chcete pokračovat?",
     "contents": "Obsah",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "Nelze načíst sekce, zkuste to prosím později.",
     "errordownloadingsection": "Chyba při stahování sekce.",
     "errorgetmodule": "Chyba při načítání",
-    "gotothesite": "Přejít na stránky",
     "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
-    "showall": "Zobrazit vše",
-    "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení.",
-    "whoops": "Jejda!"
+    "showall": "Zobrazit všechny úlohy na jedné stránce",
+    "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/da.json b/www/core/components/course/lang/da.json
index 23f7c8c2901..eb68ae4bf3e 100644
--- a/www/core/components/course/lang/da.json
+++ b/www/core/components/course/lang/da.json
@@ -1,18 +1,13 @@
 {
-    "activitynotyetviewable": "Denne aktivitet kan endnu ikke vises i app'en.",
-    "activitynotyetviewablegothere": "Denne aktivitet eller ressource er det endnu ikke muligt at vise i denne app, klik på knappen herunder for at åbne fra webstedet.",
     "allsections": "Alle sektioner",
     "confirmdownload": "Du er ved at hente {{size}}. Er du sikker på at du vil fortsætte?",
-    "confirmdownloadsection": "Du er ved at hente {{size}}. Er du sikker på at du vil fortsætte?",
     "confirmdownloadunknownsize": "Vi kunne ikke beregne størrelsen af dit download. Er du sikker på du vil hende det?",
     "contents": "Indhold",
     "couldnotloadsectioncontent": "Kunne ikke indlæse sektionens indhold, prøv igen senere.",
     "couldnotloadsections": "Kunne ikke indlæse sektionerne, prøv igen senere.",
     "errordownloadingsection": "Fejl ved indlæsning af sektion.",
-    "gotothesite": "Gå til webstedet",
     "hiddenfromstudents": "Skjult for studerende",
     "nocontentavailable": "Intet indhold tilgængeligt lige nu.",
     "overriddennotice": "Din endelige karakter fra denne aktivitet blev justeret manuelt.",
-    "showall": "Vis alt",
-    "whoops": "Hovsa!"
+    "showall": "Vis alle spørgsmål på en side"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index 3311d3535e1..82fdbc2a7d5 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Für diese Website ist die Aktivität in der App deaktiviert.",
-    "activitynotyetviewable": "Diese Aktivität kann bisher nicht in der App angezeigt werden.",
-    "activitynotyetviewablegothere": "Die Aktivität oder das Material kann bisher in der App nicht angezeigt werden. Tippen Sie auf die Taste, um die Website im Browser anzuzeigen.",
     "activitynotyetviewableinapp": "Wir arbeiten daran, die Aktivität {{$a}} zu unterstützen.",
     "activitynotyetviewableremoteaddon": "Für die Website ist ein Plugin installiert, das bisher nicht unterstützt wird.",
     "activitynotyetviewablesiteupgradeneeded": "Diese Website muss aktualisiert werden.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Wenden Sie sich an den Administrator der Website, um diese Aktivität mit der Moodle Mobile App verwenden zu können.",
     "confirmdeletemodulefiles": "Möchten Sie diese Dateien wirklich löschen?",
     "confirmdownload": "Möchten Sie wirklich {{size}} herunterladen?",
-    "confirmdownloadsection": "Möchten Sie wirklich {{size}} herunterladen?",
     "confirmdownloadunknownsize": "Die Datenmenge kann nicht berechnet werden. Möchten Sie wirklich herunterladen?",
     "confirmpartialdownloadsize": "Möchten Sie wirklich {{size}} herunterladen?",
     "contents": "Inhalte",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "Die Abschnitte konnten nicht geladen werden. Versuchen Sie es später noch einmal.",
     "errordownloadingsection": "Fehler beim Herunterladen des Abschnitts",
     "errorgetmodule": "Fehler beim Laden von Moduldaten",
-    "gotothesite": "Zur Website",
     "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
     "nocontentavailable": "Momentan sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
-    "showall": "Alles anzeigen",
-    "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden.",
-    "whoops": "Whoops!"
+    "showall": "Alle Fragen auf einer Seite anzeigen",
+    "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index c23f6c16b54..ad864c0ff41 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Δεν μπορείτε να δείτε αυτή τη δραστηριότητα στην εφαρμογή ακόμα.",
-    "activitynotyetviewablegothere": "Δεν μπορείτε να δείτε αυτή τη δραστηριότητα/πόρο στην εφαρμογή ακόμα, κάντε κλικ στο παρακάτω κουμπί για να την προσπελάσετε από το site.",
     "activitynotyetviewableinapp": "Εργαζόμαστε για την υποστήριξη της δραστηριότητας {{$a}} .",
     "activitynotyetviewableremoteaddon": "Ο οργανισμός σας εγκατέστησε ένα plugin που δεν υποστηρίζεται ακόμη.",
     "activitynotyetviewablesiteupgradeneeded": "Η πλατφόρμα Moodle του οργανισμού σας πρέπει να αναβαθμιστεί.",
@@ -8,7 +6,6 @@
     "askadmintosupport": "Επικοινωνήστε με το διαχειριστή του site για να πείτε ότι θέλετε να χρησιμοποιήσετε αυτή τη δραστηριότητα με την εφαρμογή του Moodle για κινητά.",
     "confirmdeletemodulefiles": "Είστε σίγουροι ότι θέλετε να διαγράψετε τα αρχεία αυτής της ενότητας;",
     "confirmdownload": "Πρόκειται να κατεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
-    "confirmdownloadsection": "Πρόκειται να κατεβάσετε {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "confirmdownloadunknownsize": "Δεν κατέστη δυνατό να υπολογιστεί το μέγεθος των αρχείων που θέλετε να κατεβάσετε. Είστε σίγουροι ότι θέλετε να τα κατεβάσετε;",
     "confirmpartialdownloadsize": "Πρόκειται να κατεβάσετε <strong>τουλάχιστον</strong> {{size}}. Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
     "contents": "Περιεχόμενα",
@@ -16,10 +13,8 @@
     "couldnotloadsections": "Δεν ήταν δυνατή η φόρτωση αυτής της ενότητας, δοκιμάστε ξανά αργότερα.",
     "errordownloadingsection": "Σφάλμα λήψης ενότητας",
     "errorgetmodule": "Σφάλμα κατά τη λήψη των δεδομένων της ενότητας.",
-    "gotothesite": "Πηγαίνετε στο site.",
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Προβολή όλων",
-    "whoops": "Whoops!"
+    "showall": "Εμφάνιση όλων των ερωτήσεων σε μία σελίδα"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index 418a50edb14..2bf6762b6e9 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Su  organización ha deshabilitado esta actividad en la App mobile.",
-    "activitynotyetviewable": "Esta actividad aun no es visible en la App.",
-    "activitynotyetviewablegothere": "Esta actividad o recurso todavía no es visible en la app. Haga click en el botón inferior para acceder a ella desde el sitio.",
     "activitynotyetviewableinapp": "Nosotros estamos trabajando para soportar la actividad de {{$a}}.",
     "activitynotyetviewableremoteaddon": "Su organización instaló un plugin complemento de terceros que todavía no está soportada por la App.",
     "activitynotyetviewablesiteupgradeneeded": "La instalación Moodle de su organización necesita actualizarse.",
@@ -9,19 +7,16 @@
     "askadmintosupport": "Contacte al administrador del sitio y dígale que Usted quiere usar esta actividad junto con la App Moodle Mobile.",
     "confirmdeletemodulefiles": "¿Está Usted seguro de querer eliminar estos archivos del módulo?",
     "confirmdownload": "Usted está a punto de descargar {{size}}. ¿Está Usted seguro de querer continuar?",
-    "confirmdownloadsection": "Usted está a punto de descargar {{size}}. ¿Está seguro de querer continuar?",
     "confirmdownloadunknownsize": "No pudimos calcular el tamaño de la descarga. ¿Está Usted seguro de querer descargarla?",
     "confirmpartialdownloadsize": "Usted está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está Usted seguro de querer continuar?",
-    "contents": "Contenidos",
+    "contents": "Contenido",
     "couldnotloadsectioncontent": "No pudo cargarse el contenido de la sección; por favor inténtelo nuevamente después.",
     "couldnotloadsections": "No pudieron cargarse las secciones; por favor inténtelo nuevamente después.",
     "errordownloadingsection": "Error al descargar sección",
     "errorgetmodule": "Error al obtener datos del módulo.",
-    "gotothesite": "Ir al sitio",
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todo",
-    "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo.",
-    "whoops": "¡Órale!"
+    "showall": "Mostrar todas las preguntas en una página",
+    "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es.json b/www/core/components/course/lang/es.json
index e0594271533..d1c3a6372c2 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Este tipo de actividad o recurso todavía no esta disponible para su visualización en la app.",
-    "activitynotyetviewablegothere": "Este tipo de actividad o recurso todavía no esta disponible para su visualización en la app, haga clic en el botón de abajo para acceder desde la web.",
     "activitynotyetviewableinapp": "Estamos trabajando para soportar la actividad de {{$a}}.",
     "activitynotyetviewableremoteaddon": "Esta actividad es un complemento de terceros que todavía no está soportada por la aplicación.",
     "activitynotyetviewablesiteupgradeneeded": "El sitio no está usando la versión más reciente de Moodle. Por favor, contacte al administrador del sitio.",
@@ -8,19 +6,16 @@
     "askadmintosupport": "Contacte al administrador del sitio e indíquele que desea poder usar esta actividad en la aplicación.",
     "confirmdeletemodulefiles": "¿Está seguro de querer eliminar estos archivos del módulo?",
     "confirmdownload": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
-    "confirmdownloadsection": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
     "confirmdownloadunknownsize": "No se puede calcular el tamaño de la descarga. ¿Está seguro que quiere descargarlo?",
     "confirmpartialdownloadsize": "Está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está seguro de querer continuar?",
-    "contents": "Contenidos",
+    "contents": "Contenido",
     "couldnotloadsectioncontent": "No se ha podido cargar el contenido de la sección, por favor inténtelo más tarde.",
     "couldnotloadsections": "No se ha podido cargar las secciones, por favor inténtelo más tarde.",
     "errordownloadingsection": "Error durante la descarga de la sección.",
     "errorgetmodule": "Se ha producido un error recuperando los datos del módulo.",
-    "gotothesite": "Ir al sitio",
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "No hay contenido disponible en este momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todo",
-    "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo.",
-    "whoops": "¡Vaya!"
+    "showall": "Mostrar todas las preguntas en una página",
+    "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/eu.json b/www/core/components/course/lang/eu.json
index f31d1d8038a..bbb17ee48ce 100644
--- a/www/core/components/course/lang/eu.json
+++ b/www/core/components/course/lang/eu.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Zure erakundeak jarduera hau mobile app-an desgaitu du.",
-    "activitynotyetviewable": "Jarduera hau oraindik ezin da app-ean ikusi.",
-    "activitynotyetviewablegothere": "Jarduera edo baliabide hau oraindik ezin da app-ean ikusi, sakatu beheko botoia gunearen bidez sartzeko.",
     "activitynotyetviewableinapp": "{{$a}} jarduera onartzeko lanean ari gara.",
     "activitynotyetviewableremoteaddon": "Zure erakundeak oraindik app-ean onartzen ez den gehigarri bat instalatuta dauka..",
     "activitynotyetviewablesiteupgradeneeded": "Zure erakundeko Moodle instalazioak eguneraketa bat behar du.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Jarri harremanetan zure guneko kudeatzailearekin eta esaiozu jarduera hau Moodle Mobile app-an erabili nahi duzula.",
     "confirmdeletemodulefiles": "Ziur zaude modulu honetako fitxategiak ezabatu nahi dituzula?",
     "confirmdownload": "{{size}} jaistear zaude. Ziur al zaude aurrera egin nahi duzula?",
-    "confirmdownloadsection": "{{size}} deskargatzera zoaz. Ziur zaude jarraitu nahi duzula?",
     "confirmdownloadunknownsize": "Ezin izan dugu deskargaren tamaina kalkulatu. Ziur zaude jaitsi nahi duzula?",
     "confirmpartialdownloadsize": "<strong>Gutxienez</strong> {{size}} jaistera zoaz. Ziur zaude jarraitu nahi duzula?",
     "contents": "Edukiak",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "Ezin izan dira atalak kargatu, saiatu beranduago mesedez.",
     "errordownloadingsection": "Errorea atala jaistean.",
     "errorgetmodule": "Errorea moduluaren datuak eskuratzean.",
-    "gotothesite": "Joan gunera",
     "hiddenfromstudents": "Ezkutuan ikasleentzat",
     "nocontentavailable": "Ez dago edukirik eskuragarri momentu honetan.",
     "overriddennotice": "Jarduera honetako zure azken kalifikazioa eskuz egokitu da.",
-    "showall": "Erakutsi denak",
-    "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu.",
-    "whoops": "Ups!"
+    "showall": "Galdera guztiak orri batean erakutsi",
+    "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index b9c6451b65e..21ef443c8c8 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -3,13 +3,12 @@
     "allsections": "تمام قسمت‌ها",
     "confirmdeletemodulefiles": "آیا مطمئنید که می‌خواهید فایل‌های این ماژول را پاک کنید؟",
     "confirmdownload": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
-    "confirmdownloadsection": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmdownloadunknownsize": "ما نتوانستیم حجم دریافت را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmpartialdownloadsize": "شما در آستانهٔ دریافت <strong>حداقل</strong> {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
-    "contents": "محتواها",
+    "contents": "محتویات",
     "couldnotloadsectioncontent": "محتوای قسمت نتوانست بارگیری شود. لطفا بعدا دوباره تلاش کنید.",
     "couldnotloadsections": "قسمت‌ها نتوانستند بارگیری شوند. لطفا بعدا دوباره تلاش کنید.",
     "hiddenfromstudents": "پنهان از شاگردان",
-    "showall": "نمایش همه",
+    "showall": "نمایش همهٔ سؤال‌ها در یک صفحه",
     "useactivityonbrowser": "البته همچنان می‌توانید با استفاده از مرورگر دستگاه خود، از آن استفاده کنید."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index 3302324c74c..511b6fcedf4 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Votre institution a désactivé cette activité dans l'App mobile.",
-    "activitynotyetviewable": "Cette activité n'est pas encore accessible via l'app.",
-    "activitynotyetviewablegothere": "Cette activité ou ressource n'est pas encore accessible via l'app ; cliquer sur le bouton ci-dessous pour y accéder sur la plateforme.",
     "activitynotyetviewableinapp": "L'activité {{$a}} sera bientôt supportée.",
     "activitynotyetviewableremoteaddon": "Votre institution a installé un plugin qui n'est pas encore supporté.",
     "activitynotyetviewablesiteupgradeneeded": "L'installation Moodle de votre institution doit être mise à jour.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Veuillez contacter l'administrateur de la plateforme et l'informer que vous désirez utiliser cette activité avec l'app mobile Moodle.",
     "confirmdeletemodulefiles": "Voulez-vous vraiment supprimer ces fichiers de module ?",
     "confirmdownload": "Vous allez télécharger {{size}}. Voulez-vous vraiment continuer ?",
-    "confirmdownloadsection": "Vous allez télécharger {{size}}. Voulez-vous vraiment continuer ?",
     "confirmdownloadunknownsize": "Il n'a pas été possible de calculer la taille du téléchargement. Voulez-vous vraiment effectuer le téléchargement ?",
     "confirmpartialdownloadsize": "Vous allez télécharger <strong>au moins</strong> {{size}}. Voulez-vous vraiment continuer ?",
     "contents": "Contenus",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "Impossible de charger les sections. Veuillez essayer plus tard.",
     "errordownloadingsection": "Erreur lors du téléchargement de la section.",
     "errorgetmodule": "Erreur lors de l'obtention des données du module.",
-    "gotothesite": "Aller sur la plateforme",
     "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
-    "showall": "Tout afficher",
-    "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil.",
-    "whoops": "Oups !"
+    "showall": "Afficher toutes les questions sur une page",
+    "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/he.json b/www/core/components/course/lang/he.json
index 2f067dc148f..e33a09d232c 100644
--- a/www/core/components/course/lang/he.json
+++ b/www/core/components/course/lang/he.json
@@ -1,14 +1,10 @@
 {
-    "activitynotyetviewable": "פעילות או משאב זה עדיין לא ניתנים לצפיה ביישומון.",
-    "activitynotyetviewablegothere": "פעילות או משאב זה עדיין לא ניתנים לצפיה ביישומון, יש להקליק על הכפתור למטה לגישה מהאתר.",
     "allsections": "כל יחידות ההוראה",
     "contents": "תוכן",
     "couldnotloadsectioncontent": "אין אפשרות לטעון ולהציג את תוכן יחידת ההוראה. יש לנסות שוב מאוחר יותר.",
     "couldnotloadsections": "אין אפשרות לטעון ולהציג את יחידות ההוראה, יש לנסות שוב מאוחר יותר.",
-    "gotothesite": "צפיה בעזרת האתר",
     "hiddenfromstudents": "מוסתר בפני סטודנטים",
     "nocontentavailable": "אין תוכן זמין כרגע.",
     "overriddennotice": "הציון הסופי שלך מפעילות זו הותאם ידנית.",
-    "showall": "הראה הכל",
-    "whoops": "אוווווופס!"
+    "showall": "הצגת כל השאלות בעמוד אחד"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/hu.json b/www/core/components/course/lang/hu.json
index f838946af02..245cb9bc676 100644
--- a/www/core/components/course/lang/hu.json
+++ b/www/core/components/course/lang/hu.json
@@ -1,6 +1,6 @@
 {
-    "contents": "Tartalomjegyzék",
+    "contents": "Tartalom",
     "hiddenfromstudents": "Tanulók elől rejtve",
     "overriddennotice": "A tevékenységgel kapcsolatos végső pontja kézzel módosítva lett.",
-    "showall": "Mind látszik"
+    "showall": "Minden kérdés egy oldalon látsszon"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index e4485843adb..2b09768bc49 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -1,18 +1,13 @@
 {
-    "activitynotyetviewable": "Questa attività o risorsa non è visualizzabile nell'app.",
-    "activitynotyetviewablegothere": "Questa attività o risorsa non è visualizzabile nell'app, fai click sul pulsante sotto per accedervi tramite browser.",
     "allsections": "Tutte le sezioni",
     "confirmdownload": "Stai per scaricare {{size}}. Vuoi continuare?",
-    "confirmdownloadsection": "Stai per scaricare {{size}}. Vuoi continuare?",
     "confirmdownloadunknownsize": "Non è stato possibile calcolare la dimensione del download. Vuoi scaricare lo stesso?",
     "contents": "Contenuti",
     "couldnotloadsectioncontent": "Non è stato possibile caricare il contenuto della sezione, per favore riprova più tardi.",
     "couldnotloadsections": "Non è stato possibile caricare le sezioni, per favore riprova più tardi.",
     "errordownloadingsection": "Si è verificato un errore durante lo scaricamento della sezione.",
-    "gotothesite": "Vai al sito",
     "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutto",
-    "whoops": "Oops!"
+    "showall": "Visualizza tutte le domande nella stessa pagina"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ja.json b/www/core/components/course/lang/ja.json
index 2059fb9fb13..78b79ff1fdc 100644
--- a/www/core/components/course/lang/ja.json
+++ b/www/core/components/course/lang/ja.json
@@ -3,5 +3,5 @@
     "contents": "コンテンツ",
     "hiddenfromstudents": "学生から非表示",
     "overriddennotice": "この活動に関するあなたの評点は手動で調整されました。",
-    "showall": "すべて表示"
+    "showall": "すべての問題を1ページに表示する"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/lt.json b/www/core/components/course/lang/lt.json
index 98f58437b05..46edcd17afa 100644
--- a/www/core/components/course/lang/lt.json
+++ b/www/core/components/course/lang/lt.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "Programėlė šio veiksmo  kol kas neaktlieka.",
-    "activitynotyetviewablegothere": "Šios informacijos programėlėje šiuo metu peržiūrėti negalima, jeigu norite ją peržiūrėti svetainėje, paspauskite žemiau esantį mygtuką.",
     "activitynotyetviewableinapp": "Dirbame prie {{$a}} veiklos.",
     "activitynotyetviewableremoteaddon": "Jūsų įstaiga įdiegė papildinį, kuris dar nėra palaikomas.",
     "activitynotyetviewablesiteupgradeneeded": "Jūsų įstaigos Moodle versija turi būti atnaujinta.",
@@ -8,19 +6,16 @@
     "askadmintosupport": "Susisiekite su svetainės administratoriumi, jeigu norite naudoti šią veiklą Moodle mobiliojoje programėlėje.",
     "confirmdeletemodulefiles": "Ar tikrai norite ištrinti šiuos failus?",
     "confirmdownload": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
-    "confirmdownloadsection": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
     "confirmdownloadunknownsize": "Negalima apskaičiuoti failo, kurį norite atsisiųsti, dydžio. Ar tikrai norite atsisiųsti?",
     "confirmpartialdownloadsize": "Norite atsisiųsti <strong>mažiausiai</strong> {{size}}. Ar tikrai norite tęsti?",
-    "contents": "Turiniai",
+    "contents": "Turinys",
     "couldnotloadsectioncontent": "Negalima užkrauti pasirinkto turinio, prašome pamėginti vėliau.",
     "couldnotloadsections": "Negalima užkrauti pasirinkto turinio, prašome pamėginti vėliau.",
     "errordownloadingsection": "Klaida atsisiunčiant.",
     "errorgetmodule": "Klaida gaunant kurso duomenis.",
-    "gotothesite": "Eikite į svetainę",
     "hiddenfromstudents": "Paslėpta nuo besimokančiųjų",
     "nocontentavailable": "Turinys šiuo metu nepasiekiamas.",
     "overriddennotice": "Šios veiklos galutinis įvertis buvo koreguotas rankiniu būdu.",
-    "showall": "Rodyti visus",
-    "useactivityonbrowser": "Galite naudoti savo naršyklėje.",
-    "whoops": "Oi!"
+    "showall": "Rodyti visus klausimus viename puslapyje",
+    "useactivityonbrowser": "Galite naudoti savo naršyklėje."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index 29874ac6803..4386ada4fd0 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Jouw organisatie heeft deze activiteit uitgeschakeld in de mobiele app.",
-    "activitynotyetviewable": "Deze activiteit of bron kan nog niet bekeken worden met deze app.",
-    "activitynotyetviewablegothere": "Deze activiteit of bron kan nog niet bekeken worden met deze app. Klik op onderstaande knop om het te bekijken op de site.",
     "activitynotyetviewableinapp": "We werken aan de ondersteuning van de activiteit {{$a}}.",
     "activitynotyetviewableremoteaddon": "Jouw organisatie heeft een plugin geïnstalleerd die nog niet ondersteund wordt.",
     "activitynotyetviewablesiteupgradeneeded": "De site gebruikt de niet laatste Moodle-versie en moet worden geüpdatet. Neem contact op met de site-beheerder.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Neem contact op met de sitebeheerder en geef aan dat je deze activiteit met de Moodle mobile app wilt gebruiken.",
     "confirmdeletemodulefiles": "Weet he zeker dat je deze modulebestanden wil verwijderen?",
     "confirmdownload": "Je gaat {{size}} downloaden. Weet je zeker dat je verder wil gaan?",
-    "confirmdownloadsection": "Je gaat {{size}} downloaden. Weet je zeker dat je verder wil gaan?",
     "confirmdownloadunknownsize": "We konden de grootte van de download niet berekenen. Weet je zeker dat je toch wil downloaden?",
     "confirmpartialdownloadsize": "Je staat op het punt om <strong>minstens</strong> {{size}} te downloaden. Weet je zeker dat je verder wil gaan?",
     "contents": "Inhoud",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "Kon secties niet laden. Probeer later opnieuw",
     "errordownloadingsection": "Fout bij het downloaden van de sectie.",
     "errorgetmodule": "Fout bij het ophalen van modulegegevens.",
-    "gotothesite": "Ga naar de site",
     "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
-    "showall": "Toon alle",
-    "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken",
-    "whoops": "Whoops!"
+    "showall": "Toon alle vragen op één pagina",
+    "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pl.json b/www/core/components/course/lang/pl.json
index ef88c6b604a..231bd7443da 100644
--- a/www/core/components/course/lang/pl.json
+++ b/www/core/components/course/lang/pl.json
@@ -1,6 +1,6 @@
 {
-    "contents": "Treść",
+    "contents": "Zawartość",
     "hiddenfromstudents": "Ukryte przed studentami",
     "overriddennotice": "Twoja ocena końcowa z tej aktywności została ręcznie zmieniona",
-    "showall": "Pokaż wszystko"
+    "showall": "Pokaż wszystkie pytania na stronie"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index fdf6834307a..4823f129bed 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "Sua organização desativou essa atividade no aplicativo para dispositivos móveis.",
-    "activitynotyetviewable": "Essa atividade ainda não é visualizável nesse aplicativo.",
-    "activitynotyetviewablegothere": "Essa atividade ou recurso ainda não é visualizável nesse aplicativo, clique no botão abaixo para acessar isso pelo site.",
     "activitynotyetviewableinapp": "Estamos trabalhando para dar suporte a atividade {{$a}}.",
     "activitynotyetviewableremoteaddon": "Sua organização instalou um plugin que não é suportado ainda.",
     "activitynotyetviewablesiteupgradeneeded": "O Moodle de sua organização precisa ser atualizado.",
@@ -9,19 +7,16 @@
     "askadmintosupport": "Contate o administrador do site e diga que você deseja usar essa atividade no aplicativo Moodle Mobile.",
     "confirmdeletemodulefiles": "Você tem certeza que quer excluir esse modulo arquivos?",
     "confirmdownload": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
-    "confirmdownloadsection": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
     "confirmdownloadunknownsize": "Não fomos capazes de calcular o tamanho do download. Tem certeza de que deseja fazer o download?",
     "confirmpartialdownloadsize": "Você está prestes a baixar <strong>pelo menos</strong> {{size}}. Você tem certeza que quer continuar?",
-    "contents": "Conteúdos",
+    "contents": "Conteúdo",
     "couldnotloadsectioncontent": "Não foi possível carregar o conteúdo da seção, por favor tente mais tarde.",
     "couldnotloadsections": "Não foi possível carregar a seção, por favor tente mais tarde.",
     "errordownloadingsection": "Erro ao baixar seção.",
     "errorgetmodule": "Erro ao obter os dados do módulo.",
-    "gotothesite": "Ir para o site",
     "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
-    "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente",
-    "showall": "Mostrar todos",
-    "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo",
-    "whoops": "Opa!!!"
+    "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente.",
+    "showall": "Mostrar todas as questões em uma página",
+    "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt.json b/www/core/components/course/lang/pt.json
index 803dab975fd..8256b03f877 100644
--- a/www/core/components/course/lang/pt.json
+++ b/www/core/components/course/lang/pt.json
@@ -1,7 +1,5 @@
 {
     "activitydisabled": "A sua organização desativou esta atividade na aplicação para dispositivos móveis.",
-    "activitynotyetviewable": "Esta atividade ainda não é visível na aplicação.",
-    "activitynotyetviewablegothere": "Não é possível visualizar esta atividade ou recurso nesta aplicação, clique no botão abaixo para aceder aos conteúdos a partir do site.",
     "activitynotyetviewableinapp": "Estamos trabalhar no suporte para a atividade {{$a}}.",
     "activitynotyetviewableremoteaddon": "A sua organização instalou um módulo que ainda não é suportado.",
     "activitynotyetviewablesiteupgradeneeded": "A instalação do Moodle da sua organização precisa ser atualizada.",
@@ -9,7 +7,6 @@
     "askadmintosupport": "Entre em contacto com o administrador do site e diga-lhes que pretende usar essa atividade com a aplicação móvel Moodle.",
     "confirmdeletemodulefiles": "Tem certeza de que pretende apagar os ficheiros deste módulo?",
     "confirmdownload": "Está prestes a descarregar {{size}}. Tem a certeza que pretende continuar?",
-    "confirmdownloadsection": "Está prestes a descarregar {{size}}. Tem a certeza que pretende continuar?",
     "confirmdownloadunknownsize": "Não foi possível calcular o tamanho da transferência. Tem a certeza que pretende continuar?",
     "confirmpartialdownloadsize": "Está prestes a descarregar <strong> pelo menos </strong> {{size}}. Tem a certeza que pretende continuar?",
     "contents": "Conteúdos",
@@ -17,11 +14,9 @@
     "couldnotloadsections": "Não foi possível carregar as secções, por favor tente novamente mais tarde.",
     "errordownloadingsection": "Erro ao descarregar a secção.",
     "errorgetmodule": "Erro ao obter os dados do módulo.",
-    "gotothesite": "Ir para o site",
     "hiddenfromstudents": "Oculto para os alunos",
     "nocontentavailable": "Nenhum conteúdo disponível neste momento.",
     "overriddennotice": "A sua nota final nesta atividade foi alterada manualmente na pauta.",
-    "showall": "Mostrar todos",
-    "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos.",
-    "whoops": "Ops!"
+    "showall": "Mostrar todas as perguntas numa página",
+    "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ro.json b/www/core/components/course/lang/ro.json
index b80f619a350..4295324915a 100644
--- a/www/core/components/course/lang/ro.json
+++ b/www/core/components/course/lang/ro.json
@@ -1,19 +1,14 @@
 {
-    "activitynotyetviewable": "Această activitate sau resursă nu este vizibilă în aplicație la acest moment.",
-    "activitynotyetviewablegothere": "Această activitate sau resursă nu este vizibilă în aplicație la acest moment, apăsați pe butonul de mai jos pentru a o accesa de pe site.",
     "allsections": "Toate secțiunile",
     "confirmdownload": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
-    "confirmdownloadsection": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
     "confirmdownloadunknownsize": "Nu putem calcula dimensiunea fișierului pe care doriți să îl descărcați. Sunteți sigur că doriți să descărcați?",
-    "contents": "Conținut",
+    "contents": "Conţinut",
     "couldnotloadsectioncontent": "Nu se poate încărca conținutul acestei secțiuni, încercați mai târziu.",
     "couldnotloadsections": "Nu se pot încărca secțiunile, încercați mai târziu.",
     "errordownloadingsection": "A apărut o eroare la descărcarea secțiunii.",
     "errorgetmodule": "A apărut o eroare la preluarea modului de date.",
-    "gotothesite": "Mergeți pe site",
     "hiddenfromstudents": "Ascuns de cursanţi",
     "nocontentavailable": "Pentru moment nu există conținut.",
     "overriddennotice": "Nota finală obţinută de dumneavoastră pentru această activitate a fost ajustată manual.",
-    "showall": "Arată tot",
-    "whoops": "Ops!"
+    "showall": "Afişează toate întrebările pe o singură pagină"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index 909597130f4..f05042ab16d 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -1,14 +1,10 @@
 {
-    "activitynotyetviewable": "Этот активный элемент или ресурс не просматривается в приложении",
-    "activitynotyetviewablegothere": "Этот активный элемент или ресурс не просматривается в приложении. Чтобы получить доступ на сайте нажмите на кнопку внизу.",
     "allsections": "Все разделы",
     "contents": "Содержание",
     "couldnotloadsectioncontent": "Не удалось загрузить содержимое раздела. Повторите попытку позже.",
     "couldnotloadsections": "Не удалось загрузить разделы, повторите попытку позже",
-    "gotothesite": "Зайти на сайт",
     "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Показать все",
-    "whoops": "Ой!"
+    "showall": "Отображать все вопросы на одной странице"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index ddbb9339989..d4f3f97d71b 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -1,19 +1,14 @@
 {
-    "activitynotyetviewable": "Denna aktivitet eller resurs kan ännu inte visas i appen.",
-    "activitynotyetviewablegothere": "Denna aktivitet eller resurs kan ännu inte visas i appen, klicka på knappen nedan för att komma åt den via ordinarie webbsidan",
     "allsections": "Alla sektioner",
     "confirmdownload": "Du är på väg att ladda ner {{size}}. Är du säker att du vill fortsätta?",
-    "confirmdownloadsection": "Du är på väg att ladda ner {{size}}. Är du säker att du vill fortsätta?",
     "confirmdownloadunknownsize": "Det gick inte att beräkna storleken på nedladdningen . Det gick inte att beräkna storleken på nedladdningen . Är du säker att du vill fortsätta och ladda ner?",
     "contents": "Innehåll",
     "couldnotloadsectioncontent": "Det gick inte att läsa sektionens innehåll. Vänligen försök igen senare.",
     "couldnotloadsections": "Det gick inte att läsa sektionen. Vänligen försök igen senare.",
     "errordownloadingsection": "Fel vid nedladdning av sektion",
     "errorgetmodule": "Fel vid hämtning av data",
-    "gotothesite": "Gå till webbplatsen",
     "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla",
-    "whoops": "Hoppsan!"
+    "showall": "Visa alla frågor på en sida"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/tr.json b/www/core/components/course/lang/tr.json
index 027484a1cc3..8d09b5affd9 100644
--- a/www/core/components/course/lang/tr.json
+++ b/www/core/components/course/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "allsections": "Tüm Bölümler",
-    "contents": "İçerik(ler)",
+    "contents": "İçerik",
     "hiddenfromstudents": "Öğrencilerden gizli",
     "overriddennotice": "Bu etkinlikteki final notunuz, elle ayarlandı.",
-    "showall": "Tümünü göster"
+    "showall": "Bütün soruları tek sayfada göster"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-cn.json b/www/core/components/course/lang/zh-cn.json
index c60b61bdc0b..85734e6d23c 100644
--- a/www/core/components/course/lang/zh-cn.json
+++ b/www/core/components/course/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "contents": "内容",
     "hiddenfromstudents": "对学生隐藏",
     "overriddennotice": "您在该活动中的最终成绩将自动调整。",
-    "showall": "全部显示"
+    "showall": "所有题目显示在一页"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-tw.json b/www/core/components/course/lang/zh-tw.json
index e71584065fe..dcdeaf4d160 100644
--- a/www/core/components/course/lang/zh-tw.json
+++ b/www/core/components/course/lang/zh-tw.json
@@ -1,6 +1,4 @@
 {
-    "activitynotyetviewable": "此應用程式尚未檢視這項活動.",
-    "activitynotyetviewablegothere": "此應用程式尚未檢視這項活動或資源, 請按底下的按鈕從網站存取.",
     "activitynotyetviewableinapp": "我們正在努力支援{{$ a}}活動.",
     "activitynotyetviewableremoteaddon": "您的組織安裝了尚未支援的外掛",
     "activitynotyetviewablesiteupgradeneeded": "您的組織的Moodle安裝需要更新.",
@@ -8,19 +6,16 @@
     "askadmintosupport": "請與網站管理員聯繫, 告知他們您要使用Moodle Mobile應用程式使用此活動.",
     "confirmdeletemodulefiles": "您確定要刪除此模組檔案嗎?",
     "confirmdownload": "您即將下載{{size}}. 您確定您要繼續嗎?",
-    "confirmdownloadsection": "您即將下載{{size}}. 您確定您要繼續嗎?",
     "confirmdownloadunknownsize": "我們無法計算下載的容量. 您確定要下載嗎?",
     "confirmpartialdownloadsize": "您即將下載<strong>至少</ strong> {{size}}. 您確定您要繼續嗎?",
-    "contents": "內容",
+    "contents": "目錄",
     "couldnotloadsectioncontent": "無法載入區塊內容, 請稍後再試.",
     "couldnotloadsections": "無法載入區塊, 請稍後再試.",
     "errordownloadingsection": "載入區塊時發生錯誤",
     "errorgetmodule": "取得模組資料時出現錯誤",
-    "gotothesite": "連到網站",
     "hiddenfromstudents": "對學生隱藏",
     "nocontentavailable": "目前無內容可使用",
     "overriddennotice": "您在這活動的最後成績是手動調整的。",
-    "showall": "顯示全部",
-    "useactivityonbrowser": "你可以以瀏覽器一直使用",
-    "whoops": "糟糕!"
+    "showall": "在一頁中顯示所有題目",
+    "useactivityonbrowser": "你可以以瀏覽器一直使用"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/ar.json b/www/core/components/courses/lang/ar.json
index 6bfff44c319..d78db76df94 100644
--- a/www/core/components/courses/lang/ar.json
+++ b/www/core/components/courses/lang/ar.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "يسمح للمستخدمين الضيوف بالدخول إلى هذا المقرر الدراسي",
     "availablecourses": "المقررات الدراسية المتاحة",
-    "categories": "تصنيفات المقررات الدراسية",
+    "categories": "فئات",
     "courses": "تصنيف المقررات الدراسية",
     "enrolme": "سجلني",
     "frontpage": "الصفحة الرئيسية",
-    "mycourses": "مقرراتي",
-    "nocourses": "لا يوجد معلومات لمقرر دراسي ليتم اظهرها",
+    "mycourses": "مقرراتي الدراسية",
+    "nocourses": "لا توجد مقررات دراسية بعد",
     "nocoursesyet": "لا توجد مقررات دراسية لهذه الفئة",
-    "nosearchresults": "لا توجد نتائج لهذا البحث",
+    "nosearchresults": "لا يوجد نتائج",
     "notenroled": "أنت لست مسجلاً كطالب في هذا المقرر",
-    "password": "كلمة المرور",
+    "password": "كلمة السر",
     "search": "بحث",
-    "searchcourses": "إبحث في المقررات"
+    "searchcourses": "البحث في المقررات الدراسية"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/bg.json b/www/core/components/courses/lang/bg.json
index 895ac9d4300..185273896cc 100644
--- a/www/core/components/courses/lang/bg.json
+++ b/www/core/components/courses/lang/bg.json
@@ -1,15 +1,15 @@
 {
     "allowguests": "В този курс могат да влизат гости",
     "availablecourses": "Налични курсове",
-    "categories": "Категории курсове",
+    "categories": "Категории",
     "courses": "Курсове",
     "enrolme": "Запишете ме",
     "errorloadcourses": "Грешка при зареждането на курсовете.",
     "frontpage": "Заглавна страница",
     "mycourses": "Моите курсове",
-    "nocourses": "Няма информация за курса, която да бъде показана.",
+    "nocourses": "Все още няма курсове",
     "nocoursesyet": "Няма курсове в тази категория",
-    "nosearchresults": "Няма открити резултати за Вашето търсене",
+    "nosearchresults": "Няма резултати",
     "password": "Парола",
     "search": "Търсене",
     "searchcourses": "Търсене на курсове"
diff --git a/www/core/components/courses/lang/ca.json b/www/core/components/courses/lang/ca.json
index dc6c6af16fd..48a43540ee7 100644
--- a/www/core/components/courses/lang/ca.json
+++ b/www/core/components/courses/lang/ca.json
@@ -2,7 +2,7 @@
     "allowguests": "Aquest curs permet entrar als usuaris visitants",
     "availablecourses": "Cursos disponibles",
     "cannotretrievemorecategories": "No es poden recuperar categories més enllà del nivell {{$a}}.",
-    "categories": "Categories de cursos",
+    "categories": "Categories",
     "confirmselfenrol": "Segur que voleu autoinscriure-us en aquest curs?",
     "courses": "Cursos",
     "enrolme": "Inscriu-me",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filtrar els meus cursos",
     "frontpage": "Pàgina principal",
     "mycourses": "Els meus cursos",
-    "nocourses": "No hi ha informació del curs per mostrar.",
+    "nocourses": "Encara no hi ha cursos",
     "nocoursesyet": "No hi ha cursos en aquesta categoria",
-    "nosearchresults": "No hi ha resultats per la vostra cerca",
-    "notenroled": "No esteu inscrit en aquest curs",
+    "nosearchresults": "Cap resultat",
+    "notenroled": "No us heu inscrit en aquest curs",
     "notenrollable": "No podeu autoinscriure-us en aquest curs.",
-    "password": "Clau d'inscripció",
-    "search": "Cerca",
+    "password": "Contrasenya",
+    "search": "Cerca...",
     "searchcourses": "Cerca cursos",
     "searchcoursesadvice": "Podeu fer servir el botó de cercar cursos per accedir als cursos com a convidat o autoinscriure-us en cursos que ho permetin.",
     "selfenrolment": "Autoinscripció",
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 43ca3125ec4..2149d9de359 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -2,10 +2,10 @@
     "allowguests": "Tento kurz je otevřen i pro hosty",
     "availablecourses": "Dostupné kurzy",
     "cannotretrievemorecategories": "Kategorie hlubší než úroveň {{$a}} nelze načíst.",
-    "categories": "Kategorie kurzů",
+    "categories": "Kategorie",
     "confirmselfenrol": "Jste si jisti, že chcete zapsat se do tohoto kurzu?",
     "courses": "Kurzy",
-    "enrolme": "Zapsat se",
+    "enrolme": "Zapsat se do kurzu",
     "errorloadcategories": "Při načítání kategorií došlo k chybě.",
     "errorloadcourses": "Při načítání kurzů došlo k chybě.",
     "errorsearching": "Při vyhledávání došlo k chybě.",
@@ -13,14 +13,14 @@
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
-    "nocourses": "O kurzu nejsou žádné informace.",
+    "nocourses": "Žádné kurzy",
     "nocoursesyet": "Žádný kurz v této kategorii",
-    "nosearchresults": "Z vašeho hledání nebyly nalezeny žádné výsledky",
-    "notenroled": "V tomto kurzu nejste zapsán",
+    "nosearchresults": "Žádné výsledky",
+    "notenroled": "Nejste zapsáni v tomto kurzu",
     "notenrollable": "Do tohoto kurzu se nemůžete sami zapsat.",
-    "password": "Klíč zápisu",
-    "search": "Hledat",
-    "searchcourses": "Hledat kurzy",
+    "password": "Heslo",
+    "search": "Vyhledávání...",
+    "searchcourses": "Vyhledat kurzy",
     "searchcoursesadvice": "Můžete použít tlačítko Vyhledat kurzy, pracovat jako host nebo se zapsat do kurzů, které to umožňují.",
     "selfenrolment": "Zápis sebe sama",
     "totalcoursesearchresults": "Celkem kurzů:  {{$a}}"
diff --git a/www/core/components/courses/lang/da.json b/www/core/components/courses/lang/da.json
index d27ca91a856..d54d7eaf1b1 100644
--- a/www/core/components/courses/lang/da.json
+++ b/www/core/components/courses/lang/da.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Dette kursus tillader gæster",
     "availablecourses": "Tilgængelige kurser",
-    "categories": "Kursuskategorier",
+    "categories": "Kategorier",
     "confirmselfenrol": "Er du sikker på at du ønsker at tilmelde dig dette kursus?",
     "courses": "Alle kurser",
     "enrolme": "Tilmeld mig",
@@ -11,14 +11,14 @@
     "filtermycourses": "Filtrer mit kursus",
     "frontpage": "Forside",
     "mycourses": "Mine kurser",
-    "nocourses": "Der er ingen kursusoplysninger at vise.",
+    "nocourses": "Der er endnu ingen kurser",
     "nocoursesyet": "Der er ingen kurser i denne kategori",
-    "nosearchresults": "Din søgning gav ingen resultater",
+    "nosearchresults": "Ingen resultater",
     "notenroled": "Du er ikke tilmeldt dette kursus",
     "notenrollable": "Du kan ikke selv tilmelde dig dette kursus.",
-    "password": "Tilmeldingsnøgle",
-    "search": "Søg",
-    "searchcourses": "Kursussøgning",
+    "password": "Adgangskode",
+    "search": "Søg...",
+    "searchcourses": "Søg kurser",
     "searchcoursesadvice": "Du kan bruge knappen kursussøgning for at få adgang som gæst eller tilmelde dig kurser der tillader det.",
     "selfenrolment": "Selvtilmelding",
     "totalcoursesearchresults": "Kurser i alt: {{$a}}"
diff --git a/www/core/components/courses/lang/de.json b/www/core/components/courses/lang/de.json
index 4e3b14126e9..44a6eb68eef 100644
--- a/www/core/components/courses/lang/de.json
+++ b/www/core/components/courses/lang/de.json
@@ -2,10 +2,10 @@
     "allowguests": "Der Kurs ist für Gäste zugänglich",
     "availablecourses": "Kursliste",
     "cannotretrievemorecategories": "Kursbereiche tiefer als Level {{$a}} können nicht abgerufen werden.",
-    "categories": "Kursbereiche",
+    "categories": "Kategorien",
     "confirmselfenrol": "Möchten Sie sich selbst in diesen Kurs einschreiben?",
     "courses": "Kurse",
-    "enrolme": "Selbst einschreiben",
+    "enrolme": "Einschreiben",
     "errorloadcategories": "Fehler beim Laden der Kursbereiche",
     "errorloadcourses": "Fehler beim Laden der Kurse",
     "errorsearching": "Fehler beim Suchen",
@@ -13,13 +13,13 @@
     "filtermycourses": "Meine Kurse filtern",
     "frontpage": "Startseite",
     "mycourses": "Meine Kurse",
-    "nocourses": "Keine Kursinformation",
+    "nocourses": "Keine Kurse",
     "nocoursesyet": "Keine Kurse in diesem Kursbereich",
-    "nosearchresults": "Keine Suchergebnisse",
-    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben.",
+    "nosearchresults": "Keine Ergebnisse",
+    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben",
     "notenrollable": "Sie können sich nicht selbst in diesen Kurs einschreiben.",
-    "password": "Einschreibeschlüssel",
-    "search": "Suchen",
+    "password": "Gastschlüssel",
+    "search": "Suchen...",
     "searchcourses": "Kurse suchen",
     "searchcoursesadvice": "Sie können Kurse suchen, um als Gast teilzunehmen oder sich selbst einzuschreiben, falls dies erlaubt ist.",
     "selfenrolment": "Selbsteinschreibung",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index da8d01f0e52..c229315e83e 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Σε αυτό το μάθημα επιτρέπονται και οι επισκέπτες",
-    "availablecourses": "Διαθέσιμα μαθήματα",
-    "categories": "Κατηγορίες μαθημάτων",
+    "availablecourses": "Διαθέσιμα Μαθήματα",
+    "categories": "Κατηγορίες",
     "confirmselfenrol": "Είστε σίγουροι ότι θέλετε να εγγραφείτε σε αυτό το μάθημα;",
     "courses": "Μαθήματα",
     "enrolme": "Εγγραφή",
@@ -11,13 +11,13 @@
     "filtermycourses": "Φιλτράρισμα των μαθημάτων μου",
     "frontpage": "Αρχική σελίδα",
     "mycourses": "Τα μαθήματά μου",
-    "nocourses": "Δεν υπάρχουν πληροφορίες για αυτό το μάθημα.",
+    "nocourses": "Δεν υπάρχουν μαθήματα ακόμα",
     "nocoursesyet": "Δεν υπάρχουν μαθήματα σε αυτήν την κατηγορία",
-    "nosearchresults": "Δεν βρέθηκαν αποτελέσματα",
-    "notenroled": "Δεν έχετε εγγραφεί σε αυτό το μάθημα",
+    "nosearchresults": "Δε βρέθηκαν αποτελέσματα για την αναζήτησή σας",
+    "notenroled": "Δεν είσαι εγγεγραμμένος σε αυτό το μάθημα",
     "notenrollable": "Δεν μπορείτε να αυτο-εγγραφείτε σε αυτό το μάθημα.",
-    "password": "Κλειδί εγγραφής",
-    "search": "Αναζήτηση",
+    "password": "Κωδικός πρόσβασης",
+    "search": "Αναζήτηση...",
     "searchcourses": "Αναζήτηση μαθημάτων",
     "searchcoursesadvice": "Μπορείτε να χρησιμοποιήσετε το κουμπί Αναζήτηση μαθημάτων για πρόσβαση ως επισκέπτης ή για να αυτο-εγγραφείτε σε μαθήματα που το επιτρέπουν.",
     "selfenrolment": "Αυτο-εγγραφή",
diff --git a/www/core/components/courses/lang/es-mx.json b/www/core/components/courses/lang/es-mx.json
index 3b5fa60c3b6..59e8d8d7f1e 100644
--- a/www/core/components/courses/lang/es-mx.json
+++ b/www/core/components/courses/lang/es-mx.json
@@ -13,13 +13,13 @@
     "filtermycourses": "<<<filtrar mis cursos",
     "frontpage": "Portada",
     "mycourses": "Mis cursos",
-    "nocourses": "Sin información del curso para mostrar.",
+    "nocourses": "Ningun curso",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "No hubo resultados de su búsqueda",
+    "nosearchresults": "Sin resultados",
     "notenroled": "Usted no está inscrito en este curso",
     "notenrollable": "Usted no puede inscribirse a Usted mismo en este curso.",
-    "password": "Clave de inscripción",
-    "search": "Buscar",
+    "password": "Contraseña",
+    "search": "Buscar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Usted puede usar el botón de 'buscar cursos' para acceder como invitado o para inscribirse Usted mismo en los cursos que lo permitan.",
     "selfenrolment": "Auto-inscripción",
diff --git a/www/core/components/courses/lang/es.json b/www/core/components/courses/lang/es.json
index c631db3a6aa..fa83f38a1a7 100644
--- a/www/core/components/courses/lang/es.json
+++ b/www/core/components/courses/lang/es.json
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtrar mis cursos",
     "frontpage": "Página Principal",
     "mycourses": "Mis cursos",
-    "nocourses": "No hay información del curso para mostrar.",
+    "nocourses": "Sin cursos",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "No hay resultados para su búsqueda",
-    "notenroled": "No está inscrito en este curso",
+    "nosearchresults": "Sin resultados",
+    "notenroled": "Usted no está matriculado en este curso",
     "notenrollable": "No puede auto-matricularse en este curso.",
-    "password": "Clave",
-    "search": "Buscar",
+    "password": "Contraseña",
+    "search": "Buscar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Puede utilizar el botón de buscar cursos para acceder como invitado o auto-matricularse en los cursos que lo permitan.",
     "selfenrolment": "Auto-matriculación",
diff --git a/www/core/components/courses/lang/eu.json b/www/core/components/courses/lang/eu.json
index a481ebaf120..432752fcf75 100644
--- a/www/core/components/courses/lang/eu.json
+++ b/www/core/components/courses/lang/eu.json
@@ -2,10 +2,10 @@
     "allowguests": "Ikastaro honetan bisitariak sar daitezke",
     "availablecourses": "Eskura dauden ikastaroak",
     "cannotretrievemorecategories": "{{$a}}. maila baino sakonagoko kategoriak ezin dira eskuratu.",
-    "categories": "Ikastaro-kategoriak",
+    "categories": "Kategoriak",
     "confirmselfenrol": "Ziur zaude ikastaro honetan izena eman nahi duzula?",
     "courses": "Ikastaroak",
-    "enrolme": "Matrikulatu nazazu",
+    "enrolme": "Matrikula nazazu",
     "errorloadcategories": "Errorea gertatu da kategoriak kargatzean.",
     "errorloadcourses": "Errore bat gertatu da ikastaroak kargatzean.",
     "errorsearching": "Errorea gertatu da bilatzean.",
@@ -13,14 +13,14 @@
     "filtermycourses": "Nire ikastaroak iragazi",
     "frontpage": "Hasiera-orria",
     "mycourses": "Nire ikastaroak",
-    "nocourses": "Ez dago erakusteko ikastaro-informaziorik.",
+    "nocourses": "Ez dago ikastarorik",
     "nocoursesyet": "Ez dago ikastarorik kategoria honetan",
-    "nosearchresults": "Ez da emaitzik aurkitu zure bilaketarentzat",
+    "nosearchresults": "Emaitzarik ez",
     "notenroled": "Ez zaude matrikulatuta ikastaro honetan",
     "notenrollable": "Ezin duzu zeure burua matrikulatu ikastaro honetan.",
-    "password": "Matrikulazio-giltza",
-    "search": "Bilatu",
-    "searchcourses": "Ikastaroak bilatu",
+    "password": "Pasahitza",
+    "search": "Bilatu...",
+    "searchcourses": "Bilatu ikastaroak",
     "searchcoursesadvice": "Bilatu botoia erabil dezakezu ikastaroak topatu eta bisitari gisa sartu edo bertan matrikulatzeko ikastaroak baimentzen badu.",
     "selfenrolment": "Matrikulazio automatikoa",
     "totalcoursesearchresults": "Ikastaroak guztira: {{$a}}"
diff --git a/www/core/components/courses/lang/fa.json b/www/core/components/courses/lang/fa.json
index 7843a006162..587cc3dd537 100644
--- a/www/core/components/courses/lang/fa.json
+++ b/www/core/components/courses/lang/fa.json
@@ -1,19 +1,19 @@
 {
     "allowguests": "ورود کاربران مهمان به این درس مجاز است",
     "availablecourses": "درس‌های موجود",
-    "categories": "طبقه‌های درسی",
+    "categories": "طبقه‌ها",
     "confirmselfenrol": "آیا مطمئنید که می‌خواهید خود را در این درس ثبت‌نام کنید؟",
     "courses": "درس‌ها",
-    "enrolme": "من را ثیت نام کن",
+    "enrolme": "ثبت‌نام من",
     "errorloadcourses": "در هنگام بارگیری درس‌ها خطایی رخ داد.",
     "filtermycourses": "پالایش درس‌های من",
     "frontpage": "صفحهٔ اول",
-    "mycourses": "درسهای من",
-    "nocourses": "هیچ درسی برای نمایش وجود ندارد",
+    "mycourses": "درس‌های من",
+    "nocourses": "درسی وجود ندارد",
     "nocoursesyet": "درسی در این طبقه وجود ندارد",
-    "nosearchresults": "نتایجی برای جستجوی شما وجود نداشت.",
+    "nosearchresults": "بدون نتیجه",
     "notenroled": "شما در این درس ثبت‌نام نیستید",
-    "password": "رمز ورود",
-    "search": "جستجو",
-    "searchcourses": "جستجو بین درس‌ها"
+    "password": "رمز دسترسی",
+    "search": "جستجو...",
+    "searchcourses": "جستجوی درس‌ها"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/fr.json b/www/core/components/courses/lang/fr.json
index 1861d031977..6fa919a52d9 100644
--- a/www/core/components/courses/lang/fr.json
+++ b/www/core/components/courses/lang/fr.json
@@ -2,7 +2,7 @@
     "allowguests": "Les visiteurs anonymes sont autorisés dans ce cours",
     "availablecourses": "Cours disponibles",
     "cannotretrievemorecategories": "Les catégories de niveau plus grand que {{$a}} ne peuvent pas être chargées.",
-    "categories": "Catégories de cours",
+    "categories": "Catégories",
     "confirmselfenrol": "Voulez-vous vraiment vous inscrire vous-même dans ce cours ?",
     "courses": "Cours",
     "enrolme": "M'inscrire",
@@ -13,14 +13,14 @@
     "filtermycourses": "Filtrer mes cours",
     "frontpage": "Page d'accueil",
     "mycourses": "Mes cours",
-    "nocourses": "Aucune information de cours à afficher",
+    "nocourses": "Pas de cours",
     "nocoursesyet": "Il n'y a pas encore de cours",
-    "nosearchresults": "Votre recherche n'a donné aucun résultat",
+    "nosearchresults": "Aucun résultat",
     "notenroled": "Vous n'êtes pas inscrit à ce cours",
     "notenrollable": "Vous ne pouvez pas vous inscrire vous-même à ce cours.",
-    "password": "Clef d'inscription",
-    "search": "Rechercher",
-    "searchcourses": "Rechercher des cours",
+    "password": "Mot de passe",
+    "search": "Recherche...",
+    "searchcourses": "Rechercher les cours",
     "searchcoursesadvice": "Veuillez utiliser le bouton de recherche de cours pour accéder anonymement à des cours ou vous inscrire vous-même à des cours qui le permettent.",
     "selfenrolment": "Auto-inscription",
     "totalcoursesearchresults": "Nombre de cours : {{$a}}"
diff --git a/www/core/components/courses/lang/he.json b/www/core/components/courses/lang/he.json
index 3b37f6255cc..6a11c6c797e 100644
--- a/www/core/components/courses/lang/he.json
+++ b/www/core/components/courses/lang/he.json
@@ -1,17 +1,17 @@
 {
     "allowguests": "הקורס הזה מרשה למשתמשים אורחים להכנס",
     "availablecourses": "קורסים זמינים",
-    "categories": "קטגוריות קורסים",
+    "categories": "קטגוריות",
     "courses": "קורסים",
     "enrolme": "רשום אותי",
     "errorloadcourses": "התרחשה שגיאה בזמן טעינת הקורסים.",
     "frontpage": "עמוד ראשי",
     "mycourses": "הקורסים שלי",
-    "nocourses": "אין מידע שניתן להציג על הקורס",
+    "nocourses": "טרם נרשמתם לקורס כלשהו",
     "nocoursesyet": "אין קורסים בקטגוריה זו",
-    "nosearchresults": "לחיפוש שלך לא היו תוצאות",
+    "nosearchresults": "אין תוצאות",
     "notenroled": "אינך רשום לקורס זה",
     "password": "סיסמה",
-    "search": "חיפוש",
+    "search": "חיפוש...",
     "searchcourses": "חיפוש קורסים"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/hu.json b/www/core/components/courses/lang/hu.json
index fb4d2274bef..fb7d3ac5d45 100644
--- a/www/core/components/courses/lang/hu.json
+++ b/www/core/components/courses/lang/hu.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "Ez a kurzus megengedi vendégek belépését",
     "availablecourses": "Felvehető kurzusok",
-    "categories": "Kurzuskategóriák",
+    "categories": "Kategóriák",
     "courses": "Kurzusok",
     "enrolme": "Iratkoztasson be",
     "frontpage": "Kezdőoldal",
     "mycourses": "Kurzusaim",
-    "nocourses": "Nincs megjelenítendő kurzusinformáció.",
+    "nocourses": "Nincs kurzus",
     "nocoursesyet": "Ebben a kategóriában nincsenek kurzusok",
-    "nosearchresults": "Keresése nem adott eredményt",
+    "nosearchresults": "Nincs eredmény",
     "notenroled": "Ezt a kurzust nem vette föl",
     "password": "Jelszó",
-    "search": "Keresés",
-    "searchcourses": "Kurzusok keresése"
+    "search": "Keresés...",
+    "searchcourses": "Keresés a kurzusokban"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/it.json b/www/core/components/courses/lang/it.json
index c46c10af2f5..78743b9a170 100644
--- a/www/core/components/courses/lang/it.json
+++ b/www/core/components/courses/lang/it.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Questo corso consente l'accesso ad utenti ospiti",
     "availablecourses": "Corsi disponibili",
-    "categories": "Categorie di corso",
+    "categories": "Categorie",
     "confirmselfenrol": "Desideri iscriverti al corso?",
     "courses": "Corsi",
     "enrolme": "Iscrivimi",
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtra i miei corsi",
     "frontpage": "Pagina home",
     "mycourses": "I miei corsi",
-    "nocourses": "Non sono presenti informazioni sul corso.",
+    "nocourses": "Non ci sono corsi",
     "nocoursesyet": "Questa categoria non ha corsi",
-    "nosearchresults": "La ricerca non ha prodotto risultati",
+    "nosearchresults": "Nessun risultato",
     "notenroled": "Non sei iscritto in questo corso",
     "notenrollable": "Non puoi iscriverti al corso.",
-    "password": "Chiave di iscrizione",
-    "search": "Cerca",
+    "password": "Chiave",
+    "search": "Cerca...",
     "searchcourses": "Cerca corsi",
     "searchcoursesadvice": "Puoi utilizzare la ricerca corsi per accedere come ospite oppure iscriverti nei corsi che lo consentono.",
     "selfenrolment": "Iscrizione spontanea",
diff --git a/www/core/components/courses/lang/ja.json b/www/core/components/courses/lang/ja.json
index fd48458adcb..5c4918df412 100644
--- a/www/core/components/courses/lang/ja.json
+++ b/www/core/components/courses/lang/ja.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "このコースにはゲストユーザも入ることができます。",
     "availablecourses": "コース一覧",
-    "categories": "コースカテゴリ",
+    "categories": "カテゴリ",
     "courses": "コース",
     "enrolme": "私を登録する",
     "frontpage": "フロントページ",
     "mycourses": "マイコース",
-    "nocourses": "表示するコース情報はありません。",
+    "nocourses": "コースなし",
     "nocoursesyet": "このカテゴリにコースはありません。",
-    "nosearchresults": "あなたの検索の該当データは見つかりませんでした。",
-    "notenroled": "あなたはこのコースに受講登録されていません。",
+    "nosearchresults": "該当なし",
+    "notenroled": "あなたはこのコースに登録されていません。",
     "password": "パスワード",
-    "search": "検索",
+    "search": "検索 ...",
     "searchcourses": "コースを検索する"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/lt.json b/www/core/components/courses/lang/lt.json
index cc7eb529a53..c379bfd8495 100644
--- a/www/core/components/courses/lang/lt.json
+++ b/www/core/components/courses/lang/lt.json
@@ -1,23 +1,23 @@
 {
     "allowguests": "Į šiuos kursus leidžiama įeiti svečiui",
     "availablecourses": "Kursai",
-    "categories": "Kursų kategorijos",
+    "categories": "Kategorijos",
     "confirmselfenrol": "Ar Jūs tikrai norite įsirašyti į šiuos mokymo kursus?",
     "courses": "Kursai",
-    "enrolme": "Įrašyti mane",
+    "enrolme": "Įregistruoti mane",
     "errorloadcourses": "Klaida kraunant kursus.",
     "errorsearching": "Paieškos klaida.",
     "errorselfenrol": "Klaida įrašant.",
     "filtermycourses": "Filtruoti mano kursus",
     "frontpage": "Titulinis lapas",
     "mycourses": "Mano kursai",
-    "nocourses": "Nėra ką rodyti",
+    "nocourses": "Dar nėra kursų",
     "nocoursesyet": "Nėra šios kategorijos kursų",
-    "nosearchresults": "Paieškos rezultatų nėra",
-    "notenroled": "Nesate įrašytas į šį kursą",
+    "nosearchresults": "Nėra rezultatų",
+    "notenroled": "Nesate įsiregistravęs kaip šių kursų besimokantysis",
     "notenrollable": "Negalite įrašyti savęs į šį kursą.",
-    "password": "Įrašymo raktas",
-    "search": "Ieškoti",
+    "password": "Slaptažodis",
+    "search": "Paieška...",
     "searchcourses": "Ieškoti kursų",
     "searchcoursesadvice": "Jūs galite naudoti kursų paieškos mygtuką ieškant kursų su svečio prieiga arba įrašyti save į kursus, kurie yra prieinami.",
     "selfenrolment": "Savarankiška registracija",
diff --git a/www/core/components/courses/lang/nl.json b/www/core/components/courses/lang/nl.json
index 60fc63d43fe..3ccabdad311 100644
--- a/www/core/components/courses/lang/nl.json
+++ b/www/core/components/courses/lang/nl.json
@@ -2,10 +2,10 @@
     "allowguests": "In deze cursus zijn gasten toegestaan",
     "availablecourses": "Beschikbare cursussen",
     "cannotretrievemorecategories": "Categorieën dieper dan niveau {{$a}} kunnen niet opgehaald worden.",
-    "categories": "Cursuscategorieën",
+    "categories": "Categorieën",
     "confirmselfenrol": "Weet je zeker dat je je wil aanmelden in deze cursus?",
     "courses": "Cursussen",
-    "enrolme": "Meld me aan",
+    "enrolme": "Laat me in de cursus",
     "errorloadcategories": "Er is een fout opgetreden bij het ophalen van categorieën",
     "errorloadcourses": "Er is een fout opgetreden tijdens het laden van de cursussen.",
     "errorsearching": "Er is een fout opgetreden tijdens het zoeken.",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filter mijn cursussen",
     "frontpage": "Startpagina",
     "mycourses": "Mijn cursussen",
-    "nocourses": "Geen cursusinformatie beschikbaar.",
+    "nocourses": "Geen cursussen",
     "nocoursesyet": "Er zijn geen cursussen in deze categorie",
-    "nosearchresults": "Je zoekopdracht gaf geen resultaten",
-    "notenroled": "Je bent niet aangemeld in deze cursus.",
+    "nosearchresults": "Geen resultaten",
+    "notenroled": "Je bent niet aangemeld in deze cursus",
     "notenrollable": "Je kunt jezelf niet aanmelden in deze cursus.",
-    "password": "Aanmeldingssleutel",
-    "search": "Zoek",
+    "password": "Wachtwoord",
+    "search": "Zoeken...",
     "searchcourses": "Zoek cursussen",
     "searchcoursesadvice": "Je kunt via de cursus zoekknop toegang krijgen als gast of jezelf aanmelden in cursussen die dit toestaan.",
     "selfenrolment": "Zelf aanmelden",
diff --git a/www/core/components/courses/lang/pl.json b/www/core/components/courses/lang/pl.json
index b7e9f9cc4fb..8f026d344b2 100644
--- a/www/core/components/courses/lang/pl.json
+++ b/www/core/components/courses/lang/pl.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "W tym kursie mogą uczestniczyć również goście",
     "availablecourses": "Dostępne kursy",
-    "categories": "Kategorie kursów",
+    "categories": "Kategorie",
     "courses": "Kursy",
     "enrolme": "Zapisz mnie",
     "frontpage": "Strona startowa",
     "mycourses": "Moje kursy",
-    "nocourses": "Nie ma informacji do pokazania",
+    "nocourses": "Nie ma jeszcze żadnych kursów",
     "nocoursesyet": "Brak kursów w tej kategorii",
-    "nosearchresults": "Brak rezultatów wyszukiwania",
-    "notenroled": "Nie jesteś zapisany jako student w tym kursu",
+    "nosearchresults": "Brak wyników",
+    "notenroled": "Nie jesteś zapisany w tym kursie",
     "password": "Hasło",
-    "search": "Wyszukaj",
-    "searchcourses": "Przeszukaj kursy"
+    "search": "Szukaj...",
+    "searchcourses": "Szukaj kursów"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index 2090e867bb9..c321354487f 100644
--- a/www/core/components/courses/lang/pt-br.json
+++ b/www/core/components/courses/lang/pt-br.json
@@ -2,7 +2,7 @@
     "allowguests": "Visitantes podem entrar neste curso",
     "availablecourses": "Cursos disponíveis",
     "cannotretrievemorecategories": "Categorias mais profundas que o nível {{$a}} não podem ser recuperadas.",
-    "categories": "Categorias de Cursos",
+    "categories": "Categorias",
     "confirmselfenrol": "Tem certeza de que deseja inscrever-se neste curso?",
     "courses": "Cursos",
     "enrolme": "Inscreva-me",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filtrar meus cursos",
     "frontpage": "Primeira página",
     "mycourses": "Meus cursos",
-    "nocourses": "Sem informações sobre o curso para mostrar.",
+    "nocourses": "Ainda não existem cursos",
     "nocoursesyet": "Nenhum curso nesta categoria",
-    "nosearchresults": "Não foram encontrados resultados da sua pesquisa",
-    "notenroled": "Você não está registrado neste curso",
+    "nosearchresults": "Nenhum resultado",
+    "notenroled": "Você não está inscrito como estudante neste curso",
     "notenrollable": "Você não pode inscrever-se neste curso.",
-    "password": "Chave de inscrição",
-    "search": "Pesquisa",
+    "password": "Senha",
+    "search": "Procurar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Você pode usar o botão de busca para acessar os cursos como convidado ou matricular-se em cursos que permitem que ele.",
     "selfenrolment": "Auto-inscrição",
diff --git a/www/core/components/courses/lang/pt.json b/www/core/components/courses/lang/pt.json
index 4141a2e97fb..13e43a79c56 100644
--- a/www/core/components/courses/lang/pt.json
+++ b/www/core/components/courses/lang/pt.json
@@ -2,10 +2,10 @@
     "allowguests": "Esta disciplina permite o acesso a visitantes",
     "availablecourses": "Disciplinas disponíveis",
     "cannotretrievemorecategories": "Categorias abaixo do nível {{$a}} não podem ser recuperadas.",
-    "categories": "Categorias de disciplinas",
+    "categories": "Categorias",
     "confirmselfenrol": "Tem certeza de que deseja inscrever-se nesta disciplina?",
     "courses": "Disciplinas",
-    "enrolme": "Inscreva-me",
+    "enrolme": "Inscrever-me",
     "errorloadcategories": "Ocorreu um erro ao carregar as categorias.",
     "errorloadcourses": "Ocorreu um erro ao carregar as disciplinas.",
     "errorsearching": "Ocorreu um erro durante a pesquisa.",
@@ -13,14 +13,14 @@
     "filtermycourses": "Filtrar as minhas disciplinas",
     "frontpage": "Página principal do site",
     "mycourses": "As minhas disciplinas",
-    "nocourses": "Sem informações das disciplinas para mostrar",
+    "nocourses": "Não há disciplinas para mostrar",
     "nocoursesyet": "Nenhuma disciplina nesta categoria",
-    "nosearchresults": "Não foram encontrados resultados na sua pesquisa",
-    "notenroled": "Não está inscrito nesta disciplina",
+    "nosearchresults": "Sem resultados",
+    "notenroled": "Não está inscrito como aluno nesta disciplina",
     "notenrollable": "Não se pode inscrever nesta disciplina.",
-    "password": "Senha de inscrição",
-    "search": "Pesquisar",
-    "searchcourses": "Pesquisar disciplinas",
+    "password": "Senha",
+    "search": "Pesquisa...",
+    "searchcourses": "Procurar disciplinas",
     "searchcoursesadvice": "Pode usar o botão de pesquisa de disciplinas para aceder às mesmas como visitante ou autoinscrever-se caso o permitam.",
     "selfenrolment": "Autoinscrição",
     "totalcoursesearchresults": "Total de disciplinas: {{$a}}"
diff --git a/www/core/components/courses/lang/ro.json b/www/core/components/courses/lang/ro.json
index d2e6db9c9e2..0fefab6b5b3 100644
--- a/www/core/components/courses/lang/ro.json
+++ b/www/core/components/courses/lang/ro.json
@@ -1,23 +1,23 @@
 {
     "allowguests": "Acest curs permite accesul vizitatorilor",
     "availablecourses": "Cursuri disponibile",
-    "categories": "Categorii de cursuri",
+    "categories": "Categorii",
     "confirmselfenrol": "Sunteți sigur/ă că doriți să vă înregistrați la acest curs?",
     "courses": "Cursuri",
-    "enrolme": "Înregistrează-mă",
+    "enrolme": "Înscrie-mă",
     "errorloadcourses": "A apărut o eroare la încărcarea cursurilor.",
     "errorsearching": "A apărut o eroare în procesul de căutare.",
     "errorselfenrol": "A apărut o eroare în procesul de auto-înregistrare.",
     "filtermycourses": "Filtrează cursurile",
     "frontpage": "Prima pagină",
     "mycourses": "Cursurile mele",
-    "nocourses": "Nu există informații despre curs",
+    "nocourses": "Nu există cursuri",
     "nocoursesyet": "Nu s-au găsit cursuri în această categorie",
-    "nosearchresults": "Nu există rezultate pentru căutarea dumneavoastră",
-    "notenroled": "Nu sunteți înregistrat la acest curs",
+    "nosearchresults": "Nu există rezultate",
+    "notenroled": "Nu sunteți înregistrat în  acest curs",
     "notenrollable": "Nu vă puteți auto-înregistra la acest curs.",
-    "password": "Parola de înregistrare",
-    "search": "Caută",
+    "password": "Parolă",
+    "search": "Căutare",
     "searchcourses": "Caută cursuri",
     "searchcoursesadvice": "Puteți folosi butonul pentru căutarea cursurilor pentru a cauta și accesa ca vizitator sau pentru a vă auto-înregistra la acele cursuri care permit aceste opțiuni.",
     "selfenrolment": "Auto înscriere",
diff --git a/www/core/components/courses/lang/ru.json b/www/core/components/courses/lang/ru.json
index 8847673ee5b..7ce2d395bab 100644
--- a/www/core/components/courses/lang/ru.json
+++ b/www/core/components/courses/lang/ru.json
@@ -1,17 +1,17 @@
 {
     "allowguests": "Курс доступен гостю",
     "availablecourses": "Доступные курсы",
-    "categories": "Категории курсов",
+    "categories": "Категории",
     "courses": "Курсы",
     "enrolme": "Записаться на курс",
     "errorloadcourses": "При загрузке курсов произошла ошибка.",
     "frontpage": "Главная страница",
     "mycourses": "Мои курсы",
-    "nocourses": "Нет информации для отображения.",
+    "nocourses": "Пока еще нет ни одного курса",
     "nocoursesyet": "В этой категории нет курсов",
-    "nosearchresults": "Поиск не дал результатов",
+    "nosearchresults": "Нет результатов",
     "notenroled": "Вы не записаны на этот курс",
     "password": "Пароль",
-    "search": "Найти",
-    "searchcourses": "Поиск курса"
+    "search": "Искать...",
+    "searchcourses": "Поиск курсов"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index f7b7aea83fe..2852a04f2d5 100644
--- a/www/core/components/courses/lang/sv.json
+++ b/www/core/components/courses/lang/sv.json
@@ -1,23 +1,23 @@
 {
     "allowguests": "Denna kurs tillåter gäster.",
     "availablecourses": "Tillgängliga kurser",
-    "categories": "Kurskategorier",
+    "categories": "Kategorier",
     "confirmselfenrol": "Är du säker att du vill registrera dig i den här kursen ?",
     "courses": "Kurser",
-    "enrolme": "Registrera mig",
+    "enrolme": "Koppla mig",
     "errorloadcourses": "Ett fel uppstod vid inläsning av kursen",
     "errorsearching": "Fel uppstod vid sökning",
     "errorselfenrol": "Fel uppstod vid registrering",
     "filtermycourses": "Filtrera mina kurser",
     "frontpage": "Ingångssidan",
     "mycourses": "Mina kurser",
-    "nocourses": "Ingen kursinfomration att visa",
+    "nocourses": "Det finns inga kurser ännu",
     "nocoursesyet": "Inga kurser i denna kategori",
-    "nosearchresults": "Inga sökningsresultat",
-    "notenroled": "Du är inte registrerad i kursen",
+    "nosearchresults": "Inga resultat",
+    "notenroled": "Du är inte registrerad i den här kursen",
     "notenrollable": "Du kan inte självregistrera dig i kursen",
-    "password": "Kursnyckel",
-    "search": "Sök",
+    "password": "Gästlösenord",
+    "search": "Sök...",
     "searchcourses": "Sök kurser",
     "searchcoursesadvice": "Du kan använda knappen \"Sök kurser\" för att få tillgång som gäst eller registrera dig på kurser som tillåter det .",
     "selfenrolment": "Kursnyckel (Student)",
diff --git a/www/core/components/courses/lang/tr.json b/www/core/components/courses/lang/tr.json
index 9425e9078e6..5a7c4345301 100644
--- a/www/core/components/courses/lang/tr.json
+++ b/www/core/components/courses/lang/tr.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "Bu derse konuk olarak girilebilir",
-    "availablecourses": "Açılan dersler",
-    "categories": "Kurs Kategorileri",
+    "availablecourses": "Mevcut dersler",
+    "categories": "Kategoriler",
     "courses": "Dersler",
     "enrolme": "Beni kaydet",
     "frontpage": "Ön sayfa",
     "mycourses": "Derslerim",
-    "nocourses": "Gösterilecek ders bilgisi yok",
-    "nocoursesyet": "Bu kategoride ders yoktur",
-    "nosearchresults": "Aramanızla ilgili sonuç yok",
+    "nocourses": "Henüz ders yok",
+    "nocoursesyet": "Bu kategoride ders yok",
+    "nosearchresults": "Sonuç yok",
     "notenroled": "Bu derse kayıtlı değilsiniz",
-    "password": "Şifre",
-    "search": "Ara",
-    "searchcourses": "Dersleri ara"
+    "password": "Parola",
+    "search": "Arama...",
+    "searchcourses": "Kursları ara"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/zh-cn.json b/www/core/components/courses/lang/zh-cn.json
index f384e1ed13a..dec1800a0b1 100644
--- a/www/core/components/courses/lang/zh-cn.json
+++ b/www/core/components/courses/lang/zh-cn.json
@@ -1,14 +1,14 @@
 {
     "allowguests": "该课程允许访客进入",
     "availablecourses": "现有课程",
-    "categories": "课程分类",
+    "categories": "类别",
     "courses": "课程",
     "enrolme": "将我加入",
     "frontpage": "首页",
     "mycourses": "我的课程",
-    "nocourses": "没有可显示的课程信息。",
+    "nocourses": "目前没有课程",
     "nocoursesyet": "此类中无课程",
-    "nosearchresults": "您的搜索没有结果",
+    "nosearchresults": "无结果",
     "notenroled": "您没有加入此课程",
     "password": "密码",
     "search": "搜索",
diff --git a/www/core/components/courses/lang/zh-tw.json b/www/core/components/courses/lang/zh-tw.json
index eb2fde191e0..e0298818b30 100644
--- a/www/core/components/courses/lang/zh-tw.json
+++ b/www/core/components/courses/lang/zh-tw.json
@@ -1,23 +1,23 @@
 {
     "allowguests": "本課程允許無帳號者進入",
     "availablecourses": "可使用的課程",
-    "categories": "課程類別",
+    "categories": "題目分類",
     "confirmselfenrol": "您確定要註冊本課程嗎?",
     "courses": "課程",
-    "enrolme": "註冊報名",
+    "enrolme": "將我加入",
     "errorloadcourses": "載入課程時出錯.",
     "errorsearching": "搜索時出錯.",
     "errorselfenrol": "自行註冊時出現錯誤.",
     "filtermycourses": "過濾我的課程",
     "frontpage": "首頁",
     "mycourses": "我的課程",
-    "nocourses": "沒有課程資料可以顯示",
+    "nocourses": "沒有課程",
     "nocoursesyet": "此類別中無課程",
-    "nosearchresults": "您的搜索沒有任何結果.",
-    "notenroled": "您沒有註冊此課程",
+    "nosearchresults": "沒有結果",
+    "notenroled": "您沒有加入此課程",
     "notenrollable": "您無法註冊本課程.",
-    "password": "註冊碼",
-    "search": "搜尋",
+    "password": "密碼",
+    "search": "搜尋中...",
     "searchcourses": "搜尋課程",
     "searchcoursesadvice": "您可以使用搜尋課程按鈕以訪客身份登入, 或在允許它的課程中註冊",
     "selfenrolment": "自行註冊",
diff --git a/www/core/components/fileuploader/lang/ar.json b/www/core/components/fileuploader/lang/ar.json
index 3756250ce62..3b0ca9cc7ab 100644
--- a/www/core/components/fileuploader/lang/ar.json
+++ b/www/core/components/fileuploader/lang/ar.json
@@ -5,12 +5,12 @@
     "errorcapturingimage": "خطأ في التقاط الصورة",
     "errorcapturingvideo": "خطأ في التقاط الفيديو",
     "errormustbeonlinetoupload": "لابد أن تكون متصل بالأنترنت لكي يتم رفع الملفات",
-    "errorreadingfile": "خطأ في قراءة الملف",
-    "file": "ملف",
+    "errorreadingfile": "خطاء في قراءة ملف \"{{$a}}\"",
+    "file": "ملفات التغذية الراجعة (الملاحظات)",
     "fileuploaded": "الملف الذي تم رفعه",
     "maxbytesfile": "حجم الملف {{$a.file}} كبير جداً . الحد الأقصى الذي تستطيع رفعه هو {{$a.size}}.",
     "readingfile": "يتم قراءة الملف",
-    "uploadafile": "إرفع ملف",
-    "uploading": "يتم الرفع",
+    "uploadafile": "تحميل ملف",
+    "uploading": "يتم التحميل",
     "video": "فيديو"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/bg.json b/www/core/components/fileuploader/lang/bg.json
index 9d46df4051f..19e73e3040d 100644
--- a/www/core/components/fileuploader/lang/bg.json
+++ b/www/core/components/fileuploader/lang/bg.json
@@ -10,11 +10,11 @@
     "errornoapp": "Нямате инсталирано приложение, което да извърши това действие.",
     "errorreadingfile": "Грешка при четенето на файла.",
     "errorwhileuploading": "Възникна грешка при качването на файла.",
-    "file": "Файл",
+    "file": "Файлове с обратна връзка",
     "fileuploaded": "Файлът е качен",
     "photoalbums": "Фотоалбуми",
     "readingfile": "Четене на файл",
     "uploadafile": "Качване на файл",
-    "uploading": "Качване",
+    "uploading": "Качване...",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ca.json b/www/core/components/fileuploader/lang/ca.json
index f5e46ff7e10..68323beba4b 100644
--- a/www/core/components/fileuploader/lang/ca.json
+++ b/www/core/components/fileuploader/lang/ca.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "S'ha produït un error descarregant la imatge de l'àlbum.",
     "errormustbeonlinetoupload": "Heu d'estar connectat per pujar arxius.",
     "errornoapp": "No teniu instal·lada una app per realitzar aquesta acció.",
-    "errorreadingfile": "S'ha produït un error llegint el fitxer.",
+    "errorreadingfile": "S'ha produït un error en llegir el fitxer \"{{$a}}\"",
     "errorwhileuploading": "S'ha produït un error penjant el fitxer.",
-    "file": "Arxiu",
+    "file": "Fitxers de la retroacció",
     "fileuploaded": "S'ha penjat el fitxer",
-    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima de càrrega és {{$a.size}}.",
+    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima que podeu pujar és de {{$a.size}}.",
     "photoalbums": "Àlbums de fotos",
     "readingfile": "S'està llegint un fitxer",
     "selectafile": "Selecciona un fitxer",
     "uploadafile": "Penja un fitxer",
-    "uploading": "S'està penjant",
+    "uploading": "S'està carregant...",
     "uploadingperc": "S'està pujant: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/cs.json b/www/core/components/fileuploader/lang/cs.json
index 4c0277d01ff..66897f21800 100644
--- a/www/core/components/fileuploader/lang/cs.json
+++ b/www/core/components/fileuploader/lang/cs.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
     "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
     "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
-    "errorreadingfile": "Chyba při čtení souboru.",
+    "errorreadingfile": "Chyba při čtení souboru \"{{$a}}\"",
     "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
-    "file": "Soubor",
+    "file": "Soubory se zpětnou vazbou",
     "fileuploaded": "Soubor nahrán",
-    "maxbytesfile": "Soubor {{$a.file}} je příliš veliký. Maximální velikost nahrávaného souboru je {{$a.size}}.",
+    "maxbytesfile": "Soubor {{$a.file}} je příliš velký. Maximální velikost, kterou můžete nahrát, je  {{$a.size}}.",
     "photoalbums": "Fotoalba",
     "readingfile": "Čtení souboru",
     "selectafile": "Vyberte soubor",
-    "uploadafile": "Nahrát soubor",
-    "uploading": "Nahrávání",
+    "uploadafile": "Vložit soubor",
+    "uploading": "Nahrávání ...",
     "uploadingperc": "Nahrávání: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/da.json b/www/core/components/fileuploader/lang/da.json
index 3fe2280526b..356985505e1 100644
--- a/www/core/components/fileuploader/lang/da.json
+++ b/www/core/components/fileuploader/lang/da.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Fejl ved indhentning af billede fra album",
     "errormustbeonlinetoupload": "Du skal være online for at uploade filer.",
     "errornoapp": "Du har ikke installeret en app som kan udføre denne handling.",
-    "errorreadingfile": "Fejl ved læsning af fil.",
+    "errorreadingfile": "Fejl under læsning af filen \"{{$a}}\"",
     "errorwhileuploading": "En fejl opstod under upload af filen.",
-    "file": "Fil",
+    "file": "Feedback-filer",
     "fileuploaded": "Filen er uploadet.",
     "maxbytesfile": "Filen {{$a.file}} er for stor. Maksimal upload-størrelse er {{$a.size}}.",
     "photoalbums": "Fotoalbum",
     "readingfile": "Læser fil",
     "uploadafile": "Upload en fil",
-    "uploading": "Uploader",
+    "uploading": "Uploader...",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/de.json b/www/core/components/fileuploader/lang/de.json
index e54ab178c4f..72384b4829e 100644
--- a/www/core/components/fileuploader/lang/de.json
+++ b/www/core/components/fileuploader/lang/de.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
     "errormustbeonlinetoupload": "Dateien können nur online hochgeladen werden.",
     "errornoapp": "Keine App zum Ausführen dieser Aktion gefunden",
-    "errorreadingfile": "Fehler beim Lesen der Datei",
+    "errorreadingfile": "Fehler beim Lesen der Datei \"{{$a}}\"",
     "errorwhileuploading": "Fehler beim Hochladen der Datei",
-    "file": "Datei",
+    "file": "Feedbackdateien",
     "fileuploaded": "Datei hochgeladen",
     "maxbytesfile": "Die Datei {{$a.file}} ist zu groß. Die maximale Größe zum Hochladen ist {{$a.size}}.",
     "photoalbums": "Fotoalbum",
     "readingfile": "Datei lesen",
     "selectafile": "Wählen Sie eine Datei.",
     "uploadafile": "Datei hochladen",
-    "uploading": "Hochladen",
+    "uploading": "Wird hochgeladen...",
     "uploadingperc": "Hochladen: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/el.json b/www/core/components/fileuploader/lang/el.json
index 57aa3c4745c..26043910c12 100644
--- a/www/core/components/fileuploader/lang/el.json
+++ b/www/core/components/fileuploader/lang/el.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από το αλμπουμ.",
     "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
     "errornoapp": "Δεν έχετε εγκατεστημένη εφαρμογή για να εκτελέσετε αυτή την ενέργεια.",
-    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
+    "errorreadingfile": "Σφάλμα στην ανάγνωση του αρχείου \"{{$a}}\"",
     "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου.",
-    "file": "Αρχείο",
+    "file": "Αρχεία ανατροφοδότησης",
     "fileuploaded": "Το αρχείο ανέβηκε επιτυχώς.",
     "maxbytesfile": "Το αρχείο {{$a.file}} είναι πολύ μεγάλο. Το μέγιστο μέγεθος που μπορείτε να ανεβάσετε είναι {{$a.size}}.",
     "photoalbums": "Άλμπουμ φωτογραφιών",
     "readingfile": "Ανάγνωση αρχείου",
     "selectafile": "Επιλογή αρχείου",
-    "uploadafile": "Ανεβάστε ένα αρχείο",
-    "uploading": "Ανέβασμα",
+    "uploadafile": "Φόρτωση ενός αρχείου",
+    "uploading": "Ανέβασμα...",
     "uploadingperc": "Ανέβασμα: {{$a}}%",
     "video": "Βίντεο"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/es-mx.json b/www/core/components/fileuploader/lang/es-mx.json
index d299651b204..ec27c0f9ba3 100644
--- a/www/core/components/fileuploader/lang/es-mx.json
+++ b/www/core/components/fileuploader/lang/es-mx.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Error al obtener imagen del album.",
     "errormustbeonlinetoupload": "Usted tiene que estar en-línea para subir archivos.",
     "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
-    "errorreadingfile": "Error al leer archivo.",
+    "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
     "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
-    "file": "Archivo",
+    "file": "Archivos de retroalimentación",
     "fileuploaded": "El archivo fue subido exitosamente.",
-    "maxbytesfile": "El archivo {{$a.file}} es demasido grande. El tamaño máximo que Usted puede subir es {{$a.size}}.",
+    "maxbytesfile": "El archivo {{$a.file}} es demasiado grande. El tamaño máximo que Usted puede subir es de {{$a.size}}.",
     "photoalbums": "Foto álbumes",
     "readingfile": "Leyendo archivo",
     "selectafile": "Seleccionar un archivo",
     "uploadafile": "Subir un archivo",
-    "uploading": "Subiendo",
+    "uploading": "Subiendo...",
     "uploadingperc": "Subiendo: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/es.json b/www/core/components/fileuploader/lang/es.json
index 46688459cf2..12823701a59 100644
--- a/www/core/components/fileuploader/lang/es.json
+++ b/www/core/components/fileuploader/lang/es.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "añadir archivo",
+    "addfiletext": "Añadir fichero",
     "audio": "Audio",
     "camera": "Cámara",
     "confirmuploadfile": "Usted va a subir {{size}}. ¿Desea continuar?",
@@ -12,14 +12,14 @@
     "errornoapp": "Usted no tiene una app instalada para realizar esta acción.",
     "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
     "errorwhileuploading": "Ocurrió un error al subir un archivo.",
-    "file": "Archivo",
+    "file": "Archivos de retroalimentación",
     "fileuploaded": "Archivo subido",
     "maxbytesfile": "El archivo {{$a.file}} es demasido grande. El tamaño máximo que puede subir es {{$a.size}}.",
     "photoalbums": "Álbumes de fotos",
     "readingfile": "Leyendo archivo",
     "selectafile": "Seleccionar un archivo",
     "uploadafile": "Subir un archivo",
-    "uploading": "Subiendo",
+    "uploading": "Subiendo...",
     "uploadingperc": "Subiendo: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/eu.json b/www/core/components/fileuploader/lang/eu.json
index 8d5ff8b0cef..b3ad98481b1 100644
--- a/www/core/components/fileuploader/lang/eu.json
+++ b/www/core/components/fileuploader/lang/eu.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Errorea irudia bildumatik jasotzean.",
     "errormustbeonlinetoupload": "Online egon behar zara fitxategiak igotzeko.",
     "errornoapp": "Ez daukazu ekintza hau burutzeko app-ik instalatuta.",
-    "errorreadingfile": "Errorea fitxategia irakurtzean.",
+    "errorreadingfile": "Errorea \"{{$a}}\" fitxategia irakurtzean",
     "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
-    "file": "Fitxategia",
+    "file": "Feedback-fitxategiak",
     "fileuploaded": "Fitxategia ondo igo da.",
     "maxbytesfile": "{{$a.file}} fitxategia oso handia da. Igo ditzakezun fitxategien gehienezko tamaina {{$a.size}} da.",
     "photoalbums": "Argazki-bildumak",
     "readingfile": "Fitxategia irakurtzen",
     "selectafile": "Aukeratu fitxategi bat",
-    "uploadafile": "Igo fitxategia",
-    "uploading": "Igotzen",
+    "uploadafile": "Fitxategia igo",
+    "uploading": "Igotzen...",
     "uploadingperc": "Igotzen: %{{$a}}",
     "video": "Bideoa"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/fa.json b/www/core/components/fileuploader/lang/fa.json
index 02f6d7c8b77..79f201bcc61 100644
--- a/www/core/components/fileuploader/lang/fa.json
+++ b/www/core/components/fileuploader/lang/fa.json
@@ -4,7 +4,7 @@
     "errorcapturingaudio": "خطا در ضبط صدا",
     "errorcapturingvideo": "خطا در ضبط ویدئو",
     "errorreadingfile": "خطا در خواندن فایل «{{$a}}»",
-    "file": "فایل",
+    "file": "بازخورد فایلی",
     "fileuploaded": "فایل آپلود شده",
     "maxbytesfile": "فایل {{$a.file}} بسیار بزرگ است. بیشترین اندازه‌ای که می‌توانید ارسال کنید {{$a.size}} است.",
     "uploadafile": "قرار دادن یک فایل در سایت",
diff --git a/www/core/components/fileuploader/lang/fr.json b/www/core/components/fileuploader/lang/fr.json
index 68434825ec0..78d6ece3168 100644
--- a/www/core/components/fileuploader/lang/fr.json
+++ b/www/core/components/fileuploader/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Ajouter le fichier",
+    "addfiletext": "Ajouter un fichier",
     "audio": "Audio",
     "camera": "Caméra",
     "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erreur lors de la récupération de l'image de l'album.",
     "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
     "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
-    "errorreadingfile": "Erreur de lecture du fichier.",
+    "errorreadingfile": "Erreur lors de la lecture du fichier « {{$a}} »",
     "errorwhileuploading": "Une erreur est survenue lors du dépôt du fichier.",
-    "file": "Fichier",
+    "file": "Fichiers de feedback",
     "fileuploaded": "Le fichier a été déposé.",
-    "maxbytesfile": "Le fichier {{$a.file}} est trop gros. La taille maximale permise est de {{$a.size}}.",
+    "maxbytesfile": "La taille du fichier {{$a.file}} est trop grande. La taille maximale d'un fichier à déposer est de {{$a.size}}.",
     "photoalbums": "Albums de photos",
     "readingfile": "Lecture du fichier",
     "selectafile": "Choisir un fichier",
     "uploadafile": "Déposer un fichier",
-    "uploading": "Envoi",
+    "uploading": "En cours de dépôt...",
     "uploadingperc": "Dépôt en cours : {{$a}} %",
     "video": "Vidéo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/he.json b/www/core/components/fileuploader/lang/he.json
index b6dda48ad1e..79dd59daec1 100644
--- a/www/core/components/fileuploader/lang/he.json
+++ b/www/core/components/fileuploader/lang/he.json
@@ -9,13 +9,13 @@
     "errorgettingimagealbum": "שגיאה בטעינת תמונה מאלבום.",
     "errormustbeonlinetoupload": "עליך להיות מחובר/ת בכדי להעלות קבצים.",
     "errornoapp": "לא נמצא יישומון זמין לביצוע פעולה הזו.",
-    "errorreadingfile": "שגיאה בקריאת קובץ.",
+    "errorreadingfile": "שגיאה בקריאת קובץ \"{{$a}}\"",
     "errorwhileuploading": "התרחשה שגיאה בזמן הניסיון להעלות את הקובץ.",
-    "file": "קובץ",
+    "file": "משובים בקבצים",
     "fileuploaded": "הקובץ הועלה בהצלחה.",
     "photoalbums": "אלבומי תמונות",
     "readingfile": "קורא קובץ",
-    "uploadafile": "העלה קובץ",
-    "uploading": "מעלה קבצים",
+    "uploadafile": "העלאת קובץ",
+    "uploading": "מעלה את הקובץ...",
     "video": "וידאו"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/hu.json b/www/core/components/fileuploader/lang/hu.json
index fc75447a6d9..0f3e524740a 100644
--- a/www/core/components/fileuploader/lang/hu.json
+++ b/www/core/components/fileuploader/lang/hu.json
@@ -2,11 +2,11 @@
     "addfiletext": "Állomány hozzáadása",
     "errorcapturingaudio": "Hiba a hang rögzítélse közben.",
     "errorcapturingvideo": "Nem sikerült videofelvételt készíteni.",
-    "errorreadingfile": "Hiba a(z) \"{$a}\" állomány olvasása közben",
-    "file": "Állomány",
+    "errorreadingfile": "Hiba a(z) \"{{$a}}\" állomány olvasása közben",
+    "file": "Visszajelzési állományok",
     "fileuploaded": "Fájl feltöltve",
     "maxbytesfile": "A(z)  {{$a.file}} állomány túl nagy. A feltölthető maximális méret  {{$a.size}}.",
     "uploadafile": "Egy állomány feltöltése",
-    "uploading": "Feltöltés",
+    "uploading": "Feltöltés...",
     "video": "Videó"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/it.json b/www/core/components/fileuploader/lang/it.json
index a6eac6c923f..5f5fb84e300 100644
--- a/www/core/components/fileuploader/lang/it.json
+++ b/www/core/components/fileuploader/lang/it.json
@@ -10,15 +10,15 @@
     "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
     "errormustbeonlinetoupload": "Devi essere online per caricare file.",
     "errornoapp": "Non hai un'app per svolgere questa azione.",
-    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
+    "errorreadingfile": "Si è verificato un errore leggendo il file \"{{$a}}\"",
     "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
-    "file": "File",
+    "file": "File di commento",
     "fileuploaded": "File caricato correttamente",
-    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima consentita è {{$a.size}}.",
+    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima che è possibile caricare è pari a {{$a.size}}.",
     "photoalbums": "Album fotografico",
     "readingfile": "Letture file in corso",
-    "uploadafile": "Carica un file",
-    "uploading": "Caricamento in corso",
+    "uploadafile": "Carica un file sul server",
+    "uploading": "Caricamento in corso...",
     "uploadingperc": "Caricamento: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ja.json b/www/core/components/fileuploader/lang/ja.json
index 08512d99d83..355fead3e63 100644
--- a/www/core/components/fileuploader/lang/ja.json
+++ b/www/core/components/fileuploader/lang/ja.json
@@ -3,12 +3,12 @@
     "confirmuploadfile": "{{$a}}をアップロードしようとしています。続けますか？",
     "errorcapturingaudio": "音声キャプチャーのエラー",
     "errorcapturingvideo": "ビデオキャプチャーのエラー",
-    "errorreadingfile": "ファイル\"{{$a}}\"の読み取りエラー",
-    "file": "ファイル",
+    "errorreadingfile": "ファイル「 {{$a}} 」の読み取り中にエラーが発生しました。",
+    "file": "フィードバックファイル",
     "fileuploaded": "アップロードしたファイル",
     "maxbytesfile": "ファイル {{$a.file}} は大きすぎます。あなたがアップロードできる最大サイズは {{$a.size}} です。",
     "readingfile": "ファイル読み取り",
     "uploadafile": "ファイルをアップロードする",
-    "uploading": "アップロード中",
+    "uploading": "アップロード中 ...",
     "video": "ビデオ"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/lt.json b/www/core/components/fileuploader/lang/lt.json
index 30641efcee0..3278dc303c4 100644
--- a/www/core/components/fileuploader/lang/lt.json
+++ b/www/core/components/fileuploader/lang/lt.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Klaida gaunant paveiksliuką iš albumo.",
     "errormustbeonlinetoupload": "Norint įkelti failą reikia prisijungti.",
     "errornoapp": "Jūs neturite programėlės šiam veiksmui atlikti.",
-    "errorreadingfile": "Klaida nuskaitant failą.",
+    "errorreadingfile": "Įvyko klaida skaitant failą {{$a}}",
     "errorwhileuploading": "Klaida įkeliant failą.",
-    "file": "Failas",
+    "file": "Grįžtamojo ryšio failai",
     "fileuploaded": "Failas sėkmingai įkeltas.",
     "maxbytesfile": "Failas {{$a.file}} ) per didelis. Galite įkelti failus iki {{$a.size}}.",
     "photoalbums": "Nuotraukų albumai",
     "readingfile": "Skaitomas failas",
     "selectafile": "Pasirinkite failą",
-    "uploadafile": "Įkelkite failą",
-    "uploading": "Įkeliama",
+    "uploadafile": "Įkelti failą",
+    "uploading": "Įkeliama...",
     "uploadingperc": "Įkeliama: {{$a}}%",
     "video": "Vaizdinė medžiaga"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/nl.json b/www/core/components/fileuploader/lang/nl.json
index bded0b189f9..a9642735d2d 100644
--- a/www/core/components/fileuploader/lang/nl.json
+++ b/www/core/components/fileuploader/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Voeg bestand toe",
+    "addfiletext": "Bestand toevoegen",
     "audio": "Audio",
     "camera": "Camera",
     "confirmuploadfile": "Je gaat {{size}} uploaden. Weet je zeker dat je wil verder gaan?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fout bij het ophalen van een foto uit het album.",
     "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
     "errornoapp": "Je hebt geen app geïnstalleerd om dit te kunnen doen.",
-    "errorreadingfile": "Fout bij het lezen van het bestand.",
+    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
     "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
-    "file": "Bestand",
+    "file": "Feedbackbestanden",
     "fileuploaded": "Het uploaden van het bestand is gelukt.",
-    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale uploadgrootte is {{$a.size}}.",
+    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale grootte die je kunt uploaden is {{$a.size}}.",
     "photoalbums": "Foto-albums",
     "readingfile": "Bestand lezen",
     "selectafile": "Selecteer een bestand",
-    "uploadafile": "Bestand uploaden",
-    "uploading": "Aan het uploaden",
+    "uploadafile": "Upload een bestand",
+    "uploading": "Uploaden...",
     "uploadingperc": "Uploaden: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pl.json b/www/core/components/fileuploader/lang/pl.json
index 45b3dedd8af..7d11c66277c 100644
--- a/www/core/components/fileuploader/lang/pl.json
+++ b/www/core/components/fileuploader/lang/pl.json
@@ -3,12 +3,12 @@
     "confirmuploadfile": "Chcesz wysłać plik {$a}. Czy na pewno chcesz kontynuować?",
     "errorcapturingaudio": "Błąd poczas nagrywania dźwięku",
     "errorcapturingvideo": "Błąd podczas przechwytywania wideo",
-    "errorreadingfile": "Błąd podczas odczytu pliku \"{$a}\"",
-    "file": "Plik",
+    "errorreadingfile": "Błąd podczas odczytu z pliku \"{{$a}}\"",
+    "file": "Pliki komentarzy",
     "fileuploaded": "Plik wysłany",
     "maxbytesfile": "Plik {{$a.file}} jest za duży Maksymalny rozmiar pliku, który możesz przesłać, może wynosić {{$a.size}}.",
     "readingfile": "Odczytywanie pliku",
     "uploadafile": "Prześlij plik",
-    "uploading": "Wysyłanie",
+    "uploading": "Przesyłanie ...",
     "video": "Film"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pt-br.json b/www/core/components/fileuploader/lang/pt-br.json
index f9a5cffca49..550047884c5 100644
--- a/www/core/components/fileuploader/lang/pt-br.json
+++ b/www/core/components/fileuploader/lang/pt-br.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erro ao pegar imagem a partir do álbum.",
     "errormustbeonlinetoupload": "Você precisa estar online para enviar arquivos.",
     "errornoapp": "Você não tem um aplicativo instalado para fazer essa ação.",
-    "errorreadingfile": "Erro ao ler arquivo.",
+    "errorreadingfile": "Erro na leitura do arquivo \"{{$a}}\"",
     "errorwhileuploading": "Houve um erro durante o envio do arquivo.",
-    "file": "Arquivo",
+    "file": "Arquivos de feedback",
     "fileuploaded": "Arquivo enviado",
     "maxbytesfile": "O arquivo {{$a.file}} é muito grande. O tamanho máximo que você pode enviar é {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
     "readingfile": "Lendo arquivos",
     "selectafile": "Selecione um arquivo",
-    "uploadafile": "Enviando um arquivo",
-    "uploading": "Enviando",
+    "uploadafile": "Enviar um arquivo",
+    "uploading": "Enviando...",
     "uploadingperc": "Enviando: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pt.json b/www/core/components/fileuploader/lang/pt.json
index 69f03f7f005..bb8f5e65b1d 100644
--- a/www/core/components/fileuploader/lang/pt.json
+++ b/www/core/components/fileuploader/lang/pt.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erro ao obter imagem do álbum",
     "errormustbeonlinetoupload": "Necessita de estar online para enviar ficheiros",
     "errornoapp": "Não possui a aplicação móvel necessária para executar esta ação.",
-    "errorreadingfile": "Erro ao ler o ficheiro",
+    "errorreadingfile": "Erro na leitura do ficheiro \"{{$a}}\"",
     "errorwhileuploading": "Ocorreu um erro durante o carregamento do ficheiro.",
-    "file": "Ficheiro",
+    "file": "Ficheiros de feedback",
     "fileuploaded": "Ficheiro carregado com sucesso",
-    "maxbytesfile": "O ficheiro {{$a.file}} é muito grande. O tamanho máximo que pode carregar é de {{$a.size}}.",
+    "maxbytesfile": "O ficheiro {{$a.file}} é muito grande. Apenas pode carregar ficheiros com um tamanho máximo de {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
     "readingfile": "A ler ficheiro",
     "selectafile": "Selecione um ficheiro",
-    "uploadafile": "Carregar um ficheiro",
-    "uploading": "A carregar",
+    "uploadafile": "Carregar ficheiro",
+    "uploading": "A enviar...",
     "uploadingperc": "A carrregar: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ro.json b/www/core/components/fileuploader/lang/ro.json
index 934f0c9f150..66ec060fa0f 100644
--- a/www/core/components/fileuploader/lang/ro.json
+++ b/www/core/components/fileuploader/lang/ro.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Eroare la obținerea imaginii din album.",
     "errormustbeonlinetoupload": "Pentru a putea încărca fișiere trebuie să fiți conectat la o rețea de date.",
     "errornoapp": "Nu aveți instalată o aplicație dedicată realizării acestei operațiuni.",
-    "errorreadingfile": "Eroare la citirea fișierului.",
+    "errorreadingfile": "Eroare la citirea fişierului {{$a}}",
     "errorwhileuploading": "A apărut o eroare în timpul încărcării fișierului.",
-    "file": "Fișier",
+    "file": "Fişiere de feedback",
     "fileuploaded": "Fișierul a fost încărcat cu succes.",
     "maxbytesfile": "Fișierul {{$a.file}} este prea mare. Dimensiunea maximă pe care o puteți încărca este {{$a.size}}.",
     "photoalbums": "Albume foto",
     "readingfile": "Se citește fișierul",
-    "uploadafile": "Încărcați un fișier",
-    "uploading": "Se încarcă",
+    "uploadafile": "Incarcă un fişier",
+    "uploading": "Se încarcă ...",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ru.json b/www/core/components/fileuploader/lang/ru.json
index 50c3136d898..f903ba3a582 100644
--- a/www/core/components/fileuploader/lang/ru.json
+++ b/www/core/components/fileuploader/lang/ru.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Ошибка получения изображения из альбома",
     "errormustbeonlinetoupload": "Вы должны быть на сайте, чтобы загружать файлы.",
     "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
-    "errorreadingfile": "Ошибка при чтении файла",
+    "errorreadingfile": "Ошибка чтения файла «{{$a}}»",
     "errorwhileuploading": "Произошла ошибка во время загрузки файла",
-    "file": "Файл",
+    "file": "Отзыв в виде файла",
     "fileuploaded": "Файл загружен",
     "maxbytesfile": "Файл «{{$a.file}}» слишком большой. Максимальный размер файла, который Вы можете загрузить: {{$a.size}}.",
     "photoalbums": "Фотоальбомы",
     "readingfile": "Чтение файла",
-    "uploadafile": "Загрузка файла",
-    "uploading": "Загрузка",
+    "uploadafile": "Загрузить файл",
+    "uploading": "Идет загрузка файла на сервер...",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/sv.json b/www/core/components/fileuploader/lang/sv.json
index 05123140c0e..a6f69716ad7 100644
--- a/www/core/components/fileuploader/lang/sv.json
+++ b/www/core/components/fileuploader/lang/sv.json
@@ -8,13 +8,13 @@
     "errorgettingimagealbum": "Fel att få bild från album.",
     "errormustbeonlinetoupload": "Du måste vara online för att ladda upp filer.",
     "errornoapp": "Du behöver att ha en app installerat för att utföra den här åtgärden.",
-    "errorreadingfile": "Fel vid läsning av fil.",
+    "errorreadingfile": "Fel i samband med läsningen av filen  \"{{$a}}\"",
     "errorwhileuploading": "Ett fel uppstod under filöverföringen.",
-    "file": "Fil",
+    "file": "Återkopplingsfiler",
     "fileuploaded": "Fil laddades upp",
     "photoalbums": "Fotoalbum",
     "readingfile": "Läsa fil",
     "uploadafile": "Ladda upp en fil",
-    "uploading": "Laddar upp",
+    "uploading": "Laddar upp...",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/tr.json b/www/core/components/fileuploader/lang/tr.json
index 6ee7281cee8..3af13fbd546 100644
--- a/www/core/components/fileuploader/lang/tr.json
+++ b/www/core/components/fileuploader/lang/tr.json
@@ -2,11 +2,11 @@
     "addfiletext": "Dosya ekle",
     "errorcapturingaudio": "Ses kayıt hatası",
     "errorcapturingvideo": "Video kayıt hatası",
-    "errorreadingfile": "\"{$a}\" dosyasını okurken hata oluştu",
-    "file": "Dosya",
+    "errorreadingfile": "\"{{$a}}\" dosyasını okurken hata oluştu",
+    "file": "Geribildirim dosyaları",
     "fileuploaded": "Dosya başarıyla yüklendi",
     "maxbytesfile": "Dosya {{$a.file}} çok büyük. Yüklediğiniz maksimum boyutu {{$a.size}} olduğunu.",
     "uploadafile": "Bir dosya yükle",
-    "uploading": "Yükleniyor",
+    "uploading": "Yükleniyor...",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index e27704956e5..75ac82bace1 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -3,12 +3,12 @@
     "confirmuploadfile": "Chcesz wysłać plik {$a}. Czy na pewno chcesz kontynuować?",
     "errorcapturingaudio": "捕捉音频时出错。",
     "errorcapturingvideo": "捕捉视频时出错。",
-    "errorreadingfile": "在读取文件“{$a}”时发生错误",
-    "file": "文件",
+    "errorreadingfile": "在读取文件“{{$a}}”时发生错误",
+    "file": "反馈文件",
     "fileuploaded": "文件已成功上传。",
     "maxbytesfile": "这个文件 {{$a.file}} 太大了。你可以上传的文件最大容量是 {{$a.size}}。",
     "readingfile": "Odczytywanie pliku",
     "uploadafile": "上传一个文件",
-    "uploading": "上传中",
+    "uploading": "上传中...",
     "video": "视频"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/zh-tw.json b/www/core/components/fileuploader/lang/zh-tw.json
index 3127c73c3a7..38292441417 100644
--- a/www/core/components/fileuploader/lang/zh-tw.json
+++ b/www/core/components/fileuploader/lang/zh-tw.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "新增檔案",
+    "addfiletext": "添加檔案",
     "audio": "聲音",
     "camera": "相機",
     "confirmuploadfile": "你已上傳 {{size}}. 你確定想繼續嗎?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "從相簿裡取得圖片發生錯誤.",
     "errormustbeonlinetoupload": "您必須上線才能上傳檔案.",
     "errornoapp": "您沒有安裝應用程式來執行此動作.",
-    "errorreadingfile": "讀取檔案發生錯誤.",
+    "errorreadingfile": "讀取檔案 \"{{$a}}\" 時發生錯誤",
     "errorwhileuploading": "檔案上傳時發生錯誤.",
-    "file": "檔案",
+    "file": "回饋檔案",
     "fileuploaded": "檔案已上傳",
-    "maxbytesfile": "這個檔案大小 {{$a.file}} 超過限制. 最大檔案大小只能上傳 {{$a.size}}.",
+    "maxbytesfile": "這檔案 {{$a.file}} 太大了。你可以上傳的檔案最大容量是 {{$a.size}}。",
     "photoalbums": "相簿",
     "readingfile": "讀取檔案中",
     "selectafile": "選擇一個檔案",
     "uploadafile": "上傳一個檔案",
-    "uploading": "上傳中",
+    "uploading": "上傳.....",
     "uploadingperc": "上傳中: {{$a}}%",
     "video": "影片"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/ar.json b/www/core/components/grades/lang/ar.json
index 9732d1ddc55..2966f73720e 100644
--- a/www/core/components/grades/lang/ar.json
+++ b/www/core/components/grades/lang/ar.json
@@ -1,13 +1,13 @@
 {
     "average": "متوسط",
-    "feedback": "التغذية الراجعة",
-    "grade": "الدرجة",
-    "grades": "الدرجات",
+    "feedback": "(تغذية راجعة (ملاحظات",
+    "grade": "درجة",
+    "grades": "درجات",
     "itemname": "اسم البند",
-    "lettergrade": "خطاب الدرجات",
+    "lettergrade": "درجة حرفية",
     "nooutcome": "لا يوجد مخرجات تعلم",
-    "percentage": "النسبة المئوية",
-    "range": "المدى",
-    "rank": "المرتبة",
-    "weight": "وزن الدرجات"
+    "percentage": "النسبة",
+    "range": "مجال",
+    "rank": "مستوى",
+    "weight": "الوزن"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/bg.json b/www/core/components/grades/lang/bg.json
index 8013f9a5b03..43ebadbfebc 100644
--- a/www/core/components/grades/lang/bg.json
+++ b/www/core/components/grades/lang/bg.json
@@ -1,13 +1,13 @@
 {
     "average": "Средно",
     "contributiontocoursetotal": "Дял в общата оценка",
-    "feedback": "Обратна връзка",
+    "feedback": "Забележка",
     "grade": "Оценка",
     "grades": "Оценки",
-    "itemname": "Оценяване",
+    "itemname": "Име на единица",
     "lettergrade": "Оценка с буква",
-    "percentage": "В проценти",
-    "range": "Обхват",
-    "rank": "Ранг",
+    "percentage": "Проценти",
+    "range": "Диапазон",
+    "rank": "Rank",
     "weight": "Тегло"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/ca.json b/www/core/components/grades/lang/ca.json
index be165864491..7848c0d6909 100644
--- a/www/core/components/grades/lang/ca.json
+++ b/www/core/components/grades/lang/ca.json
@@ -5,11 +5,11 @@
     "feedback": "Retroacció",
     "grade": "Qualificació",
     "grades": "Qualificacions",
-    "itemname": "Element de qualificació",
-    "lettergrade": "Qualificació alfabètica",
+    "itemname": "Nom de l'element",
+    "lettergrade": "Qualificació per lletres",
     "nooutcome": "Sense competències",
     "percentage": "Percentatge",
-    "range": "Interval",
-    "rank": "Rang",
-    "weight": "Pes"
+    "range": "Gamma",
+    "rank": "Posició",
+    "weight": "Ponderació"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/cs.json b/www/core/components/grades/lang/cs.json
index 0ce007067d2..fcd0762a591 100644
--- a/www/core/components/grades/lang/cs.json
+++ b/www/core/components/grades/lang/cs.json
@@ -1,15 +1,15 @@
 {
     "average": "Průměr",
     "badgrade": "Poskytnutá známka není platná",
-    "contributiontocoursetotal": "Příspěvek do celkové známky kurzu",
-    "feedback": "Zpětná vazba",
+    "contributiontocoursetotal": "Podíl z celkové známky",
+    "feedback": "Reakce",
     "grade": "Známka",
     "grades": "Známky",
-    "itemname": "Položka známky",
+    "itemname": "Název položky",
     "lettergrade": "Slovní známka",
     "nooutcome": "Bez očekávaných výstupů",
-    "percentage": "Procenta",
+    "percentage": "Procentuální hodnota",
     "range": "Rozsah",
-    "rank": "Pořadí",
+    "rank": "Umístění",
     "weight": "Váha"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/da.json b/www/core/components/grades/lang/da.json
index f1a7216745d..517d42331d7 100644
--- a/www/core/components/grades/lang/da.json
+++ b/www/core/components/grades/lang/da.json
@@ -1,15 +1,15 @@
 {
     "average": "Gennemsnit",
     "badgrade": "Karakteren er ugyldig",
-    "contributiontocoursetotal": "Bidrag til kurset ialt",
+    "contributiontocoursetotal": "Bidrag til kursets total",
     "feedback": "Feedback",
-    "grade": "Bedømmelse",
-    "grades": "Bedømmelser",
-    "itemname": "Emne til bedømmelse",
+    "grade": "Karakter",
+    "grades": "Karakterer",
+    "itemname": "Elementnavn",
     "lettergrade": "Bogstavkarakter",
     "nooutcome": "Intet slutresultat",
     "percentage": "Procentdel",
-    "range": "Omfang",
-    "rank": "Rang",
-    "weight": "Vægtning"
+    "range": "Opstilling",
+    "rank": "Opstil",
+    "weight": "Vægt"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/de.json b/www/core/components/grades/lang/de.json
index fa8015c62b1..49bc672f741 100644
--- a/www/core/components/grades/lang/de.json
+++ b/www/core/components/grades/lang/de.json
@@ -1,15 +1,15 @@
 {
     "average": "Durchschnitt",
     "badgrade": "Ungültige Bewertung",
-    "contributiontocoursetotal": "Teilbewertung",
+    "contributiontocoursetotal": "Beiträge zum Kurs insgesamt",
     "feedback": "Feedback",
     "grade": "Bewertung",
     "grades": "Bewertungen",
-    "itemname": "Bewertungsaspekt",
-    "lettergrade": "Buchstabenwertung",
+    "itemname": "Name des Aspekts",
+    "lettergrade": "Notenstufenbewertung",
     "nooutcome": "Kein Lernziel",
     "percentage": "Prozentsatz",
-    "range": "Bandbreite",
+    "range": "Bereich",
     "rank": "Rang",
     "weight": "Gewichtung"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/el.json b/www/core/components/grades/lang/el.json
index 8192b0ab2e2..375dafd2b9d 100644
--- a/www/core/components/grades/lang/el.json
+++ b/www/core/components/grades/lang/el.json
@@ -2,7 +2,7 @@
     "average": "Μέσος όρος",
     "badgrade": "Ο βαθμός που δόθηκε δεν είναι έγκυρος",
     "contributiontocoursetotal": "Συνεισφορά στον τελικό βαθμό",
-    "feedback": "Ανάδραση",
+    "feedback": "Ανατροφοδότηση",
     "grade": "Βαθμός",
     "grades": "Βαθμοί",
     "itemname": "Όνομα στοιχείου",
diff --git a/www/core/components/grades/lang/es-mx.json b/www/core/components/grades/lang/es-mx.json
index 5e6432d183d..ca04dc39133 100644
--- a/www/core/components/grades/lang/es-mx.json
+++ b/www/core/components/grades/lang/es-mx.json
@@ -5,11 +5,11 @@
     "feedback": "Retroalimentación",
     "grade": "Calificación",
     "grades": "Calificaciones",
-    "itemname": "Ítem de calificación",
-    "lettergrade": "Calificación con letra",
+    "itemname": "Nombre del ítem",
+    "lettergrade": "Calificación por letra",
     "nooutcome": "Sin resultado",
     "percentage": "Porcentaje",
     "range": "Rango",
-    "rank": "Rankeo",
+    "rank": "Rango",
     "weight": "Ponderación"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/es.json b/www/core/components/grades/lang/es.json
index 60db760919c..63344ded652 100644
--- a/www/core/components/grades/lang/es.json
+++ b/www/core/components/grades/lang/es.json
@@ -1,15 +1,15 @@
 {
-    "average": "Media",
+    "average": "Promedio",
     "badgrade": "La calificación suministrada no es válida",
-    "contributiontocoursetotal": "Contribución al total del curso",
+    "contributiontocoursetotal": "Aporta al total del curso",
     "feedback": "Retroalimentación",
     "grade": "Calificación",
     "grades": "Calificaciones",
-    "itemname": "Elemento de calificación",
+    "itemname": "Nombre del ítem",
     "lettergrade": "Calificación por letra",
     "nooutcome": "No resultado",
     "percentage": "Porcentaje",
     "range": "Rango",
-    "rank": "Rango",
+    "rank": "Ranking",
     "weight": "Peso"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/eu.json b/www/core/components/grades/lang/eu.json
index ec253e2d221..1037527dadf 100644
--- a/www/core/components/grades/lang/eu.json
+++ b/www/core/components/grades/lang/eu.json
@@ -1,15 +1,15 @@
 {
-    "average": "Batezbestekoa",
+    "average": "Batez bestekoa",
     "badgrade": "Emandako kalifikazioak ez du balio",
-    "contributiontocoursetotal": "Ikastarora guztira egindako ekarpena",
-    "feedback": "Feedback-a",
+    "contributiontocoursetotal": "Ikastaroaren denerako ekarpena",
+    "feedback": "Feedbacka",
     "grade": "Kalifikazioa",
     "grades": "Kalifikazioak",
-    "itemname": "Elementua kalifikatu",
+    "itemname": "Elementuaren izena",
     "lettergrade": "Letren bidezko kalifikazioa",
     "nooutcome": "Ez dago ikas-emaitzarik",
-    "percentage": "Ehunekoa",
-    "range": "Tartea",
+    "percentage": "Portzentajea",
+    "range": "Ibiltartea",
     "rank": "Sailkapena",
     "weight": "Pisua"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/fa.json b/www/core/components/grades/lang/fa.json
index 8a1b93eb79e..f1662333d8f 100644
--- a/www/core/components/grades/lang/fa.json
+++ b/www/core/components/grades/lang/fa.json
@@ -3,7 +3,7 @@
     "contributiontocoursetotal": "میزان تاثیر در نمره نهایی درس",
     "feedback": "بازخورد",
     "grade": "نمره",
-    "grades": "نمرات",
+    "grades": "نمره‌ها",
     "itemname": "نام مورد",
     "lettergrade": "نمرهٔ حرفی",
     "percentage": "درصد",
diff --git a/www/core/components/grades/lang/fr.json b/www/core/components/grades/lang/fr.json
index 8168255d6db..2fc3c6e9ea6 100644
--- a/www/core/components/grades/lang/fr.json
+++ b/www/core/components/grades/lang/fr.json
@@ -5,11 +5,11 @@
     "feedback": "Feedback",
     "grade": "Note",
     "grades": "Notes",
-    "itemname": "Élément d'évaluation",
+    "itemname": "Nom élément",
     "lettergrade": "Note lettre",
     "nooutcome": "Aucun objectif",
     "percentage": "Pourcentage",
-    "range": "Intervalle",
+    "range": "Valeurs possibles",
     "rank": "Rang",
-    "weight": "Poids"
+    "weight": "Pondération"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/he.json b/www/core/components/grades/lang/he.json
index c76bfacc440..4ae5cce2534 100644
--- a/www/core/components/grades/lang/he.json
+++ b/www/core/components/grades/lang/he.json
@@ -1,15 +1,15 @@
 {
-    "average": "ממוצע",
+    "average": "ממוצע (בקורס)",
     "badgrade": "הציון שנמסר איננו נאות",
-    "contributiontocoursetotal": "תרומה לציון הקורס הכללי",
-    "feedback": "משוב",
-    "grade": "ציון",
+    "contributiontocoursetotal": "ניקוד משוקלל, כתרומה לציון הסופי",
+    "feedback": "משוב לבחירה בתשובה זו",
+    "grade": "ניקוד בפעילות",
     "grades": "ציונים",
-    "itemname": "פריט ציון",
-    "lettergrade": "אות ציון",
+    "itemname": "שם הפריט",
+    "lettergrade": "ציון אות",
     "nooutcome": "לא קיים מדד־הערכה",
-    "percentage": "אחוז",
+    "percentage": "הניקוד כאחוז מהציון המירבי בפעילות",
     "range": "טווח",
-    "rank": "דירוג",
+    "rank": "דרוג יחסי",
     "weight": "משקל"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/hu.json b/www/core/components/grades/lang/hu.json
index b809f7dab9f..d02fb606d93 100644
--- a/www/core/components/grades/lang/hu.json
+++ b/www/core/components/grades/lang/hu.json
@@ -3,13 +3,13 @@
     "badgrade": "A megadott pont érvénytelen",
     "contributiontocoursetotal": "Hozzájárulás a kurzus összpontszámához",
     "feedback": "Visszajelzés",
-    "grade": "Osztályzat",
-    "grades": "Osztályzatok",
+    "grade": "Pont",
+    "grades": "Pontok",
     "itemname": "Tétel neve",
     "lettergrade": "Betűpontozás",
     "nooutcome": "Nincs eredmény",
     "percentage": "Százalék",
     "range": "Tartomány",
     "rank": "Sorrend",
-    "weight": "súly"
+    "weight": "Súly"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/it.json b/www/core/components/grades/lang/it.json
index 73ed8815a33..dc227165d43 100644
--- a/www/core/components/grades/lang/it.json
+++ b/www/core/components/grades/lang/it.json
@@ -5,7 +5,7 @@
     "feedback": "Feedback",
     "grade": "Valutazione",
     "grades": "Valutazioni",
-    "itemname": "Elemento di valutazione",
+    "itemname": "Nome elemento",
     "lettergrade": "Graduatoria letterale",
     "nooutcome": "Nessun obiettivo",
     "percentage": "Percentuale",
diff --git a/www/core/components/grades/lang/ja.json b/www/core/components/grades/lang/ja.json
index bc49a929733..bfa3698fe22 100644
--- a/www/core/components/grades/lang/ja.json
+++ b/www/core/components/grades/lang/ja.json
@@ -1,15 +1,15 @@
 {
     "average": "平均",
     "badgrade": "提供された評定は有効ではありません。",
-    "contributiontocoursetotal": "コース全体に対する貢献",
+    "contributiontocoursetotal": "コース合計への貢献",
     "feedback": "フィードバック",
-    "grade": "成績",
-    "grades": "成績",
-    "itemname": "評定項目",
-    "lettergrade": "評定の文字",
+    "grade": "評定",
+    "grades": "評定",
+    "itemname": "項目名",
+    "lettergrade": "評定文字",
     "nooutcome": "アウトカムなし",
     "percentage": "パーセンテージ",
     "range": "範囲",
     "rank": "ランク",
-    "weight": "重み"
+    "weight": "加重"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/lt.json b/www/core/components/grades/lang/lt.json
index 80eb71c8e0b..686daab9d80 100644
--- a/www/core/components/grades/lang/lt.json
+++ b/www/core/components/grades/lang/lt.json
@@ -2,7 +2,7 @@
     "average": "Vidurkis",
     "badgrade": "Pateiktas netinkamas įvertis",
     "contributiontocoursetotal": "Indėlis į kurso bendrą",
-    "feedback": "Atsiliepimas",
+    "feedback": "Grįžtamasis ryšys",
     "grade": "Įvertis",
     "grades": "Įverčiai",
     "itemname": "Elemento pavadinimas",
diff --git a/www/core/components/grades/lang/nl.json b/www/core/components/grades/lang/nl.json
index e849c0d29ff..a4266d2d6f4 100644
--- a/www/core/components/grades/lang/nl.json
+++ b/www/core/components/grades/lang/nl.json
@@ -1,15 +1,15 @@
 {
     "average": "Gemiddelde",
     "badgrade": "Beoordeling ongeldig",
-    "contributiontocoursetotal": "Bijdrage aan het cursustotaal",
+    "contributiontocoursetotal": "Aandeel in cursustotaal",
     "feedback": "Feedback",
-    "grade": "Cijfer",
+    "grade": "Beoordeling",
     "grades": "Cijfers",
-    "itemname": "Beoordelingsitem",
+    "itemname": "Itemnaam",
     "lettergrade": "Letterbeoordeling",
     "nooutcome": "Geen competentie",
     "percentage": "Percentage",
-    "range": "Bereik",
-    "rank": "Volgorde",
+    "range": "Marge",
+    "rank": "Ranglijst",
     "weight": "Weging"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/pl.json b/www/core/components/grades/lang/pl.json
index 9b0795c8bf3..44e378ae1b1 100644
--- a/www/core/components/grades/lang/pl.json
+++ b/www/core/components/grades/lang/pl.json
@@ -1,15 +1,15 @@
 {
     "average": "Średnia",
     "badgrade": "Wprowadzona ocena jest niepoprawna",
-    "contributiontocoursetotal": "Całkowity udział w kursie",
-    "feedback": "Opinie",
+    "contributiontocoursetotal": "Udział w całym kursie",
+    "feedback": "Informacja zwrotna",
     "grade": "Ocena",
-    "grades": "Oceny",
-    "itemname": "Przedmiot oceny",
-    "lettergrade": "Lista klas (?)",
+    "grades": "Stopnie",
+    "itemname": "Nazwa pozycji",
+    "lettergrade": "Nazwy ocen",
     "nooutcome": "Brak efektu kształcenia",
-    "percentage": "Procent",
-    "range": "Ranga",
-    "rank": "Ranking",
+    "percentage": "Procentowo",
+    "range": "Zakres",
+    "rank": "Pozycja na tle grupy",
     "weight": "Waga"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/pt-br.json b/www/core/components/grades/lang/pt-br.json
index f560c9f4df3..d489ce5db62 100644
--- a/www/core/components/grades/lang/pt-br.json
+++ b/www/core/components/grades/lang/pt-br.json
@@ -1,15 +1,15 @@
 {
     "average": "Média",
     "badgrade": "Nota fornecida é inválida",
-    "contributiontocoursetotal": "Contribuição ao total do curso",
+    "contributiontocoursetotal": "Contribuição para o total do curso",
     "feedback": "Feedback",
     "grade": "Nota",
     "grades": "Notas",
-    "itemname": "Item de nota",
-    "lettergrade": "Nota letra",
+    "itemname": "Nome do Item",
+    "lettergrade": "Notas por letras",
     "nooutcome": "Nenhum resultado de aprendizagem",
     "percentage": "Porcentagem",
-    "range": "Range",
-    "rank": "Posição",
+    "range": "Intervalo",
+    "rank": "Classificação",
     "weight": "Peso"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/pt.json b/www/core/components/grades/lang/pt.json
index 7c4ecfa457a..e0d486df8e3 100644
--- a/www/core/components/grades/lang/pt.json
+++ b/www/core/components/grades/lang/pt.json
@@ -5,11 +5,11 @@
     "feedback": "Feedback",
     "grade": "Nota",
     "grades": "Notas",
-    "itemname": "Item de avaliação",
-    "lettergrade": "Nota alfabética",
+    "itemname": "Nome do item",
+    "lettergrade": "Nota Alfabética",
     "nooutcome": "Nenhum resultado da aprendizagem",
     "percentage": "Percentagem",
     "range": "Intervalo",
-    "rank": "Posição",
+    "rank": "Posição relativa",
     "weight": "Peso"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/ro.json b/www/core/components/grades/lang/ro.json
index f0696d42be5..f0ab52efac5 100644
--- a/www/core/components/grades/lang/ro.json
+++ b/www/core/components/grades/lang/ro.json
@@ -5,11 +5,11 @@
     "feedback": "Feedback",
     "grade": "Notă",
     "grades": "Note",
-    "itemname": "Element al notei",
-    "lettergrade": "Notare prin litere",
+    "itemname": "Nume element",
+    "lettergrade": "Notă sub formă de literă",
     "nooutcome": "fără rezultat",
-    "percentage": "Procent",
+    "percentage": "Procentaj",
     "range": "Interval",
-    "rank": "Poziție",
-    "weight": "Greutate"
+    "rank": "Rang",
+    "weight": "pondere"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/ru.json b/www/core/components/grades/lang/ru.json
index 8c0a769e3f4..05c8c10d084 100644
--- a/www/core/components/grades/lang/ru.json
+++ b/www/core/components/grades/lang/ru.json
@@ -1,15 +1,15 @@
 {
-    "average": "Среднее",
+    "average": "Средняя оценка",
     "badgrade": "Указана некорректная оценка",
-    "contributiontocoursetotal": "Вклад в курс",
+    "contributiontocoursetotal": "Вклад в итог курса",
     "feedback": "Отзыв",
     "grade": "Оценка",
     "grades": "Оценки",
-    "itemname": "Элемент оценки",
+    "itemname": "Название",
     "lettergrade": "Буквенная оценка",
     "nooutcome": "Нет показателя",
-    "percentage": "В процентах",
+    "percentage": "Проценты",
     "range": "Диапазон",
-    "rank": "Ранг",
+    "rank": "Место",
     "weight": "Вес"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/sv.json b/www/core/components/grades/lang/sv.json
index ed8d114296d..7593dadca0f 100644
--- a/www/core/components/grades/lang/sv.json
+++ b/www/core/components/grades/lang/sv.json
@@ -1,15 +1,15 @@
 {
-    "average": "Genomsnitt",
+    "average": "Medelvärde",
     "badgrade": "Det betyg som har avgivits är ogiltigt",
-    "contributiontocoursetotal": "Bidrag till kurs totalt",
-    "feedback": "Feedback",
+    "contributiontocoursetotal": "Bidrag till totalen för kursen",
+    "feedback": "Återkoppling",
     "grade": "Betyg",
-    "grades": "Betyg",
+    "grades": "Betyg/omdömen",
     "itemname": "Namn på komponent",
     "lettergrade": "Bokstavsbetyg/omdöme",
     "nooutcome": "Inget resultat",
-    "percentage": "Procentandel",
+    "percentage": "Procenttal",
     "range": "Omfång",
     "rank": "Ranking",
-    "weight": "Viktning"
+    "weight": "vikt"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/tr.json b/www/core/components/grades/lang/tr.json
index 85f018585e6..a604f01f390 100644
--- a/www/core/components/grades/lang/tr.json
+++ b/www/core/components/grades/lang/tr.json
@@ -1,15 +1,15 @@
 {
     "average": "Ortalama",
     "badgrade": "Sağlanan not geçersiz",
-    "contributiontocoursetotal": "Katıldığınız toplam kurs sayısı",
+    "contributiontocoursetotal": "Ders toplamına katkısı",
     "feedback": "Geribildirim",
-    "grade": "Puan",
-    "grades": "Puan(lar)",
-    "itemname": "Not ögesi",
-    "lettergrade": "Harf derecesi",
+    "grade": "Başarı notu",
+    "grades": "Başarı notları",
+    "itemname": "Öge adı",
+    "lettergrade": "Harf notu",
     "nooutcome": "Hedef yok",
     "percentage": "Yüzde",
-    "range": "Aralık",
-    "rank": "Derece",
+    "range": "Fark",
+    "rank": "sıra",
     "weight": "Ağırlık"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/zh-cn.json b/www/core/components/grades/lang/zh-cn.json
index 32fdabc8373..acd9a162913 100644
--- a/www/core/components/grades/lang/zh-cn.json
+++ b/www/core/components/grades/lang/zh-cn.json
@@ -1,12 +1,12 @@
 {
-    "average": "平均",
+    "average": "平均值",
     "badgrade": "提供的成绩不可用",
-    "contributiontocoursetotal": "贡献课程总数",
+    "contributiontocoursetotal": "对课程的总贡献",
     "feedback": "反馈",
     "grade": "成绩",
     "grades": "成绩",
-    "itemname": "评分项",
-    "lettergrade": "字母评分",
+    "itemname": "成绩项名称",
+    "lettergrade": "分数段",
     "nooutcome": "无成果",
     "percentage": "百分比",
     "range": "范围",
diff --git a/www/core/components/grades/lang/zh-tw.json b/www/core/components/grades/lang/zh-tw.json
index bbd6a9b280a..e108db854ad 100644
--- a/www/core/components/grades/lang/zh-tw.json
+++ b/www/core/components/grades/lang/zh-tw.json
@@ -1,15 +1,15 @@
 {
     "average": "平均",
     "badgrade": "提供的成績是無效的",
-    "contributiontocoursetotal": "贡献课程总数",
+    "contributiontocoursetotal": "貢獻到課程總分",
     "feedback": "回饋",
     "grade": "成績",
     "grades": "成績",
-    "itemname": "成績項名稱",
+    "itemname": "項目名稱",
     "lettergrade": "文字等第",
     "nooutcome": "沒有能力指標",
     "percentage": "百分比",
-    "range": "範圍",
+    "range": "全距",
     "rank": "排名",
-    "weight": "加權"
+    "weight": "加權量"
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/ar.json b/www/core/components/login/lang/ar.json
index e58f7ef0a9d..a781f7c3589 100644
--- a/www/core/components/login/lang/ar.json
+++ b/www/core/components/login/lang/ar.json
@@ -1,6 +1,6 @@
 {
     "authenticating": "مصادقة",
-    "cancel": "إلغاء",
+    "cancel": "ألغي",
     "connect": "دخول",
     "connecttomoodle": "بيانات الدخول",
     "createaccount": "إنشاء حساب مشترك الجديد",
@@ -17,7 +17,7 @@
     "invalidemail": "عنوان البريد الإلكتروني غير صحيح",
     "invalidmoodleversion": "نسخة موودل غير صالحة. الحد الأدنى للنسخة المطلوبة هو:",
     "invalidsite": "رابط عنوان الموقع غير صالح.",
-    "invalidurl": "عنوان الإنترنت غير صحيح",
+    "invalidurl": "عنوان الأنترنت المدخل غير صحيح",
     "login": "دخول",
     "loginbutton": "دخول",
     "loginsteps": "مرحبا بك! يمكنك إنشاء حساب مشترك جديد في هذا الموقع خلال لحظات والاتصال الكامل بالمقررات الدراسية وذلك بتتبع الخطوات التالية:\n\n   <ol>\n   <li>املأ نموذج <a href=\"{{$a}}\">حساب جديد</a>.</li>\n   <li>على الفور تصلك رسالة على عنوانك البريدي.</li>\n   <li>قم بقراءة البريد واضغط على الرابطة الموجودة به.</li>\n   <li>سيتم تأكيد اشتراكك ويسمح لك بالدخول.</li>\n   <li>والآن قم باختيار المقرر الدراسي الذي ترغب المشاركة فيه.</li>\n   <li>من الآن فصاعدا يمكنك الدخول عن طريق إدخال اسم المستخدم وكلمة المرور (في النموذج المقابل بهذه الصفحة) ، وتستطيع الاتصال الكامل المقرر الدراسي ، وتصل إلى أي مقرر دراسي تريد التسجيل به.</li>\n   <li>إذا طلب منك  ''مفتاح التسجيل'' - استخدم المفتاح الذي أعطاه لك المدرس. هذا سيجعلك ''تشارك'' في المقرر الدراسي.   </li>\n   <li> لا حظ أن كل مقرر دراسي قد يكون له أيضا \"مفتاح تسجيل\" ستحتاج إليه لاحقا.</li>\n   </ol>",
@@ -26,7 +26,7 @@
     "missinglastname": "الاسم الأخير  لم يتم تحدده",
     "newaccount": "حساب مشترك جديد",
     "newsitedescription": "من فضلك أدخل رابط موقع نظام التعلم الإلكتروني مودل الخاص بك. لاحظ انه من الممكن أن يكون لم يتم إعداده للعمل مع هذا التطبيق.",
-    "password": "كلمة المرور",
+    "password": "كلمة السر",
     "passwordrequired": "كلمة المرور مطلوبة",
     "policyaccept": "لقد فهمت وأوافق",
     "policyagree": "يجب الموافقة على هذه الشروط للإستمرار في إستخدام الموقع. هل أنت موافق؟",
diff --git a/www/core/components/login/lang/bg.json b/www/core/components/login/lang/bg.json
index 7972b6e59f9..aba3a7656a7 100644
--- a/www/core/components/login/lang/bg.json
+++ b/www/core/components/login/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "authenticating": "Удостоверяване",
     "cancel": "Отказване",
-    "connect": "Свързване!",
+    "connect": "Свързване",
     "connecttomoodle": "Свързване към Moodle",
     "createaccount": "Създаване на моята регистрация",
     "createuserandpass": "Изберете Вашето име и парола",
@@ -17,7 +17,7 @@
     "invalidmoodleversion": "Невалидна версия на Moodle. Най-старата изискване версия е 2.4.",
     "invalidsite": "Интернет адресът на сайта е невалиден.",
     "invalidurl": "URL-ът, който току що въведохте не е валиден",
-    "login": "Вход",
+    "login": "Влизане във Вашия профил",
     "loginbutton": "Вход!",
     "logininsiterequired": "Трябва да влезете в сайта през прозорец на браузър.",
     "loginsteps": "За пълен достъп до този сайт трябва първо да си създадете профил.",
diff --git a/www/core/components/login/lang/ca.json b/www/core/components/login/lang/ca.json
index 253e1337f13..4012c0912f7 100644
--- a/www/core/components/login/lang/ca.json
+++ b/www/core/components/login/lang/ca.json
@@ -2,7 +2,6 @@
     "auth_email": "Autenticació basada en el correu electrònic",
     "authenticating": "Us esteu autenticant",
     "cancel": "Cancel·la",
-    "cannotdownloadfiles": "La baixada de fitxers està desactivada en el servei mòbil de Moodle, l'aplicació no pot funcionar amb aquest paràmetre desactivat. Contacteu amb l'administrador del lloc.",
     "checksiteversion": "Comproveu que el vostre lloc utilitza Moodle 2.4 o superior.",
     "confirmdeletesite": "Esteu segur que voleu eliminar el lloc {{sitename}}?",
     "connect": "Connecta",
@@ -11,7 +10,6 @@
     "contactyouradministratorissue": "Demaneu a l'administrador que comprovi el problema següent: {{$a}}",
     "createaccount": "Crea el meu compte",
     "createuserandpass": "Trieu un nom d'usuari i una contrasenya",
-    "credentials": "Credencials",
     "credentialsdescription": "Introduïu el vostre nom d'usuari i contrasenya per iniciar sessió.",
     "emailconfirmsent": "<p>S'ha enviat un correu a la vostra adreça <b>{{$a}}</b></p>\n<p>Conté instruccions senzilles per completar el registre.</p>\n<p>Si seguiu tenint problemes, contacteu amb l'administrador del lloc.</p>",
     "emailnotmatch": "Les adreces de correu electrònic no coincideixen",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "La versió de Moodle no és vàlida. Cal com a mínim la versió 2.4.",
     "invalidsite": "L'URL del lloc no és vàlid.",
     "invalidtime": "L'hora no és vàlida",
-    "invalidurl": "L'URL no és vàlid",
+    "invalidurl": "S'ha especificat un URL no vàlid",
     "invalidvaluemax": "El valor màxim és {{$a}}",
     "invalidvaluemin": "El valor mínim és {{$a}}",
     "localmobileunexpectedresponse": "Les característiques addicionals de Moodle Mobile han tornat una resposta inesperada, us heu d'autenticar fent servir el servei estàndard de Mobile.",
     "loggedoutssodescription": "Heu de tornar-vos a auteniticar. Cal que entreu al lloc des d'una finestra de navegador.",
-    "login": "Entra",
+    "login": "Inicia la sessió",
     "loginbutton": "Inicia la sessió",
     "logininsiterequired": "Heu d'entrar al lloc a través d'una finestra del navegador.",
     "loginsteps": "Per tenir accés complet a aquest lloc, cal que us creeu abans un compte d'usuari.",
@@ -71,7 +69,7 @@
     "startsignup": "Crea un compte d'usuari nou",
     "stillcantconnect": "Encara no hi podeu accedir?",
     "supplyinfo": "Més detalls",
-    "username": "Nom d'usuari/ària",
+    "username": "Nom d'usuari",
     "usernamerequired": "El nom d'usuari/ària és necessari",
     "usernotaddederror": "No s'ha afegit l'usuari. Error desconegut",
     "visitchangepassword": "Voleu visitar el lloc per canviar la contrasenya?",
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index bd8f051b5cc..49d4981eac9 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -2,18 +2,16 @@
     "auth_email": "Registrace na základě e-mailu",
     "authenticating": "Autentizace",
     "cancel": "Zrušit",
-    "cannotdownloadfiles": "Stahování souborů je vypnuto v mobilních službách, aplikace nebude fungovat s nastavením zakázu. Prosím, obraťte se na správce webu.",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
-    "connect": "Připojit!",
+    "connect": "Spojit",
     "connecttomoodle": "Připojit k Moodle",
     "contactyouradministrator": "Pro další pomoc se obraťte na správce webu.",
     "contactyouradministratorissue": "Požádejte správce, prosím, aby zkontroloval následující problém: {{$a}}",
     "createaccount": "Vytvořit můj nový účet",
     "createuserandpass": "Vytvořit nové uživatelské jméno a heslo pro přihlášení",
-    "credentials": "Identifikační údaje",
     "credentialsdescription": "Pro přihlášení uveďte své uživatelské jméno a heslo.",
-    "emailconfirmsent": "<p>E-mail by měl být zaslán na Vaši adresu na <b>{{$a}}</b></p><p>Obsahuje jednoduché instrukce pro dokončení registrace. </p><p>Pokud budou potíže pokračovat, obraťte se na správce webu. </p>",
+    "emailconfirmsent": "<p>Na vaši adresu <b>{{$a}}</b> byl odeslán e-mail s jednoduchými pokyny k dokončení vaší registrace.</p><p>Narazíte-li na nějaké obtíže, spojte se se správcem těchto stránek.</p>",
     "emailnotmatch": "E-maily se neshodují",
     "enterthewordsabove": "Vložte výše uvedená slova",
     "erroraccesscontrolalloworigin": "Cross-Origin volání -  váš pokus o provedení byl odmítnut. Zkontrolujte prosím https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -21,7 +19,7 @@
     "errorupdatesite": "Došlo k chybě při aktualizaci tokenu webu.",
     "firsttime": "Jste tady poprvé?",
     "getanothercaptcha": "Získat jiné CAPTCHA",
-    "help": "Nápověda",
+    "help": "Pomoc",
     "helpmelogin": "<p> Existuje mnoho tisíc webů Moodle po celém světě. Tato aplikace může připojit pouze ke stránkám Moodle, které povolily, mobilní přístup k aplikaci. </p> <p> Pokud se nemůžete k Moodle připojit, pak je třeba kontaktovat správce web Moodle, kam se chcete připojit a požádat, aby přečetl <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\"> http://docs.moodle.org/en/Mobile_app </a> </p> <p> Chcete-li otestovat aplikaci na Moodle demo webu jako <i> učitel </i> nebo <i> student </i>  na pole <i> Adresa stránky  </i> a klikněte na tlačítko <b> Připojit </b>. </p>",
     "instructions": "Pokyny",
     "invalidaccount": "Zkontrolujte si prosím své přihlašovací údaje nebo se obraťte na správce webu, aby zkontroloval nastavení.",
@@ -30,15 +28,15 @@
     "invalidmoodleversion": "Neplatná verze Moodle. Minimální potřebná verze je:",
     "invalidsite": "Adresa URL stránky je chybná",
     "invalidtime": "Neplatný čas",
-    "invalidurl": "Neplatná URL",
+    "invalidurl": "Chybná specifikace URL",
     "invalidvaluemax": "Maximální hodnota je {{$a}}",
     "invalidvaluemin": "Minimální hodnota je {{$a}}",
     "localmobileunexpectedresponse": "Kontrola rozšířených vlastností Moodle Mobile vrátil neočekávanou odezvu, budete ověřen pomocí standardních služeb mobilu .",
     "loggedoutssodescription": "Musíte se znovu autentizovat. Musíte se přihlásit na stránky v okně prohlížeče.",
-    "login": "Přihlásit se",
+    "login": "Přihlásit ke svému účtu",
     "loginbutton": "Přihlásit se",
     "logininsiterequired": "Váš Moodlu vás nutí k přihlášení pomocí prohlížeče. Nová instance prohlížeče otevře přesměrování na vaše stránky Moodle.",
-    "loginsteps": "Zdravím! K plnému přístupu do kurzů budete muset strávit minutku vytvořením svého uživatelského účtu. Jednotlivé kurzy mohou rovněž požadovat tzv. \"klíč k zápisu\", ale ten budete potřebovat až později. Postupujte podle následujících kroků:\n<ol>\n<li>Vyplňte formulář <a href=\"{{$a}}\">Nový účet</a>.</li>\n<li>Na vaši adresu bude zaslán e-mail s vygenerovaným webovým odkazem.</li>\n<li>Navštivte webovou adresu, která je vám zaslána.</li>\n<li>Váš účet tím bude potvrzen a vy budete přihlášeni.</li>\n<li>Poté si vyberte kurz, jehož se chcete účastnit.</li>\n<li>Pokud budete vyzváni k vložení \"klíče k zápisu\", zadejte text, který jste dostali od učitele kurzu. Tím se \"zapíšete\" do kurzu.</li>\n<li>Pak již máte přístup k celému kurzu. Pro přihlášení a přístup do všech kurzů, v nichž jste zapsáni, budete napříště zadávat už jenom své uživatelské jméno a heslo (do formuláře na této stránce).</li>\n</ol>",
+    "loginsteps": "K plnému přístupu na tyto stránky, musíte nejprve vytvořit účet.",
     "missingemail": "Chybí e-mailová adresa",
     "missingfirstname": "Chybí křestní jméno",
     "missinglastname": "Chybí příjmení",
diff --git a/www/core/components/login/lang/da.json b/www/core/components/login/lang/da.json
index 2b9c4745b9c..1c8dc5d0c48 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Godkender",
-    "cancel": "Afbryd",
-    "cannotdownloadfiles": "Download af filer er deaktiveret i din Moodleservice. Appen virker ikke med denne indstilling deaktiveret. Kontakt din administrator.",
+    "cancel": "Annuller",
     "confirmdeletesite": "Er du sikker på at du ønsker at slette websiden {{sitename}}?",
-    "connect": "Tilslut!",
+    "connect": "Forbind",
     "connecttomoodle": "Tilslut til Moodle",
     "createaccount": "Opret ny profil",
     "createuserandpass": "Vælg  brugernavn og adgangskode",
-    "credentials": "Referencer",
     "credentialsdescription": "Skriv dit brugernavn og adgangskode for at logge på",
     "emailconfirmsent": "<p>En e-mail skulle være sendt til din adresse <b>{{$a}}</b></p> <p>Den indeholder anvisninger på, hvordan du fuldfører din registrering.</p> <p>Hvis du stadig har problemer, så kontakt webadministratoren.</p>",
     "enterthewordsabove": "Skriv ordene herover",
@@ -23,9 +21,9 @@
     "invalidemail": "Ugyldig e-mailadresse",
     "invalidmoodleversion": "Ugyldig Moodle version. Der kræves minimum 2.4.",
     "invalidsite": "Denne webadresse er ugyldig.",
-    "invalidurl": "Ugyldig URL",
+    "invalidurl": "Ugyldig URL specificeret",
     "localmobileunexpectedresponse": "Du har fået en uventet reaktion fra Moodle Mobile Additional Features, så du vil blive godkendt ved hjælp af standard Mobile service.",
-    "login": "Login",
+    "login": "Log ind på din konto",
     "loginbutton": "Login",
     "logininsiterequired": "Du skal logge på websiden via en browser",
     "loginsteps": "For at få fuld adgang til dette site, skal du oprette en brugerkonto.",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index 005d568ca01..10cc82ae64b 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -2,7 +2,6 @@
     "auth_email": "E-Mail-Registrierung",
     "authenticating": "Authentifizieren ...",
     "cancel": "Abbrechen",
-    "cannotdownloadfiles": "Das Herunterladen von Dateien ist für den mobilen Webservice deaktiviert. Diese Option ist aber für die App unbedingt notwendig. Wenden Sie sich an den Administrator.",
     "checksiteversion": "Prüfen Sie, ob Ihre Website mindestens Moodle 2.4 verwendet.",
     "confirmdeletesite": "Möchten Sie '{{sitename}}' wirklich aus der Liste löschen?",
     "connect": "Verbinden",
@@ -11,9 +10,8 @@
     "contactyouradministratorissue": "Wenden Sie sich an den Administrator der Website, um folgendes Problem prüfen zu lassen: {{$a}}",
     "createaccount": "Zugang anlegen (Registrierung)",
     "createuserandpass": "Wählen Sie Ihren Anmeldenamen und Ihr Kennwort",
-    "credentials": "Bewertungen",
     "credentialsdescription": "Geben Sie den Anmeldenamen und das Kennwort ein. ",
-    "emailconfirmsent": "<p>In Kürze wird eine E-Mail an <b>{{$a}}</b> gesendet.</p><p>Sie finden eine einfache Anleitung, wie Sie die Registrierung abschließen. Bei Schwierigkeiten wenden Sie sich an den Administrator der Website.</p>",
+    "emailconfirmsent": "<p>Um sicherzugehen, dass sich niemand unberechtigt über die von Ihnen angegebene E-Mail anmeldet, wird eine automatische Benachrichtigung an diese Adresse <b>{{$a}}</b> gesendet. Je nach Netzlast trifft sie sofort oder auch etwas später bei Ihnen ein.</p>\n<p>Die Benachrichtigung enthält eine Anleitung, wie Sie Ihre Registrierung bestätigen.\nDanach sind Sie auf dieser Moodle-Seite registriert und können sofort loslegen.</p>\n<p>Bei Problemen wenden Sie sich bitte an die Administrator/innen der Website.</p>",
     "emailnotmatch": "Die E-Mail-Adressen stimmen nicht überein.",
     "enterthewordsabove": "Geben Sie die gezeigten Wörter ein",
     "erroraccesscontrolalloworigin": "Der Cross-Origin Aufruf wurde zurückgewiesen. Weitere Informationen: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "Falsche Version. Mindestens Moodle 2.4 ist notwendig.",
     "invalidsite": "Die URL der Website ist ungültig.",
     "invalidtime": "Ungültige Zeitangabe",
-    "invalidurl": "Ungültige URL",
+    "invalidurl": "Ungültige URL angegeben",
     "invalidvaluemax": "Der Maximalwert ist {{$a}}.",
     "invalidvaluemin": "Der Minimalwert ist {{$a}}.",
     "localmobileunexpectedresponse": "Die Verbindung zum Plugin 'Moodle Mobile - Zusatzfeatures' ist fehlgeschlagen. Sie werden über den standardmäßigen mobilen Webservice authentifiziert.",
     "loggedoutssodescription": "Sie müssen sich erneut authentifizieren. Melden Sie sich dafür im Browser auf der Website im Browser an..",
-    "login": "Login",
+    "login": "Mit Ihrem Nutzerkonto anmelden",
     "loginbutton": "Anmelden",
     "logininsiterequired": "Sie müssen sich für diese Website im Browser anmelden.",
     "loginsteps": "Für den vollen Zugriff auf diese Website benötigen Sie ein Nutzerkonto.",
@@ -46,7 +44,7 @@
     "newaccount": "Neuer Zugang",
     "newsitedescription": "Geben Sie die URL zu Ihrer Website ein. Eventuell ist Ihre Website nicht für diese App freigegeben.",
     "notloggedin": "Sie müssen eingeloggt sein.",
-    "password": "Kennwort",
+    "password": "Gastschlüssel",
     "passwordrequired": "Kennwort fehlt",
     "policyaccept": "Ich verstehe den Text und stimme ihm zu",
     "policyagree": "Lesen Sie diese Zustimmungserklärung sorgfältig. Sie müssen erst zustimmen, um diese Website weiter nutzen zu können. Stimmen Sie zu?",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index a0eae4494d9..44ccc1d8784 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -2,7 +2,6 @@
     "auth_email": "Email-based αυτο-εγγραφή",
     "authenticating": "Έλεγχος ταυτότητας",
     "cancel": "Ακύρωση",
-    "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο στη Mobile υπηρεσία, η εφαρμογή δεν μπορεί να λειτουργήσει με αυτή τη ρύθμιση απενεργοποιημένη. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
     "checksiteversion": "Ελέγξτε ποια έκδοση Moodle χρησιμοποιεί το site, Moodle 2.4 ή μετέπειτα έκδοση.",
     "confirmdeletesite": "Είστε σίγουροι ότι θέλετε να διαγράψετε το site {{sitename}};",
     "connect": "Σύνδεση!",
@@ -11,11 +10,10 @@
     "contactyouradministratorissue": "Ζητήστε από το διαχειριστή του site να ελέγξει το ζήτημα: {{$a}}",
     "createaccount": "Δημιουργία του λογαριασμού μου",
     "createuserandpass": "Δημιουργία ενός νέου ονόματος χρήστη και κωδικού πρόσβασης για είσοδο στον δικτυακό τόπο",
-    "credentials": "Credentials",
     "credentialsdescription": "Δώστε το όνομα χρήστη και τον κωδικό πρόσβασής σας για να συνδεθείτε.",
-    "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
+    "emailconfirmsent": "<p>Ένα μήνυμα ηλεκτρονικού ταχυδρομείου θα πρέπει να έχει σταλεί στη διεύθυνσή σας, <b>{{$a}}</b> </p>\n   <p>Περιέχει απλές οδηγίες για την ολοκλήρωση της εγγραφής σας. </p>\n   <p>Αν συνεχίζετε να αντιμετωπίζετε δυσκολίες, επικοινωνήστε με το διαχειριστή του δικτυακού τόπου. </p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
-    "enterthewordsabove": "Εισάγετε τις παραπάνω λέξεις",
+    "enterthewordsabove": "Enter the words above",
     "errordeletesite": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαγραφής του site. Δοκιμάστε ξανά αργότερα.",
     "errorupdatesite": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση του site token.",
     "firsttime": "Είναι η πρώτη σας φορά εδώ;",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index 4a73347b2db..0d0c4738c6c 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -2,18 +2,16 @@
     "auth_email": "Auto-registro basado en Email",
     "authenticating": "Autenticando",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile, la app nop puede trabajar con esta configuración deshbilitada. Por favor contacte al administrador de su sitio.",
     "checksiteversion": "Revisar que su sitio usa Moodle 2.4 o más reciente.",
     "confirmdeletesite": "¿Está Usted seguro de querer eliminar el sitio {{sitename}}?",
-    "connect": "¡Conectar!",
+    "connect": "Conectar",
     "connecttomoodle": "Conectar a Moodle",
     "contactyouradministrator": "Contacte a su administrador del sitio para más ayuda.",
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear mi cuenta nueva",
     "createuserandpass": "Elegir su nombre_de_usuario y contraseña",
-    "credentials": "Credenciales",
     "credentialsdescription": "Por favor proporcione su nombre_de_usuario y contraseña para ingresar.",
-    "emailconfirmsent": "<p>Debería de haberse enviado un Email a su dirección en <b>{{$a}}</b></p><p>El Email contiene instrucciones sencillas para completar su registro.</p><p>Si continúa teniendo dificultades, contacte al administrador del sitio.</p>",
+    "emailconfirmsent": "<p>Hemos enviado un correo electrónico a <b>{{$a}}</b></p>\n<p>En él encontrará instrucciones sencillas para concluir el proceso.</p>\n<p>Si tuviera alguna dificultad, contacte con el Administrador del Sistema.</p>",
     "emailnotmatch": "No coinciden los Emails",
     "enterthewordsabove": "Escriba las palabras de arriba",
     "erroraccesscontrolalloworigin": "La llamada de Orígen Cruzado (''Cross-Origin'') que Usted está tratando de realizar ha sido rechazada. Por favor revise  https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "Versión de Moodle inválida. La versión mínima requerida es 2.4",
     "invalidsite": "La URL del sitio es inválida.",
     "invalidtime": "Hora inválida",
-    "invalidurl": "URL no válida",
+    "invalidurl": "Se ha especificado una URL no válida",
     "invalidvaluemax": "El valor máximo es {{$a}}",
     "invalidvaluemin": "El valor mínimo es {{$a}}",
     "localmobileunexpectedresponse": "La revisión de las características Adicionales de Moodle Mobile regresó una respuesta inesperada; Usted será autenticado usando el servicio Mobile estándar.",
     "loggedoutssodescription": "Usted tiene que autenticarse nuevamente. Usted necesita ingresar al sitio en una ventana del navegador.",
-    "login": "Ingreso",
+    "login": "Ingresar a su cuenta",
     "loginbutton": "Ingreso",
     "logininsiterequired": "Usted necesita ingresar al sitio con una ventana del navegador.",
     "loginsteps": "Para acceso completo a este sitio, Usted necesita primeramente crear una cuenta.",
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index 8cf8466827a..1e8b3fe4e7e 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -2,7 +2,6 @@
     "auth_email": "Auto-registro basado en e-mail.",
     "authenticating": "Autenticando",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "La descarga de archivos está desactivada en el servicio móvil de Moodle, la aplicación no puede funcionar con este parámetro desactivado. Por favor, contacte con el administrador del sitio.",
     "checksiteversion": "Comprueba que tu sitio utiliza Moodle 2.4 o superior.",
     "confirmdeletesite": "¿Está seguro de que quiere eliminar el sitio {{sitename}}?",
     "connect": "Conectar",
@@ -11,9 +10,8 @@
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear cuenta",
     "createuserandpass": "Crear un nuevo usuario y contraseña para acceder al sistema",
-    "credentials": "Credenciales",
     "credentialsdescription": "Introduzca su nombre se usuario y contraseña para entrar",
-    "emailconfirmsent": "<p>Se ha enviado un email a su dirección <b>{{$a}}</b></p><p>Contiene instrucciones para completar el proceso de registro.</p><p>Si continúa teniendo algún problema, contacte con el administrador de su sitio.</p>",
+    "emailconfirmsent": "<p>Hemos enviado un correo electrónico a <b>{{$a}}</b></p>\n<p>En él encontrará instrucciones sencillas para concluir el proceso.</p>\n<p>Si tuviera alguna dificultad, contacte con el Administrador del Sistema.</p>",
     "emailnotmatch": "Las direcciones de correo no coinciden.",
     "enterthewordsabove": "Escriba las palabras de arriba",
     "erroraccesscontrolalloworigin": "La llamada Cross-Origin que está intentando ha sido rechazada. Por favor visite https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,14 +28,14 @@
     "invalidmoodleversion": "Versión de Moodle inválida. La versión mínima requerida es:",
     "invalidsite": "La URL del sitio es inválida.",
     "invalidtime": "Hora incorrecta",
-    "invalidurl": "URL no válida",
+    "invalidurl": "Se ha especificado una URL no válida",
     "invalidvaluemax": "El valor máximo es {{$a}}",
     "invalidvaluemin": "El valor mínimo es {{$a}}",
     "localmobileunexpectedresponse": "Las características adicionales de Moodle Mobile han devuelto una respuesta inesperada, debe autenticarse utilizando el servicio estándar de Mobile.",
-    "login": "Entrar",
+    "login": "Acceder con su cuenta",
     "loginbutton": "Acceder",
     "logininsiterequired": "Para autentificarse en el sitio se ha de abrir una ventana de navegador.",
-    "loginsteps": "Para tener acceso completo al sitio necesita crear una cuenta.",
+    "loginsteps": "Hola. Para acceder al sistema tómese un minuto para\ncrear una cuenta.\nCada curso puede disponer de una \"clave de acceso\"\nque sólo tendrá que usar la primera vez.\nEstos son los pasos:\n<ol>\n<li>Rellene el <a href=\"{{$a}}\">Formulario de Registro</a> con sus datos.</li>\n<li>El sistema le enviará un correo para verificar que su dirección sea correcta.</li>\n<li>Lea el correo y confirme su matrícula.</li>\n<li>Su registro será confirmado y usted podrá acceder al curso.</li>\n<li>Seleccione el curso en el que desea participar.</li>\n<li>Si algún curso en particular le solicita una \"contraseña de acceso\"\nutilice la que le facilitaron cuando se matriculó.\nAsí quedará matriculado.</li>\n<li>A partir de ese momento no necesitará utilizar más que su nombre de usuario y contraseña\nen el formulario de la página\npara entrar a cualquier curso en el que esté matriculado.</li>\n</ol>",
     "missingemail": "Falta la dirección de correo",
     "missingfirstname": "Falta el nombre dado",
     "missinglastname": "Falta el apellido(s)",
diff --git a/www/core/components/login/lang/eu.json b/www/core/components/login/lang/eu.json
index 7b129c08738..94685db8f7f 100644
--- a/www/core/components/login/lang/eu.json
+++ b/www/core/components/login/lang/eu.json
@@ -2,18 +2,16 @@
     "auth_email": "E-postaren bidezko autentifikazioa",
     "authenticating": "Egiaztatzen",
     "cancel": "Utzi",
-    "cannotdownloadfiles": "Fitxategiak jaistea ezgaituta dago zure Mobile zerbitzuan, app-ak ezin du ezarpen honekin funtzionatu. Mesedez zure gune kudeatzailean harremanetan jarri zaitez.",
     "checksiteversion": "Egiaztatu zure Moodle guneak 2.4 bertsioa edo aurreragokoa erabiltzen duela.",
     "confirmdeletesite": "Ziur zaude {{sitename}} gunea ezabatu nahi duzula?",
-    "connect": "Konektatu!",
+    "connect": "Konektatu",
     "connecttomoodle": "Moodle-ra konektatu",
     "contactyouradministrator": "Zure guneko kudeatzailearekin harremanetan jarri laguntza gehiagorako.",
     "contactyouradministratorissue": "Mesedez, eskatu zure kudeatzaileari hurrengo arazoa ikuskatu dezala: {{$a}}",
     "createaccount": "Nire kontu berria sortu",
     "createuserandpass": "Aukeratu zure erabiltzaile-izena eta pasahitza",
-    "credentials": "Egiaztagiriak",
     "credentialsdescription": "Mesedez saioa hasteko zure sartu erabiltzaile eta pasahitza.",
-    "emailconfirmsent": "<p>Zure <b>{{$a}}</b> helbidera mezu bat bidali da.</p><p>Zure erregistroa amaitzeko argibide erraz batzuk ditu.</p><p>Arazorik baduzu, jarri harremanetan kudeatzailearekin.</p>",
+    "emailconfirmsent": "<p>E-posta mezu bat bidali dugu zure hurrengo helbide honetara: <b>{{$a}}</b></p>\n   <p>Izena ematen amaitzeko argibide erraz batzuk ditu.</p>\n   <p>Arazorik baduzu, jarri harremanetan kudeatzailearekin.</p>",
     "emailnotmatch": "E-posta helbideak ez datoz bat",
     "enterthewordsabove": "Idatzi goiko hitzak",
     "erroraccesscontrolalloworigin": "Saiatzen ari zaren Cross-Origin deia ez da onartu. Ikusi mesedez https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "Moodle bertsio baliogabea. Gutxieneko bertsioa hurrengoa da:",
     "invalidsite": "Guneko URLa ez da zuzena",
     "invalidtime": "Ordu baliogabea",
-    "invalidurl": "URL baliogabea",
+    "invalidurl": "Balio ez duen URLa ezarri da",
     "invalidvaluemax": "Gehieneko balioa {{$a}} da.",
     "invalidvaluemin": "Gutxieneko balioa {{$a}} da.",
     "localmobileunexpectedresponse": "Moodle Mobile-ko Funtzio Aurreratuen kontrolak ezusteko erantzuna eman du, Mobile zerbitzu estandarra erabilita autentifikatuko zaitugu.",
     "loggedoutssodescription": "Berriz autentifikatu behar duzua. Gunean nabigatzaile leiho baten bitartez hasi behar duzu saioa.",
-    "login": "Saioa hasi",
+    "login": "Sartu zure kontuan",
     "loginbutton": "Hasi saioa",
     "logininsiterequired": "Gunean web-nabigatzaile baten bidez sartu behar zara.",
     "loginsteps": "Gune honetara sarbide osoa izateko, lehenik eta behin kontua sortu behar duzu. in ikastarotara sartzeko web-gune honetako erabiltzaile izan behar duzu\neta horretarako kontu bat sortu behar duzu.\n\nNola sortu kontu berria:\n<ol>\n<li>Sakatu lotura honetan <a href=\"{{$a}}\">KONTU BERRIA</a> eta formularioa bete zure datuekin.</li>\n<li>E-posta mezu bat bidaliko dugu berehala zure e-posta helbidera.</li>\n<li>Mezua irakurri eta agertzen den loturan klik egin.</li>\n<li>Zure kontua berretsi eta barruan izango zara.</li>\n<li>Orduan, nahi duzun ikastaroa aukeratu.</li>\n<li>\"Partaide-giltza\" bat eskatzen badizu, erabili matrikulatutakoan eman zizutena</li>\n<li>Kontu berria sortutakoan, eta zenbait kasutan matrikula egindakoan, ikastarorako sarbidea izango duzu.</li>\n<li>Hemendik aurrera zure erabiltzaile-izena eta pasahitza besterik ez dituzu sartu beharko hasiera orrian zeure ikastaroan parte hartzeko.</li>\n</ol>",
@@ -71,7 +69,7 @@
     "startsignup": "Kontu berri bat sortu",
     "stillcantconnect": "Oraindik ezin zara konektatu?",
     "supplyinfo": "Xehetasun gehiago",
-    "username": "Erabiltzailea-izena",
+    "username": "Erabiltzaile-izena",
     "usernamerequired": "Erabiltzailea behar da",
     "usernotaddederror": "Erabiltzailea ez da gehitu - errorea",
     "visitchangepassword": "Gunera joan nahi duzu pasahitza aldatzeko?",
diff --git a/www/core/components/login/lang/fa.json b/www/core/components/login/lang/fa.json
index ff8e4c89e54..60b9312b038 100644
--- a/www/core/components/login/lang/fa.json
+++ b/www/core/components/login/lang/fa.json
@@ -10,14 +10,14 @@
     "enterthewordsabove": "کلمات بالا را وارد نمائید",
     "firsttime": "برای اولین بار به این صفحه آمده‌اید؟",
     "getanothercaptcha": "دریافت یک کپچای دیگر",
-    "help": "راهنما",
+    "help": "راهنمایی",
     "helpmelogin": "<p>چندین هزار سایت مودل در دنیا وجود دارد. این برنامه فقط می‌تواند به آن مودل‌هایی متصل شود که صراحتا دسترسی «برنامه موبایل» را فعال کرده‌باشند.</p><p>اگر نمی‌توانید به سایت مودل خود وصل شوید، باید با مدیر مودل آن سایت تماس بگیرید و بخواهید که <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a> را مطالعه کنند.</p>\n<p>برای آزمایش برنامه با استفاده از یک سایت آزمایشی، در قسمت مربوط به <i>آدرس سایت</i> عبارت <i>teacher</i> یا <i>student</i> را وارد کرده و بر روی دکمه <b>اتصال</b> کلیک کنید.</p>",
     "instructions": "دستورالعمل",
     "invalidaccount": "لطفا اطلاعات ورودخود را بررسی نمایید",
     "invalidemail": "آدرس پست الکترونیک نامعتبر",
     "invalidmoodleversion": "این نسخه از برنامه سایت قابلیت اتصال به موبایل ندارد",
     "invalidsite": "نشانی سایت معتبر نیست",
-    "invalidurl": "آدرس نامعتبر",
+    "invalidurl": "آدرسی که وارد کرده‌اید معتبر نیست",
     "login": "ورود به سایت",
     "logininsiterequired": "لازم است به سایت از طریق مرورگر متصل گردید",
     "loginsteps": "برای داشتن دسترسی کامل به این سایت، پیش از هر چیز باید یک حساب کاربری بسازید.",
@@ -26,7 +26,7 @@
     "missinglastname": "نام خانوادگی را وارد کنید",
     "mobileservicesnotenabled": "سرویس دسترسی موبایل در سایت شما فعال نیست",
     "newaccount": "حساب کاربری جدید",
-    "password": "گذرواژه",
+    "password": "رمز دسترسی",
     "passwordrequired": "گذرواژه مورد نیاز است",
     "policyaccept": "موافقم و می‌پذیرم",
     "policyagree": "برای ادامهٔ استفاده از این سایت باید موافقت خود را با خط مشی آن اعلام کنید. آیا موافقید؟",
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index 5879ba75bab..375dc7590c2 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -2,18 +2,16 @@
     "auth_email": "Auto-enregistrement par courriel",
     "authenticating": "Authentification",
     "cancel": "Annuler",
-    "cannotdownloadfiles": "Le téléchargement des fichiers est désactivé sur votre Moodle et l'app ne peut pas fonctionner si ce réglage est désactivé. Veuillez contacter l'administrateur de la plateforme.",
     "checksiteversion": "Veuillez vérifier que votre site utilise Moodle 2.4 ou une version ultérieure.",
     "confirmdeletesite": "Voulez-vous vraiment supprimer la plateforme {{sitename}} ?",
-    "connect": "Connecter !",
+    "connect": "Connecter",
     "connecttomoodle": "Connexion à Moodle",
     "contactyouradministrator": "Veuillez contacter l'administrateur de la plateforme pour plus d'aide.",
     "contactyouradministratorissue": "Veuillez demander à l'administrateur de la plateforme de vérifier l'élément suivant : {{$a}}",
     "createaccount": "Créer mon compte",
     "createuserandpass": "Créer un compte",
-    "credentials": "Données de connexion",
     "credentialsdescription": "Veuillez fournir votre nom d'utilisateur et votre mot de passe pour vous connecter.",
-    "emailconfirmsent": "<p>Un message vous a été envoyé par courriel à l'adresse <b>{{$a}}</b></p><p>Il contient des instructions vous permettant de terminer votre enregistrement.</p><p>En cas de difficulté, viellez contacter l'administrateur de la plateforme.</p>",
+    "emailconfirmsent": "<p>Un message vous a été envoyé à l'adresse de courriel <strong>{{$a}}</strong>.</p><p>Il contient les instructions pour terminer votre enregistrement.</p><p>Si vous rencontrez des difficultés, veuillez contacter l'administrateur du site.</p>",
     "emailnotmatch": "Les adresses de courriel ne correspondent pas",
     "enterthewordsabove": "Tapez les mots ci-dessus",
     "erroraccesscontrolalloworigin": "La tentative d'appel « Cross-Origin » que vous avez effectuée a été rejetée. Veuillez consulter https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "Version de Moodle non valide. La version minimale requise est :",
     "invalidsite": "Cette URL n'est pas valide.",
     "invalidtime": "Temps non valide",
-    "invalidurl": "URL non valide",
+    "invalidurl": "URL spécifié non valide",
     "invalidvaluemax": "La valeur maximale est {{$a}}",
     "invalidvaluemin": "La valeur minimale est {{$a}}",
     "localmobileunexpectedresponse": "La vérification des fonctionnalités additionnelles de Moodle Mobile a envoyé une réponse inattendue. Vous allez être connecté au moyen du service mobile standard.",
     "loggedoutssodescription": "Veuillez vous ré-authentifier en vous connectant au site au moyen d'un navigateur web.",
-    "login": "Connexion",
+    "login": "Connexion à votre compte",
     "loginbutton": "Se connecter",
     "logininsiterequired": "Vous devez vous connecter au moyen d'un navigateur.",
     "loginsteps": "Pour un accès complet à ce site, veuillez créer un compte utilisateur.",
diff --git a/www/core/components/login/lang/he.json b/www/core/components/login/lang/he.json
index 0a9969ee7c7..b420c10f9f5 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -1,9 +1,8 @@
 {
     "authenticating": "מאמת נתונים",
     "cancel": "ביטול",
-    "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת בשירותי הנייד שלך, האפליקציה אינה יכולה לעבוד במצב זה. אנא פנה למנהל האתר.",
     "confirmdeletesite": "האם את/ה בטוח/ה שברצונך למחוק את האתר {{sitename}}?",
-    "connect": "התחברות!",
+    "connect": "חיבור",
     "connecttomoodle": "התחברות למוודל",
     "createaccount": "יצירת חשבון חדש",
     "createuserandpass": "הזנת שם־משתמש וסיסמה",
@@ -21,8 +20,8 @@
     "invalidemail": "כתובת דואר אלקטרוני לא תקפה",
     "invalidmoodleversion": "גרסת מוודל לא תקינה. נדרשת גרסה 2.4 ומעלה.",
     "invalidsite": "כתובת האתר אינה תקינה.",
-    "invalidurl": "URL לא חוקי",
-    "login": "כניסה",
+    "invalidurl": "הוגדר קישור לא תקין",
+    "login": "התחברות לחשבונך",
     "loginbutton": "כניסה!",
     "logininsiterequired": "עליך להתחבר לאתר בחלון דפדפן.",
     "loginsteps": "שלום לך! לקבלת גישה מלאה לקורסים עליך להקדיש דקה לפתיחת חשבון חדש באתר זה.\nלכל אחד מהקורסים הבודדים יכול להיות גם \"מפתח רישום\" שתצטרך רק מאוחר יותר. להלן שלבי פתיחת החשבון:\n<ol>\n<li>מלא את הטופס <a href=\"{{$a}}\">חשבון חדש</a> בפרטים שלך</li>\n<li>דואר אלקטרוני יישלח מיידית לכתובת הדואר האלקטרוני שסיפקת (אם לא נמצא, נא לחפש גם בדואר הזבל או הספאם). </li>\n<li>קרא את הדואר אלקטרוני שלך ולחץ על קישור האינטרנט שהוא מכיל.</li>\n<li>החשבון שלך יאושר ואתה תהיה מחובר.</li>\n<li>עכשיו בחר את הקורס בו תרצה להשתתף.</li>\n<li>אם מבקשים ממך \"מפתח רישום\" השתמש בזה שנתן לך המורה שלך. זה \"ירשום\" אותך לקורס.</li>\n<li>עכשיו יש בידך גישה לכל הקורס. מעתה והלאה כל שתצטרך בכדי להתחבר ולהיכנס לכל קורס שנרשמת אליו הוא שם המשתמש שלך והסיסמה (בטופס המופיע בדף זה).</li>\n</ol>",
diff --git a/www/core/components/login/lang/hu.json b/www/core/components/login/lang/hu.json
index 426d88bebe7..b8471f2c4ca 100644
--- a/www/core/components/login/lang/hu.json
+++ b/www/core/components/login/lang/hu.json
@@ -1,6 +1,6 @@
 {
     "authenticating": "Hitelesítés",
-    "cancel": "Mégse",
+    "cancel": "Törlés",
     "connect": "Kapcsolódás",
     "createaccount": "Új felhasználói azonosítóm létrehozása",
     "createuserandpass": "Új felhasználónév és jelszó megadása",
@@ -15,8 +15,8 @@
     "invalidemail": "Érvénytelen e-mail cím",
     "invalidmoodleversion": "Érvénytelen Moodle-verzió. A minimális verziószám a 2.4.",
     "invalidsite": "A portál-URL nem érvényes.",
-    "invalidurl": "Érvénytelen URL",
-    "login": "Belépés",
+    "invalidurl": "Érvénytelen URL-t adott meg",
+    "login": "Lépjen be fiókjába",
     "logininsiterequired": "A portálra böngészőablakban kell bejelentkeznie.",
     "loginsteps": "Ahhoz, hogy teljesen hozzáférjen a portálhoz, először új fiókot kell létrehoznia.",
     "missingemail": "Hiányzó e-mail cím",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index bc646497fc2..23251dd157e 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Autenticazione in corso",
     "cancel": "Annulla",
-    "cannotdownloadfiles": "Lo scaricamento dei file è disabilitato nel servizio Mobile. l'app non può funzionare con questa impostazione disabilitata, per favore contatta l'amministratore dle sito.",
     "confirmdeletesite": "Sei sicuro di eliminare il sito {{sitename}}?",
-    "connect": "Collegati!",
+    "connect": "Connetti",
     "connecttomoodle": "Collegati a Moodle",
     "createaccount": "Crea il mio nuovo account",
     "createuserandpass": "Scegli username e password",
-    "credentials": "Credenziali",
     "credentialsdescription": "Per favore inserisci username e password per l'autenticazione",
     "emailconfirmsent": "<p>Una email è stata inviata al tuo indirizzo <b>{{$a}}</b></p>\n<p>Contiene semplici istruzioni per completare la tua registrazione.</p>\n<p>Se hai qualche difficoltà contatta l'amministratore del sito.</p>",
     "enterthewordsabove": "Inserisci le parole sovrastanti",
@@ -23,7 +21,7 @@
     "invalidemail": "Indirizzo email non valido",
     "invalidmoodleversion": "Versione di Moodle non valida. La versione minima richiesta:",
     "invalidsite": "L'URL del sito non è valida",
-    "invalidurl": "L'URL non è valido",
+    "invalidurl": "La URL specificata non è valida",
     "localmobileunexpectedresponse": "Il controllo delle Moodle Mobile Additional Feature ha restituito una risposta inattesa, sarai autenticato tramite i servizi Mobile standard.",
     "login": "Login",
     "loginbutton": "Login!",
@@ -36,7 +34,7 @@
     "newaccount": "Nuovo account",
     "newsitedescription": "Inserisci l'URL del sito Moodle al quale vuoi collegarti. Da notare che il sito deve essere configurato per funzionare con questa app.",
     "notloggedin": "Devi essere autenticato",
-    "password": "Password",
+    "password": "Chiave",
     "passwordrequired": "Password necessaria",
     "policyaccept": "Ho letto le condizioni e le accetto",
     "policyagree": "Per continuare ad usare questo sito, è necessario accettare le condizioni riportate.",
@@ -53,7 +51,7 @@
     "siteurl": "URL del sito",
     "siteurlrequired": "L'URL del sito è obbligatoria. Esempio:<i>http://www.yourmoodlesite.abc or https://www.yourmoodlesite.efg</i>",
     "startsignup": "Crea un account",
-    "supplyinfo": "Inserisci i tuoi dati",
+    "supplyinfo": "Ulteriori dettagli",
     "username": "Username",
     "usernamerequired": "Username obbligatorio",
     "usernotaddederror": "Errore - L'utente \"{{$a}}\" non è stato aggiunto",
diff --git a/www/core/components/login/lang/ja.json b/www/core/components/login/lang/ja.json
index 885e21f8911..e38671c8c23 100644
--- a/www/core/components/login/lang/ja.json
+++ b/www/core/components/login/lang/ja.json
@@ -15,8 +15,8 @@
     "invalidemail": "無効なメールアドレスです。",
     "invalidmoodleversion": "Moodleのバージョンが古すぎます。少なくともこれより新しいMoodleである必要があります：",
     "invalidsite": "サイトURLが正しくありません。",
-    "invalidurl": "無効なURLです。",
-    "login": "ログイン",
+    "invalidurl": "無効なURLが指定されました。",
+    "login": "あなたのアカウントにログインする:",
     "logininsiterequired": "ブラウザウインドウからサイトにログインする必要があります。",
     "loginsteps": "このサイトにフルアクセスするため、あなたは最初にアカウントを作成する必要があります。",
     "missingemail": "メールアドレスが入力されていません。",
@@ -38,7 +38,7 @@
     "siteurlrequired": "サイトURLがありません。書き方は、例えば次の通りです：<i>http://www.yourmoodlesite.abc あるいは https://www.yourmoodlesite.efg</i>",
     "startsignup": "新しいアカウントを作成する",
     "supplyinfo": "詳細情報",
-    "username": "ユーザー名",
+    "username": "ユーザ名",
     "usernamerequired": "ユーザー名がありません",
     "usernotaddederror": "ユーザは追加されませんでした - エラー。",
     "webservicesnotenabled": "あなたのサイトでWebサービスが有効になっていません。モバイルアクセスが必要と思うなら、あなたのMoodleサイト管理者に相談してください。"
diff --git a/www/core/components/login/lang/lt.json b/www/core/components/login/lang/lt.json
index 9329ebf2aac..07ebd4979b4 100644
--- a/www/core/components/login/lang/lt.json
+++ b/www/core/components/login/lang/lt.json
@@ -2,18 +2,16 @@
     "auth_email": "Savarankiška registracija el. paštu",
     "authenticating": "Autentifikuojama",
     "cancel": "Atšaukti",
-    "cannotdownloadfiles": "Negalima atsisiųsti failo į Jūsų mobilųjį įrenginį, programėlė negali veikti be šių nustatymų. Prašome susisiekti su svetainės administratoriumi.",
     "checksiteversion": "Patikrintkite, ar svetainė naudoja Moodle 2.4. arba vėlesnę versiją.",
     "confirmdeletesite": "Ar tikrai norite ištrinti svetainę {{sitename}}?",
-    "connect": "Prisijungta!",
+    "connect": "Prijungti",
     "connecttomoodle": "Prisijungti prie Moodle",
     "contactyouradministrator": "Susisiekite su svetainės administratoriumi, jei reikalinga pagalba.",
     "contactyouradministratorissue": "Dėl šių klausimų prašome susisiekti su administratoriumi: {{$a}}",
     "createaccount": "Kurti naują mano paskyrą",
     "createuserandpass": "Pasirinkite savo naudotojo vardą ir slaptažodį",
-    "credentials": "Įgaliojimai",
     "credentialsdescription": "Prisijungti naudojant vartotojo vardą ir slaptažodį.",
-    "emailconfirmsent": "<p>Informacija išsiųsta Jūsų nurodytu adresu <b>{{$a}}</b></p><p>Tai padės sėkmingai užbaigti registraciją.</p><p>Jeigu nepavyksta, susisiekite su svetainės administratoriumi.</p>",
+    "emailconfirmsent": "<p>El. laiškas išsiųstas jūsų adresu <b>{{$a}}</b></p>. <p>Jame pateikti paprasti nurodymai, kaip užbaigti registraciją.</p> <p>Jei iškils kokių sunkumų, kreipkitės į svetainės administratorių.</p>",
     "emailnotmatch": "El. paštas nesutampa",
     "enterthewordsabove": "Įvesti aukščiau rodomus žodžius",
     "erroraccesscontrolalloworigin": "Kryžminis veiksmas buvo atmestas. Patikrinkite: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -21,7 +19,7 @@
     "errorupdatesite": "Klaida atnaujinant svetainės kodą.",
     "firsttime": "Ar jūs čia pirmą kartą?",
     "getanothercaptcha": "Gauti kitą CAPTCHA",
-    "help": "Žinynas",
+    "help": "Pagalba",
     "helpmelogin": "<p>Visame pasaulyje Moodle svetainių yra labai daug. Ši programėlė gali prisijungti prie Moodle svetainių, turinčių specialią Moodle programėlių prieigą.</p><p>Jeigu negalite prisijungti, praneškite apie tai Moodle administratoriui ir paprašykite perskaityti <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>Norėdami išbandyti programėlės demo versiją surinkite <i>teacher (dėstytojui)</i> ar <i>student (besimokančiajam)</i> <i>Svetainės adreso </i> lauke ir paspauskite <b>Prisijungti mygtuką<b>.</p>",
     "instructions": "Instrukcijos",
     "invalidaccount": "Prašome patikrinti prisijungimo duomenis arba paprašyti administratoriaus patikrinti svetainės nustatymus.",
@@ -30,7 +28,7 @@
     "invalidmoodleversion": "Negaliojanti Moodle versija. Turi būt ne senesnė nei 2.4.",
     "invalidsite": "URL adresas netinkamas.",
     "invalidtime": "Netinkamas laikas",
-    "invalidurl": "Klaidingas URL",
+    "invalidurl": "Nurodytas negaliojantis URL",
     "invalidvaluemax": "Didžiausia vertė {{$a}}",
     "invalidvaluemin": "Mažiausia vertė {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobilių Papildomų Funkcijų patikra gavo netikėtą atsakymą, būsite autentifikuojamas naudojant standartines mobilias paslaugas.",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index 33c44238ede..bc5e768a4fd 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -2,18 +2,16 @@
     "auth_email": "E-mail zelfregistratie",
     "authenticating": "Authenticeren",
     "cancel": "Annuleer",
-    "cannotdownloadfiles": "Het downloaden van bestanden is uitgeschakeld in je mobiele service. De app kan niet werken met deze instelling uitgeschakeld. Contacteer je Moodle sitebeheerder.",
     "checksiteversion": "Controleer of je site minstens Moodle 2.4 of nieuwe gebruikt.",
     "confirmdeletesite": "Weet je zeker dat je de site {{sitename}} wil verwijderen?",
-    "connect": "Verbinden!",
+    "connect": "Verbind",
     "connecttomoodle": "Verbinden met Moodle",
     "contactyouradministrator": "Neem contact op met je site-beheerder voor meer hulp.",
     "contactyouradministratorissue": "Vraag aan je site-beheerder om volgend probleem te onderzoeken: {{$a}}",
     "createaccount": "Maak mijn nieuwe account aan",
     "createuserandpass": "Kies een gebruikersnaam en wachtwoord",
-    "credentials": "Accountgegevens",
     "credentialsdescription": "Geef je gebruikersnaam en wachtwoord op om je aan te melden",
-    "emailconfirmsent": "<p>Er zou een e-mail gestuurd moeten zijn naar jouw adres <b>{{$a}}</b></p><p>Het bericht bevat eenvoudige instructies om je registratie te voltooien.</p><p>Als je problemen blijft ondervinden, neem dan contact op met de sitebeheerder.</p>",
+    "emailconfirmsent": "<p>Als het goed is, is er een e-mail verzonden naar <b>{{$a}}</b></p>\n<p>Daarin staan eenvoudige instructies voor het voltooien van de registratie.</p>\n<p>Indien je moeilijkheden blijft ondervinden, neem dan contact op met je sitebeheerder.</p>",
     "emailnotmatch": "E-mailadressen komen niet overeen",
     "enterthewordsabove": "Vul hier bovenstaande woorden in",
     "erroraccesscontrolalloworigin": "De Cross-Origin call die je probeerde uit te voeren,  werd geweigerd. Controleer https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,15 +28,15 @@
     "invalidmoodleversion": "Ongeldige Moodleversie. De vereiste minimumversie is:",
     "invalidsite": "Deze site-URL is niet geldig.",
     "invalidtime": "Ongeldige tijd",
-    "invalidurl": "Ongeldige url",
+    "invalidurl": "Ongeldige URL opgegeven",
     "invalidvaluemax": "De maximum waarde is {{$a}}",
     "invalidvaluemin": "De minimum waard eis {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobile Additional Features Check gaf een onverwacht antwoord. Je zult aanmelden via de standaard Mobile service.",
     "loggedoutssodescription": "Je moet opnieuw aanmelden. Je moet aanmelden met een browservenster.",
-    "login": "Login",
+    "login": "Login met je account",
     "loginbutton": "Inloggen",
     "logininsiterequired": "Je dient via een browser in te loggen op je Moodle site",
-    "loginsteps": "Om volledig toegang te krijgen moet je eerst een account maken.",
+    "loginsteps": "Om volledige toegang tot deze site te krijgen, moet je een account maken.",
     "missingemail": "e-mailadres ontbreekt",
     "missingfirstname": "Voornaam ontbreekt",
     "missinglastname": "Achternaam ontbreekt",
diff --git a/www/core/components/login/lang/pl.json b/www/core/components/login/lang/pl.json
index a9be398b050..bd6b20f4095 100644
--- a/www/core/components/login/lang/pl.json
+++ b/www/core/components/login/lang/pl.json
@@ -15,7 +15,7 @@
     "invalidemail": "Niewłaściwy adres e-mail",
     "invalidmoodleversion": "Nieprawidłowa wersja Moodle. Minimalna wymagana wersja to: ",
     "invalidsite": "Adres strony jest nieprawidłowy.",
-    "invalidurl": "Niepoprawny URL",
+    "invalidurl": "Określono niepoprawny URL",
     "login": "Zaloguj się",
     "logininsiterequired": "Musisz się zalogować do strony w oknie przeglądarki.",
     "loginsteps": "Aby otrzymać pełny dostęp do kursów w tym serwisie, musisz najpierw utworzyć konto.",
@@ -37,7 +37,7 @@
     "siteurl": "Adres strony",
     "siteurlrequired": "Adres strony wymagany, np. <i>http://www.yourmoodlesite.abc lub https://www.yourmoodlesite.efg</i>",
     "startsignup": "Zacznij teraz od utworzenia nowego konta!",
-    "supplyinfo": "Więcej szczegółów",
+    "supplyinfo": "Proszę wpisać kilka informacji o sobie",
     "username": "Nazwa użytkownika",
     "usernamerequired": "Nazwa użytkownika wymagana",
     "usernotaddederror": "Błąd - użytkownik nie został dodany.",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index 657bba65bcf..b63d1fe4266 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -2,18 +2,16 @@
     "auth_email": "Auto-registro por e-mail",
     "authenticating": "Autenticação",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "O download de arquivos está desabilitado em seu serviço Mobile, o aplicativo não pode trabalhar com essa configuração desabilitada. Por favor, contate o administrador do seu site.",
     "checksiteversion": "Verifique se seu site usa Moodle 2.4 ou superior.",
     "confirmdeletesite": "Você tem certeza que quer excluir o site {{sitename}}?",
-    "connect": "Conectar!",
+    "connect": "Conectar",
     "connecttomoodle": "Conectar ao moodle",
     "contactyouradministrator": "Contate o administrador do site para ter mais ajuda.",
     "contactyouradministratorissue": "Por favor, pergunte ao administrador para verificar o seguinte problema: {{$a}}",
     "createaccount": "Cadastrar este novo usuário",
     "createuserandpass": "Escolha seu usuário e senha",
-    "credentials": "Credenciais",
     "credentialsdescription": "Por favor, informe seu nome de usuário e senha para efetuar o login",
-    "emailconfirmsent": "<p>Um e-mail irá ser enviado para o seu endereço em <b>{{$a}}</b></p><p> Ele irá conter instruções fáceis para completar seu registro.</p><p>Se você continua a ter dificuldades, contate o administrador do site.</p>",
+    "emailconfirmsent": "<p>Uma mensagem foi enviada para o seu endereço <b>{{$a}}</b></p><p>Esta mensagem contém instruções para completar a sua inscrição.</p><p>Se você encontrar dificuldades contate o administrador.</p>",
     "emailnotmatch": "Os e-mail não coincidem",
     "enterthewordsabove": "Digite as palavras acima",
     "erroraccesscontrolalloworigin": "A chamada de Cross-Origin que você está tentando executar foi rejeitada. Por favor, verifique https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "Versão do Moodle inválida. A versão mínima requerida é:",
     "invalidsite": "A URL do siteé inválida.",
     "invalidtime": "Tempo inválido",
-    "invalidurl": "Url inválida",
+    "invalidurl": "URL inválida especificada",
     "invalidvaluemax": "O valor máximo é {{$a}}",
     "invalidvaluemin": "O valor minimo é{{$a}}",
     "localmobileunexpectedresponse": "Verificação do Moodle Mobile Additional Features retornou uma resposta inesperada, você ira se autenticar usando o serviço Mobile padrão",
     "loggedoutssodescription": "Você tem que autenticar novamente. Você precisa fazer login no site em uma janela do navegador.",
-    "login": "Login",
+    "login": "Login em sua conta",
     "loginbutton": "Entrar",
     "logininsiterequired": "É preciso logar no site num navegador.",
     "loginsteps": "Para ter acesso completo a este site, você primeiro precisa criar uma conta.",
@@ -71,7 +69,7 @@
     "startsignup": "Criar uma conta",
     "stillcantconnect": "Ainda não consegue conectar?",
     "supplyinfo": "Mais detalhes",
-    "username": "Nome de Usuário",
+    "username": "Identificação de usuário",
     "usernamerequired": "Nome de usuário exigido",
     "usernotaddederror": "Usuário não adicionado - erro",
     "visitchangepassword": "Você quer visitar o site para mudar sua senha?",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index 2e46e99dccb..4608e1fa1f9 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -2,18 +2,16 @@
     "auth_email": "Autorregisto com confirmação por e-mail",
     "authenticating": "Autenticação",
     "cancel": "Cancelar",
-    "cannotdownloadfiles": "O seu serviço Mobile não permite descarregar ficheiros e a aplicação não funciona sem ativar esta configuração. Por favor, contacte o administrador do site.",
     "checksiteversion": "Verifique se seu site usa o Moodle 2.4 ou posterior.",
     "confirmdeletesite": "Tem a certeza que pretende remover o site {{sitename}}?",
-    "connect": "Ligar!",
+    "connect": "Ligar",
     "connecttomoodle": "Ligação ao Moodle",
     "contactyouradministrator": "Contacte o administrador do site para obter mais ajuda.",
     "contactyouradministratorissue": "Solicite ao administrador que verifique o seguinte problema: {{$a}}",
     "createaccount": "Criar a minha conta",
     "createuserandpass": "Escolha um nome de utilizador e senha",
-    "credentials": "Credenciais",
     "credentialsdescription": "Por favor, digite o nome de utilizador e senha para entrar",
-    "emailconfirmsent": "<P>Um e-mail deve ter sido enviado para o seu endereço <b>{{$a}}</b></p><p>. Contém instruções fáceis para concluir o seu registo. Se continuar a ter dificuldades, entre em contacto com o administrador do site.</p>",
+    "emailconfirmsent": "<p>Acaba de ser enviada uma mensagem para o seu endereço <strong>{{$a}}</strong>, com instruções fáceis para completar a sua inscrição.</p><p>Se tiver alguma dificuldade em completar o registo, contacte o administrador do site.</p>",
     "emailnotmatch": "Os e-mails não coincidem",
     "enterthewordsabove": "Insira as palavras indicadas acima",
     "erroraccesscontrolalloworigin": "A acção de Cross-Origin que tentou executar foi rejeitada. Por favor, consulte mais informações em https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -30,12 +28,12 @@
     "invalidmoodleversion": "A versão do Moodle é inválida. É necessária a versão 2.4 ou superior.",
     "invalidsite": "O URL do site é inválido.",
     "invalidtime": "Hora inválida",
-    "invalidurl": "URL inválido",
+    "invalidurl": "O URL é inválido",
     "invalidvaluemax": "O valor máximo é {{$a}}",
     "invalidvaluemin": "O valor mínimo é {{$a}}",
     "localmobileunexpectedresponse": "A verificação do Moodle Mobile Additional Features teve um erro inesperado, a ligação será feita através do serviço Mobile padrão.",
     "loggedoutssodescription": "Tem de autenticar-se novamente. A autenticação no site tem de ser numa janela do navegador.",
-    "login": "Entrar",
+    "login": "Autentique-se com seus dados de acesso",
     "loginbutton": "Entrar!",
     "logininsiterequired": "Precisa de entrar no site através de uma janela de navegador.",
     "loginsteps": "Para ter acesso completo a este site, primeiro precisa de criar uma nova conta de utilizador.",
@@ -71,7 +69,7 @@
     "startsignup": "Criar nova conta",
     "stillcantconnect": "Continua com problemas na ligação?",
     "supplyinfo": "Insira alguma informação sobre si",
-    "username": "Nome de utilizador",
+    "username": "Utilizador",
     "usernamerequired": "É necessário o nome de utilizador",
     "usernotaddederror": "Utilizador não adicionado - erro.",
     "visitchangepassword": "Pretende visitar o site para alterar a senha?",
diff --git a/www/core/components/login/lang/ro.json b/www/core/components/login/lang/ro.json
index 4428f198e31..605fd410170 100644
--- a/www/core/components/login/lang/ro.json
+++ b/www/core/components/login/lang/ro.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Autentificare",
-    "cancel": "Renunță",
-    "cannotdownloadfiles": "Descărcarea de fișiere este inactivată în serviciul pentru mobil iar aplicația nu poate funcționa cu această funcție dezactivată. Contactați administratorul siteului.",
+    "cancel": "Anulează",
     "confirmdeletesite": "Sunteți sigur că doriți sa ștergeți siteul {{sitename}}?",
-    "connect": "Conectare!",
+    "connect": "Conectează",
     "connecttomoodle": "Conectare la Moodle",
     "createaccount": "Creează noul meu cont",
     "createuserandpass": "Alege un nume de utilizator şi o parolă",
-    "credentials": "Contributori",
     "credentialsdescription": "Va rugăm să  introduceți userul și parola dumneavoastră pentru a vă conecta",
     "emailconfirmsent": "<p>Un email a fost trimis la adresa Dvs. <b>{{$a}}</b></p>\n   <p>Acest mesaj conţine instrucţiuni despre finalizarea înregistrării.</p>\n   <p>În cazul în care întâmpinaţi dificultăţi contactaţi administratorul site-ului.</p>",
     "enterthewordsabove": "Introduceţi cuvintele de mai sus",
@@ -23,12 +21,12 @@
     "invalidemail": "Adresă de email incorectă",
     "invalidmoodleversion": "Versiunea Moodle este invalidă. Versiunea minimă este 2.4",
     "invalidsite": "Adresa URL este invalidă.",
-    "invalidurl": "URL incorect",
+    "invalidurl": "URL specificat nevalid",
     "localmobileunexpectedresponse": "Verificarea Moodle Mobile Additional Features a returnat un răspuns neașteptat. veți fi autentificat folosind serviciul standard.",
-    "login": "Logare",
+    "login": "Autentificare",
     "loginbutton": "Logat!",
     "logininsiterequired": "Trebuie sa vă logați pe site într-un browser.",
-    "loginsteps": "Pentru a avea acces complet pe site, va trebui să vă creaţi un cont.",
+    "loginsteps": "Bună ziua!\nPentru a avea acces complet la cursuri va trebui să vă creaţi un cont pe acest site.\nEste posibil ca unele cursuri să posede  o \"cheie de înscriere\", de care însă nu veţi avea nevoie decât mai târziu.\nIată care sunt paşii:\n   <ol>\n   <li>Completaţi informaţiile din formularul <a href=\"{{$a}}\">Cont nou</a>.</li>\n   <li>Imediat, vi se va trimite un email la adresa furnizată.</li>\n   <li>Citiţi emailul şi daţi clic pe link-ul pe care îl conţine.</li>\n   <li>Contul Dvs. va fi confirmat şi veţi fi autentificat.</li>\n   <li>Apoi, selectaţi cursul la care doriţi să participaţi.</li>\n   <li>În cazul în care vi se solicită o \"cheie de înscriere\" - folosiţi cheia\n   primită de la profesorul Dvs. Veţi fi astfel \"înscris\"\n   la curs.</li>\n   <li>Aveţi acum acces complet la curs. De acum înainte tot ce veţi avea de făcut\n   va fi să introduceţi numele de utilizator şi parola (în formularul din această pagină)\n   pentru a vă autentifica şi avea acces la toate cursurile la care v-aţi înscris.</li>\n   </ol>",
     "missingemail": "Lipseşte adresa de email",
     "missingfirstname": "Lipseşte prenumele",
     "missinglastname": "Lipseşte numele de familie",
@@ -36,7 +34,7 @@
     "newaccount": "Cont nou",
     "newsitedescription": "Introduceți adresa URL a siteului dumneavoastră, dar există posibilitatea ca acesta să nu fie configurat pentru a funcționa cu această aplicație.",
     "notloggedin": "Trebuie să fiți logat.",
-    "password": "Parola",
+    "password": "Parolă",
     "passwordrequired": "Este necesară introducerea parolei",
     "policyaccept": "Înţeleg şi sunt de acord",
     "policyagree": "Pentru a continua să folosiţi acest site, trebuie să fiţi de acord cu termenii de utilizare specificaţi. Sunteţi de acord?",
@@ -54,7 +52,7 @@
     "siteurlrequired": "Este necesară adresa URL a siteului, de exemplu <i>http://www.yourmoodlesite.abc sau https://www.yourmoodlesite.efg</i>",
     "startsignup": "Creează cont",
     "supplyinfo": "Detalii suplimentare",
-    "username": "Nume utilizator",
+    "username": "Nume de utilizator",
     "usernamerequired": "Este necesar numele de utilizator",
     "usernotaddederror": "Utilizatorul nu a fost adăugat - eroare",
     "webservicesnotenabled": "Serviciul Web nu este activat pe siteul dumneavoastră. Va rugăm să contactați administratorul siteului dumneavoastră dacă considerați ca ar trebui activat accesul pentru mobil."
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index e7ff24b5d2c..5cfebad7e60 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Аутентификация",
     "cancel": "Отменить",
-    "cannotdownloadfiles": "Скачивание файла отключено для мобильных служб; приложение не может работать с данной отключенной настройкой. Пожалуйста, свяжитесь с администратором сайта.",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
-    "connect": "Подключено!",
+    "connect": "Подключить",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
-    "credentials": "Учетные данные",
     "credentialsdescription": "Пожалуйста, укажите Ваш логин и пароль для входа",
     "emailconfirmsent": "На указанный Вами адрес электронной почты (<b>{{$a}}</b>) было отправлено письмо с простыми инструкциями для завершения регистрации.\n Если у вас появятся проблемы с регистрацией, свяжитесь с администратором сайта.",
     "enterthewordsabove": "Напишите слова, которые Вы видите выше",
@@ -23,7 +21,7 @@
     "invalidemail": "Некорректный формат адреса электронной почты",
     "invalidmoodleversion": "Неверная версия Moodle. Минимальная требуемая версия - 2.4.",
     "invalidsite": "URL-адрес сайта недействителен.",
-    "invalidurl": "Некорректный URL",
+    "invalidurl": "Указан неправильный URL-адрес.",
     "login": "Вход",
     "loginbutton": "Вход!",
     "logininsiterequired": "Вы должны войти на сайт в окне браузера.",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index 14dbfdaa592..106de07ced2 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -1,13 +1,11 @@
 {
     "authenticating": "Autentisera",
     "cancel": "Avbryt",
-    "cannotdownloadfiles": "Nedladdning av filer är avaktiverat i din mobila tjänst. Appen fungerar inte om den inställningen är inaktiverad. Vänligen kontakta administratören.",
     "confirmdeletesite": "Är du säker på att du vill ta bort webbsidan {{sitename}}?",
-    "connect": "Anslut!",
+    "connect": "Anslut",
     "connecttomoodle": "Anslut till Moodle",
     "createaccount": "Skapa mitt nya konto",
     "createuserandpass": "Skapa ett nytt användarnamn och lösenord för att logga in med.",
-    "credentials": "Referenser",
     "credentialsdescription": "Ange ditt användarnamn och lösenord för att logga på",
     "emailconfirmsent": "<p>Vi har skickat ett e-postbrev som Du bör ha fått<br /> till Din adress på <b>{{$a}}</b></p>\n<p>Det innehåller enkla instruktioner som hjälper Dig<br />att fullfölja Din registrering.</p>\n<p>Om Du stöter på problem, är Du välkommen att <br />kontakta den som ansvarar för webbplatsen.</p>",
     "enterthewordsabove": "Mata in de ovanstående orden",
@@ -22,9 +20,9 @@
     "invalidemail": "Ogiltig e-postadress",
     "invalidmoodleversion": "Ogiltig Moodle version. Lägsta version som krävs är",
     "invalidsite": "Den webbadress är ogiltig.",
-    "invalidurl": "Ogiltig url",
+    "invalidurl": "Ogiltig URL angiven",
     "localmobileunexpectedresponse": "Kontrollen för Moodle mobila funktioner returnerade  ett oväntat svar. Du kommer att autentiseras med mobila standard tjänsten.",
-    "login": "Logga In",
+    "login": "Inloggning",
     "loginbutton": "Logga In!",
     "logininsiterequired": "Du måste logga in på webbplatsen via en webbläsare",
     "loginsteps": "Hej!\n<br />\nDu måste bl.a. skapa ett nytt användarkonto på denna webbplats för att få tillgång till de kurser som Du vill delta i. Varje individuell kurs kan också ha en engångsnyckel \"kursnyckel\". Den behöver Du dock inte  förrän senare.\n   Så här skapar Du Ditt konto:\n   <ol size=\"2\">\n   <li>Fyll i formuläret på sidan <a href={{$a}}>\nNytt konto</a> med de efterfrågade\nuppgifterna om Dig själv.</li>\n   <li>Ett e-postmeddelande kommer därefter\nomedelbart att sändas till\nDin e-postadress.</li>\n   <li>Läs din e-post, och klicka på webblänken som den innehåller.</li>\n   <li>Ditt konto kommer därmed att bekräftas\noch Du kommer att loggas in.</li>\n   <li>Nu kan Du välja vilken kurs Du\nvill delta i.</li>\n   <li>Om Du måste ange en \"kursnyckel\" - så\nfår Du använda den som Din lärare  har\ngivit Dig. Med den kan Du registrera\nDig på en sådan kurs som kräver det.</li>\n   <li>Nu kan Du använda hela kursen.\nFrån och med nu behöver Du bara skriva\nin Ditt användarnamn och lösenord\n(i formuläret till vänster på denna sida)\nför att logga in och för att nå de kurser\nsom Du är registrerad på.</li>\n   </ol>\nOBS! Genom att Du bekräftar kontot så samtycker\nDu till databehandling enligt Personuppgiftslagen.\nOm Du är osäker på vad det innebär så kan Du hitta\nmer information här: 'http://www.datainspektionen.se/lagar-och-regler/personuppgiftslagen/\n'\n\nLycka till!",
@@ -35,7 +33,7 @@
     "newaccount": "Nytt konto",
     "newsitedescription": "Ange webbadressen till din Moodle webbplats. Observera att den kan vara konfigurerad så att den inte fungerar med appen",
     "notloggedin": "Du måste vara inloggad.",
-    "password": "Lösenord",
+    "password": "Gästlösenord",
     "passwordrequired": "Lösenord krävs",
     "policyaccept": "Jag förstår och accepterar",
     "policyagree": "Du måste acceptera denna policy för få fortsätta att använda denna webbplats. Accepterar Du denna policy?",
diff --git a/www/core/components/login/lang/tr.json b/www/core/components/login/lang/tr.json
index 215b973f377..0d240fefe28 100644
--- a/www/core/components/login/lang/tr.json
+++ b/www/core/components/login/lang/tr.json
@@ -1,6 +1,6 @@
 {
     "authenticating": "Kimlik doğrulanıyor",
-    "cancel": "Vazgeç",
+    "cancel": "İptal",
     "connect": "Bağlan",
     "createaccount": "Yeni hesabımı oluştur",
     "createuserandpass": "Kullanıcı adınızı ve şifrenizi seçin",
@@ -17,16 +17,16 @@
     "invalidemail": "Geçersiz e-posta adresi",
     "invalidmoodleversion": "Geçersiz Moodle sürümü. Sitenizin Sürümünün şundan aşağı olmaması gerekir:",
     "invalidsite": "Bu site adresi geçersizdir.",
-    "invalidurl": "Geçersiz URL",
-    "login": "Giriş yap",
+    "invalidurl": "Geçersiz URL belirtildi",
+    "login": "Giriş",
     "logininsiterequired": "Bir tarayıcı penceresinde siteye giriş yapmanız gerekiyor.",
-    "loginsteps": "Merhaba! Bu sitedeki derslere tam erişim için bir kaç dakikanızı ayırarak hesap açmanız gerekmektedir. Derslerden bazılarının sadece ders kaydı için bir defalığına kullanılacak ve sonradan gerekmeyecek \"Kayıt Anahtarı\" olabilir. Şu adımları izleyin:\n<ol>\n<li>Bilgilerinizi <a href=\"{{$a}}\">Yeni Hesap</a> formuyla girin.</li>\n<li>E-posta adresinize hemen bir mesaj gönderilir.</li>\n<li>Mesajınızı okuyun ve içerdiği web bağlantısını tıklayın.</li>\n<li>Bundan sonra hesabınız onaylanır ve giriş yapabilirsiniz.</li>\n<li>Katılmak istediğiniz dersi seçin.</li>\n<li>Sizden bir \"Kayıt Anahtarı\" istenirse, eğitimcinizin size verdiği anahtarı kullanın. Bu, sizin derse \"kaydınızı\" yapacaktır.</li>\n<li>Artık derse erişebilirsiniz. Bundan sonra kayıtlı olduğunuz derslere erişmek için yapmanız gereken tek şey, bu sayfadaki formdan kullanıcı adınız ve şifrenizle giriş yapmaktır.</li>\n</ol>",
+    "loginsteps": "Bu siteye tam erişim için önce bir hesap oluşturmalısınız.",
     "missingemail": "E-posta adresi eksik",
-    "missingfirstname": "Ad eksik",
-    "missinglastname": "Soyad eksik",
+    "missingfirstname": "Adı eksik",
+    "missinglastname": "Soyadı eksik",
     "mobileservicesnotenabled": "Mobil Hizmetler sitenizde etkin değildir. Mobil erişimin etkin olduğunu düşünüyorsanız,  Lütfen Moodle site yöneticinize başvurun.",
     "newaccount": "Yeni hesap",
-    "password": "Şifre",
+    "password": "Parola",
     "passwordrequired": "Şifre zorunludur",
     "policyaccept": "Anladım ve kabul ediyorum",
     "policyagree": "Bu siteyi kullanmaya devam etmek için bu sözleşmeyi kabul etmelisiniz. Kabul ediyor musunuz?",
@@ -42,7 +42,7 @@
     "startsignup": "Yeni hesap oluştur",
     "stillcantconnect": "Henüz bağlantı kurulamadı",
     "supplyinfo": "Daha fazla bilgi",
-    "username": "Kullanıcadı",
+    "username": "Kullanıcı adı",
     "usernamerequired": "Kullanıcı adı gerekiyor",
     "usernotaddederror": "Kullanıcısı eklenemedi - hata",
     "webservicesnotenabled": "Sitenizin Web Hizmetleri ektin değildir. Mobil erişimin etkin olduğunu düşünüyrosanız. Moodle site yöneticinize başvurun."
diff --git a/www/core/components/login/lang/zh-cn.json b/www/core/components/login/lang/zh-cn.json
index df24baac33c..6fc2ac70c17 100644
--- a/www/core/components/login/lang/zh-cn.json
+++ b/www/core/components/login/lang/zh-cn.json
@@ -15,8 +15,8 @@
     "invalidemail": "Email地址无效",
     "invalidmoodleversion": "无效的Moodle版本。最低版本要求是：",
     "invalidsite": "网站URL是无效的。",
-    "invalidurl": "无效的 网页地址",
-    "login": "登录",
+    "invalidurl": "无效的 URL",
+    "login": "登录您的账号",
     "logininsiterequired": "您需要在浏览器窗口中登录该站点。",
     "loginsteps": "为了能完全访问此网站，您首先需要创建一个帐户。",
     "missingemail": "Email地址没填",
diff --git a/www/core/components/login/lang/zh-tw.json b/www/core/components/login/lang/zh-tw.json
index e50821ef899..ea04066c5c8 100644
--- a/www/core/components/login/lang/zh-tw.json
+++ b/www/core/components/login/lang/zh-tw.json
@@ -2,18 +2,16 @@
     "auth_email": "基於電子郵件的自助註冊",
     "authenticating": "認證中",
     "cancel": "取消",
-    "cannotdownloadfiles": "在您的行動服務中已停用檔案下載, 應用程式無法使用此未啟用的設定來運作. 請與您的網站管理員聯繫.",
     "checksiteversion": "請檢查您的網站是否使用Moodle 2.4或更高版本.",
     "confirmdeletesite": "您確定要刪除網站{{sitename}}嗎?",
-    "connect": "連線!",
+    "connect": "連結",
     "connecttomoodle": "連上Moodle平台",
     "contactyouradministrator": "連絡你的網站管理員以取得更多的協助.",
     "contactyouradministratorissue": "請求管理員檢查以下問題: {{$ a}}",
     "createaccount": "建立我的新帳號",
     "createuserandpass": "請選擇您的帳號名稱和密碼",
-    "credentials": "認證",
     "credentialsdescription": "請提供您的帳號和密碼以便登入",
-    "emailconfirmsent": "<p>電子郵件應該已經寄到您的地址<b> {{$ a}} </ b> </ p> <p>它包含簡單的說明, 可以完成註冊. </ p> <p>如果, 您仍然有困難, 請與網站管理員聯繫.</ p>",
+    "emailconfirmsent": "<p>本系統已經送出電子郵件到 <b>{{$a}}</b></p>\n   <p>訊息內容包含如何完成註冊手續。</p>\n   <p>請閱覽您的私人郵件 按下確認連結後 便可登入本系統，若是有問題請和系統管理員連絡。</p>",
     "emailnotmatch": "電子郵件內容不符",
     "enterthewordsabove": "輸入您在上圖中看到的字元",
     "erroraccesscontrolalloworigin": "您嘗試執行的Cross-Origin呼叫已被拒絕. 請檢查https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -21,7 +19,7 @@
     "errorupdatesite": "更新網站權杖時出錯.",
     "firsttime": "您第一次來訪嗎？",
     "getanothercaptcha": "換一個字詞",
-    "help": "協助",
+    "help": "幫助",
     "helpmelogin": "<p>要登入前請確認:</p>1. Moodle 入口網站版本要是2.4或更高<br />2. Moodle 入口網站管理員有啟用手機存取.<br /><br /><p>想測試Moodle示範入口網站型態須輸入<i>teacher</i> 或<i>student</i> 於<i>Username</i> 欄位並點選<b>Add button</b>.</p><p><a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">Moodle文件網站有更詳細的資料及協助</a></p>",
     "instructions": "使用說明",
     "invalidaccount": "請檢查您的登人資料或請您的網站管理員檢查網站設定。",
@@ -30,11 +28,11 @@
     "invalidmoodleversion": "無效的Moodle版本。至少需要的版本為2.4",
     "invalidsite": "這網站網址無效.",
     "invalidtime": "無效的時間",
-    "invalidurl": "無效的URL網址",
+    "invalidurl": "無效的網址",
     "invalidvaluemax": "最大值為 {{$a}}",
     "invalidvaluemin": "最小值為 {{$a}}",
     "localmobileunexpectedresponse": "Moodle行動其他功能檢查返回了無預期的回應, 您將使用標準行動服務進行身份驗證.",
-    "login": "登入",
+    "login": "登入您的帳號",
     "loginbutton": "登入",
     "logininsiterequired": "您的Moodle網站強制您以系統瀏覽器開啟. 將開啟新瀏覽器, 並重新導向這Moodle網站.",
     "loginsteps": "您好！如果您尚未申請帳號，為了能完整使用本網站課程，您需要先花一兩分鐘時間申請一個新帳號。此外，部分課程在初次選課時，還需要輸入開課教師所設定的選課密碼。\n<p>申請帳號請依下列步驟進行：</p>\n<ol>\n<li>請於 <a href=\"{{$a}}\">申請新帳號</a> 表單中輸入個人相關資料。</li>\n<li>一封電子郵件會立刻寄送到您的信箱中。</li>\n<li>讀取您的電子郵件，點按信件中的網址連結。</li>\n<li>您的帳號將得到確認，並且立刻登入本網站。</li>\n<li>然後，請選擇您想要參加的課程。</li>\n<li>如果系統提示要選課密鑰，請輸入教師提供給您的選課密碼，這樣才能註冊到該課程中。</li>\n<li>從此，您只要輸入個人的帳號與密碼〈在左邊的表單中〉，就可以進入任何一個您已選修的課程中。</li>\n</ol>",
@@ -69,7 +67,7 @@
     "startsignup": "申請一個新帳號",
     "stillcantconnect": "一直無法連線嗎?",
     "supplyinfo": "更多細節",
-    "username": "帳號",
+    "username": "用戶名稱",
     "usernamerequired": "需要帳號",
     "usernotaddederror": "無法新增用戶- 未知的錯誤",
     "visitchangepassword": "您需要去拜訪這個網站變更密碼嗎?",
diff --git a/www/core/components/question/lang/ar.json b/www/core/components/question/lang/ar.json
index 605a432685e..e913cf9b03d 100644
--- a/www/core/components/question/lang/ar.json
+++ b/www/core/components/question/lang/ar.json
@@ -1,14 +1,14 @@
 {
     "answer": "إجابة",
     "answersaved": "تم حفظ الإجابة",
-    "complete": "كامل",
-    "correct": "صح",
-    "feedback": "تقرير",
-    "incorrect": "خطاء",
+    "complete": "تم/كامل",
+    "correct": "صحيح/صح",
+    "feedback": "(تغذية راجعة (ملاحظات",
+    "incorrect": "خطأ",
     "information": "معلومات",
     "invalidanswer": "إجابة غير مكتملة",
-    "notanswered": "لم تتم الأجابة بعد",
-    "notyetanswered": "لم يتم الاجابة بعد",
+    "notanswered": "لم يتم الاجابة عليه",
+    "notyetanswered": "لم يتم الاجابة عليه بعد",
     "partiallycorrect": "إجابة جزئية",
     "questionno": "سؤال {{$a}}",
     "requiresgrading": "يتطلب التصحيح",
diff --git a/www/core/components/question/lang/bg.json b/www/core/components/question/lang/bg.json
index f375fb3b363..b1cd26b52b0 100644
--- a/www/core/components/question/lang/bg.json
+++ b/www/core/components/question/lang/bg.json
@@ -1,15 +1,15 @@
 {
     "answer": "Отговор",
     "answersaved": "Отговорът съхранен",
-    "complete": "Завършен",
-    "correct": "Вярно",
-    "feedback": "Обратна връзка",
+    "complete": "Отговорен",
+    "correct": "Правилно",
+    "feedback": "Забележка",
     "incorrect": "Неправилно",
     "information": "Информация",
     "invalidanswer": "Непълен отговор",
-    "notanswered": "Още няма отговори",
-    "notyetanswered": "Още без отговор",
-    "partiallycorrect": "Частично верен",
+    "notanswered": "Не е отговорен",
+    "notyetanswered": "Все още не е даден отговор",
+    "partiallycorrect": "Отчасти верен",
     "questionno": "Въпрос {{$a}}",
     "requiresgrading": "Изисква оценяване",
     "unknown": "Неизвестно"
diff --git a/www/core/components/question/lang/ca.json b/www/core/components/question/lang/ca.json
index e31c6bbe967..aece96d8870 100644
--- a/www/core/components/question/lang/ca.json
+++ b/www/core/components/question/lang/ca.json
@@ -1,21 +1,21 @@
 {
     "answer": "Resposta",
     "answersaved": "Resposta desada",
-    "complete": "Complet",
-    "correct": "Correcta",
+    "complete": "Completa",
+    "correct": "Correcte",
     "errorattachmentsnotsupported": "L'aplicació encara no admet l'adjunció de fitxers.",
     "errorinlinefilesnotsupported": "L'aplicació encara no és compatible amb l'edició de fitxers en línia.",
     "errorquestionnotsupported": "L'aplicació no accepta aquest tipus de pregunta: {{$a}}.",
     "feedback": "Retroacció",
     "howtodraganddrop": "Feu un toc per seleccionar i feu un toc de nou per deixar anar.",
-    "incorrect": "Incorrecta",
+    "incorrect": "Incorrecte",
     "information": "Informació",
     "invalidanswer": "Resposta no vàlida o incompleta",
-    "notanswered": "No contestada encara",
-    "notyetanswered": "Encara no s'ha contestat",
+    "notanswered": "No s'ha respost",
+    "notyetanswered": "No s'ha respost encara",
     "partiallycorrect": "Parcialment correcte",
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Cal puntuar",
-    "unknown": "No es pot determinar l'estat"
+    "unknown": "Desconegut"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/cs.json b/www/core/components/question/lang/cs.json
index 21c2183113c..ed2f90af4f1 100644
--- a/www/core/components/question/lang/cs.json
+++ b/www/core/components/question/lang/cs.json
@@ -1,21 +1,21 @@
 {
     "answer": "Odpověď",
     "answersaved": "Odpověď uložena",
-    "complete": "Podrobný",
-    "correct": "Správná odpověď",
+    "complete": "Hotovo",
+    "correct": "Správně",
     "errorattachmentsnotsupported": "Aplikace ještě nepodporuje připojování souborů k odpovědím.",
     "errorinlinefilesnotsupported": "Aplikace ještě nepodporuje úpravy vložených souborů.",
     "errorquestionnotsupported": "Tento typ úlohy není aplikací podporován: {{$a}}.",
-    "feedback": "Komentář",
+    "feedback": "Reakce",
     "howtodraganddrop": "Klepnutím vyberte potom klepněte na místo umístění.",
-    "incorrect": "Nesprávná odpověď",
+    "incorrect": "Nesprávně",
     "information": "Informace",
     "invalidanswer": "Neúplná odpověď",
-    "notanswered": "Dosud nezodpovězeno",
+    "notanswered": "Nezodpovězeno",
     "notyetanswered": "Dosud nezodpovězeno",
-    "partiallycorrect": "Částečně správná odpověď",
+    "partiallycorrect": "Částečně správně",
     "questionmessage": "Úloha {{$a}}: {{$b}}",
     "questionno": "Úloha {{$a}}",
     "requiresgrading": "Vyžaduje hodnocení",
-    "unknown": "Stav nelze určit"
+    "unknown": "Neznámý"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/da.json b/www/core/components/question/lang/da.json
index 2ec14567445..d2bbaa071f2 100644
--- a/www/core/components/question/lang/da.json
+++ b/www/core/components/question/lang/da.json
@@ -1,15 +1,15 @@
 {
     "answer": "Svar",
     "answersaved": "Besvaret",
-    "complete": "Færdiggør",
+    "complete": "Gennemført",
     "correct": "Rigtigt",
     "feedback": "Feedback",
     "incorrect": "Forkert",
     "information": "Information",
     "invalidanswer": "Ufuldstændigt svar",
-    "notanswered": "Ikke besvaret endnu",
-    "notyetanswered": "Endnu ikke besvaret",
-    "partiallycorrect": "Delvist rigtigt",
+    "notanswered": "Ikke besvaret",
+    "notyetanswered": "Ikke besvaret",
+    "partiallycorrect": "Delvis rigtigt",
     "questionno": "Spørgsmål {{$a}}",
     "requiresgrading": "Kræver bedømmelse",
     "unknown": "Ukendt"
diff --git a/www/core/components/question/lang/de.json b/www/core/components/question/lang/de.json
index 8e1a1ff2bc6..a248f6250e5 100644
--- a/www/core/components/question/lang/de.json
+++ b/www/core/components/question/lang/de.json
@@ -1,21 +1,21 @@
 {
     "answer": "Antwort",
     "answersaved": "Antwort gespeichert",
-    "complete": "Fertig",
+    "complete": "Vollständig",
     "correct": "Richtig",
     "errorattachmentsnotsupported": "Die App erlaubt keine Antworten mit Dateianhängen.",
     "errorinlinefilesnotsupported": "Die App unterstützt keine Bearbeitung von integrierten Dateien.",
     "errorquestionnotsupported": "Die App unterstützt diesen Fragetyp nicht: {{$a}}.",
-    "feedback": "Rückmeldung",
+    "feedback": "Feedback",
     "howtodraganddrop": "Tippen Sie zum Auswählen und tippen Sie noch einmal zum Ablegen.",
     "incorrect": "Falsch",
     "information": "Information",
     "invalidanswer": "Unvollständige Antwort",
-    "notanswered": "Nicht abgestimmt",
-    "notyetanswered": "unbeantwortet",
+    "notanswered": "Nicht beantwortet",
+    "notyetanswered": "Bisher nicht beantwortet",
     "partiallycorrect": "Teilweise richtig",
     "questionmessage": "Frage {{$a}}: {{$b}}",
     "questionno": "Frage {{$a}}",
     "requiresgrading": "Bewertung notwendig",
-    "unknown": "Der Status kann nicht bestimmt werden."
+    "unknown": "Unbekannt"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/el.json b/www/core/components/question/lang/el.json
index 04bb3effa9e..d9a8cb6e7d1 100644
--- a/www/core/components/question/lang/el.json
+++ b/www/core/components/question/lang/el.json
@@ -3,10 +3,10 @@
     "answersaved": "Η απάντηση αποθηκεύτηκε",
     "complete": "Ολοκλήρωση",
     "correct": "Σωστό",
-    "feedback": "Ανάδραση",
+    "feedback": "Ανατροφοδότηση",
     "incorrect": "Λάθος",
     "invalidanswer": "Ημιτελής απάντηση",
-    "notanswered": "Δεν απαντήθηκε ακόμα",
+    "notanswered": "Δεν απαντήθηκε",
     "notyetanswered": "Δεν έχει απαντηθεί ακόμα",
     "partiallycorrect": "Μερικώς σωστή",
     "questionno": "Ερώτηση {{$a}}",
diff --git a/www/core/components/question/lang/es-mx.json b/www/core/components/question/lang/es-mx.json
index 08650d56e54..f304a7602ec 100644
--- a/www/core/components/question/lang/es-mx.json
+++ b/www/core/components/question/lang/es-mx.json
@@ -1,8 +1,8 @@
 {
     "answer": "Respuesta",
     "answersaved": "Respuesta guardada",
-    "complete": "Completado",
-    "correct": "Correcto",
+    "complete": "Completada",
+    "correct": "Correcta",
     "errorattachmentsnotsupported": "La aplicación todavía no soporta anexarle archivos a las respuestas.",
     "errorinlinefilesnotsupported": "La aplicación aun no soporta el editar archivos en-línea.",
     "errorquestionnotsupported": "Este tipo de pregunta no está soportada por la App: {{$a}}.",
@@ -11,11 +11,11 @@
     "incorrect": "Incorrecta",
     "information": "Información",
     "invalidanswer": "Respuesta incompleta",
-    "notanswered": "Sin contestar aún",
-    "notyetanswered": "Aún no se ha dado respuesta",
-    "partiallycorrect": "Parcialmente correcto",
+    "notanswered": "Sin contestar",
+    "notyetanswered": "Sin responder aún",
+    "partiallycorrect": "Parcialmente correcta",
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere re-calificar",
-    "unknown": "No se puede determinar el estatus"
+    "unknown": "Desconocido"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/es.json b/www/core/components/question/lang/es.json
index 2e10be674fe..eca0b6c7e61 100644
--- a/www/core/components/question/lang/es.json
+++ b/www/core/components/question/lang/es.json
@@ -1,8 +1,8 @@
 {
     "answer": "Respuesta",
     "answersaved": "Respuesta guardada",
-    "complete": "Completado",
-    "correct": "Correcto",
+    "complete": "Finalizado",
+    "correct": "Correcta",
     "errorattachmentsnotsupported": "La aplicación no soporta adjuntar archivos a respuestas todavía.",
     "errorinlinefilesnotsupported": "La aplicación aun no soporta el editar archivos en-línea.",
     "errorquestionnotsupported": "Este tipo de pregunta no está soportada por la aplicación: {{$a}}.",
@@ -11,11 +11,11 @@
     "incorrect": "Incorrecta",
     "information": "Información",
     "invalidanswer": "Respuesta incompleta",
-    "notanswered": "Sin contestar aún",
-    "notyetanswered": "Aún no se ha dado respuesta",
-    "partiallycorrect": "Parcialmente correcto",
+    "notanswered": "Sin contestar",
+    "notyetanswered": "Sin responder aún",
+    "partiallycorrect": "Parcialmente correcta",
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere calificación",
-    "unknown": "No se puede determinar el estado."
+    "unknown": "Desconocido"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/eu.json b/www/core/components/question/lang/eu.json
index d47acec2068..01be6f02930 100644
--- a/www/core/components/question/lang/eu.json
+++ b/www/core/components/question/lang/eu.json
@@ -1,21 +1,21 @@
 {
-    "answer": "Erantzun",
+    "answer": "Erantzuna",
     "answersaved": "Erantzuna gorde da",
-    "complete": "Osoa",
+    "complete": "Osatu",
     "correct": "Zuzena",
     "errorattachmentsnotsupported": "App-ak oraindik ez du erantzunei fitxategiak eranstea onartzen.",
     "errorinlinefilesnotsupported": "App-ak oraindik ez du fitxategien lerro-arteko edizioa onartzen.",
     "errorquestionnotsupported": "Galdera mota hau ez dago app-an onartuta: {{$a}}",
     "feedback": "Feedbacka",
     "howtodraganddrop": "Sakatu aukeratzeko eta ondoren sakatu ezabatzeko.",
-    "incorrect": "Ez zuzena",
+    "incorrect": "Okerra",
     "information": "Informazioa",
     "invalidanswer": "Erantzuna ez dago osorik",
-    "notanswered": "Oraindik erantzun gabe",
+    "notanswered": "Erantzun gabea",
     "notyetanswered": "Erantzun gabea",
     "partiallycorrect": "Zuzena zati batean",
     "questionmessage": "{{$a}} galdera: {{$b}}",
     "questionno": "{{$a}} galdera",
     "requiresgrading": "Kalifikazioa behar du",
-    "unknown": "Ezin da egoera zehaztu"
+    "unknown": "Ezezaguna"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/fa.json b/www/core/components/question/lang/fa.json
index 15722458795..64e56570cf2 100644
--- a/www/core/components/question/lang/fa.json
+++ b/www/core/components/question/lang/fa.json
@@ -7,9 +7,9 @@
     "incorrect": "نادرست",
     "information": "توضیح",
     "invalidanswer": "پاسخ ناقص",
-    "notanswered": "هنوز پاسخ نداده‌اند",
+    "notanswered": "پاسخ داده نشده",
     "notyetanswered": "هنوز پاسخ داده نشده است",
-    "partiallycorrect": "نیمه درست",
+    "partiallycorrect": "پاسخ نیمه درست",
     "questionno": "سؤال {{$a}}",
     "requiresgrading": "نمره‌دهی لازم است",
     "unknown": "نامعلوم"
diff --git a/www/core/components/question/lang/fr.json b/www/core/components/question/lang/fr.json
index 53fa708cca6..82dddeba70a 100644
--- a/www/core/components/question/lang/fr.json
+++ b/www/core/components/question/lang/fr.json
@@ -1,7 +1,7 @@
 {
     "answer": "Réponse",
     "answersaved": "Réponse enregistrée",
-    "complete": "Complet",
+    "complete": "Terminer",
     "correct": "Correct",
     "errorattachmentsnotsupported": "L'application ne permet pas encore d'annexer des fichiers aux réponses.",
     "errorinlinefilesnotsupported": "L'app ne permet pas encore la modification de fichiers en ligne.",
@@ -11,11 +11,11 @@
     "incorrect": "Incorrect",
     "information": "Description",
     "invalidanswer": "Réponse incomplète",
-    "notanswered": "Pas encore répondu",
+    "notanswered": "Non répondue",
     "notyetanswered": "Pas encore répondu",
     "partiallycorrect": "Partiellement correct",
     "questionmessage": "Question {{$a}} : {{$b}}",
     "questionno": "Question {{$a}}",
     "requiresgrading": "Nécessite évaluation",
-    "unknown": "Impossible de déterminer l'état"
+    "unknown": "Inconnu"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/he.json b/www/core/components/question/lang/he.json
index 1761f82c521..c9f601ea592 100644
--- a/www/core/components/question/lang/he.json
+++ b/www/core/components/question/lang/he.json
@@ -2,14 +2,14 @@
     "answer": "תשובה",
     "answersaved": "תשובה נשמרה",
     "complete": "הושלם",
-    "correct": "נכון",
-    "feedback": "תגובות",
-    "incorrect": "לא נכון",
+    "correct": "תקין",
+    "feedback": "משוב לבחירה בתשובה זו",
+    "incorrect": "שגוי",
     "information": "מידע",
     "invalidanswer": "תשובה שלא הושלמה",
-    "notanswered": "שאלה זו טרם נענתה",
-    "notyetanswered": "עדין לא ענו",
-    "partiallycorrect": "תשובה נכונה חלקית",
+    "notanswered": "לא נענה",
+    "notyetanswered": "שאלה זו טרם נענתה",
+    "partiallycorrect": "נכון באופן חלקי",
     "questionno": "שאלה {{$a}}",
     "requiresgrading": "נדרש מתן ציון",
     "unknown": "לא ידוע"
diff --git a/www/core/components/question/lang/hu.json b/www/core/components/question/lang/hu.json
index 649b1988ef4..04328cffde1 100644
--- a/www/core/components/question/lang/hu.json
+++ b/www/core/components/question/lang/hu.json
@@ -1,14 +1,14 @@
 {
     "answer": "Válasz",
     "answersaved": "A válasz elmentve",
-    "complete": "Teljes",
+    "complete": "Kész",
     "correct": "Helyes",
     "feedback": "Visszajelzés",
     "incorrect": "Hibás",
     "information": "Információ",
     "invalidanswer": "Hiányos válasz",
-    "notanswered": "Még nincs válasz",
-    "notyetanswered": "Megválaszolatlan",
+    "notanswered": "Nincs rá válasz",
+    "notyetanswered": "Még nincs rá válasz",
     "partiallycorrect": "Részben helyes",
     "questionno": "{{$a}}. kérdés",
     "requiresgrading": "Pontozandó",
diff --git a/www/core/components/question/lang/it.json b/www/core/components/question/lang/it.json
index 428103f0616..23bcbb55847 100644
--- a/www/core/components/question/lang/it.json
+++ b/www/core/components/question/lang/it.json
@@ -2,16 +2,16 @@
     "answer": "Risposta",
     "answersaved": "Risposta salvata",
     "complete": "Completo",
-    "correct": "Giusto",
+    "correct": "Risposta corretta",
     "feedback": "Feedback",
-    "incorrect": "Sbagliato",
+    "incorrect": "Risposta errata",
     "information": "Informazione",
     "invalidanswer": "Risposta incompleta",
-    "notanswered": "Senza scelta",
-    "notyetanswered": "Senza risposta",
-    "partiallycorrect": "Parzialmente corretto",
+    "notanswered": "Risposta non data",
+    "notyetanswered": "Risposta non ancora data",
+    "partiallycorrect": "Parzialmente corretta",
     "questionmessage": "Domanda {{$a}}: {{$b}}",
     "questionno": "Domanda {{$a}}",
     "requiresgrading": "Richiede valutazione",
-    "unknown": "Non è possibile determinare lo stato"
+    "unknown": "Sconosciuto"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/ja.json b/www/core/components/question/lang/ja.json
index ecce8b3b1e0..83e300c2604 100644
--- a/www/core/components/question/lang/ja.json
+++ b/www/core/components/question/lang/ja.json
@@ -1,15 +1,15 @@
 {
-    "answer": "回答",
+    "answer": "答え",
     "answersaved": "解答保存",
-    "complete": "詳細",
+    "complete": "完了",
     "correct": "正解",
     "feedback": "フィードバック",
     "howtodraganddrop": "選んだものをタッチして、あてはまる所にタッチして入れましょう。",
     "incorrect": "不正解",
     "information": "情報",
     "invalidanswer": "不完全な答え",
-    "notanswered": "未投票",
-    "notyetanswered": "未回答",
+    "notanswered": "未解答",
+    "notyetanswered": "未解答",
     "partiallycorrect": "部分的に正解",
     "questionmessage": "問題 {{$a}}: {{$b}}",
     "questionno": "問題 {{$a}}",
diff --git a/www/core/components/question/lang/lt.json b/www/core/components/question/lang/lt.json
index 795a5dca2fd..fc31749789f 100644
--- a/www/core/components/question/lang/lt.json
+++ b/www/core/components/question/lang/lt.json
@@ -1,21 +1,21 @@
 {
     "answer": "Atsakymas",
     "answersaved": "Atsakymas išsaugotas",
-    "complete": "Užbaigti",
-    "correct": "Teisingas",
+    "complete": "Baigta",
+    "correct": "Teisinga",
     "errorattachmentsnotsupported": "Programėlė nepalaiko pridėtų failų.",
     "errorinlinefilesnotsupported": "Programėlė nepalaiko redaguojamų failų",
     "errorquestionnotsupported": "Šis klausimo tipas programėlėje nepalaikomas: {{$a}}.",
-    "feedback": "Atsiliepimas",
+    "feedback": "Grįžtamasis ryšys",
     "howtodraganddrop": "Paspauskite pasirinkimui, tada perneškite.",
-    "incorrect": "Klaidinga",
+    "incorrect": "Neteisinga",
     "information": "Informacija",
     "invalidanswer": "Nepilnas atsakymas",
-    "notanswered": "Dar neatsakyta",
-    "notyetanswered": "Dar neatsakyta",
+    "notanswered": "Neatsakyta",
+    "notyetanswered": "Neatsakyta",
     "partiallycorrect": "Iš dalies teisingas",
     "questionmessage": "Klausimas {{$a}}: {{$b}}",
     "questionno": "Klausimas {{$a}}",
     "requiresgrading": "Reikia vertinimo",
-    "unknown": "Negalima nustatyti statuso"
+    "unknown": "Nežinoma"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/nl.json b/www/core/components/question/lang/nl.json
index 18382e872c6..48faa456e67 100644
--- a/www/core/components/question/lang/nl.json
+++ b/www/core/components/question/lang/nl.json
@@ -1,21 +1,21 @@
 {
     "answer": "Antwoord",
     "answersaved": "Antwoord bewaard",
-    "complete": "Voltooid",
+    "complete": "Volledig",
     "correct": "Juist",
     "errorattachmentsnotsupported": "De applicatie ondersteunt nog geen blijlagen bij antwoorden.",
     "errorinlinefilesnotsupported": "Deze applicatie ondersteunt het inline bewerken van bestanden nog niet.",
     "errorquestionnotsupported": "Dit vraagtype wordt nog niet ondersteund door de app: {{$a}}.",
     "feedback": "Feedback",
     "howtodraganddrop": "Tik om te selecteren en tik om neer te zetten.",
-    "incorrect": "Niet juist",
+    "incorrect": "Fout",
     "information": "Informatie",
     "invalidanswer": "Onvolledig antwoord",
-    "notanswered": "Nog niet beantwoord",
+    "notanswered": "Niet beantwoord",
     "notyetanswered": "Nog niet beantwoord",
     "partiallycorrect": "Gedeeltelijk juist",
     "questionmessage": "Vraag  {{$a}}: {{$b}}",
     "questionno": "Vraag {{$a}}",
     "requiresgrading": "Beoordelen vereist",
-    "unknown": "Kan status niet bepalen"
+    "unknown": "Onbekend"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/pl.json b/www/core/components/question/lang/pl.json
index 6e060784dd2..1371ba6c9df 100644
--- a/www/core/components/question/lang/pl.json
+++ b/www/core/components/question/lang/pl.json
@@ -1,14 +1,14 @@
 {
-    "answer": "Odpowiedz",
+    "answer": "Odpowiedź",
     "answersaved": "Odpowiedź zapisana",
-    "complete": "Pełna wersja",
+    "complete": "Zakończone",
     "correct": "Poprawnie",
     "feedback": "Informacja zwrotna",
-    "incorrect": "Niepoprawnie",
+    "incorrect": "Niepoprawny(a)",
     "information": "Informacja",
     "invalidanswer": "Niekompletna odpowiedź",
-    "notanswered": "Jeszcze nie udzielono odpowiedzi",
-    "notyetanswered": "Brak odpowiedzi",
+    "notanswered": "Nie udzielono odpowiedzi",
+    "notyetanswered": "Nie udzielono odpowiedzi",
     "partiallycorrect": "Częściowo poprawnie",
     "questionno": "Pytanie {{$a}}",
     "requiresgrading": "Wymaga oceny",
diff --git a/www/core/components/question/lang/pt-br.json b/www/core/components/question/lang/pt-br.json
index 2650a71a7ce..f5b6766c1a6 100644
--- a/www/core/components/question/lang/pt-br.json
+++ b/www/core/components/question/lang/pt-br.json
@@ -1,21 +1,21 @@
 {
     "answer": "Resposta",
     "answersaved": "Resposta salva",
-    "complete": "Concluído",
+    "complete": "Completo",
     "correct": "Correto",
     "errorattachmentsnotsupported": "O aplicativo ainda não suporta anexar arquivos à resposta.",
     "errorinlinefilesnotsupported": "O aplicativo ainda não suporta a edição direta de arquivos.",
     "errorquestionnotsupported": "Esse tipo de questão não é suportada pelo aplicativo: {{$a}}.",
     "feedback": "Feedback",
     "howtodraganddrop": "Toque para selecionar e então toque para soltar.",
-    "incorrect": "Errado",
+    "incorrect": "Incorreto",
     "information": "Informação",
     "invalidanswer": "Resposta incompleta",
-    "notanswered": "Nenhuma resposta",
-    "notyetanswered": "Ainda não respondeu",
-    "partiallycorrect": "Parcialmente correta",
+    "notanswered": "Não respondido",
+    "notyetanswered": "Ainda não respondida",
+    "partiallycorrect": "Parcialmente correto",
     "questionmessage": "Questão {{$a}}: {{$b}}",
     "questionno": "Questão {{$a}}",
     "requiresgrading": "Requer avaliação",
-    "unknown": "Não pôde determinar o estado"
+    "unknown": "Desconhecido"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/pt.json b/www/core/components/question/lang/pt.json
index 586db7f03f6..f0f684b92dd 100644
--- a/www/core/components/question/lang/pt.json
+++ b/www/core/components/question/lang/pt.json
@@ -1,21 +1,21 @@
 {
     "answer": "Resposta",
     "answersaved": "Resposta guardada",
-    "complete": "Completo",
+    "complete": "Respondida",
     "correct": "Correto",
     "errorattachmentsnotsupported": "A aplicação ainda não suporta anexar ficheiros a respostas.",
     "errorinlinefilesnotsupported": "A aplicação ainda não suporta a edição de ficheiros online.",
     "errorquestionnotsupported": "Este tipo de pergunta não é suportado pela aplicação: {{$a}}.",
-    "feedback": "Comentários",
+    "feedback": "Feedback",
     "howtodraganddrop": "Toque para selecionar e depois toque para largar.",
     "incorrect": "Incorreto",
     "information": "Informação",
     "invalidanswer": "Resposta incompleta",
-    "notanswered": "Ainda não respondeu",
-    "notyetanswered": "Ainda não respondeu",
+    "notanswered": "Não respondida",
+    "notyetanswered": "Por responder",
     "partiallycorrect": "Parcialmente correto",
     "questionmessage": "Pergunta {{$a}}: {{$b}}",
     "questionno": "Pergunta {{$a}}",
     "requiresgrading": "Requer avaliação",
-    "unknown": "Não é possível determinar o estado"
+    "unknown": "Desconhecido(a)"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/ro.json b/www/core/components/question/lang/ro.json
index a1bb7b725d9..f840f76f587 100644
--- a/www/core/components/question/lang/ro.json
+++ b/www/core/components/question/lang/ro.json
@@ -1,15 +1,15 @@
 {
-    "answer": "Răspunde",
+    "answer": "Răspuns",
     "answersaved": "Răspuns salvat",
-    "complete": "Finalizează",
+    "complete": "Complet",
     "correct": "Corect",
     "feedback": "Feedback",
     "incorrect": "Incorect",
     "information": "Informații",
     "invalidanswer": "Răspuns incomplet",
-    "notanswered": "Nu a fost rezolvat încă",
-    "notyetanswered": "Incă nu s-a răspuns",
-    "partiallycorrect": "Parţial corect",
+    "notanswered": "Nu a primit răspuns",
+    "notyetanswered": "Nu a primit răspuns încă",
+    "partiallycorrect": "Parțial corect",
     "questionno": "Întrebare {{$a}}",
     "requiresgrading": "Trebuie să fie notată",
     "unknown": "Necunoscut"
diff --git a/www/core/components/question/lang/ru.json b/www/core/components/question/lang/ru.json
index 68d3259d734..fc2cd8ee320 100644
--- a/www/core/components/question/lang/ru.json
+++ b/www/core/components/question/lang/ru.json
@@ -1,15 +1,15 @@
 {
     "answer": "Ответ",
     "answersaved": "Ответ сохранен",
-    "complete": "Завершено",
+    "complete": "Выполнен",
     "correct": "Верно",
     "feedback": "Отзыв",
     "incorrect": "Неверно",
     "information": "Информация",
     "invalidanswer": "Неполный ответ",
-    "notanswered": "Еще не ответили",
+    "notanswered": "Нет ответа",
     "notyetanswered": "Пока нет ответа",
-    "partiallycorrect": "Частично верно",
+    "partiallycorrect": "Частично правильный",
     "questionno": "Вопрос {{$a}}",
     "requiresgrading": "Требуется оценивание",
     "unknown": "неизвестно"
diff --git a/www/core/components/question/lang/sv.json b/www/core/components/question/lang/sv.json
index c5026909e1f..9ef56c4f049 100644
--- a/www/core/components/question/lang/sv.json
+++ b/www/core/components/question/lang/sv.json
@@ -4,11 +4,11 @@
     "complete": "Komplett",
     "correct": "Rätt",
     "feedback": "Återkoppling",
-    "incorrect": "Felaktigt",
+    "incorrect": "Felaktig",
     "information": "Information",
     "invalidanswer": "Ofullständigt svar",
-    "notanswered": "Inte ännu besvarad",
-    "notyetanswered": "Ännu inte besvarad",
+    "notanswered": "Ej besvarad",
+    "notyetanswered": "Inte besvarad än",
     "partiallycorrect": "Delvis korrekt",
     "questionno": "Fråga {{$a}}",
     "requiresgrading": "Kräver rättning",
diff --git a/www/core/components/question/lang/tr.json b/www/core/components/question/lang/tr.json
index 385441989df..08d1222bac0 100644
--- a/www/core/components/question/lang/tr.json
+++ b/www/core/components/question/lang/tr.json
@@ -1,14 +1,14 @@
 {
-    "answer": "Yanıt",
+    "answer": "Cevap",
     "answersaved": "Cevap kaydedildi",
-    "complete": "Tamamlanmış",
+    "complete": "Tamamlandı",
     "correct": "Doğru",
     "feedback": "Geribildirim",
     "incorrect": "Yanlış",
     "information": "Bilgi",
     "invalidanswer": "Tamamlanmamış cevap",
-    "notanswered": "Henüz yanıtlanmadı",
-    "notyetanswered": "Henüz yanıtlanmamış",
+    "notanswered": "Cevaplanmadı",
+    "notyetanswered": "Henüz cevaplanmadı",
     "partiallycorrect": "Kısmen doğru",
     "questionno": "Soru {{$a}}",
     "requiresgrading": "Notlandırma gerekir",
diff --git a/www/core/components/question/lang/zh-cn.json b/www/core/components/question/lang/zh-cn.json
index b0c02c82632..5f50a21a566 100644
--- a/www/core/components/question/lang/zh-cn.json
+++ b/www/core/components/question/lang/zh-cn.json
@@ -1,14 +1,14 @@
 {
-    "answer": "回答",
+    "answer": "答案",
     "answersaved": "答案已保存",
-    "complete": "完全",
+    "complete": "完成",
     "correct": "正确",
     "feedback": "反馈",
-    "incorrect": "错误",
+    "incorrect": "不正确",
     "information": "说明",
     "invalidanswer": "答案不完成",
-    "notanswered": "未答",
-    "notyetanswered": "仍未作答",
+    "notanswered": "未回答",
+    "notyetanswered": "还未回答",
     "partiallycorrect": "部分正确",
     "questionno": "题目{{$a}}",
     "requiresgrading": "需要评分",
diff --git a/www/core/components/question/lang/zh-tw.json b/www/core/components/question/lang/zh-tw.json
index 865bf62f773..98bad903e59 100644
--- a/www/core/components/question/lang/zh-tw.json
+++ b/www/core/components/question/lang/zh-tw.json
@@ -1,21 +1,21 @@
 {
-    "answer": "回答",
+    "answer": "答案",
     "answersaved": "答案已儲存",
-    "complete": "完全",
-    "correct": "正確",
+    "complete": "完成",
+    "correct": "答對",
     "errorattachmentsnotsupported": "本應用程序尚不支援將檔案附加到答案.",
     "errorinlinefilesnotsupported": "該應用程序尚不支援線上檔案的編輯.",
     "errorquestionnotsupported": "該應用程式不支援此問題類型: {{$ a}}.",
     "feedback": "回饋",
     "howtodraganddrop": "點一下選擇, 然後再點一下刪除.",
-    "incorrect": "不正確",
+    "incorrect": "答錯",
     "information": "資訊",
     "invalidanswer": "不完整的答案",
-    "notanswered": "尚未回答",
-    "notyetanswered": "還沒被填答",
-    "partiallycorrect": "部分正確",
+    "notanswered": "沒被回答",
+    "notyetanswered": "尚未回答",
+    "partiallycorrect": "部分答對",
     "questionmessage": "問題 {{$a}}: {{$b}}",
     "questionno": "試題{{$a}}",
     "requiresgrading": "需要計分",
-    "unknown": "無法偵測到狀態"
+    "unknown": "未知的"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/ar.json b/www/core/components/settings/lang/ar.json
index 09752c272ce..0f8555c7b08 100644
--- a/www/core/components/settings/lang/ar.json
+++ b/www/core/components/settings/lang/ar.json
@@ -1,10 +1,8 @@
 {
     "about": "حول",
-    "appname": "تطبيق مودل {{version}}",
     "cacheexpirationtime": "وقت انتهاء صلاحية ذاكرة التخزين المؤقت (بالميلي ثانية)",
     "currentlanguage": "اللغة الحالية",
     "deletesitefiles": "هل أنت متأكد أنك تريد حذف الملفات التي تم تنزيلها من هذا الموقع  '{{sitename}}'؟",
-    "development": "التطوير",
     "deviceinfo": "معلومات الجهاز",
     "deviceos": "نظام تشغيل الجهاز",
     "disableall": "تعطيل الإعلامات بشكل مؤقت",
@@ -13,16 +11,15 @@
     "enabledownloadsection": "تفعيل تنزيل الأقسام",
     "enabledownloadsectiondescription": "عطل هذا الخيار لكي تسرع تحميل أقسام المنهج",
     "estimatedfreespace": "تقدير المساحة الحرة",
-    "general": "العام",
+    "general": "بيانات عامة",
     "language": "اللغة",
-    "license": "الترخيص",
+    "license": "رخصة",
     "localnotifavailable": "إشعارات محلية موجودة",
     "loggedin": "متواجد",
     "loggedoff": "غير موجود",
     "settings": "الإعدادات",
     "sites": "المواقع",
     "spaceusage": "المساحة المستخدمة",
-    "success": "تم بنجاح",
     "synchronization": "تزامن",
     "synchronizenow": "زامن الأن",
     "synchronizing": "يتم التزامن",
diff --git a/www/core/components/settings/lang/bg.json b/www/core/components/settings/lang/bg.json
index dc2d2031bd9..1543ea58c4a 100644
--- a/www/core/components/settings/lang/bg.json
+++ b/www/core/components/settings/lang/bg.json
@@ -1,24 +1,21 @@
 {
     "about": "Относно",
-    "appname": "Moodle Мобайл {{version}}",
     "cacheexpirationtime": "Продължителност на кеша (милисекунди)",
     "currentlanguage": "Текущ език",
     "deletesitefiles": "Сигурни ли сте, че искате да изтриете изтеглените от този сайт файлове?",
-    "development": "Разработка",
     "disableall": "Временно отменяне на съобщенията",
-    "disabled": "Блокирано",
+    "disabled": "Отменено",
     "enabledebugging": "Позволяване на диагностициране",
     "errordeletesitefiles": "Грешка при изтриването на файловете на сайта.",
     "errorsyncsite": "Грешка при синхронизацията на данните от сайта. Моля проверете Вашата връзка към Интернет и опитайте пак.",
     "estimatedfreespace": "Пресметнато свободно пространство",
-    "general": "Общи",
+    "general": "General",
     "language": "Език",
     "license": "Лиценз",
     "loggedin": "Онлайн",
-    "loggedoff": "Не е онлайн",
+    "loggedoff": "Офлайн",
     "settings": "Настройки",
     "spaceusage": "Използване на пространство",
-    "success": "Успех!",
     "synchronization": "Синхронизиране",
     "synchronizing": "Синхронизиране",
     "syncsitesuccess": "Данните от сайта са синхронизирани и всички кешове са инвалидирани.",
diff --git a/www/core/components/settings/lang/ca.json b/www/core/components/settings/lang/ca.json
index eb5ec501f98..9a46eb62910 100644
--- a/www/core/components/settings/lang/ca.json
+++ b/www/core/components/settings/lang/ca.json
@@ -1,6 +1,5 @@
 {
     "about": "Quant a",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App preparada",
     "cacheexpirationtime": "Temps de venciment de memòria cau (milisegons)",
     "cannotsyncoffline": "No es poden sincronitzar dades fora de línia.",
@@ -15,12 +14,11 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "Esteu segur que voleu esborrar els fitxers baixats d'aquest lloc?",
     "deletesitefilestitle": "Elimina els fitxers del lloc",
-    "development": "Desenvolupament",
     "deviceinfo": "Informació del dispositiu",
     "deviceos": "OS del dispositiu",
     "devicewebworkers": "És compatible amb Device Web Workers",
     "disableall": "Inhabilita les notificacions temporalment",
-    "disabled": "Inhabilitat",
+    "disabled": "Desactivada",
     "displayformat": "Format de visualització",
     "enabledebugging": "Habilita la depuració",
     "enabledownloadsection": "Habilita la descàrrega de seccions",
@@ -32,7 +30,7 @@
     "errorsyncsite": "S'ha produït un error sincronitzant les dades del lloc, comproveu la vostra connexió a internet i torneu-ho provar.",
     "estimatedfreespace": "Espai lliure estimat",
     "filesystemroot": "Arrel del fitxer de sistema",
-    "general": "General",
+    "general": "Dades generals",
     "language": "Idioma",
     "license": "Llicència",
     "localnotifavailable": "Notificacions locals disponibles",
@@ -44,11 +42,10 @@
     "networkstatus": "Estat de la connexió a Internet",
     "privacypolicy": "Política de privadesa",
     "reportinbackground": "Informa dels errors automàticament",
-    "settings": "Configuració",
+    "settings": "Paràmetres",
     "sites": "Llocs",
     "spaceusage": "Utilització de l'espai",
     "storagetype": "Tipus d'emmagatzematge",
-    "success": "Èxit!",
     "synchronization": "Sincronització",
     "synchronizenow": "Sincronitza ara",
     "synchronizing": "S'està sincronitzant",
diff --git a/www/core/components/settings/lang/cs.json b/www/core/components/settings/lang/cs.json
index 734789c9372..ada1f9bcc0d 100644
--- a/www/core/components/settings/lang/cs.json
+++ b/www/core/components/settings/lang/cs.json
@@ -1,6 +1,5 @@
 {
     "about": "O aplikaci",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplikace je připravena",
     "cacheexpirationtime": "Vypršení platnosti vyrovnávací paměti (milisekundy)",
     "cannotsyncoffline": "Nelze synchronizovat offline.",
@@ -12,14 +11,13 @@
     "cordovadeviceuuid": "Cordova Device uuid",
     "cordovaversion": "Cordova verze",
     "credits": "Kredity",
-    "currentlanguage": "Aktuální jazyk",
+    "currentlanguage": "Současný jazyk",
     "deletesitefiles": "Jste si jisti, že chcete odstranit stažené soubory z tohoto webu?",
     "deletesitefilestitle": "Odstranit soubory webu",
-    "development": "Vývoj",
     "deviceinfo": "Informace o zařízení",
     "deviceos": "OS zařízení",
     "devicewebworkers": "Podporovaný Web Workers zařízení",
-    "disableall": "Dočasně zakázat upozornění",
+    "disableall": "Zakázat upozornění",
     "disabled": "Zakázáno",
     "displayformat": "Formát zobrazení",
     "enabledebugging": "Povolit ladící informace",
@@ -32,7 +30,7 @@
     "errorsyncsite": "Chyba synchronizace dat stránek, zkontrolujte své připojení k internetu a zkuste to znovu.",
     "estimatedfreespace": "Odhadované volné místo",
     "filesystemroot": "Kořen souborového systému",
-    "general": "Obecné",
+    "general": "Obecná data",
     "language": "Jazyk",
     "license": "Licence",
     "localnotifavailable": "Je dostupné lokání oznámení",
@@ -49,7 +47,6 @@
     "sites": "Stránky",
     "spaceusage": "Použitý prostor",
     "storagetype": "Typ paměti",
-    "success": "Úspěch!",
     "synchronization": "Synchronizace",
     "synchronizenow": "Právě synchonizuji",
     "synchronizing": "Synchronizování",
diff --git a/www/core/components/settings/lang/da.json b/www/core/components/settings/lang/da.json
index 7d2f1960299..2b0cd357ebd 100644
--- a/www/core/components/settings/lang/da.json
+++ b/www/core/components/settings/lang/da.json
@@ -1,6 +1,5 @@
 {
     "about": "Om",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App klar",
     "cacheexpirationtime": "Cache udløbstid (milisekunder)",
     "cordovadevicemodel": "Cordova Device model",
@@ -9,13 +8,12 @@
     "cordovadeviceuuid": "Cordova Device uuid",
     "cordovaversion": "Cordova version",
     "credits": "Anerkendelser",
-    "currentlanguage": "Nuværende sprog",
+    "currentlanguage": "Sprogvalg",
     "deletesitefiles": "Er du sikker på du vil slette de downloadede filer fra webstedet '{{sitename}}'?",
     "deletesitefilestitle": "Slet webstedsfiler",
-    "development": "Udvikling",
     "deviceinfo": "Enhedsinfo",
     "deviceos": "Enheds operativsystem",
-    "disableall": "Deaktiver midlertidigt underretninger",
+    "disableall": "Deaktiver notifikationer",
     "disabled": "Deaktiveret",
     "displayformat": "Vis format",
     "enabledebugging": "Aktiver fejlsøgning",
@@ -24,28 +22,27 @@
     "errorsyncsite": "Fejl ved synkronisering. Kontroller din Internettilslutning og prøv igen.",
     "estimatedfreespace": "Beregnet ledig plads",
     "filesystemroot": "Filsystemets rod",
-    "general": "Generelt",
+    "general": "Generelle data",
     "language": "Sprog",
     "license": "Licens",
     "localnotifavailable": "Lokale meddelelser tilgængelige",
     "locationhref": "Webvisning af URL",
     "loggedin": "Online",
-    "loggedoff": "Ikke online",
+    "loggedoff": "Offline",
     "navigatorlanguage": "Navigatorsprog",
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Status for internetforbindelse",
     "reportinbackground": "Anmeld fejl automatisk",
     "settings": "Indstillinger",
-    "sites": "Steder",
+    "sites": "Websteder",
     "spaceusage": "Pladsforbrug",
     "storagetype": "Lagertype",
-    "success": "Succes!",
     "synchronization": "Synkronisering",
     "synchronizenow": "Synkroniser nu",
     "synchronizing": "Synkroniserer",
     "syncsettings": "Indstilling for synkronisering",
     "syncsitesuccess": "Websidens data er synkroniseret og alle mellemlagre tømt",
-    "total": "Total",
+    "total": "Totalt",
     "versioncode": "Versionsnummer",
     "versionname": "Versionsnavn",
     "wificonnection": "WiFi-forbindelse"
diff --git a/www/core/components/settings/lang/de.json b/www/core/components/settings/lang/de.json
index 3562db16393..a1041070545 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -1,6 +1,5 @@
 {
     "about": "Über diese App",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App nutzbar",
     "cacheexpirationtime": "Speicherdauer im Cache (Millisekunden)",
     "cannotsyncoffline": "Offline kann nicht synchronisiert werden.",
@@ -12,15 +11,14 @@
     "cordovadeviceuuid": "Cordova Device UUID",
     "cordovaversion": "Cordova Version",
     "credits": "Mitwirkende",
-    "currentlanguage": "Sprache",
+    "currentlanguage": "Eingestellte Sprache",
     "deletesitefiles": "Möchten Sie wirklich alle von der Website '{{sitename}}' geladenen Dateien löschen?",
     "deletesitefilestitle": "Website-Dateien löschen",
-    "development": "Entwicklung",
     "deviceinfo": "Geräteinfo",
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
-    "disableall": "Benachrichtungen vorübergehend ausschalten",
-    "disabled": "Deaktiviert",
+    "disableall": "Benachrichtungen ausschalten",
+    "disabled": "deaktiviert",
     "displayformat": "Bildschirmformat",
     "enabledebugging": "Debugging aktivieren",
     "enabledownloadsection": "Herunterladen von Abschnitten aktivieren",
@@ -32,8 +30,8 @@
     "errorsyncsite": "Fehler beim Synchronisieren der Website. Prüfen Sie die Verbindung und versuchen Sie es noch einmal.",
     "estimatedfreespace": "Noch verfügbarer Speicherplatz",
     "filesystemroot": "Dateisystem (root)",
-    "general": "Allgemein",
-    "language": "Sprache in der App",
+    "general": "Grunddaten",
+    "language": "Sprache",
     "license": "Lizenz",
     "localnotifavailable": "Lokale Mitteilungen verfügbar",
     "locationhref": "Webview URL",
@@ -46,16 +44,15 @@
     "processorsettings": "Verarbeitungseinstellungen",
     "reportinbackground": "Fehler automatisch senden",
     "settings": "Einstellungen",
-    "sites": "Websites",
+    "sites": "Seiten",
     "spaceusage": "Speicherplatz",
     "storagetype": "Speicherart",
-    "success": "Fertig!",
     "synchronization": "Synchronisieren",
     "synchronizenow": "Synchronisieren",
     "synchronizing": "Synchronisieren ...",
     "syncsettings": "Synchronisieren",
     "syncsitesuccess": "Die Daten wurden synchronisiert.",
-    "total": "Summe",
+    "total": "Gesamt",
     "versioncode": "Versionscode",
     "versionname": "Versionsname",
     "wificonnection": "WLAN-Verbindung"
diff --git a/www/core/components/settings/lang/el.json b/www/core/components/settings/lang/el.json
index cc1f0b1429c..1e844c1e619 100644
--- a/www/core/components/settings/lang/el.json
+++ b/www/core/components/settings/lang/el.json
@@ -2,12 +2,12 @@
     "currentlanguage": "Επιλεγμένη γλώσσα",
     "disableall": "Προσωρινή απενεργοποίηση ειδοποιήσεων",
     "disabled": "Απενεργοποιημένο",
-    "general": "Γενικά",
+    "general": "Γενικά δεδομένα",
     "language": "Γλώσσα",
-    "license": "Άδεια",
+    "license": "Άδεια GPL",
     "loggedin": "Συνδεδεμένος",
     "loggedoff": "Μη συνδεδεμένος",
     "settings": "Ρυθμίσεις",
     "sites": "Δικτυακοί τόποι",
-    "total": "Συνολικά"
+    "total": "Συνολικό"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/es-mx.json b/www/core/components/settings/lang/es-mx.json
index 8bf53cb0fe2..31514e7c140 100644
--- a/www/core/components/settings/lang/es-mx.json
+++ b/www/core/components/settings/lang/es-mx.json
@@ -1,6 +1,5 @@
 {
     "about": "Acerca de",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App lista",
     "cacheexpirationtime": "Tiempo de caducidad del caché (mili segundos)",
     "cannotsyncoffline": "No puede sincronizarse fuera-de-línea.",
@@ -15,12 +14,11 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
     "deletesitefilestitle": "Eliminar archivos del sitio",
-    "development": "Desarrollo",
     "deviceinfo": "Información del Dispositivo",
     "deviceos": "Sistema Operativo del dispositivo",
     "devicewebworkers": "Trabajadores Web del Dispositivo soportados",
-    "disableall": "Deshabilitar notificaciones temporalmente",
-    "disabled": "Deshabilitado",
+    "disableall": "Deshabilitar notificaciones",
+    "disabled": "Desactivado",
     "displayformat": "Mostrar formato",
     "enabledebugging": "Activar modo depuración (debug)",
     "enabledownloadsection": "Habilitar descargar secciones",
@@ -32,13 +30,13 @@
     "errorsyncsite": "Error al sincronizarlos datos del sitio; por favor revise su conexión de Internet e inténtelo de nuevo.",
     "estimatedfreespace": "Espacio libre estimado",
     "filesystemroot": "Raíz del sistema-de-archivos",
-    "general": "General",
+    "general": "Datos generales",
     "language": "Idioma",
     "license": "Licencia",
     "localnotifavailable": "Notificaciones locales disponibles",
     "locationhref": "URL VistaWeb",
     "loggedin": "En línea",
-    "loggedoff": "No en línea",
+    "loggedoff": "Fuera de línea",
     "navigatorlanguage": "Idioma del Navegador",
     "navigatoruseragent": "usuarioAgente del Navegador",
     "networkstatus": "Estatus de conexión a Internet",
@@ -49,7 +47,6 @@
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
-    "success": "¡Éxito!",
     "synchronization": "Sincronización",
     "synchronizenow": "Sincronizar ahorita",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/es.json b/www/core/components/settings/lang/es.json
index 30bff8fb558..de92393bcae 100644
--- a/www/core/components/settings/lang/es.json
+++ b/www/core/components/settings/lang/es.json
@@ -1,6 +1,5 @@
 {
     "about": "Acerca de",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App preparada",
     "cacheexpirationtime": "Tiempo de expiración de caché (mili segundos)",
     "cannotsyncoffline": "No puede sincronizarse fuera de línea.",
@@ -15,12 +14,11 @@
     "currentlanguage": "Idioma actual",
     "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
     "deletesitefilestitle": "Elimina los ficheros del sitio",
-    "development": "Desarrollo",
     "deviceinfo": "Información del dispositivo",
     "deviceos": "OS del dispositivo",
     "devicewebworkers": "Soporta Device Web Workers",
     "disableall": "Desactivar temporalmente las notificaciones",
-    "disabled": "Deshabilitado",
+    "disabled": "Desactivado",
     "displayformat": "Formato de visualización",
     "enabledebugging": "Activar modo debug",
     "enabledownloadsection": "Habilitar la descarga de secciones",
@@ -32,7 +30,7 @@
     "errorsyncsite": "Se ha producido un error sincronizando los datos del sitio, por favor compruebe su conexión a internet y pruebe de nuevo.",
     "estimatedfreespace": "Espacio libre (estimado)",
     "filesystemroot": "Raíz del sistema de archivos",
-    "general": "General",
+    "general": "Datos generales",
     "language": "Idioma",
     "license": "Licencia",
     "localnotifavailable": "Notificaciones locales disponibles",
@@ -48,7 +46,6 @@
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
-    "success": "Éxito",
     "synchronization": "Sincronización",
     "synchronizenow": "Sincronizar ahora",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/eu.json b/www/core/components/settings/lang/eu.json
index 65a898ffbe7..1a1d6b5f47c 100644
--- a/www/core/components/settings/lang/eu.json
+++ b/www/core/components/settings/lang/eu.json
@@ -1,6 +1,5 @@
 {
     "about": "Honi buruz",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App-a prest",
     "cacheexpirationtime": "Cache-aren iraungitze denbora (milisegundotan)",
     "cannotsyncoffline": "Ezin da lineaz-kanpo sinkronizatu.",
@@ -15,11 +14,10 @@
     "currentlanguage": "Oraingo hizkuntza",
     "deletesitefiles": "Ziur zaude '{{sitename}}' gunetik jaitsitako fitxategiak ezabatu nahi dituzula?",
     "deletesitefilestitle": "Ezabatu guneko fitxategiak",
-    "development": "Garapena",
     "deviceinfo": "Gailuaren informazio",
     "deviceos": "Gailuaren SEa",
     "devicewebworkers": "Device Web Workers onartuak",
-    "disableall": "Desgaitu jakinarazpenak aldi baterako",
+    "disableall": "Desgaitu jakinarazpenak",
     "disabled": "Desgaituta",
     "displayformat": "Erakusteko modua",
     "enabledebugging": "Gaitu arazketa",
@@ -32,12 +30,12 @@
     "errorsyncsite": "Errorea guneko datuak sinkronizatzean, mesedez egiaztatu zure interneterako konexioa eta saiatu berriz.",
     "estimatedfreespace": "Estimatutako leku librea",
     "filesystemroot": "Fitxategi-sistemaren jatorria",
-    "general": "Orokorra",
+    "general": "Datu orokorrak",
     "language": "Hizkuntza",
     "license": "Lizentzia",
     "localnotifavailable": "Jakinarazpen lokalak eskuragarri",
     "locationhref": "Webview URLa",
-    "loggedin": "On-line",
+    "loggedin": "Online",
     "loggedoff": "Ez dago online",
     "navigatorlanguage": "Nabigatzailearen hizkuntza",
     "navigatoruseragent": "Nabigatzailearen userAgent-a",
@@ -49,7 +47,6 @@
     "sites": "Guneak",
     "spaceusage": "Lekuaren erabilera",
     "storagetype": "Biltegi mota",
-    "success": "Ondo!",
     "synchronization": "Sinkronizazioa",
     "synchronizenow": "Sinkronizatu orain",
     "synchronizing": "Sinkronizatzen",
diff --git a/www/core/components/settings/lang/fa.json b/www/core/components/settings/lang/fa.json
index 4b17b4372a0..4890c372d09 100644
--- a/www/core/components/settings/lang/fa.json
+++ b/www/core/components/settings/lang/fa.json
@@ -6,18 +6,17 @@
     "currentlanguage": "زبان فعلی",
     "deletesitefiles": "آیا از حذف کلیه فایل‌های این سایت مطمئنید؟",
     "deletesitefilestitle": "پاک‌کردن فایل‌های سایت",
-    "development": "توسعه",
     "deviceinfo": "اطلاعات دستگاه",
     "deviceos": "سیستم‌عامل دستگاه",
-    "disableall": "غیرفعال‌کردن موقت اطلاعیه‌ها",
-    "disabled": "غیر فعال",
+    "disableall": "غیرفعال‌کردن اطلاعیه‌ها",
+    "disabled": "غیرفعال",
     "enabledebugging": "فعالسازی اشکالزدایی",
     "enabledownloadsection": "فعال‌کردن دریافت قسمت‌ها",
     "enabledownloadsectiondescription": "برای سریع‌تر شدن بارگیری قسمت‌های درس این گزینه را غیرفعال کنید.",
     "enablerichtexteditor": "فعال‌کردن ویرایشگر متنی پیشرفته",
     "enablerichtexteditordescription": "اگر فعال باشد، در جاهایی که ممکن باشد یک ویرایشگر متنی پیشرفته نمایش داده خواهد شد.",
     "estimatedfreespace": "فضای آزاد تخمینی",
-    "general": "عمومی",
+    "general": "داده‌های کلی",
     "language": "زبان",
     "license": "اجازه‌نامه",
     "loggedin": "هنگام بودن در سایت",
diff --git a/www/core/components/settings/lang/fr.json b/www/core/components/settings/lang/fr.json
index a26ab0cc96b..b0a98969616 100644
--- a/www/core/components/settings/lang/fr.json
+++ b/www/core/components/settings/lang/fr.json
@@ -1,6 +1,5 @@
 {
     "about": "À propos",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Prêt pour l'app",
     "cacheexpirationtime": "Durée d'échéance du cache (ms)",
     "cannotsyncoffline": "Impossible de synchroniser sans connection réseau.",
@@ -12,14 +11,13 @@
     "cordovadeviceuuid": "UUID Cordova Device",
     "cordovaversion": "Version Cordova",
     "credits": "Remerciements",
-    "currentlanguage": "Langue actuelle",
+    "currentlanguage": "Langue active",
     "deletesitefiles": "Voulez-vous vraiment supprimer les fichiers téléchargés depuis ce site ?",
     "deletesitefilestitle": "Supprimer les fichiers de site",
-    "development": "Développement",
     "deviceinfo": "Info sur l'appareil",
     "deviceos": "Système d'exploitation de l'appareil",
     "devicewebworkers": "Web workers supportés",
-    "disableall": "Désactiver temporairement les notifications",
+    "disableall": "Désactiver les notifications",
     "disabled": "Désactivé",
     "displayformat": "Format d'affichage",
     "enabledebugging": "Activer débogage",
@@ -32,13 +30,13 @@
     "errorsyncsite": "Erreur de synchronisation des données. Veuillez vérifier votre connexion internet et essayer plus tard.",
     "estimatedfreespace": "Espace libre estimé",
     "filesystemroot": "Racine du système de fichiers",
-    "general": "Général",
+    "general": "Généralités",
     "language": "Langue",
     "license": "Licence",
     "localnotifavailable": "Notifications locales disponibles",
     "locationhref": "URL webview",
     "loggedin": "Connectés :",
-    "loggedoff": "Non connectés :",
+    "loggedoff": "Hors ligne",
     "navigatorlanguage": "Langue du navigateur",
     "navigatoruseragent": "UserAgent du navigateur",
     "networkstatus": "Statut de la connexion internet",
@@ -46,10 +44,9 @@
     "processorsettings": "Réglage du processus d'envoi de messages",
     "reportinbackground": "Annoncer les erreurs automatiquement",
     "settings": "Réglages",
-    "sites": "Plateformes",
+    "sites": "Sites",
     "spaceusage": "Espace utilisé",
     "storagetype": "Type de stockage",
-    "success": "Succès !",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchroniser maintenant",
     "synchronizing": "Synchronisation en cours",
diff --git a/www/core/components/settings/lang/he.json b/www/core/components/settings/lang/he.json
index fb9798c3810..4b431f585e1 100644
--- a/www/core/components/settings/lang/he.json
+++ b/www/core/components/settings/lang/he.json
@@ -5,19 +5,18 @@
     "currentlanguage": "שפה נוכחית",
     "deletesitefiles": "האם אתה בטוח שברצונך למחוק את כל הקבצים שהורדו מאתר זה?",
     "deletesitefilestitle": "מחיקת קבצי אתר",
-    "development": "פיתוח",
     "deviceinfo": "מידע אודות המכשיר",
     "deviceos": "מערכת הפעלה של המכשיר",
     "disableall": "הודעות־מערכת כבויות זמנית",
-    "disabled": "לא זמין",
+    "disabled": "כבוי",
     "displayformat": "תבנית תצוגה",
     "enabledebugging": "הפעל ניפוי שגיאות",
     "errordeletesitefiles": "שגיאה במחיקת קבצי האתר.",
     "errorsyncsite": "שגיאה בסנכרון מידע האתר, אנא בדוק את החיבור לרשת האינטרנט ונסה שוב.",
     "estimatedfreespace": "אומדן מקום פנוי",
-    "general": "כללי",
-    "language": "שפה",
-    "license": "רישיון",
+    "general": "נתונים כללים",
+    "language": "שפת ממשק",
+    "license": "רישיון:",
     "localnotifavailable": "התראות מקומיות זמינות",
     "loggedin": "מקוון",
     "loggedoff": "לא מקוון",
@@ -26,12 +25,11 @@
     "settings": "הגדרות",
     "sites": "אתרים",
     "spaceusage": "זיכרון בשימוש",
-    "success": "הצלחה!",
     "synchronization": "סינכרון",
     "synchronizenow": "סינכרון עכשיו",
     "synchronizing": "מסנכרן",
     "syncsitesuccess": "מידע האתר סונכרן וכל זיכרון המטמון אופס.",
-    "total": "סך הכל",
+    "total": "כולל",
     "versioncode": "קוד גרסה",
     "versionname": "שם גרסה",
     "wificonnection": "חיבור אלחוטי"
diff --git a/www/core/components/settings/lang/hu.json b/www/core/components/settings/lang/hu.json
index 8d8d1ac084d..dabf3467e9f 100644
--- a/www/core/components/settings/lang/hu.json
+++ b/www/core/components/settings/lang/hu.json
@@ -3,19 +3,19 @@
     "cacheexpirationtime": "Gyorsítótár lejárata (ms)",
     "currentlanguage": "Aktuális nyelv",
     "deletesitefiles": "Biztosan törli a portálról a letöltött fájlokat?",
-    "disableall": "Értesítések átmeneti kikapcsolása",
+    "disableall": "Értesítésekkikapcsolása",
     "disabled": "Kikapcsolva",
     "enabledebugging": "Hibakeresés bekapcsolása",
     "estimatedfreespace": "Becsült szabad tárhely",
-    "general": "Általános",
+    "general": "Általános adatok",
     "language": "Nyelv",
-    "license": "Engedély",
+    "license": "Engedély:",
     "loggedin": "Bejelentkezve:",
-    "loggedoff": "Kijelentkezve:",
+    "loggedoff": "Kijelentkezve",
     "processorsettings": "Feldolgozó beállításai",
     "settings": "Beállítások",
     "sites": "Portálok",
     "spaceusage": "Tárhelyhasználat",
     "synchronization": "Szinkronizálás",
-    "total": "Összes"
+    "total": "Összesen"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/it.json b/www/core/components/settings/lang/it.json
index cefcde944c6..15da5268622 100644
--- a/www/core/components/settings/lang/it.json
+++ b/www/core/components/settings/lang/it.json
@@ -1,6 +1,5 @@
 {
     "about": "Informazioni",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App ready",
     "cacheexpirationtime": "Durata cache (millisecondi)",
     "cordovadevicemodel": "Modello del dispositivo Cordova",
@@ -12,11 +11,10 @@
     "currentlanguage": "Lingua in uso",
     "deletesitefiles": "Sei sicuro di eliminare i file scaricati dal sito '{{sitename}}'?",
     "deletesitefilestitle": "Elimina file del sito",
-    "development": "Sviluppo",
     "deviceinfo": "Informazioni sul dispositivo",
     "deviceos": "SO del dispositivo",
     "devicewebworkers": "Dispositivi Web Worker supportati",
-    "disableall": "Disabilita temporaneamente le notifiche",
+    "disableall": "Disabilita le notifiche",
     "disabled": "Disabilitato",
     "displayformat": "Formato di visualizzazione",
     "enabledebugging": "Abilita debugging",
@@ -26,7 +24,7 @@
     "errorsyncsite": "Si è verificato un errore durante la sincronizzazione dei dati dal sito. Per favore verifica la connessione internet e riprova.",
     "estimatedfreespace": "Spazio libero stimato",
     "filesystemroot": "Root del filesystem",
-    "general": "Generale",
+    "general": "Dati generali",
     "language": "Lingua",
     "license": "Licenza",
     "localnotifavailable": "Notifiche locali disponibili",
@@ -41,7 +39,6 @@
     "sites": "Siti",
     "spaceusage": "Spazio utilizzato",
     "storagetype": "Tipo di storage",
-    "success": "Effettuato correttamente!",
     "synchronization": "Sincronizzazione",
     "synchronizenow": "Sincronizza adesso",
     "synchronizing": "Sincronizzazione in corso",
diff --git a/www/core/components/settings/lang/ja.json b/www/core/components/settings/lang/ja.json
index ff314f93d59..c59c0bb69cf 100644
--- a/www/core/components/settings/lang/ja.json
+++ b/www/core/components/settings/lang/ja.json
@@ -3,13 +3,12 @@
     "cacheexpirationtime": "キャッシュ有効期限（ミリ秒単位）",
     "currentlanguage": "現在の言語",
     "deletesitefiles": "本当にこのサイトからダウンロードしたファイルを消去しますか？",
-    "development": "開発",
-    "disableall": "一時的に通知を無効にする",
-    "disabled": "無効",
+    "disableall": "通知を無効にする",
+    "disabled": "利用不可",
     "enabledebugging": "デバッグを有効にする",
     "estimatedfreespace": "概算の空き容量",
-    "general": "一般",
-    "language": "言語",
+    "general": "一般データ",
+    "language": "言語設定",
     "license": "ライセンス",
     "loggedin": "オンライン",
     "loggedoff": "オフライン",
@@ -18,5 +17,5 @@
     "sites": "サイト",
     "spaceusage": "保存領域使用量",
     "synchronization": "同期",
-    "total": "総計"
+    "total": "合計"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/lt.json b/www/core/components/settings/lang/lt.json
index 178c58fe546..79f4bc7a512 100644
--- a/www/core/components/settings/lang/lt.json
+++ b/www/core/components/settings/lang/lt.json
@@ -1,6 +1,5 @@
 {
     "about": "Apie",
-    "appname": "Moodle mobili {{version}}",
     "appready": "Programėlė paruošta",
     "cacheexpirationtime": "Laikinas galiojimo laikas (ms)",
     "cannotsyncoffline": "Negalima sinchronizuoti neprisijungus.",
@@ -15,7 +14,6 @@
     "currentlanguage": "Vartojama kalba",
     "deletesitefiles": "Ar esate tikri, kad norite ištrinti atsisiųstus failus iš svetainės '{{sitename}}'?",
     "deletesitefilestitle": "Ištrinti svetainės failus",
-    "development": "Kūrimas",
     "deviceinfo": "Informacija apie įrenginį",
     "deviceos": "Įrenginio OS",
     "devicewebworkers": "Įrenginio palaikymas",
@@ -32,7 +30,7 @@
     "errorsyncsite": "Klaida sinchronizuojant svetainės duomenis, prašome patikrinti interneto ryšį ir pabandyti dar kartą.",
     "estimatedfreespace": "Laisva vieta",
     "filesystemroot": "Failų sistema pradžia",
-    "general": "Bendra",
+    "general": "Bendrieji duomenys",
     "language": "Kalba",
     "license": "Licencija",
     "localnotifavailable": "Prieinami vietos pranešimai",
@@ -48,7 +46,6 @@
     "sites": "Svetainės",
     "spaceusage": "Vietos naudojimas",
     "storagetype": "Atminties tipas",
-    "success": "Sėkmė!!",
     "synchronization": "Sinchronizavimas",
     "synchronizenow": "Sinchronizuoti dabar",
     "synchronizing": "Sinchronizuojama",
diff --git a/www/core/components/settings/lang/nl.json b/www/core/components/settings/lang/nl.json
index 505652de0ee..19bfb28d023 100644
--- a/www/core/components/settings/lang/nl.json
+++ b/www/core/components/settings/lang/nl.json
@@ -1,6 +1,5 @@
 {
     "about": "Over",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "App klaar",
     "cacheexpirationtime": "Cache verlooptijd (milliseconden)",
     "cannotsyncoffline": "Kan offline geen bestanden synchroniseren.",
@@ -15,11 +14,10 @@
     "currentlanguage": "Huidige taal",
     "deletesitefiles": "Weet je zeker dat je deze site en gedownloade bestanden ervan wil verwijderen?",
     "deletesitefilestitle": "Verwijder site-bestanden",
-    "development": "Ontwikkeling",
     "deviceinfo": "Toestel info",
     "deviceos": "Toestel OS",
     "devicewebworkers": "Ondersteunde Device Web Workers",
-    "disableall": "Berichten tijdelijk uitschakelen",
+    "disableall": "Berichten uitschakelen",
     "disabled": "Uitgeschakeld",
     "displayformat": "Schermformaat",
     "enabledebugging": "Foutopsporing inschakelen",
@@ -32,7 +30,7 @@
     "errorsyncsite": "Fout bij het synchroniseren van sitegegevens. Controleer je internetverbinding en probeer opnieuw.",
     "estimatedfreespace": "Geschatte vrije ruimte",
     "filesystemroot": "Root bestandssysteem",
-    "general": "Algemeen",
+    "general": "Algemene gegevens",
     "language": "Taal",
     "license": "Licentie",
     "localnotifavailable": "Lokale meldingen beschikbaar",
@@ -49,7 +47,6 @@
     "sites": "Sites",
     "spaceusage": "Gebruikte ruimte",
     "storagetype": "Opslagtype",
-    "success": "Gelukt!",
     "synchronization": "Synchronisatie",
     "synchronizenow": "Nu synchroniseren",
     "synchronizing": "Aan het synchroniseren...",
diff --git a/www/core/components/settings/lang/pl.json b/www/core/components/settings/lang/pl.json
index 0c03e84f5b2..0433565a1a6 100644
--- a/www/core/components/settings/lang/pl.json
+++ b/www/core/components/settings/lang/pl.json
@@ -4,10 +4,10 @@
     "currentlanguage": "Aktualny język",
     "deletesitefiles": "Czy na pewno chcesz usunąć pliki pobrane z tej strony?",
     "disableall": "Tymczasowo wyłącz powiadomienia",
-    "disabled": "Wyłączony",
+    "disabled": "Wyłączone",
     "enabledebugging": "Włącz debugowanie",
     "estimatedfreespace": "Szacowana wolna przestrzeń",
-    "general": "Ogólne",
+    "general": "Dane ogólne",
     "language": "Język",
     "license": "Licencja",
     "loggedin": "On-line",
@@ -15,5 +15,5 @@
     "settings": "Ustawienia",
     "sites": "Serwisy",
     "spaceusage": "Użyta przestrzeń",
-    "total": "Suma"
+    "total": "Ogólnie"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/pt-br.json b/www/core/components/settings/lang/pt-br.json
index e3e3771f7f9..f0a410d15db 100644
--- a/www/core/components/settings/lang/pt-br.json
+++ b/www/core/components/settings/lang/pt-br.json
@@ -1,6 +1,5 @@
 {
     "about": "Sobre",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicativo pronto",
     "cacheexpirationtime": "Tempo de expiração do cache (milisegundos)",
     "cannotsyncoffline": "Não pode sincronizar offline.",
@@ -12,15 +11,14 @@
     "cordovadeviceuuid": "Cordova Device uuid",
     "cordovaversion": "Cordova versão",
     "credits": "Creditos",
-    "currentlanguage": "Idioma atual",
+    "currentlanguage": "Idioma em uso",
     "deletesitefiles": "Você tem certeza que quer excluir os arquivos baixados do site '{{sitename}}'?",
     "deletesitefilestitle": "Excluir os arquivos do site",
-    "development": "Desenvolvimento",
     "deviceinfo": "Informação do dispositivo",
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
-    "disableall": "Desabilitar temporariamente notificações",
-    "disabled": "Desativar",
+    "disableall": "Desabilitar notificações",
+    "disabled": "Desativado",
     "displayformat": "Formato de exibição",
     "enabledebugging": "Ativar a depuração",
     "enabledownloadsection": "Ativar seções de download",
@@ -32,13 +30,13 @@
     "errorsyncsite": "Erro ao sincronizar os dados do site, por favor verifique sua conexão de internet e tente novamente.",
     "estimatedfreespace": "Espaço livre estimado",
     "filesystemroot": "Raiz do sistema de arquivos",
-    "general": "Geral",
+    "general": "Dados Gerais",
     "language": "Idioma",
     "license": "Licença",
     "localnotifavailable": "Notificações locais disponíveis",
     "locationhref": "Webview URL",
     "loggedin": "Conectado",
-    "loggedoff": "Desconectado",
+    "loggedoff": "Offline",
     "navigatorlanguage": "Idioma de navegação",
     "navigatoruseragent": "Navegador userAgent",
     "networkstatus": "O status da conexão Internet",
@@ -48,7 +46,6 @@
     "sites": "Sites",
     "spaceusage": "Uso do espaço",
     "storagetype": "Tipo de armazenamento",
-    "success": "Sucesso!",
     "synchronization": "Sincronização",
     "synchronizenow": "Sincronizar agora",
     "synchronizing": "Sincronizando",
diff --git a/www/core/components/settings/lang/pt.json b/www/core/components/settings/lang/pt.json
index e1640c0210c..d188b0239d1 100644
--- a/www/core/components/settings/lang/pt.json
+++ b/www/core/components/settings/lang/pt.json
@@ -1,6 +1,5 @@
 {
     "about": "Acerca",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicação pronta",
     "cacheexpirationtime": "Intervalo de tempo para a cache expirar (milisegundos)",
     "cannotsyncoffline": "Não é possível sincronizar offline.",
@@ -12,14 +11,13 @@
     "cordovadeviceuuid": "Cordova Device uuid",
     "cordovaversion": "Versão do Cordova",
     "credits": "Créditos",
-    "currentlanguage": "Idioma atual",
+    "currentlanguage": "Idioma usado atualmente",
     "deletesitefiles": "Tem a certeza que pretende apagar os ficheiros descarregados a partir do site '{{sitename}}'?",
     "deletesitefilestitle": "Excluir os ficheiros do site",
-    "development": "Desenvolvimento",
     "deviceinfo": "Informação do dispositivo",
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
-    "disableall": "Desativar temporáriamente todas as notificações",
+    "disableall": "Desativar notificações",
     "disabled": "Desativado",
     "displayformat": "Formato de visualização",
     "enabledebugging": "Ativar a depuração",
@@ -32,7 +30,7 @@
     "errorsyncsite": "Erro ao sincronizar os dados do site, por favor verifique a sua ligação à internet e tente novamente.",
     "estimatedfreespace": "Espaço livre estimado",
     "filesystemroot": "Raíz do sistema de ficheiros",
-    "general": "Geral",
+    "general": "Dados gerais",
     "language": "Idioma",
     "license": "Licença",
     "localnotifavailable": "Notificações locais disponíveis",
@@ -45,11 +43,10 @@
     "privacypolicy": "Politica de privacidade",
     "processorsettings": "Configurações do processador",
     "reportinbackground": "Reportar erros automaticamente",
-    "settings": "Configurações",
+    "settings": "Definições",
     "sites": "Sites",
     "spaceusage": "Utilização do espaço",
     "storagetype": "Tipo de armazenamento",
-    "success": "Sucesso!",
     "synchronization": "Sincronização",
     "synchronizenow": "Sincronizar agora",
     "synchronizing": "A sincronizar",
diff --git a/www/core/components/settings/lang/ro.json b/www/core/components/settings/lang/ro.json
index 5b2bcf83f36..c241401f584 100644
--- a/www/core/components/settings/lang/ro.json
+++ b/www/core/components/settings/lang/ro.json
@@ -1,6 +1,5 @@
 {
     "about": "Despre",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Aplicația este pregătită",
     "cacheexpirationtime": "Timpul de expirare al cacheului (milisecunde)",
     "cordovadevicemodel": "Modelul Cordova Device",
@@ -9,10 +8,9 @@
     "cordovadeviceuuid": "UUID Cordova Device",
     "cordovaversion": "Versiunea Cordova",
     "credits": "Credit",
-    "currentlanguage": "Limba curenta",
+    "currentlanguage": "Limba curentă",
     "deletesitefiles": "Sunteți sigur/ă ca doriți să ștergeți fișierele descărcate de pe siteul '{{sitename}}'?",
     "deletesitefilestitle": "Șterge fișierele de pe site",
-    "development": "Dezvoltare",
     "deviceinfo": "Informații despre dispozitiv",
     "deviceos": "Sistemul de operare al dispozitivului",
     "devicewebworkers": "Web Workers este suportat pe dispozitiv",
@@ -27,8 +25,8 @@
     "errorsyncsite": "A apărut o eroare la sincronizarea datelor de pe site, verificați conexiunea la internet și încercați din nou.",
     "estimatedfreespace": "Spațiu liber estimat",
     "filesystemroot": "Rădăcina sistemului de fișiere",
-    "general": "General",
-    "language": "Limbă",
+    "general": "Informaţii generale",
+    "language": "Limba",
     "license": "Licență",
     "localnotifavailable": "Notificările locale sunt disponibile",
     "locationhref": "URL",
@@ -39,10 +37,9 @@
     "networkstatus": "Starea conexiunii la Internet",
     "reportinbackground": "Erorile se raportează automat",
     "settings": "Setări",
-    "sites": "Siteuri",
+    "sites": "Site-uri",
     "spaceusage": "Spațiu utilizat",
     "storagetype": "Tipul stocării",
-    "success": "Succes!",
     "synchronization": "Sincronizare",
     "synchronizenow": "Sincronizați acum",
     "synchronizing": "Se sincronizeaza",
diff --git a/www/core/components/settings/lang/ru.json b/www/core/components/settings/lang/ru.json
index 5eb58abb46e..817c0204921 100644
--- a/www/core/components/settings/lang/ru.json
+++ b/www/core/components/settings/lang/ru.json
@@ -1,29 +1,26 @@
 {
     "about": "О приложении",
-    "appname": "Moodle Mobile {{version}}",
     "cacheexpirationtime": "Срок действия кэша (миллисекунд)",
     "credits": "Разработчики",
     "currentlanguage": "Выбранный язык",
     "deletesitefiles": "Вы уверены, что хотите удалить файлы, скачанные с сайта «{{sitename}}»?",
     "deletesitefilestitle": "Удалить файлы сайта",
-    "development": "Разработка",
     "disableall": "Временно отключить уведомления",
     "disabled": "Отключено",
     "enabledebugging": "Включить отладку",
     "errordeletesitefiles": "Ошибка при удалении файлов сайта",
     "errorsyncsite": "Ошибка синхронизации данных сайта. Проверьте интернет-соединение и повторите попытку.",
     "estimatedfreespace": "Ориентировочное свободное место",
-    "general": "Общее",
+    "general": "Основные данные",
     "language": "Язык",
-    "license": "Лицензия",
+    "license": "Лицензия:",
     "loggedin": "На сайте",
     "loggedoff": "Вне сайта",
     "settings": "Настройки",
     "sites": "Сайты",
     "spaceusage": "Используемое пространство",
-    "success": "Успешно!",
     "synchronization": "Синхронизация",
     "synchronizing": "Синхронизация",
     "syncsitesuccess": "Данные синхронизации сайта и все кэши недействительны.",
-    "total": "Всего"
+    "total": "Итого"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/sv.json b/www/core/components/settings/lang/sv.json
index 50ab6aae45a..ecc3e7b2c21 100644
--- a/www/core/components/settings/lang/sv.json
+++ b/www/core/components/settings/lang/sv.json
@@ -1,6 +1,5 @@
 {
     "about": "Om",
-    "appname": "Moodle Mobile {{version}}",
     "appready": "Appen är redo",
     "cacheexpirationtime": "Cache utgångs tid (millisekunder)",
     "cordovadevicemodel": "",
@@ -9,10 +8,9 @@
     "cordovadeviceuuid": "",
     "cordovaversion": "",
     "credits": "",
-    "currentlanguage": "Aktuellt språk",
+    "currentlanguage": "Nuvarande språk",
     "deletesitefiles": "Är du säker på att du vill ta bort de nedladdade filerna från den här webbplatsen?",
     "deletesitefilestitle": "Ta bort platsfiler",
-    "development": "Utveckling",
     "deviceinfo": "Info mobil enhet",
     "deviceos": "Mobil enhet operativsystem",
     "devicewebworkers": "Enheten stödjer Web Workers",
@@ -27,7 +25,7 @@
     "errorsyncsite": "Fel vid synkronisering. Kontrollera din Internetanslutning och försök igen",
     "estimatedfreespace": "Beräknad ledigt utrymme",
     "filesystemroot": "Filsystem root",
-    "general": "Generell",
+    "general": "Allmänna data",
     "language": "Språk",
     "license": "Licens",
     "localnotifavailable": "Lokala meddelanden tillgängliga",
@@ -39,16 +37,15 @@
     "networkstatus": "Status för Internetanslutning",
     "reportinbackground": "Rapportera fel per automatik",
     "settings": "Inställningar",
-    "sites": "Webbsidor",
+    "sites": "Webbplatser",
     "spaceusage": "Utrymmesanvändning",
     "storagetype": "Lagringstyp",
-    "success": "Framgång!",
     "synchronization": "Synkronisering",
     "synchronizenow": "Synkronisera nu",
     "synchronizing": "Synkronisera",
     "syncsettings": "Synkronisation inställningar",
     "syncsitesuccess": "Webbsidedata synkroniserades och alla cachar ogiltigförklarades",
-    "total": "Total",
+    "total": "Summa",
     "versioncode": "Version kod",
     "versionname": "Version namn",
     "wificonnection": "WiFi-anslutning"
diff --git a/www/core/components/settings/lang/tr.json b/www/core/components/settings/lang/tr.json
index 36d39aedfd9..88f41f68bad 100644
--- a/www/core/components/settings/lang/tr.json
+++ b/www/core/components/settings/lang/tr.json
@@ -1,16 +1,14 @@
 {
     "about": "Hakkında",
-    "appname": "Moodle Mobile {{version}}",
     "cacheexpirationtime": "Önbellek zaman aşımı (milisaniye)",
     "currentlanguage": "Geçerli dil",
     "deletesitefiles": "Bu siteden indirdiğiniz dosyaları silmek istediğinizden eminmisiniz?",
-    "development": "Gelişmiş ayarlar",
     "disableall": "Bildirimleri devre dışı bırak",
-    "disabled": "Devre dışı bırakıldı",
+    "disabled": "Etkin değil",
     "enabledebugging": "Hata ayıklamayı etkinleştir",
     "estimatedfreespace": "Tahmini boş alan",
-    "general": "Genel",
-    "language": "Lisan",
+    "general": "Genel veri",
+    "language": "Dil",
     "license": "Lisans",
     "loggedin": "Çevrimiçi",
     "loggedoff": "Çevrim içi değil",
diff --git a/www/core/components/settings/lang/zh-cn.json b/www/core/components/settings/lang/zh-cn.json
index 6ac933eaf19..791a7c769b0 100644
--- a/www/core/components/settings/lang/zh-cn.json
+++ b/www/core/components/settings/lang/zh-cn.json
@@ -3,19 +3,18 @@
     "cacheexpirationtime": "缓存过期时间（毫秒）",
     "currentlanguage": "当前语言",
     "deletesitefiles": "您确定要删除从本站下载的文件？",
-    "development": "开发",
     "disableall": "临时禁用通知",
-    "disabled": "禁用",
+    "disabled": "停用",
     "enabledebugging": "启用调试功能",
     "estimatedfreespace": "估计的可用空间",
-    "general": "常规",
+    "general": "通用数据",
     "language": "语言",
-    "license": "许可",
+    "license": "证书",
     "loggedin": "在线",
     "loggedoff": "离线",
     "settings": "设置",
     "sites": "网站",
     "spaceusage": "空间使用情况",
     "synchronization": "同步",
-    "total": "总共"
+    "total": "总分"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/zh-tw.json b/www/core/components/settings/lang/zh-tw.json
index 66e3782719f..a2e67603c02 100644
--- a/www/core/components/settings/lang/zh-tw.json
+++ b/www/core/components/settings/lang/zh-tw.json
@@ -1,6 +1,5 @@
 {
     "about": "關於",
-    "appname": "Moodle行動版{{version}}",
     "appready": "應用程式已就緒",
     "cacheexpirationtime": "快取到期時間(毫秒)",
     "cannotsyncoffline": "離線狀態無法進行同步",
@@ -15,7 +14,6 @@
     "currentlanguage": "選定語言",
     "deletesitefiles": "您確定想從這個網站位置刪除已下載的檔案?",
     "deletesitefilestitle": "刪除網站檔案",
-    "development": "開發",
     "deviceinfo": "裝置資訊",
     "deviceos": "裝置作業系統",
     "devicewebworkers": "裝置網路工作站已支援",
@@ -32,9 +30,9 @@
     "errorsyncsite": "同步網站資料時出錯, 請檢查您的網際網路連線, 然後重試.",
     "estimatedfreespace": "估計剩餘空間",
     "filesystemroot": "檔案系統根目錄",
-    "general": "一般",
+    "general": "一般資料",
     "language": "語言",
-    "license": "授權",
+    "license": "授權方式",
     "localnotifavailable": "提供本端通知",
     "locationhref": "Webview網址",
     "loggedin": "線上",
@@ -48,13 +46,12 @@
     "sites": "網站",
     "spaceusage": "使用空間",
     "storagetype": "儲存類型",
-    "success": "成功!",
     "synchronization": "同步",
     "synchronizenow": "立即同步",
     "synchronizing": "同步中",
     "syncsettings": "同步設定",
     "syncsitesuccess": "網站資料同步與快取都無效",
-    "total": "總計",
+    "total": "總分",
     "versioncode": "版本碼",
     "versionname": "版本名稱",
     "wificonnection": "WiFi連線"
diff --git a/www/core/components/sharedfiles/lang/ar.json b/www/core/components/sharedfiles/lang/ar.json
index 9f9e759ba0b..e56fb17f780 100644
--- a/www/core/components/sharedfiles/lang/ar.json
+++ b/www/core/components/sharedfiles/lang/ar.json
@@ -1,4 +1,4 @@
 {
-    "rename": "تغيير الاسم",
+    "rename": "إعادة تسمية",
     "replace": "استبدال"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/ca.json b/www/core/components/sharedfiles/lang/ca.json
index 56cb9344708..af0c921ccaf 100644
--- a/www/core/components/sharedfiles/lang/ca.json
+++ b/www/core/components/sharedfiles/lang/ca.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "No hi ha llocs desats. Afegiu un lloc per poder compartir fitxers amb l'aplicació.",
     "nosharedfiles": "No hi ha fitxers compartits desats en aquest lloc.",
     "nosharedfilestoupload": "No hi ha fitxers per pujar. Si voleu pujar un fitxer des d'un altra aplicació, busqueu-lo i feu clic al botó «Obre a».",
-    "rename": "Reanomena",
+    "rename": "Canvia el nom",
     "replace": "Reemplaça",
     "sharedfiles": "Fitxers compartits",
     "successstorefile": "S'ha desat el fitxer amb èxit. Podeu seleccionar-lo i pujar-lo als vostres fitxers privats o adjuntar-lo a alguna activitat."
diff --git a/www/core/components/sharedfiles/lang/cs.json b/www/core/components/sharedfiles/lang/cs.json
index 2cd35a9d0d4..9a19d1f00b1 100644
--- a/www/core/components/sharedfiles/lang/cs.json
+++ b/www/core/components/sharedfiles/lang/cs.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Na tomto webu nejsou uložené žádné sdílené soubory.",
     "nosharedfilestoupload": "Nemáte žádné nahrané soubory. Pokud chcete nahrát soubor z jiné aplikace, vyhledejte tento soubor a klikněte na tlačítko \"Otevřít v\".",
     "rename": "Přejmenovat",
-    "replace": "Nahradit",
+    "replace": "Přepsat",
     "sharedfiles": "Sdílené soubory",
     "successstorefile": "Soubor byl úspěšně uložen. Nyní můžete vybrat tento soubor a nahrát do vašich soukromých souborů nebo připojit ji do některých činností."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/de.json b/www/core/components/sharedfiles/lang/de.json
index f682d1fb09c..835afa40cf1 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Keine freigegebenen Dateien für diese Website",
     "nosharedfilestoupload": "Sie haben noch keine Dateien zum Hochladen freigegeben. Wenn Sie eine Datei aus einer anderen App hochladen möchten, suchen Sie diese Datei und tippen Sie auf die Taste 'Öffnen in'.",
     "rename": "Umbenennen",
-    "replace": "Ersetzen",
+    "replace": "Ersetze",
     "sharedfiles": "Freigegebene Dateien",
     "successstorefile": "Die Datei wurde gespeichert. Sie können die Datei verwenden, um Sie in 'Meine Dateien' hochzuladen oder bei Aktivitäten anzuhängen."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/es-mx.json b/www/core/components/sharedfiles/lang/es-mx.json
index d2732c41c62..6cd58565e88 100644
--- a/www/core/components/sharedfiles/lang/es-mx.json
+++ b/www/core/components/sharedfiles/lang/es-mx.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "No hay archivos compartidos en este sitio.",
     "nosharedfilestoupload": "Usted no tiene archivos para subir aquí. Si Usted desea subir un archivo desde otra App, localice ese archivo y haga click en el botón para 'Abrir en'.",
     "rename": "Renombrar",
-    "replace": "Remplazar",
+    "replace": "Reemplazar",
     "sharedfiles": "Archivos compartidos",
     "successstorefile": "Archivo almacenado exitosamente. Ahora Usted puede seleccionar a este archivo para subirlo a sus archivos privados, o anexarlo a algunas actividades."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/eu.json b/www/core/components/sharedfiles/lang/eu.json
index cbbcb5eef04..a56363d095e 100644
--- a/www/core/components/sharedfiles/lang/eu.json
+++ b/www/core/components/sharedfiles/lang/eu.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Ez dago artekatutako fitxategirik gune honetan.",
     "nosharedfilestoupload": "Ez duzu igotzeko fitxategirik hemen. Beste app baten bitartez fitxategia igo nahi baduzu, fitxategia aurkitu eta ondoren 'Ireki honekin' botoia sakatu.",
     "rename": "Berrizendatu",
-    "replace": "Ordeztu",
+    "replace": "Ordezkatu",
     "sharedfiles": "Partekatutako fitxategiak",
     "successstorefile": "Fitxategia ondo gorde da. Orain fitxategi hau aukeratu dezakezu zure gune pribatura igo edo jarduera bati eransteko."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/it.json b/www/core/components/sharedfiles/lang/it.json
index 875611dd996..81869805f8b 100644
--- a/www/core/components/sharedfiles/lang/it.json
+++ b/www/core/components/sharedfiles/lang/it.json
@@ -1,5 +1,5 @@
 {
-    "rename": "Rinomina",
+    "rename": "Cambia il nome",
     "replace": "Sostituisci",
     "sharedfiles": "File condivisi"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/lt.json b/www/core/components/sharedfiles/lang/lt.json
index ef379410c73..2e51ae1b0ed 100644
--- a/www/core/components/sharedfiles/lang/lt.json
+++ b/www/core/components/sharedfiles/lang/lt.json
@@ -4,8 +4,8 @@
     "errorreceivefilenosites": "Svetainės nėra saugomos. Prieš dalintis failu, pridėkite svetainės nuorodą.",
     "nosharedfiles": "Šioje svetainėje nepatalpinti bendro naudojimo failai.",
     "nosharedfilestoupload": "Nėra įkeltų failų. Jeigu norite juos įkelti iš kitos programėlės, pažymėkite ir paspauskite mygtuką „Atidaryti“.",
-    "rename": "Pervadinti",
-    "replace": "Pakeisti",
+    "rename": "Pervardyti",
+    "replace": "Keisti",
     "sharedfiles": "Bendro naudojimo failai",
     "successstorefile": "Failas sėkmingai patalpintas. Galite jį perkelti į savo asmeninį aplanką arba įkelti tam tikrosiose veiklose."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/pt.json b/www/core/components/sharedfiles/lang/pt.json
index 2c1daa00102..2200f805ed5 100644
--- a/www/core/components/sharedfiles/lang/pt.json
+++ b/www/core/components/sharedfiles/lang/pt.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "Não existem sites armazenados. Adicione um site antes de partilhar um ficheiro com a aplicação.",
     "nosharedfiles": "Não existem quaisquer ficheiros partilhados armazenados neste site.",
     "nosharedfilestoupload": "Não tem ficheiros para fazer o carregamento aqui. Se quiser carregar um ficheiro de outra aplicação, localize o ficheiro e clique no botão 'Abrir em'.",
-    "rename": "Mudar nome",
+    "rename": "Renomear",
     "replace": "Substituir",
     "sharedfiles": "Ficheiros partilhados",
     "successstorefile": "Ficheiro armazenado com sucesso. A partir de agora pode selecionar este ficheiro para enviá-lo para os seus ficheiros privados ou anexá-lo em algumas atividades."
diff --git a/www/core/components/sharedfiles/lang/sv.json b/www/core/components/sharedfiles/lang/sv.json
index 117af22281c..aa1e826c0b2 100644
--- a/www/core/components/sharedfiles/lang/sv.json
+++ b/www/core/components/sharedfiles/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "rename": "Döp om",
+    "rename": "Ändra namn",
     "replace": "Byt ut"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/tr.json b/www/core/components/sharedfiles/lang/tr.json
index 94ea98f2214..76c25af6f7c 100644
--- a/www/core/components/sharedfiles/lang/tr.json
+++ b/www/core/components/sharedfiles/lang/tr.json
@@ -1,5 +1,5 @@
 {
-    "rename": "Yeniden adlandır",
+    "rename": "Ad değiştir",
     "replace": "Değiştir",
     "sharedfiles": "Paylaşılan dosyalar"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/zh-tw.json b/www/core/components/sharedfiles/lang/zh-tw.json
index 9e1a070f78b..29220712327 100644
--- a/www/core/components/sharedfiles/lang/zh-tw.json
+++ b/www/core/components/sharedfiles/lang/zh-tw.json
@@ -4,8 +4,8 @@
     "errorreceivefilenosites": "沒有已存入的網站. 請在與應用程式共享文件之前新增網站.",
     "nosharedfiles": "此網站中沒有存入共享檔案.",
     "nosharedfilestoupload": "您沒有要在此處上傳的檔案. 如果您要從其他應用程式上傳檔案, 請找出該檔案, 然後按一下[開啟]按鈕.",
-    "rename": "重新命名",
-    "replace": "替代",
+    "rename": "改名",
+    "replace": "替換",
     "sharedfiles": "分享檔案",
     "successstorefile": "檔案已成功儲存.現在您可以選擇檔案進行上傳到您的個人檔案."
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ar.json b/www/core/components/sidemenu/lang/ar.json
index 79c72d2c731..79a0f6adb0d 100644
--- a/www/core/components/sidemenu/lang/ar.json
+++ b/www/core/components/sidemenu/lang/ar.json
@@ -2,7 +2,7 @@
     "appsettings": "إعدادات التطبيق",
     "changesite": "الخروج",
     "help": "مساعدة",
-    "logout": "الخروج",
-    "mycourses": "مقرراتي",
+    "logout": "خروج",
+    "mycourses": "مقرراتي الدراسية",
     "website": "الموقع"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ca.json b/www/core/components/sidemenu/lang/ca.json
index 321730fec1f..1f492266956 100644
--- a/www/core/components/sidemenu/lang/ca.json
+++ b/www/core/components/sidemenu/lang/ca.json
@@ -2,7 +2,7 @@
     "appsettings": "Paràmetres de l'aplicació",
     "changesite": "Canvia de lloc",
     "help": "Ajuda",
-    "logout": "Desconnecta",
+    "logout": "Tanca la sessió",
     "mycourses": "Els meus cursos",
     "togglemenu": "Canvia menú",
     "website": "Lloc web"
diff --git a/www/core/components/sidemenu/lang/cs.json b/www/core/components/sidemenu/lang/cs.json
index 7de80a2bb9b..68c7fe8de79 100644
--- a/www/core/components/sidemenu/lang/cs.json
+++ b/www/core/components/sidemenu/lang/cs.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "Nastavení aplikace",
     "changesite": "Změnit stránky",
-    "help": "Nápověda",
-    "logout": "Odhlásit",
+    "help": "Pomoc",
+    "logout": "Odhlásit se",
     "mycourses": "Moje kurzy",
     "togglemenu": "Přepnout nabídku",
     "website": "Webová stránka"
diff --git a/www/core/components/sidemenu/lang/es-mx.json b/www/core/components/sidemenu/lang/es-mx.json
index e2079172694..fb36a0997ba 100644
--- a/www/core/components/sidemenu/lang/es-mx.json
+++ b/www/core/components/sidemenu/lang/es-mx.json
@@ -2,7 +2,7 @@
     "appsettings": "Configuraciones del App",
     "changesite": "Cambiar sitio",
     "help": "Ayuda",
-    "logout": "Salir del sitio",
+    "logout": "Salir",
     "mycourses": "Mis cursos",
     "togglemenu": "Alternar menú",
     "website": "Página web"
diff --git a/www/core/components/sidemenu/lang/eu.json b/www/core/components/sidemenu/lang/eu.json
index d6c4be2b4ea..c5757719d6e 100644
--- a/www/core/components/sidemenu/lang/eu.json
+++ b/www/core/components/sidemenu/lang/eu.json
@@ -2,7 +2,7 @@
     "appsettings": "App-aren ezarpenak",
     "changesite": "Aldatu gunea",
     "help": "Laguntza",
-    "logout": "Irten",
+    "logout": "Saioa amaitu",
     "mycourses": "Nire ikastaroak",
     "togglemenu": "Aldatu menua",
     "website": "Webgunea"
diff --git a/www/core/components/sidemenu/lang/fa.json b/www/core/components/sidemenu/lang/fa.json
index 7d4184a0d64..34bdcc7018f 100644
--- a/www/core/components/sidemenu/lang/fa.json
+++ b/www/core/components/sidemenu/lang/fa.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "تنظیمات برنامه",
     "changesite": "خروج",
-    "help": "راهنما",
-    "logout": "خروج",
+    "help": "راهنمایی",
+    "logout": "خروج از سایت",
     "mycourses": "درس‌های من",
     "website": "پایگاه اینترنتی"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/he.json b/www/core/components/sidemenu/lang/he.json
index defec49d009..df2620a0194 100644
--- a/www/core/components/sidemenu/lang/he.json
+++ b/www/core/components/sidemenu/lang/he.json
@@ -2,7 +2,7 @@
     "appsettings": "הגדרות יישומון",
     "changesite": "התנתק",
     "help": "עזרה",
-    "logout": "התנתק",
+    "logout": "התנתקות",
     "mycourses": "הקורסים שלי",
     "togglemenu": "החלפת מצב תפריט",
     "website": "אתר אינטרנט"
diff --git a/www/core/components/sidemenu/lang/lt.json b/www/core/components/sidemenu/lang/lt.json
index 0f0cb015df4..c48f439f478 100644
--- a/www/core/components/sidemenu/lang/lt.json
+++ b/www/core/components/sidemenu/lang/lt.json
@@ -2,8 +2,8 @@
     "appsettings": "Programėlės nustatymai",
     "changesite": "Pakeisti svetainę",
     "help": "Pagalba",
-    "logout": "Pakeisti svetainę",
-    "mycourses": "Mano mokymo programos",
+    "logout": "Atsijungti",
+    "mycourses": "Mano kursai",
     "togglemenu": "Perjungti",
     "website": "Interneto svetainė"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/nl.json b/www/core/components/sidemenu/lang/nl.json
index d06e70ec6d8..7caa7f9041a 100644
--- a/www/core/components/sidemenu/lang/nl.json
+++ b/www/core/components/sidemenu/lang/nl.json
@@ -2,7 +2,7 @@
     "appsettings": "App instellingen",
     "changesite": "Naar andere site",
     "help": "Help",
-    "logout": "Afmelden",
+    "logout": "Uitloggen",
     "mycourses": "Mijn cursussen",
     "togglemenu": "Menu schakelen",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/pl.json b/www/core/components/sidemenu/lang/pl.json
index db5b40a15cd..dc57d0910b1 100644
--- a/www/core/components/sidemenu/lang/pl.json
+++ b/www/core/components/sidemenu/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "changesite": "Wyloguj",
     "help": "Pomoc",
-    "logout": "Wyloguj",
+    "logout": "Wyloguj się",
     "mycourses": "Moje kursy",
     "website": "Witryna"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ro.json b/www/core/components/sidemenu/lang/ro.json
index ea5d1d106e0..da61b14058d 100644
--- a/www/core/components/sidemenu/lang/ro.json
+++ b/www/core/components/sidemenu/lang/ro.json
@@ -2,7 +2,7 @@
     "appsettings": "Setările aplicației",
     "changesite": "Schimbați siteul",
     "help": "Ajutor",
-    "logout": "Schimbați siteul",
+    "logout": "Ieșire",
     "mycourses": "Cursurile mele",
     "togglemenu": "Meniul pentru comutare",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/zh-cn.json b/www/core/components/sidemenu/lang/zh-cn.json
index ea6cd6e91e1..ce1e1892a81 100644
--- a/www/core/components/sidemenu/lang/zh-cn.json
+++ b/www/core/components/sidemenu/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "changesite": "注销",
     "help": "帮助",
-    "logout": "注销",
+    "logout": "登出",
     "mycourses": "我的课程",
     "website": "网站"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/zh-tw.json b/www/core/components/sidemenu/lang/zh-tw.json
index 412f2616441..ae2600bd818 100644
--- a/www/core/components/sidemenu/lang/zh-tw.json
+++ b/www/core/components/sidemenu/lang/zh-tw.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "應用程式設定",
     "changesite": "更換網站",
-    "help": "協助",
-    "logout": "更換網站",
+    "help": "幫助",
+    "logout": "登出",
     "mycourses": "我的課程",
     "togglemenu": "切換功能選單",
     "website": "網站"
diff --git a/www/core/components/user/lang/ar.json b/www/core/components/user/lang/ar.json
index 4c5085eba06..de04c688c6f 100644
--- a/www/core/components/user/lang/ar.json
+++ b/www/core/components/user/lang/ar.json
@@ -1,12 +1,12 @@
 {
     "address": "العنوان",
-    "city": "المدنية",
+    "city": "المدينة/البلدة",
     "contact": "جهة اتصال",
     "country": "الدولة",
-    "description": "الوصف",
-    "details": "التفاصيل",
+    "description": "وصف",
+    "details": "تفاصيل متابعة اسكو",
     "editingteacher": "معلم",
-    "email": "البريد الإلكتروني",
+    "email": "بريد الإلكتروني",
     "emailagain": "إعادة إدخال البريد الإلكتروني للتأكيد ",
     "firstname": "الاسم الأول",
     "interests": "اهتمامات",
@@ -14,9 +14,9 @@
     "lastname": "الاسم الأخير",
     "manager": "مدير",
     "newpicture": "صورة شخصية جديدة",
-    "phone1": "الهاتف",
-    "phone2": "الجوال",
-    "roles": "أدورا",
+    "phone1": "هاتف",
+    "phone2": "رقم الهاتف المحمول",
+    "roles": "أدوار",
     "student": "طالب",
     "viewprofile": "عرض الحساب",
     "webpage": "صفحة إنترنت"
diff --git a/www/core/components/user/lang/bg.json b/www/core/components/user/lang/bg.json
index 3c6b5751c31..022f6afb2b1 100644
--- a/www/core/components/user/lang/bg.json
+++ b/www/core/components/user/lang/bg.json
@@ -1,8 +1,8 @@
 {
     "address": "Адрес",
-    "city": "Град",
-    "contact": "Контакти",
-    "country": "Страна",
+    "city": "Град/село",
+    "contact": "Контакт",
+    "country": "Държава",
     "description": "Описание",
     "details": "Подробности",
     "detailsnotavailable": "Детайлите за този потребител не са достъпни за Вас.",
@@ -11,12 +11,12 @@
     "emailagain": "Имейл адрес (отново)",
     "firstname": "Име",
     "interests": "Интереси",
-    "invaliduser": "Невалиден потребител.",
+    "invaliduser": "Невалиден потребител",
     "lastname": "Фамилия",
     "manager": "Мениждър",
     "newpicture": "Нова снимка",
     "phone1": "Телефон",
-    "phone2": "Мобилен",
+    "phone2": "Мобилен телефон",
     "roles": "Роли",
     "student": "Студент",
     "teacher": "Не-редактиращ учител",
diff --git a/www/core/components/user/lang/ca.json b/www/core/components/user/lang/ca.json
index 0324f526bea..a556ba985d1 100644
--- a/www/core/components/user/lang/ca.json
+++ b/www/core/components/user/lang/ca.json
@@ -1,10 +1,10 @@
 {
     "address": "Adreça",
-    "city": "Ciutat",
+    "city": "Població",
     "contact": "Contacte",
     "country": "País",
     "description": "Descripció",
-    "details": "Detalls",
+    "details": "Detalls de seguiment",
     "detailsnotavailable": "No tens accés als detalls d'aquest usuari.",
     "editingteacher": "Professor",
     "email": "Correu electrònic",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Nova imatge",
     "phone1": "Telèfon",
-    "phone2": "Mòbil",
+    "phone2": "Telèfon mòbil",
     "roles": "Rols",
     "sendemail": "Correu-e",
     "student": "Estudiant",
diff --git a/www/core/components/user/lang/cs.json b/www/core/components/user/lang/cs.json
index 30062f8104c..5533c565060 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -1,26 +1,26 @@
 {
     "address": "Adresa",
-    "city": "Město",
+    "city": "Město/obec",
     "contact": "Kontakt",
     "country": "Země",
     "description": "Popis",
-    "details": "Detaily",
+    "details": "Podrobnosti o průchodu",
     "detailsnotavailable": "Podrobnosti o tomto uživateli nejsou k dispozici.",
     "editingteacher": "Učitel",
-    "email": "E-mail",
+    "email": "Poslat e-mailem",
     "emailagain": "E-mail (znovu)",
     "firstname": "Křestní jméno",
     "interests": "Zájmy",
-    "invaliduser": "Neplatný uživatel.",
+    "invaliduser": "Neplatný uživatel",
     "lastname": "Příjmení",
     "manager": "Manažer",
     "newpicture": "Nový obrázek",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobilní telefon",
     "roles": "Role",
     "sendemail": "Email",
     "student": "Student",
     "teacher": "Učitel bez práva upravovat",
     "viewprofile": "Zobrazit profil",
-    "webpage": "Webové stránky"
+    "webpage": "Webová stránka"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/da.json b/www/core/components/user/lang/da.json
index 9cd2b112ee5..d93cd682bd8 100644
--- a/www/core/components/user/lang/da.json
+++ b/www/core/components/user/lang/da.json
@@ -4,14 +4,14 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beskrivelse",
-    "details": "Detaljer",
+    "details": "Følg detaljer",
     "detailsnotavailable": "Denne brugers data er ikke tilgængelige for dig.",
     "editingteacher": "Lærer",
-    "email": "Email",
+    "email": "E-mail",
     "emailagain": "E-mail (igen)",
     "firstname": "Fornavn",
     "interests": "Interesser",
-    "invaliduser": "Ugyldig bruger.",
+    "invaliduser": "Ugyldig bruger",
     "lastname": "Efternavn",
     "manager": "Manager",
     "newpicture": "Nyt billede",
diff --git a/www/core/components/user/lang/de.json b/www/core/components/user/lang/de.json
index d7a29452fef..9d95a7c6312 100644
--- a/www/core/components/user/lang/de.json
+++ b/www/core/components/user/lang/de.json
@@ -1,26 +1,26 @@
 {
     "address": "Adresse",
-    "city": "Stadt",
+    "city": "Stadt/Ort",
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beschreibung",
-    "details": "Details",
+    "details": "Trackingdetails",
     "detailsnotavailable": "Die Nutzerdetails zu dieser Person sind für Sie nicht verfügbar.",
     "editingteacher": "Trainer/in",
     "email": "E-Mail",
     "emailagain": "E-Mail (wiederholen)",
     "firstname": "Vorname",
-    "interests": "Interessen",
-    "invaliduser": "Nutzer/in ungültig",
+    "interests": "Persönliche Interessen",
+    "invaliduser": "Ungültige Nutzer/in",
     "lastname": "Nachname",
     "manager": "Manager/in",
     "newpicture": "Neues Foto",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobiltelefon",
     "roles": "Rollen",
     "sendemail": "E-Mail",
     "student": "Teilnehmer/in",
     "teacher": "Trainer/in ohne Bearbeitungsrecht",
     "viewprofile": "Profil anzeigen",
-    "webpage": "Website"
+    "webpage": "Webseite"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/el.json b/www/core/components/user/lang/el.json
index aa3e3d7b91d..db5d645b8d7 100644
--- a/www/core/components/user/lang/el.json
+++ b/www/core/components/user/lang/el.json
@@ -4,8 +4,8 @@
     "country": "Χώρα",
     "description": "Περιγραφή",
     "details": "Παρακολούθηση λεπτομερειών",
-    "email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-    "emailagain": "Αποστολή ηλεκτρονικού ταχυδρομείου (ξανά)",
+    "email": "Ηλεκτρονικό Ταχυδρομείο",
+    "emailagain": "Email (ξανά)",
     "firstname": "Όνομα",
     "interests": "Ενδιαφέροντα",
     "invaliduser": "Μη έγκυρος χρήστης",
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index ed5ff39741a..dabd4a46d5b 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -4,23 +4,23 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descripción",
-    "details": "Detalles",
+    "details": "Detalles del seguimiento",
     "detailsnotavailable": "Los detalles de este usuario no están disponibles para Usted.",
     "editingteacher": "Profesor",
     "email": "Email",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
-    "invaliduser": "Usuario inválido.",
+    "invaliduser": "Usuario no válido",
     "lastname": "Apellido(s)",
     "manager": "Mánager",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Móvil",
+    "phone2": "Teléfono móvil",
     "roles": "Roles",
     "sendemail": "Email",
     "student": "Estudiante",
     "teacher": "Profesor sin derechos de edición",
     "viewprofile": "Ver perfil",
-    "webpage": "Página Web"
+    "webpage": "Página web"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/es.json b/www/core/components/user/lang/es.json
index 4255815ce54..74417c8296b 100644
--- a/www/core/components/user/lang/es.json
+++ b/www/core/components/user/lang/es.json
@@ -4,7 +4,7 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descripción",
-    "details": "Detalles",
+    "details": "Detalles del rastreo SCO",
     "detailsnotavailable": "No tiene acceso a los detalles de este usuario.",
     "editingteacher": "Profesor",
     "email": "Email",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Móvil",
+    "phone2": "Teléfono móvil",
     "roles": "Roles",
     "student": "Estudiante",
     "teacher": "Profesor sin permiso de edición",
diff --git a/www/core/components/user/lang/eu.json b/www/core/components/user/lang/eu.json
index e1d3ce5d4b8..035cbdedc80 100644
--- a/www/core/components/user/lang/eu.json
+++ b/www/core/components/user/lang/eu.json
@@ -1,26 +1,26 @@
 {
     "address": "Helbidea",
-    "city": "Hiria",
+    "city": "Hiria/Herria",
     "contact": "Kontaktua",
-    "country": "Herrialdea",
+    "country": "Herria",
     "description": "Deskribapena",
-    "details": "Xehetasunak",
+    "details": "Pistaren zehaztasunak",
     "detailsnotavailable": "Erabiltzaile honen xehetasunak ez daude zuretzat eskuragarri",
     "editingteacher": "Irakaslea",
     "email": "E-posta",
     "emailagain": "E-posta (berriro)",
     "firstname": "Izena",
-    "interests": "Interesak",
-    "invaliduser": "Erabiltzailea ez da zuzena.",
+    "interests": "Interesguneak",
+    "invaliduser": "Erabiltzaile baliogabea",
     "lastname": "Deitura",
     "manager": "Kudeatzailea",
     "newpicture": "Irudi berria",
     "phone1": "Telefonoa",
-    "phone2": "Sakelekoa",
+    "phone2": "Telefono mugikorra",
     "roles": "Rolak",
     "sendemail": "E-posta",
     "student": "Ikaslea",
     "teacher": "Edizio-baimenik gabeko irakaslea",
-    "viewprofile": "Ikusi profila",
-    "webpage": "Web orria"
+    "viewprofile": "Profila ikusi",
+    "webpage": "Web-orria"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/fa.json b/www/core/components/user/lang/fa.json
index cd0d533d277..9980ecf4e7f 100644
--- a/www/core/components/user/lang/fa.json
+++ b/www/core/components/user/lang/fa.json
@@ -1,11 +1,11 @@
 {
     "address": "آدرس",
-    "city": "شهر",
-    "contact": "مخاطب",
+    "city": "شهر/شهرک",
+    "contact": "تماس",
     "country": "کشور",
-    "description": "توضیحات",
-    "details": "جزئیات",
-    "email": "ایمیل",
+    "description": "توصیف",
+    "details": "دنبال کردن جزئیات",
+    "email": "پست الکترونیک",
     "emailagain": "پست الکترونیک (دوباره)",
     "firstname": "نام",
     "interests": "علایق",
@@ -13,7 +13,7 @@
     "lastname": "نام خانوادگی",
     "newpicture": "عکس جدید",
     "phone1": "تلفن",
-    "phone2": "همراه",
+    "phone2": "تلفن همراه",
     "roles": "نقش‌ها",
     "student": "شاگرد",
     "viewprofile": "مشاهدهٔ صفحهٔ مشخصات فردی",
diff --git a/www/core/components/user/lang/fr.json b/www/core/components/user/lang/fr.json
index 31a576caae9..06e5d47b78d 100644
--- a/www/core/components/user/lang/fr.json
+++ b/www/core/components/user/lang/fr.json
@@ -4,23 +4,23 @@
     "contact": "Contact",
     "country": "Pays",
     "description": "Description",
-    "details": "Détails",
+    "details": "Détails du parcours",
     "detailsnotavailable": "Vous n'avez pas accès aux informations de cet utilisateur.",
     "editingteacher": "Enseignant",
     "email": "Courriel",
     "emailagain": "Courriel (confirmation)",
     "firstname": "Prénom",
-    "interests": "Intérêts",
-    "invaliduser": "Utilisateur non valide.",
+    "interests": "Centres d'intérêt",
+    "invaliduser": "Utilisateur non valide",
     "lastname": "Nom",
     "manager": "Gestionnaire",
     "newpicture": "Nouvelle image",
-    "phone1": "Tél.",
-    "phone2": "Mobile",
+    "phone1": "Téléphone",
+    "phone2": "Téléphone mobile",
     "roles": "Rôles",
     "sendemail": "Courriel",
-    "student": "Étudiant",
+    "student": "Participants",
     "teacher": "Enseignant non-éditeur",
     "viewprofile": "Consulter le profil",
-    "webpage": "Page web"
+    "webpage": "Page Web"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/he.json b/www/core/components/user/lang/he.json
index d028c08cdfc..41bc9822a7b 100644
--- a/www/core/components/user/lang/he.json
+++ b/www/core/components/user/lang/he.json
@@ -1,25 +1,25 @@
 {
     "address": "כתובת",
-    "city": "עיר",
-    "contact": "צור קשר",
+    "city": "ישוב",
+    "contact": "ליצירת קשר",
     "country": "ארץ",
-    "description": "תיאור",
-    "details": "פרטים",
+    "description": "תאור",
+    "details": "דוח המעקב מפורט",
     "detailsnotavailable": "פרטי משתמש זה אינם זמינים לך.",
     "editingteacher": "מרצה",
-    "email": "דואר אלקטרוני",
+    "email": "דוא\"ל",
     "emailagain": "דואר אלקטרוני (שוב)",
     "firstname": "שם פרטי",
     "interests": "תחומי עניין",
-    "invaliduser": "משתמש לא תקף.",
+    "invaliduser": "משתמש שגוי",
     "lastname": "שם משפחה",
     "manager": "מנהל",
     "newpicture": "תמונה חדשה",
     "phone1": "טלפון",
-    "phone2": "סלולרי",
+    "phone2": "טלפון נייד",
     "roles": "תפקידים",
     "student": "סטודנט",
     "teacher": "עוזר/ת הוראה",
     "viewprofile": "תצוגת מאפיינים",
-    "webpage": "עמוד אינטרנט"
+    "webpage": "דף בית באינטרנט"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/hu.json b/www/core/components/user/lang/hu.json
index 4140999b572..ea3235ea2d0 100644
--- a/www/core/components/user/lang/hu.json
+++ b/www/core/components/user/lang/hu.json
@@ -1,10 +1,10 @@
 {
     "address": "Cím",
-    "city": "Város",
+    "city": "Helység",
     "contact": "Kapcsolat",
     "country": "Ország",
     "description": "Leírás",
-    "details": "Részletek",
+    "details": "SCO nyomon követésének részletei",
     "email": "E-mail",
     "emailagain": "E-mail (ismét)",
     "firstname": "Keresztnév",
@@ -14,7 +14,7 @@
     "manager": "Igazgató",
     "newpicture": "Új kép",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobiltelefon",
     "roles": "Szerepek",
     "student": "Tanuló",
     "viewprofile": "Profil megtekintése",
diff --git a/www/core/components/user/lang/it.json b/www/core/components/user/lang/it.json
index 64c06498fe8..9aa43cad4d0 100644
--- a/www/core/components/user/lang/it.json
+++ b/www/core/components/user/lang/it.json
@@ -1,25 +1,25 @@
 {
     "address": "Indirizzo",
-    "city": "Città",
+    "city": "Città /Località",
     "contact": "Contatto",
-    "country": "Stato",
+    "country": "Nazione",
     "description": "Descrizione",
-    "details": "Dettagli",
+    "details": "Dettagli tracciamento",
     "detailsnotavailable": "Non puoi visualizzare i dettagli di questo utente.",
     "editingteacher": "Docente",
     "email": "Email",
     "emailagain": "Indirizzo email (ripeti)",
     "firstname": "Nome",
     "interests": "Interessi",
-    "invaliduser": "Utente non valido.",
+    "invaliduser": "Utente non valido",
     "lastname": "Cognome",
     "manager": "Manager",
     "newpicture": "Nuova immagine",
     "phone1": "Telefono",
-    "phone2": "Mobile",
+    "phone2": "Cellulare",
     "roles": "Ruoli",
     "student": "Studente",
     "teacher": "Docente non editor",
-    "viewprofile": "Visualizza profilo",
+    "viewprofile": "Visualizza",
     "webpage": "Pagina web"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/ja.json b/www/core/components/user/lang/ja.json
index 4ff9174b263..a07f54c15b6 100644
--- a/www/core/components/user/lang/ja.json
+++ b/www/core/components/user/lang/ja.json
@@ -1,14 +1,14 @@
 {
-    "address": "アドレス",
-    "city": "市町村",
-    "contact": "コンタクト",
+    "address": "住所",
+    "city": "都道府県",
+    "contact": "連絡先",
     "country": "国",
     "description": "説明",
-    "details": "詳細",
-    "email": "Email",
+    "details": "トラック詳細",
+    "email": "メール",
     "emailagain": "メールアドレス (もう一度)",
     "firstname": "名",
-    "interests": "興味があること",
+    "interests": "興味のあること",
     "invaliduser": "無効なユーザです。",
     "lastname": "姓",
     "manager": "マネージャ",
diff --git a/www/core/components/user/lang/lt.json b/www/core/components/user/lang/lt.json
index 794c12956b1..2728c689594 100644
--- a/www/core/components/user/lang/lt.json
+++ b/www/core/components/user/lang/lt.json
@@ -1,22 +1,22 @@
 {
     "address": "Adresas",
     "city": "Miestas / miestelis",
-    "contact": "Kontaktai",
+    "contact": "Kontaktas",
     "country": "Šalis",
-    "description": "Aprašas",
-    "details": "Detalės",
+    "description": "Aprašymas",
+    "details": "Sekimo išsami informacija",
     "detailsnotavailable": "Šio vartotojo duomenys jums nepasiekiami.",
     "editingteacher": "Dėstytojas",
-    "email": "El. pašto adresas",
+    "email": "El. laiškas",
     "emailagain": "El. paštas (dar kartą)",
     "firstname": "Vardas",
     "interests": "Pomėgiai",
-    "invaliduser": "Netinkamas vartotojas.",
+    "invaliduser": "Klaidingas naudotojas",
     "lastname": "Pavardė",
     "manager": "Valdytojas",
     "newpicture": "Naujas paveikslėlis",
     "phone1": "Telefonas",
-    "phone2": "Mobilus",
+    "phone2": "Mobilusis telefonas",
     "roles": "Vaidmenys",
     "student": "Besimokantysis",
     "teacher": "Neredaguojantis mokytojas",
diff --git a/www/core/components/user/lang/nl.json b/www/core/components/user/lang/nl.json
index 5fa389b05fd..040c2592de8 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -1,17 +1,17 @@
 {
     "address": "Adres",
-    "city": "Stad",
+    "city": "Plaats",
     "contact": "Contact",
     "country": "Land",
     "description": "Beschrijving",
-    "details": "Details",
+    "details": "SCO opvolgdetails",
     "detailsnotavailable": "Je kunt de details voor deze gebruiker niet bekijken.",
     "editingteacher": "Leraar",
     "email": "E-mail",
     "emailagain": "E-mail (nogmaals)",
     "firstname": "Voornaam",
     "interests": "Interesses",
-    "invaliduser": "Ongeldige gebuiker",
+    "invaliduser": "Ongeldige gebruiker",
     "lastname": "Achternaam",
     "manager": "Manager",
     "newpicture": "Nieuwe foto",
@@ -22,5 +22,5 @@
     "student": "Leerling",
     "teacher": "Leraar zonder bewerken",
     "viewprofile": "Bekijk profiel",
-    "webpage": "Webpagina"
+    "webpage": "Website"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/pl.json b/www/core/components/user/lang/pl.json
index 2bb0548b29c..e81808a5344 100644
--- a/www/core/components/user/lang/pl.json
+++ b/www/core/components/user/lang/pl.json
@@ -1,11 +1,11 @@
 {
     "address": "Adres",
     "city": "Miasto",
-    "contact": "Kontakt",
+    "contact": "Połącz",
     "country": "Kraj",
     "description": "Opis",
-    "details": "Szczegóły",
-    "email": "Email",
+    "details": "Szczegóły ścieżki",
+    "email": "e-mail",
     "emailagain": "E-mail (jeszcze raz)",
     "firstname": "Imię",
     "interests": "Zainteresowania",
@@ -14,7 +14,7 @@
     "manager": "Menedżer",
     "newpicture": "Nowy obraz",
     "phone1": "Telefon",
-    "phone2": "Telefon komórkowy",
+    "phone2": "Tel. komórkowy",
     "roles": "Role",
     "student": "Student",
     "viewprofile": "Zobacz profil",
diff --git a/www/core/components/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index a9530813c54..e212093a063 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -1,26 +1,26 @@
 {
     "address": "Endereço",
-    "city": "Cidade",
+    "city": "Cidade/Município",
     "contact": "Contato",
     "country": "País",
     "description": "Descrição",
-    "details": "Detalhes",
+    "details": "Detalhes do registro",
     "detailsnotavailable": "Os detalhes desse usuário não estão disponíveis para você.",
     "editingteacher": "Professor",
     "email": "Email",
     "emailagain": "Confirmar endereço de e-mail",
     "firstname": "Nome",
-    "interests": "interesses",
-    "invaliduser": "Usuário inválido.",
+    "interests": "Interesses",
+    "invaliduser": "Usuário inválido",
     "lastname": "Sobrenome",
     "manager": "Gerente",
     "newpicture": "Nova imagem",
-    "phone1": "Telefone",
-    "phone2": "Celular",
+    "phone1": "Fone",
+    "phone2": "Telefone celular",
     "roles": "Papéis",
     "sendemail": "Email",
     "student": "Estudante",
     "teacher": "Professor não-editor",
     "viewprofile": "Ver perfil",
-    "webpage": "Página da internet"
+    "webpage": "Página web"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/pt.json b/www/core/components/user/lang/pt.json
index dee09115b30..7b0f3e6910f 100644
--- a/www/core/components/user/lang/pt.json
+++ b/www/core/components/user/lang/pt.json
@@ -1,13 +1,13 @@
 {
-    "address": "Endereço",
-    "city": "Cidade",
+    "address": "Morada",
+    "city": "Cidade/Estado",
     "contact": "Contacto",
     "country": "País",
     "description": "Descrição",
-    "details": "Detalhes",
+    "details": "Detalhe do percurso",
     "detailsnotavailable": "Não tem acesso aos detalhes deste utilizador.",
     "editingteacher": "Professor",
-    "email": "Email",
+    "email": "E-mail",
     "emailagain": "E-mail (novamente)",
     "firstname": "Nome",
     "interests": "Interesses",
@@ -17,10 +17,10 @@
     "newpicture": "Nova imagem",
     "phone1": "Telefone",
     "phone2": "Telemóvel",
-    "roles": "Papéis",
+    "roles": "Papéis atribuídos",
     "sendemail": "E-mail",
     "student": "Aluno",
     "teacher": "Professor não editor",
     "viewprofile": "Ver perfil",
-    "webpage": "Página da internet"
+    "webpage": "Página Web"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/ro.json b/www/core/components/user/lang/ro.json
index 2e832d0720e..b6929b4f310 100644
--- a/www/core/components/user/lang/ro.json
+++ b/www/core/components/user/lang/ro.json
@@ -1,25 +1,25 @@
 {
-    "address": "Adresa",
-    "city": "Oraș",
+    "address": "Adresă",
+    "city": "Oraş/localitate",
     "contact": "Contact",
-    "country": "Țara",
+    "country": "Ţara",
     "description": "Descriere",
-    "details": "Detalii",
+    "details": "Detalii înregistrare activitate",
     "detailsnotavailable": "Detaliile acestui utilizator nu vă sunt disponibile.",
     "editingteacher": "Profesor",
     "email": "Email",
     "emailagain": "Email (reintroduceţi)",
     "firstname": "Prenume",
     "interests": "Interese",
-    "invaliduser": "Utilizator necunoscut.",
+    "invaliduser": "Utilizator incorect",
     "lastname": "Nume",
     "manager": "Manager",
     "newpicture": "Imagine nouă",
     "phone1": "Telefon",
     "phone2": "Mobil",
     "roles": "Roluri",
-    "student": "Student",
+    "student": "Cursant",
     "teacher": "Profesor asistent",
     "viewprofile": "Vezi profilul",
-    "webpage": "Pagina Web"
+    "webpage": "Pagină Web"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/ru.json b/www/core/components/user/lang/ru.json
index 5ef576632aa..eec8fc8030f 100644
--- a/www/core/components/user/lang/ru.json
+++ b/www/core/components/user/lang/ru.json
@@ -4,19 +4,19 @@
     "contact": "Контакты",
     "country": "Страна",
     "description": "Описание",
-    "details": "Подробнее",
+    "details": "Подробный отчет",
     "detailsnotavailable": "Вам не доступны подробности этого пользователя",
     "editingteacher": "Учитель",
-    "email": "Эл.почта",
+    "email": "Email",
     "emailagain": "Адрес электронной почты (еще раз)",
     "firstname": "Имя",
     "interests": "Интересы",
-    "invaliduser": "Неправильный пользователь",
+    "invaliduser": "Некорректный пользователь",
     "lastname": "Фамилия",
     "manager": "Управляющий",
     "newpicture": "Новое изображение",
     "phone1": "Телефон",
-    "phone2": "Мобильный",
+    "phone2": "Мобильный телефон",
     "roles": "Роли",
     "student": "Студент",
     "teacher": "Учитель без права редактирования (ассистент)",
diff --git a/www/core/components/user/lang/sv.json b/www/core/components/user/lang/sv.json
index 2106aa65943..94ca7299b23 100644
--- a/www/core/components/user/lang/sv.json
+++ b/www/core/components/user/lang/sv.json
@@ -1,24 +1,24 @@
 {
     "address": "Adress",
-    "city": "Stad",
+    "city": "Stad/ort",
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beskrivning",
-    "details": "Detaljer",
+    "details": "Detaljerad SCO spårning",
     "detailsnotavailable": "Detaljerna till denna användare är inte tillgängliga för dig.",
     "editingteacher": "Lärare",
-    "email": "Skicka",
+    "email": "E-post",
     "emailagain": "E-post (igen)",
     "firstname": "Förnamn",
     "interests": "Intressen",
-    "invaliduser": "Ogiltig användare.",
+    "invaliduser": "Ogiltig användare",
     "lastname": "Efternamn",
     "manager": "Manager",
     "newpicture": "Ny bild",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobiltelefon",
     "roles": "Roller",
-    "student": "Student",
+    "student": "Student/elev/deltagare/lärande",
     "teacher": "Icke editerande lärare",
     "viewprofile": "Visa profil",
     "webpage": "Webbsida"
diff --git a/www/core/components/user/lang/tr.json b/www/core/components/user/lang/tr.json
index d166cf750d6..0415b166cdc 100644
--- a/www/core/components/user/lang/tr.json
+++ b/www/core/components/user/lang/tr.json
@@ -1,24 +1,24 @@
 {
     "address": "Adres",
     "city": "Şehir",
-    "contact": "Kişi",
+    "contact": "İletişim",
     "country": "Ülke",
     "description": "Açıklama",
-    "details": "Detaylar",
+    "details": "İzleme ayrıntıları",
     "editingteacher": "Öğretmen",
-    "email": "E-posta gönder",
+    "email": "E-posta",
     "emailagain": "E-posta (tekrar)",
-    "firstname": "Ad",
+    "firstname": "Adı",
     "interests": "İlgi alanları",
-    "invaliduser": "Geçersiz kullanıcı.",
-    "lastname": "Soyad",
+    "invaliduser": "Geçersiz kullanıcı",
+    "lastname": "Soyadı",
     "manager": "Yönetici",
     "newpicture": "Yeni resim",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Cep telefonu",
     "roles": "Roller",
     "student": "Öğrenci",
     "teacher": "Düzenleme yetkisi olmayan öğretmen",
-    "viewprofile": "Profile bak",
+    "viewprofile": "Profili görüntüle",
     "webpage": "Web sayfası"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/zh-cn.json b/www/core/components/user/lang/zh-cn.json
index 6c90be26989..f1e99807e98 100644
--- a/www/core/components/user/lang/zh-cn.json
+++ b/www/core/components/user/lang/zh-cn.json
@@ -1,10 +1,10 @@
 {
     "address": "地址",
-    "city": "城市",
-    "contact": "联系方式",
-    "country": "国家",
+    "city": "市/县",
+    "contact": "联系",
+    "country": "国家和地区",
     "description": "描述",
-    "details": "详情",
+    "details": "查看详情",
     "email": "Email",
     "emailagain": "Email (重复)",
     "firstname": "名",
diff --git a/www/core/components/user/lang/zh-tw.json b/www/core/components/user/lang/zh-tw.json
index 754c957069b..bb119de2d5b 100644
--- a/www/core/components/user/lang/zh-tw.json
+++ b/www/core/components/user/lang/zh-tw.json
@@ -1,22 +1,22 @@
 {
-    "address": "住址",
-    "city": "城市",
-    "contact": "連絡人",
+    "address": "地址",
+    "city": "縣/市",
+    "contact": "聯絡",
     "country": "國家",
-    "description": "描述",
-    "details": "明細",
+    "description": "說明",
+    "details": "SCO 追蹤細節",
     "detailsnotavailable": "這個使用者的詳細資料無法提供給您",
     "editingteacher": "教師",
     "email": "電子郵件",
     "emailagain": "電子郵件(再次確認)",
     "firstname": "名字",
     "interests": "興趣",
-    "invaliduser": "無效的使用者",
+    "invaliduser": "無效的用戶",
     "lastname": "姓氏",
     "manager": "管理者",
     "newpicture": "新照片",
     "phone1": "電話",
-    "phone2": "行動",
+    "phone2": "手機",
     "roles": "角色",
     "student": "學生",
     "teacher": "非編輯中的教師",
diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index 2f831bf7266..6930c3aed5e 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -1,10 +1,10 @@
 {
     "allparticipants": "كل المشاركين",
     "areyousure": "هل انت متأكد؟",
-    "back": "رجوع",
-    "cancel": "إلغاء",
+    "back": "العودة لمعاينة السؤال",
+    "cancel": "ألغي",
     "cannotconnect": "لا يمكن الاتصال: تحقق من أنك كتبت عنوان URL بشكل صحيح وأنك تستخدم موقع موودل 2.4 أو أحدث.",
-    "category": "التصنيف",
+    "category": "فئة",
     "choose": "اختر",
     "choosedots": "اختر...",
     "clicktohideshow": "انقر للطي أو التوسيع",
@@ -27,12 +27,12 @@
     "decsep": ".",
     "delete": "حذف",
     "deleting": "حذف",
-    "description": "الوصف",
+    "description": "وصف",
     "done": "تم",
-    "download": "تحميل",
+    "download": "تنزيل",
     "downloading": "يتم التنزيل",
-    "edit": "حرر",
-    "error": "خطأ",
+    "edit": "تحرير",
+    "error": "حصل خطاء",
     "errordownloading": "خطأ عن تنزيل الملف",
     "filename": "اسم الملف",
     "folder": "مجلد",
@@ -52,8 +52,8 @@
     "loading": "يتم التحميل",
     "lostconnection": "فقدنا الاتصال تحتاج إلى إعادة الاتصال. المميز الخاص بك هو الآن غير صالح",
     "maxsizeandattachments": "الحجم الأقصى للملفات الجديدة: {{$a.size}}, أقصى عدد للمرفقات: {{$a.attachments}}",
-    "min": "الحد الأدنى",
-    "mins": "الأقل",
+    "min": "الأدنى",
+    "mins": "دقائق",
     "mod_assign": "مهمة",
     "mod_assignment": "مهمة",
     "mod_book": "كتاب",
@@ -77,14 +77,14 @@
     "mod_workshop": "ورشة عمل",
     "moduleintro": "وصف",
     "mygroups": "مجموعاتي",
-    "name": "الاسم",
+    "name": "اسم",
     "networkerrormsg": "لم يتم تمكين الشبكة أو أنها لا تعمل.",
     "never": "مطلقاً",
-    "next": "التالي",
+    "next": "استمر",
     "no": "لا",
     "nocomments": "لا يوجد تعليقات",
     "nograde": "لا توجد درجة",
-    "none": "لا يوجد",
+    "none": "لا شئ",
     "nopasswordchangeforced": "لا يمكنك الاستمرار دون تغيير كلمة مرورك، لكن يبدو أنه لا يوجد صفحة متوفرة لتغييرها. رجاءً قم بالاتصال بمدير مودل.",
     "nopermissions": "عذراً ولكنك لا تملك حالياً الصلاحيات لتقوم بهذا ({{$a}})",
     "noresults": "لا توجد نتائج",
@@ -97,13 +97,13 @@
     "pagea": "صفحة {{$a}}",
     "phone": "هاتف",
     "pictureof": "صورة {{$a}}",
-    "previous": "السابق",
+    "previous": "الوضع السابق",
     "pulltorefresh": "اسحب للأسفل ليتم التحديث",
-    "refresh": "تحديث",
-    "required": "مفروض",
+    "refresh": "تنشيط",
+    "required": "مطلوب",
     "save": "حفظ",
     "search": "بحث",
-    "searching": "يتم البحث",
+    "searching": "البحث في",
     "searchresults": "نتائج البحث",
     "sec": "ثانية",
     "secs": "ثواني",
@@ -118,7 +118,7 @@
     "sizekb": "كيلو بايت",
     "sizemb": "ميغا بايب",
     "start": "إبداء",
-    "submit": "سلم",
+    "submit": "سلم/قدم",
     "success": "نجاح",
     "teachers": "معلمون",
     "time": "الوقت",
@@ -131,7 +131,7 @@
     "userdeleted": "تم حذف اشتراك هذا المستخدم",
     "userdetails": "تفاصيل المستخدم",
     "users": "المستخدمون",
-    "view": "معاينه",
+    "view": "استعراض",
     "viewprofile": "عرض الحساب",
     "year": "سنة",
     "years": "سنوات",
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index c54034c1df4..726d0d85ddc 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Всички участници",
     "areyousure": "Сигурни ли сте?",
-    "back": "Обратно",
+    "back": "Обратно към преглед на въпрос",
     "cancel": "Отказване",
     "cannotconnect": "Не става свързване: Проверете дали написахте правилно адреса и дали сайтът използва Moodle версия 2.4 или по-нова.",
     "category": "Категория",
@@ -21,16 +21,16 @@
     "coursedetails": "Информация за курсове",
     "date": "Дата",
     "day": "ден",
-    "days": "дни",
+    "days": "Дена",
     "decsep": ",",
     "delete": "Изтриване",
     "deleting": "Изтриване",
     "description": "Описание",
     "done": "Извършено",
-    "download": "Изтегляне",
+    "download": "Щракнете за да изтеглите експортирания файл с категории",
     "downloading": "Изтегляне",
     "edit": "Редактиране",
-    "error": "Грешка",
+    "error": "Възникна непозната грешка!",
     "errordownloading": "Грешка при теглене на файл",
     "filename": "Име на файл",
     "folder": "Папка",
@@ -49,7 +49,7 @@
     "loading": "Зареждане",
     "lostconnection": "Изгубихме връзка и трябва да се свържете отново. Вашият ключ сега е невалиден.",
     "maxsizeandattachments": "Максимален размер за нови файлове: {{$a.size}}, максимален брой файлове: {{$a.attachments}}",
-    "min": "мин",
+    "min": "Най-ниска",
     "mins": "мин.",
     "mod_assign": "Задание",
     "mod_assignment": "Задание",
@@ -80,11 +80,11 @@
     "name": "Име",
     "networkerrormsg": "Мрежата не е разрешена или не работи",
     "never": "Никога",
-    "next": "Следваща",
+    "next": "Продължаване",
     "no": "Не",
     "nocomments": "Няма коментари",
-    "nograde": "Без оценка",
-    "none": "Нищо",
+    "nograde": "Няма оценка.",
+    "none": "Без",
     "nopasswordchangeforced": "Не можете да продължите без да се променили паролата, обаче няма налична страница за промяната и. Моля, свържете се с Вашия Moodle администратор.",
     "nopermissions": "За съжаление Вие нямате право да правите това  ({{$a}})",
     "noresults": "Няма резултати",
@@ -92,15 +92,15 @@
     "notice": "Съобщене",
     "now": "сега",
     "numwords": "{{$a}} думи",
-    "offline": "Не се изисква предаване онлайн",
+    "offline": "Офлайн",
     "online": "Онлайн",
     "phone": "Телефон",
     "pictureof": "Снимка на {{$a}}",
-    "previous": "Предишна",
+    "previous": "Предишно състояние",
     "pulltorefresh": "",
     "refresh": "Опресняване",
-    "required": "Задължително",
-    "save": "Запазване",
+    "required": "Задължителен",
+    "save": "Запис",
     "search": "Търсене",
     "searching": "Търсене в ...",
     "searchresults": "Резултати от търсенето",
@@ -109,15 +109,15 @@
     "seemoredetail": "Щракнете тук за повече подробности",
     "send": "Изпращане",
     "sending": "Изпраща се",
-    "show": "Да се вижда",
+    "show": "Показване",
     "site": "Сайт",
-    "sizeb": "Байтове",
-    "sizegb": "ГБ",
-    "sizekb": "КБ",
-    "sizemb": "МБ",
+    "sizeb": "байта",
+    "sizegb": "GB",
+    "sizekb": "KB",
+    "sizemb": "MB",
     "sizetb": "ТБ",
     "start": "Започване",
-    "submit": "Изпълняване",
+    "submit": "Изпращане",
     "success": "Успешно",
     "time": "Време",
     "timesup": "Времето изтече!",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 5c8b4cb3c37..2e5d0b28070 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -3,7 +3,7 @@
     "allparticipants": "Tots els participants",
     "android": "Android",
     "areyousure": "Segur que voleu tirar endavant aquesta acció?",
-    "back": "Enrere",
+    "back": "Torna a la previsualització de la pregunta",
     "cancel": "Cancel·la",
     "cannotconnect": "No s'ha pogut connectar: Comproveu que l'URL és correcte i que el lloc Moodle utilitza la versió 2.4 o posterior.",
     "cannotdownloadfiles": "La descàrrega d'arxius està deshabilitada al vostre servei Mobile. Contacteu amb l'administrador.",
@@ -13,9 +13,9 @@
     "clearsearch": "Neteja la cerca",
     "clicktohideshow": "Feu clic per ampliar o reduir",
     "clicktoseefull": "Cliqueu per veure el contingut complet.",
-    "close": "Tanca",
+    "close": "Tanca finestra",
     "comments": "Comentaris",
-    "commentscount": "Comentaris ({{$a}})",
+    "commentscount": "Comentaris  ({{$a}})",
     "commentsnotworking": "No s'han pogut recuperar els comentaris",
     "completion-alt-auto-fail": "Completat: {{$a}} (no han aconseguit assolir la qualificació)",
     "completion-alt-auto-n": "Incomplet: {{$a}}",
@@ -36,11 +36,11 @@
     "currentdevice": "Dispositiu actual",
     "datastoredoffline": "S'han desat les dades al dispositiu perquè no s'han pogut enviar. S'enviaran de manera automàtica més tard.",
     "date": "Data",
-    "day": "dia",
-    "days": "dies",
+    "day": "Dia (dies)",
+    "days": "Dies",
     "decsep": ",",
     "delete": "Suprimeix",
-    "deleting": "S'està eliminant",
+    "deleting": "S'està suprimint",
     "description": "Descripció",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -50,11 +50,10 @@
     "discard": "Descarta",
     "dismiss": "Ignora",
     "done": "Fet",
-    "download": "Baixa",
+    "download": "Feu clic per baixar el fitxer de categoria exportat",
     "downloading": "S'està descarregant",
     "edit": "Edita",
-    "elementseparator": ",",
-    "error": "Error",
+    "error": "Ha succeït un error desconegut!",
     "errorchangecompletion": "S'ha produït un error en carregar l'estat de la compleció. Si us plau torneu a intentar-ho.",
     "errordeletefile": "S'ha produït un error en eliminar el fitxer. Torneu-ho a provar més tard.",
     "errordownloading": "S'ha produït un error en baixar el fitxer.",
@@ -69,7 +68,6 @@
     "errorrenamefile": "S'ha produït un error en reanomenar el fitxer. Torneu-ho a provar més tard.",
     "errorsync": "S'ha produït un error durant la sincronització. Torneu-ho a provar més tard.",
     "errorsyncblocked": "Aquest/a {{$a}} no es pot sincronitzar ara mateix perquè ja hi ha un procés en marxa. Torneu-ho a provar més tard. Si el problema persisteix, reinicieu l'aplicació.",
-    "fieldvalueseparator": ":",
     "filename": "Nom de fitxer",
     "filenameexist": "Ja existeix un fitxer amb el nom: {{$a}}",
     "folder": "Carpeta",
@@ -92,10 +90,10 @@
     "lastmodified": "Darrera modificació",
     "lastsync": "Darrera sincronització.",
     "listsep": ";",
-    "loading": "S'està carregant",
+    "loading": "S'està carregant...",
     "lostconnection": "S'ha perdut la connexió. Necessita tornar a connectar. El testimoni ja no és vàlid.",
     "maxsizeandattachments": "Mida màxima per als nous fitxers, {{$a.size}}, adjunts màxims: {{$a.attachments}}",
-    "min": "minut",
+    "min": "La més baixa",
     "mins": "minuts",
     "mod_assign": "Tasca",
     "mod_assignment": "Tasca",
@@ -125,15 +123,15 @@
     "mod_workshop": "Taller",
     "moduleintro": "Descripció",
     "mygroups": "Els meus grups",
-    "name": "Nom",
+    "name": "Títol",
     "networkerrormsg": "La connexió a la xarxa no està habilitada o no funciona.",
     "never": "Mai",
-    "next": "Següent",
+    "next": "Continua",
     "no": "No",
-    "nocomments": "Sense comentaris",
-    "nograde": "Sense qualificació",
+    "nocomments": "No hi ha comentaris",
+    "nograde": "No hi ha qualificació.",
     "none": "Cap",
-    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya.",
+    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya, però no està disponible cap pàgina on pugueu canviar-la. Contacteu amb l'administració del vostre Moodle.",
     "nopermissions": "Actualment no teniu permisos per a fer això ({{$a}})",
     "noresults": "Sense resultats",
     "notapplicable": "n/a",
@@ -141,7 +139,7 @@
     "notsent": "No enviat",
     "now": "ara",
     "numwords": "{{$a}} paraules",
-    "offline": "No es requereix cap tramesa en línia",
+    "offline": "Fora de línia",
     "online": "En línia",
     "openfullimage": "Feu clic per veure la imatge a tamany complert",
     "openinbrowser": "Obre-ho al navegador",
@@ -149,24 +147,24 @@
     "pagea": "Pàgina {{$a}}",
     "percentagenumber": "{{$a}}%",
     "phone": "Telèfon",
-    "pictureof": "Imatge de {{$a}}",
-    "previous": "Anterior",
+    "pictureof": "Imatge {{$a}}",
+    "previous": "Estat anterior",
     "pulltorefresh": "Estira per actualitzar",
     "redirectingtosite": "Sereu redireccionats al lloc web.",
     "refresh": "Refresca",
-    "required": "Necessari",
+    "required": "Requerit",
     "requireduserdatamissing": "En aquest perfil d'usuari hi manquen dades requerides. Si us plau ompliu aquestes dades i torneu a intentar-ho.<br>{{$a}}",
     "retry": "Reintenta",
     "save": "Desa",
-    "search": "Cerca",
-    "searching": "S'està cercant",
+    "search": "Cerca...",
+    "searching": "S'està cercant en...",
     "searchresults": "Resultats de la cerca",
     "sec": "segon",
     "secs": "segons",
     "seemoredetail": "Feu clic aquí per veure més detalls",
     "send": "Envia",
     "sending": "S'està enviant",
-    "serverconnection": "S'ha produït un error en connectar al servidor",
+    "serverconnection": "S'ha produït un error de connexió amb el servidor",
     "show": "Mostra",
     "showmore": "Mostra'n més...",
     "site": "Lloc",
@@ -178,12 +176,12 @@
     "sizetb": "TB",
     "sorry": "Ho sentim...",
     "start": "Inicia",
-    "submit": "Tramet",
+    "submit": "Envia",
     "success": "Èxit",
     "tablet": "Tablet",
     "teachers": "Professors",
     "thereisdatatosync": "Hi ha {{$a}} fora de línia per sincronitzar.",
-    "time": "Hora",
+    "time": "Temps",
     "timesup": "Temps esgotat",
     "today": "Avui",
     "tryagain": "Torna-ho a provar",
@@ -199,14 +197,14 @@
     "userdeleted": "S'ha suprimit aquest compte d'usuari",
     "userdetails": "Més detall",
     "users": "Usuaris",
-    "view": "Visualitza",
+    "view": "Mostra",
     "viewprofile": "Mostra el perfil",
     "warningofflinedatadeleted": "Les dades fora de línia de {{component}} «{{name}}» s'han eliminat. {{error}}",
     "whoops": "Ui!",
     "whyisthishappening": "I això per què passa?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La funció de webservice no està disponible.",
-    "year": "any",
+    "year": "Any(s)",
     "years": "anys",
     "yes": "Sí"
 }
\ No newline at end of file
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index b8311928487..089ef0f2c33 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -3,7 +3,7 @@
     "allparticipants": "Všichni účastníci",
     "android": "Android",
     "areyousure": "Opravdu?",
-    "back": "Zpět",
+    "back": "Zpět k náhledu úlohy",
     "cancel": "Zrušit",
     "cannotconnect": "Nelze se připojit: Ověřte, zda je zadali správně adresu URL a že používáte Moodle 2.4 nebo novější.",
     "cannotdownloadfiles": "Stahování souborů je vypnuto v Mobilních službách webu. Prosím, obraťte se na správce webu.",
@@ -13,13 +13,13 @@
     "clearsearch": "Vymazat vyhledávání",
     "clicktohideshow": "Klikněte pro rozbalení nebo sbalení",
     "clicktoseefull": "Kliknutím zobrazit celý obsah.",
-    "close": "Zavřít",
+    "close": "Zavřít okno",
     "comments": "Komentáře",
     "commentscount": "Komentáře ({{$a}})",
     "commentsnotworking": "Komentáře nemohou být obnoveny",
-    "completion-alt-auto-fail": "Splněno: {{$a}} ; ale nedosáhli se potřebné známky",
+    "completion-alt-auto-fail": "Splněno: {{$a}} (nebylo dosaženo požadované známky)",
     "completion-alt-auto-n": "Nesplněno: {{$a}}",
-    "completion-alt-auto-pass": "Splněno: {{$a}}; dosáhli se potřebné známky",
+    "completion-alt-auto-pass": "Splněno: {{$a}} (bylo dosaženo požadované známky)",
     "completion-alt-auto-y": "Splněno: {{$a}}",
     "completion-alt-manual-n": "Nesplněno: {{$a}}. Výběrem označíte jako splněné.",
     "completion-alt-manual-y": "Splněno: {{$a}}. Výběrem označíte jako nesplněné.",
@@ -36,8 +36,8 @@
     "currentdevice": "Aktuální zařízení",
     "datastoredoffline": "Data byla uložena na zařízení, protože nemohla být odeslána. Budou odeslána automaticky později.",
     "date": "Datum",
-    "day": "den",
-    "days": "dny",
+    "day": "Dnů",
+    "days": "Dnů",
     "decsep": ",",
     "defaultvalue": "Výchozí  ({{$a}})",
     "delete": "Odstranit",
@@ -51,11 +51,10 @@
     "discard": "Odstranit",
     "dismiss": "Odmítnout",
     "done": "Hotovo",
-    "download": "Stáhnout",
+    "download": "Klikněte pro stažení exportovaného souboru",
     "downloading": "Stahování",
     "edit": "Upravit",
-    "elementseparator": ",",
-    "error": "Chyba",
+    "error": "Došlo k neznámé chybě!",
     "errorchangecompletion": "Při změně stavu dokončení došlo k chybě. Prosím zkuste to znovu.",
     "errordeletefile": "Chyba při odstraňování souboru. Prosím zkuste to znovu.",
     "errordownloading": "Chyba při stahování souboru",
@@ -70,7 +69,6 @@
     "errorrenamefile": "Chyba při přejmenování souboru. Prosím zkuste to znovu.",
     "errorsync": "Při synchronizaci došlo k chybě. Zkuste to prosím znovu.",
     "errorsyncblocked": "{{$a}} nelze nyní synchronizovat z důvodu probíhajícího procesu. Zkuste to prosím znovu později. Pokud problém přetrvává, zkuste restartovat aplikaci.",
-    "fieldvalueseparator": ":",
     "filename": "Název souboru",
     "filenameexist": "Jméno souboru již existuje: {{$a}}",
     "folder": "Složka",
@@ -80,23 +78,23 @@
     "groupsseparate": "Oddělené skupiny",
     "groupsvisible": "Viditelné skupiny",
     "hasdatatosync": "{{$a}} má offline data, která mají být synchronizována.",
-    "help": "Nápověda",
+    "help": "Pomoc",
     "hide": "Skrýt",
     "hour": "hodina",
     "hours": "hodin",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Obrázek",
     "imageviewer": "Prohlížeč obrázků",
-    "info": "Informace",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Naposledy změněno",
     "lastsync": "Poslední synchronizace",
     "listsep": ";",
-    "loading": "Nahrávání",
+    "loading": "Nahrávám...",
     "lostconnection": "Ztratili jsme spojení,  potřebujete se znovu připojit. Váš token je nyní neplatný",
     "maxsizeandattachments": "Maximální velikost nových souborů: {{$a.size}}, maximální přílohy: {{$a.attachments}}",
-    "min": "min.",
+    "min": "Nejhorší",
     "mins": "min.",
     "mod_assign": "Úkol",
     "mod_assignment": "Úkol",
@@ -126,17 +124,17 @@
     "mod_workshop": "Workshop",
     "moduleintro": "Popis",
     "mygroups": "Moje skupiny",
-    "name": "Název",
+    "name": "Jméno",
     "networkerrormsg": "Síť není povolena nebo nefunguje.",
     "never": "Nikdy",
-    "next": "Další",
+    "next": "Pokračovat",
     "no": "Ne",
-    "nocomments": "Bez komentářů",
-    "nograde": "Bez známky",
-    "none": "Žádný",
-    "nopasswordchangeforced": "Nelze pokračovat beze změny hesla.",
+    "nocomments": "Nejsou žádné komentáře",
+    "nograde": "Žádné hodnocení.",
+    "none": "Žádné",
+    "nopasswordchangeforced": "Nemůžete pokračovat dál bez změny hesla, ale stránka pro jeho změnu není k dispozici. Kontaktujte správce Vašeho eLearningu Moodle.",
     "nopermissions": "Je mi líto, ale momentálně nemáte oprávnění vykonat tuto operaci ({{$a}})",
-    "noresults": "Bez výsledků",
+    "noresults": "Žádné výsledky",
     "notapplicable": "n/a",
     "notice": "Poznámka",
     "notsent": "Neodesláno",
@@ -151,23 +149,23 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Obrázek: {{$a}}",
-    "previous": "Předchozí",
+    "previous": "O krok zpět",
     "pulltorefresh": "Stáhněte pro obnovu",
     "redirectingtosite": "Budete přesměrováni na web.",
     "refresh": "Obnovit",
-    "required": "Vyžadováno",
+    "required": "Povinné",
     "requireduserdatamissing": "Tento uživatel nemá některá požadovaná data v profilu. Prosím, vyplňte tato data v systému Moodle a zkuste to znovu. <br> {{$a}}",
     "retry": "Opakovat",
     "save": "Uložit",
-    "search": "Hledat",
-    "searching": "Hledání",
+    "search": "Vyhledávání...",
+    "searching": "Vyhledávám v ...",
     "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
     "send": "Odeslat",
-    "sending": "Odeslání",
-    "serverconnection": "Chyba připojení k serveru",
+    "sending": "Odesílání",
+    "serverconnection": "Chyba spojení se serverem",
     "show": "Ukázat",
     "showmore": "Zobrazit více...",
     "site": "Stránky",
@@ -180,7 +178,7 @@
     "sorry": "Promiňte...",
     "start": "Začátek",
     "submit": "Odeslat",
-    "success": "Úspěch!",
+    "success": "Úspěch",
     "tablet": "Tablet",
     "teachers": "Učitelé",
     "thereisdatatosync": "K dispozici jsou v  offline režimu {{$a}}, které mají být synchronizovány.",
@@ -208,7 +206,7 @@
     "whyisthishappening": "Proč se to děje?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Funkce webových služeb není k dispozici.",
-    "year": "rok",
+    "year": "Rok(y)",
     "years": "roky",
     "yes": "Ano"
 }
\ No newline at end of file
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index 76a68bba6f1..e1d7fef3543 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -3,7 +3,7 @@
     "allparticipants": "Alle deltagere",
     "android": "Android",
     "areyousure": "Er du sikker?",
-    "back": "Tilbage",
+    "back": "Tilbage til spørgsmålet",
     "cancel": "Annuller",
     "cannotconnect": "Kan ikke tilslutte: kontroller at webadressen er rigtig og at dit websted bruger Moodle 2.4 eller nyere.",
     "cannotdownloadfiles": "Download af filer er deaktiveret i din mobilservice. Kontakt dit websteds administrator.",
@@ -16,32 +16,32 @@
     "close": "Luk",
     "comments": "Kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Gennemført: {{$a}} (bestod ikke)",
+    "completion-alt-auto-fail": "Gennemført: {{$a}} (opnåede ikke beståelseskarakter)",
     "completion-alt-auto-n": "Ikke gennemført: {{$a}}",
-    "completion-alt-auto-pass": "Gennemført: {{$a}} (bestod)",
+    "completion-alt-auto-pass": "Gennemført: {{$a}} (opnåede beståelseskarakter)",
     "completion-alt-auto-y": "Gennemført: {{$a}}",
-    "completion-alt-manual-n": "Ikke gennemført: {{$a}}. Vælg til markering som gennemført.",
-    "completion-alt-manual-y": "Gennemført: {{$a}}. Vælg til markering som ikke gennemført.",
+    "completion-alt-manual-n": "Ikke gennemført: {{$a}}. Vælg for at markere som gennemført.",
+    "completion-alt-manual-y": "Gennemført: {{$a}}. Vælg for at markere som ikke gennemført.",
     "confirmcanceledit": "Er du sikker på at du vil forlade denne side? Alle ændringer vil gå tabt.",
     "confirmdeletefile": "Er du sikker på at du vil slette denne fil?",
     "confirmopeninbrowser": "Vil du åbne den i en browser?",
     "content": "Indhold",
     "continue": "Fortsæt",
-    "course": "Rum",
+    "course": "Kursus",
     "coursedetails": "Kursusdetaljer",
     "datastoredoffline": "Der blev gemt data på enheden da det ikke kunne sendes. Det vil blive sendt senere.",
     "date": "Dato",
-    "day": "dag",
-    "days": "dage",
+    "day": "Dag(e)",
+    "days": "Dage",
     "decsep": ",",
     "delete": "Slet",
     "deleting": "Sletter",
     "description": "Beskrivelse",
     "done": "Færdig",
-    "download": "Download",
+    "download": "Klik for at downloade den eksporterede kategorifil",
     "downloading": "Downloader",
     "edit": "Rediger",
-    "error": "Fejl",
+    "error": "Der opstod en ukendt fejl!",
     "errorchangecompletion": "En fejl opstod under ændring af gennemførelsesstatus. Prøv igen.",
     "errordownloading": "Fejl ved download af fil.",
     "errordownloadingsomefiles": "Fejl ved download af modulfiler. Nogle filer mangler måske.",
@@ -62,16 +62,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Billede",
     "imageviewer": "Billedfremviser",
-    "info": "Information",
+    "info": "Introduktion",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Sidst ændret",
+    "lastmodified": "Senest ændret",
     "lastsync": "Sidste sunkronisering",
     "listsep": ";",
-    "loading": "Indlæser",
+    "loading": "Indlæser...",
     "lostconnection": "Din godkendelse er ugyldig eller udløbet, så du skal genoprette forbindelsen til webstedet.",
     "maxsizeandattachments": "Maksimal størrelse på nye filer: {{$a.size}}, højeste antal bilag: {{$a.attachments}}",
-    "min": "min.",
+    "min": "Laveste",
     "mins": "min.",
     "mod_assign": "Opgave",
     "mod_assignment": "Opgave",
@@ -103,10 +103,10 @@
     "name": "Navn",
     "networkerrormsg": "Netværk ikke aktiveret eller virker ikke.",
     "never": "Aldrig",
-    "next": "Næste",
+    "next": "Fortsæt",
     "no": "Nej",
-    "nocomments": "Ingen kommentarer",
-    "nograde": "Ingen karakter",
+    "nocomments": "Der er ingen kommentarer",
+    "nograde": "Ingen bedømmelse.",
     "none": "Ingen",
     "nopasswordchangeforced": "Du kan ikke fortsætte uden at ændre din adgangskode, men der er ingen tilgængelig side at ændre den på. Kontakt venligst din Moodleadministrator.",
     "nopermissions": "Beklager, men dette ({{$a}}) har du ikke tilladelse til.",
@@ -123,21 +123,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Billede af {{$a}}",
-    "previous": "Forrige",
+    "previous": "Forrige tilstand",
     "pulltorefresh": "Træk for at opdatere",
     "refresh": "Genindlæs",
-    "required": "Påkrævet",
+    "required": "Krævet",
     "requireduserdatamissing": "Denne bruger mangler nogle krævede profildata. Udfyld venligst de manglende data i din Moodle og prøv igen.<br>{{$a}}",
     "save": "Gem",
-    "search": "Søg",
-    "searching": "Søger",
+    "search": "Søg...",
+    "searching": "Søger i...",
     "searchresults": "Søgeresultater",
     "sec": "sekunder",
     "secs": "sekunder",
     "seemoredetail": "Klik her for detaljer",
     "send": "Send",
     "sending": "Sender",
-    "serverconnection": "Fejl ved tilslutning til server",
+    "serverconnection": "Fejl ved forbindelse til server",
     "show": "Vis",
     "site": "Websted",
     "sizeb": "bytes",
@@ -146,11 +146,11 @@
     "sizemb": "Mb",
     "sizetb": "TB",
     "start": "Start",
-    "submit": "Gem",
-    "success": "Succes!",
+    "submit": "Aflever",
+    "success": "Succes",
     "tablet": "Tablet",
     "teachers": "Undervisere",
-    "time": "Tidspunkt",
+    "time": "Tid",
     "timesup": "Tiden er gået!",
     "today": "I dag",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -167,7 +167,7 @@
     "whoops": "Hovsa",
     "windowsphone": "Windowstelefon",
     "wsfunctionnotavailable": "Denne webservicefunktion er ikke tilgængelig.",
-    "year": "år",
+    "year": "År",
     "years": "år",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 4d0c426ded0..f0fec564385 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -3,45 +3,45 @@
     "allparticipants": "Alle Teilnehmer/innen",
     "android": "Android",
     "areyousure": "Sind Sie sicher?",
-    "back": "Zurück",
+    "back": "Zurück zur vorherigen Antwort",
     "cancel": "Abbrechen",
     "cannotconnect": "Die Verbindung ist nicht möglich. Prüfen Sie, ob die URL richtig ist und dass mindestens Moodle 2.4 verwendet wird.",
     "cannotdownloadfiles": "Das Herunterladen von Dateien ist im mobilen Webservice deaktiviert. Wenden Sie sich an den Administrator der Website.",
     "category": "Kursbereich",
-    "choose": "Auswählen",
+    "choose": "Auswahl",
     "choosedots": "Auswählen...",
     "clearsearch": "Suche löschen",
-    "clicktohideshow": "Klicken zum Umschalten der Ansicht",
+    "clicktohideshow": "Zum Erweitern oder Zusammenfassen klicken",
     "clicktoseefull": "Tippen zum Anzeigen aller Inhalte",
-    "close": "Schließen",
+    "close": "Fenster schließen",
     "comments": "Kommentare",
     "commentscount": "Kommentare ({{$a}})",
     "commentsnotworking": "Kommentare können nicht mehr abgerufen werden",
-    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (Anforderung nicht erreicht)",
+    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (ohne Erfolg)",
     "completion-alt-auto-n": "Nicht abgeschlossen: {{$a}}",
-    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (Anforderung erreicht)",
+    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (mit Erfolg)",
     "completion-alt-auto-y": "Abgeschlossen: {{$a}}",
-    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}}. Auswählen, um als abgeschlossen zu markieren.",
-    "completion-alt-manual-y": "Abgeschlossen: {{$a}}. Auswählen, um als nicht abgeschlossen zu markieren.",
+    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}} - mit Auswahl als abgeschlossen markieren",
+    "completion-alt-manual-y": "Abgeschlossen: {{$a}}  - mit Auswahl als nicht abgeschlossen markieren",
     "confirmcanceledit": "Möchten Sie diese Seite wirklich verlassen? Alle Änderungen gehen verloren!",
     "confirmdeletefile": "Möchten Sie diese Datei wirklich löschen?",
     "confirmloss": "Möchten Sie wirklich alle Änderungen verlieren?",
     "confirmopeninbrowser": "Möchten Sie dies im Browser öffnen?",
     "content": "Inhalt",
     "contenteditingsynced": "Der Inhalt, den Sie bearbeiten, wurde synchronisiert.",
-    "continue": "Weiter",
+    "continue": "Fortsetzen",
     "copiedtoclipboard": "Text in die Zwischenablage kopiert",
     "course": "Kurs",
     "coursedetails": "Kursdetails",
     "currentdevice": "Aktuelles Gerät",
     "datastoredoffline": "Daten wurden im Gerät gespeichert, da sie nicht gesendet werden konnten. Sie werden automatisch später gesendet.",
     "date": "Datum",
-    "day": "Tag",
+    "day": "Tag(e)",
     "days": "Tage",
     "decsep": ",",
     "defaultvalue": "Standard ({{$a}})",
     "delete": "Löschen",
-    "deleting": "Löschen ...",
+    "deleting": "Lösche",
     "description": "Beschreibung",
     "dfdaymonthyear": "DD.MM.YYYY",
     "dfdayweekmonth": "ddd, D. MMM",
@@ -51,11 +51,10 @@
     "discard": "Verwerfen",
     "dismiss": "Abbrechen",
     "done": "Erledigt",
-    "download": "Herunterladen",
+    "download": "Klick zum Download der exportierten Kategorien",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
-    "elementseparator": ";",
-    "error": "Fehler",
+    "error": "Fehler aufgetreten!",
     "errorchangecompletion": "Fehler beim Ändern des Abschlussstatus. Versuchen Sie es noch einmal.",
     "errordeletefile": "Fehler beim Löschen der Datei. Versuchen Sie es noch einmal.",
     "errordownloading": "Fehler beim Laden der Datei",
@@ -70,11 +69,10 @@
     "errorrenamefile": "Fehler beim Umbenennen der Datei. Versuchen Sie es noch einmal.",
     "errorsync": "Fehler beim Synchronisieren. Versuchen Sie es noch einmal.",
     "errorsyncblocked": "Diese(s/r) {{$ a}} kann im Moment nicht synchronisiert werden. Versuchen Sie es später noch einmal. Falls das Problem weiterhin besteht, sollten Sie die App neu starten.",
-    "fieldvalueseparator": ":",
     "filename": "Dateiname",
     "filenameexist": "Dateiname existiert bereits: {{$a}}",
     "folder": "Verzeichnis",
-    "forcepasswordchangenotice": "Bitte ändern Sie Ihr Kennwort, bevor Sie weiterarbeiten",
+    "forcepasswordchangenotice": "Ändern Sie Ihr Kennwort, bevor Sie weiterarbeiten können.",
     "fulllistofcourses": "Alle Kurse",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
     "groupsseparate": "Getrennte Gruppen",
@@ -93,10 +91,10 @@
     "lastmodified": "Zuletzt geändert",
     "lastsync": "Letztes Synchronisieren",
     "listsep": ";",
-    "loading": "Laden",
+    "loading": "Laden...",
     "lostconnection": "Die Authentifizierung ist abgelaufen oder ungültig. Sie müssen sich neu verbinden.",
     "maxsizeandattachments": "Maximale Größe für neue Dateien: {{$a.size}}, Maximale Zahl von Anhängen: {{$a.attachments}}",
-    "min": "Minute",
+    "min": "Niedrigste",
     "mins": "Minuten",
     "mod_assign": "Aufgabe",
     "mod_assignment": "Aufgabe",
@@ -131,16 +129,16 @@
     "never": "Nie",
     "next": "Weiter",
     "no": "Nein",
-    "nocomments": "Noch keine Kommentare",
-    "nograde": "Keine Bewertung",
-    "none": "Keine",
-    "nopasswordchangeforced": "Sie können nicht weitermachen, ohne das Kennwort zu ändern.",
+    "nocomments": "Keine Kommentare",
+    "nograde": "Keine Bewertung.",
+    "none": "--",
+    "nopasswordchangeforced": "Ohne die Änderung des Kennworts können Sie nicht weitermachen. Falls die Seite zur Änderung des Kennworts nicht verfügbar ist, wenden Sie sich an den Administrator der Website.",
     "nopermissions": "Sie besitzen derzeit keine Rechte, dies zu tun ({{$a}}).",
     "noresults": "Keine Ergebnisse",
     "notapplicable": "n/a",
     "notice": "Hinweis",
     "notsent": "Nicht gesendet",
-    "now": "Jetzt",
+    "now": "jetzt",
     "numwords": "{{$a}} Wörter",
     "offline": "Offline",
     "online": "Online",
@@ -149,26 +147,26 @@
     "othergroups": "Weitere Gruppen",
     "pagea": "Seite {{$a}}",
     "percentagenumber": "{{$a}}%",
-    "phone": "Phone",
-    "pictureof": "Bild von {{$a}}",
-    "previous": "Zurück",
+    "phone": "Telefon",
+    "pictureof": "Nutzerbild {{$a}}",
+    "previous": "Letzter Zustand",
     "pulltorefresh": "Zum Aktualisieren runterziehen",
     "redirectingtosite": "Sie werden zur Website weitergeleitet.",
-    "refresh": "Neuladen",
-    "required": "Erforderlich",
+    "refresh": "Neu laden",
+    "required": "Notwendig",
     "requireduserdatamissing": "In diesem Nutzerprofil fehlen notwendige Daten. Füllen Sie die Daten in der Website aus und versuchen Sie es noch einmal.<br> {{$a}}",
     "retry": "Neu versuchen",
-    "save": "Speichern",
-    "search": "Suchen",
-    "searching": "Suchen",
+    "save": "Sichern",
+    "search": "Suchen...",
+    "searching": "Suche in ...",
     "searchresults": "Suchergebnisse",
     "sec": "Sekunde",
     "secs": "Sekunden",
     "seemoredetail": "Hier klicken, um weitere Details sichtbar zu machen",
     "send": "Senden",
-    "sending": "Senden",
-    "serverconnection": "Fehler beim Verbinden zum Server",
-    "show": "Anzeigen",
+    "sending": "wird gesendet",
+    "serverconnection": "Fehler beim Aufbau der Verbindung zum Server",
+    "show": "Zeigen",
     "showmore": "Mehr anzeigen ...",
     "site": "Website",
     "sitemaintenance": "Wartungsmodus: Die Website ist im Moment nicht erreichbar!",
@@ -179,8 +177,8 @@
     "sizetb": "TB",
     "sorry": "Sorry ...",
     "start": "Start",
-    "submit": "Speichern",
-    "success": "Fertig!",
+    "submit": "Abgabe",
+    "success": "erfolgreich",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
     "thereisdatatosync": "Die Offline-Daten {{$a}} müssen synchronisiert werden.",
@@ -208,7 +206,7 @@
     "whyisthishappening": "Warum geschieht dies?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Die Webservice-Funktion ist nicht verfügbar.",
-    "year": "Jahr",
+    "year": "Jahr(e)",
     "years": "Jahre",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index d7a4e12dff2..9f12ddb37a5 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -3,7 +3,7 @@
     "allparticipants": "Όλοι οι συμμετέχοντες",
     "android": "Android",
     "areyousure": "Είστε σίγουρος ;",
-    "back": "Επιστροφή",
+    "back": "Επιστροφή στην προηγούμενη ερώτηση",
     "cancel": "Ακύρωση",
     "cannotconnect": "Δεν είναι δυνατή η σύνδεση: Βεβαιωθείτε ότι έχετε πληκτρολογήσει σωστά τη διεύθυνση URL και ότι το site σας χρησιμοποιεί το Moodle 2.4 ή νεότερη έκδοση.",
     "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
@@ -13,16 +13,16 @@
     "clearsearch": "Καθαρισμός αναζήτησης",
     "clicktohideshow": "Πατήστε για επέκταση ή κατάρρευση",
     "clicktoseefull": "Κάντε κλικ για να δείτε το πλήρες περιεχόμενο.",
-    "close": "Κλείσιμο",
+    "close": "Κλείσιμο παραθύρου",
     "comments": "Σχόλια",
     "commentscount": "Σχόλια ({{$a}})",
     "commentsnotworking": "Τα σχόλια δεν μπορούν να ανακτηθούν",
-    "completion-alt-auto-fail": "Ολοκληρώθηκε: {{$a}} (δεν πετύχατε βαθμό πρόσβασης)",
-    "completion-alt-auto-n": "Δεν ολοκληρώθηκε: {{$a}}",
-    "completion-alt-auto-pass": "Ολοκληρώθηκε: {{$a}} (πετύχατε βαθμό πρόσβασης)",
-    "completion-alt-auto-y": "Ολοκληρώθηκε: {{$a}}",
-    "completion-alt-manual-n": "Δεν ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως ολοκληρωμένο.",
-    "completion-alt-manual-y": "Ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως μη ολοκληρωμένο.",
+    "completion-alt-auto-fail": "Ολοκληρωμένο (με βαθμό κάτω της βάσης)",
+    "completion-alt-auto-n": "Μη ολοκληρωμένο",
+    "completion-alt-auto-pass": "Ολοκληρωμένο (με βαθμό άνω της βάσης)",
+    "completion-alt-auto-y": "Ολοκληρωμένο",
+    "completion-alt-manual-n": "Μη ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως ολοκληρωμένο",
+    "completion-alt-manual-y": "Ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως μη ολοκληρωμένο",
     "confirmcanceledit": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν τη σελίδα; Όλες οι αλλαγές θα χαθούν.",
     "confirmdeletefile": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmopeninbrowser": "Θέλετε να το ανοίξετε στο πρόγραμμα περιήγησης;",
@@ -35,10 +35,10 @@
     "datastoredoffline": "Τα δεδομένα αποθηκεύονται στη συσκευή, διότι δεν μπορούν να σταλούν. Θα αποσταλούν αυτόματα αργότερα.",
     "date": "Ημερομηνία",
     "day": "ημέρα",
-    "days": "ημέρες",
+    "days": "Ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
-    "deleting": "Γίνεται διαγραφή",
+    "deleting": "Διαγραφή",
     "description": "Περιγραφή",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -48,11 +48,10 @@
     "discard": "Απόρριψη",
     "dismiss": "Απόρριψη",
     "done": "Ολοκληρώθηκε",
-    "download": "Μεταφόρτωση",
+    "download": "Κάντε κλικ για να κατεβάσετε το εξαγόμενο αρχείο κατηγορίας",
     "downloading": "Κατέβασμα",
-    "edit": "Επεξεργασία ",
-    "elementseparator": ",",
-    "error": "Σφάλμα",
+    "edit": "Επεξεργασία",
+    "error": "Συνέβη ένα άγνωστο σφάλμα!",
     "errorchangecompletion": "Παρουσιάστηκε σφάλμα κατά την αλλαγή της κατάστασης ολοκλήρωσης. Παρακαλώ προσπαθήστε ξανά.",
     "errordeletefile": "Σφάλμα κατά τη διαγραφή του αρχείου. Παρακαλώ προσπαθήστε ξανά.",
     "errordownloading": "Σφάλμα στο κατέβασμα του αρχείου.",
@@ -87,10 +86,10 @@
     "lastmodified": "Τελευταία τροποποίηση",
     "lastsync": "Τελευταίος συγχρονισμός",
     "listsep": ";",
-    "loading": "Φόρτωση...",
+    "loading": "Φορτώνει....",
     "lostconnection": "Η σύνδεσή σας είναι άκυρη ή έχει λήξει. Πρέπει να ξανασυνδεθείτε στο site.",
     "maxsizeandattachments": "Μέγιστο μέγεθος για νέα αρχεία: {{$a.size}}, μέγιστος αριθμός συνημμένων: {{$a.attachments}}",
-    "min": "λεπτό",
+    "min": "Ελάχιστο",
     "mins": "λεπτά",
     "mod_assign": "Εργασία",
     "mod_assignment": "Εργασία",
@@ -123,12 +122,12 @@
     "name": "Όνομα",
     "networkerrormsg": "Το δίκτυο δεν είναι ενεργοποιημένο ή δεν δουλεύει.",
     "never": "Ποτέ",
-    "next": "Επόμενο",
+    "next": "Συνέχεια",
     "no": "Όχι",
-    "nocomments": "Χωρίς σχόλια",
-    "nograde": "Δεν υπάρχει βαθμός",
-    "none": "Κανένας",
-    "nopasswordchangeforced": "Δεν μπορείτε να προχωρήσετε χωρίς να αλλάξετε τον κωδικό πρόσβασής σας.",
+    "nocomments": "Δεν υπάρχουν σχόλια",
+    "nograde": "Κανένα βαθμό.",
+    "none": "Κανένα",
+    "nopasswordchangeforced": "You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.",
     "nopermissions": "Συγνώμη, αλλά επί του τρεχόντως δεν έχετε το δικαίωμα να το κάνετε αυτό ({{$a}})",
     "noresults": "Κανένα αποτέλεσμα",
     "notapplicable": "n/a",
@@ -136,7 +135,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Εκτός σύνδεσης",
+    "offline": "Αποσυνδεδεμένος",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -145,7 +144,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Τηλέφωνο",
     "pictureof": "Φωτογραφία {{$a}}",
-    "previous": "Προηγούμενο",
+    "previous": "Προηγούμενη κατάσταση",
     "pulltorefresh": "Τραβήξτε προς τα κάτω για ανανέωση",
     "redirectingtosite": "Θα μεταφερθείτε στο site.",
     "refresh": "Ανανέωση",
@@ -153,15 +152,15 @@
     "requireduserdatamissing": "Αυτός ο χρήστης δεν έχει συμπληρωμένα κάποια απαιτούμενα στοιχεία του προφίλ του. Συμπληρώστε τα δεδομένα στο Moodle σας και προσπαθήστε ξανά.<br>{{$a}}",
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
-    "search": "Αναζήτηση",
-    "searching": "Αναζήτηση",
-    "searchresults": "Αποτελέσματα αναζήτησης",
+    "search": "Αναζήτηση...",
+    "searching": "Γίνεται έρευνα στο...",
+    "searchresults": "Αναζήτηση στα αποτελέσματα",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
-    "sending": "Αποστολή",
-    "show": "Προβολή",
+    "sending": "Αποστέλλεται",
+    "show": "Δείξε",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
     "sitemaintenance": "Η ιστοσελίδα είναι υπό συντήρηση και δεν είναι άμεσα διαθέσιμη",
@@ -173,11 +172,11 @@
     "sorry": "Λυπάμαι...",
     "start": "Αρχή",
     "submit": "Υποβολή",
-    "success": "Επιτυχία!",
+    "success": "Επιτυχία",
     "tablet": "Tablet",
     "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
-    "time": "Ώρα",
+    "time": "Χρόνος",
     "timesup": "Έληξε ο χρόνος!",
     "today": "Σήμερα",
     "tryagain": "Προσπαθήστε ξανά.",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index e955ca514e5..b50c260f300 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos los participantes",
     "android": "Android",
     "areyousure": "¿Está Usted seguro?",
-    "back": "Atrás",
+    "back": "Volver a la vista previa de la pregunta",
     "cancel": "Cancelar",
     "cannotconnect": "No se puede conectar: Verifique que Usted escribió la URL correcta y que su sitio usa Moodle 2.4 o más reciente.",
     "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile. Por favor contacte a su administrador del sitio.",
@@ -11,18 +11,18 @@
     "choose": "Elegir",
     "choosedots": "Elegir...",
     "clearsearch": "Limpiar búsqueda",
-    "clicktohideshow": "Hacer click para expander o colapsar",
+    "clicktohideshow": "Clic para expandir o colapsar",
     "clicktoseefull": "Hacer click para ver los contenidos completos.",
-    "close": "Cerrar",
+    "close": "Cerrar vista previa",
     "comments": "Comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
-    "completion-alt-auto-fail": "Completado: {{$a}} (no obtuvo calificación aprobatoria)",
-    "completion-alt-auto-n": "No completado: {{$a}}",
-    "completion-alt-auto-pass": "Completado: {{$a}} (obtuvo calificación aprobatoria)",
-    "completion-alt-auto-y": "Completado: {{$a}}",
-    "completion-alt-manual-n": "No-completado: {{$a}}. Seleccionar mara marcarlo como completado.",
-    "completion-alt-manual-y": "Completado: {{$a}}. Seleccionar mara marcarlo como no completado.",
+    "completion-alt-auto-fail": "Finalizado {{$a}} (no obtuvo calificación de aprobado)",
+    "completion-alt-auto-n": "Sin finalizar: {{$a}}",
+    "completion-alt-auto-pass": "Finalizado: {{$a}} (obtuvo calificación de aprobado)",
+    "completion-alt-auto-y": "Finalizado: {{$a}}",
+    "completion-alt-manual-n": "No finalizado; {{$a}}. Seleccione para marcar como finalizado",
+    "completion-alt-manual-y": "Finalizado; {{$a}} seleccione para marcar como no finalizado",
     "confirmcanceledit": "¿Está Usted seguro de que quiere abandonar esta página? Se perderán todos los cambios.",
     "confirmdeletefile": "¿Está seguro de que desea eliminar este archivo?",
     "confirmloss": "¿Está Usted seguro? Se perderán todos los cambios.",
@@ -36,11 +36,11 @@
     "currentdevice": "Dispositivo actual",
     "datastoredoffline": "Los datos se almacenaron en el dispositivo debido a que no se pudieron enviar. Serán enviados automáticamente más tarde.",
     "date": "Fecha",
-    "day": "día",
-    "days": "días",
+    "day": "Día(s)",
+    "days": "Días",
     "decsep": ".",
     "defaultvalue": "Valor por defecto ({{$a}})",
-    "delete": "Borrar",
+    "delete": "Eliminar",
     "deleting": "Eliminando",
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-AAAA",
@@ -51,11 +51,10 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Descargar",
+    "download": "Haga clic para descargar el archivo de categorías exportadas",
     "downloading": "Descargando",
     "edit": "Editar",
-    "elementseparator": ",",
-    "error": "Error",
+    "error": "Ha ocurrido un error desconocido.",
     "errorchangecompletion": "Ocurrió un error al cambiar el estatus de finalización. Por favor inténtelo nuevamente.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo nuevamente.",
     "errordownloading": "Error al descargar archivo",
@@ -70,7 +69,6 @@
     "errorrenamefile": "Error al renombrar el archivo. Por favor inténtelo nuevamente.",
     "errorsync": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente más tarde.",
     "errorsyncblocked": "Este/a {{$a}} no puede sincronizarse ahorita porque hay un proceso trabajando. Por favor inténtelo nuevamente más tarde. Si el problema persiste, intente reiniciar la App.",
-    "fieldvalueseparator": ":",
     "filename": "Nombre del archivo",
     "filenameexist": "El archivo ya existe: {{$a}}",
     "folder": "Carpeta",
@@ -90,14 +88,14 @@
     "info": "Información",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Última modificación",
+    "lastmodified": "Última modicficación",
     "lastsync": "Última sincronzación",
     "listsep": ";",
-    "loading": "Cargando",
+    "loading": "Cargando...",
     "lostconnection": "Hemos perdido la conexión, necesita reconectar. Su ficha (token) ya no es válido",
     "maxsizeandattachments": "Tamaño máximo para archivos nuevos: {{$a.size}}, anexos máximos: {{$a.attachments}}",
-    "min": "min",
-    "mins": "mins",
+    "min": "Más baja",
+    "mins": "minutos",
     "mod_assign": "Tarea",
     "mod_assignment": "Tarea",
     "mod_book": "Libro",
@@ -129,41 +127,41 @@
     "name": "Nombre",
     "networkerrormsg": "Red no disponible o no funcionando.",
     "never": "Nunca",
-    "next": "Siguiente",
+    "next": "Continuar",
     "no": "No",
     "nocomments": "No hay comentarios",
-    "nograde": "No hay calificación",
+    "nograde": "Sin calificación.",
     "none": "Ninguno(a)",
-    "nopasswordchangeforced": "Usted no puede proceder sin cambiar su contraseña.",
+    "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
-    "noresults": "No hay resultados",
+    "noresults": "Sin resultados",
     "notapplicable": "no disp.",
     "notice": "Aviso",
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "Fuera-de-línea",
-    "online": "En-línea",
+    "offline": "Fuera de línea",
+    "online": "En línea",
     "openfullimage": "Hacer click aquí para mostrar la imagen a tamaño completo",
     "openinbrowser": "Abrir en navegador",
     "othergroups": "Otros grupos",
     "pagea": "Página {{$a}}",
     "percentagenumber": "{{$a}}%",
     "phone": "Teléfono",
-    "pictureof": "Fotografía de  {{$a}}",
-    "previous": "Previo",
+    "pictureof": "Imagen de {{$a}}",
+    "previous": "Estado previo",
     "pulltorefresh": "''Pull'' para refrescar",
     "redirectingtosite": "Usted será redireccionado al sitio.",
     "refresh": "Refrescar",
-    "required": "Obligatorio",
+    "required": "Requerido",
     "requireduserdatamissing": "A este usuario le faltan algunos datos requeridos del perfil. Por favor, llene estos datos en su Moodle e inténtelo nuevamente.<br>{{$a}}",
     "retry": "Reintentar",
     "save": "Guardar",
-    "search": "Búsqueda",
-    "searching": "Buscando",
-    "searchresults": "Resultados de la búsqueda",
-    "sec": "seg",
-    "secs": "segs",
+    "search": "Buscar...",
+    "searching": "Buscando en ...",
+    "searchresults": "Resultado",
+    "sec": "segundos",
+    "secs": "segundos",
     "seemoredetail": "Haga clic aquí para ver más detalles",
     "send": "Enviar",
     "sending": "Enviando",
@@ -180,11 +178,11 @@
     "sorry": "Lo siento...",
     "start": "Inicio",
     "submit": "Enviar",
-    "success": "¡Éxito!",
+    "success": "Éxito",
     "tablet": "Tableta",
     "teachers": "Profesores",
     "thereisdatatosync": "Existen {{$a}} fuera-de-línea para ser sincronizados/as.",
-    "time": "Hora",
+    "time": "Tiempo",
     "timesup": "¡Se ha pasado el tiempo!",
     "today": "Hoy",
     "tryagain": "Intentar nuevamente",
@@ -197,7 +195,7 @@
     "unlimited": "Sin límite",
     "unzipping": "Descomprimiendo ZIP",
     "upgraderunning": "El sitio está siendo actualizado, por favor trate más tarde.",
-    "userdeleted": "Esta cuenta de usuario ha sido eliminada",
+    "userdeleted": "Esta cuenta se ha cancelado",
     "userdetails": "Detalles de usuario",
     "usernotfullysetup": "Usuario no cnfigurado completamente",
     "users": "Usuarios",
@@ -208,7 +206,7 @@
     "whyisthishappening": "¿Porqué está pasando esto?",
     "windowsphone": "Teléfono Windows",
     "wsfunctionnotavailable": "La función webservice no está disponible.",
-    "year": "año",
+    "year": "Año(s)",
     "years": "años",
     "yes": "Sí"
 }
\ No newline at end of file
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index 444d54b807e..b5230226a5b 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos los participantes",
     "android": "Android",
     "areyousure": "¿Està seguro?",
-    "back": "Atrás",
+    "back": "Volver a la vista previa de la pregunta",
     "cancel": "Cancelar",
     "cannotconnect": "No se puede conectar: Verifique que la URL es correcta y que el sitio Moodle usa la versión 2.4 o posterior.",
     "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile. Por favor contacte al administrador de su sitio.",
@@ -11,9 +11,9 @@
     "choose": "Elegir",
     "choosedots": "Elegir...",
     "clearsearch": "Limpiar búsqueda",
-    "clicktohideshow": "Clic para expandir o contraer.",
+    "clicktohideshow": "Clic para expandir o colapsar",
     "clicktoseefull": "Clic para ver el contenido al completo",
-    "close": "Cerrar",
+    "close": "Cerrar vista previa",
     "comments": "Comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
@@ -34,11 +34,11 @@
     "currentdevice": "Dispositivo actual",
     "datastoredoffline": "Los datos se almacenaron en el dispositivo debido a que no se pudieron enviar. Serán enviados automáticamente más tarde.",
     "date": "Fecha",
-    "day": "día",
-    "days": "días",
+    "day": "Día(s)",
+    "days": "Días",
     "decsep": ",",
     "delete": "Borrar",
-    "deleting": "Borrando",
+    "deleting": "Eliminando",
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -48,11 +48,10 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Descargar",
+    "download": "Haga clic para descargar el archivo de categorías exportadas",
     "downloading": "Descargando...",
     "edit": "Editar",
-    "elementseparator": ",",
-    "error": "Error",
+    "error": "Ha ocurrido un error desconocido.",
     "errorchangecompletion": "Ha ocurrido un error cargando el grado de realización. Por favor inténtalo de nuevo.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo de nuevo.",
     "errordownloading": "Ocurrió un error descargando el archivo",
@@ -88,10 +87,10 @@
     "lastmodified": "Última modificación",
     "lastsync": "Última sincronización",
     "listsep": ";",
-    "loading": "Cargando",
+    "loading": "Cargando...",
     "lostconnection": "Hemos perdido la conexión, necesita reconectar. Su token ya no es válido",
     "maxsizeandattachments": "Tamaño máximo para nuevos archivos: {{$a.size}}, número máximo de archivos adjuntos: {{$a.attachments}}",
-    "min": "minutos",
+    "min": "Más baja",
     "mins": "minutos",
     "mod_assign": "Tarea",
     "mod_assignment": "Tarea",
@@ -124,21 +123,21 @@
     "name": "Nombre",
     "networkerrormsg": "Conexión no disponible o sin funcionar.",
     "never": "Nunca",
-    "next": "Siguiente",
+    "next": "Continuar",
     "no": "No",
     "nocomments": "No hay comentarios",
-    "nograde": "No hay calificación",
+    "nograde": "Sin calificación",
     "none": "Ninguno",
-    "nopasswordchangeforced": "No puede continuar sin cambiar su contraseña.",
+    "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
-    "noresults": "No hay resultados",
+    "noresults": "Sin resultados",
     "notapplicable": "n/a",
     "notice": "Noticia",
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "No se requieren entregas online",
-    "online": "Conectado",
+    "offline": "Fuera de línea",
+    "online": "En línea",
     "openfullimage": "Haga clic aquí para ver la imagen a tamaño completo",
     "openinbrowser": "Abrir en el navegador",
     "othergroups": "Otros grupos",
@@ -146,23 +145,23 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Teléfono",
     "pictureof": "Imagen de {{$a}}",
-    "previous": "Anterior",
+    "previous": "Estado previo",
     "pulltorefresh": "Tirar para recargar",
     "redirectingtosite": "Será redirigido al sitio.",
-    "refresh": "Recargar",
+    "refresh": "Refrescar",
     "required": "Obligatorio",
     "requireduserdatamissing": "En este perfil de usuario faltan datos requeridos. Por favor, rellene estos datos e inténtelo otra vez.<br>{{$a}}",
     "retry": "Reintentar",
     "save": "Guardar",
-    "search": "Buscar",
-    "searching": "Buscando",
-    "searchresults": "Resultados de la búsqueda",
+    "search": "Buscar...",
+    "searching": "Buscando en...",
+    "searchresults": "Resultado",
     "sec": "segundos",
     "secs": "segundos",
     "seemoredetail": "Haga clic aquí para ver más detalles",
     "send": "Enviar",
     "sending": "Enviando",
-    "serverconnection": "Error conectando con el servidor",
+    "serverconnection": "Error al conectarse al servidor",
     "show": "Mostrar",
     "showmore": "Mostrar más...",
     "site": "Sitio",
@@ -179,7 +178,7 @@
     "tablet": "Tablet",
     "teachers": "Profesores",
     "thereisdatatosync": "Hay {{$a}} fuera de línea pendiente de ser sincronizado.",
-    "time": "Hora",
+    "time": "Tiempo",
     "timesup": "¡Se ha pasado el tiempo!",
     "today": "Hoy",
     "tryagain": "Intentar de nuevo",
@@ -200,7 +199,7 @@
     "whyisthishappening": "¿Porqué está pasando esto?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La función de webservice no está disponible.",
-    "year": "año",
+    "year": "Año(s)",
     "years": "años",
     "yes": "Sí"
 }
\ No newline at end of file
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index a6d6b8ca4b5..3c62499e565 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -3,7 +3,7 @@
     "allparticipants": "Partaide guztiak",
     "android": "Android",
     "areyousure": "Ziur al zaude?",
-    "back": "Atzera",
+    "back": "Itzuli aurreko galderara",
     "cancel": "Utzi",
     "cannotconnect": "Ezin izan da konektatu: URLa ondo idatzi duzula eta zure Moodle-ak 2.4 edo goragoko bertsioa erabiltzen duela egiaztatu ezazu.",
     "cannotdownloadfiles": "Fitxategiak jaistea ezgaituta dago zure Mobile zerbitzuan. Mesedez zure gune kudeatzailean harremanetan jarri zaitez.",
@@ -11,11 +11,11 @@
     "choose": "Aukeratu",
     "choosedots": "Aukeratu...",
     "clearsearch": "Bilaketa garbia",
-    "clicktohideshow": "Klik egin zabaldu edo tolesteko",
+    "clicktohideshow": "Sakatu zabaltzeko edo tolesteko",
     "clicktoseefull": "Klik egin eduki guztiak ikusteko.",
-    "close": "Itxi",
+    "close": "Leihoa itxi",
     "comments": "Iruzkinak",
-    "commentscount": "Iruzkinak: ({{$a}})",
+    "commentscount": "({{$a}}) iruzkinak",
     "commentsnotworking": "Iruzkinak ezin izan dira atzitu",
     "completion-alt-auto-fail": "Osatuta: {{$a}} (ez dute gutxieneko kalifikazioa lortu)",
     "completion-alt-auto-n": "Osatu gabea: {{$a}}",
@@ -32,12 +32,12 @@
     "continue": "Jarraitu",
     "copiedtoclipboard": "Testua arbelean kopiatu da",
     "course": "Ikastaroa",
-    "coursedetails": "Ikastaroaren xehetasunak",
+    "coursedetails": "Ikastaro-xehetasunak",
     "currentdevice": "Oraingo gailua",
     "datastoredoffline": "Gailu honetan gordetako informazioa ezin izan da bidali. Beranduago automatikoki bidaliko da.",
     "date": "Data",
-    "day": "egun(a)",
-    "days": "egun",
+    "day": "Egun",
+    "days": "Egun",
     "decsep": ",",
     "delete": "Ezabatu",
     "deleting": "Ezabatzen",
@@ -50,11 +50,10 @@
     "discard": "Baztertu",
     "dismiss": "Baztertu",
     "done": "Eginda",
-    "download": "Jaitsi",
+    "download": "Klikatu esportatutako kategoria-fitxategia deskargatzeko",
     "downloading": "Jaisten",
     "edit": "Editatu",
-    "elementseparator": ",",
-    "error": "Errorea",
+    "error": "Errore ezezagun bat gertatu da!",
     "errorchangecompletion": "Errorea gertatu da osaketa-egoera aldatzean. Mesedez saiatu berriz.",
     "errordeletefile": "Errorea fitxategia ezabatzean. Mesedez, saiatu berriz.",
     "errordownloading": "Errorea fitxategia jaistean.",
@@ -69,7 +68,6 @@
     "errorrenamefile": "Errorea izena berrizendatzean. Mesedez, saiatu berriz.",
     "errorsync": "Errorea gertatu da sinkronizatzean. Mesedez, saiatu berriz.",
     "errorsyncblocked": "{{$a}} hau ezin izan da orain sinkronizatu prozesu bat martxan dagoelako. Mesedez, saiatu berriz beranduago. Arazoa errepikatzen bada, saiatu app-a berrabiarazten.",
-    "fieldvalueseparator": ":",
     "filename": "Fitxategiaren izena",
     "filenameexist": "Fitxategi-izena dagoeneko existitzen da: {{$a}}",
     "folder": "Karpeta",
@@ -92,10 +90,10 @@
     "lastmodified": "Azken aldaketa",
     "lastsync": "Azken sinkronizazioa",
     "listsep": ";",
-    "loading": "Kargatzen",
+    "loading": "Igotzen...",
     "lostconnection": "Zure token-a orain ez da baliozkoa edo iraungitu da, gunera berriz konektatu beharko zara.",
     "maxsizeandattachments": "Gehienezko tamaina fitxategi berrietarako: {{$a.size}}, gehienezko eranskin-kopurua: {{$a.attachments}}",
-    "min": "minutu",
+    "min": "Baxuena",
     "mins": "minutu",
     "mod_assign": "Zeregina",
     "mod_assignment": "Zeregina",
@@ -128,12 +126,12 @@
     "name": "Izena",
     "networkerrormsg": "Sarea ezgaituta dago edo ez dabil.",
     "never": "Inoiz ez",
-    "next": "Hurrengoa",
+    "next": "Jarraitu",
     "no": "Ez",
-    "nocomments": "Iruzkinik ez",
-    "nograde": "Kalifikaziorik ez",
+    "nocomments": "Ez dago iruzkinik",
+    "nograde": "Kalifikaziorik ez.",
     "none": "Bat ere ez",
-    "nopasswordchangeforced": "Ezin duzu jarraitu zure pasahitza aldatu gabe.",
+    "nopasswordchangeforced": "Ezin duzu aurrera egin pasahitza aldatu gabe, baina ez dago aldatzeko inongo orririk. Mesedez, jarri harremanetan zure Moodle Kudeatzailearekin.",
     "nopermissions": "Sentitzen dugu, baina oraingoz ez duzu hori egiteko baimenik ({{$a}})",
     "noresults": "Emaitzarik ez",
     "notapplicable": "ezin da aplikatu",
@@ -142,24 +140,24 @@
     "now": "orain",
     "numwords": "{{$a}} hitz",
     "offline": "Lineaz kanpo",
-    "online": "On-line",
+    "online": "Online",
     "openfullimage": "Klik egin hemen irudia jatorrizko tamainan ikusteko",
     "openinbrowser": "Ireki nabigatzailean",
     "othergroups": "Beste taldeak",
     "pagea": "{{$a}} orria",
     "percentagenumber": "%{{$a}}",
     "phone": "Telefonoa",
-    "pictureof": "{{$a}}-ren argazkia",
-    "previous": "Aurrekoa",
+    "pictureof": "{{$a}}-ren irudia",
+    "previous": "Aurreko egoera",
     "pulltorefresh": "Sakatu freskatzeko",
     "redirectingtosite": "Gunera berbideratua izango zara.",
     "refresh": "Freskatu",
-    "required": "Beharrezkoa",
+    "required": "Beharrekoa",
     "requireduserdatamissing": "Erabiltzaile honek beharrezkoak diren profileko datuak bete gabe ditu. Mesedez, bete itzazu datu hauek zure Moodle gunean eta saiatu berriz.<br>{{$a}}",
     "retry": "Berriz saiatu",
     "save": "Gorde",
-    "search": "Bilatu",
-    "searching": "Bilatzen",
+    "search": "Bilatu...",
+    "searching": "Bilatzen hemen:",
     "searchresults": "Bilaketaren emaitzak",
     "sec": "seg",
     "secs": "segundu",
@@ -183,7 +181,7 @@
     "tablet": "Tablet-a",
     "teachers": "Irakasleak",
     "thereisdatatosync": "Lineaz-kanpoko {{$a}} daude sinkronizatzeko .",
-    "time": "Ordua",
+    "time": "Denbora",
     "timesup": "Denbora amaitu egin da!",
     "today": "Gaur",
     "tryagain": "Saiatu berriz",
@@ -206,7 +204,7 @@
     "whyisthishappening": "Zergatik ari da hau gertatzen?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Web-zerbitzu funtzioa ez dago eskuragarri.",
-    "year": "urtea",
+    "year": "Urte",
     "years": "urte",
     "yes": "Bai"
 }
\ No newline at end of file
diff --git a/www/core/lang/fa.json b/www/core/lang/fa.json
index 959e4ea3e48..35c3c437a9b 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "همهٔ اعضاء",
     "areyousure": "آیا مطمئن هستید؟",
-    "back": "بازگشت",
+    "back": "بازگشت به پیش‌نمایش سؤال",
     "cancel": "انصراف",
     "cannotconnect": "اتصال به سایت ممکن نبود. بررسی کنید که نشانی سایت را درست وارد کرده باشید و اینکه سایت شما از مودل ۲٫۴ یا جدیدتر استفاده کند.",
-    "category": "طبقه",
+    "category": "دسته",
     "choose": "انتخاب کنید",
     "choosedots": "انتخاب کنید...",
     "clicktohideshow": "برای باز یا بسته شدن کلیک کنید",
     "close": "بستن پنجره",
-    "comments": "نظرات",
+    "comments": "دیدگاه‌ها",
     "commentscount": "نظرات ({{$a}})",
     "completion-alt-auto-fail": "تکمیل شده است (بدون اکتساب نمرهٔ قبولی)",
     "completion-alt-auto-n": "تکمیل نشده است",
@@ -34,9 +34,9 @@
     "deleting": "در حال حذف",
     "description": "توصیف",
     "done": "پر کرده است",
-    "download": "دریافت",
-    "edit": "ویرایش ",
-    "error": "خطا",
+    "download": "برای دریافت فایل صادر شدهٔ طبقه کلیک کنید",
+    "edit": "ویرایش",
+    "error": "خطا رخ داد",
     "errordownloading": "خطا در دانلود فایل",
     "folder": "پوشه",
     "forcepasswordchangenotice": "برای پیش‌روی باید رمز ورود خود را تغییر دهید.",
@@ -48,14 +48,14 @@
     "hour": "ساعت",
     "hours": "ساعت",
     "imageviewer": "نمایشگر تصویر",
-    "info": "توضیحات",
+    "info": "اطلاعات",
     "labelsep": ":&nbsp;",
     "lastmodified": "آخرین تغییر",
     "listsep": ",",
-    "loading": "بارگذاری",
+    "loading": "در حال بارگیری...",
     "lostconnection": "اطلاعات توکن شناسایی شما معتبر نیست یا منقضی شده است. باید دوباره به سایت متصل شوید.",
     "maxsizeandattachments": "حداکثر اندازه برای فایل‌های جدید: {{$a.size}}، حداکثر تعداد فایل‌های پیوست: {{$a.attachments}}",
-    "min": "دقیقه",
+    "min": "کف",
     "mins": "دقیقه",
     "mod_assign": "تکلیف",
     "mod_chat": "اتاق گفتگو",
@@ -72,10 +72,10 @@
     "moduleintro": "توصیف",
     "name": "نام",
     "networkerrormsg": "شبکه قابل دسترسی نیست",
-    "never": "هیچوقت",
+    "never": "هیچ‌وقت",
     "next": "ادامه",
     "no": "خیر",
-    "nocomments": "بدون دیدگاه",
+    "nocomments": "نظری ارائه نشده است",
     "nograde": "بدون نمره",
     "none": "هیچ",
     "nopasswordchangeforced": "شما نمی‌توانید بدون تغییر رمز عبور ادامه دهید اما هیچ صفحه‌ای برای عوض کردن آن وجود ندارد. لطفا با مدیریت سایت تماس بگیرید.",
@@ -90,19 +90,19 @@
     "pagea": "صفحه {{$a}}",
     "phone": "تلفن",
     "pictureof": "عکس {{$a}}",
-    "previous": "قبلی",
+    "previous": "حالت قبلی",
     "pulltorefresh": "برای تازه‌سازی بکشید",
     "refresh": "تازه‌سازی",
-    "required": "الزامی بودن",
+    "required": "اجباری",
     "save": "ذخیره",
-    "search": "جستجو",
+    "search": "جستجو...",
     "searching": "در حال جستجو در ...",
-    "searchresults": "نتیجهٔ جستجو",
+    "searchresults": "نتایج جستجو",
     "sec": "ثانیه",
     "secs": "ثانیه",
     "seemoredetail": "برای دیدن جزئیات بیشتر اینجا را کلیک کنید",
     "send": "ارسال",
-    "sending": "ارسال کردن",
+    "sending": "در حال ارسال",
     "serverconnection": "خطا در اتصال به کارگزار",
     "show": "نمایش",
     "showmore": "نمایش بیشتر...",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index 46ac02950b7..c1cdd4a8af7 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -2,18 +2,18 @@
     "accounts": "Comptes",
     "allparticipants": "Tous les participants",
     "android": "Android",
-    "areyousure": "Vraiment ?",
-    "back": "Retour",
+    "areyousure": "En êtes-vous bien sûr ?",
+    "back": "Retour à la question précédente",
     "cancel": "Annuler",
     "cannotconnect": "Connexion impossible : vérifiez que l'URL a été saisie correctement et que votre site utilise Moodle 2.4 ou ultérieur.",
     "cannotdownloadfiles": "Le téléchargement de fichiers est désactivé dans le service mobile de votre plateforme. Veuillez contacter l'administrateur de la plateforme.",
     "category": "Catégorie",
-    "choose": "Sélectionner",
+    "choose": "Choisir",
     "choosedots": "Choisir...",
     "clearsearch": "Effacer la recherche",
-    "clicktohideshow": "Cliquer pour développer ou replier",
+    "clicktohideshow": "Cliquer pour déplier ou replier",
     "clicktoseefull": "Cliquer pour voir tout le contenu.",
-    "close": "Fermer",
+    "close": "Fermer la prévisualisation",
     "comments": "Commentaires",
     "commentscount": "Commentaires ({{$a}})",
     "commentsnotworking": "Les commentaires ne peuvent pas être récupérés",
@@ -36,12 +36,12 @@
     "currentdevice": "Appareil actuel",
     "datastoredoffline": "Données stockées sur l'appareil, car elles n'ont pas pu être envoyées. Elles seront automatiquement envoyées ultérieurement.",
     "date": "Date",
-    "day": "jour",
-    "days": "jours",
+    "day": "Jour(s)",
+    "days": "Jours",
     "decsep": ",",
     "defaultvalue": "Défaut ({{$a}})",
     "delete": "Supprimer",
-    "deleting": "Suppression",
+    "deleting": "En cours de suppression",
     "description": "Description",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -51,11 +51,10 @@
     "discard": "Ignorer",
     "dismiss": "Rejeter",
     "done": "Terminé",
-    "download": "Télécharger",
+    "download": "Cliquer pour télécharger le fichier exporté",
     "downloading": "Téléchargement en cours",
     "edit": "Modifier",
-    "elementseparator": ",",
-    "error": "Erreur",
+    "error": "Une erreur inconnue est survenue !",
     "errorchangecompletion": "Une erreur est survenue lors du changement de l'état d'achèvement. Veuillez essayer à nouveau.",
     "errordeletefile": "Erreur lors de la suppression du fichier. Veuillez essayer à nouveau.",
     "errordownloading": "Erreur lors du téléchargement du fichier.",
@@ -70,7 +69,6 @@
     "errorrenamefile": "Erreur lors du renommage du fichier. Veuillez essayer à nouveau.",
     "errorsync": "Une erreur est survenue lors de la synchronisation. Veuillez essayer plus tard.",
     "errorsyncblocked": "Ce {{$a}} ne peut pas être synchronisé à l'instant en raison d'une tâche en cours. Veuillez essayer plus tard. Si le problème persiste, veuillez relancer l'app.",
-    "fieldvalueseparator": ":",
     "filename": "Nom de fichier",
     "filenameexist": "Le nom de fichier existe déjà : {{$a}}",
     "folder": "Dossier",
@@ -90,13 +88,13 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": "&nbsp;",
-    "lastmodified": "Modifié le",
+    "lastmodified": "Dernière modification",
     "lastsync": "Dernière synchronisation",
     "listsep": ";",
-    "loading": "Chargement",
+    "loading": "Chargement...",
     "lostconnection": "Connexion perdue. Vous devez vous reconnecter. Votre jeton n'est plus valide",
     "maxsizeandattachments": "Taille maximale des nouveaux fichiers : {{$a.size}}. Nombre maximal d'annexes : {{$a.attachments}}",
-    "min": "min",
+    "min": "Minimum",
     "mins": "min",
     "mod_assign": "Devoir",
     "mod_assignment": "Devoir",
@@ -129,20 +127,20 @@
     "name": "Nom",
     "networkerrormsg": "Réseau désactivé ou en panne.",
     "never": "Jamais",
-    "next": "Suivant",
+    "next": "Continuer",
     "no": "Non",
     "nocomments": "Aucun commentaire",
-    "nograde": "Pas de note",
+    "nograde": "Aucune note.",
     "none": "Aucun",
-    "nopasswordchangeforced": "Vous ne pouvez pas continuer ans changer votre mot de passe.",
+    "nopasswordchangeforced": "Vous ne pouvez pas continuer sans modifier votre mot de passe. Cependant, il n'y a aucun moyen disponible de le modifier. Veuillez contacter l'administrateur de votre Moodle.",
     "nopermissions": "Désolé, vous n'avez actuellement pas les droits d'accès requis pour effectuer ceci ({{$a}})",
-    "noresults": "Aucun résultat",
+    "noresults": "Pas de résultat",
     "notapplicable": "n/a",
     "notice": "Remarque",
     "notsent": "Pas envoyé",
     "now": "maintenant",
     "numwords": "{{$a}} mots",
-    "offline": "Hors ligne",
+    "offline": "Déconnecté",
     "online": "En ligne",
     "openfullimage": "Cliquer ici pour afficher l'image en pleine grandeur",
     "openinbrowser": "Ouvrir dans le navigateur",
@@ -150,8 +148,8 @@
     "pagea": "Page {{$a}}",
     "percentagenumber": "{{$a}} %",
     "phone": "Téléphone",
-    "pictureof": "Avatar de {{$a}}",
-    "previous": "Précédent",
+    "pictureof": "Avatar {{$a}}",
+    "previous": "État précédent",
     "pulltorefresh": "Tirer pour actualiser",
     "redirectingtosite": "Vous allez être redirigé vers le site.",
     "refresh": "Actualiser",
@@ -159,32 +157,32 @@
     "requireduserdatamissing": "Il manque certaines données au profil de cet utilisateur. Veuillez compléter ces données dans votre plateforme Moodle et essayer à nouveau.<br />{{$a}}",
     "retry": "Essayer à nouveau",
     "save": "Enregistrer",
-    "search": "Recherche",
-    "searching": "Recherche",
+    "search": "Recherche...",
+    "searching": "Recherche dans...",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
     "seemoredetail": "Cliquer ici pour avoir plus de détail",
     "send": "Envoyer",
     "sending": "Envoi",
-    "serverconnection": "Erreur de connexion au serveur",
+    "serverconnection": "Erreur lors de la connexion au serveur",
     "show": "Afficher",
     "showmore": "Afficher plus...",
     "site": "Site",
     "sitemaintenance": "Le site est en cours de maintenance et n'est pas disponible.",
     "sizeb": "octets",
     "sizegb": "Go",
-    "sizekb": "ko",
+    "sizekb": "Ko",
     "sizemb": "Mo",
     "sizetb": "To",
     "sorry": "Désolé...",
     "start": "Début",
     "submit": "Envoyer",
-    "success": "Succès !",
+    "success": "Succès",
     "tablet": "Tablette",
     "teachers": "Enseignants",
     "thereisdatatosync": "Il y a des {{$a}} locales à synchroniser",
-    "time": "Heure",
+    "time": "Temps",
     "timesup": "Le chrono est enclenché !",
     "today": "Aujourd'hui",
     "tryagain": "Essayer encore",
@@ -197,18 +195,18 @@
     "unlimited": "Illimité",
     "unzipping": "Décompression",
     "upgraderunning": "Ce site est en phase de mise à jour. Veuillez essayer plus tard.",
-    "userdeleted": "Ce compte utilisateur a été supprimé",
+    "userdeleted": "Le compte de cet utilisateur a été supprimé",
     "userdetails": "Informations détaillées",
     "usernotfullysetup": "Utilisateur pas complètement défini",
     "users": "Utilisateurs",
-    "view": "Consulter",
-    "viewprofile": "Afficher le profil",
+    "view": "Afficher",
+    "viewprofile": "Consulter le profil",
     "warningofflinedatadeleted": "Des données locales de {{component}} « {{name}} » ont été supprimées. {{error}}",
     "whoops": "Oups !",
     "whyisthishappening": "Que se passe-t-il ?",
     "windowsphone": "Windows phone",
     "wsfunctionnotavailable": "La fonction webservice n'est pas disponible",
-    "year": "année",
+    "year": "Année(s)",
     "years": "années",
     "yes": "Oui"
 }
\ No newline at end of file
diff --git a/www/core/lang/he.json b/www/core/lang/he.json
index e20a18bd9af..aa240eedc8c 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -2,7 +2,7 @@
     "allparticipants": "כל המשתתפים",
     "android": "אנדרואיד",
     "areyousure": "האם את/ה בטוח/ה?",
-    "back": "חזרה",
+    "back": "חזרה לתצוגה המקדימה של השאלה.",
     "cancel": "ביטול",
     "cannotconnect": "אין אפשרות להתחבר: אנא ודא כי הזנת נכון את כתובת האתר ושהאתר הוא בגרסה 2.4 ומעלה.",
     "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת במכשירים ניידים. יש לפנות למנהל/ת האתר להפעלת אפשרות זו.",
@@ -11,35 +11,35 @@
     "choosedots": "בחירה...",
     "clearsearch": "איפוס חיפוש",
     "clicktohideshow": "הקש להרחבה או לצמצום",
-    "close": "סגירה",
+    "close": "סגירת חלון",
     "comments": "הערות",
-    "commentscount": "({{$a}}) הערות",
-    "completion-alt-auto-fail": "הושלם: {{$a}} (לא הושג ציון עובר)",
+    "commentscount": "(הערות {{$a}})",
+    "completion-alt-auto-fail": "הושלם: {{$a}} (לא השיג ציון עובר)",
     "completion-alt-auto-n": "לא הושלם: {{$a}}",
-    "completion-alt-auto-pass": "הושלם: {{$a}} (הושג ציון עובר)",
+    "completion-alt-auto-pass": "הושלם: {{$a}} (השיג ציון עובר)",
     "completion-alt-auto-y": "הושלם: {{$a}}",
-    "completion-alt-manual-n": "לא הושלם: {{$a}}. יש לבחור כדי לסמן כ:הושלם.",
-    "completion-alt-manual-y": "הושלם: {{$a}}. יש לבחור כדי לסמן כ:לא-הושלם.",
+    "completion-alt-manual-n": "{{$a}} לא הושלם.   הקליקו לסימון כ\"הושלם\"",
+    "completion-alt-manual-y": "{{$a}} הושלם.   הקליקו לסימון כ\"לא הושלם\"",
     "confirmdeletefile": "האם הינך בטוח כי ברצונך למחוק את קובץ זה?",
     "content": "תוכן",
     "continue": "המשך",
     "course": "קורס",
     "coursedetails": "פרטי הקורס",
     "date": "תאריך",
-    "day": "יום",
+    "day": "ימים",
     "days": "ימים",
     "decsep": ".",
     "delete": "מחיקה",
     "deleting": "מוחק",
-    "description": "תיאור",
+    "description": "תאור",
     "dfdayweekmonth": "dddd, D  MMMM",
     "dflastweekdate": "dddd",
     "dftimedate": "hh[:]mm",
     "done": "גמור",
-    "download": "הורדה",
+    "download": "יש להקליק להורדת קובץ הקטגוריות שיוצא",
     "downloading": "מוריד",
     "edit": "עריכה",
-    "error": "שגיאה",
+    "error": "התרחשה שגיאה לא ידוע!",
     "errordownloading": "שגיאה בהורדת קובץ",
     "errordownloadingsomefiles": "שגיאה בהורדת קבצי המודול. יתכן וחלק מהקבצים חסרים.",
     "filename": "שם הקובץ",
@@ -56,12 +56,12 @@
     "imageviewer": "מציג תמונות",
     "info": "מידע",
     "labelsep": ":",
-    "lastmodified": "שינוי אחרון",
+    "lastmodified": "עדכון אחרון",
     "listsep": ",",
-    "loading": "טוען",
+    "loading": "מתבצעה...",
     "lostconnection": "לקוד הזיהוי המאובטח שלך פג התוקף, ולכן החיבור נותק. עליך להתחבר שוב.",
     "maxsizeandattachments": "נפח קבצים מירבי: {{$a.size}}, מספר קבצים מצורפים מירבי: {{$a.attachments}}",
-    "min": "דקה",
+    "min": "נמוך ביותר",
     "mins": "דקות",
     "mod_assign": "מטלה",
     "mod_assignment": "מטלה",
@@ -92,50 +92,50 @@
     "moduleintro": "הנחיה לפעילות",
     "name": "שם",
     "networkerrormsg": "הרשת לא מופעלת או לא עובדת.",
-    "never": "אף פעם לא",
-    "next": "הבא",
+    "never": "אף פעם",
+    "next": "המשך",
     "no": "לא",
-    "nocomments": "ללא הערות",
+    "nocomments": "אין הערות",
     "nograde": "אין ציון",
-    "none": "אין",
+    "none": "ללא",
     "nopasswordchangeforced": "אינך יכול להמשיך ללא שינוי הסיסמה שלך. אך נכון לעכשיו אין דף זמין בו ניתן לשנותה. אנא צור קשר עם מנהל המוודל שלך.",
     "nopermissions": "למשתמש שלכם אין את ההרשאה לבצע את הפעולה \"{{$a}}\".\n<br/>\nיש לפנות למנהל(ת) המערכת שלכם לקבלת ההרשאות המתאימות.",
-    "noresults": "אין תוצאות",
+    "noresults": "לא נמצאו תוצאות",
     "notapplicable": "לא זמין",
     "notice": "לתשומת לב",
     "now": "עכשיו",
     "numwords": "{{$a}} מילים",
-    "offline": "לא מחובר",
-    "online": "מחובר",
+    "offline": "לא מקוון",
+    "online": "מקוון",
     "openfullimage": "יש להקליק כאן להצגת התמונה בגודל מלא",
     "openinbrowser": "תצוגה בדפדפן",
     "pagea": "עמוד {{$a}}",
     "phone": "טלפון",
     "pictureof": "תמונה של {{$a}}",
-    "previous": "קודם",
+    "previous": "מצב קודם",
     "pulltorefresh": "משיכה לרענון",
-    "refresh": "ריענון",
+    "refresh": "רענון",
     "required": "נדרש",
     "requireduserdatamissing": "למשתמש זה חסרים שדות נדרשים בפרופיל המשתמש. יש להשלים מידע זה באתר המוודל שלך ולנסות שוב.<br>{{$a}}",
     "save": "שמירה",
-    "search": "חיפוש",
+    "search": "חיפוש...",
     "searching": "מחפש ב...",
-    "searchresults": "תוצאות חיפוש",
+    "searchresults": "תוצאות החיפוש",
     "sec": "שניה",
     "secs": "שניות",
-    "seemoredetail": "לחץ כאן כדי לראות פרטים נוספים",
-    "send": "שליחה",
-    "sending": "שולח",
-    "serverconnection": "שגיאה בחיבור לשרת",
-    "show": "הצגה",
+    "seemoredetail": "הקליקו כאן כדי לראות פרטים נוספים",
+    "send": "לשלוח",
+    "sending": "שולחים",
+    "serverconnection": "שגיאה בהתחברות לשרת",
+    "show": "תצוגה",
     "site": "מערכת",
     "sizeb": "בתים",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
     "start": "התחלה",
-    "submit": "שמירה",
-    "success": "הצלחה!",
+    "submit": "הגשה",
+    "success": "הצלחה",
     "tablet": "טאבלט",
     "teachers": "מורים",
     "time": "זמן",
@@ -149,9 +149,9 @@
     "userdetails": "מאפייניי המשתמש",
     "users": "משתמשים",
     "view": "צפיה",
-    "viewprofile": "צפיה בפרופיל",
+    "viewprofile": "תצוגת מאפיינים",
     "whoops": "אוווווופס!",
-    "year": "שנה",
+    "year": "שנים",
     "years": "שנים",
     "yes": "כן"
 }
\ No newline at end of file
diff --git a/www/core/lang/hu.json b/www/core/lang/hu.json
index 5a2b766447f..24eaed06fef 100644
--- a/www/core/lang/hu.json
+++ b/www/core/lang/hu.json
@@ -1,8 +1,8 @@
 {
     "allparticipants": "Összes résztvevő",
     "areyousure": "Biztos?",
-    "back": "Vissza",
-    "cancel": "Mégse",
+    "back": "Vissza a kérdés előzetes megtekintéséhez",
+    "cancel": "Törlés",
     "cannotconnect": "Sikertelen kapcsolódás: ellenőrizze, jó-e az URL és a portál legalább 2.4-es Moodle-t használ-e.",
     "category": "Kategória",
     "choose": "Választás",
@@ -10,7 +10,7 @@
     "clicktohideshow": "Kattintson a kibontáshoz vagy a becsukáshoz.",
     "close": "Ablak bezárása",
     "comments": "Megjegyzések",
-    "commentscount": "Megjegyzések  ({{$a}})",
+    "commentscount": "Megjegyzések ({{$a}})",
     "completion-alt-auto-fail": "Teljesítve: {{$a}}  (a teljesítési pontszámot nem érte el)",
     "completion-alt-auto-n": "Nincs teljesítve:  {{$a}}",
     "completion-alt-auto-pass": "Teljesítve: {{$a}} (a teljesítési pontszámot elérte)",
@@ -19,22 +19,22 @@
     "completion-alt-manual-y": "Teljesítve:  {{$a}}, teljesítetlenként való megjelöléséhez válassza ki.",
     "confirmdeletefile": "Biztosan törli ezt az állományt?",
     "content": "Tartalom",
-    "continue": "Folytatás",
+    "continue": "Tovább",
     "course": "Kurzus",
     "coursedetails": "Kurzusadatok",
     "date": "Dátum",
     "day": "nap",
-    "days": "nap",
+    "days": "Nap",
     "decsep": ",",
     "defaultvalue": "Alapeset ({{$a}})",
     "delete": "Törlés",
     "deleting": "Törlés",
     "description": "Leírás",
     "done": "Kész",
-    "download": "Letöltés",
+    "download": "Az exportált kategóriafájl letöltéséhez kattintson",
     "downloading": "Letöltés...",
     "edit": "Szerkesztés",
-    "error": "Hiba",
+    "error": "Ismeretlen hiba történt!",
     "errordownloading": "Nem sikerült letölteni az állományt.",
     "filename": "Állománynév",
     "folder": "Mappa",
@@ -46,14 +46,14 @@
     "hide": "Elrejtés",
     "hour": "óra",
     "hours": "óra",
-    "info": "Információ",
+    "info": "Infó",
     "labelsep": ":",
-    "lastmodified": "Utolsó módosítás",
+    "lastmodified": "Utolsó módosítás dátuma:",
     "listsep": ";",
-    "loading": "Betöltés",
+    "loading": "Betöltés...",
     "lostconnection": "A kapcsolat megszakadt, kacsolódjon újból. Jele érvénytelen.",
     "maxsizeandattachments": "Új állományok maximális mérete: {{$a.size}}, maximális csatolt állomány: {{$a.attachments}}",
-    "min": "p",
+    "min": "Legalacsonyabb",
     "mins": "perc",
     "mod_assign": "Feladat",
     "mod_chat": "Csevegés",
@@ -71,33 +71,33 @@
     "name": "Név",
     "networkerrormsg": "A hálózat nincs bekapcsolva vagy nem működik.",
     "never": "Soha",
-    "next": "Következő",
+    "next": "Tovább",
     "no": "Nem",
-    "nocomments": "Nincs megjegyzés.",
+    "nocomments": "Nincs megjegyzés",
     "nograde": "Nincs osztályzat",
-    "none": "Nincs",
+    "none": "Egy sem",
     "nopasswordchangeforced": "A továbblépéshez először módosítania kell a jelszavát, ehhez azonban nem áll rendelkezésre megfelelő oldal. Forduljon a Moodle rendszergazdájához.",
     "nopermissions": "Ehhez ({{$a}}) jelenleg nincs engedélye",
     "noresults": "Nincs eredmény",
     "notice": "Tájékoztatás",
     "now": "most",
     "numwords": "{{$a}} szó",
-    "offline": "Nincs szükség neten keresztüli leadásra",
+    "offline": "Offline",
     "online": "Online",
     "pagea": "{{$a}} oldal",
     "phone": "Telefon",
     "pictureof": "Kép",
-    "previous": "Előző",
+    "previous": "Előző állapot",
     "refresh": "Frissítés",
     "required": "Kitöltendő",
     "save": "Mentés",
-    "search": "Keresés",
+    "search": "Keresés...",
     "searching": "Keresés helye ...",
     "searchresults": "Keresési eredmények",
     "sec": "mp",
     "secs": "mp",
     "seemoredetail": "A részletekért kattintson ide",
-    "send": "Elküld",
+    "send": "Küldés",
     "sending": "Küldés",
     "serverconnection": "Hiba a szerverhez csatlakozás közben",
     "show": "Mutat",
@@ -121,9 +121,9 @@
     "userdetails": "Felhasználó adatai",
     "usernotfullysetup": "A felhasználó beállítása még nincs kész",
     "users": "Felhasználó",
-    "view": "Nézet",
+    "view": "Megtekintés",
     "viewprofile": "Profil megtekintése",
-    "year": "év",
+    "year": "Év",
     "years": "év",
     "yes": "Igen"
 }
\ No newline at end of file
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index ef565c113a0..81fe258864b 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -2,7 +2,7 @@
     "allparticipants": "Tutti i partecipanti",
     "android": "Android",
     "areyousure": "Sei sicuro?",
-    "back": "Indietro",
+    "back": "Torna all'anteprima della domanda",
     "cancel": "Annulla",
     "cannotconnect": "Impossibile connettersi: verificare che l'URL sia corretto e che il sito usi Moodle 2.4 o versioni successive.",
     "cannotdownloadfiles": "Nel servizio Mobile Lo scaricamento di file è disabilitato. Per favore contatta l'amministratore del sito.",
@@ -12,16 +12,16 @@
     "clearsearch": "Pulisci la ricerca",
     "clicktohideshow": "Click per aprire e chiudere",
     "clicktoseefull": "Click per visualizzare il contenuto completo.",
-    "close": "Chiudi",
+    "close": "Chiudi finestra",
     "comments": "Commenti",
-    "commentscount": "Commenti: ({{$a}})",
+    "commentscount": "Commenti ({{$a}})",
     "commentsnotworking": "Non è possibile scaricare i commenti",
-    "completion-alt-auto-fail": "Completato: {{$a}} (senza la sufficienza)",
-    "completion-alt-auto-n": "Non completato: {{$a}}",
-    "completion-alt-auto-pass": "Completato: {{$a}} (con la sufficienza)",
-    "completion-alt-auto-y": "Completato: {{$a}}",
-    "completion-alt-manual-n": "Non completato: {{$a}}. Selezionare per indicare come completato.",
-    "completion-alt-manual-y": "Completato: {{$a}}. Selezionare per indicare come non completato.",
+    "completion-alt-auto-fail": "Completato: {{$a}} (senza raggiungere la sufficienza)",
+    "completion-alt-auto-n": "Non completata: {{$a}}",
+    "completion-alt-auto-pass": "Completato: {{$a}} (raggiunta la sufficienza)",
+    "completion-alt-auto-y": "Completata: {{$a}}",
+    "completion-alt-manual-n": "Non completata: {{$a}}.\nSelezionarla per spuntarla come completata.",
+    "completion-alt-manual-y": "Completata: {{$a}}. Selezionarla per spuntarla come non completata.",
     "confirmcanceledit": "Sei sicuro di abbandonare questa pagina? Tutte le modifiche saranno perdute.",
     "confirmdeletefile": "Sei sicuro di voler eliminare questo file?",
     "confirmopeninbrowser": "Desideri aprirlo nel browser?",
@@ -30,23 +30,22 @@
     "course": "Corso",
     "coursedetails": "Dettagli corso",
     "date": "Data",
-    "day": "giorno",
-    "days": "giorni",
+    "day": "Giorni",
+    "days": "Giorni",
     "decsep": ",",
     "defaultvalue": "Default ({{$a}})",
     "delete": "Elimina",
-    "deleting": "Eliminazione in corso",
+    "deleting": "Eliminazione",
     "description": "Descrizione",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
     "done": "Fatto",
-    "download": "Scarica",
+    "download": "Click per il download del file della categoria esportata",
     "downloading": "Scaricamento in corso",
     "edit": "Modifica",
-    "elementseparator": ",",
-    "error": "Errore",
+    "error": "Si è verificato un errore sconosciuto!",
     "errorchangecompletion": "Si è verificato un errore durante la modifica dello stato di completamento. Per favore riprova.",
     "errordeletefile": "Si è verificato un errore durante l'eliminazione del file. Per favore riprova.",
     "errordownloading": "Si è verificato un errore durante lo scaricamento del file.",
@@ -71,17 +70,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Immagine",
     "imageviewer": "Visualizzatore di immagini",
-    "info": "Informazioni",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
-    "lastmodified": "Ultime modifiche",
+    "lastmodified": "Ultima modifica",
     "lastsync": "Ultima sincronizzazione",
     "listsep": ";",
-    "loading": "Caricamento in corso",
+    "loading": "Caricamento in corso...",
     "lostconnection": "La connessione è stata perduta. Il tuo token non è più valido.",
     "maxsizeandattachments": "Dimensione massima per i file nuovi: {{$a.size}}, numero massimo di allegati: {{$a.attachments}}",
-    "min": "minuto",
-    "mins": "minuti",
+    "min": "Minimo",
+    "mins": "min.",
     "mod_assign": "Compito",
     "mod_assignment": "Compito",
     "mod_book": "Libro",
@@ -113,10 +112,10 @@
     "name": "Nome",
     "networkerrormsg": "La rete non è abilitata o non funziona.",
     "never": "Mai",
-    "next": "Successivo",
+    "next": "Continua",
     "no": "No",
     "nocomments": "Non ci sono commenti",
-    "nograde": "Senza valutazione",
+    "nograde": "Nessuna valutazione.",
     "none": "Nessuno",
     "nopasswordchangeforced": "Non puoi proseguire senza modificare la tua password, ma non c'è una pagina per cambiarla. Contatta il tuo amministratore Moodle.",
     "nopermissions": "Spiacente, ma attualmente non avete il permesso per fare questo ({{$a}})",
@@ -134,35 +133,35 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefono",
     "pictureof": "Immagine {{$a}}",
-    "previous": "Precedente",
+    "previous": "Stato precedente",
     "pulltorefresh": "Trascina per aggiornare",
     "refresh": "Aggiorna",
     "required": "Obbligatorio",
     "requireduserdatamissing": "Nel profilo di questo utente mancano alcuni dati. Per favore compila i dati mancanti in Moodle e riprova.<br>{{$a}}",
     "retry": "Riprova",
     "save": "Salva",
-    "search": "Cerca",
-    "searching": "Ricerca in corso",
-    "searchresults": "Risultati della ricerca",
+    "search": "Cerca...",
+    "searching": "Ricerca in ...",
+    "searchresults": "Risultati delle ricerche",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
     "send": "Invia",
-    "sending": "Invio in c orso",
-    "serverconnection": "Si è verificato un errore durante il collegamento con il server.",
+    "sending": "Invio in corso",
+    "serverconnection": "Si è verificato un errore durante la connessione al server",
     "show": "Visualizza",
     "site": "Sito",
-    "sizeb": "byte",
+    "sizeb": "bytes",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
     "sizetb": "TB",
     "start": "Apertura",
     "submit": "Invia",
-    "success": "OK!",
+    "success": "Operazione eseguita con successo",
     "tablet": "Tablet",
     "teachers": "Docenti",
-    "time": "Data/Ora",
+    "time": "Ora",
     "timesup": "Tempo scaduto!",
     "today": "Oggi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -171,16 +170,16 @@
     "unlimited": "Nessun limite",
     "unzipping": "Decompressione in corso",
     "upgraderunning": "Il sito è in fase di aggiornamento, per favore provate ad accedere più tardi",
-    "userdeleted": "Questo account utente è stato eliminato",
+    "userdeleted": "Questo account è stato eliminato",
     "userdetails": "Dettagli dell'utente",
     "usernotfullysetup": "Utente non completamente impostato",
     "users": "Utenti",
     "view": "Visualizza",
-    "viewprofile": "Visualizza profilo",
+    "viewprofile": "Visualizza",
     "whoops": "Oops!",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La funzione webservice non è disponibile.",
-    "year": "anno",
+    "year": "Anni",
     "years": "anni",
     "yes": "Si"
 }
\ No newline at end of file
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index c36075d65b9..61a73bc6dea 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -1,13 +1,13 @@
 {
     "allparticipants": "すべての参加者",
     "areyousure": "本当によろしいですか?",
-    "back": "戻る",
+    "back": "問題のプレビューに戻る",
     "cancel": "キャンセル",
     "cannotconnect": "接続できません：正しいURLを入力しているか、サイトのMoodleが2.4以降であることを確認してください。",
     "category": "カテゴリ",
     "choose": "選択",
     "choosedots": "選択 ...",
-    "clicktohideshow": "展開または折りたたむには、ここをクリックしてください。",
+    "clicktohideshow": "展開または折りたたむにはここをクリックしてください。",
     "close": "ウィンドウを閉じる",
     "comments": "コメント",
     "commentscount": "コメント ({{$a}})",
@@ -31,10 +31,10 @@
     "deleting": "削除中",
     "description": "説明",
     "done": "完了",
-    "download": "ダウンロード",
+    "download": "エクスポートしたカテゴリファイルをダウンロードする",
     "downloading": "ダウンロード中 ...",
     "edit": "編集",
-    "error": "エラー",
+    "error": "不明なエラーが発生しました!",
     "errordownloading": "ファイルのダウンロードのエラー",
     "filename": "ファイル名",
     "folder": "フォルダ",
@@ -46,14 +46,14 @@
     "hide": "非表示",
     "hour": "時間",
     "hours": "時間",
-    "info": "情報",
+    "info": "インフォメーション",
     "labelsep": ":",
     "lastmodified": "最終更新日時",
     "listsep": ",",
-    "loading": "読込中",
+    "loading": "読み込み中 ...",
     "lostconnection": "あなたのトークンが無効になったため、再接続に必要な情報がサーバにはありません。",
     "maxsizeandattachments": "新しいファイルの最大サイズ: {{$a.size}} / 最大添付: {{$a.attachments}}",
-    "min": "分",
+    "min": "最低",
     "mins": "分",
     "mod_assign": "課題",
     "mod_chat": "チャット",
@@ -71,9 +71,9 @@
     "name": "名称",
     "networkerrormsg": "ネットワークが無効もしくは機能していません",
     "never": "なし",
-    "next": "次へ",
+    "next": "続ける",
     "no": "No",
-    "nocomments": "コメントなし",
+    "nocomments": "コメントはありません。",
     "nograde": "評点なし",
     "none": "なし",
     "nopasswordchangeforced": "あなたはパスワードを変更せずに次へ進むことはできません。しかし、パスワードを変更するため利用できるページがありません。あなたのMoodle管理者にご連絡ください。",
@@ -82,16 +82,16 @@
     "notice": "警告",
     "now": "現在",
     "numwords": "{{$a}} 語",
-    "offline": "オンライン提出不要",
+    "offline": "オフライン",
     "online": "オンライン",
     "pagea": "ページ {{$a}}",
     "phone": "電話",
     "pictureof": "画像 {{$a}}",
-    "previous": "前へ",
+    "previous": "前の状態に戻す",
     "refresh": "リフレッシュ",
     "required": "必須",
     "save": "保存",
-    "search": "検索",
+    "search": "検索 ...",
     "searching": "検索 ...",
     "searchresults": "検索結果",
     "sec": "秒",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 19ab070955f..9f682afb1e9 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -3,26 +3,26 @@
     "allparticipants": "Visi dalyviai",
     "android": "Android",
     "areyousure": "Ar Jūs tikras?",
-    "back": "Grįžti",
+    "back": "Grįžti į klausimo peržiūrą",
     "cancel": "Atšaukti",
     "cannotconnect": "Negalima prisijungti: patikrinkite, ar teisingai įvedėte URL adresą, ar Jūsų svetainė naudoja Moodle 2.4. ar vėlesnę versiją.",
     "cannotdownloadfiles": "Jūsų mobiliuoju ryšiu negalima atsisiųsti failo. Prašome susisiekti su svetainės administratoriumi.",
-    "category": "Kursų kategorija",
+    "category": "Kategorija",
     "choose": "Pasirinkite",
     "choosedots": "Pasirinkite...",
     "clearsearch": "Išvalyti peiškos laukelį",
     "clicktohideshow": "Spustelėkite, kad išplėstumėte ar sutrauktumėte",
     "clicktoseefull": "Paspauskite norėdami pamatyti visą turinį.",
-    "close": "Uždaryti",
+    "close": "Uždaryti langą",
     "comments": "Komentarai",
     "commentscount": "Komentarai ({{$a}})",
     "commentsnotworking": "Komentarų negalima ištaisyti",
-    "completion-alt-auto-fail": "Baigta: {{$a}} (nepasiekta)",
+    "completion-alt-auto-fail": "Užbaigta: {{$a}} (negautas išlaikymo įvertis)",
     "completion-alt-auto-n": "Nebaigta: {{$a}}",
-    "completion-alt-auto-pass": "Baigta: {{$a}} (pasiekta)",
-    "completion-alt-auto-y": "Baigta: {{$a}}",
-    "completion-alt-manual-n": "Nebaigta: {{$a}}. Pažymėti, kaip baigtą",
-    "completion-alt-manual-y": "Baigta: {{$a}}. Pažymėti, kaip nebaigtą.",
+    "completion-alt-auto-pass": "Užbaigta: {{$a}} (gautas išlaikymo įvertis)",
+    "completion-alt-auto-y": "Užbaigta: {{$a}}",
+    "completion-alt-manual-n": "Dar neužbaigta: {{$a}}. Pasirinkti pažymėti kaip užbaigtą",
+    "completion-alt-manual-y": "Užbaigta: {{$a}}. Pasirinkti pažymėti kaip nebaigtą",
     "confirmcanceledit": "Ar tikrai norite išeiti iš šio puslapio? Visi pakeitimai bus prarasti.",
     "confirmdeletefile": "Ar tikrai norite naikinti šį failą?",
     "confirmopeninbrowser": "Ar norite tai atidaryti naršyklėje?",
@@ -34,12 +34,12 @@
     "currentdevice": "Dabartinis prietaisas",
     "datastoredoffline": "Duomenys saugomi įrenginyje, nes šiuo metu negalima išsiųsti. Bus vėlaiu išsiųsti automatiškai.",
     "date": "Data",
-    "day": "diena",
-    "days": "dienos",
+    "day": "Diena(-os)",
+    "days": "Dienos",
     "decsep": ".",
-    "delete": "Naikinti",
-    "deleting": "Trinama",
-    "description": "Aprašas",
+    "delete": "Pašalinti",
+    "deleting": "Naikinama",
+    "description": "Aprašymas",
     "dfdaymonthyear": "MM-DD-MMMM",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -48,11 +48,10 @@
     "discard": "Atmesti",
     "dismiss": "Praleisti",
     "done": "Atlikta",
-    "download": "Atsisiųsti",
+    "download": "Spustelėkite, kad atsisiųstumėte eksportuotą kategorijos failą",
     "downloading": "Siunčiama",
     "edit": "Redaguoti",
-    "elementseparator": ",",
-    "error": "Klaida",
+    "error": "Įvyko nežinoma klaida!",
     "errorchangecompletion": "Klaida keičiant baigimo būseną. Pabandykite dar kartą.",
     "errordeletefile": "Klaida trinant failą. Pabandykite dar kartą.",
     "errordownloading": "Klaida siunčiant failą.",
@@ -75,7 +74,7 @@
     "groupsseparate": "Atskiros grupės",
     "groupsvisible": "Matomos grupės",
     "hasdatatosync": "{{$a}} turi duomenis, kuriuos reikia sinchronizuoti.",
-    "help": "Žinynas",
+    "help": "Pagalba",
     "hide": "Slėpti",
     "hour": "valanda",
     "hours": "valandos",
@@ -85,13 +84,13 @@
     "info": "Informacija",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Paskutinį kartą modifikuota",
+    "lastmodified": "Paskutinį kartą keista",
     "lastsync": "Paskutinis sinchronizavimas",
     "listsep": ";",
-    "loading": "Įkeliama...",
+    "loading": "Kraunasi...",
     "lostconnection": "Jūsų atpažinimo kodas neteisingas arba negalioja, turėsite vėl prisijungti prie svetainės.",
     "maxsizeandattachments": "Maksimalus naujo failo dydis: {{$a.size}}, maksimalus priedų skaičius: {{$a.attachments}}",
-    "min": "min.",
+    "min": "Žemiausias",
     "mins": "min.",
     "mod_assign": "Užduotis",
     "mod_assignment": "Užduotis",
@@ -121,15 +120,15 @@
     "mod_workshop": "Darbas grupėje",
     "moduleintro": "Aprašas",
     "mygroups": "Mano grupės",
-    "name": "Vardas",
+    "name": "Pavadinimas",
     "networkerrormsg": "Tinklas nepasiekiamas arba neveikia.",
     "never": "Niekada",
-    "next": "Pirmyn",
+    "next": "Tęsti",
     "no": "Ne",
-    "nocomments": "Jokių komentarų",
-    "nograde": "Nėra įverčio",
+    "nocomments": "Nėra komentarų",
+    "nograde": "Nėra įvertinimų.",
     "none": "Nėra",
-    "nopasswordchangeforced": "Nepakeitus slaptažodžio, negalima tęsti.",
+    "nopasswordchangeforced": "Negalite tęsti nepakeitę slaptažodžio, tačiau nėra slaptažodžio keitimo puslapio. Susisiekite su „Moodle“ administratoriumi.",
     "nopermissions": "Atsiprašome, tačiau šiuo metu jūs neturite teisės atlikti šio veiksmo",
     "noresults": "Nėra rezultatų",
     "notapplicable": "netaikoma",
@@ -146,16 +145,16 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefonas",
     "pictureof": "{{$a}} paveikslėlis",
-    "previous": "Ankstesnis",
+    "previous": "Ankstesnė būsena",
     "pulltorefresh": "Atnaujinti",
     "redirectingtosite": "Būsite nukreiptas į svetainę.",
     "refresh": "Atnaujinti",
-    "required": "Būtina",
+    "required": "Privalomas",
     "requireduserdatamissing": "Trūkta vartotojo duomenų.  Prašome užpildyti duomenis Moodle ir pabandyti dar kartą.<br>{{$a}}",
     "retry": "Bandykite dar kartą",
-    "save": "Įrašyti",
-    "search": "Ieškoti",
-    "searching": "Ieškoma",
+    "save": "Išsaugoti",
+    "search": "Paieška...",
+    "searching": "Ieškoma...",
     "searchresults": "Ieškos rezultatai",
     "sec": "sek.",
     "secs": "sek.",
@@ -175,7 +174,7 @@
     "sorry": "Atsiprašome...",
     "start": "Pradėti",
     "submit": "Pateikti",
-    "success": "Sėkmė!",
+    "success": "Sėkmingai",
     "tablet": "Planšetė",
     "teachers": "Dėstytojai",
     "thereisdatatosync": "Neprijungtas {{$a}}, kad sinchronizuotų.",
@@ -186,7 +185,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Klaida. Uždarykite programėlę ir bandykite atidaryti dar kartą",
-    "unknown": "Nežinomas",
+    "unknown": "Nežinoma",
     "unlimited": "Neribota",
     "unzipping": "Išskleidžiama",
     "upgraderunning": "Naujinama svetainės versija, bandykite vėliau.",
@@ -200,7 +199,7 @@
     "whyisthishappening": "Kodėl tai nutiko?",
     "windowsphone": "Windows telefonas",
     "wsfunctionnotavailable": "Interneto paslaugų funkcija nepasiekiama.",
-    "year": "metai",
+    "year": "Metai (-ų)",
     "years": "metai",
     "yes": "Taip"
 }
\ No newline at end of file
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index cbb560fa711..451cb6a7dd9 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -2,8 +2,8 @@
     "accounts": "Accounts",
     "allparticipants": "Alle deelnemers",
     "android": "Android",
-    "areyousure": "Ben je zeker?",
-    "back": "Terug",
+    "areyousure": "Weet je het zeker?",
+    "back": "Terug naar controleer vraag",
     "cancel": "Annuleer",
     "cannotconnect": "Kan niet verbinden: controleer of je de URL juist hebt ingegeven en dat je site Moodle 2.4 of recenter gebruikt.",
     "cannotdownloadfiles": "Bestanden downloaden is uitgeschakeld voor jouw mobiele service. Neem contact op met je systeembeheerder.",
@@ -11,37 +11,37 @@
     "choose": "Kies",
     "choosedots": "Kies...",
     "clearsearch": "Zoekresultaten leegmaken",
-    "clicktohideshow": "Klik hier om uit of in te klappen",
+    "clicktohideshow": "Klik om te vergroten of te verkleinen",
     "clicktoseefull": "Klik hier om de volledige inhoud te zien",
-    "close": "Sluit",
-    "comments": "Notities",
+    "close": "Sluit weergave test",
+    "comments": "Opmerkingen",
     "commentscount": "Opmerkingen ({{$a}})",
     "commentsnotworking": "Opmerkingen konden niet opgehaald worden",
-    "completion-alt-auto-fail": "Voltooid: {{$a}} (slaagcijfer niet behaald)",
+    "completion-alt-auto-fail": "Voltooid:  {{$a}}  (bereikte het cijfer voor geslaagd niet)",
     "completion-alt-auto-n": "Niet voltooid: {{$a}}",
-    "completion-alt-auto-pass": "Voltooid: {{$a}} (slaagcijfer behaald)",
+    "completion-alt-auto-pass": "Voltooid:  {{$a}} (slaagcijfer bereikt)",
     "completion-alt-auto-y": "Voltooid: {{$a}}",
-    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om als voltooid te markeren.",
-    "completion-alt-manual-y": "Voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
+    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om te markeren als voltooid",
+    "completion-alt-manual-y": "voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
     "confirmcanceledit": "Weet je zeker dat je deze pagina wil verlaten? Alle wijzigingen zullen verloren gaan.",
     "confirmdeletefile": "Wil je dit bestand echt verwijderen?",
     "confirmloss": "Ben je zeker? Alle wijzigingen zullen verloren gaan.",
     "confirmopeninbrowser": "Wil je het openen in je browser?",
     "content": "Inhoud",
     "contenteditingsynced": "De inhoud die je aan het bewerken bent, is gesynchroniseerd.",
-    "continue": "Ga door",
+    "continue": "Ga verder",
     "copiedtoclipboard": "Tekst gekopieerd naar klembord",
     "course": "Cursus",
     "coursedetails": "Cursusdetails",
     "currentdevice": "Huidig apparaat",
     "datastoredoffline": "Gegevens die bewaard werden op het toestel konden niet verstuurd worden. Ze zullen later automatisch verzonden worden.",
     "date": "Datum",
-    "day": "dag",
-    "days": "dagen",
+    "day": "Dag(en)",
+    "days": "Dagen",
     "decsep": ",",
     "defaultvalue": "Standaard ({{$a}})",
     "delete": "Verwijder",
-    "deleting": "Verwijderen.",
+    "deleting": "Verwijderen",
     "description": "Beschrijving",
     "dfdaymonthyear": "MM-DD-JJJJ",
     "dfdayweekmonth": "ddd, D, MMM",
@@ -51,11 +51,10 @@
     "discard": "Verwerpen",
     "dismiss": "Verwijderen",
     "done": "Voltooid",
-    "download": "Download",
+    "download": "Klik om het bestand met de geëxporteerde categorie te downloaden",
     "downloading": "Downloaden",
     "edit": "Bewerk",
-    "elementseparator": ",",
-    "error": "Fout",
+    "error": "Onbekende fout!",
     "errorchangecompletion": "Er is een fout opgetreden tijdens het wijzigen van de voltooiingsstatus. Probeer opnieuw.",
     "errordeletefile": "Fout tijdens het verwijderen van het bestand. Probeer opnieuw.",
     "errordownloading": "Fout bij downloaden bestand",
@@ -70,7 +69,6 @@
     "errorrenamefile": "Fout bij het hernoemen van het bestand. Probeer opnieuw.",
     "errorsync": "Er is een fout opgetreden tijdens het synchroniseren. Probeer opnieuw.",
     "errorsyncblocked": "Deze {{$a}} kan nu niet gesynchroniseerd worden omdat er nog een ander proces anders bezig is. Probeer later opnieuw. Als het probleem blijft aanhouden, probeer dan de app te herstarten.",
-    "fieldvalueseparator": ":",
     "filename": "Bestandsnaam",
     "filenameexist": "Bestandsnaam bestaat al: {{$a}}",
     "folder": "Map",
@@ -90,14 +88,14 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
-    "lastmodified": "Laatste wijziging",
+    "lastmodified": "Laatst gewijzigd",
     "lastsync": "Laatste synchronisatie",
     "listsep": ";",
-    "loading": "Laden...",
+    "loading": "Aan het laden...",
     "lostconnection": "We zijn de verbinding kwijt en moeten opnieuw verbinden. Je token is nu ongeldig.",
     "maxsizeandattachments": "Maximale grootte voor nieuwe bestanden: {{$a.size}}, maximum aantal bijlagen: {{$a.attachments}}",
-    "min": "min",
-    "mins": "mins",
+    "min": "Laagste",
+    "mins": "minuten",
     "mod_assign": "Opdracht",
     "mod_assignment": "Opdracht",
     "mod_book": "Boek",
@@ -131,16 +129,16 @@
     "never": "Nooit",
     "next": "Volgende",
     "no": "Nee",
-    "nocomments": "Geen commentaren",
-    "nograde": "Nog geen cijfer",
+    "nocomments": "Er zijn geen opmerkingen",
+    "nograde": "Geen cijfer.",
     "none": "Geen",
-    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te veranderen.",
+    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te wijzigen, hoewel er geen pagina voorzien is om dat te doen. Neem contact op met je Moodlebeheerder",
     "nopermissions": "Sorry, maar je hebt nu niet het recht om dat te doen ({{$a}}).",
-    "noresults": "Geen resultaten",
+    "noresults": "Geen resultaat",
     "notapplicable": "n/a",
     "notice": "Opmerking",
     "notsent": "Niet verstuurd",
-    "now": "nu",
+    "now": "Nu",
     "numwords": "{{$a}} woorden",
     "offline": "Offline",
     "online": "Online",
@@ -150,25 +148,25 @@
     "pagea": "Pagina {{$a}}",
     "percentagenumber": "{{$a}}%",
     "phone": "Telefoon",
-    "pictureof": "Afbeelding van {{$a}}",
-    "previous": "Vorige",
+    "pictureof": "Foto van {{$a}}",
+    "previous": "Vorige status",
     "pulltorefresh": "Slepen om te verversen",
     "redirectingtosite": "Je wordt doorgestuurd naar de site.",
-    "refresh": "Ververs",
-    "required": "Verplicht",
+    "refresh": "Vernieuw",
+    "required": "Vereist",
     "requireduserdatamissing": "Er ontbreken vereiste gegevens in het profiel van deze gebruiker. Vul deze gegevens in op je Moodle site en probeer opnieuw.<br>{{$a}}",
     "retry": "Probeer opnieuw",
     "save": "Bewaar",
-    "search": "Zoek",
-    "searching": "Zoeken",
+    "search": "Zoeken...",
+    "searching": "Zoeken in ...",
     "searchresults": "Zoekresultaten",
-    "sec": "sec",
+    "sec": "seconde",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
-    "send": "Stuur",
-    "sending": "Sturen",
+    "send": "Verstuur",
+    "sending": "Versturen",
     "serverconnection": "Fout bij het verbinden met de server",
-    "show": "Toon",
+    "show": "Laat zien",
     "showmore": "Toon meer...",
     "site": "Site",
     "sitemaintenance": "De site is in onderhoud en is op dit ogenblik niet beschikbaar.",
@@ -179,10 +177,10 @@
     "sizetb": "TB",
     "sorry": "Sorry...",
     "start": "Start",
-    "submit": "Insturen",
-    "success": "Gelukt!",
+    "submit": "Afgeven",
+    "success": "Succes",
     "tablet": "Tablet",
-    "teachers": "Leraren",
+    "teachers": "leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
     "time": "Tijd",
     "timesup": "Tijd is op!",
@@ -197,7 +195,7 @@
     "unlimited": "Onbeperkt",
     "unzipping": "Unzippen",
     "upgraderunning": "Site wordt geüpgraded. Probeer later nog eens.",
-    "userdeleted": "Deze gebruikersaccount is verwijderd",
+    "userdeleted": "De account van deze gebruiker is verwijderd",
     "userdetails": "Gebruikersdetails",
     "usernotfullysetup": "Gebruiker niet volledig ingesteld",
     "users": "Gebruikers",
@@ -208,7 +206,7 @@
     "whyisthishappening": "Waarom gebeurt dit?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "De webservice is niet beschikbaar",
-    "year": "jaar",
-    "years": "jaren",
+    "year": "Jaar",
+    "years": "Jaren",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/pl.json b/www/core/lang/pl.json
index 4fa8ac3b1ec..af444002641 100644
--- a/www/core/lang/pl.json
+++ b/www/core/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Wszyscy uczestnicy",
     "areyousure": "Jesteś pewien?",
-    "back": "Powrót",
+    "back": "Powrót do podglądu pytania",
     "cancel": "Anuluj",
     "cannotconnect": "Nie można się połączyć: Sprawdź, czy wpisałeś poprawyny adres URL i twoja strona używa Moodle 2.4 lub nowsze.",
     "category": "Kategoria",
@@ -22,18 +22,18 @@
     "continue": "Kontynuuj",
     "course": "Kurs",
     "coursedetails": "Szczegóły kursu",
-    "date": "Data",
-    "day": "dzień",
-    "days": "dni",
+    "date": "data",
+    "day": "Dzień/dni",
+    "days": "Dni",
     "decsep": ",",
     "delete": "Usuń",
     "deleting": "Usuwanie",
     "description": "Opis",
     "done": "Wykonane",
-    "download": "Pobierz",
+    "download": "Pobierz plik z kategoriami",
     "downloading": "Pobieranie ...",
-    "edit": "Modyfikuj",
-    "error": "Błąd",
+    "edit": "Edytuj",
+    "error": "Wystąpił nieznany błąd!",
     "filename": "Nazwa pliku",
     "folder": "Folder",
     "forcepasswordchangenotice": "W celu kontynuacji musisz zmienić swoje hasło",
@@ -46,12 +46,12 @@
     "hours": "godz.",
     "info": "Informacja",
     "labelsep": ":&nbsp;",
-    "lastmodified": "Ostatnia modyfikacja",
+    "lastmodified": "Ostatnia modyfikacja:",
     "listsep": ";",
-    "loading": "Ładowanie",
+    "loading": "Ładowanie...",
     "lostconnection": "Straciliśmy połączenie i musisz się połączyć ponowne. Twój token jest teraz nieważny",
     "maxsizeandattachments": "Maksymalny rozmiar dla nowych plików: {{$a.size}}, maksimum załączników: {{$a.attachments}}",
-    "min": "min",
+    "min": "Najniższy",
     "mins": "min.",
     "mod_assign": "Zadanie",
     "mod_chat": "Czat",
@@ -69,10 +69,10 @@
     "name": "Nazwa",
     "networkerrormsg": "Sieć jest wyłączona lub nie działa.",
     "never": "Nigdy",
-    "next": "Dalej",
+    "next": "Kontynuuj",
     "no": "Nie",
     "nocomments": "Brak komentarzy",
-    "nograde": "Brak oceny",
+    "nograde": "Brak oceny.",
     "none": "Żaden",
     "nopasswordchangeforced": "Nie możesz kontynuować bez zmiany hasła, jakkolwiek nie ma dostępnej strony do tej zmiany. Proszę skontaktować się z Administratorem Moodla.",
     "nopermissions": "Brak odpowiednich uprawnień do wykonania ({{$a}})",
@@ -80,18 +80,18 @@
     "notice": "Powiadomienie",
     "now": "teraz",
     "numwords": "{{$a}} słów",
-    "offline": "Wysyłanie online nie jest wymagane",
+    "offline": "Offline",
     "online": "Online",
     "pagea": "Strona {{$a}}",
     "phone": "Telefon",
     "pictureof": "Obraz {{$a}}",
-    "previous": "Poprzedni",
-    "refresh": "Odśwież",
+    "previous": "Poprzedni stan",
+    "refresh": "Odswież",
     "required": "Wymagane",
     "save": "Zapisz",
-    "search": "Wyszukaj",
+    "search": "Szukaj...",
     "searching": "Wyszukiwanie w ...",
-    "searchresults": "Wyniki wyszukiwania",
+    "searchresults": "Szukaj w rezultatach",
     "sec": "sek",
     "secs": "sek.",
     "seemoredetail": "Kliknij aby zobaczyć więcej szczegółów",
@@ -105,7 +105,7 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "start": "Rozpocznij",
-    "submit": "Prześlij",
+    "submit": "Zatwierdź",
     "success": "Gotowe",
     "teachers": "Prowadzący",
     "time": "Czas",
@@ -118,9 +118,9 @@
     "userdeleted": "To konto użytkownika zostało usunięte",
     "userdetails": "Szczegóły użytkownika",
     "users": "Użytkownicy",
-    "view": "Widok",
+    "view": "Przegląd",
     "viewprofile": "Zobacz profil",
-    "year": "rok",
+    "year": "Rok/lata",
     "years": "lata",
     "yes": "Tak"
 }
\ No newline at end of file
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 7e469df2a12..0cf22e1b2e0 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos os participantes",
     "android": "Android",
     "areyousure": "Você tem certeza?",
-    "back": "Voltar",
+    "back": "Voltar à visualização prévia da questão",
     "cancel": "Cancelar",
     "cannotconnect": "Não é possível conectar-se: Verifique se digitou a URL corretamente e se seu site usa o Moodle 2.4 ou posterior.",
     "cannotdownloadfiles": "Download de arquivos está desabilitado no seu serviço Mobile. Por favor, contate o administrador do site.",
@@ -13,16 +13,16 @@
     "clearsearch": "Limpar busca",
     "clicktohideshow": "Clique para expandir ou contrair",
     "clicktoseefull": "Clique para ver o conteúdo completo.",
-    "close": "Fechar",
+    "close": "Fechar janela",
     "comments": "Comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Os comentários não podem ser recuperados",
-    "completion-alt-auto-fail": "Concluído: {{$a}} (não alcançou a nota para passar)",
-    "completion-alt-auto-n": "Não concluído: {{$a}}",
-    "completion-alt-auto-pass": "Concluído: {{$a}} (nota para passar foi alcançada)",
+    "completion-alt-auto-fail": "Concluído: {{$a}} (não obteve nota para aprovação)",
+    "completion-alt-auto-n": "Não concluído(s): {{$a}}",
+    "completion-alt-auto-pass": "Concluído: {{$a}} (foi atingida a nota de aprovação)",
     "completion-alt-auto-y": "Concluído: {{$a}}",
-    "completion-alt-manual-n": "Não concluído: {{$a}}. Selecione para marcar como concluída.",
-    "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
+    "completion-alt-manual-n": "Não concluído(s): {{$a}}. Selecione para marcar como concluído.",
+    "completion-alt-manual-y": "Concluído(s): {{$a}}. Selecione para marcar como não concluído.",
     "confirmcanceledit": "Você tem certeza que quer sair dessa página? Todas as mudanças serão perdidas.",
     "confirmdeletefile": "Você tem certeza que quer excluir este arquivo?",
     "confirmloss": "Você tem certeza? Todas as alterações serão perdidas.",
@@ -36,8 +36,8 @@
     "currentdevice": "Dispositivo atual",
     "datastoredoffline": "Os dados foram guardados no dispositivo porque não foi possível enviar agora. Os dados serão automaticamente enviados mais tarde.",
     "date": "Data",
-    "day": "dia",
-    "days": "dias",
+    "day": "Dia(s)",
+    "days": "Dias",
     "decsep": ",",
     "delete": "Excluir",
     "deleting": "Excluindo",
@@ -50,11 +50,10 @@
     "discard": "Descartar",
     "dismiss": "Dispersar",
     "done": "Feito",
-    "download": "Download",
+    "download": "Clique para baixar o arquivo de categoria exportado",
     "downloading": "Baixando",
     "edit": "Editar",
-    "elementseparator": ",",
-    "error": "Erro",
+    "error": "Ocorreu um erro desconhecido!",
     "errorchangecompletion": "Ocorreu um erro ao alterar o status de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao excluir o arquivo. Por favor tente novamente.",
     "errordownloading": "Erro ao baixar o arquivo",
@@ -69,7 +68,6 @@
     "errorrenamefile": "Erro ao renomear o arquivo. Por favor, tente novamente.",
     "errorsync": "Um erro aconteceu quando estava sincronizando. Por favor tente novamente.",
     "errorsyncblocked": "Esse {{$a}} não pode ser sincronizado agora por causa de um processo em andamento. Por favor tente mais tarde. Se o problema persistir, tente reiniciar o aplicativo.",
-    "fieldvalueseparator": ":",
     "filename": "Nome do arquivo",
     "filenameexist": "O nome do arquivo já existe: {{$a}}",
     "folder": "Pasta",
@@ -89,13 +87,13 @@
     "info": "Informações",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
-    "lastmodified": "Última atualização",
+    "lastmodified": "Última modificação",
     "lastsync": "Última sincronização",
     "listsep": ";",
-    "loading": "Carregando",
+    "loading": "Carregando...",
     "lostconnection": "Perdemos conexão. Você precisa se reconectar. Seu token agora está inválido.",
     "maxsizeandattachments": "Tamanho máximo para novos arquivos: {{$a.size}}, máximo de anexos: {{$a.attachments}}",
-    "min": "minuto",
+    "min": "Pior",
     "mins": "minutos",
     "mod_assign": "Tarefa",
     "mod_assignment": "Tarefa",
@@ -128,12 +126,12 @@
     "name": "Nome",
     "networkerrormsg": "Rede não habilitada ou não está funcionado",
     "never": "Nunca",
-    "next": "Próximo",
+    "next": "Próxima",
     "no": "Não",
-    "nocomments": "Nenhum comentário",
-    "nograde": "Nenhuma nota",
+    "nocomments": "Não existem comentários",
+    "nograde": "Não há nota",
     "none": "Nenhum",
-    "nopasswordchangeforced": "Você não pode proceder sem mudar sua senha.",
+    "nopasswordchangeforced": "Você não pode continuar sem mudar sua senha. Mas infelizmente não existe uma página para esse propósito.\nPor favor contate o Administrador Moodle.",
     "nopermissions": "Você não tem permissão para {{$a}}",
     "noresults": "Nenhum resultado",
     "notapplicable": "n/a",
@@ -141,8 +139,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavras",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Desconectado",
+    "online": "Conectado",
     "openfullimage": "Clique aqui para exibir a imagem no tamanho completo",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -150,40 +148,40 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Fone",
     "pictureof": "Imagem de {{$a}}",
-    "previous": "Anterior",
+    "previous": "Estado anterior",
     "pulltorefresh": "Puxe para atualizar",
     "redirectingtosite": "Você será redirecionado para o site.",
     "refresh": "Atualizar",
-    "required": "Necessários",
+    "required": "Obrigatório",
     "requireduserdatamissing": "Este usuário não possui alguns dados de perfil exigidos. Por favor, preencha estes dados em seu Moodle e tente novamente. <br> {{$a}}",
     "retry": "Tentar novamente",
     "save": "Salvar",
-    "search": "Procura",
-    "searching": "Procurando",
+    "search": "Procurar...",
+    "searching": "Pesquisando em....",
     "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para mais detalhes",
     "send": "Enviar",
     "sending": "Enviando",
-    "serverconnection": "Erro de conexão com o servidor",
-    "show": "Mostrar",
+    "serverconnection": "Erro ao conectar ao servidor",
+    "show": "Visualizar",
     "showmore": "Exibir mais...",
     "site": "Site",
     "sitemaintenance": "Os site está em manutenção e atualmente não está disponível",
     "sizeb": "bytes",
-    "sizegb": "GB",
-    "sizekb": "KB",
-    "sizemb": "MB",
+    "sizegb": "Gb",
+    "sizekb": "Kb",
+    "sizemb": "Mb",
     "sizetb": "TB",
     "sorry": "Desculpe...",
     "start": "Início",
     "submit": "Enviar",
-    "success": "Sucesso!",
+    "success": "Sucesso",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
-    "time": "Hora",
+    "time": "Tempo",
     "timesup": "Acabou o tempo de duração!",
     "today": "Hoje",
     "tryagain": "Tente de novo",
@@ -199,14 +197,14 @@
     "userdeleted": "Esta conta de usuário foi cancelada",
     "userdetails": "Detalhes do usuário",
     "users": "Usuários",
-    "view": "Ver",
+    "view": "Visualizar",
     "viewprofile": "Ver perfil",
     "warningofflinedatadeleted": "Dados offline de {{component}} '{{name}}' foram excluídos. {{error}}",
     "whoops": "Oops!",
     "whyisthishappening": "Por que isso está acontecendo?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "A função do webservice não está disponível.",
-    "year": "ano",
+    "year": "Ano(s)",
     "years": "anos",
     "yes": "Sim"
 }
\ No newline at end of file
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index b36ec5e0e0d..c45456ec562 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -1,9 +1,9 @@
 {
     "accounts": "Contas",
-    "allparticipants": "Todos os participantes",
+    "allparticipants": "Todos",
     "android": "Android",
     "areyousure": "Tem a certeza?",
-    "back": "Voltar",
+    "back": "Voltar à pré-visualização da pergunta",
     "cancel": "Cancelar",
     "cannotconnect": "Não é possível estabelecer a ligação: Verifique se digitou o URL corretamente e se o seu site Moodle possui a versão 2.4 ou superior.",
     "cannotdownloadfiles": "O seu serviço Moodle não permite descarregar ficheiros. Por favor, contacte o administrador do site.",
@@ -13,16 +13,16 @@
     "clearsearch": "Limpar pesquisa",
     "clicktohideshow": "Clique para expandir ou contrair",
     "clicktoseefull": "Clique para ver todos os conteúdos.",
-    "close": "Fechar",
+    "close": "Fechar janela",
     "comments": "Comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Não foi possível recuperar os comentários",
-    "completion-alt-auto-fail": "Concluído: {{$a}} (não alcançou a nota mínima para passar)",
-    "completion-alt-auto-n": "Não concluído: {{$a}}",
-    "completion-alt-auto-pass": "Concluído: {{$a}} (alcançou a nota mínima para passar)",
-    "completion-alt-auto-y": "Concluído: {{$a}}",
-    "completion-alt-manual-n": "Não concluído: {{$a}}. Selecione para marcar como concluída.",
-    "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
+    "completion-alt-auto-fail": "Concluída (não atingiu nota de aprovação)",
+    "completion-alt-auto-n": "Não concluída",
+    "completion-alt-auto-pass": "Concluída (atingiu nota de aprovação)",
+    "completion-alt-auto-y": "Concluída",
+    "completion-alt-manual-n": "Não concluída. Selecione para assinalar como concluída",
+    "completion-alt-manual-y": "Concluída: {{$a}}. Selecione para dar como não concluída",
     "confirmcanceledit": "Tem a certeza de que pretende sair desta página? Todas as alterações serão perdidas.",
     "confirmdeletefile": "Tem a certeza de que pretende apagar este ficheiro?",
     "confirmloss": "Tem a certeza absoluta? Todas as alterações serão perdidas.",
@@ -36,8 +36,8 @@
     "currentdevice": "Dispositivo atual",
     "datastoredoffline": "Dados armazenados no dispositivo por não ter sido possível enviar. Serão automaticamente enviados mais tarde.",
     "date": "Data",
-    "day": "dia",
-    "days": "dias",
+    "day": "Dia(s)",
+    "days": "Dias",
     "decsep": ",",
     "delete": "Apagar",
     "deleting": "A apagar",
@@ -50,11 +50,10 @@
     "discard": "Descartar",
     "dismiss": "Dispensar",
     "done": "Concluído",
-    "download": "Descarregar",
+    "download": "Clique para descarregar o ficheiro de categorias exportado",
     "downloading": "A descarregar",
     "edit": "Editar",
-    "elementseparator": ",",
-    "error": "Erro",
+    "error": "Ocorreu um erro desconhecido!",
     "errorchangecompletion": "Ocorreu um erro ao alterar o estado de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao apagar o ficheiro. Por favor, tente novamente.",
     "errordownloading": "Erro ao descarregar ficheiro.",
@@ -69,7 +68,6 @@
     "errorrenamefile": "Erro ao mudar o nome do ficheiro. Por favor, tente novamente.",
     "errorsync": "Ocorreu um erro durante a sincronização. Por favor, tente novamente.",
     "errorsyncblocked": "Não é possível sincronizar agora este {{$a}} devido a um outro processo já em andamento. Por favor, tente novamente mais tarde. Se o problema persistir, tente reiniciar a aplicação.",
-    "fieldvalueseparator": ":",
     "filename": "Nome do ficheiro",
     "filenameexist": "O nome do ficheiro já existe: {{$a}}",
     "folder": "Pasta",
@@ -86,16 +84,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagem",
     "imageviewer": "Visualizador de imagens",
-    "info": "Informações",
+    "info": "Informação",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
-    "lastmodified": "Última alteração",
+    "lastmodified": "Modificado pela última vez:",
     "lastsync": "Última sincronização",
     "listsep": ";",
-    "loading": "A carregar",
+    "loading": "A carregar...",
     "lostconnection": "O seu token é inválido ou expirou, terá de se autenticar novamente no site.",
     "maxsizeandattachments": "Tamanho máximo para novos ficheiros: {{$a.size}}, número máximo de anexos: {{$a.attachments}}",
-    "min": "minuto",
+    "min": "Mais baixa",
     "mins": "minutos",
     "mod_assign": "Trabalho",
     "mod_assignment": "Trabalho",
@@ -125,15 +123,15 @@
     "mod_workshop": "Workshop",
     "moduleintro": "Descrição",
     "mygroups": "Meus grupos",
-    "name": "Designação",
+    "name": "Nome",
     "networkerrormsg": "A rede está desativada ou não está a funcionar corretamente.",
     "never": "Nunca",
-    "next": "Seguinte",
+    "next": "Continuar",
     "no": "Não",
-    "nocomments": "Sem comentários",
-    "nograde": "Nenhuma nota",
-    "none": "Nenhum",
-    "nopasswordchangeforced": "Não pode prosseguir sem alterar sua senha.",
+    "nocomments": "Não existem comentários",
+    "nograde": "Sem avaliação",
+    "none": "Nenhuma",
+    "nopasswordchangeforced": "Não consegue prosseguir sem modificar a senha, entretanto não existe nenhuma página disponível para a mudar. Por favor contate o Administrador do site Moodle.",
     "nopermissions": "Atualmente, não tem permissões para realizar a operação <b>{{$a}}</b>",
     "noresults": "Sem resultados",
     "notapplicable": "n/a",
@@ -141,8 +139,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavra(s)",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Inativo",
+    "online": "Inativo",
     "openfullimage": "Clique aqui para exibir a imagem em tamanho real",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -150,7 +148,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefone",
     "pictureof": "Fotografia de {{$a}}",
-    "previous": "Anterior",
+    "previous": "Estado anterior",
     "pulltorefresh": "Puxe para atualizar",
     "redirectingtosite": "Irá ser redirecionado para o site.",
     "refresh": "Atualizar",
@@ -158,32 +156,32 @@
     "requireduserdatamissing": "Este utilizador não possui todos os dados de perfil obrigatórios. Por favor, preencha estes dados no seu Moodle e tente novamente. <br> {{$a}}",
     "retry": "Tentar novamente",
     "save": "Guardar",
-    "search": "Procurar",
-    "searching": "A procurar",
-    "searchresults": "Procurar resultados",
+    "search": "Pesquisa...",
+    "searching": "A procurar em...",
+    "searchresults": "Resultados da procura",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para ver mais detalhes",
     "send": "Enviar",
     "sending": "A enviar",
-    "serverconnection": "Erro ao ligar ao servidor",
+    "serverconnection": "Ocorreu um erro ao conectar com o servidor",
     "show": "Mostrar",
     "showmore": "Mostrar mais...",
     "site": "Site",
     "sitemaintenance": "O site está em manutenção e, de momento, não está disponível",
     "sizeb": "bytes",
     "sizegb": "GB",
-    "sizekb": "Kb",
-    "sizemb": "Mb",
+    "sizekb": "KB",
+    "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Desculpe...",
     "start": "Iniciar",
     "submit": "Submeter",
-    "success": "Sucesso!",
+    "success": "Operação realizada com sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline que têm de ser sincronizados.",
-    "time": "Hora",
+    "time": "Horas",
     "timesup": "O tempo terminou!",
     "today": "Hoje",
     "tryagain": "Tente novamente",
@@ -192,7 +190,7 @@
     "unexpectederror": "Erro inesperado. Por favor, feche e abra novamente a aplicação para tentar de novo",
     "unicodenotsupported": "Texto Unicode, tais como emojis, não são suportados neste site. O texto será enviado sem estes caracteres.",
     "unicodenotsupportedcleanerror": "Foi encontrado texto vazio ao limpar caracteres Unicode.",
-    "unknown": "Desconhecido",
+    "unknown": "Desconhecido(a)",
     "unlimited": "Ilimitado(a)",
     "unzipping": "A descomprimir",
     "upgraderunning": "O site está em processo de atualização, por favor, tente novamente mais tarde.",
@@ -207,7 +205,7 @@
     "whyisthishappening": "Por que é que isto está a acontecer?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "A função do webservice não está disponível.",
-    "year": "ano",
+    "year": "Ano(s)",
     "years": "anos",
     "yes": "Sim"
 }
\ No newline at end of file
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index a8102950e02..6972936646e 100644
--- a/www/core/lang/ro.json
+++ b/www/core/lang/ro.json
@@ -2,7 +2,7 @@
     "allparticipants": "Toţi participanţii",
     "android": "Adroid",
     "areyousure": "Ești sigur?",
-    "back": "Înapoi",
+    "back": "Înapoi la vizualizare întrebare",
     "cancel": "Anulează",
     "cannotconnect": "A apărut o eroare conectare: verificați dacă ați scris corect adresa URL căutată și dacă siteul folosește cel puțin versiune de Moodle 2.4",
     "cannotdownloadfiles": "Descărcarea de fișiere este dezactivată pentru serviciul mobil. Contactați administratorul siteului.",
@@ -12,38 +12,37 @@
     "clearsearch": "Curățați căutările",
     "clicktohideshow": "Click pentru maximizare sau minimizare",
     "clicktoseefull": "Apăsați pentru a vedea întregul conținut",
-    "close": "Închide",
+    "close": "Închide fereastra",
     "comments": "Comentarii",
     "commentscount": "Comentarii ({{$a}})",
-    "completion-alt-auto-fail": "Realizat: {{$a}} (nu este suficient pentru promovare)",
-    "completion-alt-auto-n": "Nerealizat: {{$a}}",
-    "completion-alt-auto-pass": "Realizat: {{$a}} (este obținută nota pentru promovare)",
-    "completion-alt-auto-y": "Realizat: {{$a}}",
-    "completion-alt-manual-n": "Nerealizat: {{$a}}. Selectați pentru a fi marcat ca realizat.",
-    "completion-alt-manual-y": "Realizat: {{$a}}. Selectați pentru a fi marcat ca nerealizat.",
+    "completion-alt-auto-fail": "Finalizat: {{$a}} (nu a obținut notă de trecere)",
+    "completion-alt-auto-n": "Nu s-a finalizat: {{$a}}",
+    "completion-alt-auto-pass": "Finalizat: {{$a}} (s-a obținut notă de trecere)",
+    "completion-alt-auto-y": "Finalizat: {{$a}}",
+    "completion-alt-manual-n": "Necompletat: {{$a}}. Selectați pentru a-l seta ca fiind completat.",
+    "completion-alt-manual-y": "Completat: {{$a}}. Selectați pentru a-l seta ca fiind necompletat.",
     "confirmdeletefile": "Sunteți sigur că doriți să ștergeți acest fișier?",
     "confirmopeninbrowser": "Doriți să deschideți într-un browser?",
     "content": "Conţinut",
-    "continue": "Continuă",
+    "continue": "Mai departe",
     "course": "Curs",
     "coursedetails": "Detalii curs",
-    "date": "Dată",
-    "day": "zi",
-    "days": "zile",
+    "date": "Data",
+    "day": "Zi(Zile)",
+    "days": "Zile",
     "decsep": ",",
-    "delete": "Şterge",
-    "deleting": "Se șterge",
+    "delete": "Ștergeți",
+    "deleting": "În curs de ştergere",
     "description": "Descriere",
     "dfdayweekmonth": "zzz, Z LLL",
     "dflastweekdate": "zzz",
     "dfmediumdate": "LLL",
     "dftimedate": "o[:]mm A",
     "done": "Terminat",
-    "download": "Descarcă",
+    "download": "Executaţi clic pentru a descărca fişierul cu categorii exportate",
     "downloading": "Se descarcă",
-    "edit": "Editează",
-    "elementseparator": ",",
-    "error": "Eroare",
+    "edit": "Editare",
+    "error": "A apărut o eroare necunoscută!",
     "errorchangecompletion": "A apărut o eroare în timpul schimbării nivelului de completare a cursului. Încercați din nou!",
     "errordownloading": "A apărut o eroare la descărcarea fișierului.",
     "errordownloadingsomefiles": "A apărut o eroare la descărcarea fișierelor modulului. Unele fișiere pot lipsi.",
@@ -67,13 +66,13 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Ultima modificare",
+    "lastmodified": "Modificat ultima dată",
     "lastsync": "Ultima sincronizare",
     "listsep": ";",
-    "loading": "Se încarcă",
+    "loading": "Se încarcă...",
     "lostconnection": "Tokenul pentru autentificare este invalid sau a expirat; trebuie să va reconectați!",
     "maxsizeandattachments": "Dimensiunea maximă pentru fișierele noi: {{$a.size}}, atașamente maxime: {{$a.attachments}}",
-    "min": "min",
+    "min": "Cel mai mic",
     "mins": "min",
     "mod_assign": "Temă",
     "mod_assignment": "Temă",
@@ -105,14 +104,14 @@
     "name": "Nume",
     "networkerrormsg": "Rețea de date inexistentă sau nefuncțională",
     "never": "Niciodată",
-    "next": "Următorul",
+    "next": "Continuare",
     "no": "Nu",
-    "nocomments": "Nu sunt comentarii",
-    "nograde": "Nicio notă",
+    "nocomments": "Nu există comentarii",
+    "nograde": "Fără notă.",
     "none": "Niciunul",
     "nopasswordchangeforced": "Nu puteţi trece mai departe fără să vă schimbaţi parola, însă nu există nicio pagină în care să realizaţi această operaţiune. Vă rugăm contactaţi un administrator Moodle.",
     "nopermissions": "Ne pare rău, dar în acest moment nu aveţi permisiunea să realizaţi această operaţiune ({{$a}})",
-    "noresults": "Niciun rezultat",
+    "noresults": "Nu sunt rezultate",
     "notapplicable": "n/a",
     "notice": "Notificare",
     "now": "acum",
@@ -125,22 +124,22 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Imaginea {{$a}}",
-    "previous": "Precedent",
+    "previous": "Status anterior",
     "pulltorefresh": "Trageți în jos pentru actualizare",
-    "refresh": "Reîncarcă",
-    "required": "Obligatoriu",
+    "refresh": "Actualizați",
+    "required": "Necesar",
     "requireduserdatamissing": "Acest utilizator are unele date de profil obligatorii necompletate. Completați aceste date în contul din Moodle și încercați din nou.<br>{{$a}}",
     "save": "Salvează",
-    "search": "Caută",
-    "searching": "Căutare",
-    "searchresults": "Rezultate căutare",
+    "search": "Căutare",
+    "searching": "Caut în ...",
+    "searchresults": "Rezultatele căutării",
     "sec": "sec",
     "secs": "secs",
     "seemoredetail": "Apasă aici pentru mai multe detalii",
-    "send": "Trimis",
+    "send": "Trimite",
     "sending": "Se trimite",
-    "serverconnection": "A apărut o eroare la conectarea la server",
-    "show": "Afişare",
+    "serverconnection": "Eroare la conectarea la server",
+    "show": "Afișează",
     "site": "Site",
     "sizeb": "bytes",
     "sizegb": "GB",
@@ -149,10 +148,10 @@
     "sizetb": "TB",
     "start": "Start",
     "submit": "Trimite",
-    "success": "Succes!",
+    "success": "Succes",
     "tablet": "Tabletă",
     "teachers": "Profesori",
-    "time": "Ora",
+    "time": "timp",
     "timesup": "Timpul a expirat!",
     "today": "Azi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -169,7 +168,7 @@
     "whoops": "Ops!",
     "windowsphone": "Telefon cu sistem de operare Windows",
     "wsfunctionnotavailable": "Această funcție Web nu este disponibilă.",
-    "year": "an",
+    "year": "An (Ani)",
     "years": "ani",
     "yes": "Da"
 }
\ No newline at end of file
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index b0ccdb40434..10b10ea1b9a 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -2,7 +2,7 @@
     "allparticipants": "Все участники",
     "android": "Android",
     "areyousure": "Вы уверены?",
-    "back": "Назад",
+    "back": "Вернуться к просмотру вопроса",
     "cancel": "Отменить",
     "cannotconnect": "Не удается подключиться: убедитесь, что Вы ввели правильный URL-адрес и что сайт использует Moodle 2.4 или более поздней версии.",
     "cannotdownloadfiles": "Скачивание файла отключено для мобильных служб. Пожалуйста, свяжитесь с администратором сайта.",
@@ -26,19 +26,18 @@
     "course": "Курс",
     "coursedetails": "Информация о курсе",
     "date": "Дата",
-    "day": "день",
-    "days": "дн.",
+    "day": "дн.",
+    "days": "Дней",
     "decsep": ",",
     "defaultvalue": "Значение по умолчанию ({{$a}})",
     "delete": "Удалить",
     "deleting": "Удаление",
     "description": "Описание",
     "done": "Завершено",
-    "download": "Скачать",
+    "download": "Нажмите «Продолжить», чтобы загрузить файл экспортируемой категории.",
     "downloading": "Загрузка",
     "edit": "Редактировать",
-    "elementseparator": ",",
-    "error": "Ошибка",
+    "error": "Произошла неизвестная ошибка!",
     "errordownloading": "Ошибка загрузки файла",
     "filename": "Имя файла",
     "folder": "Папка",
@@ -46,19 +45,19 @@
     "fulllistofcourses": "Все курсы",
     "groupsseparate": "Изолированные группы",
     "groupsvisible": "Видимые группы",
-    "help": "Справка",
+    "help": "Помощь",
     "hide": "Скрыть",
     "hour": "ч.",
     "hours": "час.",
     "humanreadablesize": "{{size}} {{unit}}",
-    "info": "Информация",
+    "info": "Вступление",
     "labelsep": ":",
-    "lastmodified": "Последнее изменение",
+    "lastmodified": "Последние изменения:",
     "listsep": ";",
-    "loading": "Загрузка",
+    "loading": "Загрузка...",
     "lostconnection": "Ваш ключ аутентификации недействителен или просрочен. Вам придется повторно подключиться к сайту.",
     "maxsizeandattachments": "Максимальный размер новых файлов: {{$a.size}}, максимальное количество прикрепленных файлов: {{$a.attachments}}",
-    "min": "мин.",
+    "min": "Наименьшая оценка",
     "mins": "мин.",
     "mod_assign": "Задание",
     "mod_assignment": "Задание",
@@ -90,11 +89,11 @@
     "name": "Название",
     "networkerrormsg": "Сеть не работает или работа в ней не разрешена.",
     "never": "Никогда",
-    "next": "Далее",
+    "next": "Продолжить",
     "no": "Нет",
     "nocomments": "Нет комментариев",
-    "nograde": "Без оценки",
-    "none": "Пусто",
+    "nograde": "Нет оценки.",
+    "none": "Нет",
     "nopasswordchangeforced": "Вы не можете продолжать работу без смены пароля, однако страница для его изменения не доступна. Пожалуйста, свяжитесь с администратором сайта.",
     "nopermissions": "Извините, но у Вас нет прав сделать это ({{$a}})",
     "noresults": "Нет результатов",
@@ -102,17 +101,17 @@
     "notice": "Уведомление",
     "now": "сейчас",
     "numwords": "всего слов - {{$a}}",
-    "offline": "Ответ вне сайта",
+    "offline": "Вне сайта",
     "online": "На сайте",
     "pagea": "Страница {{$a}}",
     "phone": "Телефон",
     "pictureof": "Изображение пользователя {{$a}}",
-    "previous": "Назад",
+    "previous": "Предыдущее состояние",
     "pulltorefresh": "Потяните, чтобы обновить",
     "refresh": "Обновить",
-    "required": "Необходимо заполнить",
+    "required": "Обязательно",
     "save": "Сохранить",
-    "search": "Поиск",
+    "search": "Искать...",
     "searching": "Поиск в...",
     "searchresults": "Результаты поиска",
     "sec": "сек.",
@@ -124,9 +123,9 @@
     "show": "Показать",
     "site": "Сайт",
     "sizeb": "байт",
-    "sizegb": "Гб",
-    "sizekb": "кб",
-    "sizemb": "Мб",
+    "sizegb": "Гбайт",
+    "sizekb": "Кбайт",
+    "sizemb": "Мбайт",
     "sizetb": "Тб",
     "start": "Начало",
     "submit": "Отправить",
@@ -142,10 +141,10 @@
     "userdeleted": "Учетная запись пользователя была удалена",
     "userdetails": "Подробная информация о пользователе",
     "users": "Пользователи",
-    "view": "Вид",
+    "view": "Просмотр",
     "viewprofile": "Просмотр профиля",
     "whoops": "Ой!",
-    "year": "г.",
+    "year": "Год(ы)",
     "years": "г.",
     "yes": "Да"
 }
\ No newline at end of file
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index 473c171aa38..af99d470510 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -2,7 +2,7 @@
     "allparticipants": "Alla deltagare",
     "android": "Android",
     "areyousure": "Är du säker?",
-    "back": "Tillbaka",
+    "back": "Tillbaka till förhandsgranskning av fråga",
     "cancel": "Avbryt",
     "cannotconnect": "Kan inte ansluta: Kontrollera att webbadressen är korrekt och att din webbplats använder Moodle 2.4 eller senare",
     "cannotdownloadfiles": "Nedladdning av filer är inaktiverad. Vänligen kontakta webbsidans administratör.",
@@ -12,15 +12,15 @@
     "clearsearch": "Rensa sökning",
     "clicktohideshow": "Klicka för att expandera eller fälla ihop",
     "clicktoseefull": "Klicka för att se hela innehållet",
-    "close": "Stäng",
+    "close": "Stäng fönster",
     "comments": "Kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Avslutad: {{$a}} (uppnådde inte gräns för godkänd)",
+    "completion-alt-auto-fail": "Fullföljd (uppnådde inte godkänt resultat)",
     "completion-alt-auto-n": "Inte avslutad: {{$a}}",
-    "completion-alt-auto-pass": "Avslutad: {{$a}} (uppnådde gräns för godkänd)",
-    "completion-alt-auto-y": "Avslutad: {{$a}}",
-    "completion-alt-manual-n": "Inte avslutad: {{$a}}. Välj att markera som avslutad",
-    "completion-alt-manual-y": "Avslutad: {{$a}}. Välj att markera som INTE avslutad",
+    "completion-alt-auto-pass": "Fullföljd (godkänt resultat)",
+    "completion-alt-auto-y": "Fullföljd",
+    "completion-alt-manual-n": "Ej fullföljd; välj för att markera som fullföljd",
+    "completion-alt-manual-y": "Fullföljd; välj för att markera som ej fullföljd",
     "confirmdeletefile": "Är Du säker på att Du vill ta bort den här filen?",
     "confirmopeninbrowser": "Vill du öppna den i webbläsaren ?",
     "content": "Innehåll",
@@ -28,22 +28,21 @@
     "course": "Kurs",
     "coursedetails": "Kursinformation",
     "date": "Datum",
-    "day": "dag",
-    "days": "dagar",
+    "day": "Dag(ar)",
+    "days": "Dagar",
     "decsep": ",",
     "delete": "Ta bort",
-    "deleting": "ta bort",
+    "deleting": "Tar bort",
     "description": "Beskrivning",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
     "dfmediumdate": "",
     "dftimedate": "h[:]mm A",
     "done": "Färdig",
-    "download": "Ladda ner",
+    "download": "Klicka för att ladda ner den exporterade filen för kategorier",
     "downloading": "Laddar ner",
     "edit": "Redigera",
-    "elementseparator": ",",
-    "error": "Fel",
+    "error": "Det inträffade ett okänt fel!",
     "errorchangecompletion": "Ett fel uppstod när du ändrade status för fullföljande. Var god försök igen.",
     "errordownloading": "Fel vid nedladdning av fil",
     "errordownloadingsomefiles": "Fel vid hämtning av modulens filer. Vissa filer kanske saknas .",
@@ -70,10 +69,10 @@
     "lastmodified": "Senast modifierad",
     "lastsync": "Senaste synkronisering",
     "listsep": ";",
-    "loading": "Loading",
+    "loading": "Laddar....",
     "lostconnection": "Vi förlorade anslutningen. Du måste  ansluta igen. Din token är nu ogiltigt.",
     "maxsizeandattachments": "Maximal storlek för nya filer: {{$a.size}}, max bilagor: {{$a.attachments}}",
-    "min": "minut",
+    "min": "Lägsta",
     "mins": "minuter",
     "mod_assign": "Uppgift",
     "mod_assignment": "Uppgift",
@@ -106,10 +105,10 @@
     "name": "Namn",
     "networkerrormsg": "Nätverket är inte aktiverat eller fungerar inte",
     "never": "Aldrig",
-    "next": "Nästa",
-    "no": "Nej",
-    "nocomments": "Inga kommentarer",
-    "nograde": "Inget betyg",
+    "next": "Fortsätt",
+    "no": "Ingen",
+    "nocomments": "Det finns inga kommentarer",
+    "nograde": "Inget betyg.",
     "none": "Ingen",
     "nopasswordchangeforced": "Du kan inte gå vidare utan att ändra Ditt lösenord, men det finns inte någon sida tillgänglig för att ändra det. Var snäll och kontakta Din administratör för Moodle.",
     "nopermissions": "Du har tyvärr f.n. inte tillstånd att göra detta ({{$a}})",
@@ -118,8 +117,8 @@
     "notice": "Meddelande",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Frånkopplat läge",
+    "online": "Uppkopplad",
     "openfullimage": "Klick här för att visa bilden i full storlek",
     "openinbrowser": "Öppna i webbläsare",
     "othergroups": "Andra grupper",
@@ -127,14 +126,14 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Bild av {{$a}}",
-    "previous": "Tidigare",
+    "previous": "Föregående status",
     "pulltorefresh": "Dra för att uppdatera",
-    "refresh": "Uppdatera",
+    "refresh": "Återställ",
     "required": "Obligatorisk",
     "requireduserdatamissing": "Den här användaren saknar vissa nödvändiga profildata. Vänligen fyll i uppgifterna i din Moodle och försök igen. <br>{{$a}}",
     "save": "Spara",
-    "search": "Sök",
-    "searching": "Söker",
+    "search": "Sök...",
+    "searching": "Söker i...",
     "searchresults": "Sökresultat",
     "sec": "Sekund",
     "secs": "Sekunder",
@@ -151,7 +150,7 @@
     "sizetb": "Tb",
     "start": "Starta",
     "submit": "Skicka",
-    "success": "Succé!",
+    "success": "Framgång",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
     "time": "Tid",
@@ -171,7 +170,7 @@
     "whoops": "Hoppsan!",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Webbtjänstfunktion är inte tillgänglig.",
-    "year": "år",
+    "year": "År",
     "years": "år",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index ce95ef58e73..efec2826202 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -3,8 +3,8 @@
     "allparticipants": "Bütün katılımcılar",
     "android": "Android",
     "areyousure": "Emin misiniz?",
-    "back": "Geri",
-    "cancel": "Vazgeç",
+    "back": "Soruyu önizlemeye geri dön",
+    "cancel": "İptal",
     "cannotconnect": "Bağlantı kurulamıyor: Doğru adres girdiğinizden ve sitenizin Moodle 2.4 ve sonrası sürüme sahip olduğundan emin olun.",
     "category": "Kategori",
     "choose": "Seç",
@@ -23,21 +23,21 @@
     "confirmdeletefile": "Bu dosyayı silmek istediğinize emin misiniz?",
     "confirmopeninbrowser": "Tarayıcıda açmak istediğine emin misin?",
     "content": "İçerik",
-    "continue": "Devam",
-    "course": "Kurs",
-    "coursedetails": "Kurs ayrıntıları",
+    "continue": "Devam et",
+    "course": "Ders",
+    "coursedetails": "Ders ayrıntıları",
     "date": "Tarih",
-    "day": "gün",
-    "days": "gün",
+    "day": "Gün",
+    "days": "Gün",
     "decsep": ",",
     "delete": "Sil",
     "deleting": "Siliniyor",
     "description": "Açıklama",
     "done": "Tamamlandı",
-    "download": "İndir",
+    "download": "Verilen kategori dosyasını indirin",
     "downloading": "İndiriliyor...",
-    "edit": "Düzenle ",
-    "error": "Hata",
+    "edit": "Düzenle",
+    "error": "Bilinmeyen bir hata oluştu!",
     "errordownloading": "Dosya indirmede  hata",
     "filename": "Dosya adı",
     "folder": "Klasör",
@@ -58,8 +58,8 @@
     "listsep": ";",
     "loading": "Yükleniyor",
     "lostconnection": "Bağlantınızı kaybettik, yeniden bağlanmanız gerekiyor. Verileriniz artık geçerli değil.",
-    "maxsizeandattachments": "Yeni dosyalar için azami büyüklük: {{$a.size}}, azami ek: {{$a.attachments}}",
-    "min": "dk",
+    "maxsizeandattachments": "Yeni dosyalar için en büyük boyut: {{$a.size}}, en fazla ek: {{$a.attachments}}",
+    "min": "En düşük",
     "mins": "dk",
     "mod_assign": "Ödev",
     "mod_book": "Kitap",
@@ -88,13 +88,13 @@
     "mod_workshop": "Çalıştay",
     "moduleintro": "Açıklama",
     "mygroups": "Gruplarım",
-    "name": "Ad",
+    "name": "Adı",
     "networkerrormsg": "Ağ etkin değil ya da çalışmıyor.",
-    "never": "Hiçbir zaman",
-    "next": "Sonraki",
+    "never": "Asla",
+    "next": "Devam et",
     "no": "Hayır",
-    "nocomments": "Yorum bulunmuyor",
-    "nograde": "Not yok",
+    "nocomments": "Hiç yorum yok",
+    "nograde": "Not yok.",
     "none": "Hiçbiri",
     "nopasswordchangeforced": "Şifrenizi değiştirmeden ilerleyemezsiniz, ancak şifrenizi değiştirmek için bir sayfa yok. Lütfen Moodle Yöneticinizle iletişime geçin.",
     "nopermissions": "Üzgünüz, şu anda bunu yapmaya yetkiniz yok: {{$a}}",
@@ -108,13 +108,13 @@
     "othergroups": "Diğer gruplar",
     "pagea": "Sayfa {{$a}}",
     "phone": "Telefon",
-    "pictureof": "{{$a}} Resmi",
-    "previous": "Önceki",
+    "pictureof": "{{$a}} 'ın resmi",
+    "previous": "Önceki durum",
     "refresh": "Yenile",
     "required": "Gerekli",
     "save": "Kaydet",
-    "search": "Ara",
-    "searching": "Aranıyor",
+    "search": "Arama...",
+    "searching": "Aranıyor...",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
@@ -125,30 +125,30 @@
     "show": "Göster",
     "showmore": "Daha fazla göster...",
     "site": "Site",
-    "sizeb": "byte",
+    "sizeb": "bayt",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
     "sorry": "Üzgünüz...",
     "start": "Başla",
     "submit": "Gönder",
-    "success": "Başarılı",
+    "success": "Başarı",
     "tablet": "Tablet",
     "teachers": "Eğitimciler",
-    "time": "Zaman",
+    "time": "Süre",
     "timesup": "Süre doldu!",
     "today": "Bugün",
     "unexpectederror": "Beklenmeyen hata. Lütfen uygulamanızı yeniden açın ve tekrar deneyin",
     "unknown": "Bilinmeyen",
     "unlimited": "Limitsiz",
     "upgraderunning": "Site güncellemesi yapılıyor, lütfen daha sonra deneyin.",
-    "userdeleted": "Bu kullanıcının hesabı silindi",
+    "userdeleted": "Bu kullanıcı hesabı silindi",
     "userdetails": "Kullanıcı ayrıntıları",
     "usernotfullysetup": "Kullanıcı tam kurulum yapmadı",
     "users": "Kullanıcılar",
     "view": "Görünüm",
-    "viewprofile": "Profile bak",
-    "year": "yıl",
+    "viewprofile": "Profili görüntüle",
+    "year": "Yıl",
     "years": "yıl",
     "yes": "Evet"
 }
\ No newline at end of file
diff --git a/www/core/lang/zh-cn.json b/www/core/lang/zh-cn.json
index 68fba3c90fa..3d984a928c7 100644
--- a/www/core/lang/zh-cn.json
+++ b/www/core/lang/zh-cn.json
@@ -1,10 +1,10 @@
 {
     "allparticipants": "所有成员",
     "areyousure": "你确定吗？",
-    "back": "返回",
+    "back": "返回预览试题",
     "cancel": "取消",
     "cannotconnect": "无法连接：请确认您已经正确输入网址，并且您的网站使用了Moodle 2.4或更高版本。",
-    "category": "课程分类",
+    "category": "类别",
     "choose": "选择",
     "choosedots": "选择...",
     "clicktohideshow": "点击来展开或折叠",
@@ -24,15 +24,15 @@
     "coursedetails": "课程详情",
     "date": "日期",
     "day": "天",
-    "days": "天",
+    "days": "天数",
     "decsep": ".",
     "delete": "删除",
     "deleting": "删除中",
     "description": "描述",
     "done": "完成",
-    "download": "下载",
+    "download": "点击下载已导出的分类文件",
     "edit": "编辑",
-    "error": "错误",
+    "error": "发生未知错误！",
     "errordownloading": "下载文件时出错",
     "filename": "文件名",
     "folder": "文件夹",
@@ -46,12 +46,12 @@
     "hours": "小时",
     "info": "信息",
     "labelsep": "：",
-    "lastmodified": "最后修改",
+    "lastmodified": "最近修改",
     "listsep": "，",
-    "loading": "载入中",
+    "loading": "载入中……",
     "lostconnection": "我们失去了连接，因此您需要重新连接。您现在的令牌是无效的。",
     "maxsizeandattachments": "新文件的最大尺寸： {{$a.size}} ，最多附件：{{$a.attachments}}",
-    "min": "分钟",
+    "min": "最低",
     "mins": "分钟",
     "mod_assign": "作业",
     "mod_chat": "聊天",
@@ -68,29 +68,29 @@
     "moduleintro": "描述",
     "name": "名称",
     "networkerrormsg": "网络未启用或不工作。",
-    "never": "从未",
-    "next": "向后",
+    "never": "从不",
+    "next": "继续",
     "no": "否",
-    "nocomments": "无评论",
-    "nograde": "没有分数",
-    "none": "无",
+    "nocomments": "没有评论",
+    "nograde": "没有成绩。",
+    "none": "没有",
     "nopasswordchangeforced": "在您更改密码前不能继续操作，但系统找不到用来更改密码的页面，请与管理员联系。",
     "nopermissions": "很抱歉，您没有相应权限（{{$a}}）",
     "noresults": "没有结果",
     "notice": "注意",
     "now": "现在",
     "numwords": "{{$a}}单词",
-    "offline": "不需要在线提交",
+    "offline": "离线",
     "online": "在线",
     "pagea": "页码 {{$a}}",
     "phone": "电话",
     "pictureof": "{{$a}}的头像",
-    "previous": "向前",
+    "previous": "以前状态",
     "refresh": "刷新",
-    "required": "必需的",
+    "required": "必须回答",
     "save": "保存",
     "search": "搜索",
-    "searching": "搜索",
+    "searching": "搜索中……",
     "searchresults": "搜索结果",
     "sec": "秒",
     "secs": "秒",
@@ -118,7 +118,7 @@
     "userdeleted": "该用户帐号已被删除",
     "userdetails": "用户细节",
     "users": "用户",
-    "view": "浏览",
+    "view": "查看",
     "viewprofile": "查看个人资料",
     "year": "年",
     "years": "年",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index e599a4db4c9..d0aec1e213c 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -3,26 +3,26 @@
     "allparticipants": "所有參與者",
     "android": "安卓",
     "areyousure": "你確定嗎？",
-    "back": "返回",
+    "back": "返回預覽試題",
     "cancel": "取消",
     "cannotconnect": "無法連接：請確認您輸入之網址正確，且您的位置使用的是Moodle2.4版或更新版本。",
     "cannotdownloadfiles": "在您的行動服務中禁用檔案下載. 請與您的網站管理員聯繫.",
-    "category": "類別",
+    "category": "類目",
     "choose": "選擇",
     "choosedots": "選擇...",
     "clearsearch": "清除搜尋",
     "clicktohideshow": "點按展開或縮合",
     "clicktoseefull": "點擊以看到詳細內容",
     "close": "關閉視窗",
-    "comments": "評論",
-    "commentscount": "評論數({{$a}})",
+    "comments": "評語",
+    "commentscount": "評論（{{$a}}）",
     "commentsnotworking": "無法取得評論資料",
-    "completion-alt-auto-fail": "已完成: {{$a}} (did not achieve pass grade)",
-    "completion-alt-auto-n": "未完成: {{$a}}",
-    "completion-alt-auto-pass": "已完成: {{$a}} (achieved pass grade)",
-    "completion-alt-auto-y": "已完成: {{$a}}",
-    "completion-alt-manual-n": "未完成: {{$ a}}.  選擇標記為完成.",
-    "completion-alt-manual-y": "已完成: {{$ a}}. 選擇標記為未完成.",
+    "completion-alt-auto-fail": "已完成：{{$a}} (不及格)",
+    "completion-alt-auto-n": "尚未完成：{{$a}}",
+    "completion-alt-auto-pass": "已經完成：{{$a}} (及格)",
+    "completion-alt-auto-y": "已經完成：{{$a}}",
+    "completion-alt-manual-n": "未完成：{{$a}} 。點選標記為完成。",
+    "completion-alt-manual-y": "已完成：{{$a}} 。點選標記為未完成。",
     "confirmcanceledit": "您確定要離開此頁面嗎? 所有的修改將會遺失.",
     "confirmdeletefile": "你確定要刪除這一檔案？",
     "confirmopeninbrowser": "你想要在瀏覽器內開啟嗎?",
@@ -35,12 +35,12 @@
     "datastoredoffline": "儲存在設備中的資料，因為它之前無法發送.  它稍後將自動發送.",
     "date": "日期",
     "day": "日",
-    "days": "日",
+    "days": "天數",
     "decsep": ".",
     "defaultvalue": "預設 ({{$a}})",
     "delete": "刪除",
     "deleting": "刪除中",
-    "description": "描述",
+    "description": "說明",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -49,11 +49,10 @@
     "discard": "捨棄",
     "dismiss": "除去",
     "done": "完成",
-    "download": "下載",
+    "download": "點選可下載匯出的類別檔案",
     "downloading": "下載中",
-    "edit": "編修",
-    "elementseparator": ",",
-    "error": "錯誤",
+    "edit": "編輯",
+    "error": "發生一個未知的錯誤!",
     "errorchangecompletion": "更改完成狀態時發生錯誤. 請再試一次.",
     "errordeletefile": "刪除檔案時出錯. 請再試一次.",
     "errordownloading": "下載檔案時發生錯誤",
@@ -76,23 +75,23 @@
     "groupsseparate": "分隔群組",
     "groupsvisible": "可視群組",
     "hasdatatosync": "此{{$ a}}有離線資料要同步.",
-    "help": "輔助說明",
+    "help": "幫助",
     "hide": "隱藏",
     "hour": "小時",
     "hours": "小時",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "圖片",
     "imageviewer": "影像檢視器",
-    "info": "資料",
+    "info": "說明",
     "ios": "iOS",
     "labelsep": "：",
     "lastmodified": "最後修改",
     "lastsync": "最後同步",
     "listsep": "，",
-    "loading": "載入中",
+    "loading": "裝載中...",
     "lostconnection": "我們已斷了線，您需重新連線。您的口令目前是無效的。",
     "maxsizeandattachments": "新檔案的最大容量： {{$a.size}} ，最多附件：{{$a.attachments}}",
-    "min": "分鐘",
+    "min": "最低分",
     "mins": "分鐘",
     "mod_assign": "分配",
     "mod_assignment": "分配",
@@ -124,13 +123,13 @@
     "mygroups": "我的群組",
     "name": "名稱",
     "networkerrormsg": "網路未啟用或未運作。",
-    "never": "從不",
-    "next": "往後",
+    "never": "從未",
+    "next": "繼續",
     "no": "否",
     "nocomments": "沒有評論",
-    "nograde": "沒有成績",
-    "none": "無",
-    "nopasswordchangeforced": "你若沒有更新密碼無法進行此處理",
+    "nograde": "沒有成績。",
+    "none": "沒有",
+    "nopasswordchangeforced": "沒有修改密碼前您無法處理，這裡沒有提供可以變更的頁面，請聯絡您的Moodle管理員。",
     "nopermissions": "抱歉，但是您目前沒有權限執行({{$a}})",
     "noresults": "沒有結果",
     "notapplicable": "n/a",
@@ -139,7 +138,7 @@
     "now": "現在",
     "numwords": "{{$a}}字數",
     "offline": "離線",
-    "online": "上線",
+    "online": "在線上",
     "openfullimage": "點擊這裡以圖像原尺寸顯示",
     "openinbrowser": "以瀏覽器開啟",
     "othergroups": "其他群組",
@@ -147,22 +146,22 @@
     "percentagenumber": "{{$a}}%",
     "phone": "電話",
     "pictureof": "{{$a}}的相片",
-    "previous": "向前",
+    "previous": "先前的狀態",
     "pulltorefresh": "拖曳更新",
     "redirectingtosite": "您將被重定向到網站.",
-    "refresh": "更新",
-    "required": "必須的",
+    "refresh": "重新整理",
+    "required": "必要的",
     "requireduserdatamissing": "此使用者缺少一些必需的配置資料. 請在您的Moodle中填寫此數據, 然後重試.<br> {{$ a}}",
     "retry": "重試",
     "save": "儲存",
-    "search": "搜尋",
-    "searching": "搜尋中",
+    "search": "搜尋中...",
+    "searching": "搜尋中...",
     "searchresults": "搜尋結果",
     "sec": "秒",
     "secs": "秒",
     "seemoredetail": "按此以觀看更多細節",
-    "send": "傳送",
-    "sending": "傳送中",
+    "send": "送出",
+    "sending": "正在傳送",
     "serverconnection": "連結到伺服器時發生錯誤",
     "show": "顯示",
     "showmore": "顯示更多...",
@@ -176,7 +175,7 @@
     "sorry": "抱歉...",
     "start": "開始",
     "submit": "送出",
-    "success": "成功!",
+    "success": "成功",
     "tablet": "平板",
     "teachers": "教師",
     "thereisdatatosync": "有離線的{{$ a}}要同步",
@@ -187,7 +186,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "噢哦!",
     "unexpectederror": "無法預期的錯誤. 請關閉並重新開啟應用程式, 再試一次.",
-    "unknown": "未知",
+    "unknown": "未知的",
     "unlimited": "無限制",
     "unzipping": "解壓縮中",
     "upgraderunning": "網站正在升級中，請稍後再試。",
@@ -195,7 +194,7 @@
     "userdetails": "用戶的詳細資料",
     "usernotfullysetup": "用戶沒有完全設定好",
     "users": "用戶",
-    "view": "瀏覽",
+    "view": "檢視",
     "viewprofile": "瀏覽個人資料",
     "warningofflinedatadeleted": "離線資料 {{component}} '{{name}}' 已被刪除. {{error}}",
     "whoops": "糟糕!",

From 1e872ebb9a4ca5eebfb51decaf854c2009660255 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Tue, 23 May 2017 14:35:39 +0200
Subject: [PATCH 203/218] MOBILE-2103 release: Sync with AMOS

---
 www/addons/calendar/lang/cs.json              |  4 +--
 www/addons/calendar/lang/de.json              |  4 +--
 www/addons/calendar/lang/es-mx.json           |  2 +-
 www/addons/calendar/lang/fa.json              |  4 +--
 www/addons/calendar/lang/fr.json              |  2 +-
 www/addons/calendar/lang/it.json              |  2 +-
 www/addons/calendar/lang/nl.json              |  2 +-
 www/addons/calendar/lang/pt-br.json           |  2 +-
 www/addons/calendar/lang/ru.json              |  1 +
 www/addons/calendar/lang/sv.json              |  2 +-
 www/addons/competency/lang/ca.json            |  2 +-
 www/addons/competency/lang/cs.json            |  2 +-
 www/addons/competency/lang/de.json            |  2 +-
 www/addons/competency/lang/es-mx.json         |  2 +-
 www/addons/competency/lang/fr.json            |  2 +-
 www/addons/competency/lang/it.json            |  2 +-
 www/addons/competency/lang/nl.json            |  2 +-
 www/addons/competency/lang/pt-br.json         |  2 +-
 www/addons/coursecompletion/lang/ca.json      | 14 +++++-----
 www/addons/coursecompletion/lang/cs.json      | 26 +++++++++---------
 www/addons/coursecompletion/lang/de.json      | 22 +++++++--------
 www/addons/coursecompletion/lang/el.json      |  4 +--
 www/addons/coursecompletion/lang/es-mx.json   | 24 ++++++++---------
 www/addons/coursecompletion/lang/fa.json      |  4 +--
 www/addons/coursecompletion/lang/fr.json      |  6 ++---
 www/addons/coursecompletion/lang/it.json      | 14 +++++-----
 www/addons/coursecompletion/lang/nl.json      | 18 ++++++-------
 www/addons/coursecompletion/lang/pt-br.json   | 22 +++++++--------
 www/addons/coursecompletion/lang/ru.json      | 26 +++++++++---------
 www/addons/coursecompletion/lang/sv.json      | 22 +++++++--------
 www/addons/files/lang/ca.json                 |  4 +--
 www/addons/files/lang/cs.json                 |  4 +--
 www/addons/files/lang/de.json                 |  4 +--
 www/addons/files/lang/el.json                 |  2 +-
 www/addons/files/lang/es-mx.json              |  4 +--
 www/addons/files/lang/fr.json                 |  4 +--
 www/addons/files/lang/it.json                 |  4 +--
 www/addons/files/lang/nl.json                 |  4 +--
 www/addons/files/lang/pt-br.json              |  4 +--
 www/addons/files/lang/ru.json                 |  2 +-
 www/addons/messages/lang/ca.json              |  4 +--
 www/addons/messages/lang/cs.json              |  6 ++---
 www/addons/messages/lang/de.json              |  6 ++---
 www/addons/messages/lang/el.json              |  6 ++---
 www/addons/messages/lang/es-mx.json           |  6 ++---
 www/addons/messages/lang/fr.json              |  6 ++---
 www/addons/messages/lang/it.json              |  6 ++---
 www/addons/messages/lang/nl.json              |  4 +--
 www/addons/messages/lang/pt-br.json           |  4 +--
 www/addons/messages/lang/ru.json              |  4 +--
 www/addons/messages/lang/sv.json              |  6 ++---
 www/addons/messages/lang/tr.json              |  2 +-
 www/addons/mod/choice/lang/ca.json            |  4 +--
 www/addons/mod/choice/lang/cs.json            |  4 +--
 www/addons/mod/choice/lang/de.json            |  4 +--
 www/addons/mod/choice/lang/el.json            |  4 +--
 www/addons/mod/choice/lang/es-mx.json         |  4 +--
 www/addons/mod/choice/lang/fr.json            |  4 +--
 www/addons/mod/choice/lang/it.json            |  4 +--
 www/addons/mod/choice/lang/nl.json            |  4 +--
 www/addons/mod/choice/lang/pt-br.json         |  4 +--
 www/addons/mod/choice/lang/sv.json            |  4 +--
 www/addons/mod/feedback/lang/ca.json          |  2 ++
 www/addons/mod/feedback/lang/cs.json          |  2 ++
 www/addons/mod/feedback/lang/de.json          |  2 ++
 www/addons/mod/feedback/lang/es-mx.json       |  2 ++
 www/addons/mod/feedback/lang/nl.json          |  2 ++
 www/addons/mod/folder/lang/ca.json            |  2 +-
 www/addons/mod/folder/lang/cs.json            |  2 +-
 www/addons/mod/folder/lang/de.json            |  2 +-
 www/addons/mod/folder/lang/es-mx.json         |  2 +-
 www/addons/mod/folder/lang/fr.json            |  2 +-
 www/addons/mod/folder/lang/it.json            |  2 +-
 www/addons/mod/folder/lang/nl.json            |  2 +-
 www/addons/mod/folder/lang/pt-br.json         |  2 +-
 www/addons/mod/forum/lang/de.json             |  2 +-
 www/addons/mod/forum/lang/es-mx.json          |  2 +-
 www/addons/mod/forum/lang/fr.json             |  2 +-
 www/addons/mod/forum/lang/it.json             |  2 +-
 www/addons/mod/forum/lang/nl.json             |  2 +-
 www/addons/mod/forum/lang/pt-br.json          |  2 +-
 www/addons/mod/forum/lang/ru.json             |  3 ++-
 www/addons/mod/forum/lang/sv.json             |  2 +-
 www/addons/mod/glossary/lang/ca.json          |  2 +-
 www/addons/mod/glossary/lang/cs.json          |  2 +-
 www/addons/mod/glossary/lang/de.json          |  2 +-
 www/addons/mod/glossary/lang/el.json          |  2 +-
 www/addons/mod/glossary/lang/es-mx.json       |  2 +-
 www/addons/mod/glossary/lang/fr.json          |  2 +-
 www/addons/mod/glossary/lang/nl.json          |  2 +-
 www/addons/mod/glossary/lang/pt-br.json       |  2 +-
 www/addons/mod/glossary/lang/sv.json          |  2 +-
 www/addons/mod/lesson/lang/ca.json            |  6 +++++
 www/addons/mod/lesson/lang/cs.json            |  6 +++++
 www/addons/mod/lesson/lang/de.json            |  6 +++++
 www/addons/mod/lesson/lang/es-mx.json         |  6 +++++
 www/addons/mod/lesson/lang/nl.json            |  6 +++++
 www/addons/mod/wiki/lang/ca.json              |  2 +-
 www/addons/mod/wiki/lang/cs.json              |  2 +-
 www/addons/mod/wiki/lang/de.json              |  2 +-
 www/addons/mod/wiki/lang/el.json              |  2 +-
 www/addons/mod/wiki/lang/es-mx.json           |  2 +-
 www/addons/mod/wiki/lang/fr.json              |  2 +-
 www/addons/mod/wiki/lang/nl.json              |  2 +-
 www/addons/mod/wiki/lang/pt-br.json           |  2 +-
 www/addons/mod/wiki/lang/ru.json              |  2 +-
 www/addons/mod/wiki/lang/tr.json              |  2 +-
 www/addons/notes/lang/ca.json                 |  2 +-
 www/addons/notes/lang/cs.json                 |  2 +-
 www/addons/notes/lang/de.json                 |  2 +-
 www/addons/notes/lang/el.json                 |  2 +-
 www/addons/notes/lang/es-mx.json              |  2 +-
 www/addons/notes/lang/fr.json                 |  2 +-
 www/addons/notes/lang/it.json                 |  2 +-
 www/addons/notes/lang/nl.json                 |  2 +-
 www/addons/notes/lang/pt-br.json              |  2 +-
 www/addons/notes/lang/ru.json                 |  2 +-
 www/addons/notes/lang/sv.json                 |  2 +-
 www/addons/notifications/lang/ca.json         |  1 +
 www/addons/notifications/lang/cs.json         |  1 +
 www/addons/notifications/lang/de.json         |  5 ++--
 www/addons/notifications/lang/es-mx.json      |  1 +
 www/addons/notifications/lang/fa.json         |  2 +-
 www/addons/notifications/lang/nl.json         |  3 ++-
 www/addons/notifications/lang/pt-br.json      |  4 +--
 www/addons/notifications/lang/sv.json         |  2 +-
 www/addons/participants/lang/ca.json          |  2 +-
 www/addons/participants/lang/cs.json          |  4 +--
 www/addons/participants/lang/de.json          |  4 +--
 www/addons/participants/lang/el.json          |  2 +-
 www/addons/participants/lang/es-mx.json       |  2 +-
 www/addons/participants/lang/fr.json          |  2 +-
 www/addons/participants/lang/it.json          |  4 +--
 www/addons/participants/lang/nl.json          |  2 +-
 www/addons/participants/lang/pt-br.json       |  2 +-
 www/addons/participants/lang/sv.json          |  2 +-
 www/addons/participants/lang/tr.json          |  2 +-
 www/addons/participants/lang/zh-cn.json       |  2 +-
 www/core/components/course/lang/ca.json       |  2 +-
 www/core/components/course/lang/cs.json       |  2 +-
 www/core/components/course/lang/de.json       |  2 +-
 www/core/components/course/lang/el.json       |  2 +-
 www/core/components/course/lang/es-mx.json    |  4 +--
 www/core/components/course/lang/fa.json       |  4 +--
 www/core/components/course/lang/fr.json       |  2 +-
 www/core/components/course/lang/it.json       |  2 +-
 www/core/components/course/lang/nl.json       |  2 +-
 www/core/components/course/lang/pt-br.json    |  4 +--
 www/core/components/course/lang/ru.json       |  2 +-
 www/core/components/course/lang/sv.json       |  2 +-
 www/core/components/course/lang/tr.json       |  4 +--
 www/core/components/course/lang/zh-cn.json    |  2 +-
 www/core/components/courses/lang/ca.json      |  8 +++---
 www/core/components/courses/lang/cs.json      | 10 +++----
 www/core/components/courses/lang/de.json      | 10 +++----
 www/core/components/courses/lang/el.json      |  8 +++---
 www/core/components/courses/lang/es-mx.json   |  6 ++---
 www/core/components/courses/lang/fr.json      |  6 ++---
 www/core/components/courses/lang/it.json      |  6 ++---
 www/core/components/courses/lang/nl.json      | 10 +++----
 www/core/components/courses/lang/pt-br.json   |  8 +++---
 www/core/components/courses/lang/sv.json      | 10 +++----
 www/core/components/fileuploader/lang/ca.json |  8 +++---
 www/core/components/fileuploader/lang/cs.json | 10 +++----
 www/core/components/fileuploader/lang/de.json |  6 ++---
 www/core/components/fileuploader/lang/el.json |  8 +++---
 .../components/fileuploader/lang/es-mx.json   |  8 +++---
 www/core/components/fileuploader/lang/fr.json | 10 +++----
 www/core/components/fileuploader/lang/it.json | 10 +++----
 www/core/components/fileuploader/lang/nl.json | 12 ++++-----
 .../components/fileuploader/lang/pt-br.json   |  8 +++---
 www/core/components/fileuploader/lang/ru.json |  8 +++---
 www/core/components/fileuploader/lang/sv.json |  6 ++---
 www/core/components/fileuploader/lang/tr.json |  2 +-
 .../components/fileuploader/lang/zh-cn.json   |  2 +-
 www/core/components/login/lang/cs.json        |  4 +--
 www/core/components/login/lang/de.json        |  2 +-
 www/core/components/login/lang/el.json        |  2 +-
 www/core/components/login/lang/es-mx.json     |  4 +--
 www/core/components/login/lang/fr.json        |  4 +--
 www/core/components/login/lang/it.json        |  2 +-
 www/core/components/login/lang/nl.json        |  4 +--
 www/core/components/login/lang/pt-br.json     |  4 +--
 www/core/components/login/lang/ru.json        |  2 +-
 www/core/components/login/lang/sv.json        |  2 +-
 www/core/components/question/lang/ca.json     |  2 +-
 www/core/components/question/lang/cs.json     |  2 +-
 www/core/components/question/lang/de.json     |  2 +-
 www/core/components/question/lang/es-mx.json  |  2 +-
 www/core/components/question/lang/fr.json     |  2 +-
 www/core/components/question/lang/it.json     |  2 +-
 www/core/components/question/lang/nl.json     |  2 +-
 www/core/components/question/lang/pt-br.json  |  2 +-
 www/core/components/settings/lang/ru.json     |  7 +++++
 www/core/components/sharedfiles/lang/ca.json  |  2 +-
 www/core/components/sharedfiles/lang/cs.json  |  2 +-
 www/core/components/sharedfiles/lang/de.json  |  2 +-
 .../components/sharedfiles/lang/es-mx.json    |  2 +-
 www/core/components/sharedfiles/lang/tr.json  |  2 +-
 www/core/components/sidemenu/lang/ca.json     |  2 +-
 www/core/components/sidemenu/lang/cs.json     |  4 +--
 www/core/components/sidemenu/lang/es-mx.json  |  2 +-
 www/core/components/sidemenu/lang/fa.json     |  4 +--
 www/core/components/sidemenu/lang/nl.json     |  2 +-
 www/core/components/sidemenu/lang/zh-cn.json  |  2 +-
 www/core/components/user/lang/ca.json         |  4 +--
 www/core/components/user/lang/cs.json         |  6 ++---
 www/core/components/user/lang/de.json         |  6 ++---
 www/core/components/user/lang/es-mx.json      |  6 ++---
 www/core/components/user/lang/fa.json         |  6 ++---
 www/core/components/user/lang/fr.json         |  8 +++---
 www/core/components/user/lang/it.json         |  6 ++---
 www/core/components/user/lang/nl.json         |  4 +--
 www/core/components/user/lang/pt-br.json      |  6 ++---
 www/core/components/user/lang/ru.json         |  6 ++---
 www/core/components/user/lang/sv.json         |  8 +++---
 www/core/components/user/lang/tr.json         |  8 +++---
 www/core/components/user/lang/zh-cn.json      |  4 +--
 www/core/lang/ca.json                         | 11 +++++---
 www/core/lang/cs.json                         | 19 +++++++------
 www/core/lang/de.json                         | 23 +++++++++-------
 www/core/lang/el.json                         | 24 ++++++++---------
 www/core/lang/es-mx.json                      | 27 ++++++++++---------
 www/core/lang/fr.json                         | 10 +++----
 www/core/lang/it.json                         | 22 +++++++--------
 www/core/lang/nl.json                         | 23 +++++++++-------
 www/core/lang/pt-br.json                      | 20 +++++++-------
 www/core/lang/ru.json                         |  3 +++
 www/core/lang/sv.json                         | 20 +++++++-------
 www/core/lang/tr.json                         |  2 +-
 230 files changed, 605 insertions(+), 533 deletions(-)

diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index dc0b5327079..93d27c11dce 100644
--- a/www/addons/calendar/lang/cs.json
+++ b/www/addons/calendar/lang/cs.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Výchozí čas oznámení",
     "errorloadevent": "Chyba při načítání události.",
     "errorloadevents": "Chyba při načítání událostí.",
-    "noevents": "Žádné nadcházející činnosti",
-    "notifications": "Oznámení"
+    "noevents": "Nejsou žádné události",
+    "notifications": "Upozornění"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/de.json b/www/addons/calendar/lang/de.json
index ba88248af7f..ee64dc04300 100644
--- a/www/addons/calendar/lang/de.json
+++ b/www/addons/calendar/lang/de.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standardmäßige Benachrichtigungszeit",
     "errorloadevent": "Fehler beim Laden des Kalendereintrags",
     "errorloadevents": "Fehler beim Laden der Kalendereinträge",
-    "noevents": "Keine anstehenden Aktivitäten fällig",
-    "notifications": "Benachrichtigungen"
+    "noevents": "Keine Kalendereinträge",
+    "notifications": "Benachrichtigung"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es-mx.json b/www/addons/calendar/lang/es-mx.json
index d54a5abc6ad..872b31813b4 100644
--- a/www/addons/calendar/lang/es-mx.json
+++ b/www/addons/calendar/lang/es-mx.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificación por defecto",
     "errorloadevent": "Error al cargar evento.",
     "errorloadevents": "Error al cargar eventos.",
-    "noevents": "No hay actividades próximas pendientes",
+    "noevents": "No hay eventos",
     "notifications": "Notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 344affea7df..109ac4e7ec6 100644
--- a/www/addons/calendar/lang/fa.json
+++ b/www/addons/calendar/lang/fa.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "زمان پیش‌فرض اطلاع‌رسانی",
     "errorloadevent": "خطا در بارگیری رویداد.",
     "errorloadevents": "خطا در بارگیری رویدادها.",
-    "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
-    "notifications": "اطلاعیه‌ها"
+    "noevents": "هیچ رویدادی نیست",
+    "notifications": "هشدارها"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fr.json b/www/addons/calendar/lang/fr.json
index 9281fbdabb5..79e2b2edcac 100644
--- a/www/addons/calendar/lang/fr.json
+++ b/www/addons/calendar/lang/fr.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Heure de notification par défaut",
     "errorloadevent": "Erreur de chargement de l'événement",
     "errorloadevents": "Erreur de chargement des événements",
-    "noevents": "Aucune activité",
+    "noevents": "Il n'y a pas d'événement",
     "notifications": "Notifications"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/it.json b/www/addons/calendar/lang/it.json
index bd05740cedc..7dda0726c1e 100644
--- a/www/addons/calendar/lang/it.json
+++ b/www/addons/calendar/lang/it.json
@@ -2,6 +2,6 @@
     "calendarevents": "Eventi nel calendario",
     "errorloadevent": "Si è verificato un errore durante il caricamento degli eventi.",
     "errorloadevents": "Si è verificato un errore durante il caricamento degli eventi.",
-    "noevents": "Non ci sono attività da svolgere",
+    "noevents": "Non ci sono eventi",
     "notifications": "Notifiche"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/nl.json b/www/addons/calendar/lang/nl.json
index 16546e8a4ee..5c7174a3165 100644
--- a/www/addons/calendar/lang/nl.json
+++ b/www/addons/calendar/lang/nl.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standaard notificatietijd",
     "errorloadevent": "Fout bij het laden van de gebeurtenis.",
     "errorloadevents": "Fout bij het laden van de gebeurtenissen.",
-    "noevents": "Er zijn geen verwachte activiteiten",
+    "noevents": "Er zijn geen gebeurtenissen",
     "notifications": "Meldingen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index 77451b11a5d..b348e89bed4 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
     "noevents": "Sem eventos",
-    "notifications": "Notificações"
+    "notifications": "Notificação"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/ru.json b/www/addons/calendar/lang/ru.json
index 59e7977c92a..0d17cabd368 100644
--- a/www/addons/calendar/lang/ru.json
+++ b/www/addons/calendar/lang/ru.json
@@ -1,5 +1,6 @@
 {
     "calendarevents": "События календаря",
+    "defaultnotificationtime": "Время уведомлений по умолчанию",
     "errorloadevent": "Ошибка при загрузке события",
     "errorloadevents": "Ошибка при загрузке событий",
     "noevents": "Нет событий",
diff --git a/www/addons/calendar/lang/sv.json b/www/addons/calendar/lang/sv.json
index 7599b1d1f89..d5ac5c127d0 100644
--- a/www/addons/calendar/lang/sv.json
+++ b/www/addons/calendar/lang/sv.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fel vid inläsning av händelse.",
     "errorloadevents": "Fel vid inläsning av händelser",
     "noevents": "Det finns inga händelser",
-    "notifications": "Meddelande"
+    "notifications": "Notifikationer"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index 91a5c0fde71..92fe71cb17a 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -10,7 +10,7 @@
     "learningplans": "Plans d'aprenentatge",
     "myplans": "Els meus plans d'aprenentatge",
     "noactivities": "Cap activitat",
-    "nocompetencies": "No s'han creat competències en aquest marc.",
+    "nocompetencies": "Cap competència",
     "nocrossreferencedcompetencies": "No hi ha competències amb referències a aquesta.",
     "noevidence": "Cap evidència",
     "noplanswerecreated": "No s'ha creat cap pla d'aprenentatge.",
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index 2e584cd9176..bc6d5945d5e 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -12,7 +12,7 @@
     "learningplans": "Studijní plány",
     "myplans": "Mé studijní plány",
     "noactivities": "Žádné činnosti",
-    "nocompetencies": "V tomto rámci nebyly vytvořeny žádné kompetence.",
+    "nocompetencies": "Žádné kompetence",
     "nocrossreferencedcompetencies": "K této kompetenci nebyly spojeny další průřezové kompetence.",
     "noevidence": "Bez záznamu",
     "noplanswerecreated": "Nebyly vytvořeny žádné studijní plány.",
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index 744b6c16535..e5efd8aed97 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -12,7 +12,7 @@
     "learningplans": "Lernpläne",
     "myplans": "Meine Lernpläne",
     "noactivities": "Keine Aktivitäten",
-    "nocompetencies": "Für diesen Kompetenzrahmen wurden keine Kompetenzen angelegt.",
+    "nocompetencies": "Keine Kompetenzen",
     "nocrossreferencedcompetencies": "Keine anderen Kompetenzen wurden zu dieser Kompetenz referiert.",
     "noevidence": "Keine Belege",
     "noplanswerecreated": "Bisher sind keine Lernpläne angelegt.",
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index b6b1c272d25..4c7800dd8dd 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -12,7 +12,7 @@
     "learningplans": "Planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
-    "nocompetencies": "No se han creado competencias en esta estructura.",
+    "nocompetencies": "Sin competencias",
     "nocrossreferencedcompetencies": "No se han referenciado cruzadamente otras competencias con esta competencia.",
     "noevidence": "Sin evidencia",
     "noplanswerecreated": "No se crearon planes de aprendizaje.",
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index f8af723914c..e0ba3a63fde 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -12,7 +12,7 @@
     "learningplans": "Plans de formation",
     "myplans": "Mes plans de formation",
     "noactivities": "Aucune activité",
-    "nocompetencies": "Aucune compétence n'a été créée dans ce référentiel.",
+    "nocompetencies": "Aucune compétence",
     "nocrossreferencedcompetencies": "Aucune autre compétence n'est transversale pour cette compétence.",
     "noevidence": "Aucune preuve d'acquis",
     "noplanswerecreated": "Aucun plan de formation n'a été créé.",
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index aedcc17cab4..3f31d62120d 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -12,7 +12,7 @@
     "learningplans": "Piani di formazione",
     "myplans": "I miei piani di formazione",
     "noactivities": "Nessuna attività.",
-    "nocompetencies": "Questo quadro non ha competenze",
+    "nocompetencies": "Non sono presenti competenze",
     "nocrossreferencedcompetencies": "Non ci sono competenze con riferimenti incrociati a questa competenza",
     "noevidence": "Non sono presenti attestazioni.",
     "noplanswerecreated": "Non sono stati creati piani di formazione",
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index 8f923295c43..ef153319741 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -12,7 +12,7 @@
     "learningplans": "Studieplannen",
     "myplans": "Mijn studieplannen",
     "noactivities": "Geen activiteiten",
-    "nocompetencies": "Er zijn nog geen competenties gemaakt in dit framework",
+    "nocompetencies": "Geen competenties",
     "nocrossreferencedcompetencies": "Er zijn geen andere competenties met een kruisverwijzing naar deze competentie.",
     "noevidence": "Geen bewijs",
     "noplanswerecreated": "Er zijn nog geen studieplannen gemaakt",
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index b63b0689b05..2a38ec28be7 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -12,7 +12,7 @@
     "learningplans": "Planos de aprendizagem",
     "myplans": "Meus planos de aprendizagem",
     "noactivities": "Sem atividades",
-    "nocompetencies": "Nenhuma competência foi criada para esta estrutura.",
+    "nocompetencies": "Nenhuma competência",
     "nocrossreferencedcompetencies": "Nenhuma outra competência foi referenciada a esta competência.",
     "noevidence": "Nenhuma evidência",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
diff --git a/www/addons/coursecompletion/lang/ca.json b/www/addons/coursecompletion/lang/ca.json
index 9a551225fed..c8c2a11d5e0 100644
--- a/www/addons/coursecompletion/lang/ca.json
+++ b/www/addons/coursecompletion/lang/ca.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completa",
+    "complete": "Complet",
     "completecourse": "Curs complet",
     "completed": "Completat",
     "completiondate": "Data de compleció",
     "couldnotloadreport": "No es pot carregar l'informe de compleció del curs, torneu a intentar-ho més tard.",
-    "coursecompletion": "Els usuaris han de completar aquest curs.",
+    "coursecompletion": "Compleció del curs",
     "criteria": "Criteris",
     "criteriagroup": "Grup de criteris",
-    "criteriarequiredall": "Cal que es compleixin tots els criteris que es mostren a continuació",
-    "criteriarequiredany": "Cal que es compleixi algun dels criteris que es mostren a continuació",
+    "criteriarequiredall": "Calen tots els criteris del dessota",
+    "criteriarequiredany": "Cal qualsevol dels criteris del dessota",
     "inprogress": "En curs",
     "manualselfcompletion": "Auto-compleció manual",
     "notyetstarted": "No s'ha començat encara",
-    "pending": "Pendent",
-    "required": "Requerit",
+    "pending": "Pendents",
+    "required": "Necessari",
     "requiredcriteria": "Criteri requerit",
     "requirement": "Requisit",
-    "status": "Permetre l'accés de visitants",
+    "status": "Estat",
     "viewcoursereport": "Visualitza l'informe del curs"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/cs.json b/www/addons/coursecompletion/lang/cs.json
index ba2add0dc81..f54632d92c0 100644
--- a/www/addons/coursecompletion/lang/cs.json
+++ b/www/addons/coursecompletion/lang/cs.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Hotovo",
+    "complete": "Absolvováno",
     "completecourse": "Absolvovaný kurz",
-    "completed": "Dokončeno",
+    "completed": "Splněno",
     "completiondate": "Datum ukončení",
     "couldnotloadreport": "Nelze načíst zprávu o absolvování kurzu, zkuste to prosím později.",
-    "coursecompletion": "Studenti musí absolvovat tento kurz",
-    "criteria": "Podmínky",
+    "coursecompletion": "Absolvování kurzu",
+    "criteria": "Kritéria",
     "criteriagroup": "Skupina podmínek",
-    "criteriarequiredall": "Všechny podmínky musí být splněny",
-    "criteriarequiredany": "Jakákoli z podmínek musí být splněna",
-    "inprogress": "Probíhající",
-    "manualselfcompletion": "Označení absolvování kurzu samotným studentem",
+    "criteriarequiredall": "Jsou požadovány všechny podmínky",
+    "criteriarequiredany": "Je požadována libovolná podmínka",
+    "inprogress": "Probíhá",
+    "manualselfcompletion": "Ručně nastavené absolvování kurzu samotným studentem",
     "notyetstarted": "Zatím nezačalo",
-    "pending": "Probíhající",
-    "required": "Povinné",
-    "requiredcriteria": "Vyžadované podmínky",
+    "pending": "Čeká",
+    "required": "Požadováno",
+    "requiredcriteria": "Požadovaná kriteria",
     "requirement": "Požadavek",
-    "status": "Povolit přístup pro hosty",
-    "viewcoursereport": "Zobrazit přehled kurzu"
+    "status": "Status",
+    "viewcoursereport": "Zobrazit sestavu kurzu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/de.json b/www/addons/coursecompletion/lang/de.json
index 926a8f3eed6..7125646d332 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Vollständig",
+    "complete": "Abschließen",
     "completecourse": "Kurs abschließen",
     "completed": "Abgeschlossen",
     "completiondate": "Abschlussdatum",
     "couldnotloadreport": "Fehler beim Laden des Kursabschlussberichts. Versuchen Sie es später noch einmal.",
-    "coursecompletion": "Teilnehmer/innen müssen diesen Kurs abschließen.",
+    "coursecompletion": "Kursabschluss",
     "criteria": "Kriterien",
     "criteriagroup": "Kriteriengruppe",
-    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig",
-    "criteriarequiredany": "Eine der nachfolgenden Kriterien ist notwendig",
-    "inprogress": "Laufend",
-    "manualselfcompletion": "Manueller eigener Abschluss",
-    "notyetstarted": "Noch nicht begonnen",
-    "pending": "Wartend",
+    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig.",
+    "criteriarequiredany": "Ein nachfolgendes Kriterium ist notwendig.",
+    "inprogress": "In Arbeit",
+    "manualselfcompletion": "Manueller Selbstabschluss",
+    "notyetstarted": "Nicht begonnen",
+    "pending": "Nicht erledigt",
     "required": "Notwendig",
-    "requiredcriteria": "Notwendiges Kriterium",
+    "requiredcriteria": "Notwendige Kriterien",
     "requirement": "Anforderung",
-    "status": "Gastzugang erlauben",
-    "viewcoursereport": "Kursbericht ansehen"
+    "status": "Status",
+    "viewcoursereport": "Kursbericht anzeigen"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index b05cb6dcd92..555b60517bd 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -16,6 +16,6 @@
     "required": "Απαιτείται",
     "requiredcriteria": "Απαιτούμενα κριτήρια",
     "requirement": "Απαίτηση",
-    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
-    "viewcoursereport": "Προβολή αναφορά μαθήματος"
+    "status": "Κατάσταση",
+    "viewcoursereport": "Δείτε την αναφορά μαθήματος"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es-mx.json b/www/addons/coursecompletion/lang/es-mx.json
index 72d16395f3d..0252ef2ea82 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completada",
+    "complete": "Completo",
     "completecourse": "Curso completo",
-    "completed": "Finalizado",
+    "completed": "Completado",
     "completiondate": "Fecha de terminación",
     "couldnotloadreport": "No pudo cargarse el reporte de finalización del curso; por favor inténtelo más tarde.",
-    "coursecompletion": "Los usuarios deben completar este curso.",
-    "criteria": "Criterios",
-    "criteriagroup": "Grupo de criterios",
-    "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
-    "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
-    "inprogress": "En progreso",
-    "manualselfcompletion": "Auto-finalizar manualmente",
-    "notyetstarted": "Aún no ha comenzado",
+    "coursecompletion": "Finalización del curso",
+    "criteria": "Criterio",
+    "criteriagroup": "Grupo de criterio",
+    "criteriarequiredall": "Todos los criterios debajo son necesarios",
+    "criteriarequiredany": "Cualquiera de los criterios debajo es necesarios",
+    "inprogress": "en progreso",
+    "manualselfcompletion": "Auto finalización manual",
+    "notyetstarted": "Todavía no iniciado",
     "pending": "Pendiente",
     "required": "Requerido",
-    "requiredcriteria": "Criterios necesarios",
+    "requiredcriteria": "Criterio requerido",
     "requirement": "Requisito",
-    "status": "Se permite el acceso de invitados",
+    "status": "Estatus",
     "viewcoursereport": "Ver reporte del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fa.json b/www/addons/coursecompletion/lang/fa.json
index e785f269e31..75f68e394ac 100644
--- a/www/addons/coursecompletion/lang/fa.json
+++ b/www/addons/coursecompletion/lang/fa.json
@@ -12,6 +12,6 @@
     "pending": "معلق",
     "required": "اجباری",
     "requiredcriteria": "ضوابط مورد نیاز",
-    "status": "اجازهٔ ورود به عنوان مهمان",
-    "viewcoursereport": "مشاهده گزارش درس"
+    "status": "وضعیت",
+    "viewcoursereport": "مشاهدهٔ گزارش درس"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fr.json b/www/addons/coursecompletion/lang/fr.json
index 5f763cc0ad5..9b7c1642571 100644
--- a/www/addons/coursecompletion/lang/fr.json
+++ b/www/addons/coursecompletion/lang/fr.json
@@ -4,7 +4,7 @@
     "completed": "Terminé",
     "completiondate": "Date d'achèvement",
     "couldnotloadreport": "Impossible de charger le rapport d'achèvement de cours. Veuillez essayer plus tard.",
-    "coursecompletion": "Les participants doivent achever ce cours.",
+    "coursecompletion": "Achèvement du cours",
     "criteria": "Critères",
     "criteriagroup": "Groupe de critères",
     "criteriarequiredall": "Tous les critères ci-dessous sont requis",
@@ -16,6 +16,6 @@
     "required": "Requis",
     "requiredcriteria": "Critères requis",
     "requirement": "Condition",
-    "status": "Permettre l'accès anonyme",
-    "viewcoursereport": "Consulter le rapport du cours"
+    "status": "Statut",
+    "viewcoursereport": "Afficher le rapport du cours"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/it.json b/www/addons/coursecompletion/lang/it.json
index cac35851b3a..6521061e031 100644
--- a/www/addons/coursecompletion/lang/it.json
+++ b/www/addons/coursecompletion/lang/it.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Completato",
     "completecourse": "Corso completato",
     "completed": "Completato",
     "completiondate": "Data di completamento",
     "couldnotloadreport": "Non è stato possibile caricare il report di completamento del corso, per favore riporva.",
-    "coursecompletion": "Gli utenti devono completare il corso",
+    "coursecompletion": "Completamento del corso",
     "criteria": "Criteri",
     "criteriagroup": "Gruppo di criteri",
     "criteriarequiredall": "E' richiesto il soddisfacimento di tutti i criteri elencati",
     "criteriarequiredany": "E' richiesto il soddisfacimento di almeno uno dei criteri elencati",
-    "inprogress": "in svolgimento",
+    "inprogress": "In svolgimento",
     "manualselfcompletion": "Conferma personale di completamento",
-    "notyetstarted": "Non ancora iniziato",
+    "notyetstarted": "Non iniziato",
     "pending": "In attesa",
-    "required": "Obbligatorio",
+    "required": "Da soddisfare",
     "requiredcriteria": "Criteri da soddisfare",
     "requirement": "Requisito",
-    "status": "Consenti l'accesso agli ospiti",
-    "viewcoursereport": "Visualizza il report del corso"
+    "status": "Stato",
+    "viewcoursereport": "Visualizza report del corso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/nl.json b/www/addons/coursecompletion/lang/nl.json
index a6a621c5fa0..78f31da0ac9 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Volledig",
+    "complete": "Voltooi",
     "completecourse": "Voltooi cursus",
-    "completed": "Volledig",
+    "completed": "Voltooid",
     "completiondate": "Voltooiingsdatum",
     "couldnotloadreport": "Kon het voltooiingsrapport van de cursus niet laden. Probeer later opnieuw.",
-    "coursecompletion": "Leerlingen moeten deze cursus voltooien.",
+    "coursecompletion": "Cursus voltooiing",
     "criteria": "Criteria",
     "criteriagroup": "Criteria groep",
     "criteriarequiredall": "Alle onderstaande criteria zijn vereist",
-    "criteriarequiredany": "Al onderstaande criteria zijn vereist",
-    "inprogress": "Actief",
-    "manualselfcompletion": "Manueel voltooien",
-    "notyetstarted": "Nog niet begonnen",
-    "pending": "In behandeling",
+    "criteriarequiredany": "Alle onderstaande criteria zijn vereist",
+    "inprogress": "Bezig",
+    "manualselfcompletion": "Handmatige zelf-voltooiing",
+    "notyetstarted": "Nog niet gestart",
+    "pending": "Nog bezig",
     "required": "Vereist",
     "requiredcriteria": "Vereiste criteria",
     "requirement": "Vereiste",
-    "status": "Gasttoegang toestaan",
+    "status": "Status",
     "viewcoursereport": "Bekijk cursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt-br.json b/www/addons/coursecompletion/lang/pt-br.json
index ca01e849231..da82565edc9 100644
--- a/www/addons/coursecompletion/lang/pt-br.json
+++ b/www/addons/coursecompletion/lang/pt-br.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Concluído",
     "completecourse": "Curso concluído",
-    "completed": "Concluído",
+    "completed": "Completado",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão do curso, por favor tente novamente mais tarde.",
-    "coursecompletion": "Participantes precisam completar este curso.",
+    "coursecompletion": "Conclusão do curso",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
     "criteriarequiredall": "Todos os critérios abaixo são necessários",
-    "criteriarequiredany": "Qualquer um dos critérios abaixo são necessários",
-    "inprogress": "Em andamento",
-    "manualselfcompletion": "Conclusão manual por si mesmo",
-    "notyetstarted": "Não iniciado ainda",
+    "criteriarequiredany": "Quaisquer critérios abaixo são necessários",
+    "inprogress": "Em progresso",
+    "manualselfcompletion": "Auto conclusão manual",
+    "notyetstarted": "Ainda não começou",
     "pending": "Pendente",
-    "required": "Obrigatório",
-    "requiredcriteria": "Critérios exigidos",
+    "required": "Necessário",
+    "requiredcriteria": "Critério necessário",
     "requirement": "Exigência",
-    "status": "Permitir o acesso de visitantes",
-    "viewcoursereport": "Ver relatório do curso"
+    "status": "Condição",
+    "viewcoursereport": "Ver relatório de curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ru.json b/www/addons/coursecompletion/lang/ru.json
index ad7b8ac320c..dbd50c8ad09 100644
--- a/www/addons/coursecompletion/lang/ru.json
+++ b/www/addons/coursecompletion/lang/ru.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Выполнен",
+    "complete": "Завершить",
     "completecourse": "Завершить курс",
-    "completed": "Завершено",
+    "completed": "Завершен",
     "completiondate": "Дата завершения",
-    "coursecompletion": "Пользователи должны завершить этот курс.",
+    "coursecompletion": "Завершение курса",
     "criteria": "Критерии",
-    "criteriagroup": "Группа критериев",
-    "criteriarequiredall": "Требуются соответствие всем указанным ниже критериям",
-    "criteriarequiredany": "Требуется соответствие любому из указанных ниже критериев",
-    "inprogress": "В процессе",
-    "manualselfcompletion": "Пользователь может сам поставить отметку о выполнении",
-    "notyetstarted": "Еще не началось",
-    "pending": "Ожидаемые",
-    "required": "Обязательно",
+    "criteriagroup": "Критерии группы",
+    "criteriarequiredall": "Все приведенные ниже критерии являются обязательными",
+    "criteriarequiredany": "Некоторые из нижеуказанных критериев обязательны",
+    "inprogress": "В прогрессе",
+    "manualselfcompletion": "Ручное самостоятельное завершение",
+    "notyetstarted": "Еще не начался",
+    "pending": "На рассмотрении",
+    "required": "Необходимый",
     "requiredcriteria": "Необходимые критерии",
     "requirement": "Требование",
-    "status": "Разрешить гостевой доступ",
-    "viewcoursereport": "Просмотреть отчет по курсу"
+    "status": "Статус",
+    "viewcoursereport": "Посмотреть отчет курса"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index a6e9b4208a6..1a9665c3d8e 100644
--- a/www/addons/coursecompletion/lang/sv.json
+++ b/www/addons/coursecompletion/lang/sv.json
@@ -1,21 +1,21 @@
 {
     "complete": "Komplett",
     "completecourse": "",
-    "completed": "Slutfört",
+    "completed": "Fullföljt",
     "completiondate": "Datum för fullföljande",
     "couldnotloadreport": "Det gick inte att läsa in rapporten för fullföljande av kursen, vänligen försök igen senare .",
-    "coursecompletion": "Studerande måste slutföra den här kursen.",
-    "criteria": "Kriterier",
-    "criteriagroup": "Kriterier för grupp",
-    "criteriarequiredall": "Alla kriterier är obligatoriska",
-    "criteriarequiredany": "Alla kriterier nedan är obligatoriska",
-    "inprogress": "Pågår",
-    "manualselfcompletion": "Studenten markerar själv som fullföljd",
-    "notyetstarted": "Har ännu inte påbörjats",
+    "coursecompletion": "Fullföljande av kurs",
+    "criteria": "Villkor",
+    "criteriagroup": "Villkor grupp",
+    "criteriarequiredall": "Alla villkor nedan måste vara uppfyllda",
+    "criteriarequiredany": "Något villkor nedan måste vara uppfylld",
+    "inprogress": "Pågående",
+    "manualselfcompletion": "Manuell fullföljande av deltagare",
+    "notyetstarted": "Ännu inte börjat",
     "pending": "Avvaktar",
     "required": "Obligatorisk",
-    "requiredcriteria": "Obligatoriskt kriterium",
+    "requiredcriteria": "Obligatorisk villkor",
     "requirement": "Krav",
-    "status": "Tillåt gäster",
+    "status": "Status",
     "viewcoursereport": "Visa kursrapport"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ca.json b/www/addons/files/lang/ca.json
index 90887bf7b3f..035be4b1f33 100644
--- a/www/addons/files/lang/ca.json
+++ b/www/addons/files/lang/ca.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Teniu en compte que l'administrador de Moodle ha desactivat la descàrrega d'arxius; podeu visualitzar els arxius, però no descarregar-los.",
     "clicktoupload": "Feu clic al botó del dessota per pujar arxius a l'àrea del vostres fitxers.",
     "couldnotloadfiles": "La llista d'arxius no s'ha pogut carregar.",
-    "emptyfilelist": "No hi ha fitxers per mostrar",
+    "emptyfilelist": "No hi ha fitxers per mostrar.",
     "erroruploadnotworking": "No es poden pujar fitxers al vostre lloc ara mateix.",
     "files": "Fitxers",
     "myprivatefilesdesc": "Els arxius que teniu disponibles a la vostra àrea privada en aquest lloc Moodle.",
     "privatefiles": "Fitxers privats",
     "sitefiles": "Fitxers del lloc",
     "sitefilesdesc": "Els altres arxius que es troben disponibles en aquest lloc Moodle.",
-    "uploadfiles": "Envia fitxers de retroacció"
+    "uploadfiles": "Puja fitxers"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/cs.json b/www/addons/files/lang/cs.json
index becf830a35d..2336beb6bc4 100644
--- a/www/addons/files/lang/cs.json
+++ b/www/addons/files/lang/cs.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Upozorňujeme, že správce Moodle zakázal stahování souborů, soubory si můžete prohlížet, ale ne stáhnout.",
     "clicktoupload": "Kliknutím na tlačítko níže nahrát soubory do vašich osobních souborů.",
     "couldnotloadfiles": "Seznam souborů, které nelze načíst .",
-    "emptyfilelist": "Žádný soubor k zobrazení",
+    "emptyfilelist": "Žádný soubor k zobrazení.",
     "erroruploadnotworking": "Bohužel v současné době není možné nahrávat na stránky vašeho Moodle.",
     "files": "Soubory",
     "myprivatefilesdesc": "Soubory, které jsou dostupné v soukromé oblasti na těchto stránkách Moodle.",
     "privatefiles": "Osobní soubory",
     "sitefiles": "Soubory stránek",
     "sitefilesdesc": "Další soubory, které jsou dostupné na těchto stránkách Moodle.",
-    "uploadfiles": "Poslat zpětnovazební soubory"
+    "uploadfiles": "Nahrát soubory"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/de.json b/www/addons/files/lang/de.json
index 16517d7cc60..39a046af215 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Sie können nur die Dateiliste sehen.",
     "clicktoupload": "Tippen Sie auf die Taste, um Dateien in 'Meine Dateien' hochzuladen.",
     "couldnotloadfiles": "Die Dateiliste konnte nicht geladen werden.",
-    "emptyfilelist": "Es liegen keine Dateien vor",
+    "emptyfilelist": "Keine Dateien",
     "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
     "files": "Dateien",
     "myprivatefilesdesc": "Diese Dateien liegen in Ihrem persönlichen Bereich auf dieser Website.",
     "privatefiles": "Meine Dateien",
     "sitefiles": "Dateien",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
-    "uploadfiles": "Feedbackdateien senden"
+    "uploadfiles": "Dateien hochladen"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/el.json b/www/addons/files/lang/el.json
index 105bb0c0877..8f435d24e4f 100644
--- a/www/addons/files/lang/el.json
+++ b/www/addons/files/lang/el.json
@@ -9,5 +9,5 @@
     "privatefiles": "Προσωπικά αρχεία",
     "sitefiles": "Αρχεία του ιστοχώρου",
     "sitefilesdesc": "Άλλα αρχεία που είναι στη διάθεσή σας σε αυτό το site Moodle.",
-    "uploadfiles": "Αποστολή αρχείου ανατροφοδότησης"
+    "uploadfiles": "Μεταφορτώστε αρχεία"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es-mx.json b/www/addons/files/lang/es-mx.json
index 3a779e4d667..38849f29131 100644
--- a/www/addons/files/lang/es-mx.json
+++ b/www/addons/files/lang/es-mx.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ver los archivos pero no puede descargarlos.",
     "clicktoupload": "Haga click en el botón inferior para subir archivos a sus archivos privados.",
     "couldnotloadfiles": "La lista de archivos no pudo cargarse.",
-    "emptyfilelist": "No hay archivos que mostrar",
+    "emptyfilelist": "No hay archivos para mostrar.",
     "erroruploadnotworking": "Desafortunadamente ahorita no es posible subir archivos a su sitio.",
     "files": "Archivos",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
     "privatefiles": "Archivos privados",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "uploadfiles": "Mandar archivos de retroalimentación"
+    "uploadfiles": "Subir archivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fr.json b/www/addons/files/lang/fr.json
index ce819c482cb..a1237a3feeb 100644
--- a/www/addons/files/lang/fr.json
+++ b/www/addons/files/lang/fr.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "L'administrateur de votre Moodle a désactivé le téléchargement des fichiers. Vous pouvez les consulter, mais pas les télécharger.",
     "clicktoupload": "Cliquer sur le bouton ci-dessous pour déposer les fichiers dans vos fichiers personnels.",
     "couldnotloadfiles": "La liste des fichiers n'a pas pu être chargée.",
-    "emptyfilelist": "Il n'y a pas de fichier à afficher",
+    "emptyfilelist": "Aucun fichier à afficher.",
     "erroruploadnotworking": "Il n'est actuellement pas possible de déposer des fichiers sur votre site.",
     "files": "Fichiers",
     "myprivatefilesdesc": "Les fichiers disponibles dans votre zone privée sur cette plateforme Moodle.",
     "privatefiles": "Fichiers personnels",
     "sitefiles": "Fichiers du site",
     "sitefilesdesc": "Les autres fichiers disponibles sur cette plateforme Moodle.",
-    "uploadfiles": "Envoyer des fichiers de feedback"
+    "uploadfiles": "Déposer des fichiers"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/it.json b/www/addons/files/lang/it.json
index d9b1f96d205..3f198893008 100644
--- a/www/addons/files/lang/it.json
+++ b/www/addons/files/lang/it.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "L'amministratore del sito Moodle ha disabilitato il download dei file. Puoi navigare tra i file ma non potrai scaricarli.",
     "clicktoupload": "Fai click sul pulsante sotto per caricare i file nei File personali",
     "couldnotloadfiles": "Non è stato possibile caricare l'elenco dei file.",
-    "emptyfilelist": "Non ci sono file da visualizzare",
+    "emptyfilelist": "Non ci sono file da visualizzare.",
     "erroruploadnotworking": "Al momento non è possibile caricare file sul sito.",
     "files": "File",
     "myprivatefilesdesc": "I file memorizzati nell'omonima area di Moodle",
     "privatefiles": "File personali",
     "sitefiles": "File del sito",
     "sitefilesdesc": "Altri file del sito Moodle ai quali puoi accedere.",
-    "uploadfiles": "Invia file di commento"
+    "uploadfiles": "Carica file"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/nl.json b/www/addons/files/lang/nl.json
index e4f5e1dc248..2b091df63b0 100644
--- a/www/addons/files/lang/nl.json
+++ b/www/addons/files/lang/nl.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Je Moodle beheerder heeft het downloaden van bestanden uitgeschakeld. Je kunt door de bestandenlijst bladeren, maar ze niet downloaden.",
     "clicktoupload": "Klik op onderstaande knop om bestanden naar je privé-bestanden te uploaden.",
     "couldnotloadfiles": "De bestandenlijst kon niet geladen worden.",
-    "emptyfilelist": "Er zijn geen bestanden om te tonen",
+    "emptyfilelist": "Er zijn geen bestanden te tonen.",
     "erroruploadnotworking": "Jammer genoeg kun je op dit ogenblik geen bestanden uploaden naar de site.",
     "files": "Bestanden",
     "myprivatefilesdesc": "Jouw bestanden op deze Moodle-site.",
     "privatefiles": "Privébestanden",
     "sitefiles": "Sitebestanden",
     "sitefilesdesc": "Andere bestanden op deze Moodle-site.",
-    "uploadfiles": "Stuur feedbackbestanden"
+    "uploadfiles": "Bestanden uploaden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt-br.json b/www/addons/files/lang/pt-br.json
index 2c3c45d9555..fa0429bebba 100644
--- a/www/addons/files/lang/pt-br.json
+++ b/www/addons/files/lang/pt-br.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Por favor note que o administrador do Moodle desativou downloads de arquivos, você pode navegar através dos arquivos, mas não baixá-los.",
     "clicktoupload": "Clique no botão abaixo para enviar para seus arquivos privados.",
     "couldnotloadfiles": "A lista de arquivos não pode ser carregada.",
-    "emptyfilelist": "Não há arquivos para exibir",
+    "emptyfilelist": "Não há arquivos para mostrar.",
     "erroruploadnotworking": "Infelizmente é impossível enviar arquivos para o seu site.",
     "files": "Arquivos",
     "myprivatefilesdesc": "Os arquivos que estão disponíveis em sua área de arquivos privados nesse site Moodle.",
     "privatefiles": "Arquivos privados",
     "sitefiles": "Arquivos do site",
     "sitefilesdesc": "Os outros arquivos que estão disponíveis a você neste site Moodle.",
-    "uploadfiles": "Enviar arquivos de feedback"
+    "uploadfiles": "Enviar arquivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ru.json b/www/addons/files/lang/ru.json
index 10418095e77..7da775bb875 100644
--- a/www/addons/files/lang/ru.json
+++ b/www/addons/files/lang/ru.json
@@ -8,5 +8,5 @@
     "privatefiles": "Личные файлы",
     "sitefiles": "Файлы сайта",
     "sitefilesdesc": "Другие файлы, доступные на этом сайте Moodle",
-    "uploadfiles": "Отправить файлы с отзывами"
+    "uploadfiles": "Загрузка файлов"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/ca.json b/www/addons/messages/lang/ca.json
index 04139bc73b4..46e13618050 100644
--- a/www/addons/messages/lang/ca.json
+++ b/www/addons/messages/lang/ca.json
@@ -17,9 +17,9 @@
     "messagenotsent": "El missatge no s'ha enviat. Si us plau, intenteu-ho més tard",
     "messages": "Missatges",
     "mustbeonlinetosendmessages": "Heu de tenir connexió a la xarxa per a enviar missatges",
-    "newmessage": "Missatge nou",
+    "newmessage": "Nou missatge...",
     "newmessages": "Nous missatges",
-    "nomessages": "No teniu missatges pendents",
+    "nomessages": "No hi ha missatges.",
     "nousersfound": "No s'han trobat usuaris",
     "removecontact": "Suprimeix contacte",
     "removecontactconfirm": "El contacte s'eliminarà de la vostra llista de contactes.",
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index 90822283653..d3aa98a5834 100644
--- a/www/addons/messages/lang/cs.json
+++ b/www/addons/messages/lang/cs.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Nastavení zpráv",
     "messages": "Zprávy",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
-    "newmessage": "Nová zpráva",
+    "newmessage": "Nová zpráva...",
     "newmessages": "Nové zprávy",
-    "nomessages": "Žádné zprávy",
-    "nousersfound": "Nenalezeni žádní uživatelé",
+    "nomessages": "Žádné zprávy.",
+    "nousersfound": "Nebyl nalezen žádný uživatel",
     "removecontact": "Odebrat kontakt",
     "removecontactconfirm": "Kontakt bude odstraněn ze seznamu kontaktů.",
     "send": "Odeslat",
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index f61929ee329..1f91de7f2a3 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -1,7 +1,7 @@
 {
     "addcontact": "Kontakt hinzufügen",
     "blockcontact": "Kontakt sperren",
-    "blockcontactconfirm": "Sie werden von diesem Kontakt keine Mitteilungen mehr empfangen.",
+    "blockcontactconfirm": "Sie beenden den Mitteilungsempfang von diesem Kontakt.",
     "blocknoncontacts": "Weitere Personen sperren",
     "contactlistempty": "Die Kontaktliste ist leer.",
     "contactname": "Name",
@@ -18,10 +18,10 @@
     "messagepreferences": "Mitteilungen konfigurieren",
     "messages": "Mitteilungen",
     "mustbeonlinetosendmessages": "Sie müssen online sein, um Mitteilungen zu senden",
-    "newmessage": "Neue Mitteilung",
+    "newmessage": "Neue Mitteilung ...",
     "newmessages": "Neue Mitteilungen",
     "nomessages": "Keine Mitteilungen",
-    "nousersfound": "Keine Nutzer/innen gefunden",
+    "nousersfound": "Keine Personen gefunden",
     "removecontact": "Kontakt entfernen",
     "removecontactconfirm": "Der Kontakt wird aus Ihrer Kontaktliste gelöscht.",
     "send": "Senden",
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index 6976449017a..4a4c3270fb7 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -14,9 +14,9 @@
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "newmessage": "Νέο μήνυμα",
-    "nomessages": "Δεν υπάρχουν μηνύματα σε αναμονή",
-    "nousersfound": "Δε βρέθηκαν χρήστες",
+    "newmessage": "Νέο μήνυμα...",
+    "nomessages": "Κανένα μήνυμα.",
+    "nousersfound": "Δεν βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "send": "Αποστολή",
     "sendmessage": "Αποστολή μηνύματος",
diff --git a/www/addons/messages/lang/es-mx.json b/www/addons/messages/lang/es-mx.json
index cb30898bdb8..8b435e15996 100644
--- a/www/addons/messages/lang/es-mx.json
+++ b/www/addons/messages/lang/es-mx.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Preferencias de Mensaje",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Usted debe de estar en-linea para enviar mensajes",
-    "newmessage": "Nuevo mensaje",
+    "newmessage": "Nuevo mensaje...",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "No hay mensajes",
-    "nousersfound": "No se encuentran usuarios",
+    "nomessages": "Sin mensajes.",
+    "nousersfound": "No se encontraron usuarios",
     "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto será quitado de su lista de contactos.",
     "send": "Enviar",
diff --git a/www/addons/messages/lang/fr.json b/www/addons/messages/lang/fr.json
index c988ebada69..f0dd9fbacd0 100644
--- a/www/addons/messages/lang/fr.json
+++ b/www/addons/messages/lang/fr.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Préférences des messages",
     "messages": "Messages personnels",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
-    "newmessage": "Nouveau message",
+    "newmessage": "Nouveau message...",
     "newmessages": "Nouveaux messages",
-    "nomessages": "Aucun message",
-    "nousersfound": "Aucun utilisateur n'a été trouvé",
+    "nomessages": "Aucun message.",
+    "nousersfound": "Aucun utilisateur trouvé",
     "removecontact": "Supprimer ce contact",
     "removecontactconfirm": "Le contact sera retiré de votre liste.",
     "send": "Envoyer",
diff --git a/www/addons/messages/lang/it.json b/www/addons/messages/lang/it.json
index 997e27210b3..9052dd21da0 100644
--- a/www/addons/messages/lang/it.json
+++ b/www/addons/messages/lang/it.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Preferenze messaggi",
     "messages": "Messaggi",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
-    "newmessage": "Nuovo messaggio",
-    "nomessages": "Nessun messaggio",
-    "nousersfound": "Non trovato alcun utente",
+    "newmessage": "Nuovo messaggio...",
+    "nomessages": "Non ci sono messaggi.",
+    "nousersfound": "Non sono stati trovati utenti",
     "removecontact": "Cancella contatti",
     "send": "Invia",
     "sendmessage": "Invia messaggio",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index 2c9ecfc57d8..03ecde88321 100644
--- a/www/addons/messages/lang/nl.json
+++ b/www/addons/messages/lang/nl.json
@@ -18,9 +18,9 @@
     "messagepreferences": "Berichten voorkeuren",
     "messages": "Berichten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
-    "newmessage": "Nieuw bericht",
+    "newmessage": "Nieuw bericht...",
     "newmessages": "Nieuwe berichten",
-    "nomessages": "Geen berichten",
+    "nomessages": "Geen berichten.",
     "nousersfound": "Geen gebruikers gevonden",
     "removecontact": "Verwijder contactpersoon",
     "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index d1ae86c8e24..645056dbe47 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -17,9 +17,9 @@
     "messagenotsent": "A mensagem não foi enviada. Por favor tente novamente mais tarde.",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Você precisa estar conectado para enviar mensagens.",
-    "newmessage": "Nova Mensagem",
+    "newmessage": "Nova mensagem...",
     "newmessages": "Novas mensagens",
-    "nomessages": "Sem novas mensagens",
+    "nomessages": "Não há mensagens.",
     "nousersfound": "Nenhum usuário encontrado",
     "removecontact": "Eliminar contato",
     "removecontactconfirm": "O contato será removido da sua lista de contatos.",
diff --git a/www/addons/messages/lang/ru.json b/www/addons/messages/lang/ru.json
index 763c739f876..4c6677f9138 100644
--- a/www/addons/messages/lang/ru.json
+++ b/www/addons/messages/lang/ru.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Настройки сообщений",
     "messages": "Сообщения",
     "mustbeonlinetosendmessages": "Вы должны быть на сайте, чтобы отправлять сообщения",
-    "newmessage": "Новое сообщение",
+    "newmessage": "Новое сообщение...",
     "newmessages": "Новые сообщения",
-    "nomessages": "Нет новых сообщений",
+    "nomessages": "Нет сообщений",
     "nousersfound": "Пользователи не найдены",
     "removecontact": "Удалить собеседника из моего списка",
     "send": "Отправить",
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index 1539f736369..21f7a6126c9 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -15,9 +15,9 @@
     "messagenotsent": "Meddelandet skickades inte, försök igen senare.",
     "messages": "Meddelanden",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
-    "newmessage": "Nytt meddelande",
-    "nomessages": "Inga avvaktande meddelanden",
-    "nousersfound": "Det gick inte att hitta några användare",
+    "newmessage": "Ny meddelande...",
+    "nomessages": "Inga meddelanden",
+    "nousersfound": "Inga användare hittades",
     "removecontact": "Ta bort kontakt",
     "send": "Skicka",
     "sendmessage": "Skicka meddelande",
diff --git a/www/addons/messages/lang/tr.json b/www/addons/messages/lang/tr.json
index ad8dc3b2766..056f78c77d3 100644
--- a/www/addons/messages/lang/tr.json
+++ b/www/addons/messages/lang/tr.json
@@ -9,7 +9,7 @@
     "messagepreferences": "İleti tercihleri",
     "messages": "Mesajlar",
     "newmessage": "Yeni ileti",
-    "nomessages": "Yeni ileti yok",
+    "nomessages": "İleti yok.",
     "nousersfound": "Kullanıcı bulunamadı",
     "removecontact": "Kişiyi sil",
     "send": "Gönder",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index c0a93b72130..fc6af3e2e89 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -6,8 +6,8 @@
     "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
-    "numberofuser": "Nombre de respostes",
-    "numberofuserinpercentage": "Percentatge de respostes (%)",
+    "numberofuser": "Nombre de participants",
+    "numberofuserinpercentage": "Percentatge de participants",
     "previewonly": "Això és sols una vista prèvia de les opcions disponibles en aquesta activitat. No esteu habilitat per enviar consultes fins {{$a}}.",
     "removemychoice": "Suprimeix la meva resposta",
     "responses": "Respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index f9a22aaf32e..aaa5ea9560c 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -6,8 +6,8 @@
     "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
     "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
-    "numberofuser": "Počet odpovědí",
-    "numberofuserinpercentage": "Počet odpovědí v procentech",
+    "numberofuser": "Počet účastníků",
+    "numberofuserinpercentage": "Procentní podíl účastníků",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
     "removemychoice": "Odstranit mou volbu",
     "responses": "Odpovědi",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index be13d38af77..a7bea8a7061 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -6,8 +6,8 @@
     "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
     "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
-    "numberofuser": "Anzahl der Antworten",
-    "numberofuserinpercentage": "Prozent der Antworten",
+    "numberofuser": "Anzahl",
+    "numberofuserinpercentage": "Prozent",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
     "responses": "Stimmabgaben",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 4b17c064e80..31602f11f93 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -4,8 +4,8 @@
     "full": "(Πλήρες)",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
     "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
-    "numberofuser": "Αριθμός απαντήσεων",
-    "numberofuserinpercentage": "Ποσοστό απαντήσεων",
+    "numberofuser": "Πλήθος συμμετεχόντων",
+    "numberofuserinpercentage": "Ποσοστό συμμετεχόντων",
     "removemychoice": "Διαγραφή της επιλογής μου",
     "responses": "Απαντήσεις",
     "responsesresultgraphdescription": "{{number}}% των χρηστών επέλεξε: {{text}}.",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index ceddb82adc6..41b15bb932f 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de respuestas",
-    "numberofuserinpercentage": "Porcentaje de respuestas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentaje de participantes",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 9ca0f50c2ea..05e3f3b9c99 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -6,8 +6,8 @@
     "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
     "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
-    "numberofuser": "Nombre de réponses",
-    "numberofuserinpercentage": "Pourcentage de réponses",
+    "numberofuser": "Nombre de participants",
+    "numberofuserinpercentage": "Pourcentage de participants",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
     "responses": "Réponses",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index 01597a9058a..c44e97ee335 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -6,8 +6,8 @@
     "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
     "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
-    "numberofuser": "Numero di risposte",
-    "numberofuserinpercentage": "Percentuale delle risposte",
+    "numberofuser": "Numero di partecipanti",
+    "numberofuserinpercentage": "Percentuale dei partecipanti",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
     "responses": "Scelte",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index d7e7f4cd7f3..b2be190c0c9 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -6,8 +6,8 @@
     "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
     "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
-    "numberofuser": "Aantal antwoorden",
-    "numberofuserinpercentage": "Percentage antwoorden",
+    "numberofuser": "Aantal deelnemers",
+    "numberofuserinpercentage": "Deelnemerspercentage",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
     "responses": "Antwoorden",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index 01fbb57c4c1..f8fbe81990b 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -6,8 +6,8 @@
     "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
     "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
-    "numberofuser": "Número de usuários",
-    "numberofuserinpercentage": "Percentual de participantes",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentagem de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
     "removemychoice": "Remover a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 8ef6af50622..62217bdb227 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
     "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
-    "numberofuser": "Antal användare",
-    "numberofuserinpercentage": "Antalet användare i procent.",
+    "numberofuser": "Antal deltagare",
+    "numberofuserinpercentage": "Procent av deltagarna",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
     "responses": "Svar",
diff --git a/www/addons/mod/feedback/lang/ca.json b/www/addons/mod/feedback/lang/ca.json
index bee56432429..4d936b89e1c 100644
--- a/www/addons/mod/feedback/lang/ca.json
+++ b/www/addons/mod/feedback/lang/ca.json
@@ -3,10 +3,12 @@
     "anonymous": "Anonimat",
     "anonymous_entries": "Entrades anònimes",
     "average": "Mitjana",
+    "captchaofflinewarning": "Les retroaccions amb captcha no es poden completar si aquest no està configurat, o no es pot connectar amb el servidor.",
     "complete_the_form": "Responeu les preguntes...",
     "completed_feedbacks": "Respostes enviades",
     "continue_the_form": "Continua el formulari",
     "feedback_is_not_open": "La retroacció no està oberta",
+    "feedback_submitted_offline": "S'ha desat la retroacció per trametre's més tard.",
     "feedbackclose": "Permet les respostes a",
     "feedbackopen": "Permet les respostes de",
     "mapcourses": "Mapatge de retroacció a cursos.",
diff --git a/www/addons/mod/feedback/lang/cs.json b/www/addons/mod/feedback/lang/cs.json
index c330879b1d3..50c98674c0f 100644
--- a/www/addons/mod/feedback/lang/cs.json
+++ b/www/addons/mod/feedback/lang/cs.json
@@ -3,10 +3,12 @@
     "anonymous": "Anonymní",
     "anonymous_entries": "Anonymní záznamy",
     "average": "Průměr",
+    "captchaofflinewarning": "Dotazník se souborem captcha nemůže být dokončen, pokud není nakonfigurován režim offline nebo s vypnutým serverem.",
     "complete_the_form": "Klikněte zde a odpovězte na otázky...",
     "completed_feedbacks": "Odevzdané odpovědi",
     "continue_the_form": "Pokračovat ve formuláři",
     "feedback_is_not_open": "Dotazník není přístupný",
+    "feedback_submitted_offline": "Tento dotazník byl uložen k pozdějšímu odevzdání.",
     "feedbackclose": "Povolit odpovědi",
     "feedbackopen": "Dostupné od",
     "mapcourses": "Mapování kurzů",
diff --git a/www/addons/mod/feedback/lang/de.json b/www/addons/mod/feedback/lang/de.json
index cbfa2dfb6fb..d9fb285b01e 100644
--- a/www/addons/mod/feedback/lang/de.json
+++ b/www/addons/mod/feedback/lang/de.json
@@ -3,10 +3,12 @@
     "anonymous": "Anonym",
     "anonymous_entries": "Anonyme Einträge ({{$a}})",
     "average": "Mittelwert",
+    "captchaofflinewarning": "Ein Feedback mit Captcha kann nicht beendet werden, wenn der Server nicht konfiguriert ist oder nicht antwortet. Captcha funktioniert im Offline-Modus nicht.",
     "complete_the_form": "Formular ausfüllen...",
     "completed_feedbacks": "Ausgefüllte Feedbacks",
     "continue_the_form": "Ausfüllen fortsetzen",
     "feedback_is_not_open": "Feedback ist zu diesem Zeitpunkt nicht möglich",
+    "feedback_submitted_offline": "Das Feedback wurde gespeichert, um es später zu übemitteln.",
     "feedbackclose": "Antworten erlauben bis",
     "feedbackopen": "Antworten erlauben ab",
     "mapcourses": "Diesem Feedback Kurse zuordnen",
diff --git a/www/addons/mod/feedback/lang/es-mx.json b/www/addons/mod/feedback/lang/es-mx.json
index 3ccea0d4f08..6c9cfa558f6 100644
--- a/www/addons/mod/feedback/lang/es-mx.json
+++ b/www/addons/mod/feedback/lang/es-mx.json
@@ -3,10 +3,12 @@
     "anonymous": "Anónima",
     "anonymous_entries": "Respuestas anónimas ({{$a}})",
     "average": "Promedio",
+    "captchaofflinewarning": "La retroalimentación con captcha no puede ser completada si no está configurada, si está en modo fuera-de-línea o con el servidor tirado.",
     "complete_the_form": "Responda a las preguntas...",
     "completed_feedbacks": "Respuestas enviadas",
     "continue_the_form": "Continuar con el formato",
     "feedback_is_not_open": "La retroalimentación no está disponible",
+    "feedback_submitted_offline": "Esta retroalimentación ha sido guardada para enviarse más tarde.",
     "feedbackclose": "Permitir respuestas a",
     "feedbackopen": "Permitir respuestas de",
     "mapcourses": "Asignar retroalimentación a cursos",
diff --git a/www/addons/mod/feedback/lang/nl.json b/www/addons/mod/feedback/lang/nl.json
index d760ceb58c6..92250c29608 100644
--- a/www/addons/mod/feedback/lang/nl.json
+++ b/www/addons/mod/feedback/lang/nl.json
@@ -3,10 +3,12 @@
     "anonymous": "Anoniem",
     "anonymous_entries": "Anoniem ingevulde formulieren ({{$a}})",
     "average": "Gemiddelde",
+    "captchaofflinewarning": "Feedback met captcha kan niet voltooid worden als dat niet geconfigureerd is, in offline modus of wanneer de server onbereikbaar is.",
     "complete_the_form": "Beantwoord de vragen...",
     "completed_feedbacks": "Ingevulde antwoorden",
     "continue_the_form": "Ga verder met dit formulier",
     "feedback_is_not_open": "De feedback is niet open",
+    "feedback_submitted_offline": "Deze feedback is bewaard om later in te sturen.",
     "feedbackclose": "Antwoorden toestaan tot",
     "feedbackopen": "Antwoorden toestaan van",
     "mapcourses": "Koppel feedback aan cursussen",
diff --git a/www/addons/mod/folder/lang/ca.json b/www/addons/mod/folder/lang/ca.json
index 2208f493a4b..b2f87d440ac 100644
--- a/www/addons/mod/folder/lang/ca.json
+++ b/www/addons/mod/folder/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hi ha fitxers per mostrar",
+    "emptyfilelist": "No hi ha fitxers per mostrar.",
     "errorwhilegettingfolder": "S'ha produït un error en recuperar les dades de la carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/cs.json b/www/addons/mod/folder/lang/cs.json
index 04e2822f6a0..66b256adf4c 100644
--- a/www/addons/mod/folder/lang/cs.json
+++ b/www/addons/mod/folder/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Žádný soubor k zobrazení",
+    "emptyfilelist": "Žádný soubor k zobrazení.",
     "errorwhilegettingfolder": "Chyba při načítání dat složky."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/de.json b/www/addons/mod/folder/lang/de.json
index 00b4ea2a954..022d05baeea 100644
--- a/www/addons/mod/folder/lang/de.json
+++ b/www/addons/mod/folder/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Es liegen keine Dateien vor",
+    "emptyfilelist": "Keine Dateien",
     "errorwhilegettingfolder": "Fehler beim Laden der Verzeichnisdaten"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/es-mx.json b/www/addons/mod/folder/lang/es-mx.json
index e2f470725df..5b9563d5c0d 100644
--- a/www/addons/mod/folder/lang/es-mx.json
+++ b/www/addons/mod/folder/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hay archivos que mostrar",
+    "emptyfilelist": "No hay archivos para mostrar.",
     "errorwhilegettingfolder": "Error al obtener datos de carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/fr.json b/www/addons/mod/folder/lang/fr.json
index e16e5c1aeb4..86d36f87890 100644
--- a/www/addons/mod/folder/lang/fr.json
+++ b/www/addons/mod/folder/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Il n'y a pas de fichier à afficher",
+    "emptyfilelist": "Aucun fichier à afficher.",
     "errorwhilegettingfolder": "Erreur lors de l'obtention des données du dossier."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/it.json b/www/addons/mod/folder/lang/it.json
index b828249f904..93e13593395 100644
--- a/www/addons/mod/folder/lang/it.json
+++ b/www/addons/mod/folder/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Non ci sono file da visualizzare",
+    "emptyfilelist": "Non ci sono file da visualizzare.",
     "errorwhilegettingfolder": "Si è verificato un errore durante la ricezione dei dati della cartella."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/nl.json b/www/addons/mod/folder/lang/nl.json
index 7b544820480..92b48519e9d 100644
--- a/www/addons/mod/folder/lang/nl.json
+++ b/www/addons/mod/folder/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Er zijn geen bestanden om te tonen",
+    "emptyfilelist": "Geen bestanden.",
     "errorwhilegettingfolder": "Fout bij het ophalen van de mapgegevens"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/pt-br.json b/www/addons/mod/folder/lang/pt-br.json
index 4e9c9589aa3..1588790327d 100644
--- a/www/addons/mod/folder/lang/pt-br.json
+++ b/www/addons/mod/folder/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Não há arquivos para exibir",
+    "emptyfilelist": "Não há arquivos para mostrar",
     "errorwhilegettingfolder": "Erro ao obter dados da pasta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index bee3c7cb0d4..22814dbf13e 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Themenabonnement",
     "edit": "Bearbeiten",
     "erroremptymessage": "Die Mitteilung darf nicht leer sein.",
-    "erroremptysubject": "Der Betreff darf nicht leer sein.",
+    "erroremptysubject": "Das Forenthema darf nicht leer sein.",
     "errorgetforum": "Fehler beim Laden der Forendaten",
     "errorgetgroups": "Fehler beim Laden der Gruppeneinstellungen",
     "forumnodiscussionsyet": "Keine Themen im Forum",
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index 48404906707..c3743416512 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Suscripción a discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
-    "erroremptysubject": "El asunto del mensaje no puede estar vacío.",
+    "erroremptysubject": "El asunto de la publicación no puede estar vacío",
     "errorgetforum": "Error al obtener datos del foro.",
     "errorgetgroups": "Error al obtener configuraciones de grupo.",
     "forumnodiscussionsyet": "Todavía no hay tópicos de discusión en este foro.",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 566c52681f0..09bf43de5be 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Abonnement à la discussion",
     "edit": "Modifier",
     "erroremptymessage": "Un message ne peut pas être vide",
-    "erroremptysubject": "L'objet d'un message ne peut pas être vide",
+    "erroremptysubject": "L'objet du message ne peut pas être vide",
     "errorgetforum": "Erreur de récupération des données de forum.",
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
diff --git a/www/addons/mod/forum/lang/it.json b/www/addons/mod/forum/lang/it.json
index c54ee597c31..ad1b8b1ed8b 100644
--- a/www/addons/mod/forum/lang/it.json
+++ b/www/addons/mod/forum/lang/it.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Sottoscrizione della discussione",
     "edit": "Modifica",
     "erroremptymessage": "Il corpo del messaggio non può essere vuoto",
-    "erroremptysubject": "L'oggetto non può essere vuoto",
+    "erroremptysubject": "L'oggetto dell'intervento non può essere vuoto",
     "errorgetforum": "Si è verificato un errore durante la ricezione dei dati del forum.",
     "errorgetgroups": "Si è verificato un errore durante la ricezione delle impostazioni gruppo.",
     "forumnodiscussionsyet": "In questo forum non sono presenti discussioni",
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 8f7fe7dad45..83fddedda47 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Inschrijving discussie",
     "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
-    "erroremptysubject": "Onderwerp kan niet leeg zijn",
+    "erroremptysubject": "Onderwerp mag niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
     "errorgetgroups": "Fout bij het ophalen van groepinstellingen.",
     "forumnodiscussionsyet": "Er zijn nog geen discussies in dit forum",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index aebbce61f21..f7d9cf730e2 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
-    "erroremptysubject": "O assunto da mensagem não pode ser vazio.",
+    "erroremptysubject": "Assunto não pode estar vazio",
     "errorgetforum": "Erro ao buscar dados de fórum.",
     "errorgetgroups": "Erro ao obter configurações do grupo.",
     "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index d2d420c71b6..3faffe0f076 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Подписаться на эту тему.",
     "edit": "Редактировать",
     "erroremptymessage": "Сообщение не может быть пустым",
-    "erroremptysubject": "Тема сообщения не может быть пустой",
+    "erroremptysubject": "Заголовок сообщения не может быть пустым",
     "errorgetforum": "Ошибка при получении данных форума",
     "errorgetgroups": "Ошибка получения параметров группы",
     "forumnodiscussionsyet": "В этом форуме ещё нет тем для обсуждения",
@@ -23,6 +23,7 @@
     "numreplies": "Ответов - {{numreplies}}",
     "posttoforum": "Отправить в форум",
     "re": "Re:",
+    "refreshposts": "Обновить обсуждения",
     "reply": "Ответить",
     "subject": "Тема",
     "unread": "Непрочтенные",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 5d9eb54b6ad..676e5ba9fa1 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
-    "erroremptysubject": "Ämnesrubriken för inlägget kan inte vara tom.",
+    "erroremptysubject": "Rubriken kan inte vara tom",
     "errorgetforum": "Fel att få forum innehåll",
     "errorgetgroups": "Fel vid hämtning av gruppinställningar",
     "forumnodiscussionsyet": "Det finns inga diskussionsämnen ännu i detta forum.",
diff --git a/www/addons/mod/glossary/lang/ca.json b/www/addons/mod/glossary/lang/ca.json
index a0af30fc35e..5cbf4a2bb6a 100644
--- a/www/addons/mod/glossary/lang/ca.json
+++ b/www/addons/mod/glossary/lang/ca.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Fitxer adjunt",
-    "browsemode": "Mode exploració",
+    "browsemode": "Navegueu per les entrades",
     "byalphabet": "Alfabèticament",
     "byauthor": "Agrupat per autor",
     "bycategory": "Agrupa per categoria",
diff --git a/www/addons/mod/glossary/lang/cs.json b/www/addons/mod/glossary/lang/cs.json
index db30da2ce2e..9d81e677a27 100644
--- a/www/addons/mod/glossary/lang/cs.json
+++ b/www/addons/mod/glossary/lang/cs.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Příloha",
-    "browsemode": "Režim náhledu",
+    "browsemode": "Prohlížení příspěvků",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
     "bycategory": "Skupina podle kategorie",
diff --git a/www/addons/mod/glossary/lang/de.json b/www/addons/mod/glossary/lang/de.json
index c5afa42c3fc..03bb7f1a602 100644
--- a/www/addons/mod/glossary/lang/de.json
+++ b/www/addons/mod/glossary/lang/de.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anhang",
-    "browsemode": "Vorschaumodus",
+    "browsemode": "Einträge durchblättern",
     "byalphabet": "Alphabetisch",
     "byauthor": "Nach Autor/in",
     "bycategory": "Nach Kategorie",
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index 226aa549be7..0f544630722 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Επισυναπτόμενο",
-    "browsemode": "Φάση Προεπισκόπισης",
+    "browsemode": "Περιήγηση στις καταχωρήσεις",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bynewestfirst": "Νεότερα πρώτα",
diff --git a/www/addons/mod/glossary/lang/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index 46307467a49..3c23deb2d2a 100644
--- a/www/addons/mod/glossary/lang/es-mx.json
+++ b/www/addons/mod/glossary/lang/es-mx.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Archivo adjunto",
-    "browsemode": "Modo de presentación preliminar",
+    "browsemode": "Ver entradas",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoría",
diff --git a/www/addons/mod/glossary/lang/fr.json b/www/addons/mod/glossary/lang/fr.json
index 976057ed4e7..f72096c8b1b 100644
--- a/www/addons/mod/glossary/lang/fr.json
+++ b/www/addons/mod/glossary/lang/fr.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Annexe",
-    "browsemode": "Mode prévisualisation",
+    "browsemode": "Parcourir les articles",
     "byalphabet": "Alphabétiquement",
     "byauthor": "Grouper par auteur",
     "bycategory": "Grouper par catégorie",
diff --git a/www/addons/mod/glossary/lang/nl.json b/www/addons/mod/glossary/lang/nl.json
index a7e834e6b2a..5a53d5a1d7a 100644
--- a/www/addons/mod/glossary/lang/nl.json
+++ b/www/addons/mod/glossary/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bijlage",
-    "browsemode": "Probeermodus",
+    "browsemode": "Blader door items",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
     "bycategory": "Groepeer per categorie",
diff --git a/www/addons/mod/glossary/lang/pt-br.json b/www/addons/mod/glossary/lang/pt-br.json
index 37cf8ed2dab..57059a9b327 100644
--- a/www/addons/mod/glossary/lang/pt-br.json
+++ b/www/addons/mod/glossary/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexo",
-    "browsemode": "Prévia",
+    "browsemode": "Navegar nas entradas",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
diff --git a/www/addons/mod/glossary/lang/sv.json b/www/addons/mod/glossary/lang/sv.json
index 3cfa169d56c..7fb8c3d2643 100644
--- a/www/addons/mod/glossary/lang/sv.json
+++ b/www/addons/mod/glossary/lang/sv.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bilaga",
-    "browsemode": "Läge för förhandsgranskning",
+    "browsemode": "Bläddrar bland poster",
     "byalphabet": "Alfabetiskt",
     "byauthor": "Sortera efter författare",
     "bynewestfirst": "Nyaste först",
diff --git a/www/addons/mod/lesson/lang/ca.json b/www/addons/mod/lesson/lang/ca.json
index de2e7ee5046..ad28463c750 100644
--- a/www/addons/mod/lesson/lang/ca.json
+++ b/www/addons/mod/lesson/lang/ca.json
@@ -21,7 +21,9 @@
     "emptypassword": "La contrasenya no es pot deixar en blanc",
     "enterpassword": "Escriviu la contrasenya:",
     "eolstudentoutoftimenoanswers": "No heu respost cap pregunta. La vostra puntuació d'auqesta lliçó és de 0.",
+    "errorreviewretakenotlast": "Aquest intent no es pot revisar perquè un altre intent s'ha finalitzat.",
     "finish": "Acaba",
+    "finishretakeoffline": "Aquest intent s'ha finalitzat fora de línia.",
     "firstwrong": "La vostra resposta no és correcta. Voleu reintentar-ho? (Si ara responeu correctament, no s'incrementarà la puntuació final).",
     "gotoendoflesson": "Vés al final de la lliçó",
     "grade": "Qualifica",
@@ -55,6 +57,9 @@
     "rawgrade": "Qualificació bruta",
     "reports": "Informes",
     "response": "Reacció",
+    "retakefinishedinsync": "S'ha sincronitzat un intent fora de línia. Voleu revisar-lo?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Revisa",
     "reviewlesson": "Revisa la lliçó",
     "reviewquestionback": "Sí, vull tornar-ho a provar",
@@ -69,6 +74,7 @@
     "timeremaining": "Temps restant",
     "timetaken": "Temps dedicat",
     "unseenpageinbranch": "Pregunta no vista en una pàgina de contingut",
+    "warningretakefinished": "L'intent s'ha finalitzat al lloc web",
     "welldone": "Molt bé",
     "youhaveseen": "Ja heu vist més d'una pàgina d'aquesta lliçó.<br /> Voleu començar a la darrera pàgina que vau veure?",
     "youranswer": "La vostra resposta",
diff --git a/www/addons/mod/lesson/lang/cs.json b/www/addons/mod/lesson/lang/cs.json
index 3575e0f706c..c6b5605a360 100644
--- a/www/addons/mod/lesson/lang/cs.json
+++ b/www/addons/mod/lesson/lang/cs.json
@@ -21,7 +21,9 @@
     "emptypassword": "Heslo nemůže být prázdné",
     "enterpassword": "Zadejte prosím heslo:",
     "eolstudentoutoftimenoanswers": "Nezodpověděli jste žádnou otázku. Za tuto přednášku nezískáváte žádný bod.",
+    "errorreviewretakenotlast": "Tento pokus již nelze prohlédnout, protože byl dokončen další pokus.",
     "finish": "Skončit",
+    "finishretakeoffline": "Tento pokus byl dokončen offline.",
     "firstwrong": "Bohužel, vaše odpověď není správná. Chcete to zkusit ještě jednou? (ovšem již bez bodového zisku)",
     "gotoendoflesson": "Přejít na konec přednášky",
     "grade": "Známka",
@@ -55,6 +57,9 @@
     "rawgrade": "Hrubá známka",
     "reports": "Výsledky",
     "response": "Reakce",
+    "retakefinishedinsync": "Offline pokus byl synchronizován. Chcete jej zobrazit?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Revize",
     "reviewlesson": "Revize přednášky",
     "reviewquestionback": "Ano, chci to zkusit ještě jednou",
@@ -69,6 +74,7 @@
     "timeremaining": "Zbývající čas",
     "timetaken": "Doba průchodu",
     "unseenpageinbranch": "Nezobrazená otázka v rámci stránky",
+    "warningretakefinished": "Pokus byl dokončen na webu.",
     "welldone": "Výborně!",
     "youhaveseen": "Některé ze stránek této přednášky jste již viděli.<br />Chcete začít na poslední stránce, kterou jste navštívili?",
     "youranswer": "Vaše odpověď",
diff --git a/www/addons/mod/lesson/lang/de.json b/www/addons/mod/lesson/lang/de.json
index 08992c23260..60f5cf0ae98 100644
--- a/www/addons/mod/lesson/lang/de.json
+++ b/www/addons/mod/lesson/lang/de.json
@@ -21,7 +21,9 @@
     "emptypassword": "Das Kennwort muss eingegeben werden",
     "enterpassword": "Bitte geben Sie das Kennwort ein:",
     "eolstudentoutoftimenoanswers": "Sie haben keine Fragen beantwortet. Sie erhalten daher 0 Punkte für die Lektion.",
+    "errorreviewretakenotlast": "Dieser Versuch kann nicht erneut angesehen werden, weil ein weiterer Versuch beendet wurde.",
     "finish": "Fertigstellen",
+    "finishretakeoffline": "Dieser Versuch wurde offline beendet.",
     "firstwrong": "Ihre Antwort ist falsch. Wollen Sie noch einmal (ohne Bewertung) wiederholen?",
     "gotoendoflesson": "Zum Lektionende gehen",
     "grade": "Relative Bewertung",
@@ -55,6 +57,9 @@
     "rawgrade": "Absolute Bewertung",
     "reports": "Ergebnisse",
     "response": "Feedback",
+    "retakefinishedinsync": "Ein Offline-Versuch wurde synchronisiert. Möchten Sie ihn überprüfen?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Rückschau",
     "reviewlesson": "Zur Lektion",
     "reviewquestionback": "Wiederholen",
@@ -69,6 +74,7 @@
     "timeremaining": "Verbleibende Zeit",
     "timetaken": "Aufgewendete Zeit",
     "unseenpageinbranch": "Noch nicht angezeigte Frage innerhalb des Zweiges",
+    "warningretakefinished": "Der Versuch wurde auf der Website beendet.",
     "welldone": "In den Kurs gelangen Sie mit Klick auf \"Zurückkehren zu ...\"",
     "youhaveseen": "Sie haben einige Seiten der Lektion schon einmal bearbeitet. <br />Wollen Sie an der Stelle fortsetzen, an der Sie damals aufgehört haben?",
     "youranswer": "Ihre Antwort",
diff --git a/www/addons/mod/lesson/lang/es-mx.json b/www/addons/mod/lesson/lang/es-mx.json
index 632d0c294c3..ead72ecbab5 100644
--- a/www/addons/mod/lesson/lang/es-mx.json
+++ b/www/addons/mod/lesson/lang/es-mx.json
@@ -21,7 +21,9 @@
     "emptypassword": "La contraseña no puede estar vacía",
     "enterpassword": "Por favor, escriba la contraseña:",
     "eolstudentoutoftimenoanswers": "No ha contestado a ninguna pregunta. En esta lección ha obtenido 0 puntos.",
+    "errorreviewretakenotlast": "Este intento no puede ser revisado más porque se ha terminado otro intento.",
     "finish": "Terminar",
+    "finishretakeoffline": "Este intento se ha terminado en fuera-de-línea.",
     "firstwrong": "Lo sentimos, usted ha contestado incorrectamente. ¡Le gustaría volver a intentar la pregunta de nuevo? (si Usted contesta ahora la pregunta correctamente, no contará hacia su puntaje final).",
     "gotoendoflesson": "Ir al final de lección",
     "grade": "Calificación",
@@ -55,6 +57,9 @@
     "rawgrade": "Calificación en bruto",
     "reports": "Reportes",
     "response": "Comentario",
+    "retakefinishedinsync": "Un intento fuera-de-línea fue sincronizado.¿Quiere Usted revisarlo?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Revisión",
     "reviewlesson": "Revisar lección",
     "reviewquestionback": "Sí, me gustaría probar de nuevo",
@@ -69,6 +74,7 @@
     "timeremaining": "Tiempo restante",
     "timetaken": "Tiempo empleado",
     "unseenpageinbranch": "Pregunta no vista dentro de una página de conenidos",
+    "warningretakefinished": "Este intento fue terminado en el sitio.",
     "welldone": "¡Bien hecho!",
     "youhaveseen": "Usted ya ha visto más de una página de esta lección.<br />¿Desea comenzar desde la última página vista?",
     "youranswer": "Su respuesta",
diff --git a/www/addons/mod/lesson/lang/nl.json b/www/addons/mod/lesson/lang/nl.json
index 58d8a40f232..e2620a8cabf 100644
--- a/www/addons/mod/lesson/lang/nl.json
+++ b/www/addons/mod/lesson/lang/nl.json
@@ -21,7 +21,9 @@
     "emptypassword": "Wachtwoord kan niet leeg zijn",
     "enterpassword": "Geef het wachtwoord:",
     "eolstudentoutoftimenoanswers": "Je hebt geen enkele vraag beantwoord. Je hebt een 0 voor deze les",
+    "errorreviewretakenotlast": "Deze poging kan niet meer nagekeken worden omdat er al een andere poging voltooid is.",
     "finish": "Einde",
+    "finishretakeoffline": "Deze poging is voltooid in offline modus",
     "firstwrong": "Je antwoord is fout.  Wil je de vraag opnieuw proberen te beantwoorden? Als je het antwoord weet, zul je er geen punten meer mee verdienen.",
     "gotoendoflesson": "Ga naar het einde van de les",
     "grade": "Cijfer",
@@ -55,6 +57,9 @@
     "rawgrade": "Ruwe score",
     "reports": "Rapporten",
     "response": "Respons",
+    "retakefinishedinsync": "Er werd een offline poging gesynchroniseerd. Wil je ze bekijken?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Nalezen",
     "reviewlesson": "Les nalezen",
     "reviewquestionback": "Ja, ik wil nog eens proberen",
@@ -69,6 +74,7 @@
     "timeremaining": "Resterende tijd",
     "timetaken": "Gebruikte tijd",
     "unseenpageinbranch": "Ongeziene vraag binnen een inhoudspagina",
+    "warningretakefinished": "De poging is voltooid via de site.",
     "welldone": "Goed gedaan!",
     "youhaveseen": "Je hebt al meer dan één pagina van deze les bekeken.<br />Wil je beginnen bij de laatste pagina die je vorige keer bekeken hebt?",
     "youranswer": "Jouw antwoord",
diff --git a/www/addons/mod/wiki/lang/ca.json b/www/addons/mod/wiki/lang/ca.json
index fb0c7bfab1e..b827bb47066 100644
--- a/www/addons/mod/wiki/lang/ca.json
+++ b/www/addons/mod/wiki/lang/ca.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Títol de la pàgina nova",
     "nocontent": "No hi ha contingut per a aquesta pàgina",
     "notingroup": "No en grup",
-    "page": "Pàgina: {{$a}}",
+    "page": "Pàgina",
     "pageexists": "Aquesta pàgina ja existeix.",
     "pagename": "Nom de la pàgina",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/cs.json b/www/addons/mod/wiki/lang/cs.json
index 052676bb598..89723ca1da7 100644
--- a/www/addons/mod/wiki/lang/cs.json
+++ b/www/addons/mod/wiki/lang/cs.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nový název stránky",
     "nocontent": "Pro tuto stránku není obsah",
     "notingroup": "Není ve skupině",
-    "page": "Stránka: {{$a}}",
+    "page": "Stránka",
     "pageexists": "Tato stránka již existuje.",
     "pagename": "Název stránky",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/de.json b/www/addons/mod/wiki/lang/de.json
index 6fe1fc4dba9..7bb8187eaff 100644
--- a/www/addons/mod/wiki/lang/de.json
+++ b/www/addons/mod/wiki/lang/de.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titel für neue Seite\n",
     "nocontent": "Kein Inhalt auf dieser Seite",
     "notingroup": "Nicht in Gruppen",
-    "page": "Seite: {{$a}}",
+    "page": "Seite",
     "pageexists": "Diese Seite existiert bereits.",
     "pagename": "Seitenname",
     "subwiki": "Teilwiki",
diff --git a/www/addons/mod/wiki/lang/el.json b/www/addons/mod/wiki/lang/el.json
index 8eec41f7ee2..7a3a3058446 100644
--- a/www/addons/mod/wiki/lang/el.json
+++ b/www/addons/mod/wiki/lang/el.json
@@ -3,7 +3,7 @@
     "errornowikiavailable": "Αυτό το wiki δεν έχει ακόμα περιεχόμενο.",
     "gowikihome": "Go Wiki home",
     "notingroup": "Συγγνώμη, αλλά πρέπει να είστε μέλος ομάδας για να δείτε αυτό την ομάδα συζητήσεων.",
-    "page": "Σελίδα: {{$a}}",
+    "page": "Σελίδα",
     "subwiki": "Subwiki",
     "titleshouldnotbeempty": "Ο τίτλος δεν πρέπει να είναι κενός",
     "viewpage": "Δείτε τη σελίδα",
diff --git a/www/addons/mod/wiki/lang/es-mx.json b/www/addons/mod/wiki/lang/es-mx.json
index 5a53592ed79..cbd65b371f9 100644
--- a/www/addons/mod/wiki/lang/es-mx.json
+++ b/www/addons/mod/wiki/lang/es-mx.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Título nuevo de la página",
     "nocontent": "No hay contenido para esta página",
     "notingroup": "No está en un grupo",
-    "page": "Página: {{$a}}",
+    "page": "Página",
     "pageexists": "Esta página ya existe.",
     "pagename": "Nombre de página",
     "subwiki": "Sub-wiki",
diff --git a/www/addons/mod/wiki/lang/fr.json b/www/addons/mod/wiki/lang/fr.json
index e18eeba1d13..3d4ff31273f 100644
--- a/www/addons/mod/wiki/lang/fr.json
+++ b/www/addons/mod/wiki/lang/fr.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titre de la nouvelle page",
     "nocontent": "Cette page n'a pas de contenu",
     "notingroup": "Pas dans le groupe",
-    "page": "Page : {{$a}}",
+    "page": "Page",
     "pageexists": "Cette page existe déjà.",
     "pagename": "Nom de page",
     "subwiki": "Sous-wiki",
diff --git a/www/addons/mod/wiki/lang/nl.json b/www/addons/mod/wiki/lang/nl.json
index de4427ee53d..2d4ec194f27 100644
--- a/www/addons/mod/wiki/lang/nl.json
+++ b/www/addons/mod/wiki/lang/nl.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nieuwe paginatitel",
     "nocontent": "Er is geen inhoud voor deze pagina",
     "notingroup": "Niet in groep",
-    "page": "Pagina: {{$a}}",
+    "page": "Pagina",
     "pageexists": "Deze pagina bestaat al.",
     "pagename": "Paginanaam",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/pt-br.json b/www/addons/mod/wiki/lang/pt-br.json
index 710e219e39c..6c2036aa656 100644
--- a/www/addons/mod/wiki/lang/pt-br.json
+++ b/www/addons/mod/wiki/lang/pt-br.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Novo título da página",
     "nocontent": "Não existe conteúdo para esta página",
     "notingroup": "Não existe no grupo",
-    "page": "Página: {{$a}}",
+    "page": "Página",
     "pageexists": "Esta página já existe. Redirecionado para ela.",
     "pagename": "Nome da página",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/ru.json b/www/addons/mod/wiki/lang/ru.json
index efca795f742..d1aad170e59 100644
--- a/www/addons/mod/wiki/lang/ru.json
+++ b/www/addons/mod/wiki/lang/ru.json
@@ -9,7 +9,7 @@
     "newpagetitle": "Заголовок новой страницы",
     "nocontent": "Нет содержимого у этой страницы",
     "notingroup": "Не в группе",
-    "page": "Страница: {{$a}}",
+    "page": "Страница",
     "pageexists": "Такая страница уже существует.",
     "pagename": "Название страницы",
     "titleshouldnotbeempty": "Заголовок не должен быть пустым",
diff --git a/www/addons/mod/wiki/lang/tr.json b/www/addons/mod/wiki/lang/tr.json
index f1167632e26..8ddfdfd95b3 100644
--- a/www/addons/mod/wiki/lang/tr.json
+++ b/www/addons/mod/wiki/lang/tr.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Yeni sayfa başlığı",
     "nocontent": "Bu sayfa için içerik yok",
     "notingroup": "Grupta değil",
-    "page": "Sayfa: {{$a}}",
+    "page": "Sayfa",
     "pageexists": "Bu sayfa zaten var.",
     "pagename": "Sayfa adı",
     "wrongversionlock": "Başka bir kullanıcı sizin düzenlemeniz sırasında bu sayfayı düzenledi ve içeriğiniz geçersiz."
diff --git a/www/addons/notes/lang/ca.json b/www/addons/notes/lang/ca.json
index 9367384a78e..1c044e61b29 100644
--- a/www/addons/notes/lang/ca.json
+++ b/www/addons/notes/lang/ca.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "S'ha creat la nota",
     "nonotes": "Encara no hi ha notes d'aquest tipus",
     "note": "Anotació",
-    "notes": "El teu anàlisi privat i les teves notes",
+    "notes": "Anotacions",
     "personalnotes": "Anotacions personals",
     "publishstate": "Context",
     "sitenotes": "Anotacions del lloc",
diff --git a/www/addons/notes/lang/cs.json b/www/addons/notes/lang/cs.json
index 984816ff5e7..fd3b1a46f42 100644
--- a/www/addons/notes/lang/cs.json
+++ b/www/addons/notes/lang/cs.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Poznámka vytvořena",
     "nonotes": "Doposud neexistují žádné poznámky tohoto typu",
     "note": "Poznámka",
-    "notes": "Vaše soukromé postřehy a poznámky",
+    "notes": "Poznámky",
     "personalnotes": "Osobní poznámky",
     "publishstate": "Kontext",
     "sitenotes": "Poznámky stránek",
diff --git a/www/addons/notes/lang/de.json b/www/addons/notes/lang/de.json
index 06d550d7211..b4ed60eb088 100644
--- a/www/addons/notes/lang/de.json
+++ b/www/addons/notes/lang/de.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anmerkung angelegt",
     "nonotes": "Keine Anmerkungen",
     "note": "Anmerkung",
-    "notes": "Ihre persönliche Analyse und Anmerkungen",
+    "notes": "Anmerkungen",
     "personalnotes": "Meine Anmerkungen",
     "publishstate": "Kontext",
     "sitenotes": "Anmerkungen zur Website",
diff --git a/www/addons/notes/lang/el.json b/www/addons/notes/lang/el.json
index 9bc5d02d49e..e796b19cabe 100644
--- a/www/addons/notes/lang/el.json
+++ b/www/addons/notes/lang/el.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Το σημείωμα δημιουργήθηκε",
     "nonotes": "Δεν υπάρχουν σημειώσεις αυτού του τύπου ακόμα",
     "note": "Σημείωση",
-    "notes": "Οι προσωπικές σας αναλύσεις και σημειώσεις",
+    "notes": "Σημειώσεις",
     "personalnotes": "Προσωπικές σημειώσεις",
     "publishstate": "Γενικό πλαίσιο",
     "sitenotes": "Σημειώσεις της ιστοσελίδας",
diff --git a/www/addons/notes/lang/es-mx.json b/www/addons/notes/lang/es-mx.json
index 1c91ea47373..aabd17d948f 100644
--- a/www/addons/notes/lang/es-mx.json
+++ b/www/addons/notes/lang/es-mx.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Nota creada",
     "nonotes": "Todavía no hay notas de este tipo todavía",
     "note": "Nota",
-    "notes": "Su análisis privado y sus notas",
+    "notes": "Notas",
     "personalnotes": "Notas personales",
     "publishstate": "Contexto",
     "sitenotes": "Notas del sitio",
diff --git a/www/addons/notes/lang/fr.json b/www/addons/notes/lang/fr.json
index 346f886976d..21d624c4af2 100644
--- a/www/addons/notes/lang/fr.json
+++ b/www/addons/notes/lang/fr.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Annotation créée",
     "nonotes": "Il n'y a pas encore d'annotation de ce type",
     "note": "Annotation",
-    "notes": "Votre analyse et vos remarques personnelles",
+    "notes": "Annotations",
     "personalnotes": "Annotations personnelles",
     "publishstate": "Contexte",
     "sitenotes": "Annotations du site",
diff --git a/www/addons/notes/lang/it.json b/www/addons/notes/lang/it.json
index 90c300a1f85..0e9b001f16c 100644
--- a/www/addons/notes/lang/it.json
+++ b/www/addons/notes/lang/it.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Creata annotazione",
     "nonotes": "Non sono presenti annotazioni di questo tipo.",
     "note": "Annotazione",
-    "notes": "Le tue note e analisi",
+    "notes": "Annotazioni",
     "personalnotes": "Annotazioni personali",
     "publishstate": "Contesto",
     "sitenotes": "Annotazioni del sito",
diff --git a/www/addons/notes/lang/nl.json b/www/addons/notes/lang/nl.json
index 64e66285bed..49a0c0209c4 100644
--- a/www/addons/notes/lang/nl.json
+++ b/www/addons/notes/lang/nl.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Notitie gemaakt",
     "nonotes": "Er zijn nog geen notities van dit type.",
     "note": "Notitie",
-    "notes": "Je persoonlijke analyse en aantekeningen",
+    "notes": "Notities",
     "personalnotes": "Persoonlijke notities",
     "publishstate": "Context",
     "sitenotes": "Site notities",
diff --git a/www/addons/notes/lang/pt-br.json b/www/addons/notes/lang/pt-br.json
index 5634bc70e89..ce6908d1d3e 100644
--- a/www/addons/notes/lang/pt-br.json
+++ b/www/addons/notes/lang/pt-br.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anotação criada",
     "nonotes": "Não há mais anotações desse típo",
     "note": "Anotação",
-    "notes": "Suas análises e anotações pessoais",
+    "notes": "Anotações",
     "personalnotes": "Anotações pessoais",
     "publishstate": "Contexto",
     "sitenotes": "Anotações do site",
diff --git a/www/addons/notes/lang/ru.json b/www/addons/notes/lang/ru.json
index 5b45804576d..ce3b230d19d 100644
--- a/www/addons/notes/lang/ru.json
+++ b/www/addons/notes/lang/ru.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Заметка создана",
     "nonotes": "Тут нет заметок такого типа",
     "note": "Заметка",
-    "notes": "Ваши анализы и заметки",
+    "notes": "Заметки",
     "personalnotes": "Личные заметки",
     "publishstate": "Контекст",
     "sitenotes": "Заметки сайта",
diff --git a/www/addons/notes/lang/sv.json b/www/addons/notes/lang/sv.json
index 75049c59549..8fcd87edc6d 100644
--- a/www/addons/notes/lang/sv.json
+++ b/www/addons/notes/lang/sv.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anteckning skapade",
     "nonotes": "Det finns inga anteckningar av denna typ ännu",
     "note": "Anteckning",
-    "notes": "Din privata analys och anteckningar",
+    "notes": "Anteckningar",
     "personalnotes": "Personliga anteckningar",
     "publishstate": "Sammanhang",
     "sitenotes": "Webbplats anteckningar",
diff --git a/www/addons/notifications/lang/ca.json b/www/addons/notifications/lang/ca.json
index af8c7e550d0..324cd60ecdb 100644
--- a/www/addons/notifications/lang/ca.json
+++ b/www/addons/notifications/lang/ca.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "S'ha produït un error carregant les notificacions",
     "notificationpreferences": "Preferències de notificació",
     "notifications": "Notificacions",
+    "playsound": "Reprodueix el so",
     "therearentnotificationsyet": "No hi ha notificacions"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/cs.json b/www/addons/notifications/lang/cs.json
index c058c7707ee..b6fcbaa749e 100644
--- a/www/addons/notifications/lang/cs.json
+++ b/www/addons/notifications/lang/cs.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Chyba při načítání oznámení.",
     "notificationpreferences": "Nastavení oznámení",
     "notifications": "Oznámení",
+    "playsound": "Přehrát zvuk",
     "therearentnotificationsyet": "Nejsou žádná sdělení"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/de.json b/www/addons/notifications/lang/de.json
index cdd10eae826..6dc2a08c68c 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -1,6 +1,7 @@
 {
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
-    "notificationpreferences": "Benachrichtigungen konfigurieren",
-    "notifications": "Benachrichtigungen",
+    "notificationpreferences": "Systemmitteilungen",
+    "notifications": "Systemmitteilungen",
+    "playsound": "Audio abspielen",
     "therearentnotificationsyet": "Keine Mitteilungen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es-mx.json b/www/addons/notifications/lang/es-mx.json
index dcd161eb585..238d8cfaa15 100644
--- a/www/addons/notifications/lang/es-mx.json
+++ b/www/addons/notifications/lang/es-mx.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Error al obtener notificaciones",
     "notificationpreferences": "Preferencias de notificación",
     "notifications": "Notificaciones",
+    "playsound": "Reproducir sonido",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/fa.json b/www/addons/notifications/lang/fa.json
index 4db075e4716..dcfecb86fba 100644
--- a/www/addons/notifications/lang/fa.json
+++ b/www/addons/notifications/lang/fa.json
@@ -1,5 +1,5 @@
 {
     "notificationpreferences": "ترجیحات اطلاعیه‌ها",
-    "notifications": "اطلاعیه‌ها",
+    "notifications": "هشدارها",
     "therearentnotificationsyet": "هیچ هشداری وجود ندارد"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/nl.json b/www/addons/notifications/lang/nl.json
index 85ae7955a0e..c884b7364ea 100644
--- a/www/addons/notifications/lang/nl.json
+++ b/www/addons/notifications/lang/nl.json
@@ -1,6 +1,7 @@
 {
     "errorgetnotifications": "Fout bij het ophalen van notificaties",
-    "notificationpreferences": "Meldingen  voorkeuren",
+    "notificationpreferences": "Notificatievoorkeuren",
     "notifications": "Meldingen",
+    "playsound": "Speel geluid",
     "therearentnotificationsyet": "Er zijn geen meldingen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/pt-br.json b/www/addons/notifications/lang/pt-br.json
index c7ff82adb19..33e2586486c 100644
--- a/www/addons/notifications/lang/pt-br.json
+++ b/www/addons/notifications/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Erro ao receber notificações",
-    "notificationpreferences": "Preferências de notificação",
-    "notifications": "Notificações",
+    "notificationpreferences": "Preferência de notificações",
+    "notifications": "Notificação",
     "therearentnotificationsyet": "Não há notificações"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sv.json b/www/addons/notifications/lang/sv.json
index 024d0fef099..2aa4e69322a 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,5 +1,5 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
-    "notifications": "Meddelande",
+    "notifications": "Meddelanden",
     "therearentnotificationsyet": "Det finns inga meddelanden"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ca.json b/www/addons/participants/lang/ca.json
index 1c214eda823..3c6638a3af7 100644
--- a/www/addons/participants/lang/ca.json
+++ b/www/addons/participants/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No s'han trobat participants.",
+    "noparticipants": "No s'han trobat participants per aquest curs",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/cs.json b/www/addons/participants/lang/cs.json
index 4ae4dd88392..2092b03a730 100644
--- a/www/addons/participants/lang/cs.json
+++ b/www/addons/participants/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nebyl nalezen žádný účastník",
-    "participants": "Přispěvatelé"
+    "noparticipants": "Pro tento kurz nenalezeni účastníci",
+    "participants": "Účastníci"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/de.json b/www/addons/participants/lang/de.json
index 087591cfe5d..95a259f09bd 100644
--- a/www/addons/participants/lang/de.json
+++ b/www/addons/participants/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Keine Teilnehmer gefunden",
-    "participants": "Teilnehmer/innen"
+    "noparticipants": "Keine Personen für diesen Kurs gefunden",
+    "participants": "Personen"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/el.json b/www/addons/participants/lang/el.json
index e1a786afbb1..846f209c0b0 100644
--- a/www/addons/participants/lang/el.json
+++ b/www/addons/participants/lang/el.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Δε βρέθηκαν συμμετέχονες γι' αυτό το μάθημα",
+    "noparticipants": "Δεν βρέθηκαν συμμετέχοντες σε αυτό το μάθημα",
     "participants": "Συμμετέχοντες"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es-mx.json b/www/addons/participants/lang/es-mx.json
index 5c6014bd522..56f80358ad5 100644
--- a/www/addons/participants/lang/es-mx.json
+++ b/www/addons/participants/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se encontraron participantes.",
+    "noparticipants": "No se encontraron participantes para este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/fr.json b/www/addons/participants/lang/fr.json
index 0a75ac6f8c8..fc97610a609 100644
--- a/www/addons/participants/lang/fr.json
+++ b/www/addons/participants/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Aucun participant trouvé",
+    "noparticipants": "Aucun participant trouvé dans ce cours",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/it.json b/www/addons/participants/lang/it.json
index 21d39dce004..0d16202be57 100644
--- a/www/addons/participants/lang/it.json
+++ b/www/addons/participants/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Non sono stati trovati partecipanti.",
-    "participants": "Sono autorizzati ad inserire record"
+    "noparticipants": "In questo corso non sono stati trovati partecipanti",
+    "participants": "Partecipanti"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/nl.json b/www/addons/participants/lang/nl.json
index a7b39b547fc..2beef686f18 100644
--- a/www/addons/participants/lang/nl.json
+++ b/www/addons/participants/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Geen deelnemers gevonden",
+    "noparticipants": "Geen deelnemers gevonden in deze cursus",
     "participants": "Deelnemers"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt-br.json b/www/addons/participants/lang/pt-br.json
index a107a2f8ee1..792fea1d8fd 100644
--- a/www/addons/participants/lang/pt-br.json
+++ b/www/addons/participants/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nenhum participante encontrado.",
+    "noparticipants": "Nenhum dos participantes encontrados para este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sv.json b/www/addons/participants/lang/sv.json
index 54221f5de3f..ab7780c8f28 100644
--- a/www/addons/participants/lang/sv.json
+++ b/www/addons/participants/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Inga deltagare funna.",
+    "noparticipants": "Inga deltagare hittades för kursen",
     "participants": "Deltagare"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/tr.json b/www/addons/participants/lang/tr.json
index 307ef1e120f..05e3c834e4a 100644
--- a/www/addons/participants/lang/tr.json
+++ b/www/addons/participants/lang/tr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Hiçbir katılımcı bulunamadı.",
+    "noparticipants": "Bu derste hiç katılımcı bulunamadı",
     "participants": "Katılımcılar"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-cn.json b/www/addons/participants/lang/zh-cn.json
index 4a9403ae5c7..f2ce4c8e36a 100644
--- a/www/addons/participants/lang/zh-cn.json
+++ b/www/addons/participants/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "未找到此项课程的参与者",
-    "participants": "参与者"
+    "participants": "课程参与者"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index 840bea85604..4d5f44fc1cc 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
-    "showall": "Mostra totes les preguntes en una pàgina",
+    "showall": "Mostra-ho tot",
     "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index c9c69290ccd..e8cac178795 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
-    "showall": "Zobrazit všechny úlohy na jedné stránce",
+    "showall": "Zobrazit vše",
     "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index 82fdbc2a7d5..16ab12b9912 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
     "nocontentavailable": "Momentan sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
-    "showall": "Alle Fragen auf einer Seite anzeigen",
+    "showall": "Alles anzeigen",
     "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index ad864c0ff41..5882734e565 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -16,5 +16,5 @@
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Εμφάνιση όλων των ερωτήσεων σε μία σελίδα"
+    "showall": "Προβολή όλων"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index 2bf6762b6e9..1745ce4e20a 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Usted está a punto de descargar {{size}}. ¿Está Usted seguro de querer continuar?",
     "confirmdownloadunknownsize": "No pudimos calcular el tamaño de la descarga. ¿Está Usted seguro de querer descargarla?",
     "confirmpartialdownloadsize": "Usted está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está Usted seguro de querer continuar?",
-    "contents": "Contenido",
+    "contents": "Contenidos",
     "couldnotloadsectioncontent": "No pudo cargarse el contenido de la sección; por favor inténtelo nuevamente después.",
     "couldnotloadsections": "No pudieron cargarse las secciones; por favor inténtelo nuevamente después.",
     "errordownloadingsection": "Error al descargar sección",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todas las preguntas en una página",
+    "showall": "Mostrar todo",
     "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index 21ef443c8c8..cb91088f8e6 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -5,10 +5,10 @@
     "confirmdownload": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmdownloadunknownsize": "ما نتوانستیم حجم دریافت را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmpartialdownloadsize": "شما در آستانهٔ دریافت <strong>حداقل</strong> {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
-    "contents": "محتویات",
+    "contents": "محتواها",
     "couldnotloadsectioncontent": "محتوای قسمت نتوانست بارگیری شود. لطفا بعدا دوباره تلاش کنید.",
     "couldnotloadsections": "قسمت‌ها نتوانستند بارگیری شوند. لطفا بعدا دوباره تلاش کنید.",
     "hiddenfromstudents": "پنهان از شاگردان",
-    "showall": "نمایش همهٔ سؤال‌ها در یک صفحه",
+    "showall": "نمایش همه",
     "useactivityonbrowser": "البته همچنان می‌توانید با استفاده از مرورگر دستگاه خود، از آن استفاده کنید."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index 511b6fcedf4..fa5ca9f7fb7 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
-    "showall": "Afficher toutes les questions sur une page",
+    "showall": "Tout afficher",
     "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index 2b09768bc49..2f6968177c8 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -9,5 +9,5 @@
     "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutte le domande nella stessa pagina"
+    "showall": "Visualizza tutto"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index 4386ada4fd0..e341c7adfe2 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
-    "showall": "Toon alle vragen op één pagina",
+    "showall": "Toon alle",
     "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index 4823f129bed..e95b7c4187c 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
     "confirmdownloadunknownsize": "Não fomos capazes de calcular o tamanho do download. Tem certeza de que deseja fazer o download?",
     "confirmpartialdownloadsize": "Você está prestes a baixar <strong>pelo menos</strong> {{size}}. Você tem certeza que quer continuar?",
-    "contents": "Conteúdo",
+    "contents": "Conteúdos",
     "couldnotloadsectioncontent": "Não foi possível carregar o conteúdo da seção, por favor tente mais tarde.",
     "couldnotloadsections": "Não foi possível carregar a seção, por favor tente mais tarde.",
     "errordownloadingsection": "Erro ao baixar seção.",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
     "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente.",
-    "showall": "Mostrar todas as questões em uma página",
+    "showall": "Mostrar todos",
     "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index f05042ab16d..6a0a1c3f43a 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -6,5 +6,5 @@
     "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Отображать все вопросы на одной странице"
+    "showall": "Показать все"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index d4f3f97d71b..0063575e970 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -10,5 +10,5 @@
     "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla frågor på en sida"
+    "showall": "Visa alla"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/tr.json b/www/core/components/course/lang/tr.json
index 8d09b5affd9..027484a1cc3 100644
--- a/www/core/components/course/lang/tr.json
+++ b/www/core/components/course/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "allsections": "Tüm Bölümler",
-    "contents": "İçerik",
+    "contents": "İçerik(ler)",
     "hiddenfromstudents": "Öğrencilerden gizli",
     "overriddennotice": "Bu etkinlikteki final notunuz, elle ayarlandı.",
-    "showall": "Bütün soruları tek sayfada göster"
+    "showall": "Tümünü göster"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-cn.json b/www/core/components/course/lang/zh-cn.json
index 85734e6d23c..c60b61bdc0b 100644
--- a/www/core/components/course/lang/zh-cn.json
+++ b/www/core/components/course/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "contents": "内容",
     "hiddenfromstudents": "对学生隐藏",
     "overriddennotice": "您在该活动中的最终成绩将自动调整。",
-    "showall": "所有题目显示在一页"
+    "showall": "全部显示"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/ca.json b/www/core/components/courses/lang/ca.json
index 48a43540ee7..4eecef3495a 100644
--- a/www/core/components/courses/lang/ca.json
+++ b/www/core/components/courses/lang/ca.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrar els meus cursos",
     "frontpage": "Pàgina principal",
     "mycourses": "Els meus cursos",
-    "nocourses": "Encara no hi ha cursos",
+    "nocourses": "No hi ha informació del curs per mostrar.",
     "nocoursesyet": "No hi ha cursos en aquesta categoria",
-    "nosearchresults": "Cap resultat",
-    "notenroled": "No us heu inscrit en aquest curs",
+    "nosearchresults": "No hi ha resultats per la vostra cerca",
+    "notenroled": "No esteu inscrit en aquest curs",
     "notenrollable": "No podeu autoinscriure-us en aquest curs.",
-    "password": "Contrasenya",
+    "password": "Clau d'inscripció",
     "search": "Cerca...",
     "searchcourses": "Cerca cursos",
     "searchcoursesadvice": "Podeu fer servir el botó de cercar cursos per accedir als cursos com a convidat o autoinscriure-us en cursos que ho permetin.",
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 2149d9de359..db3178d0886 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -5,7 +5,7 @@
     "categories": "Kategorie",
     "confirmselfenrol": "Jste si jisti, že chcete zapsat se do tohoto kurzu?",
     "courses": "Kurzy",
-    "enrolme": "Zapsat se do kurzu",
+    "enrolme": "Zapsat se",
     "errorloadcategories": "Při načítání kategorií došlo k chybě.",
     "errorloadcourses": "Při načítání kurzů došlo k chybě.",
     "errorsearching": "Při vyhledávání došlo k chybě.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
-    "nocourses": "Žádné kurzy",
+    "nocourses": "O kurzu nejsou žádné informace.",
     "nocoursesyet": "Žádný kurz v této kategorii",
-    "nosearchresults": "Žádné výsledky",
-    "notenroled": "Nejste zapsáni v tomto kurzu",
+    "nosearchresults": "Z vašeho hledání nebyly nalezeny žádné výsledky",
+    "notenroled": "V tomto kurzu nejste zapsán",
     "notenrollable": "Do tohoto kurzu se nemůžete sami zapsat.",
-    "password": "Heslo",
+    "password": "Klíč zápisu",
     "search": "Vyhledávání...",
     "searchcourses": "Vyhledat kurzy",
     "searchcoursesadvice": "Můžete použít tlačítko Vyhledat kurzy, pracovat jako host nebo se zapsat do kurzů, které to umožňují.",
diff --git a/www/core/components/courses/lang/de.json b/www/core/components/courses/lang/de.json
index 44a6eb68eef..e570f9df7bd 100644
--- a/www/core/components/courses/lang/de.json
+++ b/www/core/components/courses/lang/de.json
@@ -5,7 +5,7 @@
     "categories": "Kategorien",
     "confirmselfenrol": "Möchten Sie sich selbst in diesen Kurs einschreiben?",
     "courses": "Kurse",
-    "enrolme": "Einschreiben",
+    "enrolme": "Selbst einschreiben",
     "errorloadcategories": "Fehler beim Laden der Kursbereiche",
     "errorloadcourses": "Fehler beim Laden der Kurse",
     "errorsearching": "Fehler beim Suchen",
@@ -13,12 +13,12 @@
     "filtermycourses": "Meine Kurse filtern",
     "frontpage": "Startseite",
     "mycourses": "Meine Kurse",
-    "nocourses": "Keine Kurse",
+    "nocourses": "Keine Kursinformation",
     "nocoursesyet": "Keine Kurse in diesem Kursbereich",
-    "nosearchresults": "Keine Ergebnisse",
-    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben",
+    "nosearchresults": "Keine Suchergebnisse",
+    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben.",
     "notenrollable": "Sie können sich nicht selbst in diesen Kurs einschreiben.",
-    "password": "Gastschlüssel",
+    "password": "Einschreibeschlüssel",
     "search": "Suchen...",
     "searchcourses": "Kurse suchen",
     "searchcoursesadvice": "Sie können Kurse suchen, um als Gast teilzunehmen oder sich selbst einzuschreiben, falls dies erlaubt ist.",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index c229315e83e..b7408250b69 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Φιλτράρισμα των μαθημάτων μου",
     "frontpage": "Αρχική σελίδα",
     "mycourses": "Τα μαθήματά μου",
-    "nocourses": "Δεν υπάρχουν μαθήματα ακόμα",
+    "nocourses": "Δεν υπάρχουν πληροφορίες για αυτό το μάθημα.",
     "nocoursesyet": "Δεν υπάρχουν μαθήματα σε αυτήν την κατηγορία",
-    "nosearchresults": "Δε βρέθηκαν αποτελέσματα για την αναζήτησή σας",
-    "notenroled": "Δεν είσαι εγγεγραμμένος σε αυτό το μάθημα",
+    "nosearchresults": "Δεν βρέθηκαν αποτελέσματα",
+    "notenroled": "Δεν έχετε εγγραφεί σε αυτό το μάθημα",
     "notenrollable": "Δεν μπορείτε να αυτο-εγγραφείτε σε αυτό το μάθημα.",
-    "password": "Κωδικός πρόσβασης",
+    "password": "Κλειδί εγγραφής",
     "search": "Αναζήτηση...",
     "searchcourses": "Αναζήτηση μαθημάτων",
     "searchcoursesadvice": "Μπορείτε να χρησιμοποιήσετε το κουμπί Αναζήτηση μαθημάτων για πρόσβαση ως επισκέπτης ή για να αυτο-εγγραφείτε σε μαθήματα που το επιτρέπουν.",
diff --git a/www/core/components/courses/lang/es-mx.json b/www/core/components/courses/lang/es-mx.json
index 59e8d8d7f1e..efaa185521b 100644
--- a/www/core/components/courses/lang/es-mx.json
+++ b/www/core/components/courses/lang/es-mx.json
@@ -13,12 +13,12 @@
     "filtermycourses": "<<<filtrar mis cursos",
     "frontpage": "Portada",
     "mycourses": "Mis cursos",
-    "nocourses": "Ningun curso",
+    "nocourses": "Sin información del curso para mostrar.",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "Sin resultados",
+    "nosearchresults": "No hubo resultados de su búsqueda",
     "notenroled": "Usted no está inscrito en este curso",
     "notenrollable": "Usted no puede inscribirse a Usted mismo en este curso.",
-    "password": "Contraseña",
+    "password": "Clave de inscripción",
     "search": "Buscar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Usted puede usar el botón de 'buscar cursos' para acceder como invitado o para inscribirse Usted mismo en los cursos que lo permitan.",
diff --git a/www/core/components/courses/lang/fr.json b/www/core/components/courses/lang/fr.json
index 6fa919a52d9..25d105f1132 100644
--- a/www/core/components/courses/lang/fr.json
+++ b/www/core/components/courses/lang/fr.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrer mes cours",
     "frontpage": "Page d'accueil",
     "mycourses": "Mes cours",
-    "nocourses": "Pas de cours",
+    "nocourses": "Aucune information de cours à afficher",
     "nocoursesyet": "Il n'y a pas encore de cours",
-    "nosearchresults": "Aucun résultat",
+    "nosearchresults": "Votre recherche n'a donné aucun résultat",
     "notenroled": "Vous n'êtes pas inscrit à ce cours",
     "notenrollable": "Vous ne pouvez pas vous inscrire vous-même à ce cours.",
-    "password": "Mot de passe",
+    "password": "Clef d'inscription",
     "search": "Recherche...",
     "searchcourses": "Rechercher les cours",
     "searchcoursesadvice": "Veuillez utiliser le bouton de recherche de cours pour accéder anonymement à des cours ou vous inscrire vous-même à des cours qui le permettent.",
diff --git a/www/core/components/courses/lang/it.json b/www/core/components/courses/lang/it.json
index 78743b9a170..a62c6475bca 100644
--- a/www/core/components/courses/lang/it.json
+++ b/www/core/components/courses/lang/it.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Filtra i miei corsi",
     "frontpage": "Pagina home",
     "mycourses": "I miei corsi",
-    "nocourses": "Non ci sono corsi",
+    "nocourses": "Non sono presenti informazioni sul corso.",
     "nocoursesyet": "Questa categoria non ha corsi",
-    "nosearchresults": "Nessun risultato",
+    "nosearchresults": "La ricerca non ha prodotto risultati",
     "notenroled": "Non sei iscritto in questo corso",
     "notenrollable": "Non puoi iscriverti al corso.",
-    "password": "Chiave",
+    "password": "Chiave di iscrizione",
     "search": "Cerca...",
     "searchcourses": "Cerca corsi",
     "searchcoursesadvice": "Puoi utilizzare la ricerca corsi per accedere come ospite oppure iscriverti nei corsi che lo consentono.",
diff --git a/www/core/components/courses/lang/nl.json b/www/core/components/courses/lang/nl.json
index 3ccabdad311..71fd4592a9e 100644
--- a/www/core/components/courses/lang/nl.json
+++ b/www/core/components/courses/lang/nl.json
@@ -5,7 +5,7 @@
     "categories": "Categorieën",
     "confirmselfenrol": "Weet je zeker dat je je wil aanmelden in deze cursus?",
     "courses": "Cursussen",
-    "enrolme": "Laat me in de cursus",
+    "enrolme": "Meld me aan",
     "errorloadcategories": "Er is een fout opgetreden bij het ophalen van categorieën",
     "errorloadcourses": "Er is een fout opgetreden tijdens het laden van de cursussen.",
     "errorsearching": "Er is een fout opgetreden tijdens het zoeken.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filter mijn cursussen",
     "frontpage": "Startpagina",
     "mycourses": "Mijn cursussen",
-    "nocourses": "Geen cursussen",
+    "nocourses": "Geen cursusinformatie beschikbaar.",
     "nocoursesyet": "Er zijn geen cursussen in deze categorie",
-    "nosearchresults": "Geen resultaten",
-    "notenroled": "Je bent niet aangemeld in deze cursus",
+    "nosearchresults": "Je zoekopdracht gaf geen resultaten",
+    "notenroled": "Je bent niet aangemeld in deze cursus.",
     "notenrollable": "Je kunt jezelf niet aanmelden in deze cursus.",
-    "password": "Wachtwoord",
+    "password": "Aanmeldingssleutel",
     "search": "Zoeken...",
     "searchcourses": "Zoek cursussen",
     "searchcoursesadvice": "Je kunt via de cursus zoekknop toegang krijgen als gast of jezelf aanmelden in cursussen die dit toestaan.",
diff --git a/www/core/components/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index c321354487f..6f8671b937b 100644
--- a/www/core/components/courses/lang/pt-br.json
+++ b/www/core/components/courses/lang/pt-br.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrar meus cursos",
     "frontpage": "Primeira página",
     "mycourses": "Meus cursos",
-    "nocourses": "Ainda não existem cursos",
+    "nocourses": "Sem informações sobre o curso para mostrar.",
     "nocoursesyet": "Nenhum curso nesta categoria",
-    "nosearchresults": "Nenhum resultado",
-    "notenroled": "Você não está inscrito como estudante neste curso",
+    "nosearchresults": "Não foram encontrados resultados da sua pesquisa",
+    "notenroled": "Você não está registrado neste curso",
     "notenrollable": "Você não pode inscrever-se neste curso.",
-    "password": "Senha",
+    "password": "Chave de inscrição",
     "search": "Procurar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Você pode usar o botão de busca para acessar os cursos como convidado ou matricular-se em cursos que permitem que ele.",
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index 2852a04f2d5..dd610088dbb 100644
--- a/www/core/components/courses/lang/sv.json
+++ b/www/core/components/courses/lang/sv.json
@@ -4,19 +4,19 @@
     "categories": "Kategorier",
     "confirmselfenrol": "Är du säker att du vill registrera dig i den här kursen ?",
     "courses": "Kurser",
-    "enrolme": "Koppla mig",
+    "enrolme": "Registrera mig",
     "errorloadcourses": "Ett fel uppstod vid inläsning av kursen",
     "errorsearching": "Fel uppstod vid sökning",
     "errorselfenrol": "Fel uppstod vid registrering",
     "filtermycourses": "Filtrera mina kurser",
     "frontpage": "Ingångssidan",
     "mycourses": "Mina kurser",
-    "nocourses": "Det finns inga kurser ännu",
+    "nocourses": "Ingen kursinfomration att visa",
     "nocoursesyet": "Inga kurser i denna kategori",
-    "nosearchresults": "Inga resultat",
-    "notenroled": "Du är inte registrerad i den här kursen",
+    "nosearchresults": "Inga sökningsresultat",
+    "notenroled": "Du är inte registrerad i kursen",
     "notenrollable": "Du kan inte självregistrera dig i kursen",
-    "password": "Gästlösenord",
+    "password": "Kursnyckel",
     "search": "Sök...",
     "searchcourses": "Sök kurser",
     "searchcoursesadvice": "Du kan använda knappen \"Sök kurser\" för att få tillgång som gäst eller registrera dig på kurser som tillåter det .",
diff --git a/www/core/components/fileuploader/lang/ca.json b/www/core/components/fileuploader/lang/ca.json
index 68323beba4b..f5e46ff7e10 100644
--- a/www/core/components/fileuploader/lang/ca.json
+++ b/www/core/components/fileuploader/lang/ca.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "S'ha produït un error descarregant la imatge de l'àlbum.",
     "errormustbeonlinetoupload": "Heu d'estar connectat per pujar arxius.",
     "errornoapp": "No teniu instal·lada una app per realitzar aquesta acció.",
-    "errorreadingfile": "S'ha produït un error en llegir el fitxer \"{{$a}}\"",
+    "errorreadingfile": "S'ha produït un error llegint el fitxer.",
     "errorwhileuploading": "S'ha produït un error penjant el fitxer.",
-    "file": "Fitxers de la retroacció",
+    "file": "Arxiu",
     "fileuploaded": "S'ha penjat el fitxer",
-    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima que podeu pujar és de {{$a.size}}.",
+    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima de càrrega és {{$a.size}}.",
     "photoalbums": "Àlbums de fotos",
     "readingfile": "S'està llegint un fitxer",
     "selectafile": "Selecciona un fitxer",
     "uploadafile": "Penja un fitxer",
-    "uploading": "S'està carregant...",
+    "uploading": "S'està penjant",
     "uploadingperc": "S'està pujant: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/cs.json b/www/core/components/fileuploader/lang/cs.json
index 66897f21800..4c0277d01ff 100644
--- a/www/core/components/fileuploader/lang/cs.json
+++ b/www/core/components/fileuploader/lang/cs.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
     "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
     "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
-    "errorreadingfile": "Chyba při čtení souboru \"{{$a}}\"",
+    "errorreadingfile": "Chyba při čtení souboru.",
     "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
-    "file": "Soubory se zpětnou vazbou",
+    "file": "Soubor",
     "fileuploaded": "Soubor nahrán",
-    "maxbytesfile": "Soubor {{$a.file}} je příliš velký. Maximální velikost, kterou můžete nahrát, je  {{$a.size}}.",
+    "maxbytesfile": "Soubor {{$a.file}} je příliš veliký. Maximální velikost nahrávaného souboru je {{$a.size}}.",
     "photoalbums": "Fotoalba",
     "readingfile": "Čtení souboru",
     "selectafile": "Vyberte soubor",
-    "uploadafile": "Vložit soubor",
-    "uploading": "Nahrávání ...",
+    "uploadafile": "Nahrát soubor",
+    "uploading": "Nahrávání",
     "uploadingperc": "Nahrávání: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/de.json b/www/core/components/fileuploader/lang/de.json
index 72384b4829e..e54ab178c4f 100644
--- a/www/core/components/fileuploader/lang/de.json
+++ b/www/core/components/fileuploader/lang/de.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
     "errormustbeonlinetoupload": "Dateien können nur online hochgeladen werden.",
     "errornoapp": "Keine App zum Ausführen dieser Aktion gefunden",
-    "errorreadingfile": "Fehler beim Lesen der Datei \"{{$a}}\"",
+    "errorreadingfile": "Fehler beim Lesen der Datei",
     "errorwhileuploading": "Fehler beim Hochladen der Datei",
-    "file": "Feedbackdateien",
+    "file": "Datei",
     "fileuploaded": "Datei hochgeladen",
     "maxbytesfile": "Die Datei {{$a.file}} ist zu groß. Die maximale Größe zum Hochladen ist {{$a.size}}.",
     "photoalbums": "Fotoalbum",
     "readingfile": "Datei lesen",
     "selectafile": "Wählen Sie eine Datei.",
     "uploadafile": "Datei hochladen",
-    "uploading": "Wird hochgeladen...",
+    "uploading": "Hochladen",
     "uploadingperc": "Hochladen: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/el.json b/www/core/components/fileuploader/lang/el.json
index 26043910c12..57aa3c4745c 100644
--- a/www/core/components/fileuploader/lang/el.json
+++ b/www/core/components/fileuploader/lang/el.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από το αλμπουμ.",
     "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
     "errornoapp": "Δεν έχετε εγκατεστημένη εφαρμογή για να εκτελέσετε αυτή την ενέργεια.",
-    "errorreadingfile": "Σφάλμα στην ανάγνωση του αρχείου \"{{$a}}\"",
+    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
     "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου.",
-    "file": "Αρχεία ανατροφοδότησης",
+    "file": "Αρχείο",
     "fileuploaded": "Το αρχείο ανέβηκε επιτυχώς.",
     "maxbytesfile": "Το αρχείο {{$a.file}} είναι πολύ μεγάλο. Το μέγιστο μέγεθος που μπορείτε να ανεβάσετε είναι {{$a.size}}.",
     "photoalbums": "Άλμπουμ φωτογραφιών",
     "readingfile": "Ανάγνωση αρχείου",
     "selectafile": "Επιλογή αρχείου",
-    "uploadafile": "Φόρτωση ενός αρχείου",
-    "uploading": "Ανέβασμα...",
+    "uploadafile": "Ανεβάστε ένα αρχείο",
+    "uploading": "Ανέβασμα",
     "uploadingperc": "Ανέβασμα: {{$a}}%",
     "video": "Βίντεο"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/es-mx.json b/www/core/components/fileuploader/lang/es-mx.json
index ec27c0f9ba3..d299651b204 100644
--- a/www/core/components/fileuploader/lang/es-mx.json
+++ b/www/core/components/fileuploader/lang/es-mx.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Error al obtener imagen del album.",
     "errormustbeonlinetoupload": "Usted tiene que estar en-línea para subir archivos.",
     "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
-    "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
+    "errorreadingfile": "Error al leer archivo.",
     "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
-    "file": "Archivos de retroalimentación",
+    "file": "Archivo",
     "fileuploaded": "El archivo fue subido exitosamente.",
-    "maxbytesfile": "El archivo {{$a.file}} es demasiado grande. El tamaño máximo que Usted puede subir es de {{$a.size}}.",
+    "maxbytesfile": "El archivo {{$a.file}} es demasido grande. El tamaño máximo que Usted puede subir es {{$a.size}}.",
     "photoalbums": "Foto álbumes",
     "readingfile": "Leyendo archivo",
     "selectafile": "Seleccionar un archivo",
     "uploadafile": "Subir un archivo",
-    "uploading": "Subiendo...",
+    "uploading": "Subiendo",
     "uploadingperc": "Subiendo: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/fr.json b/www/core/components/fileuploader/lang/fr.json
index 78d6ece3168..68434825ec0 100644
--- a/www/core/components/fileuploader/lang/fr.json
+++ b/www/core/components/fileuploader/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Ajouter un fichier",
+    "addfiletext": "Ajouter le fichier",
     "audio": "Audio",
     "camera": "Caméra",
     "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erreur lors de la récupération de l'image de l'album.",
     "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
     "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
-    "errorreadingfile": "Erreur lors de la lecture du fichier « {{$a}} »",
+    "errorreadingfile": "Erreur de lecture du fichier.",
     "errorwhileuploading": "Une erreur est survenue lors du dépôt du fichier.",
-    "file": "Fichiers de feedback",
+    "file": "Fichier",
     "fileuploaded": "Le fichier a été déposé.",
-    "maxbytesfile": "La taille du fichier {{$a.file}} est trop grande. La taille maximale d'un fichier à déposer est de {{$a.size}}.",
+    "maxbytesfile": "Le fichier {{$a.file}} est trop gros. La taille maximale permise est de {{$a.size}}.",
     "photoalbums": "Albums de photos",
     "readingfile": "Lecture du fichier",
     "selectafile": "Choisir un fichier",
     "uploadafile": "Déposer un fichier",
-    "uploading": "En cours de dépôt...",
+    "uploading": "Envoi",
     "uploadingperc": "Dépôt en cours : {{$a}} %",
     "video": "Vidéo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/it.json b/www/core/components/fileuploader/lang/it.json
index 5f5fb84e300..a6eac6c923f 100644
--- a/www/core/components/fileuploader/lang/it.json
+++ b/www/core/components/fileuploader/lang/it.json
@@ -10,15 +10,15 @@
     "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
     "errormustbeonlinetoupload": "Devi essere online per caricare file.",
     "errornoapp": "Non hai un'app per svolgere questa azione.",
-    "errorreadingfile": "Si è verificato un errore leggendo il file \"{{$a}}\"",
+    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
     "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
-    "file": "File di commento",
+    "file": "File",
     "fileuploaded": "File caricato correttamente",
-    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima che è possibile caricare è pari a {{$a.size}}.",
+    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima consentita è {{$a.size}}.",
     "photoalbums": "Album fotografico",
     "readingfile": "Letture file in corso",
-    "uploadafile": "Carica un file sul server",
-    "uploading": "Caricamento in corso...",
+    "uploadafile": "Carica un file",
+    "uploading": "Caricamento in corso",
     "uploadingperc": "Caricamento: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/nl.json b/www/core/components/fileuploader/lang/nl.json
index a9642735d2d..bded0b189f9 100644
--- a/www/core/components/fileuploader/lang/nl.json
+++ b/www/core/components/fileuploader/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Bestand toevoegen",
+    "addfiletext": "Voeg bestand toe",
     "audio": "Audio",
     "camera": "Camera",
     "confirmuploadfile": "Je gaat {{size}} uploaden. Weet je zeker dat je wil verder gaan?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fout bij het ophalen van een foto uit het album.",
     "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
     "errornoapp": "Je hebt geen app geïnstalleerd om dit te kunnen doen.",
-    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
+    "errorreadingfile": "Fout bij het lezen van het bestand.",
     "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
-    "file": "Feedbackbestanden",
+    "file": "Bestand",
     "fileuploaded": "Het uploaden van het bestand is gelukt.",
-    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale grootte die je kunt uploaden is {{$a.size}}.",
+    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale uploadgrootte is {{$a.size}}.",
     "photoalbums": "Foto-albums",
     "readingfile": "Bestand lezen",
     "selectafile": "Selecteer een bestand",
-    "uploadafile": "Upload een bestand",
-    "uploading": "Uploaden...",
+    "uploadafile": "Bestand uploaden",
+    "uploading": "Aan het uploaden",
     "uploadingperc": "Uploaden: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pt-br.json b/www/core/components/fileuploader/lang/pt-br.json
index 550047884c5..f9a5cffca49 100644
--- a/www/core/components/fileuploader/lang/pt-br.json
+++ b/www/core/components/fileuploader/lang/pt-br.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erro ao pegar imagem a partir do álbum.",
     "errormustbeonlinetoupload": "Você precisa estar online para enviar arquivos.",
     "errornoapp": "Você não tem um aplicativo instalado para fazer essa ação.",
-    "errorreadingfile": "Erro na leitura do arquivo \"{{$a}}\"",
+    "errorreadingfile": "Erro ao ler arquivo.",
     "errorwhileuploading": "Houve um erro durante o envio do arquivo.",
-    "file": "Arquivos de feedback",
+    "file": "Arquivo",
     "fileuploaded": "Arquivo enviado",
     "maxbytesfile": "O arquivo {{$a.file}} é muito grande. O tamanho máximo que você pode enviar é {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
     "readingfile": "Lendo arquivos",
     "selectafile": "Selecione um arquivo",
-    "uploadafile": "Enviar um arquivo",
-    "uploading": "Enviando...",
+    "uploadafile": "Enviando um arquivo",
+    "uploading": "Enviando",
     "uploadingperc": "Enviando: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ru.json b/www/core/components/fileuploader/lang/ru.json
index f903ba3a582..50c3136d898 100644
--- a/www/core/components/fileuploader/lang/ru.json
+++ b/www/core/components/fileuploader/lang/ru.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Ошибка получения изображения из альбома",
     "errormustbeonlinetoupload": "Вы должны быть на сайте, чтобы загружать файлы.",
     "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
-    "errorreadingfile": "Ошибка чтения файла «{{$a}}»",
+    "errorreadingfile": "Ошибка при чтении файла",
     "errorwhileuploading": "Произошла ошибка во время загрузки файла",
-    "file": "Отзыв в виде файла",
+    "file": "Файл",
     "fileuploaded": "Файл загружен",
     "maxbytesfile": "Файл «{{$a.file}}» слишком большой. Максимальный размер файла, который Вы можете загрузить: {{$a.size}}.",
     "photoalbums": "Фотоальбомы",
     "readingfile": "Чтение файла",
-    "uploadafile": "Загрузить файл",
-    "uploading": "Идет загрузка файла на сервер...",
+    "uploadafile": "Загрузка файла",
+    "uploading": "Загрузка",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/sv.json b/www/core/components/fileuploader/lang/sv.json
index a6f69716ad7..05123140c0e 100644
--- a/www/core/components/fileuploader/lang/sv.json
+++ b/www/core/components/fileuploader/lang/sv.json
@@ -8,13 +8,13 @@
     "errorgettingimagealbum": "Fel att få bild från album.",
     "errormustbeonlinetoupload": "Du måste vara online för att ladda upp filer.",
     "errornoapp": "Du behöver att ha en app installerat för att utföra den här åtgärden.",
-    "errorreadingfile": "Fel i samband med läsningen av filen  \"{{$a}}\"",
+    "errorreadingfile": "Fel vid läsning av fil.",
     "errorwhileuploading": "Ett fel uppstod under filöverföringen.",
-    "file": "Återkopplingsfiler",
+    "file": "Fil",
     "fileuploaded": "Fil laddades upp",
     "photoalbums": "Fotoalbum",
     "readingfile": "Läsa fil",
     "uploadafile": "Ladda upp en fil",
-    "uploading": "Laddar upp...",
+    "uploading": "Laddar upp",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/tr.json b/www/core/components/fileuploader/lang/tr.json
index 3af13fbd546..e95ef77a496 100644
--- a/www/core/components/fileuploader/lang/tr.json
+++ b/www/core/components/fileuploader/lang/tr.json
@@ -7,6 +7,6 @@
     "fileuploaded": "Dosya başarıyla yüklendi",
     "maxbytesfile": "Dosya {{$a.file}} çok büyük. Yüklediğiniz maksimum boyutu {{$a.size}} olduğunu.",
     "uploadafile": "Bir dosya yükle",
-    "uploading": "Yükleniyor...",
+    "uploading": "Yükleniyor",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index 75ac82bace1..465e7156f29 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -9,6 +9,6 @@
     "maxbytesfile": "这个文件 {{$a.file}} 太大了。你可以上传的文件最大容量是 {{$a.size}}。",
     "readingfile": "Odczytywanie pliku",
     "uploadafile": "上传一个文件",
-    "uploading": "上传中...",
+    "uploading": "上传中",
     "video": "视频"
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index 49d4981eac9..19ff1bbfed4 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -4,14 +4,14 @@
     "cancel": "Zrušit",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
-    "connect": "Spojit",
+    "connect": "Připojit!",
     "connecttomoodle": "Připojit k Moodle",
     "contactyouradministrator": "Pro další pomoc se obraťte na správce webu.",
     "contactyouradministratorissue": "Požádejte správce, prosím, aby zkontroloval následující problém: {{$a}}",
     "createaccount": "Vytvořit můj nový účet",
     "createuserandpass": "Vytvořit nové uživatelské jméno a heslo pro přihlášení",
     "credentialsdescription": "Pro přihlášení uveďte své uživatelské jméno a heslo.",
-    "emailconfirmsent": "<p>Na vaši adresu <b>{{$a}}</b> byl odeslán e-mail s jednoduchými pokyny k dokončení vaší registrace.</p><p>Narazíte-li na nějaké obtíže, spojte se se správcem těchto stránek.</p>",
+    "emailconfirmsent": "<p>E-mail by měl být zaslán na Vaši adresu na <b>{{$a}}</b></p><p>Obsahuje jednoduché instrukce pro dokončení registrace. </p><p>Pokud budou potíže pokračovat, obraťte se na správce webu. </p>",
     "emailnotmatch": "E-maily se neshodují",
     "enterthewordsabove": "Vložte výše uvedená slova",
     "erroraccesscontrolalloworigin": "Cross-Origin volání -  váš pokus o provedení byl odmítnut. Zkontrolujte prosím https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index 10cc82ae64b..5f20787751c 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -11,7 +11,7 @@
     "createaccount": "Zugang anlegen (Registrierung)",
     "createuserandpass": "Wählen Sie Ihren Anmeldenamen und Ihr Kennwort",
     "credentialsdescription": "Geben Sie den Anmeldenamen und das Kennwort ein. ",
-    "emailconfirmsent": "<p>Um sicherzugehen, dass sich niemand unberechtigt über die von Ihnen angegebene E-Mail anmeldet, wird eine automatische Benachrichtigung an diese Adresse <b>{{$a}}</b> gesendet. Je nach Netzlast trifft sie sofort oder auch etwas später bei Ihnen ein.</p>\n<p>Die Benachrichtigung enthält eine Anleitung, wie Sie Ihre Registrierung bestätigen.\nDanach sind Sie auf dieser Moodle-Seite registriert und können sofort loslegen.</p>\n<p>Bei Problemen wenden Sie sich bitte an die Administrator/innen der Website.</p>",
+    "emailconfirmsent": "<p>In Kürze wird eine E-Mail an <b>{{$a}}</b> gesendet.</p><p>Sie finden eine einfache Anleitung, wie Sie die Registrierung abschließen. Bei Schwierigkeiten wenden Sie sich an den Administrator der Website.</p>",
     "emailnotmatch": "Die E-Mail-Adressen stimmen nicht überein.",
     "enterthewordsabove": "Geben Sie die gezeigten Wörter ein",
     "erroraccesscontrolalloworigin": "Der Cross-Origin Aufruf wurde zurückgewiesen. Weitere Informationen: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index 44ccc1d8784..7768de9816d 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -11,7 +11,7 @@
     "createaccount": "Δημιουργία του λογαριασμού μου",
     "createuserandpass": "Δημιουργία ενός νέου ονόματος χρήστη και κωδικού πρόσβασης για είσοδο στον δικτυακό τόπο",
     "credentialsdescription": "Δώστε το όνομα χρήστη και τον κωδικό πρόσβασής σας για να συνδεθείτε.",
-    "emailconfirmsent": "<p>Ένα μήνυμα ηλεκτρονικού ταχυδρομείου θα πρέπει να έχει σταλεί στη διεύθυνσή σας, <b>{{$a}}</b> </p>\n   <p>Περιέχει απλές οδηγίες για την ολοκλήρωση της εγγραφής σας. </p>\n   <p>Αν συνεχίζετε να αντιμετωπίζετε δυσκολίες, επικοινωνήστε με το διαχειριστή του δικτυακού τόπου. </p>",
+    "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
     "enterthewordsabove": "Enter the words above",
     "errordeletesite": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαγραφής του site. Δοκιμάστε ξανά αργότερα.",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index 0d0c4738c6c..bb37772a367 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Revisar que su sitio usa Moodle 2.4 o más reciente.",
     "confirmdeletesite": "¿Está Usted seguro de querer eliminar el sitio {{sitename}}?",
-    "connect": "Conectar",
+    "connect": "¡Conectar!",
     "connecttomoodle": "Conectar a Moodle",
     "contactyouradministrator": "Contacte a su administrador del sitio para más ayuda.",
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear mi cuenta nueva",
     "createuserandpass": "Elegir su nombre_de_usuario y contraseña",
     "credentialsdescription": "Por favor proporcione su nombre_de_usuario y contraseña para ingresar.",
-    "emailconfirmsent": "<p>Hemos enviado un correo electrónico a <b>{{$a}}</b></p>\n<p>En él encontrará instrucciones sencillas para concluir el proceso.</p>\n<p>Si tuviera alguna dificultad, contacte con el Administrador del Sistema.</p>",
+    "emailconfirmsent": "<p>Debería de haberse enviado un Email a su dirección en <b>{{$a}}</b></p><p>El Email contiene instrucciones sencillas para completar su registro.</p><p>Si continúa teniendo dificultades, contacte al administrador del sitio.</p>",
     "emailnotmatch": "No coinciden los Emails",
     "enterthewordsabove": "Escriba las palabras de arriba",
     "erroraccesscontrolalloworigin": "La llamada de Orígen Cruzado (''Cross-Origin'') que Usted está tratando de realizar ha sido rechazada. Por favor revise  https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index 375dc7590c2..d177bab9b72 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -4,14 +4,14 @@
     "cancel": "Annuler",
     "checksiteversion": "Veuillez vérifier que votre site utilise Moodle 2.4 ou une version ultérieure.",
     "confirmdeletesite": "Voulez-vous vraiment supprimer la plateforme {{sitename}} ?",
-    "connect": "Connecter",
+    "connect": "Connecter !",
     "connecttomoodle": "Connexion à Moodle",
     "contactyouradministrator": "Veuillez contacter l'administrateur de la plateforme pour plus d'aide.",
     "contactyouradministratorissue": "Veuillez demander à l'administrateur de la plateforme de vérifier l'élément suivant : {{$a}}",
     "createaccount": "Créer mon compte",
     "createuserandpass": "Créer un compte",
     "credentialsdescription": "Veuillez fournir votre nom d'utilisateur et votre mot de passe pour vous connecter.",
-    "emailconfirmsent": "<p>Un message vous a été envoyé à l'adresse de courriel <strong>{{$a}}</strong>.</p><p>Il contient les instructions pour terminer votre enregistrement.</p><p>Si vous rencontrez des difficultés, veuillez contacter l'administrateur du site.</p>",
+    "emailconfirmsent": "<p>Un message vous a été envoyé par courriel à l'adresse <b>{{$a}}</b></p><p>Il contient des instructions vous permettant de terminer votre enregistrement.</p><p>En cas de difficulté, viellez contacter l'administrateur de la plateforme.</p>",
     "emailnotmatch": "Les adresses de courriel ne correspondent pas",
     "enterthewordsabove": "Tapez les mots ci-dessus",
     "erroraccesscontrolalloworigin": "La tentative d'appel « Cross-Origin » que vous avez effectuée a été rejetée. Veuillez consulter https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index 23251dd157e..0f291730dce 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -2,7 +2,7 @@
     "authenticating": "Autenticazione in corso",
     "cancel": "Annulla",
     "confirmdeletesite": "Sei sicuro di eliminare il sito {{sitename}}?",
-    "connect": "Connetti",
+    "connect": "Collegati!",
     "connecttomoodle": "Collegati a Moodle",
     "createaccount": "Crea il mio nuovo account",
     "createuserandpass": "Scegli username e password",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index bc5e768a4fd..bbc9031fd53 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -4,14 +4,14 @@
     "cancel": "Annuleer",
     "checksiteversion": "Controleer of je site minstens Moodle 2.4 of nieuwe gebruikt.",
     "confirmdeletesite": "Weet je zeker dat je de site {{sitename}} wil verwijderen?",
-    "connect": "Verbind",
+    "connect": "Verbinden!",
     "connecttomoodle": "Verbinden met Moodle",
     "contactyouradministrator": "Neem contact op met je site-beheerder voor meer hulp.",
     "contactyouradministratorissue": "Vraag aan je site-beheerder om volgend probleem te onderzoeken: {{$a}}",
     "createaccount": "Maak mijn nieuwe account aan",
     "createuserandpass": "Kies een gebruikersnaam en wachtwoord",
     "credentialsdescription": "Geef je gebruikersnaam en wachtwoord op om je aan te melden",
-    "emailconfirmsent": "<p>Als het goed is, is er een e-mail verzonden naar <b>{{$a}}</b></p>\n<p>Daarin staan eenvoudige instructies voor het voltooien van de registratie.</p>\n<p>Indien je moeilijkheden blijft ondervinden, neem dan contact op met je sitebeheerder.</p>",
+    "emailconfirmsent": "<p>Er zou een e-mail gestuurd moeten zijn naar jouw adres <b>{{$a}}</b></p><p>Het bericht bevat eenvoudige instructies om je registratie te voltooien.</p><p>Als je problemen blijft ondervinden, neem dan contact op met de sitebeheerder.</p>",
     "emailnotmatch": "E-mailadressen komen niet overeen",
     "enterthewordsabove": "Vul hier bovenstaande woorden in",
     "erroraccesscontrolalloworigin": "De Cross-Origin call die je probeerde uit te voeren,  werd geweigerd. Controleer https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index b63d1fe4266..c0fbcba22ee 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Verifique se seu site usa Moodle 2.4 ou superior.",
     "confirmdeletesite": "Você tem certeza que quer excluir o site {{sitename}}?",
-    "connect": "Conectar",
+    "connect": "Conectar!",
     "connecttomoodle": "Conectar ao moodle",
     "contactyouradministrator": "Contate o administrador do site para ter mais ajuda.",
     "contactyouradministratorissue": "Por favor, pergunte ao administrador para verificar o seguinte problema: {{$a}}",
     "createaccount": "Cadastrar este novo usuário",
     "createuserandpass": "Escolha seu usuário e senha",
     "credentialsdescription": "Por favor, informe seu nome de usuário e senha para efetuar o login",
-    "emailconfirmsent": "<p>Uma mensagem foi enviada para o seu endereço <b>{{$a}}</b></p><p>Esta mensagem contém instruções para completar a sua inscrição.</p><p>Se você encontrar dificuldades contate o administrador.</p>",
+    "emailconfirmsent": "<p>Um e-mail irá ser enviado para o seu endereço em <b>{{$a}}</b></p><p> Ele irá conter instruções fáceis para completar seu registro.</p><p>Se você continua a ter dificuldades, contate o administrador do site.</p>",
     "emailnotmatch": "Os e-mail não coincidem",
     "enterthewordsabove": "Digite as palavras acima",
     "erroraccesscontrolalloworigin": "A chamada de Cross-Origin que você está tentando executar foi rejeitada. Por favor, verifique https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index 5cfebad7e60..8ad130b0c6d 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -2,7 +2,7 @@
     "authenticating": "Аутентификация",
     "cancel": "Отменить",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
-    "connect": "Подключить",
+    "connect": "Подключено!",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index 106de07ced2..e24c8948325 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -2,7 +2,7 @@
     "authenticating": "Autentisera",
     "cancel": "Avbryt",
     "confirmdeletesite": "Är du säker på att du vill ta bort webbsidan {{sitename}}?",
-    "connect": "Anslut",
+    "connect": "Anslut!",
     "connecttomoodle": "Anslut till Moodle",
     "createaccount": "Skapa mitt nya konto",
     "createuserandpass": "Skapa ett nytt användarnamn och lösenord för att logga in med.",
diff --git a/www/core/components/question/lang/ca.json b/www/core/components/question/lang/ca.json
index aece96d8870..52bd86fd1d3 100644
--- a/www/core/components/question/lang/ca.json
+++ b/www/core/components/question/lang/ca.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Cal puntuar",
-    "unknown": "Desconegut"
+    "unknown": "No es pot determinar l'estat"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/cs.json b/www/core/components/question/lang/cs.json
index ed2f90af4f1..acb5034afe8 100644
--- a/www/core/components/question/lang/cs.json
+++ b/www/core/components/question/lang/cs.json
@@ -17,5 +17,5 @@
     "questionmessage": "Úloha {{$a}}: {{$b}}",
     "questionno": "Úloha {{$a}}",
     "requiresgrading": "Vyžaduje hodnocení",
-    "unknown": "Neznámý"
+    "unknown": "Stav nelze určit"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/de.json b/www/core/components/question/lang/de.json
index a248f6250e5..75ee149e500 100644
--- a/www/core/components/question/lang/de.json
+++ b/www/core/components/question/lang/de.json
@@ -17,5 +17,5 @@
     "questionmessage": "Frage {{$a}}: {{$b}}",
     "questionno": "Frage {{$a}}",
     "requiresgrading": "Bewertung notwendig",
-    "unknown": "Unbekannt"
+    "unknown": "Der Status kann nicht bestimmt werden."
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/es-mx.json b/www/core/components/question/lang/es-mx.json
index f304a7602ec..adeff045b27 100644
--- a/www/core/components/question/lang/es-mx.json
+++ b/www/core/components/question/lang/es-mx.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere re-calificar",
-    "unknown": "Desconocido"
+    "unknown": "No se puede determinar el estatus"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/fr.json b/www/core/components/question/lang/fr.json
index 82dddeba70a..1284a6a8d2a 100644
--- a/www/core/components/question/lang/fr.json
+++ b/www/core/components/question/lang/fr.json
@@ -17,5 +17,5 @@
     "questionmessage": "Question {{$a}} : {{$b}}",
     "questionno": "Question {{$a}}",
     "requiresgrading": "Nécessite évaluation",
-    "unknown": "Inconnu"
+    "unknown": "Impossible de déterminer l'état"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/it.json b/www/core/components/question/lang/it.json
index 23bcbb55847..20bb79efc49 100644
--- a/www/core/components/question/lang/it.json
+++ b/www/core/components/question/lang/it.json
@@ -13,5 +13,5 @@
     "questionmessage": "Domanda {{$a}}: {{$b}}",
     "questionno": "Domanda {{$a}}",
     "requiresgrading": "Richiede valutazione",
-    "unknown": "Sconosciuto"
+    "unknown": "Non è possibile determinare lo stato"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/nl.json b/www/core/components/question/lang/nl.json
index 48faa456e67..871c95b1c10 100644
--- a/www/core/components/question/lang/nl.json
+++ b/www/core/components/question/lang/nl.json
@@ -17,5 +17,5 @@
     "questionmessage": "Vraag  {{$a}}: {{$b}}",
     "questionno": "Vraag {{$a}}",
     "requiresgrading": "Beoordelen vereist",
-    "unknown": "Onbekend"
+    "unknown": "Kan status niet bepalen"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/pt-br.json b/www/core/components/question/lang/pt-br.json
index f5b6766c1a6..99a33590a15 100644
--- a/www/core/components/question/lang/pt-br.json
+++ b/www/core/components/question/lang/pt-br.json
@@ -17,5 +17,5 @@
     "questionmessage": "Questão {{$a}}: {{$b}}",
     "questionno": "Questão {{$a}}",
     "requiresgrading": "Requer avaliação",
-    "unknown": "Desconhecido"
+    "unknown": "Não pôde determinar o estado"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/ru.json b/www/core/components/settings/lang/ru.json
index 817c0204921..1d4cd0d9c7a 100644
--- a/www/core/components/settings/lang/ru.json
+++ b/www/core/components/settings/lang/ru.json
@@ -1,6 +1,7 @@
 {
     "about": "О приложении",
     "cacheexpirationtime": "Срок действия кэша (миллисекунд)",
+    "configuringnotifications": "Вы настраиваете уведомления «{{$a}}».",
     "credits": "Разработчики",
     "currentlanguage": "Выбранный язык",
     "deletesitefiles": "Вы уверены, что хотите удалить файлы, скачанные с сайта «{{sitename}}»?",
@@ -8,6 +9,10 @@
     "disableall": "Временно отключить уведомления",
     "disabled": "Отключено",
     "enabledebugging": "Включить отладку",
+    "enabledownloadsection": "Показать материалы, доступные для скачивания",
+    "enablerichtexteditor": "Включить текстовый редактор",
+    "enablerichtexteditordescription": "При включении функции текстовый редактор будет отображаться в допустимых местах.",
+    "enablesyncwifi": "Разрешить синхронизацию только по Wi-Fi",
     "errordeletesitefiles": "Ошибка при удалении файлов сайта",
     "errorsyncsite": "Ошибка синхронизации данных сайта. Проверьте интернет-соединение и повторите попытку.",
     "estimatedfreespace": "Ориентировочное свободное место",
@@ -16,11 +21,13 @@
     "license": "Лицензия:",
     "loggedin": "На сайте",
     "loggedoff": "Вне сайта",
+    "reportinbackground": "Автоматически оповещать об ошибках",
     "settings": "Настройки",
     "sites": "Сайты",
     "spaceusage": "Используемое пространство",
     "synchronization": "Синхронизация",
     "synchronizing": "Синхронизация",
+    "syncsettings": "Настройки синхронизации",
     "syncsitesuccess": "Данные синхронизации сайта и все кэши недействительны.",
     "total": "Итого"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/ca.json b/www/core/components/sharedfiles/lang/ca.json
index af0c921ccaf..56cb9344708 100644
--- a/www/core/components/sharedfiles/lang/ca.json
+++ b/www/core/components/sharedfiles/lang/ca.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "No hi ha llocs desats. Afegiu un lloc per poder compartir fitxers amb l'aplicació.",
     "nosharedfiles": "No hi ha fitxers compartits desats en aquest lloc.",
     "nosharedfilestoupload": "No hi ha fitxers per pujar. Si voleu pujar un fitxer des d'un altra aplicació, busqueu-lo i feu clic al botó «Obre a».",
-    "rename": "Canvia el nom",
+    "rename": "Reanomena",
     "replace": "Reemplaça",
     "sharedfiles": "Fitxers compartits",
     "successstorefile": "S'ha desat el fitxer amb èxit. Podeu seleccionar-lo i pujar-lo als vostres fitxers privats o adjuntar-lo a alguna activitat."
diff --git a/www/core/components/sharedfiles/lang/cs.json b/www/core/components/sharedfiles/lang/cs.json
index 9a19d1f00b1..2cd35a9d0d4 100644
--- a/www/core/components/sharedfiles/lang/cs.json
+++ b/www/core/components/sharedfiles/lang/cs.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Na tomto webu nejsou uložené žádné sdílené soubory.",
     "nosharedfilestoupload": "Nemáte žádné nahrané soubory. Pokud chcete nahrát soubor z jiné aplikace, vyhledejte tento soubor a klikněte na tlačítko \"Otevřít v\".",
     "rename": "Přejmenovat",
-    "replace": "Přepsat",
+    "replace": "Nahradit",
     "sharedfiles": "Sdílené soubory",
     "successstorefile": "Soubor byl úspěšně uložen. Nyní můžete vybrat tento soubor a nahrát do vašich soukromých souborů nebo připojit ji do některých činností."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/de.json b/www/core/components/sharedfiles/lang/de.json
index 835afa40cf1..f682d1fb09c 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Keine freigegebenen Dateien für diese Website",
     "nosharedfilestoupload": "Sie haben noch keine Dateien zum Hochladen freigegeben. Wenn Sie eine Datei aus einer anderen App hochladen möchten, suchen Sie diese Datei und tippen Sie auf die Taste 'Öffnen in'.",
     "rename": "Umbenennen",
-    "replace": "Ersetze",
+    "replace": "Ersetzen",
     "sharedfiles": "Freigegebene Dateien",
     "successstorefile": "Die Datei wurde gespeichert. Sie können die Datei verwenden, um Sie in 'Meine Dateien' hochzuladen oder bei Aktivitäten anzuhängen."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/es-mx.json b/www/core/components/sharedfiles/lang/es-mx.json
index 6cd58565e88..d2732c41c62 100644
--- a/www/core/components/sharedfiles/lang/es-mx.json
+++ b/www/core/components/sharedfiles/lang/es-mx.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "No hay archivos compartidos en este sitio.",
     "nosharedfilestoupload": "Usted no tiene archivos para subir aquí. Si Usted desea subir un archivo desde otra App, localice ese archivo y haga click en el botón para 'Abrir en'.",
     "rename": "Renombrar",
-    "replace": "Reemplazar",
+    "replace": "Remplazar",
     "sharedfiles": "Archivos compartidos",
     "successstorefile": "Archivo almacenado exitosamente. Ahora Usted puede seleccionar a este archivo para subirlo a sus archivos privados, o anexarlo a algunas actividades."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/tr.json b/www/core/components/sharedfiles/lang/tr.json
index 76c25af6f7c..94ea98f2214 100644
--- a/www/core/components/sharedfiles/lang/tr.json
+++ b/www/core/components/sharedfiles/lang/tr.json
@@ -1,5 +1,5 @@
 {
-    "rename": "Ad değiştir",
+    "rename": "Yeniden adlandır",
     "replace": "Değiştir",
     "sharedfiles": "Paylaşılan dosyalar"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ca.json b/www/core/components/sidemenu/lang/ca.json
index 1f492266956..321730fec1f 100644
--- a/www/core/components/sidemenu/lang/ca.json
+++ b/www/core/components/sidemenu/lang/ca.json
@@ -2,7 +2,7 @@
     "appsettings": "Paràmetres de l'aplicació",
     "changesite": "Canvia de lloc",
     "help": "Ajuda",
-    "logout": "Tanca la sessió",
+    "logout": "Desconnecta",
     "mycourses": "Els meus cursos",
     "togglemenu": "Canvia menú",
     "website": "Lloc web"
diff --git a/www/core/components/sidemenu/lang/cs.json b/www/core/components/sidemenu/lang/cs.json
index 68c7fe8de79..7de80a2bb9b 100644
--- a/www/core/components/sidemenu/lang/cs.json
+++ b/www/core/components/sidemenu/lang/cs.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "Nastavení aplikace",
     "changesite": "Změnit stránky",
-    "help": "Pomoc",
-    "logout": "Odhlásit se",
+    "help": "Nápověda",
+    "logout": "Odhlásit",
     "mycourses": "Moje kurzy",
     "togglemenu": "Přepnout nabídku",
     "website": "Webová stránka"
diff --git a/www/core/components/sidemenu/lang/es-mx.json b/www/core/components/sidemenu/lang/es-mx.json
index fb36a0997ba..e2079172694 100644
--- a/www/core/components/sidemenu/lang/es-mx.json
+++ b/www/core/components/sidemenu/lang/es-mx.json
@@ -2,7 +2,7 @@
     "appsettings": "Configuraciones del App",
     "changesite": "Cambiar sitio",
     "help": "Ayuda",
-    "logout": "Salir",
+    "logout": "Salir del sitio",
     "mycourses": "Mis cursos",
     "togglemenu": "Alternar menú",
     "website": "Página web"
diff --git a/www/core/components/sidemenu/lang/fa.json b/www/core/components/sidemenu/lang/fa.json
index 34bdcc7018f..7d4184a0d64 100644
--- a/www/core/components/sidemenu/lang/fa.json
+++ b/www/core/components/sidemenu/lang/fa.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "تنظیمات برنامه",
     "changesite": "خروج",
-    "help": "راهنمایی",
-    "logout": "خروج از سایت",
+    "help": "راهنما",
+    "logout": "خروج",
     "mycourses": "درس‌های من",
     "website": "پایگاه اینترنتی"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/nl.json b/www/core/components/sidemenu/lang/nl.json
index 7caa7f9041a..d06e70ec6d8 100644
--- a/www/core/components/sidemenu/lang/nl.json
+++ b/www/core/components/sidemenu/lang/nl.json
@@ -2,7 +2,7 @@
     "appsettings": "App instellingen",
     "changesite": "Naar andere site",
     "help": "Help",
-    "logout": "Uitloggen",
+    "logout": "Afmelden",
     "mycourses": "Mijn cursussen",
     "togglemenu": "Menu schakelen",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/zh-cn.json b/www/core/components/sidemenu/lang/zh-cn.json
index ce1e1892a81..ea6cd6e91e1 100644
--- a/www/core/components/sidemenu/lang/zh-cn.json
+++ b/www/core/components/sidemenu/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "changesite": "注销",
     "help": "帮助",
-    "logout": "登出",
+    "logout": "注销",
     "mycourses": "我的课程",
     "website": "网站"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/ca.json b/www/core/components/user/lang/ca.json
index a556ba985d1..730cb065191 100644
--- a/www/core/components/user/lang/ca.json
+++ b/www/core/components/user/lang/ca.json
@@ -4,7 +4,7 @@
     "contact": "Contacte",
     "country": "País",
     "description": "Descripció",
-    "details": "Detalls de seguiment",
+    "details": "Detalls",
     "detailsnotavailable": "No tens accés als detalls d'aquest usuari.",
     "editingteacher": "Professor",
     "email": "Correu electrònic",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Nova imatge",
     "phone1": "Telèfon",
-    "phone2": "Telèfon mòbil",
+    "phone2": "Mòbil",
     "roles": "Rols",
     "sendemail": "Correu-e",
     "student": "Estudiant",
diff --git a/www/core/components/user/lang/cs.json b/www/core/components/user/lang/cs.json
index 5533c565060..d6a2f04ff29 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Země",
     "description": "Popis",
-    "details": "Podrobnosti o průchodu",
+    "details": "Detaily",
     "detailsnotavailable": "Podrobnosti o tomto uživateli nejsou k dispozici.",
     "editingteacher": "Učitel",
     "email": "Poslat e-mailem",
     "emailagain": "E-mail (znovu)",
     "firstname": "Křestní jméno",
     "interests": "Zájmy",
-    "invaliduser": "Neplatný uživatel",
+    "invaliduser": "Neplatný uživatel.",
     "lastname": "Příjmení",
     "manager": "Manažer",
     "newpicture": "Nový obrázek",
     "phone1": "Telefon",
-    "phone2": "Mobilní telefon",
+    "phone2": "Mobil",
     "roles": "Role",
     "sendemail": "Email",
     "student": "Student",
diff --git a/www/core/components/user/lang/de.json b/www/core/components/user/lang/de.json
index 9d95a7c6312..c5acfba8273 100644
--- a/www/core/components/user/lang/de.json
+++ b/www/core/components/user/lang/de.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beschreibung",
-    "details": "Trackingdetails",
+    "details": "Details",
     "detailsnotavailable": "Die Nutzerdetails zu dieser Person sind für Sie nicht verfügbar.",
     "editingteacher": "Trainer/in",
     "email": "E-Mail",
     "emailagain": "E-Mail (wiederholen)",
     "firstname": "Vorname",
     "interests": "Persönliche Interessen",
-    "invaliduser": "Ungültige Nutzer/in",
+    "invaliduser": "Nutzer/in ungültig",
     "lastname": "Nachname",
     "manager": "Manager/in",
     "newpicture": "Neues Foto",
     "phone1": "Telefon",
-    "phone2": "Mobiltelefon",
+    "phone2": "Mobil",
     "roles": "Rollen",
     "sendemail": "E-Mail",
     "student": "Teilnehmer/in",
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index dabd4a46d5b..c5bb23b5a13 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -4,19 +4,19 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descripción",
-    "details": "Detalles del seguimiento",
+    "details": "Detalles",
     "detailsnotavailable": "Los detalles de este usuario no están disponibles para Usted.",
     "editingteacher": "Profesor",
     "email": "Email",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
-    "invaliduser": "Usuario no válido",
+    "invaliduser": "Usuario inválido.",
     "lastname": "Apellido(s)",
     "manager": "Mánager",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Teléfono móvil",
+    "phone2": "Móvil",
     "roles": "Roles",
     "sendemail": "Email",
     "student": "Estudiante",
diff --git a/www/core/components/user/lang/fa.json b/www/core/components/user/lang/fa.json
index 9980ecf4e7f..8f04d8269cb 100644
--- a/www/core/components/user/lang/fa.json
+++ b/www/core/components/user/lang/fa.json
@@ -1,10 +1,10 @@
 {
     "address": "آدرس",
     "city": "شهر/شهرک",
-    "contact": "تماس",
+    "contact": "مخاطب",
     "country": "کشور",
     "description": "توصیف",
-    "details": "دنبال کردن جزئیات",
+    "details": "جزئیات",
     "email": "پست الکترونیک",
     "emailagain": "پست الکترونیک (دوباره)",
     "firstname": "نام",
@@ -13,7 +13,7 @@
     "lastname": "نام خانوادگی",
     "newpicture": "عکس جدید",
     "phone1": "تلفن",
-    "phone2": "تلفن همراه",
+    "phone2": "همراه",
     "roles": "نقش‌ها",
     "student": "شاگرد",
     "viewprofile": "مشاهدهٔ صفحهٔ مشخصات فردی",
diff --git a/www/core/components/user/lang/fr.json b/www/core/components/user/lang/fr.json
index 06e5d47b78d..55ae03508ff 100644
--- a/www/core/components/user/lang/fr.json
+++ b/www/core/components/user/lang/fr.json
@@ -4,22 +4,22 @@
     "contact": "Contact",
     "country": "Pays",
     "description": "Description",
-    "details": "Détails du parcours",
+    "details": "Détails",
     "detailsnotavailable": "Vous n'avez pas accès aux informations de cet utilisateur.",
     "editingteacher": "Enseignant",
     "email": "Courriel",
     "emailagain": "Courriel (confirmation)",
     "firstname": "Prénom",
     "interests": "Centres d'intérêt",
-    "invaliduser": "Utilisateur non valide",
+    "invaliduser": "Utilisateur non valide.",
     "lastname": "Nom",
     "manager": "Gestionnaire",
     "newpicture": "Nouvelle image",
     "phone1": "Téléphone",
-    "phone2": "Téléphone mobile",
+    "phone2": "Mobile",
     "roles": "Rôles",
     "sendemail": "Courriel",
-    "student": "Participants",
+    "student": "Étudiant",
     "teacher": "Enseignant non-éditeur",
     "viewprofile": "Consulter le profil",
     "webpage": "Page Web"
diff --git a/www/core/components/user/lang/it.json b/www/core/components/user/lang/it.json
index 9aa43cad4d0..8d2c83785c7 100644
--- a/www/core/components/user/lang/it.json
+++ b/www/core/components/user/lang/it.json
@@ -4,19 +4,19 @@
     "contact": "Contatto",
     "country": "Nazione",
     "description": "Descrizione",
-    "details": "Dettagli tracciamento",
+    "details": "Dettagli",
     "detailsnotavailable": "Non puoi visualizzare i dettagli di questo utente.",
     "editingteacher": "Docente",
     "email": "Email",
     "emailagain": "Indirizzo email (ripeti)",
     "firstname": "Nome",
     "interests": "Interessi",
-    "invaliduser": "Utente non valido",
+    "invaliduser": "Utente non valido.",
     "lastname": "Cognome",
     "manager": "Manager",
     "newpicture": "Nuova immagine",
     "phone1": "Telefono",
-    "phone2": "Cellulare",
+    "phone2": "Mobile",
     "roles": "Ruoli",
     "student": "Studente",
     "teacher": "Docente non editor",
diff --git a/www/core/components/user/lang/nl.json b/www/core/components/user/lang/nl.json
index 040c2592de8..0ca1abf5ab6 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -4,14 +4,14 @@
     "contact": "Contact",
     "country": "Land",
     "description": "Beschrijving",
-    "details": "SCO opvolgdetails",
+    "details": "Details",
     "detailsnotavailable": "Je kunt de details voor deze gebruiker niet bekijken.",
     "editingteacher": "Leraar",
     "email": "E-mail",
     "emailagain": "E-mail (nogmaals)",
     "firstname": "Voornaam",
     "interests": "Interesses",
-    "invaliduser": "Ongeldige gebruiker",
+    "invaliduser": "Ongeldige gebuiker",
     "lastname": "Achternaam",
     "manager": "Manager",
     "newpicture": "Nieuwe foto",
diff --git a/www/core/components/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index e212093a063..424401d439f 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -4,19 +4,19 @@
     "contact": "Contato",
     "country": "País",
     "description": "Descrição",
-    "details": "Detalhes do registro",
+    "details": "Detalhes",
     "detailsnotavailable": "Os detalhes desse usuário não estão disponíveis para você.",
     "editingteacher": "Professor",
     "email": "Email",
     "emailagain": "Confirmar endereço de e-mail",
     "firstname": "Nome",
     "interests": "Interesses",
-    "invaliduser": "Usuário inválido",
+    "invaliduser": "Usuário inválido.",
     "lastname": "Sobrenome",
     "manager": "Gerente",
     "newpicture": "Nova imagem",
     "phone1": "Fone",
-    "phone2": "Telefone celular",
+    "phone2": "Celular",
     "roles": "Papéis",
     "sendemail": "Email",
     "student": "Estudante",
diff --git a/www/core/components/user/lang/ru.json b/www/core/components/user/lang/ru.json
index eec8fc8030f..0ded3856726 100644
--- a/www/core/components/user/lang/ru.json
+++ b/www/core/components/user/lang/ru.json
@@ -4,19 +4,19 @@
     "contact": "Контакты",
     "country": "Страна",
     "description": "Описание",
-    "details": "Подробный отчет",
+    "details": "Подробнее",
     "detailsnotavailable": "Вам не доступны подробности этого пользователя",
     "editingteacher": "Учитель",
     "email": "Email",
     "emailagain": "Адрес электронной почты (еще раз)",
     "firstname": "Имя",
     "interests": "Интересы",
-    "invaliduser": "Некорректный пользователь",
+    "invaliduser": "Неправильный пользователь",
     "lastname": "Фамилия",
     "manager": "Управляющий",
     "newpicture": "Новое изображение",
     "phone1": "Телефон",
-    "phone2": "Мобильный телефон",
+    "phone2": "Мобильный",
     "roles": "Роли",
     "student": "Студент",
     "teacher": "Учитель без права редактирования (ассистент)",
diff --git a/www/core/components/user/lang/sv.json b/www/core/components/user/lang/sv.json
index 94ca7299b23..de1a0d62c87 100644
--- a/www/core/components/user/lang/sv.json
+++ b/www/core/components/user/lang/sv.json
@@ -4,21 +4,21 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beskrivning",
-    "details": "Detaljerad SCO spårning",
+    "details": "Detaljer",
     "detailsnotavailable": "Detaljerna till denna användare är inte tillgängliga för dig.",
     "editingteacher": "Lärare",
     "email": "E-post",
     "emailagain": "E-post (igen)",
     "firstname": "Förnamn",
     "interests": "Intressen",
-    "invaliduser": "Ogiltig användare",
+    "invaliduser": "Ogiltig användare.",
     "lastname": "Efternamn",
     "manager": "Manager",
     "newpicture": "Ny bild",
     "phone1": "Telefon",
-    "phone2": "Mobiltelefon",
+    "phone2": "Mobil",
     "roles": "Roller",
-    "student": "Student/elev/deltagare/lärande",
+    "student": "Student",
     "teacher": "Icke editerande lärare",
     "viewprofile": "Visa profil",
     "webpage": "Webbsida"
diff --git a/www/core/components/user/lang/tr.json b/www/core/components/user/lang/tr.json
index 0415b166cdc..5a2649c0939 100644
--- a/www/core/components/user/lang/tr.json
+++ b/www/core/components/user/lang/tr.json
@@ -1,21 +1,21 @@
 {
     "address": "Adres",
     "city": "Şehir",
-    "contact": "İletişim",
+    "contact": "Kişi",
     "country": "Ülke",
     "description": "Açıklama",
-    "details": "İzleme ayrıntıları",
+    "details": "Detaylar",
     "editingteacher": "Öğretmen",
     "email": "E-posta",
     "emailagain": "E-posta (tekrar)",
     "firstname": "Adı",
     "interests": "İlgi alanları",
-    "invaliduser": "Geçersiz kullanıcı",
+    "invaliduser": "Geçersiz kullanıcı.",
     "lastname": "Soyadı",
     "manager": "Yönetici",
     "newpicture": "Yeni resim",
     "phone1": "Telefon",
-    "phone2": "Cep telefonu",
+    "phone2": "Mobil",
     "roles": "Roller",
     "student": "Öğrenci",
     "teacher": "Düzenleme yetkisi olmayan öğretmen",
diff --git a/www/core/components/user/lang/zh-cn.json b/www/core/components/user/lang/zh-cn.json
index f1e99807e98..e87f7ac73ef 100644
--- a/www/core/components/user/lang/zh-cn.json
+++ b/www/core/components/user/lang/zh-cn.json
@@ -1,10 +1,10 @@
 {
     "address": "地址",
     "city": "市/县",
-    "contact": "联系",
+    "contact": "联系方式",
     "country": "国家和地区",
     "description": "描述",
-    "details": "查看详情",
+    "details": "详情",
     "email": "Email",
     "emailagain": "Email (重复)",
     "firstname": "名",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 2e5d0b28070..ba029792d77 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -40,10 +40,11 @@
     "days": "Dies",
     "decsep": ",",
     "delete": "Suprimeix",
-    "deleting": "S'està suprimint",
+    "deleting": "S'està eliminant",
     "description": "Descripció",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY k[:]mm",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
@@ -53,6 +54,7 @@
     "download": "Feu clic per baixar el fitxer de categoria exportat",
     "downloading": "S'està descarregant",
     "edit": "Edita",
+    "emptysplit": "Aquesta pàgina estarà buida si el panell esquerre està buit o s'està carregant.",
     "error": "Ha succeït un error desconegut!",
     "errorchangecompletion": "S'ha produït un error en carregar l'estat de la compleció. Si us plau torneu a intentar-ho.",
     "errordeletefile": "S'ha produït un error en eliminar el fitxer. Torneu-ho a provar més tard.",
@@ -91,6 +93,7 @@
     "lastsync": "Darrera sincronització.",
     "listsep": ";",
     "loading": "S'està carregant...",
+    "loadmore": "Carrega'n més",
     "lostconnection": "S'ha perdut la connexió. Necessita tornar a connectar. El testimoni ja no és vàlid.",
     "maxsizeandattachments": "Mida màxima per als nous fitxers, {{$a.size}}, adjunts màxims: {{$a.attachments}}",
     "min": "La més baixa",
@@ -131,7 +134,7 @@
     "nocomments": "No hi ha comentaris",
     "nograde": "No hi ha qualificació.",
     "none": "Cap",
-    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya, però no està disponible cap pàgina on pugueu canviar-la. Contacteu amb l'administració del vostre Moodle.",
+    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya.",
     "nopermissions": "Actualment no teniu permisos per a fer això ({{$a}})",
     "noresults": "Sense resultats",
     "notapplicable": "n/a",
@@ -139,7 +142,7 @@
     "notsent": "No enviat",
     "now": "ara",
     "numwords": "{{$a}} paraules",
-    "offline": "Fora de línia",
+    "offline": "No es requereix cap tramesa en línia",
     "online": "En línia",
     "openfullimage": "Feu clic per veure la imatge a tamany complert",
     "openinbrowser": "Obre-ho al navegador",
@@ -157,7 +160,7 @@
     "retry": "Reintenta",
     "save": "Desa",
     "search": "Cerca...",
-    "searching": "S'està cercant en...",
+    "searching": "S'està cercant",
     "searchresults": "Resultats de la cerca",
     "sec": "segon",
     "secs": "segons",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index 089ef0f2c33..a5c85690c79 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -17,9 +17,9 @@
     "comments": "Komentáře",
     "commentscount": "Komentáře ({{$a}})",
     "commentsnotworking": "Komentáře nemohou být obnoveny",
-    "completion-alt-auto-fail": "Splněno: {{$a}} (nebylo dosaženo požadované známky)",
+    "completion-alt-auto-fail": "Splněno: {{$a}} ; ale nedosáhli se potřebné známky",
     "completion-alt-auto-n": "Nesplněno: {{$a}}",
-    "completion-alt-auto-pass": "Splněno: {{$a}} (bylo dosaženo požadované známky)",
+    "completion-alt-auto-pass": "Splněno: {{$a}}; dosáhli se potřebné známky",
     "completion-alt-auto-y": "Splněno: {{$a}}",
     "completion-alt-manual-n": "Nesplněno: {{$a}}. Výběrem označíte jako splněné.",
     "completion-alt-manual-y": "Splněno: {{$a}}. Výběrem označíte jako nesplněné.",
@@ -45,6 +45,7 @@
     "description": "Popis",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
@@ -54,6 +55,7 @@
     "download": "Klikněte pro stažení exportovaného souboru",
     "downloading": "Stahování",
     "edit": "Upravit",
+    "emptysplit": "Pokud je levý panel prázdný nebo se nahrává, zobrazí se tato stránka prázdná.",
     "error": "Došlo k neznámé chybě!",
     "errorchangecompletion": "Při změně stavu dokončení došlo k chybě. Prosím zkuste to znovu.",
     "errordeletefile": "Chyba při odstraňování souboru. Prosím zkuste to znovu.",
@@ -85,13 +87,14 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Obrázek",
     "imageviewer": "Prohlížeč obrázků",
-    "info": "Info",
+    "info": "Informace",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Naposledy změněno",
     "lastsync": "Poslední synchronizace",
     "listsep": ";",
     "loading": "Nahrávám...",
+    "loadmore": "Načíst další",
     "lostconnection": "Ztratili jsme spojení,  potřebujete se znovu připojit. Váš token je nyní neplatný",
     "maxsizeandattachments": "Maximální velikost nových souborů: {{$a.size}}, maximální přílohy: {{$a.attachments}}",
     "min": "Nejhorší",
@@ -132,7 +135,7 @@
     "nocomments": "Nejsou žádné komentáře",
     "nograde": "Žádné hodnocení.",
     "none": "Žádné",
-    "nopasswordchangeforced": "Nemůžete pokračovat dál bez změny hesla, ale stránka pro jeho změnu není k dispozici. Kontaktujte správce Vašeho eLearningu Moodle.",
+    "nopasswordchangeforced": "Nelze pokračovat beze změny hesla.",
     "nopermissions": "Je mi líto, ale momentálně nemáte oprávnění vykonat tuto operaci ({{$a}})",
     "noresults": "Žádné výsledky",
     "notapplicable": "n/a",
@@ -158,13 +161,13 @@
     "retry": "Opakovat",
     "save": "Uložit",
     "search": "Vyhledávání...",
-    "searching": "Vyhledávám v ...",
+    "searching": "Hledání",
     "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
     "send": "Odeslat",
-    "sending": "Odesílání",
+    "sending": "Odeslání",
     "serverconnection": "Chyba spojení se serverem",
     "show": "Ukázat",
     "showmore": "Zobrazit více...",
@@ -178,7 +181,7 @@
     "sorry": "Promiňte...",
     "start": "Začátek",
     "submit": "Odeslat",
-    "success": "Úspěch",
+    "success": "Úspěch!",
     "tablet": "Tablet",
     "teachers": "Učitelé",
     "thereisdatatosync": "K dispozici jsou v  offline režimu {{$a}}, které mají být synchronizovány.",
@@ -189,7 +192,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Herdekfilek!",
     "unexpectederror": "Neočekávaná chyba. Zavřete a znovu otevřete aplikaci a zkuste to znovu, prosím",
-    "unicodenotsupported": "Text Unicode jako emodži nejsou na těchto stránkách podporovány, text bude zaslán po odstranění těchto znaků.",
+    "unicodenotsupported": "Některá emojis nejsou na tomto webu podporována. Takové znaky budou při odeslání zprávy odstraněny.",
     "unicodenotsupportedcleanerror": "Při čištění Unicode znaků byl nalezen prázdný text.",
     "unknown": "Neznámý",
     "unlimited": "Neomezeno",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index f0fec564385..f0984392ce7 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -17,12 +17,12 @@
     "comments": "Kommentare",
     "commentscount": "Kommentare ({{$a}})",
     "commentsnotworking": "Kommentare können nicht mehr abgerufen werden",
-    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (ohne Erfolg)",
+    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (Anforderung nicht erreicht)",
     "completion-alt-auto-n": "Nicht abgeschlossen: {{$a}}",
-    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (mit Erfolg)",
+    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (Anforderung erreicht)",
     "completion-alt-auto-y": "Abgeschlossen: {{$a}}",
-    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}} - mit Auswahl als abgeschlossen markieren",
-    "completion-alt-manual-y": "Abgeschlossen: {{$a}}  - mit Auswahl als nicht abgeschlossen markieren",
+    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}}. Auswählen, um als abgeschlossen zu markieren.",
+    "completion-alt-manual-y": "Abgeschlossen: {{$a}}. Auswählen, um als nicht abgeschlossen zu markieren.",
     "confirmcanceledit": "Möchten Sie diese Seite wirklich verlassen? Alle Änderungen gehen verloren!",
     "confirmdeletefile": "Möchten Sie diese Datei wirklich löschen?",
     "confirmloss": "Möchten Sie wirklich alle Änderungen verlieren?",
@@ -41,10 +41,11 @@
     "decsep": ",",
     "defaultvalue": "Standard ({{$a}})",
     "delete": "Löschen",
-    "deleting": "Lösche",
+    "deleting": "Löschen ...",
     "description": "Beschreibung",
     "dfdaymonthyear": "DD.MM.YYYY",
     "dfdayweekmonth": "ddd, D. MMM",
+    "dffulldate": "dddd, D. MMMM YYYY, HH[:]mm",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "HH[:]mm",
@@ -54,6 +55,7 @@
     "download": "Klick zum Download der exportierten Kategorien",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
+    "emptysplit": "Diese Seite ist leer, wenn das linke Panel leer ist oder noch geladen wird.",
     "error": "Fehler aufgetreten!",
     "errorchangecompletion": "Fehler beim Ändern des Abschlussstatus. Versuchen Sie es noch einmal.",
     "errordeletefile": "Fehler beim Löschen der Datei. Versuchen Sie es noch einmal.",
@@ -92,6 +94,7 @@
     "lastsync": "Letztes Synchronisieren",
     "listsep": ";",
     "loading": "Laden...",
+    "loadmore": "Mehr laden",
     "lostconnection": "Die Authentifizierung ist abgelaufen oder ungültig. Sie müssen sich neu verbinden.",
     "maxsizeandattachments": "Maximale Größe für neue Dateien: {{$a.size}}, Maximale Zahl von Anhängen: {{$a.attachments}}",
     "min": "Niedrigste",
@@ -132,7 +135,7 @@
     "nocomments": "Keine Kommentare",
     "nograde": "Keine Bewertung.",
     "none": "--",
-    "nopasswordchangeforced": "Ohne die Änderung des Kennworts können Sie nicht weitermachen. Falls die Seite zur Änderung des Kennworts nicht verfügbar ist, wenden Sie sich an den Administrator der Website.",
+    "nopasswordchangeforced": "Sie können nicht weitermachen, ohne das Kennwort zu ändern.",
     "nopermissions": "Sie besitzen derzeit keine Rechte, dies zu tun ({{$a}}).",
     "noresults": "Keine Ergebnisse",
     "notapplicable": "n/a",
@@ -158,13 +161,13 @@
     "retry": "Neu versuchen",
     "save": "Sichern",
     "search": "Suchen...",
-    "searching": "Suche in ...",
+    "searching": "Suchen",
     "searchresults": "Suchergebnisse",
     "sec": "Sekunde",
     "secs": "Sekunden",
     "seemoredetail": "Hier klicken, um weitere Details sichtbar zu machen",
     "send": "Senden",
-    "sending": "wird gesendet",
+    "sending": "Senden",
     "serverconnection": "Fehler beim Aufbau der Verbindung zum Server",
     "show": "Zeigen",
     "showmore": "Mehr anzeigen ...",
@@ -178,7 +181,7 @@
     "sorry": "Sorry ...",
     "start": "Start",
     "submit": "Abgabe",
-    "success": "erfolgreich",
+    "success": "Fertig!",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
     "thereisdatatosync": "Die Offline-Daten {{$a}} müssen synchronisiert werden.",
@@ -189,7 +192,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Unerwarteter Fehler! Starten Sie die App neu und versuchen Sie es noch einmal.",
-    "unicodenotsupported": "Unicode-Zeichen, wie z.B. Emojis, werden auf dieser Website nicht unterstützt. Der Text wird deswegen ohne diese Zeichen gesendet.",
+    "unicodenotsupported": "Manche Emojis werden von dieser Website nicht unterstützt. Die betreffenden Zeichen werden beim Senden der Mitteilung entfernt.",
     "unicodenotsupportedcleanerror": "Der Text ist leer, nachdem die Unicode-Zeichen gelöscht wurden.",
     "unknown": "Unbekannt",
     "unlimited": "Unbegrenzt",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index 9f12ddb37a5..b16fa971c6f 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -17,12 +17,12 @@
     "comments": "Σχόλια",
     "commentscount": "Σχόλια ({{$a}})",
     "commentsnotworking": "Τα σχόλια δεν μπορούν να ανακτηθούν",
-    "completion-alt-auto-fail": "Ολοκληρωμένο (με βαθμό κάτω της βάσης)",
-    "completion-alt-auto-n": "Μη ολοκληρωμένο",
-    "completion-alt-auto-pass": "Ολοκληρωμένο (με βαθμό άνω της βάσης)",
-    "completion-alt-auto-y": "Ολοκληρωμένο",
-    "completion-alt-manual-n": "Μη ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως ολοκληρωμένο",
-    "completion-alt-manual-y": "Ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως μη ολοκληρωμένο",
+    "completion-alt-auto-fail": "Ολοκληρώθηκε: {{$a}} (δεν πετύχατε βαθμό πρόσβασης)",
+    "completion-alt-auto-n": "Δεν ολοκληρώθηκε: {{$a}}",
+    "completion-alt-auto-pass": "Ολοκληρώθηκε: {{$a}} (πετύχατε βαθμό πρόσβασης)",
+    "completion-alt-auto-y": "Ολοκληρώθηκε: {{$a}}",
+    "completion-alt-manual-n": "Δεν ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως ολοκληρωμένο.",
+    "completion-alt-manual-y": "Ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως μη ολοκληρωμένο.",
     "confirmcanceledit": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν τη σελίδα; Όλες οι αλλαγές θα χαθούν.",
     "confirmdeletefile": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmopeninbrowser": "Θέλετε να το ανοίξετε στο πρόγραμμα περιήγησης;",
@@ -38,7 +38,7 @@
     "days": "Ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
-    "deleting": "Διαγραφή",
+    "deleting": "Γίνεται διαγραφή",
     "description": "Περιγραφή",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -127,7 +127,7 @@
     "nocomments": "Δεν υπάρχουν σχόλια",
     "nograde": "Κανένα βαθμό.",
     "none": "Κανένα",
-    "nopasswordchangeforced": "You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.",
+    "nopasswordchangeforced": "Δεν μπορείτε να προχωρήσετε χωρίς να αλλάξετε τον κωδικό πρόσβασής σας.",
     "nopermissions": "Συγνώμη, αλλά επί του τρεχόντως δεν έχετε το δικαίωμα να το κάνετε αυτό ({{$a}})",
     "noresults": "Κανένα αποτέλεσμα",
     "notapplicable": "n/a",
@@ -135,7 +135,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Αποσυνδεδεμένος",
+    "offline": "Εκτός σύνδεσης",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -153,13 +153,13 @@
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
     "search": "Αναζήτηση...",
-    "searching": "Γίνεται έρευνα στο...",
+    "searching": "Αναζήτηση",
     "searchresults": "Αναζήτηση στα αποτελέσματα",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
-    "sending": "Αποστέλλεται",
+    "sending": "Αποστολή",
     "show": "Δείξε",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
@@ -172,7 +172,7 @@
     "sorry": "Λυπάμαι...",
     "start": "Αρχή",
     "submit": "Υποβολή",
-    "success": "Επιτυχία",
+    "success": "Επιτυχία!",
     "tablet": "Tablet",
     "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index b50c260f300..081f675765b 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -17,12 +17,12 @@
     "comments": "Comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
-    "completion-alt-auto-fail": "Finalizado {{$a}} (no obtuvo calificación de aprobado)",
-    "completion-alt-auto-n": "Sin finalizar: {{$a}}",
-    "completion-alt-auto-pass": "Finalizado: {{$a}} (obtuvo calificación de aprobado)",
-    "completion-alt-auto-y": "Finalizado: {{$a}}",
-    "completion-alt-manual-n": "No finalizado; {{$a}}. Seleccione para marcar como finalizado",
-    "completion-alt-manual-y": "Finalizado; {{$a}} seleccione para marcar como no finalizado",
+    "completion-alt-auto-fail": "Completado: {{$a}} (no obtuvo calificación aprobatoria)",
+    "completion-alt-auto-n": "No completado: {{$a}}",
+    "completion-alt-auto-pass": "Completado: {{$a}} (obtuvo calificación aprobatoria)",
+    "completion-alt-auto-y": "Completado: {{$a}}",
+    "completion-alt-manual-n": "No-completado: {{$a}}. Seleccionar mara marcarlo como completado.",
+    "completion-alt-manual-y": "Completado: {{$a}}. Seleccionar mara marcarlo como no completado.",
     "confirmcanceledit": "¿Está Usted seguro de que quiere abandonar esta página? Se perderán todos los cambios.",
     "confirmdeletefile": "¿Está seguro de que desea eliminar este archivo?",
     "confirmloss": "¿Está Usted seguro? Se perderán todos los cambios.",
@@ -45,6 +45,7 @@
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-AAAA",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM AAAA h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
@@ -54,6 +55,7 @@
     "download": "Haga clic para descargar el archivo de categorías exportadas",
     "downloading": "Descargando",
     "edit": "Editar",
+    "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
     "error": "Ha ocurrido un error desconocido.",
     "errorchangecompletion": "Ocurrió un error al cambiar el estatus de finalización. Por favor inténtelo nuevamente.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo nuevamente.",
@@ -92,6 +94,7 @@
     "lastsync": "Última sincronzación",
     "listsep": ";",
     "loading": "Cargando...",
+    "loadmore": "Cargar más",
     "lostconnection": "Hemos perdido la conexión, necesita reconectar. Su ficha (token) ya no es válido",
     "maxsizeandattachments": "Tamaño máximo para archivos nuevos: {{$a.size}}, anexos máximos: {{$a.attachments}}",
     "min": "Más baja",
@@ -132,7 +135,7 @@
     "nocomments": "No hay comentarios",
     "nograde": "Sin calificación.",
     "none": "Ninguno(a)",
-    "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
+    "nopasswordchangeforced": "Usted no puede proceder sin cambiar su contraseña.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
     "noresults": "Sin resultados",
     "notapplicable": "no disp.",
@@ -140,8 +143,8 @@
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "Fuera de línea",
-    "online": "En línea",
+    "offline": "Fuera-de-línea",
+    "online": "En-línea",
     "openfullimage": "Hacer click aquí para mostrar la imagen a tamaño completo",
     "openinbrowser": "Abrir en navegador",
     "othergroups": "Otros grupos",
@@ -158,7 +161,7 @@
     "retry": "Reintentar",
     "save": "Guardar",
     "search": "Buscar...",
-    "searching": "Buscando en ...",
+    "searching": "Buscando",
     "searchresults": "Resultado",
     "sec": "segundos",
     "secs": "segundos",
@@ -178,7 +181,7 @@
     "sorry": "Lo siento...",
     "start": "Inicio",
     "submit": "Enviar",
-    "success": "Éxito",
+    "success": "¡Éxito!",
     "tablet": "Tableta",
     "teachers": "Profesores",
     "thereisdatatosync": "Existen {{$a}} fuera-de-línea para ser sincronizados/as.",
@@ -189,7 +192,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "¡Órale!",
     "unexpectederror": "Error inesperado. Por favor cierre y vuelva a abrir la aplicación para intentarlo de nuevo",
-    "unicodenotsupported": "El texto Unicode, como los emoticones, no está soportado en este sitio; el texto será enviado quitándole estos caracteres.",
+    "unicodenotsupported": "Los emojis no están soportado en este sitio; esos caracteres serán quitados cuando el mensaje sea enviado.",
     "unicodenotsupportedcleanerror": "Se encontró texto vacío al limpiar caracteres Unicode.",
     "unknown": "Desconocido",
     "unlimited": "Sin límite",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index c1cdd4a8af7..ece0b0da482 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Défaut ({{$a}})",
     "delete": "Supprimer",
-    "deleting": "En cours de suppression",
+    "deleting": "Suppression",
     "description": "Description",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -132,7 +132,7 @@
     "nocomments": "Aucun commentaire",
     "nograde": "Aucune note.",
     "none": "Aucun",
-    "nopasswordchangeforced": "Vous ne pouvez pas continuer sans modifier votre mot de passe. Cependant, il n'y a aucun moyen disponible de le modifier. Veuillez contacter l'administrateur de votre Moodle.",
+    "nopasswordchangeforced": "Vous ne pouvez pas continuer ans changer votre mot de passe.",
     "nopermissions": "Désolé, vous n'avez actuellement pas les droits d'accès requis pour effectuer ceci ({{$a}})",
     "noresults": "Pas de résultat",
     "notapplicable": "n/a",
@@ -140,7 +140,7 @@
     "notsent": "Pas envoyé",
     "now": "maintenant",
     "numwords": "{{$a}} mots",
-    "offline": "Déconnecté",
+    "offline": "Hors ligne",
     "online": "En ligne",
     "openfullimage": "Cliquer ici pour afficher l'image en pleine grandeur",
     "openinbrowser": "Ouvrir dans le navigateur",
@@ -158,7 +158,7 @@
     "retry": "Essayer à nouveau",
     "save": "Enregistrer",
     "search": "Recherche...",
-    "searching": "Recherche dans...",
+    "searching": "Recherche",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
@@ -178,7 +178,7 @@
     "sorry": "Désolé...",
     "start": "Début",
     "submit": "Envoyer",
-    "success": "Succès",
+    "success": "Succès !",
     "tablet": "Tablette",
     "teachers": "Enseignants",
     "thereisdatatosync": "Il y a des {{$a}} locales à synchroniser",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index 81fe258864b..fbb552bed44 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -16,12 +16,12 @@
     "comments": "Commenti",
     "commentscount": "Commenti ({{$a}})",
     "commentsnotworking": "Non è possibile scaricare i commenti",
-    "completion-alt-auto-fail": "Completato: {{$a}} (senza raggiungere la sufficienza)",
-    "completion-alt-auto-n": "Non completata: {{$a}}",
-    "completion-alt-auto-pass": "Completato: {{$a}} (raggiunta la sufficienza)",
-    "completion-alt-auto-y": "Completata: {{$a}}",
-    "completion-alt-manual-n": "Non completata: {{$a}}.\nSelezionarla per spuntarla come completata.",
-    "completion-alt-manual-y": "Completata: {{$a}}. Selezionarla per spuntarla come non completata.",
+    "completion-alt-auto-fail": "Completato: {{$a}} (senza la sufficienza)",
+    "completion-alt-auto-n": "Non completato: {{$a}}",
+    "completion-alt-auto-pass": "Completato: {{$a}} (con la sufficienza)",
+    "completion-alt-auto-y": "Completato: {{$a}}",
+    "completion-alt-manual-n": "Non completato: {{$a}}. Selezionare per indicare come completato.",
+    "completion-alt-manual-y": "Completato: {{$a}}. Selezionare per indicare come non completato.",
     "confirmcanceledit": "Sei sicuro di abbandonare questa pagina? Tutte le modifiche saranno perdute.",
     "confirmdeletefile": "Sei sicuro di voler eliminare questo file?",
     "confirmopeninbrowser": "Desideri aprirlo nel browser?",
@@ -35,7 +35,7 @@
     "decsep": ",",
     "defaultvalue": "Default ({{$a}})",
     "delete": "Elimina",
-    "deleting": "Eliminazione",
+    "deleting": "Eliminazione in corso",
     "description": "Descrizione",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -70,7 +70,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Immagine",
     "imageviewer": "Visualizzatore di immagini",
-    "info": "Info",
+    "info": "Informazioni",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Ultima modifica",
@@ -141,13 +141,13 @@
     "retry": "Riprova",
     "save": "Salva",
     "search": "Cerca...",
-    "searching": "Ricerca in ...",
+    "searching": "Ricerca in corso",
     "searchresults": "Risultati delle ricerche",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
     "send": "Invia",
-    "sending": "Invio in corso",
+    "sending": "Invio in c orso",
     "serverconnection": "Si è verificato un errore durante la connessione al server",
     "show": "Visualizza",
     "site": "Sito",
@@ -158,7 +158,7 @@
     "sizetb": "TB",
     "start": "Apertura",
     "submit": "Invia",
-    "success": "Operazione eseguita con successo",
+    "success": "OK!",
     "tablet": "Tablet",
     "teachers": "Docenti",
     "time": "Ora",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index 451cb6a7dd9..fbb079fddac 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -17,12 +17,12 @@
     "comments": "Opmerkingen",
     "commentscount": "Opmerkingen ({{$a}})",
     "commentsnotworking": "Opmerkingen konden niet opgehaald worden",
-    "completion-alt-auto-fail": "Voltooid:  {{$a}}  (bereikte het cijfer voor geslaagd niet)",
+    "completion-alt-auto-fail": "Voltooid: {{$a}} (slaagcijfer niet behaald)",
     "completion-alt-auto-n": "Niet voltooid: {{$a}}",
-    "completion-alt-auto-pass": "Voltooid:  {{$a}} (slaagcijfer bereikt)",
+    "completion-alt-auto-pass": "Voltooid: {{$a}} (slaagcijfer behaald)",
     "completion-alt-auto-y": "Voltooid: {{$a}}",
-    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om te markeren als voltooid",
-    "completion-alt-manual-y": "voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
+    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om als voltooid te markeren.",
+    "completion-alt-manual-y": "Voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
     "confirmcanceledit": "Weet je zeker dat je deze pagina wil verlaten? Alle wijzigingen zullen verloren gaan.",
     "confirmdeletefile": "Wil je dit bestand echt verwijderen?",
     "confirmloss": "Ben je zeker? Alle wijzigingen zullen verloren gaan.",
@@ -41,10 +41,11 @@
     "decsep": ",",
     "defaultvalue": "Standaard ({{$a}})",
     "delete": "Verwijder",
-    "deleting": "Verwijderen",
+    "deleting": "Verwijderen.",
     "description": "Beschrijving",
     "dfdaymonthyear": "MM-DD-JJJJ",
     "dfdayweekmonth": "ddd, D, MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
@@ -54,6 +55,7 @@
     "download": "Klik om het bestand met de geëxporteerde categorie te downloaden",
     "downloading": "Downloaden",
     "edit": "Bewerk",
+    "emptysplit": "Deze pagina zal leeg verschijnen als het linker paneel leeg of aan het laden is.",
     "error": "Onbekende fout!",
     "errorchangecompletion": "Er is een fout opgetreden tijdens het wijzigen van de voltooiingsstatus. Probeer opnieuw.",
     "errordeletefile": "Fout tijdens het verwijderen van het bestand. Probeer opnieuw.",
@@ -92,6 +94,7 @@
     "lastsync": "Laatste synchronisatie",
     "listsep": ";",
     "loading": "Aan het laden...",
+    "loadmore": "Meer laden",
     "lostconnection": "We zijn de verbinding kwijt en moeten opnieuw verbinden. Je token is nu ongeldig.",
     "maxsizeandattachments": "Maximale grootte voor nieuwe bestanden: {{$a.size}}, maximum aantal bijlagen: {{$a.attachments}}",
     "min": "Laagste",
@@ -132,7 +135,7 @@
     "nocomments": "Er zijn geen opmerkingen",
     "nograde": "Geen cijfer.",
     "none": "Geen",
-    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te wijzigen, hoewel er geen pagina voorzien is om dat te doen. Neem contact op met je Moodlebeheerder",
+    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te veranderen.",
     "nopermissions": "Sorry, maar je hebt nu niet het recht om dat te doen ({{$a}}).",
     "noresults": "Geen resultaat",
     "notapplicable": "n/a",
@@ -158,13 +161,13 @@
     "retry": "Probeer opnieuw",
     "save": "Bewaar",
     "search": "Zoeken...",
-    "searching": "Zoeken in ...",
+    "searching": "Zoeken",
     "searchresults": "Zoekresultaten",
     "sec": "seconde",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
     "send": "Verstuur",
-    "sending": "Versturen",
+    "sending": "Sturen",
     "serverconnection": "Fout bij het verbinden met de server",
     "show": "Laat zien",
     "showmore": "Toon meer...",
@@ -178,7 +181,7 @@
     "sorry": "Sorry...",
     "start": "Start",
     "submit": "Afgeven",
-    "success": "Succes",
+    "success": "Gelukt!",
     "tablet": "Tablet",
     "teachers": "leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
@@ -189,7 +192,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Ojee!",
     "unexpectederror": "Onverwachte fout. Sluit en heropen de applicatie om opnieuw te proberen.",
-    "unicodenotsupported": "Unicode tekst, zoals emojis, worden niet ondersteund op deze site. Er zal tekst gestuurd worden, waarbij deze tekens verloren gaan.",
+    "unicodenotsupported": "Sommige emojis worden niet ondersteund op deze site. Deze tekens zullen verwijderd worden wanneer het bericht verstuurd wordt.",
     "unicodenotsupportedcleanerror": "Er is lege tekst gevonden tijdens het opschonen van Unicode-tekens.",
     "unknown": "Onbekend",
     "unlimited": "Onbeperkt",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 0cf22e1b2e0..638775195bd 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -17,12 +17,12 @@
     "comments": "Comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Os comentários não podem ser recuperados",
-    "completion-alt-auto-fail": "Concluído: {{$a}} (não obteve nota para aprovação)",
-    "completion-alt-auto-n": "Não concluído(s): {{$a}}",
-    "completion-alt-auto-pass": "Concluído: {{$a}} (foi atingida a nota de aprovação)",
+    "completion-alt-auto-fail": "Concluído: {{$a}} (não alcançou a nota para passar)",
+    "completion-alt-auto-n": "Não concluído: {{$a}}",
+    "completion-alt-auto-pass": "Concluído: {{$a}} (nota para passar foi alcançada)",
     "completion-alt-auto-y": "Concluído: {{$a}}",
-    "completion-alt-manual-n": "Não concluído(s): {{$a}}. Selecione para marcar como concluído.",
-    "completion-alt-manual-y": "Concluído(s): {{$a}}. Selecione para marcar como não concluído.",
+    "completion-alt-manual-n": "Não concluído: {{$a}}. Selecione para marcar como concluída.",
+    "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
     "confirmcanceledit": "Você tem certeza que quer sair dessa página? Todas as mudanças serão perdidas.",
     "confirmdeletefile": "Você tem certeza que quer excluir este arquivo?",
     "confirmloss": "Você tem certeza? Todas as alterações serão perdidas.",
@@ -131,7 +131,7 @@
     "nocomments": "Não existem comentários",
     "nograde": "Não há nota",
     "none": "Nenhum",
-    "nopasswordchangeforced": "Você não pode continuar sem mudar sua senha. Mas infelizmente não existe uma página para esse propósito.\nPor favor contate o Administrador Moodle.",
+    "nopasswordchangeforced": "Você não pode proceder sem mudar sua senha.",
     "nopermissions": "Você não tem permissão para {{$a}}",
     "noresults": "Nenhum resultado",
     "notapplicable": "n/a",
@@ -139,8 +139,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavras",
-    "offline": "Desconectado",
-    "online": "Conectado",
+    "offline": "Offline",
+    "online": "Online",
     "openfullimage": "Clique aqui para exibir a imagem no tamanho completo",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -157,7 +157,7 @@
     "retry": "Tentar novamente",
     "save": "Salvar",
     "search": "Procurar...",
-    "searching": "Pesquisando em....",
+    "searching": "Procurando",
     "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",
@@ -177,7 +177,7 @@
     "sorry": "Desculpe...",
     "start": "Início",
     "submit": "Enviar",
-    "success": "Sucesso",
+    "success": "Sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index 10b10ea1b9a..0a7e3196954 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -21,6 +21,7 @@
     "completion-alt-manual-n": "Не выполнено: {{$a}}. Выберите, чтобы отметить элемент как выполненный",
     "completion-alt-manual-y": "Выполнено: {{$a}}. Выберите, чтобы отметить элемент курса как невыполненный",
     "confirmdeletefile": "Вы уверены, что хотите удалить это файл?",
+    "confirmloss": "Вы уверены? Все изменения будут удалены.",
     "content": "Содержимое",
     "continue": "Продолжить",
     "course": "Курс",
@@ -103,6 +104,7 @@
     "numwords": "всего слов - {{$a}}",
     "offline": "Вне сайта",
     "online": "На сайте",
+    "openinbrowser": "Открыть в браузере",
     "pagea": "Страница {{$a}}",
     "phone": "Телефон",
     "pictureof": "Изображение пользователя {{$a}}",
@@ -121,6 +123,7 @@
     "sending": "Отправка",
     "serverconnection": "Ошибка соединения с сервером",
     "show": "Показать",
+    "showmore": "Показать больше...",
     "site": "Сайт",
     "sizeb": "байт",
     "sizegb": "Гбайт",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index af99d470510..885c20ba531 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -15,12 +15,12 @@
     "close": "Stäng fönster",
     "comments": "Kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Fullföljd (uppnådde inte godkänt resultat)",
+    "completion-alt-auto-fail": "Avslutad: {{$a}} (uppnådde inte gräns för godkänd)",
     "completion-alt-auto-n": "Inte avslutad: {{$a}}",
-    "completion-alt-auto-pass": "Fullföljd (godkänt resultat)",
-    "completion-alt-auto-y": "Fullföljd",
-    "completion-alt-manual-n": "Ej fullföljd; välj för att markera som fullföljd",
-    "completion-alt-manual-y": "Fullföljd; välj för att markera som ej fullföljd",
+    "completion-alt-auto-pass": "Avslutad: {{$a}} (uppnådde gräns för godkänd)",
+    "completion-alt-auto-y": "Avslutad: {{$a}}",
+    "completion-alt-manual-n": "Inte avslutad: {{$a}}. Välj att markera som avslutad",
+    "completion-alt-manual-y": "Avslutad: {{$a}}. Välj att markera som INTE avslutad",
     "confirmdeletefile": "Är Du säker på att Du vill ta bort den här filen?",
     "confirmopeninbrowser": "Vill du öppna den i webbläsaren ?",
     "content": "Innehåll",
@@ -32,7 +32,7 @@
     "days": "Dagar",
     "decsep": ",",
     "delete": "Ta bort",
-    "deleting": "Tar bort",
+    "deleting": "ta bort",
     "description": "Beskrivning",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -117,8 +117,8 @@
     "notice": "Meddelande",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Frånkopplat läge",
-    "online": "Uppkopplad",
+    "offline": "Offline",
+    "online": "Online",
     "openfullimage": "Klick här för att visa bilden i full storlek",
     "openinbrowser": "Öppna i webbläsare",
     "othergroups": "Andra grupper",
@@ -133,7 +133,7 @@
     "requireduserdatamissing": "Den här användaren saknar vissa nödvändiga profildata. Vänligen fyll i uppgifterna i din Moodle och försök igen. <br>{{$a}}",
     "save": "Spara",
     "search": "Sök...",
-    "searching": "Söker i...",
+    "searching": "Söker",
     "searchresults": "Sökresultat",
     "sec": "Sekund",
     "secs": "Sekunder",
@@ -150,7 +150,7 @@
     "sizetb": "Tb",
     "start": "Starta",
     "submit": "Skicka",
-    "success": "Framgång",
+    "success": "Succé!",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
     "time": "Tid",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index efec2826202..d43bf2b3b08 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -114,7 +114,7 @@
     "required": "Gerekli",
     "save": "Kaydet",
     "search": "Arama...",
-    "searching": "Aranıyor...",
+    "searching": "Aranıyor",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",

From 4c6569c24d67192f1374a8b1f0efe2c729ed1cf6 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Tue, 23 May 2017 14:58:06 +0200
Subject: [PATCH 204/218] MOBILE-2103 release: Auto-translate stage 2

---
 www/addons/mod/choice/lang/ca.json    | 4 ++--
 www/addons/mod/choice/lang/cs.json    | 4 ++--
 www/addons/mod/choice/lang/de.json    | 4 ++--
 www/addons/mod/choice/lang/el.json    | 4 ++--
 www/addons/mod/choice/lang/es-mx.json | 4 ++--
 www/addons/mod/choice/lang/fr.json    | 4 ++--
 www/addons/mod/choice/lang/it.json    | 4 ++--
 www/addons/mod/choice/lang/nl.json    | 4 ++--
 www/addons/mod/choice/lang/pt-br.json | 4 ++--
 www/addons/mod/choice/lang/sv.json    | 4 ++--
 www/addons/mod/forum/lang/de.json     | 2 +-
 www/addons/mod/forum/lang/es-mx.json  | 2 +-
 www/addons/mod/forum/lang/fr.json     | 2 +-
 www/addons/mod/forum/lang/it.json     | 2 +-
 www/addons/mod/forum/lang/nl.json     | 2 +-
 www/addons/mod/forum/lang/pt-br.json  | 2 +-
 www/addons/mod/forum/lang/ru.json     | 2 +-
 www/addons/mod/forum/lang/sv.json     | 2 +-
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index fc6af3e2e89..c0a93b72130 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -6,8 +6,8 @@
     "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
-    "numberofuser": "Nombre de participants",
-    "numberofuserinpercentage": "Percentatge de participants",
+    "numberofuser": "Nombre de respostes",
+    "numberofuserinpercentage": "Percentatge de respostes (%)",
     "previewonly": "Això és sols una vista prèvia de les opcions disponibles en aquesta activitat. No esteu habilitat per enviar consultes fins {{$a}}.",
     "removemychoice": "Suprimeix la meva resposta",
     "responses": "Respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index aaa5ea9560c..f9a22aaf32e 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -6,8 +6,8 @@
     "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
     "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
-    "numberofuser": "Počet účastníků",
-    "numberofuserinpercentage": "Procentní podíl účastníků",
+    "numberofuser": "Počet odpovědí",
+    "numberofuserinpercentage": "Počet odpovědí v procentech",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
     "removemychoice": "Odstranit mou volbu",
     "responses": "Odpovědi",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index a7bea8a7061..be13d38af77 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -6,8 +6,8 @@
     "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
     "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
-    "numberofuser": "Anzahl",
-    "numberofuserinpercentage": "Prozent",
+    "numberofuser": "Anzahl der Antworten",
+    "numberofuserinpercentage": "Prozent der Antworten",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
     "responses": "Stimmabgaben",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 31602f11f93..4b17c064e80 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -4,8 +4,8 @@
     "full": "(Πλήρες)",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
     "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
-    "numberofuser": "Πλήθος συμμετεχόντων",
-    "numberofuserinpercentage": "Ποσοστό συμμετεχόντων",
+    "numberofuser": "Αριθμός απαντήσεων",
+    "numberofuserinpercentage": "Ποσοστό απαντήσεων",
     "removemychoice": "Διαγραφή της επιλογής μου",
     "responses": "Απαντήσεις",
     "responsesresultgraphdescription": "{{number}}% των χρηστών επέλεξε: {{text}}.",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index 41b15bb932f..ceddb82adc6 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentaje de participantes",
+    "numberofuser": "Número de respuestas",
+    "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 05e3f3b9c99..9ca0f50c2ea 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -6,8 +6,8 @@
     "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
     "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
-    "numberofuser": "Nombre de participants",
-    "numberofuserinpercentage": "Pourcentage de participants",
+    "numberofuser": "Nombre de réponses",
+    "numberofuserinpercentage": "Pourcentage de réponses",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
     "responses": "Réponses",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index c44e97ee335..01597a9058a 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -6,8 +6,8 @@
     "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
     "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
-    "numberofuser": "Numero di partecipanti",
-    "numberofuserinpercentage": "Percentuale dei partecipanti",
+    "numberofuser": "Numero di risposte",
+    "numberofuserinpercentage": "Percentuale delle risposte",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
     "responses": "Scelte",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index b2be190c0c9..d7e7f4cd7f3 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -6,8 +6,8 @@
     "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
     "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
-    "numberofuser": "Aantal deelnemers",
-    "numberofuserinpercentage": "Deelnemerspercentage",
+    "numberofuser": "Aantal antwoorden",
+    "numberofuserinpercentage": "Percentage antwoorden",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
     "responses": "Antwoorden",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index f8fbe81990b..01fbb57c4c1 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -6,8 +6,8 @@
     "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
     "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
-    "numberofuser": "Número de participantes",
-    "numberofuserinpercentage": "Porcentagem de participantes",
+    "numberofuser": "Número de usuários",
+    "numberofuserinpercentage": "Percentual de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
     "removemychoice": "Remover a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 62217bdb227..8ef6af50622 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
     "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
-    "numberofuser": "Antal deltagare",
-    "numberofuserinpercentage": "Procent av deltagarna",
+    "numberofuser": "Antal användare",
+    "numberofuserinpercentage": "Antalet användare i procent.",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
     "responses": "Svar",
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index 22814dbf13e..bee3c7cb0d4 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Themenabonnement",
     "edit": "Bearbeiten",
     "erroremptymessage": "Die Mitteilung darf nicht leer sein.",
-    "erroremptysubject": "Das Forenthema darf nicht leer sein.",
+    "erroremptysubject": "Der Betreff darf nicht leer sein.",
     "errorgetforum": "Fehler beim Laden der Forendaten",
     "errorgetgroups": "Fehler beim Laden der Gruppeneinstellungen",
     "forumnodiscussionsyet": "Keine Themen im Forum",
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index c3743416512..48404906707 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Suscripción a discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
-    "erroremptysubject": "El asunto de la publicación no puede estar vacío",
+    "erroremptysubject": "El asunto del mensaje no puede estar vacío.",
     "errorgetforum": "Error al obtener datos del foro.",
     "errorgetgroups": "Error al obtener configuraciones de grupo.",
     "forumnodiscussionsyet": "Todavía no hay tópicos de discusión en este foro.",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 09bf43de5be..566c52681f0 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Abonnement à la discussion",
     "edit": "Modifier",
     "erroremptymessage": "Un message ne peut pas être vide",
-    "erroremptysubject": "L'objet du message ne peut pas être vide",
+    "erroremptysubject": "L'objet d'un message ne peut pas être vide",
     "errorgetforum": "Erreur de récupération des données de forum.",
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
diff --git a/www/addons/mod/forum/lang/it.json b/www/addons/mod/forum/lang/it.json
index ad1b8b1ed8b..c54ee597c31 100644
--- a/www/addons/mod/forum/lang/it.json
+++ b/www/addons/mod/forum/lang/it.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Sottoscrizione della discussione",
     "edit": "Modifica",
     "erroremptymessage": "Il corpo del messaggio non può essere vuoto",
-    "erroremptysubject": "L'oggetto dell'intervento non può essere vuoto",
+    "erroremptysubject": "L'oggetto non può essere vuoto",
     "errorgetforum": "Si è verificato un errore durante la ricezione dei dati del forum.",
     "errorgetgroups": "Si è verificato un errore durante la ricezione delle impostazioni gruppo.",
     "forumnodiscussionsyet": "In questo forum non sono presenti discussioni",
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 83fddedda47..8f7fe7dad45 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Inschrijving discussie",
     "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
-    "erroremptysubject": "Onderwerp mag niet leeg zijn",
+    "erroremptysubject": "Onderwerp kan niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
     "errorgetgroups": "Fout bij het ophalen van groepinstellingen.",
     "forumnodiscussionsyet": "Er zijn nog geen discussies in dit forum",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index f7d9cf730e2..aebbce61f21 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
-    "erroremptysubject": "Assunto não pode estar vazio",
+    "erroremptysubject": "O assunto da mensagem não pode ser vazio.",
     "errorgetforum": "Erro ao buscar dados de fórum.",
     "errorgetgroups": "Erro ao obter configurações do grupo.",
     "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index 3faffe0f076..46a510d03d2 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Подписаться на эту тему.",
     "edit": "Редактировать",
     "erroremptymessage": "Сообщение не может быть пустым",
-    "erroremptysubject": "Заголовок сообщения не может быть пустым",
+    "erroremptysubject": "Тема сообщения не может быть пустой",
     "errorgetforum": "Ошибка при получении данных форума",
     "errorgetgroups": "Ошибка получения параметров группы",
     "forumnodiscussionsyet": "В этом форуме ещё нет тем для обсуждения",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 676e5ba9fa1..5d9eb54b6ad 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
-    "erroremptysubject": "Rubriken kan inte vara tom",
+    "erroremptysubject": "Ämnesrubriken för inlägget kan inte vara tom.",
     "errorgetforum": "Fel att få forum innehåll",
     "errorgetgroups": "Fel vid hämtning av gruppinställningar",
     "forumnodiscussionsyet": "Det finns inga diskussionsämnen ännu i detta forum.",

From 48d43a16c35db5cff6a5214c03b135ab7ff11565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 23 May 2017 14:01:51 +0200
Subject: [PATCH 205/218] MOBILE-2103 overview: Fix centered course icon

---
 www/addons/mod/quiz/scss/styles.scss         |  2 +-
 www/core/components/courses/scss/styles.scss | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/quiz/scss/styles.scss b/www/addons/mod/quiz/scss/styles.scss
index b46df9b646a..197baf0a6b8 100644
--- a/www/addons/mod/quiz/scss/styles.scss
+++ b/www/addons/mod/quiz/scss/styles.scss
@@ -48,7 +48,7 @@ p.mma-mod-quiz-warning {
   .mm-timer {
     min-height: 41px;
     border: 0;
-    padding: 2px 0 1px 25px;
+    padding: 1px 0 1px 25px;
 
     .icon {
       left: 0;
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index f0f02780920..b6762dc0036 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -97,16 +97,21 @@ $doughnut-text-colour: $gray-darker;
 
     .icon {
       position: absolute;
-      top: 50%;
       text-align: center;
       /*rtl:ignore*/
-      left: 50%;
+      left: -1px;
+      top: -1px;
+      right: 0;
+      bottom: 0;
       margin: 0;
-      transform: translate(-42%, -50%);
       color: $white;
-      height: ($chart-size / 2) + 10px;
-      width: ($chart-size / 2) + 10px;
+      height: $chart-size;
+      width: $chart-size;
+      line-height: $chart-size;
       font-size: ($chart-size / 2) + 10px;
+      &:before {
+        width: $chart-size;
+      }
     }
   }
 }

From 7f6cb92bc8d32f64b436897632ad0e350af3b012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 24 May 2017 12:12:03 +0200
Subject: [PATCH 206/218] MOBILE-2103 login: Show logo if avatar not set on
 reconect

---
 .../components/login/controllers/reconnect.js   |  9 +++++++++
 .../components/login/templates/reconnect.html   | 17 +++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/www/core/components/login/controllers/reconnect.js b/www/core/components/login/controllers/reconnect.js
index 7276ec594ba..f79b6380be2 100644
--- a/www/core/components/login/controllers/reconnect.js
+++ b/www/core/components/login/controllers/reconnect.js
@@ -45,6 +45,15 @@ angular.module('mm.core.login')
 
         $scope.credentials.username = site.infos.username;
         $scope.siteurl = site.infos.siteurl;
+        $scope.sitename = site.infos.sitename;
+
+        // Check logoURL if user avatar is not set.
+        if ($scope.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
+            $scope.site.avatar = false;
+            return site.getPublicConfig().then(function(config) {
+                $scope.logourl = config.logourl || config.compactlogourl;
+            });
+        }
     });
 
     if (siteConfig) {
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index 2aee6e4f386..d425a8cf33e 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -2,10 +2,19 @@
     <ion-content mm-state-class padding="true" class="mm-center-view">
         <div class="mm-view-content">
             <div class="box">
-                <div class="item item-text-wrap item-avatar-center item-borderless">
-                    <img ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
-                    <h2 class="padding">{{siteurl}}</h2>
-                    <p ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
+                <div class="item item-text-wrap item-avatar-center item-borderless" ng-class="{'item-avatar-center': site.avatar, 'text-center': !site.avatar}">
+                    <img ng-if="site.avatar" ng-src="{{site.avatar}}" class="avatar" mm-external-content siteid="site.id" alt="{{ 'mm.core.pictureof' | translate:{$a: site.fullname} }}" role="presentation">
+                    <!-- Show site logo or a default image. -->
+                    <img ng-if="!site.avatar && logourl" ng-src="{{logourl}}" class="avatar-full" mm-external-content role="presentation">
+                    <img ng-if="!site.avatar && !logourl" ng-src="img/moodle.png" class="avatar-full moodle-logo" role="presentation">
+
+                    <!-- If no sitename show big siteurl. -->
+                    <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
+                    <!-- If sitename, show big sitename and small siteurl. -->
+                    <p ng-if="sitename" class="item-heading padding">{{sitename}}</p>
+                    <p ng-if="sitename">{{siteurl}}</p>
+
+                    <p class="padding-top" ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
                 </div>
                 <div class="list item padding">
                     <h2>{{ 'mm.login.username' | translate }}</h2>

From 3792a64ff113ff4eab7f57dc93546848f43c7790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 24 May 2017 12:21:35 +0200
Subject: [PATCH 207/218] MOBILE-2103 notifications: Fix update counter

---
 www/addons/messages/services/handlers.js             |  3 ++-
 www/addons/notifications/services/handlers.js        |  5 +++--
 .../pushnotifications/services/pushnotifications.js  | 12 +++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/www/addons/messages/services/handlers.js b/www/addons/messages/services/handlers.js
index 7d5a82ef991..412b112500f 100644
--- a/www/addons/messages/services/handlers.js
+++ b/www/addons/messages/services/handlers.js
@@ -371,7 +371,8 @@ angular.module('mm.addons.messages')
                     }
 
                     function updateUnreadConversationsCount(siteId) {
-                        return $mmaMessages.getUnreadConversationsCount().then(function(unread) {
+                        siteId = siteId || $mmSite.getId();
+                        return $mmaMessages.getUnreadConversationsCount(undefined, siteId).then(function(unread) {
                             // Leave badge enter if there is a 0+ or a 0.
                             $scope.badge = parseInt(unread, 10) > 0 ? unread : '';
                             // Update badge.
diff --git a/www/addons/notifications/services/handlers.js b/www/addons/notifications/services/handlers.js
index 90eb9a458c5..f832baa8c98 100644
--- a/www/addons/notifications/services/handlers.js
+++ b/www/addons/notifications/services/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.notifications')
  * @ngdoc service
  * @name $mmaNotificationsHandlers
  */
-.factory('$mmaNotificationsHandlers', function($log, $mmaNotifications, $mmEvents, $mmSitesManager, $mmUtil,
+.factory('$mmaNotificationsHandlers', function($log, $mmaNotifications, $mmEvents, $mmSitesManager, $mmUtil, $mmSite,
         mmaNotificationsReadChangedEvent, mmaNotificationsReadCronEvent, $mmAddonManager) {
     $log = $log.getInstance('$mmaNotificationsHandlers');
 
@@ -106,7 +106,8 @@ angular.module('mm.addons.notifications')
                     }
 
                     function updateUnreadNotificationsCount(siteId) {
-                        return $mmaNotifications.getUnreadNotificationsCount().then(function(unread) {
+                        siteId = siteId || $mmSite.getId();
+                        return $mmaNotifications.getUnreadNotificationsCount(undefined, siteId).then(function(unread) {
                             // Leave badge enter if there is a 0+ or a 0.
                             $scope.badge = parseInt(unread, 10) > 0 ? unread : '';
                             // Update badge.
diff --git a/www/addons/pushnotifications/services/pushnotifications.js b/www/addons/pushnotifications/services/pushnotifications.js
index 138fcb09b9f..328ccf0bff3 100644
--- a/www/addons/pushnotifications/services/pushnotifications.js
+++ b/www/addons/pushnotifications/services/pushnotifications.js
@@ -260,10 +260,10 @@ angular.module('mm.addons.pushnotifications')
      * @module mm.addons.pushnotifications
      * @ngdoc method
      * @name $mmaPushNotifications#updateAddonCounter
-     * @param  {String} siteId Site ID.
-     * @param  {String} addon  Registered addon name to set the badge number.
-     * @param  {Number} number The number to be stored.
-     * @return {Promise}       Promise resolved with the stored badge counter for the addon on the site.
+     * @param  {String} [siteId] Site ID. If not defined, use current site.
+     * @param  {String} addon    Registered addon name to set the badge number.
+     * @param  {Number} number   The number to be stored.
+     * @return {Promise}         Promise resolved with the stored badge counter for the addon on the site.
      */
     self.updateAddonCounter = function(siteId, addon, number) {
         if ($mmPushNotificationsDelegate.isCounterHandlerRegistered(addon)) {
@@ -403,12 +403,14 @@ angular.module('mm.addons.pushnotifications')
     /**
      * Save the addon/site badgecounter on the database.
      *
-     * @param  {String} siteId   Site ID.
+     * @param  {String} [siteId] Site ID. If not defined, use current site.
      * @param  {Number} number   The number to be stored.
      * @param  {String} [addon]  Registered addon name. If not defined it will store the site total.
      * @return {Promise}         Promise resolved with the stored badge counter for the addon or site.
      */
     function saveAddonBadge(siteId, number, addon) {
+        siteId = siteId || $mmSite.getId();
+
         var entry = {
             siteid: siteId,
             addon: addon || 'site',

From ed9c02e00f7a3f232feef6e5e8e1556ff08e635e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 24 May 2017 13:01:17 +0200
Subject: [PATCH 208/218] MOBILE-2103 lesson: Fix ng-click to continue timed
 lesson

---
 www/addons/mod/lesson/templates/view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/templates/view.html b/www/addons/mod/lesson/templates/view.html
index f7e94dda626..114de1682ef 100644
--- a/www/addons/mod/lesson/templates/view.html
+++ b/www/addons/mod/lesson/templates/view.html
@@ -38,7 +38,7 @@
         <div ng-if="leftDuringTimed && lesson.timelimit && lesson.retake" class="item item-text-wrap">
             <!-- User left during the session with time limit and retakes allowed, ask to continue. -->
             <p ng-bind-html="'mma.mod_lesson.leftduringtimed' | translate"></p>
-            <button class="button button-block" ng-click="start(false) button-positive icon-right ion-chevron-right">{{ 'mma.mod_lesson.continue' | translate }}</button>
+            <button class="button button-block button-positive icon-right ion-chevron-right" ng-click="start(false)">{{ 'mma.mod_lesson.continue' | translate }}</button>
         </div>
         <div ng-if="leftDuringTimed && lesson.timelimit && !lesson.retake" class="item item-text-wrap">
             <!-- User left during the session with time limit and retakes not allowed. This should be handled by preventMessages -->

From b73dab8a840d5b524ebcf9233531b9fce36b75c4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 24 May 2017 13:41:11 +0200
Subject: [PATCH 209/218] MOBILE-2103 lesson: Fix buttons in legacy lessons
 (1.9)

---
 www/addons/mod/lesson/services/helper.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 2a1a0a09fef..7999d10a59e 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -93,20 +93,27 @@ angular.module('mm.addons.mod_lesson')
         var buttons = [],
             rootElement = document.createElement('div'),
             buttonsContainer,
-            forms;
+            forms,
+            isLegacy = false;
 
         // Get the container of the buttons if it exists.
         rootElement.innerHTML = html;
         buttonsContainer = rootElement.querySelector('.branchbuttoncontainer');
 
         if (!buttonsContainer) {
-            // Button container not found, no buttons.
-            return buttons;
+            // Button container not found, might be a legacy lesson (from 1.9).
+            if (!rootElement.querySelector('form input[type="submit"]')) {
+                // No buttons found.
+                return buttons;
+            }
+            isLegacy = true;
+            buttonsContainer = rootElement;
         }
 
         forms = buttonsContainer.querySelectorAll('form');
         angular.forEach(forms, function(form) {
-            var buttonEl = form.querySelector('button[type="submit"]'),
+            var buttonSelector = isLegacy ? 'input[type="submit"]' : 'button[type="submit"]',
+                buttonEl = form.querySelector(buttonSelector),
                 inputs = form.querySelectorAll('input'),
                 button;
 
@@ -117,13 +124,15 @@ angular.module('mm.addons.mod_lesson')
 
             button = {
                 id: buttonEl.id,
-                title: buttonEl.title,
-                content: buttonEl.innerHTML.trim(),
+                title: buttonEl.title || buttonEl.value,
+                content: isLegacy ? buttonEl.value : buttonEl.innerHTML.trim(),
                 data: {}
             };
 
             angular.forEach(inputs, function(input) {
-                button.data[input.name] = input.value;
+                if (input.type != 'submit') {
+                    button.data[input.name] = input.value;
+                }
             });
 
             buttons.push(button);

From e4ae29c4f7adb2da7837fb51f3d6ac332676cd10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 25 May 2017 10:23:21 +0200
Subject: [PATCH 210/218] MOBILE-2103 style: Fix empty boxes for small screens

---
 www/core/scss/styles.scss | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index d2941757c0a..4fcf1b07fbc 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1530,6 +1530,26 @@ i, cite, em, var, address, dfn {
   }
 }
 
+@media only screen and (max-height: 420px) {
+  .mm-empty-box {
+    position: relative;
+
+    .mm-empty-box-content {
+      padding: $item-padding / 2;
+    }
+    .icon {
+      font-size: 100px;
+    }
+    img {
+      height: 104px;
+      width: 121px;
+    }
+    .icon + p, img + p {
+      padding-top: $item-padding / 2;
+    }
+  }
+}
+
 progress {
   -webkit-appearance: none;
   appearance: none;

From 3e187641c24950f5b83a0e026a4008cf8244338d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 25 May 2017 10:52:07 +0200
Subject: [PATCH 211/218] MOBILE-1035 styles: Animate show/hide mm-loading

---
 www/app.js                      |  2 +-
 www/core/scss/styles.scss       | 24 ++++++++++++++++++++++++
 www/core/templates/loading.html |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/www/app.js b/www/app.js
index bb083f400e6..d614d95d94a 100644
--- a/www/app.js
+++ b/www/app.js
@@ -15,7 +15,7 @@
 // Dependencies will be automatically added here, the following line must declare ionic as first dependency
 // and should not be split into multiple lines, see gulpfile.js.
 angular.module('mm', ['ionic', 'ngCordova', 'angular-md5', 'pascalprecht.translate', 'ngAria', 'oc.lazyLoad', 'ckeditor',
-            'ngMessages'])
+            'ngMessages', 'ngAnimate'])
 
 .run(function($ionicPlatform) {
     $ionicPlatform.ready(function() {
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 4fcf1b07fbc..ac1142effc1 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1609,3 +1609,27 @@ h2.invert {
     }
   }
 }
+
+/* Animations */
+.mm-animate-show,
+.mm-animate-show-hide {
+  &.ng-enter {
+    transition: 0.5s ease all;
+    opacity: 0;
+  }
+
+  &.ng-enter.ng-enter-active {
+    opacity: 1;
+  }
+}
+
+.mm-animate-hide,
+.mm-animate-show-hide {
+  &.ng-leave {
+    transition: 0.5s ease all;
+    opacity: 1;
+  }
+  &.ng-leave.ng-leave-active {
+    opacity: 0;
+  }
+}
\ No newline at end of file
diff --git a/www/core/templates/loading.html b/www/core/templates/loading.html
index 17fd3a345fe..15cddca8fd0 100644
--- a/www/core/templates/loading.html
+++ b/www/core/templates/loading.html
@@ -1,9 +1,9 @@
-<div class="mm-loading-container" ng-if="!hideUntil">
+<div class="mm-loading-container mm-animate-show-hide" ng-if="!hideUntil">
     <span class="mm-loading-spinner">
         <ion-spinner></ion-spinner>
         <p class="mm-loading-message" ng-if="dynMessage">{{dynMessage}}</p>
         <p class="mm-loading-message" ng-if="message && !dynMessage">{{message}}</p>
     </span>
 </div>
-<div class="mm-loading-content" ng-if="hideUntil" ng-transclude>
+<div class="mm-loading-content mm-animate-show-hide" ng-if="hideUntil" ng-transclude>
 </div>
\ No newline at end of file

From 4f03f8ad955a7df506b466d67ffa822541990db2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 26 May 2017 10:28:57 +0200
Subject: [PATCH 212/218] MOBILE-2103 lesson: Show warning when prefetch lesson
 with RANDOMBRANCH

---
 www/addons/mod/lesson/lang/en.json            |  1 +
 www/addons/mod/lesson/services/handlers.js    |  4 +--
 www/addons/mod/lesson/services/lesson.js      |  2 ++
 .../mod/lesson/services/prefetch_handler.js   | 25 ++++++++++++++++---
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 903667efb1a..a85e9edbe81 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -21,6 +21,7 @@
     "emptypassword": "Password cannot be empty",
     "enterpassword": "Please enter the password:",
     "eolstudentoutoftimenoanswers": "You did not answer any questions.  You have received a 0 for this lesson.",
+    "errorprefetchrandombranch": "This lesson contains a jump to a random content page, it cannot be attempted in the app until it has been started in web.",
     "errorreviewretakenotlast": "This attempt can no longer be reviewed because another attempt has been finished.",
     "finish": "Finish",
     "finishretakeoffline": "This attempt was finished offline.",
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index cf3e3fadb5b..f1308aa0422 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -98,9 +98,9 @@ angular.module('mm.addons.mod_lesson')
 
                     $mmaModLessonPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModLessonPrefetchHandler.prefetch(module, courseId).catch(function() {
+                            $mmaModLessonPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/lesson/services/lesson.js b/www/addons/mod/lesson/services/lesson.js
index 29e784c81da..7dbebba49c4 100644
--- a/www/addons/mod/lesson/services/lesson.js
+++ b/www/addons/mod/lesson/services/lesson.js
@@ -64,6 +64,8 @@ angular.module('mm.addons.mod_lesson')
     self.LESSON_UNSEENBRANCHPAGE = -50;
     // Jump to a random page within a branch and end of branch or end of lesson.
     self.LESSON_RANDOMPAGE = -60;
+    // Jump to a random Branch.
+    self.LESSON_RANDOMBRANCH = -70;
     // Cluster Jump.
     self.LESSON_CLUSTERJUMP = -80;
 
diff --git a/www/addons/mod/lesson/services/prefetch_handler.js b/www/addons/mod/lesson/services/prefetch_handler.js
index 38df02df9bb..7b58cdf68aa 100644
--- a/www/addons/mod/lesson/services/prefetch_handler.js
+++ b/www/addons/mod/lesson/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_lesson')
  * @name $mmaModLessonPrefetchHandler
  */
 .factory('$mmaModLessonPrefetchHandler', function($mmaModLesson, $q, $mmPrefetchFactory, mmaModLessonComponent, $mmUtil, $mmGroups,
-    $mmSite, $mmFilepool, $rootScope, $timeout, $ionicModal, mmCoreDontShowError, $mmCourse) {
+    $mmSite, $mmFilepool, $rootScope, $timeout, $ionicModal, mmCoreDontShowError, $mmCourse, $mmLang) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModLessonComponent, false);
 
@@ -426,10 +426,19 @@ angular.module('mm.addons.mod_lesson')
 
             // Get the list of pages.
             promises.push($mmaModLesson.getPages(lesson.id, password, false, true, siteId).then(function(pages) {
-                var subPromises = [];
+                var subPromises = [],
+                    hasRandomBranch = false;
 
                 // Get the data for each page.
                 angular.forEach(pages, function(data) {
+                    // Check if any page has a RANDOMBRANCH jump.
+                    angular.forEach(data.jumps, function(jump) {
+                        if (jump == $mmaModLesson.LESSON_RANDOMBRANCH) {
+                            hasRandomBranch = true;
+                        }
+                    });
+
+                    // Get the page data.
                     subPromises.push($mmaModLesson.getPageData(lesson, data.page.id, password, false, true, false,
                             true, undefined, undefined, siteId).then(function(pageData) {
 
@@ -449,6 +458,16 @@ angular.module('mm.addons.mod_lesson')
                     }));
                 });
 
+                // Prefetch the list of possible jumps for offline navigation. Do it here so we know hasRandomBranch.
+                subPromises.push($mmaModLesson.getPagesPossibleJumps(lesson.id, false, true, siteId).catch(function(error) {
+                    if (hasRandomBranch) {
+                        // The WebSevice probably failed because RANDOMBRANCH aren't supported if the user hasn't seen any page.
+                        return $mmLang.translateAndReject('mma.mod_lesson.errorprefetchrandombranch');
+                    } else {
+                        return $q.reject(error);
+                    }
+                }));
+
                 return $q.all(subPromises);
             }));
 
@@ -457,8 +476,6 @@ angular.module('mm.addons.mod_lesson')
                 // Ignore errors.
             }));
 
-            // Prefetch the list of possible jumps for offline navigation.
-            promises.push($mmaModLesson.getPagesPossibleJumps(lesson.id, false, true, siteId));
 
             // Prefetch viewed pages in last retake to calculate progress.
             promises.push($mmaModLesson.getContentPagesViewedOnline(lesson.id, retake, false, true, siteId));

From 86ef02acbc779152b2722e5c19eba024669e7303 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 26 May 2017 11:30:15 +0200
Subject: [PATCH 213/218] MOBILE-2103 release: Auto-translated strings

---
 www/addons/badges/lang/uk.json                |  12 ++
 www/addons/calendar/lang/cs.json              |   4 +-
 www/addons/calendar/lang/de.json              |   4 +-
 www/addons/calendar/lang/es-mx.json           |   2 +-
 www/addons/calendar/lang/fa.json              |   4 +-
 www/addons/calendar/lang/fr.json              |   2 +-
 www/addons/calendar/lang/it.json              |   2 +-
 www/addons/calendar/lang/nl.json              |   2 +-
 www/addons/calendar/lang/pt-br.json           |   2 +-
 www/addons/calendar/lang/sv.json              |   2 +-
 www/addons/calendar/lang/uk.json              |   8 +
 www/addons/competency/lang/ca.json            |   2 +-
 www/addons/competency/lang/cs.json            |   2 +-
 www/addons/competency/lang/de.json            |   2 +-
 www/addons/competency/lang/es-mx.json         |   2 +-
 www/addons/competency/lang/fr.json            |   2 +-
 www/addons/competency/lang/it.json            |   2 +-
 www/addons/competency/lang/nl.json            |   2 +-
 www/addons/competency/lang/pt-br.json         |   2 +-
 www/addons/competency/lang/uk.json            |  28 +++
 www/addons/coursecompletion/lang/ca.json      |  14 +-
 www/addons/coursecompletion/lang/cs.json      |  26 +--
 www/addons/coursecompletion/lang/de.json      |  22 +-
 www/addons/coursecompletion/lang/el.json      |  10 +-
 www/addons/coursecompletion/lang/es-mx.json   |  24 +--
 www/addons/coursecompletion/lang/fa.json      |   4 +-
 www/addons/coursecompletion/lang/fr.json      |   6 +-
 www/addons/coursecompletion/lang/it.json      |  14 +-
 www/addons/coursecompletion/lang/nl.json      |  18 +-
 www/addons/coursecompletion/lang/pt-br.json   |  22 +-
 www/addons/coursecompletion/lang/ru.json      |  26 +--
 www/addons/coursecompletion/lang/sv.json      |  22 +-
 www/addons/coursecompletion/lang/uk.json      |  21 ++
 www/addons/files/lang/ca.json                 |   4 +-
 www/addons/files/lang/cs.json                 |   4 +-
 www/addons/files/lang/de.json                 |   4 +-
 www/addons/files/lang/el.json                 |   2 +-
 www/addons/files/lang/es-mx.json              |   4 +-
 www/addons/files/lang/fr.json                 |   4 +-
 www/addons/files/lang/it.json                 |   4 +-
 www/addons/files/lang/nl.json                 |   4 +-
 www/addons/files/lang/pt-br.json              |   4 +-
 www/addons/files/lang/ru.json                 |   2 +-
 www/addons/files/lang/uk.json                 |  13 ++
 www/addons/frontpage/lang/uk.json             |   4 +
 www/addons/grades/lang/uk.json                |   4 +
 .../messageoutput/airnotifier/lang/uk.json    |   3 +
 www/addons/messages/lang/ca.json              |   4 +-
 www/addons/messages/lang/cs.json              |   6 +-
 www/addons/messages/lang/de.json              |   4 +-
 www/addons/messages/lang/el.json              |   6 +-
 www/addons/messages/lang/es-mx.json           |   6 +-
 www/addons/messages/lang/eu.json              |   2 +-
 www/addons/messages/lang/fr.json              |   6 +-
 www/addons/messages/lang/it.json              |   6 +-
 www/addons/messages/lang/nl.json              |   4 +-
 www/addons/messages/lang/pt-br.json           |   4 +-
 www/addons/messages/lang/pt.json              |   2 +-
 www/addons/messages/lang/ru.json              |   4 +-
 www/addons/messages/lang/sv.json              |   6 +-
 www/addons/messages/lang/tr.json              |   2 +-
 www/addons/messages/lang/uk.json              |  33 +++
 www/addons/mod/assign/lang/ar.json            |  10 +-
 www/addons/mod/assign/lang/bg.json            |  12 +-
 www/addons/mod/assign/lang/ca.json            |  14 +-
 www/addons/mod/assign/lang/cs.json            |  18 +-
 www/addons/mod/assign/lang/da.json            |  14 +-
 www/addons/mod/assign/lang/de.json            |  16 +-
 www/addons/mod/assign/lang/el.json            |  14 +-
 www/addons/mod/assign/lang/es-mx.json         |  16 +-
 www/addons/mod/assign/lang/es.json            |  12 +-
 www/addons/mod/assign/lang/eu.json            |  10 +-
 www/addons/mod/assign/lang/fa.json            |  14 +-
 www/addons/mod/assign/lang/fr.json            |  20 +-
 www/addons/mod/assign/lang/he.json            |  16 +-
 www/addons/mod/assign/lang/hu.json            |  16 +-
 www/addons/mod/assign/lang/it.json            |  16 +-
 www/addons/mod/assign/lang/ja.json            |  14 +-
 www/addons/mod/assign/lang/lt.json            |  14 +-
 www/addons/mod/assign/lang/nl.json            |  16 +-
 www/addons/mod/assign/lang/pl.json            |  16 +-
 www/addons/mod/assign/lang/pt-br.json         |  18 +-
 www/addons/mod/assign/lang/pt.json            |  14 +-
 www/addons/mod/assign/lang/ro.json            |   6 +-
 www/addons/mod/assign/lang/ru.json            |  18 +-
 www/addons/mod/assign/lang/sv.json            |  16 +-
 www/addons/mod/assign/lang/tr.json            |  12 +-
 www/addons/mod/assign/lang/uk.json            |  97 +++++++++
 www/addons/mod/assign/lang/zh-cn.json         |  14 +-
 www/addons/mod/assign/lang/zh-tw.json         |  18 +-
 www/addons/mod/chat/lang/ar.json              |   4 +-
 www/addons/mod/chat/lang/bg.json              |   2 +-
 www/addons/mod/chat/lang/ca.json              |   2 +-
 www/addons/mod/chat/lang/cs.json              |   2 +-
 www/addons/mod/chat/lang/da.json              |   2 +-
 www/addons/mod/chat/lang/el.json              |   2 +-
 www/addons/mod/chat/lang/es-mx.json           |   2 +-
 www/addons/mod/chat/lang/es.json              |   2 +-
 www/addons/mod/chat/lang/eu.json              |   2 +-
 www/addons/mod/chat/lang/fa.json              |   2 +-
 www/addons/mod/chat/lang/fr.json              |   2 +-
 www/addons/mod/chat/lang/he.json              |   4 +-
 www/addons/mod/chat/lang/hu.json              |   4 +-
 www/addons/mod/chat/lang/it.json              |   2 +-
 www/addons/mod/chat/lang/ja.json              |   2 +-
 www/addons/mod/chat/lang/lt.json              |   2 +-
 www/addons/mod/chat/lang/nl.json              |   4 +-
 www/addons/mod/chat/lang/pl.json              |   2 +-
 www/addons/mod/chat/lang/pt-br.json           |   2 +-
 www/addons/mod/chat/lang/pt.json              |   2 +-
 www/addons/mod/chat/lang/ro.json              |   4 +-
 www/addons/mod/chat/lang/ru.json              |   2 +-
 www/addons/mod/chat/lang/sv.json              |   2 +-
 www/addons/mod/chat/lang/tr.json              |   2 +-
 www/addons/mod/chat/lang/uk.json              |  19 ++
 www/addons/mod/chat/lang/zh-cn.json           |   2 +-
 www/addons/mod/chat/lang/zh-tw.json           |   4 +-
 www/addons/mod/choice/lang/ar.json            |   4 +-
 www/addons/mod/choice/lang/bg.json            |   6 +-
 www/addons/mod/choice/lang/ca.json            |   4 +-
 www/addons/mod/choice/lang/cs.json            |   6 +-
 www/addons/mod/choice/lang/da.json            |   8 +-
 www/addons/mod/choice/lang/de.json            |   8 +-
 www/addons/mod/choice/lang/el.json            |   6 +-
 www/addons/mod/choice/lang/es-mx.json         |   8 +-
 www/addons/mod/choice/lang/es.json            |   8 +-
 www/addons/mod/choice/lang/eu.json            |   8 +-
 www/addons/mod/choice/lang/fa.json            |   8 +-
 www/addons/mod/choice/lang/fr.json            |   6 +-
 www/addons/mod/choice/lang/he.json            |   8 +-
 www/addons/mod/choice/lang/hu.json            |   8 +-
 www/addons/mod/choice/lang/it.json            |   6 +-
 www/addons/mod/choice/lang/ja.json            |   4 +-
 www/addons/mod/choice/lang/lt.json            |   4 +-
 www/addons/mod/choice/lang/nl.json            |   8 +-
 www/addons/mod/choice/lang/pl.json            |   8 +-
 www/addons/mod/choice/lang/pt-br.json         |   6 +-
 www/addons/mod/choice/lang/pt.json            |   6 +-
 www/addons/mod/choice/lang/ro.json            |   6 +-
 www/addons/mod/choice/lang/ru.json            |   8 +-
 www/addons/mod/choice/lang/sv.json            |   8 +-
 www/addons/mod/choice/lang/tr.json            |   8 +-
 www/addons/mod/choice/lang/uk.json            |  20 ++
 www/addons/mod/choice/lang/zh-cn.json         |   8 +-
 www/addons/mod/choice/lang/zh-tw.json         |   8 +-
 www/addons/mod/feedback/lang/ar.json          |   8 +-
 www/addons/mod/feedback/lang/bg.json          |   4 +-
 www/addons/mod/feedback/lang/ca.json          |   8 +-
 www/addons/mod/feedback/lang/cs.json          |   6 +-
 www/addons/mod/feedback/lang/da.json          |   6 +-
 www/addons/mod/feedback/lang/de.json          |   8 +-
 www/addons/mod/feedback/lang/el.json          |   4 +-
 www/addons/mod/feedback/lang/es-mx.json       |  10 +-
 www/addons/mod/feedback/lang/es.json          |  10 +-
 www/addons/mod/feedback/lang/eu.json          |  10 +-
 www/addons/mod/feedback/lang/fa.json          |   8 +-
 www/addons/mod/feedback/lang/fr.json          |   2 +-
 www/addons/mod/feedback/lang/he.json          |   4 +-
 www/addons/mod/feedback/lang/hu.json          |   4 +-
 www/addons/mod/feedback/lang/it.json          |   8 +-
 www/addons/mod/feedback/lang/ja.json          |   8 +-
 www/addons/mod/feedback/lang/lt.json          |   4 +-
 www/addons/mod/feedback/lang/nl.json          |   4 +-
 www/addons/mod/feedback/lang/pl.json          |   4 +-
 www/addons/mod/feedback/lang/pt-br.json       |   6 +-
 www/addons/mod/feedback/lang/pt.json          |  10 +-
 www/addons/mod/feedback/lang/ro.json          |   6 +-
 www/addons/mod/feedback/lang/ru.json          |  14 +-
 www/addons/mod/feedback/lang/sv.json          |   8 +-
 www/addons/mod/feedback/lang/tr.json          |   4 +-
 www/addons/mod/feedback/lang/uk.json          |  35 +++
 www/addons/mod/feedback/lang/zh-cn.json       |  10 +-
 www/addons/mod/feedback/lang/zh-tw.json       |   8 +-
 www/addons/mod/folder/lang/ca.json            |   2 +-
 www/addons/mod/folder/lang/cs.json            |   2 +-
 www/addons/mod/folder/lang/de.json            |   2 +-
 www/addons/mod/folder/lang/es-mx.json         |   2 +-
 www/addons/mod/folder/lang/fr.json            |   2 +-
 www/addons/mod/folder/lang/it.json            |   2 +-
 www/addons/mod/folder/lang/nl.json            |   2 +-
 www/addons/mod/folder/lang/pt-br.json         |   2 +-
 www/addons/mod/folder/lang/uk.json            |   4 +
 www/addons/mod/forum/lang/ar.json             |   2 +-
 www/addons/mod/forum/lang/bg.json             |   4 +-
 www/addons/mod/forum/lang/da.json             |   4 +-
 www/addons/mod/forum/lang/de.json             |   2 +-
 www/addons/mod/forum/lang/es.json             |   2 +-
 www/addons/mod/forum/lang/fa.json             |   2 +-
 www/addons/mod/forum/lang/fr.json             |   2 +-
 www/addons/mod/forum/lang/he.json             |   2 +-
 www/addons/mod/forum/lang/lt.json             |   4 +-
 www/addons/mod/forum/lang/nl.json             |   2 +-
 www/addons/mod/forum/lang/pl.json             |   4 +-
 www/addons/mod/forum/lang/pt-br.json          |   2 +-
 www/addons/mod/forum/lang/pt.json             |   2 +-
 www/addons/mod/forum/lang/ro.json             |   4 +-
 www/addons/mod/forum/lang/ru.json             |   2 +-
 www/addons/mod/forum/lang/sv.json             |   2 +-
 www/addons/mod/forum/lang/tr.json             |   2 +-
 www/addons/mod/forum/lang/uk.json             |  30 +++
 www/addons/mod/forum/lang/zh-cn.json          |   4 +-
 www/addons/mod/forum/lang/zh-tw.json          |   4 +-
 www/addons/mod/glossary/lang/ca.json          |   2 +-
 www/addons/mod/glossary/lang/cs.json          |   2 +-
 www/addons/mod/glossary/lang/de.json          |   2 +-
 www/addons/mod/glossary/lang/el.json          |   2 +-
 www/addons/mod/glossary/lang/es-mx.json       |   2 +-
 www/addons/mod/glossary/lang/fr.json          |   2 +-
 www/addons/mod/glossary/lang/nl.json          |   2 +-
 www/addons/mod/glossary/lang/pt-br.json       |   2 +-
 www/addons/mod/glossary/lang/sv.json          |   2 +-
 www/addons/mod/glossary/lang/uk.json          |  20 ++
 www/addons/mod/imscp/lang/uk.json             |   3 +
 www/addons/mod/label/lang/uk.json             |   3 +
 www/addons/mod/lesson/lang/ar.json            |   6 +-
 www/addons/mod/lesson/lang/bg.json            |   6 +-
 www/addons/mod/lesson/lang/ca.json            |   8 +-
 www/addons/mod/lesson/lang/cs.json            |   6 +-
 www/addons/mod/lesson/lang/da.json            |   8 +-
 www/addons/mod/lesson/lang/de.json            |  12 +-
 www/addons/mod/lesson/lang/el.json            |   6 +-
 www/addons/mod/lesson/lang/es-mx.json         |   4 +-
 www/addons/mod/lesson/lang/es.json            |   4 +-
 www/addons/mod/lesson/lang/eu.json            |  12 +-
 www/addons/mod/lesson/lang/fa.json            |   8 +-
 www/addons/mod/lesson/lang/fr.json            |   6 +-
 www/addons/mod/lesson/lang/he.json            |   8 +-
 www/addons/mod/lesson/lang/it.json            |   8 +-
 www/addons/mod/lesson/lang/ja.json            |   8 +-
 www/addons/mod/lesson/lang/lt.json            |   4 +-
 www/addons/mod/lesson/lang/nl.json            |  12 +-
 www/addons/mod/lesson/lang/pl.json            |   8 +-
 www/addons/mod/lesson/lang/pt-br.json         |  12 +-
 www/addons/mod/lesson/lang/pt.json            |  16 +-
 www/addons/mod/lesson/lang/ro.json            |   4 +-
 www/addons/mod/lesson/lang/ru.json            |   8 +-
 www/addons/mod/lesson/lang/sv.json            |  10 +-
 www/addons/mod/lesson/lang/tr.json            |   8 +-
 www/addons/mod/lesson/lang/uk.json            |  83 ++++++++
 www/addons/mod/lesson/lang/zh-cn.json         |  10 +-
 www/addons/mod/lesson/lang/zh-tw.json         |   8 +-
 www/addons/mod/lti/lang/uk.json               |   5 +
 www/addons/mod/page/lang/uk.json              |   3 +
 www/addons/mod/quiz/lang/ar.json              |   8 +-
 www/addons/mod/quiz/lang/bg.json              |   4 +-
 www/addons/mod/quiz/lang/ca.json              |   6 +-
 www/addons/mod/quiz/lang/cs.json              |   6 +-
 www/addons/mod/quiz/lang/da.json              |   6 +-
 www/addons/mod/quiz/lang/de.json              |   4 +-
 www/addons/mod/quiz/lang/el.json              |   4 +-
 www/addons/mod/quiz/lang/es-mx.json           |   6 +-
 www/addons/mod/quiz/lang/es.json              |   6 +-
 www/addons/mod/quiz/lang/eu.json              |   8 +-
 www/addons/mod/quiz/lang/fa.json              |   6 +-
 www/addons/mod/quiz/lang/fr.json              |   6 +-
 www/addons/mod/quiz/lang/he.json              |   8 +-
 www/addons/mod/quiz/lang/hu.json              |   6 +-
 www/addons/mod/quiz/lang/it.json              |   4 +-
 www/addons/mod/quiz/lang/ja.json              |   8 +-
 www/addons/mod/quiz/lang/lt.json              |   6 +-
 www/addons/mod/quiz/lang/nl.json              |  10 +-
 www/addons/mod/quiz/lang/pl.json              |   4 +-
 www/addons/mod/quiz/lang/pt-br.json           |  12 +-
 www/addons/mod/quiz/lang/pt.json              |   4 +-
 www/addons/mod/quiz/lang/ro.json              |   8 +-
 www/addons/mod/quiz/lang/ru.json              |   4 +-
 www/addons/mod/quiz/lang/sv.json              |   8 +-
 www/addons/mod/quiz/lang/tr.json              |   8 +-
 www/addons/mod/quiz/lang/uk.json              |  80 +++++++
 www/addons/mod/quiz/lang/zh-cn.json           |   8 +-
 www/addons/mod/quiz/lang/zh-tw.json           |   8 +-
 www/addons/mod/resource/lang/uk.json          |   4 +
 www/addons/mod/scorm/lang/ar.json             |  10 +-
 www/addons/mod/scorm/lang/ca.json             |   4 +-
 www/addons/mod/scorm/lang/cs.json             |   8 +-
 www/addons/mod/scorm/lang/da.json             |  10 +-
 www/addons/mod/scorm/lang/de.json             |  10 +-
 www/addons/mod/scorm/lang/el.json             |   4 +-
 www/addons/mod/scorm/lang/es-mx.json          |   4 +-
 www/addons/mod/scorm/lang/es.json             |   4 +-
 www/addons/mod/scorm/lang/eu.json             |   4 +-
 www/addons/mod/scorm/lang/fa.json             |  10 +-
 www/addons/mod/scorm/lang/fr.json             |   4 +-
 www/addons/mod/scorm/lang/he.json             |  10 +-
 www/addons/mod/scorm/lang/hu.json             |   2 +-
 www/addons/mod/scorm/lang/it.json             |   8 +-
 www/addons/mod/scorm/lang/ja.json             |   4 +-
 www/addons/mod/scorm/lang/lt.json             |   4 +-
 www/addons/mod/scorm/lang/nl.json             |   4 +-
 www/addons/mod/scorm/lang/pl.json             |   4 +-
 www/addons/mod/scorm/lang/pt-br.json          |   6 +-
 www/addons/mod/scorm/lang/pt.json             |   4 +-
 www/addons/mod/scorm/lang/ro.json             |  10 +-
 www/addons/mod/scorm/lang/ru.json             |   4 +-
 www/addons/mod/scorm/lang/sv.json             |   8 +-
 www/addons/mod/scorm/lang/tr.json             |   8 +-
 www/addons/mod/scorm/lang/uk.json             |  51 +++++
 www/addons/mod/scorm/lang/zh-cn.json          |   6 +-
 www/addons/mod/scorm/lang/zh-tw.json          |  10 +-
 www/addons/mod/survey/lang/de.json            |   2 +-
 www/addons/mod/survey/lang/es-mx.json         |   2 +-
 www/addons/mod/survey/lang/es.json            |   2 +-
 www/addons/mod/survey/lang/eu.json            |   2 +-
 www/addons/mod/survey/lang/fa.json            |   2 +-
 www/addons/mod/survey/lang/fr.json            |   2 +-
 www/addons/mod/survey/lang/hu.json            |   2 +-
 www/addons/mod/survey/lang/it.json            |   2 +-
 www/addons/mod/survey/lang/ja.json            |   2 +-
 www/addons/mod/survey/lang/nl.json            |   2 +-
 www/addons/mod/survey/lang/pl.json            |   2 +-
 www/addons/mod/survey/lang/ru.json            |   2 +-
 www/addons/mod/survey/lang/sv.json            |   2 +-
 www/addons/mod/survey/lang/tr.json            |   2 +-
 www/addons/mod/survey/lang/uk.json            |   9 +
 www/addons/mod/survey/lang/zh-cn.json         |   2 +-
 www/addons/mod/survey/lang/zh-tw.json         |   2 +-
 www/addons/mod/url/lang/uk.json               |   4 +
 www/addons/mod/wiki/lang/ca.json              |   2 +-
 www/addons/mod/wiki/lang/cs.json              |   2 +-
 www/addons/mod/wiki/lang/de.json              |   2 +-
 www/addons/mod/wiki/lang/el.json              |   2 +-
 www/addons/mod/wiki/lang/es-mx.json           |   2 +-
 www/addons/mod/wiki/lang/fr.json              |   2 +-
 www/addons/mod/wiki/lang/nl.json              |   2 +-
 www/addons/mod/wiki/lang/pt-br.json           |   2 +-
 www/addons/mod/wiki/lang/ru.json              |   2 +-
 www/addons/mod/wiki/lang/tr.json              |   2 +-
 www/addons/mod/wiki/lang/uk.json              |  21 ++
 www/addons/myoverview/lang/nl.json            |   4 +-
 www/addons/notes/lang/ca.json                 |   2 +-
 www/addons/notes/lang/cs.json                 |   2 +-
 www/addons/notes/lang/de.json                 |   2 +-
 www/addons/notes/lang/el.json                 |   2 +-
 www/addons/notes/lang/es-mx.json              |   2 +-
 www/addons/notes/lang/fr.json                 |   2 +-
 www/addons/notes/lang/it.json                 |   2 +-
 www/addons/notes/lang/nl.json                 |   2 +-
 www/addons/notes/lang/pt-br.json              |   2 +-
 www/addons/notes/lang/ru.json                 |   2 +-
 www/addons/notes/lang/sv.json                 |   2 +-
 www/addons/notes/lang/uk.json                 |  13 ++
 www/addons/notifications/lang/de.json         |   4 +-
 www/addons/notifications/lang/eu.json         |   1 +
 www/addons/notifications/lang/fa.json         |   2 +-
 www/addons/notifications/lang/nl.json         |   2 +-
 www/addons/notifications/lang/pt-br.json      |   4 +-
 www/addons/notifications/lang/pt.json         |   1 +
 www/addons/notifications/lang/sv.json         |   2 +-
 www/addons/notifications/lang/uk.json         |   7 +
 www/addons/participants/lang/ca.json          |   2 +-
 www/addons/participants/lang/cs.json          |   4 +-
 www/addons/participants/lang/de.json          |   4 +-
 www/addons/participants/lang/el.json          |   2 +-
 www/addons/participants/lang/es-mx.json       |   2 +-
 www/addons/participants/lang/fr.json          |   2 +-
 www/addons/participants/lang/it.json          |   4 +-
 www/addons/participants/lang/nl.json          |   2 +-
 www/addons/participants/lang/pt-br.json       |   2 +-
 www/addons/participants/lang/sv.json          |   2 +-
 www/addons/participants/lang/tr.json          |   2 +-
 www/addons/participants/lang/uk.json          |   4 +
 www/addons/participants/lang/zh-cn.json       |   2 +-
 www/config.json                               |   2 +-
 www/core/components/contentlinks/lang/uk.json |   7 +
 www/core/components/course/lang/ca.json       |   2 +-
 www/core/components/course/lang/cs.json       |   2 +-
 www/core/components/course/lang/de.json       |   2 +-
 www/core/components/course/lang/el.json       |   2 +-
 www/core/components/course/lang/es-mx.json    |   4 +-
 www/core/components/course/lang/fa.json       |   4 +-
 www/core/components/course/lang/fr.json       |   2 +-
 www/core/components/course/lang/it.json       |   2 +-
 www/core/components/course/lang/nl.json       |   2 +-
 www/core/components/course/lang/pt-br.json    |   4 +-
 www/core/components/course/lang/ru.json       |   2 +-
 www/core/components/course/lang/sv.json       |   2 +-
 www/core/components/course/lang/tr.json       |   4 +-
 www/core/components/course/lang/uk.json       |  22 ++
 www/core/components/course/lang/zh-cn.json    |   2 +-
 www/core/components/courses/lang/ca.json      |   8 +-
 www/core/components/courses/lang/cs.json      |  10 +-
 www/core/components/courses/lang/de.json      |  10 +-
 www/core/components/courses/lang/el.json      |   8 +-
 www/core/components/courses/lang/es-mx.json   |   6 +-
 www/core/components/courses/lang/fr.json      |   6 +-
 www/core/components/courses/lang/it.json      |   6 +-
 www/core/components/courses/lang/nl.json      |  10 +-
 www/core/components/courses/lang/pt-br.json   |   8 +-
 www/core/components/courses/lang/sv.json      |  10 +-
 www/core/components/courses/lang/uk.json      |  27 +++
 www/core/components/fileuploader/lang/ca.json |   8 +-
 www/core/components/fileuploader/lang/cs.json |  10 +-
 www/core/components/fileuploader/lang/de.json |   6 +-
 www/core/components/fileuploader/lang/el.json |   8 +-
 .../components/fileuploader/lang/es-mx.json   |   8 +-
 www/core/components/fileuploader/lang/fr.json |  10 +-
 www/core/components/fileuploader/lang/it.json |  10 +-
 www/core/components/fileuploader/lang/nl.json |  12 +-
 .../components/fileuploader/lang/pt-br.json   |   8 +-
 www/core/components/fileuploader/lang/ru.json |   8 +-
 www/core/components/fileuploader/lang/sv.json |   6 +-
 www/core/components/fileuploader/lang/tr.json |   2 +-
 www/core/components/fileuploader/lang/uk.json |  25 +++
 .../components/fileuploader/lang/zh-cn.json   |   2 +-
 www/core/components/grades/lang/uk.json       |  15 ++
 www/core/components/login/lang/cs.json        |   4 +-
 www/core/components/login/lang/de.json        |   2 +-
 www/core/components/login/lang/el.json        |   2 +-
 www/core/components/login/lang/es-mx.json     |   4 +-
 www/core/components/login/lang/fr.json        |   4 +-
 www/core/components/login/lang/it.json        |   2 +-
 www/core/components/login/lang/nl.json        |   4 +-
 www/core/components/login/lang/pt-br.json     |   4 +-
 www/core/components/login/lang/pt.json        |   2 +-
 www/core/components/login/lang/ru.json        |   2 +-
 www/core/components/login/lang/sv.json        |   2 +-
 www/core/components/login/lang/uk.json        |  77 +++++++
 www/core/components/question/lang/ca.json     |   2 +-
 www/core/components/question/lang/cs.json     |   2 +-
 www/core/components/question/lang/de.json     |   2 +-
 www/core/components/question/lang/es-mx.json  |   2 +-
 www/core/components/question/lang/fr.json     |   2 +-
 www/core/components/question/lang/it.json     |   2 +-
 www/core/components/question/lang/nl.json     |   2 +-
 www/core/components/question/lang/pt-br.json  |   2 +-
 www/core/components/question/lang/uk.json     |  21 ++
 www/core/components/settings/lang/it.json     |   1 +
 www/core/components/settings/lang/uk.json     |  58 +++++
 www/core/components/sharedfiles/lang/ca.json  |   2 +-
 www/core/components/sharedfiles/lang/cs.json  |   2 +-
 www/core/components/sharedfiles/lang/de.json  |   2 +-
 .../components/sharedfiles/lang/es-mx.json    |   2 +-
 www/core/components/sharedfiles/lang/tr.json  |   2 +-
 www/core/components/sharedfiles/lang/uk.json  |  11 +
 www/core/components/sidemenu/lang/ca.json     |   2 +-
 www/core/components/sidemenu/lang/cs.json     |   4 +-
 www/core/components/sidemenu/lang/es-mx.json  |   2 +-
 www/core/components/sidemenu/lang/fa.json     |   4 +-
 www/core/components/sidemenu/lang/nl.json     |   2 +-
 www/core/components/sidemenu/lang/uk.json     |   9 +
 www/core/components/sidemenu/lang/zh-cn.json  |   2 +-
 www/core/components/user/lang/ca.json         |   4 +-
 www/core/components/user/lang/cs.json         |   6 +-
 www/core/components/user/lang/de.json         |   6 +-
 www/core/components/user/lang/es-mx.json      |   6 +-
 www/core/components/user/lang/fa.json         |   6 +-
 www/core/components/user/lang/fr.json         |   8 +-
 www/core/components/user/lang/it.json         |   6 +-
 www/core/components/user/lang/nl.json         |   4 +-
 www/core/components/user/lang/pt-br.json      |   6 +-
 www/core/components/user/lang/ru.json         |   6 +-
 www/core/components/user/lang/sv.json         |   8 +-
 www/core/components/user/lang/tr.json         |   8 +-
 www/core/components/user/lang/uk.json         |  26 +++
 www/core/components/user/lang/zh-cn.json      |   4 +-
 www/core/lang/ca.json                         |   8 +-
 www/core/lang/cs.json                         |  14 +-
 www/core/lang/de.json                         |  18 +-
 www/core/lang/el.json                         |  24 +--
 www/core/lang/es-mx.json                      |  22 +-
 www/core/lang/eu.json                         |   5 +-
 www/core/lang/fr.json                         |  10 +-
 www/core/lang/it.json                         |  22 +-
 www/core/lang/nl.json                         |  18 +-
 www/core/lang/pt-br.json                      |  20 +-
 www/core/lang/pt.json                         |   5 +-
 www/core/lang/sv.json                         |  20 +-
 www/core/lang/tr.json                         |   2 +-
 www/core/lang/uk.json                         | 199 ++++++++++++++++++
 469 files changed, 2397 insertions(+), 1234 deletions(-)
 create mode 100644 www/addons/badges/lang/uk.json
 create mode 100644 www/addons/calendar/lang/uk.json
 create mode 100644 www/addons/competency/lang/uk.json
 create mode 100644 www/addons/coursecompletion/lang/uk.json
 create mode 100644 www/addons/files/lang/uk.json
 create mode 100644 www/addons/frontpage/lang/uk.json
 create mode 100644 www/addons/grades/lang/uk.json
 create mode 100644 www/addons/messageoutput/airnotifier/lang/uk.json
 create mode 100644 www/addons/messages/lang/uk.json
 create mode 100644 www/addons/mod/assign/lang/uk.json
 create mode 100644 www/addons/mod/chat/lang/uk.json
 create mode 100644 www/addons/mod/choice/lang/uk.json
 create mode 100644 www/addons/mod/feedback/lang/uk.json
 create mode 100644 www/addons/mod/folder/lang/uk.json
 create mode 100644 www/addons/mod/forum/lang/uk.json
 create mode 100644 www/addons/mod/glossary/lang/uk.json
 create mode 100644 www/addons/mod/imscp/lang/uk.json
 create mode 100644 www/addons/mod/label/lang/uk.json
 create mode 100644 www/addons/mod/lesson/lang/uk.json
 create mode 100644 www/addons/mod/lti/lang/uk.json
 create mode 100644 www/addons/mod/page/lang/uk.json
 create mode 100644 www/addons/mod/quiz/lang/uk.json
 create mode 100644 www/addons/mod/resource/lang/uk.json
 create mode 100644 www/addons/mod/scorm/lang/uk.json
 create mode 100644 www/addons/mod/survey/lang/uk.json
 create mode 100644 www/addons/mod/url/lang/uk.json
 create mode 100644 www/addons/mod/wiki/lang/uk.json
 create mode 100644 www/addons/notes/lang/uk.json
 create mode 100644 www/addons/notifications/lang/uk.json
 create mode 100644 www/addons/participants/lang/uk.json
 create mode 100644 www/core/components/contentlinks/lang/uk.json
 create mode 100644 www/core/components/course/lang/uk.json
 create mode 100644 www/core/components/courses/lang/uk.json
 create mode 100644 www/core/components/fileuploader/lang/uk.json
 create mode 100644 www/core/components/grades/lang/uk.json
 create mode 100644 www/core/components/login/lang/uk.json
 create mode 100644 www/core/components/question/lang/uk.json
 create mode 100644 www/core/components/settings/lang/uk.json
 create mode 100644 www/core/components/sharedfiles/lang/uk.json
 create mode 100644 www/core/components/sidemenu/lang/uk.json
 create mode 100644 www/core/components/user/lang/uk.json
 create mode 100644 www/core/lang/uk.json

diff --git a/www/addons/badges/lang/uk.json b/www/addons/badges/lang/uk.json
new file mode 100644
index 00000000000..6ed6729d125
--- /dev/null
+++ b/www/addons/badges/lang/uk.json
@@ -0,0 +1,12 @@
+{
+    "badgedetails": "Детальніше про відзнаку",
+    "badges": "Відзнаки",
+    "contact": "Контакт",
+    "dateawarded": "Дата отримання",
+    "expirydate": "Дата завершення",
+    "issuancedetails": "Відзнака не актуальна",
+    "issuerdetails": "Деталі присудження",
+    "issuername": "Ім’я видавця",
+    "nobadges": "Немає доступних відзнак.",
+    "recipientdetails": "Деталі отримувача"
+}
\ No newline at end of file
diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index 93d27c11dce..dc0b5327079 100644
--- a/www/addons/calendar/lang/cs.json
+++ b/www/addons/calendar/lang/cs.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Výchozí čas oznámení",
     "errorloadevent": "Chyba při načítání události.",
     "errorloadevents": "Chyba při načítání událostí.",
-    "noevents": "Nejsou žádné události",
-    "notifications": "Upozornění"
+    "noevents": "Žádné nadcházející činnosti",
+    "notifications": "Oznámení"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/de.json b/www/addons/calendar/lang/de.json
index ee64dc04300..ba88248af7f 100644
--- a/www/addons/calendar/lang/de.json
+++ b/www/addons/calendar/lang/de.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standardmäßige Benachrichtigungszeit",
     "errorloadevent": "Fehler beim Laden des Kalendereintrags",
     "errorloadevents": "Fehler beim Laden der Kalendereinträge",
-    "noevents": "Keine Kalendereinträge",
-    "notifications": "Benachrichtigung"
+    "noevents": "Keine anstehenden Aktivitäten fällig",
+    "notifications": "Benachrichtigungen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es-mx.json b/www/addons/calendar/lang/es-mx.json
index 872b31813b4..d54a5abc6ad 100644
--- a/www/addons/calendar/lang/es-mx.json
+++ b/www/addons/calendar/lang/es-mx.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificación por defecto",
     "errorloadevent": "Error al cargar evento.",
     "errorloadevents": "Error al cargar eventos.",
-    "noevents": "No hay eventos",
+    "noevents": "No hay actividades próximas pendientes",
     "notifications": "Notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 109ac4e7ec6..344affea7df 100644
--- a/www/addons/calendar/lang/fa.json
+++ b/www/addons/calendar/lang/fa.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "زمان پیش‌فرض اطلاع‌رسانی",
     "errorloadevent": "خطا در بارگیری رویداد.",
     "errorloadevents": "خطا در بارگیری رویدادها.",
-    "noevents": "هیچ رویدادی نیست",
-    "notifications": "هشدارها"
+    "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
+    "notifications": "اطلاعیه‌ها"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fr.json b/www/addons/calendar/lang/fr.json
index 79e2b2edcac..9281fbdabb5 100644
--- a/www/addons/calendar/lang/fr.json
+++ b/www/addons/calendar/lang/fr.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Heure de notification par défaut",
     "errorloadevent": "Erreur de chargement de l'événement",
     "errorloadevents": "Erreur de chargement des événements",
-    "noevents": "Il n'y a pas d'événement",
+    "noevents": "Aucune activité",
     "notifications": "Notifications"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/it.json b/www/addons/calendar/lang/it.json
index 7dda0726c1e..bd05740cedc 100644
--- a/www/addons/calendar/lang/it.json
+++ b/www/addons/calendar/lang/it.json
@@ -2,6 +2,6 @@
     "calendarevents": "Eventi nel calendario",
     "errorloadevent": "Si è verificato un errore durante il caricamento degli eventi.",
     "errorloadevents": "Si è verificato un errore durante il caricamento degli eventi.",
-    "noevents": "Non ci sono eventi",
+    "noevents": "Non ci sono attività da svolgere",
     "notifications": "Notifiche"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/nl.json b/www/addons/calendar/lang/nl.json
index 5c7174a3165..16546e8a4ee 100644
--- a/www/addons/calendar/lang/nl.json
+++ b/www/addons/calendar/lang/nl.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standaard notificatietijd",
     "errorloadevent": "Fout bij het laden van de gebeurtenis.",
     "errorloadevents": "Fout bij het laden van de gebeurtenissen.",
-    "noevents": "Er zijn geen gebeurtenissen",
+    "noevents": "Er zijn geen verwachte activiteiten",
     "notifications": "Meldingen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index b348e89bed4..77451b11a5d 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
     "noevents": "Sem eventos",
-    "notifications": "Notificação"
+    "notifications": "Notificações"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sv.json b/www/addons/calendar/lang/sv.json
index d5ac5c127d0..7599b1d1f89 100644
--- a/www/addons/calendar/lang/sv.json
+++ b/www/addons/calendar/lang/sv.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fel vid inläsning av händelse.",
     "errorloadevents": "Fel vid inläsning av händelser",
     "noevents": "Det finns inga händelser",
-    "notifications": "Notifikationer"
+    "notifications": "Meddelande"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/uk.json b/www/addons/calendar/lang/uk.json
new file mode 100644
index 00000000000..2a2f34438be
--- /dev/null
+++ b/www/addons/calendar/lang/uk.json
@@ -0,0 +1,8 @@
+{
+    "calendarevents": "Події календаря",
+    "defaultnotificationtime": "Час сповіщень за-замовчуванням",
+    "errorloadevent": "Помилка завантаження події.",
+    "errorloadevents": "Помилка завантаження подій.",
+    "noevents": "Немає подій",
+    "notifications": "Повідомлення"
+}
\ No newline at end of file
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index 92fe71cb17a..91a5c0fde71 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -10,7 +10,7 @@
     "learningplans": "Plans d'aprenentatge",
     "myplans": "Els meus plans d'aprenentatge",
     "noactivities": "Cap activitat",
-    "nocompetencies": "Cap competència",
+    "nocompetencies": "No s'han creat competències en aquest marc.",
     "nocrossreferencedcompetencies": "No hi ha competències amb referències a aquesta.",
     "noevidence": "Cap evidència",
     "noplanswerecreated": "No s'ha creat cap pla d'aprenentatge.",
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index bc6d5945d5e..2e584cd9176 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -12,7 +12,7 @@
     "learningplans": "Studijní plány",
     "myplans": "Mé studijní plány",
     "noactivities": "Žádné činnosti",
-    "nocompetencies": "Žádné kompetence",
+    "nocompetencies": "V tomto rámci nebyly vytvořeny žádné kompetence.",
     "nocrossreferencedcompetencies": "K této kompetenci nebyly spojeny další průřezové kompetence.",
     "noevidence": "Bez záznamu",
     "noplanswerecreated": "Nebyly vytvořeny žádné studijní plány.",
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index e5efd8aed97..744b6c16535 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -12,7 +12,7 @@
     "learningplans": "Lernpläne",
     "myplans": "Meine Lernpläne",
     "noactivities": "Keine Aktivitäten",
-    "nocompetencies": "Keine Kompetenzen",
+    "nocompetencies": "Für diesen Kompetenzrahmen wurden keine Kompetenzen angelegt.",
     "nocrossreferencedcompetencies": "Keine anderen Kompetenzen wurden zu dieser Kompetenz referiert.",
     "noevidence": "Keine Belege",
     "noplanswerecreated": "Bisher sind keine Lernpläne angelegt.",
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index 4c7800dd8dd..b6b1c272d25 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -12,7 +12,7 @@
     "learningplans": "Planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
-    "nocompetencies": "Sin competencias",
+    "nocompetencies": "No se han creado competencias en esta estructura.",
     "nocrossreferencedcompetencies": "No se han referenciado cruzadamente otras competencias con esta competencia.",
     "noevidence": "Sin evidencia",
     "noplanswerecreated": "No se crearon planes de aprendizaje.",
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index e0ba3a63fde..f8af723914c 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -12,7 +12,7 @@
     "learningplans": "Plans de formation",
     "myplans": "Mes plans de formation",
     "noactivities": "Aucune activité",
-    "nocompetencies": "Aucune compétence",
+    "nocompetencies": "Aucune compétence n'a été créée dans ce référentiel.",
     "nocrossreferencedcompetencies": "Aucune autre compétence n'est transversale pour cette compétence.",
     "noevidence": "Aucune preuve d'acquis",
     "noplanswerecreated": "Aucun plan de formation n'a été créé.",
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index 3f31d62120d..aedcc17cab4 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -12,7 +12,7 @@
     "learningplans": "Piani di formazione",
     "myplans": "I miei piani di formazione",
     "noactivities": "Nessuna attività.",
-    "nocompetencies": "Non sono presenti competenze",
+    "nocompetencies": "Questo quadro non ha competenze",
     "nocrossreferencedcompetencies": "Non ci sono competenze con riferimenti incrociati a questa competenza",
     "noevidence": "Non sono presenti attestazioni.",
     "noplanswerecreated": "Non sono stati creati piani di formazione",
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index ef153319741..8f923295c43 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -12,7 +12,7 @@
     "learningplans": "Studieplannen",
     "myplans": "Mijn studieplannen",
     "noactivities": "Geen activiteiten",
-    "nocompetencies": "Geen competenties",
+    "nocompetencies": "Er zijn nog geen competenties gemaakt in dit framework",
     "nocrossreferencedcompetencies": "Er zijn geen andere competenties met een kruisverwijzing naar deze competentie.",
     "noevidence": "Geen bewijs",
     "noplanswerecreated": "Er zijn nog geen studieplannen gemaakt",
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index 2a38ec28be7..b63b0689b05 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -12,7 +12,7 @@
     "learningplans": "Planos de aprendizagem",
     "myplans": "Meus planos de aprendizagem",
     "noactivities": "Sem atividades",
-    "nocompetencies": "Nenhuma competência",
+    "nocompetencies": "Nenhuma competência foi criada para esta estrutura.",
     "nocrossreferencedcompetencies": "Nenhuma outra competência foi referenciada a esta competência.",
     "noevidence": "Nenhuma evidência",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
diff --git a/www/addons/competency/lang/uk.json b/www/addons/competency/lang/uk.json
new file mode 100644
index 00000000000..a3bc8358537
--- /dev/null
+++ b/www/addons/competency/lang/uk.json
@@ -0,0 +1,28 @@
+{
+    "activities": "Діяльності",
+    "competenciesmostoftennotproficientincourse": "Компетентності, які найчастіше не досягаються у цьому курсі",
+    "coursecompetencies": "Компетентності курсу",
+    "coursecompetencyratingsarenotpushedtouserplans": "Оцінювання компетентностей цього курсу не впливають на навчальні плани",
+    "coursecompetencyratingsarepushedtouserplans": "Оцінювання компетентностей цього курсу будуть зразу  передані в навчальні плани.",
+    "crossreferencedcompetencies": "Пов'язані компетентності",
+    "duedate": "Термін завершення",
+    "errornocompetenciesfound": "Не знайдено компетенції",
+    "evidence": "Підтвердження",
+    "learningplancompetencies": "Компетентності навчального плану",
+    "learningplans": "Навчальний план",
+    "myplans": "Мої навчальні плани",
+    "noactivities": "Жодної діяльності",
+    "nocompetencies": "Жодної компетентності не створено у цьому репозиторії",
+    "nocrossreferencedcompetencies": "Жодна інша компетентність не пов'язана з даною",
+    "noevidence": "Жодного підтвердження",
+    "noplanswerecreated": "Жодного навчального плану не було створено",
+    "path": "Шлях:",
+    "proficient": "Набута компетентність",
+    "progress": "Прогрес",
+    "rating": "Оцінювання",
+    "reviewstatus": "Статус підтвердження",
+    "status": "Дозволити доступ для гостя",
+    "template": "Шаблон навчального плану",
+    "xcompetenciesproficientoutofy": "{{$a.x}} компетентностей з {{$a.y}} набуті",
+    "xcompetenciesproficientoutofyincourse": "Ви набули {{$a.x}} компетентностей з {{$a.y}} наявних у цьому курсі"
+}
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ca.json b/www/addons/coursecompletion/lang/ca.json
index c8c2a11d5e0..9a551225fed 100644
--- a/www/addons/coursecompletion/lang/ca.json
+++ b/www/addons/coursecompletion/lang/ca.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Complet",
+    "complete": "Completa",
     "completecourse": "Curs complet",
     "completed": "Completat",
     "completiondate": "Data de compleció",
     "couldnotloadreport": "No es pot carregar l'informe de compleció del curs, torneu a intentar-ho més tard.",
-    "coursecompletion": "Compleció del curs",
+    "coursecompletion": "Els usuaris han de completar aquest curs.",
     "criteria": "Criteris",
     "criteriagroup": "Grup de criteris",
-    "criteriarequiredall": "Calen tots els criteris del dessota",
-    "criteriarequiredany": "Cal qualsevol dels criteris del dessota",
+    "criteriarequiredall": "Cal que es compleixin tots els criteris que es mostren a continuació",
+    "criteriarequiredany": "Cal que es compleixi algun dels criteris que es mostren a continuació",
     "inprogress": "En curs",
     "manualselfcompletion": "Auto-compleció manual",
     "notyetstarted": "No s'ha començat encara",
-    "pending": "Pendents",
-    "required": "Necessari",
+    "pending": "Pendent",
+    "required": "Requerit",
     "requiredcriteria": "Criteri requerit",
     "requirement": "Requisit",
-    "status": "Estat",
+    "status": "Permetre l'accés de visitants",
     "viewcoursereport": "Visualitza l'informe del curs"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/cs.json b/www/addons/coursecompletion/lang/cs.json
index f54632d92c0..ba2add0dc81 100644
--- a/www/addons/coursecompletion/lang/cs.json
+++ b/www/addons/coursecompletion/lang/cs.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Absolvováno",
+    "complete": "Hotovo",
     "completecourse": "Absolvovaný kurz",
-    "completed": "Splněno",
+    "completed": "Dokončeno",
     "completiondate": "Datum ukončení",
     "couldnotloadreport": "Nelze načíst zprávu o absolvování kurzu, zkuste to prosím později.",
-    "coursecompletion": "Absolvování kurzu",
-    "criteria": "Kritéria",
+    "coursecompletion": "Studenti musí absolvovat tento kurz",
+    "criteria": "Podmínky",
     "criteriagroup": "Skupina podmínek",
-    "criteriarequiredall": "Jsou požadovány všechny podmínky",
-    "criteriarequiredany": "Je požadována libovolná podmínka",
-    "inprogress": "Probíhá",
-    "manualselfcompletion": "Ručně nastavené absolvování kurzu samotným studentem",
+    "criteriarequiredall": "Všechny podmínky musí být splněny",
+    "criteriarequiredany": "Jakákoli z podmínek musí být splněna",
+    "inprogress": "Probíhající",
+    "manualselfcompletion": "Označení absolvování kurzu samotným studentem",
     "notyetstarted": "Zatím nezačalo",
-    "pending": "Čeká",
-    "required": "Požadováno",
-    "requiredcriteria": "Požadovaná kriteria",
+    "pending": "Probíhající",
+    "required": "Povinné",
+    "requiredcriteria": "Vyžadované podmínky",
     "requirement": "Požadavek",
-    "status": "Status",
-    "viewcoursereport": "Zobrazit sestavu kurzu"
+    "status": "Povolit přístup pro hosty",
+    "viewcoursereport": "Zobrazit přehled kurzu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/de.json b/www/addons/coursecompletion/lang/de.json
index 7125646d332..926a8f3eed6 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Abschließen",
+    "complete": "Vollständig",
     "completecourse": "Kurs abschließen",
     "completed": "Abgeschlossen",
     "completiondate": "Abschlussdatum",
     "couldnotloadreport": "Fehler beim Laden des Kursabschlussberichts. Versuchen Sie es später noch einmal.",
-    "coursecompletion": "Kursabschluss",
+    "coursecompletion": "Teilnehmer/innen müssen diesen Kurs abschließen.",
     "criteria": "Kriterien",
     "criteriagroup": "Kriteriengruppe",
-    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig.",
-    "criteriarequiredany": "Ein nachfolgendes Kriterium ist notwendig.",
-    "inprogress": "In Arbeit",
-    "manualselfcompletion": "Manueller Selbstabschluss",
-    "notyetstarted": "Nicht begonnen",
-    "pending": "Nicht erledigt",
+    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig",
+    "criteriarequiredany": "Eine der nachfolgenden Kriterien ist notwendig",
+    "inprogress": "Laufend",
+    "manualselfcompletion": "Manueller eigener Abschluss",
+    "notyetstarted": "Noch nicht begonnen",
+    "pending": "Wartend",
     "required": "Notwendig",
-    "requiredcriteria": "Notwendige Kriterien",
+    "requiredcriteria": "Notwendiges Kriterium",
     "requirement": "Anforderung",
-    "status": "Status",
-    "viewcoursereport": "Kursbericht anzeigen"
+    "status": "Gastzugang erlauben",
+    "viewcoursereport": "Kursbericht ansehen"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index 555b60517bd..4152345abc0 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -7,15 +7,15 @@
     "coursecompletion": "Ολοκλήρωση μαθήματος",
     "criteria": "Κριτήρια",
     "criteriagroup": "Ομάδα κριτηρίων",
-    "criteriarequiredall": "Όλα τα παρακάτω κριτήρια είναι υποχρεωτικά",
-    "criteriarequiredany": "Οποιοδήποτε από τα παρακάτω κριτήρια είναι υποχρεωτικά",
+    "criteriarequiredall": "Όλα τα παρακάτω κριτήρια είναι απαραίτητα",
+    "criteriarequiredany": "Τα παρακάτω κριτήρια είναι απαραίτητα",
     "inprogress": "Σε εξέλιξη",
     "manualselfcompletion": "Χειροκίνητη αυτό-ολοκλήρωση",
     "notyetstarted": "Δεν έχει ξεκινήσει ακόμα",
-    "pending": "Εκκρεμής",
+    "pending": "Σε εκκρεμότητα",
     "required": "Απαιτείται",
     "requiredcriteria": "Απαιτούμενα κριτήρια",
     "requirement": "Απαίτηση",
-    "status": "Κατάσταση",
-    "viewcoursereport": "Δείτε την αναφορά μαθήματος"
+    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
+    "viewcoursereport": "Προβολή αναφορά μαθήματος"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es-mx.json b/www/addons/coursecompletion/lang/es-mx.json
index 0252ef2ea82..72d16395f3d 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Completada",
     "completecourse": "Curso completo",
-    "completed": "Completado",
+    "completed": "Finalizado",
     "completiondate": "Fecha de terminación",
     "couldnotloadreport": "No pudo cargarse el reporte de finalización del curso; por favor inténtelo más tarde.",
-    "coursecompletion": "Finalización del curso",
-    "criteria": "Criterio",
-    "criteriagroup": "Grupo de criterio",
-    "criteriarequiredall": "Todos los criterios debajo son necesarios",
-    "criteriarequiredany": "Cualquiera de los criterios debajo es necesarios",
-    "inprogress": "en progreso",
-    "manualselfcompletion": "Auto finalización manual",
-    "notyetstarted": "Todavía no iniciado",
+    "coursecompletion": "Los usuarios deben completar este curso.",
+    "criteria": "Criterios",
+    "criteriagroup": "Grupo de criterios",
+    "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
+    "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
+    "inprogress": "En progreso",
+    "manualselfcompletion": "Auto-finalizar manualmente",
+    "notyetstarted": "Aún no ha comenzado",
     "pending": "Pendiente",
     "required": "Requerido",
-    "requiredcriteria": "Criterio requerido",
+    "requiredcriteria": "Criterios necesarios",
     "requirement": "Requisito",
-    "status": "Estatus",
+    "status": "Se permite el acceso de invitados",
     "viewcoursereport": "Ver reporte del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fa.json b/www/addons/coursecompletion/lang/fa.json
index 75f68e394ac..e785f269e31 100644
--- a/www/addons/coursecompletion/lang/fa.json
+++ b/www/addons/coursecompletion/lang/fa.json
@@ -12,6 +12,6 @@
     "pending": "معلق",
     "required": "اجباری",
     "requiredcriteria": "ضوابط مورد نیاز",
-    "status": "وضعیت",
-    "viewcoursereport": "مشاهدهٔ گزارش درس"
+    "status": "اجازهٔ ورود به عنوان مهمان",
+    "viewcoursereport": "مشاهده گزارش درس"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fr.json b/www/addons/coursecompletion/lang/fr.json
index 9b7c1642571..5f763cc0ad5 100644
--- a/www/addons/coursecompletion/lang/fr.json
+++ b/www/addons/coursecompletion/lang/fr.json
@@ -4,7 +4,7 @@
     "completed": "Terminé",
     "completiondate": "Date d'achèvement",
     "couldnotloadreport": "Impossible de charger le rapport d'achèvement de cours. Veuillez essayer plus tard.",
-    "coursecompletion": "Achèvement du cours",
+    "coursecompletion": "Les participants doivent achever ce cours.",
     "criteria": "Critères",
     "criteriagroup": "Groupe de critères",
     "criteriarequiredall": "Tous les critères ci-dessous sont requis",
@@ -16,6 +16,6 @@
     "required": "Requis",
     "requiredcriteria": "Critères requis",
     "requirement": "Condition",
-    "status": "Statut",
-    "viewcoursereport": "Afficher le rapport du cours"
+    "status": "Permettre l'accès anonyme",
+    "viewcoursereport": "Consulter le rapport du cours"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/it.json b/www/addons/coursecompletion/lang/it.json
index 6521061e031..cac35851b3a 100644
--- a/www/addons/coursecompletion/lang/it.json
+++ b/www/addons/coursecompletion/lang/it.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completato",
+    "complete": "Completo",
     "completecourse": "Corso completato",
     "completed": "Completato",
     "completiondate": "Data di completamento",
     "couldnotloadreport": "Non è stato possibile caricare il report di completamento del corso, per favore riporva.",
-    "coursecompletion": "Completamento del corso",
+    "coursecompletion": "Gli utenti devono completare il corso",
     "criteria": "Criteri",
     "criteriagroup": "Gruppo di criteri",
     "criteriarequiredall": "E' richiesto il soddisfacimento di tutti i criteri elencati",
     "criteriarequiredany": "E' richiesto il soddisfacimento di almeno uno dei criteri elencati",
-    "inprogress": "In svolgimento",
+    "inprogress": "in svolgimento",
     "manualselfcompletion": "Conferma personale di completamento",
-    "notyetstarted": "Non iniziato",
+    "notyetstarted": "Non ancora iniziato",
     "pending": "In attesa",
-    "required": "Da soddisfare",
+    "required": "Obbligatorio",
     "requiredcriteria": "Criteri da soddisfare",
     "requirement": "Requisito",
-    "status": "Stato",
-    "viewcoursereport": "Visualizza report del corso"
+    "status": "Consenti l'accesso agli ospiti",
+    "viewcoursereport": "Visualizza il report del corso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/nl.json b/www/addons/coursecompletion/lang/nl.json
index 78f31da0ac9..a6a621c5fa0 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Voltooi",
+    "complete": "Volledig",
     "completecourse": "Voltooi cursus",
-    "completed": "Voltooid",
+    "completed": "Volledig",
     "completiondate": "Voltooiingsdatum",
     "couldnotloadreport": "Kon het voltooiingsrapport van de cursus niet laden. Probeer later opnieuw.",
-    "coursecompletion": "Cursus voltooiing",
+    "coursecompletion": "Leerlingen moeten deze cursus voltooien.",
     "criteria": "Criteria",
     "criteriagroup": "Criteria groep",
     "criteriarequiredall": "Alle onderstaande criteria zijn vereist",
-    "criteriarequiredany": "Alle onderstaande criteria zijn vereist",
-    "inprogress": "Bezig",
-    "manualselfcompletion": "Handmatige zelf-voltooiing",
-    "notyetstarted": "Nog niet gestart",
-    "pending": "Nog bezig",
+    "criteriarequiredany": "Al onderstaande criteria zijn vereist",
+    "inprogress": "Actief",
+    "manualselfcompletion": "Manueel voltooien",
+    "notyetstarted": "Nog niet begonnen",
+    "pending": "In behandeling",
     "required": "Vereist",
     "requiredcriteria": "Vereiste criteria",
     "requirement": "Vereiste",
-    "status": "Status",
+    "status": "Gasttoegang toestaan",
     "viewcoursereport": "Bekijk cursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt-br.json b/www/addons/coursecompletion/lang/pt-br.json
index da82565edc9..ca01e849231 100644
--- a/www/addons/coursecompletion/lang/pt-br.json
+++ b/www/addons/coursecompletion/lang/pt-br.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Concluído",
+    "complete": "Completo",
     "completecourse": "Curso concluído",
-    "completed": "Completado",
+    "completed": "Concluído",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão do curso, por favor tente novamente mais tarde.",
-    "coursecompletion": "Conclusão do curso",
+    "coursecompletion": "Participantes precisam completar este curso.",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
     "criteriarequiredall": "Todos os critérios abaixo são necessários",
-    "criteriarequiredany": "Quaisquer critérios abaixo são necessários",
-    "inprogress": "Em progresso",
-    "manualselfcompletion": "Auto conclusão manual",
-    "notyetstarted": "Ainda não começou",
+    "criteriarequiredany": "Qualquer um dos critérios abaixo são necessários",
+    "inprogress": "Em andamento",
+    "manualselfcompletion": "Conclusão manual por si mesmo",
+    "notyetstarted": "Não iniciado ainda",
     "pending": "Pendente",
-    "required": "Necessário",
-    "requiredcriteria": "Critério necessário",
+    "required": "Obrigatório",
+    "requiredcriteria": "Critérios exigidos",
     "requirement": "Exigência",
-    "status": "Condição",
-    "viewcoursereport": "Ver relatório de curso"
+    "status": "Permitir o acesso de visitantes",
+    "viewcoursereport": "Ver relatório do curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ru.json b/www/addons/coursecompletion/lang/ru.json
index dbd50c8ad09..ad7b8ac320c 100644
--- a/www/addons/coursecompletion/lang/ru.json
+++ b/www/addons/coursecompletion/lang/ru.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Завершить",
+    "complete": "Выполнен",
     "completecourse": "Завершить курс",
-    "completed": "Завершен",
+    "completed": "Завершено",
     "completiondate": "Дата завершения",
-    "coursecompletion": "Завершение курса",
+    "coursecompletion": "Пользователи должны завершить этот курс.",
     "criteria": "Критерии",
-    "criteriagroup": "Критерии группы",
-    "criteriarequiredall": "Все приведенные ниже критерии являются обязательными",
-    "criteriarequiredany": "Некоторые из нижеуказанных критериев обязательны",
-    "inprogress": "В прогрессе",
-    "manualselfcompletion": "Ручное самостоятельное завершение",
-    "notyetstarted": "Еще не начался",
-    "pending": "На рассмотрении",
-    "required": "Необходимый",
+    "criteriagroup": "Группа критериев",
+    "criteriarequiredall": "Требуются соответствие всем указанным ниже критериям",
+    "criteriarequiredany": "Требуется соответствие любому из указанных ниже критериев",
+    "inprogress": "В процессе",
+    "manualselfcompletion": "Пользователь может сам поставить отметку о выполнении",
+    "notyetstarted": "Еще не началось",
+    "pending": "Ожидаемые",
+    "required": "Обязательно",
     "requiredcriteria": "Необходимые критерии",
     "requirement": "Требование",
-    "status": "Статус",
-    "viewcoursereport": "Посмотреть отчет курса"
+    "status": "Разрешить гостевой доступ",
+    "viewcoursereport": "Просмотреть отчет по курсу"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index 1a9665c3d8e..a6e9b4208a6 100644
--- a/www/addons/coursecompletion/lang/sv.json
+++ b/www/addons/coursecompletion/lang/sv.json
@@ -1,21 +1,21 @@
 {
     "complete": "Komplett",
     "completecourse": "",
-    "completed": "Fullföljt",
+    "completed": "Slutfört",
     "completiondate": "Datum för fullföljande",
     "couldnotloadreport": "Det gick inte att läsa in rapporten för fullföljande av kursen, vänligen försök igen senare .",
-    "coursecompletion": "Fullföljande av kurs",
-    "criteria": "Villkor",
-    "criteriagroup": "Villkor grupp",
-    "criteriarequiredall": "Alla villkor nedan måste vara uppfyllda",
-    "criteriarequiredany": "Något villkor nedan måste vara uppfylld",
-    "inprogress": "Pågående",
-    "manualselfcompletion": "Manuell fullföljande av deltagare",
-    "notyetstarted": "Ännu inte börjat",
+    "coursecompletion": "Studerande måste slutföra den här kursen.",
+    "criteria": "Kriterier",
+    "criteriagroup": "Kriterier för grupp",
+    "criteriarequiredall": "Alla kriterier är obligatoriska",
+    "criteriarequiredany": "Alla kriterier nedan är obligatoriska",
+    "inprogress": "Pågår",
+    "manualselfcompletion": "Studenten markerar själv som fullföljd",
+    "notyetstarted": "Har ännu inte påbörjats",
     "pending": "Avvaktar",
     "required": "Obligatorisk",
-    "requiredcriteria": "Obligatorisk villkor",
+    "requiredcriteria": "Obligatoriskt kriterium",
     "requirement": "Krav",
-    "status": "Status",
+    "status": "Tillåt gäster",
     "viewcoursereport": "Visa kursrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/uk.json b/www/addons/coursecompletion/lang/uk.json
new file mode 100644
index 00000000000..acc5ff8ddda
--- /dev/null
+++ b/www/addons/coursecompletion/lang/uk.json
@@ -0,0 +1,21 @@
+{
+    "complete": "Завершено",
+    "completecourse": "Завершити курсу",
+    "completed": "Завершено",
+    "completiondate": "Дата завершення",
+    "couldnotloadreport": "Не вдалося завантажити звіт про закінчення курсу, будь ласка, спробуйте ще раз пізніше.",
+    "coursecompletion": "Користувачі повинні завершити цей курс.",
+    "criteria": "Критерій",
+    "criteriagroup": "Група критеріїв",
+    "criteriarequiredall": "Потрібна відповідність всім вказаним критеріям",
+    "criteriarequiredany": "Потрібна відповідність будь-якому критерію",
+    "inprogress": "В процесі",
+    "manualselfcompletion": "Самореєстрація завершення",
+    "notyetstarted": "Ще не почато",
+    "pending": "В очікуванні",
+    "required": "Обов’язкове",
+    "requiredcriteria": "Необхідний критерій",
+    "requirement": "Вимога",
+    "status": "Дозволити доступ для гостя",
+    "viewcoursereport": "Переглянути звіт курсу"
+}
\ No newline at end of file
diff --git a/www/addons/files/lang/ca.json b/www/addons/files/lang/ca.json
index 035be4b1f33..90887bf7b3f 100644
--- a/www/addons/files/lang/ca.json
+++ b/www/addons/files/lang/ca.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Teniu en compte que l'administrador de Moodle ha desactivat la descàrrega d'arxius; podeu visualitzar els arxius, però no descarregar-los.",
     "clicktoupload": "Feu clic al botó del dessota per pujar arxius a l'àrea del vostres fitxers.",
     "couldnotloadfiles": "La llista d'arxius no s'ha pogut carregar.",
-    "emptyfilelist": "No hi ha fitxers per mostrar.",
+    "emptyfilelist": "No hi ha fitxers per mostrar",
     "erroruploadnotworking": "No es poden pujar fitxers al vostre lloc ara mateix.",
     "files": "Fitxers",
     "myprivatefilesdesc": "Els arxius que teniu disponibles a la vostra àrea privada en aquest lloc Moodle.",
     "privatefiles": "Fitxers privats",
     "sitefiles": "Fitxers del lloc",
     "sitefilesdesc": "Els altres arxius que es troben disponibles en aquest lloc Moodle.",
-    "uploadfiles": "Puja fitxers"
+    "uploadfiles": "Envia fitxers de retroacció"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/cs.json b/www/addons/files/lang/cs.json
index 2336beb6bc4..becf830a35d 100644
--- a/www/addons/files/lang/cs.json
+++ b/www/addons/files/lang/cs.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Upozorňujeme, že správce Moodle zakázal stahování souborů, soubory si můžete prohlížet, ale ne stáhnout.",
     "clicktoupload": "Kliknutím na tlačítko níže nahrát soubory do vašich osobních souborů.",
     "couldnotloadfiles": "Seznam souborů, které nelze načíst .",
-    "emptyfilelist": "Žádný soubor k zobrazení.",
+    "emptyfilelist": "Žádný soubor k zobrazení",
     "erroruploadnotworking": "Bohužel v současné době není možné nahrávat na stránky vašeho Moodle.",
     "files": "Soubory",
     "myprivatefilesdesc": "Soubory, které jsou dostupné v soukromé oblasti na těchto stránkách Moodle.",
     "privatefiles": "Osobní soubory",
     "sitefiles": "Soubory stránek",
     "sitefilesdesc": "Další soubory, které jsou dostupné na těchto stránkách Moodle.",
-    "uploadfiles": "Nahrát soubory"
+    "uploadfiles": "Poslat zpětnovazební soubory"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/de.json b/www/addons/files/lang/de.json
index 39a046af215..16517d7cc60 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Sie können nur die Dateiliste sehen.",
     "clicktoupload": "Tippen Sie auf die Taste, um Dateien in 'Meine Dateien' hochzuladen.",
     "couldnotloadfiles": "Die Dateiliste konnte nicht geladen werden.",
-    "emptyfilelist": "Keine Dateien",
+    "emptyfilelist": "Es liegen keine Dateien vor",
     "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
     "files": "Dateien",
     "myprivatefilesdesc": "Diese Dateien liegen in Ihrem persönlichen Bereich auf dieser Website.",
     "privatefiles": "Meine Dateien",
     "sitefiles": "Dateien",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
-    "uploadfiles": "Dateien hochladen"
+    "uploadfiles": "Feedbackdateien senden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/el.json b/www/addons/files/lang/el.json
index 8f435d24e4f..105bb0c0877 100644
--- a/www/addons/files/lang/el.json
+++ b/www/addons/files/lang/el.json
@@ -9,5 +9,5 @@
     "privatefiles": "Προσωπικά αρχεία",
     "sitefiles": "Αρχεία του ιστοχώρου",
     "sitefilesdesc": "Άλλα αρχεία που είναι στη διάθεσή σας σε αυτό το site Moodle.",
-    "uploadfiles": "Μεταφορτώστε αρχεία"
+    "uploadfiles": "Αποστολή αρχείου ανατροφοδότησης"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es-mx.json b/www/addons/files/lang/es-mx.json
index 38849f29131..3a779e4d667 100644
--- a/www/addons/files/lang/es-mx.json
+++ b/www/addons/files/lang/es-mx.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ver los archivos pero no puede descargarlos.",
     "clicktoupload": "Haga click en el botón inferior para subir archivos a sus archivos privados.",
     "couldnotloadfiles": "La lista de archivos no pudo cargarse.",
-    "emptyfilelist": "No hay archivos para mostrar.",
+    "emptyfilelist": "No hay archivos que mostrar",
     "erroruploadnotworking": "Desafortunadamente ahorita no es posible subir archivos a su sitio.",
     "files": "Archivos",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
     "privatefiles": "Archivos privados",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "uploadfiles": "Subir archivos"
+    "uploadfiles": "Mandar archivos de retroalimentación"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fr.json b/www/addons/files/lang/fr.json
index a1237a3feeb..ce819c482cb 100644
--- a/www/addons/files/lang/fr.json
+++ b/www/addons/files/lang/fr.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "L'administrateur de votre Moodle a désactivé le téléchargement des fichiers. Vous pouvez les consulter, mais pas les télécharger.",
     "clicktoupload": "Cliquer sur le bouton ci-dessous pour déposer les fichiers dans vos fichiers personnels.",
     "couldnotloadfiles": "La liste des fichiers n'a pas pu être chargée.",
-    "emptyfilelist": "Aucun fichier à afficher.",
+    "emptyfilelist": "Il n'y a pas de fichier à afficher",
     "erroruploadnotworking": "Il n'est actuellement pas possible de déposer des fichiers sur votre site.",
     "files": "Fichiers",
     "myprivatefilesdesc": "Les fichiers disponibles dans votre zone privée sur cette plateforme Moodle.",
     "privatefiles": "Fichiers personnels",
     "sitefiles": "Fichiers du site",
     "sitefilesdesc": "Les autres fichiers disponibles sur cette plateforme Moodle.",
-    "uploadfiles": "Déposer des fichiers"
+    "uploadfiles": "Envoyer des fichiers de feedback"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/it.json b/www/addons/files/lang/it.json
index 3f198893008..d9b1f96d205 100644
--- a/www/addons/files/lang/it.json
+++ b/www/addons/files/lang/it.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "L'amministratore del sito Moodle ha disabilitato il download dei file. Puoi navigare tra i file ma non potrai scaricarli.",
     "clicktoupload": "Fai click sul pulsante sotto per caricare i file nei File personali",
     "couldnotloadfiles": "Non è stato possibile caricare l'elenco dei file.",
-    "emptyfilelist": "Non ci sono file da visualizzare.",
+    "emptyfilelist": "Non ci sono file da visualizzare",
     "erroruploadnotworking": "Al momento non è possibile caricare file sul sito.",
     "files": "File",
     "myprivatefilesdesc": "I file memorizzati nell'omonima area di Moodle",
     "privatefiles": "File personali",
     "sitefiles": "File del sito",
     "sitefilesdesc": "Altri file del sito Moodle ai quali puoi accedere.",
-    "uploadfiles": "Carica file"
+    "uploadfiles": "Invia file di commento"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/nl.json b/www/addons/files/lang/nl.json
index 2b091df63b0..e4f5e1dc248 100644
--- a/www/addons/files/lang/nl.json
+++ b/www/addons/files/lang/nl.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Je Moodle beheerder heeft het downloaden van bestanden uitgeschakeld. Je kunt door de bestandenlijst bladeren, maar ze niet downloaden.",
     "clicktoupload": "Klik op onderstaande knop om bestanden naar je privé-bestanden te uploaden.",
     "couldnotloadfiles": "De bestandenlijst kon niet geladen worden.",
-    "emptyfilelist": "Er zijn geen bestanden te tonen.",
+    "emptyfilelist": "Er zijn geen bestanden om te tonen",
     "erroruploadnotworking": "Jammer genoeg kun je op dit ogenblik geen bestanden uploaden naar de site.",
     "files": "Bestanden",
     "myprivatefilesdesc": "Jouw bestanden op deze Moodle-site.",
     "privatefiles": "Privébestanden",
     "sitefiles": "Sitebestanden",
     "sitefilesdesc": "Andere bestanden op deze Moodle-site.",
-    "uploadfiles": "Bestanden uploaden"
+    "uploadfiles": "Stuur feedbackbestanden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt-br.json b/www/addons/files/lang/pt-br.json
index fa0429bebba..2c3c45d9555 100644
--- a/www/addons/files/lang/pt-br.json
+++ b/www/addons/files/lang/pt-br.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Por favor note que o administrador do Moodle desativou downloads de arquivos, você pode navegar através dos arquivos, mas não baixá-los.",
     "clicktoupload": "Clique no botão abaixo para enviar para seus arquivos privados.",
     "couldnotloadfiles": "A lista de arquivos não pode ser carregada.",
-    "emptyfilelist": "Não há arquivos para mostrar.",
+    "emptyfilelist": "Não há arquivos para exibir",
     "erroruploadnotworking": "Infelizmente é impossível enviar arquivos para o seu site.",
     "files": "Arquivos",
     "myprivatefilesdesc": "Os arquivos que estão disponíveis em sua área de arquivos privados nesse site Moodle.",
     "privatefiles": "Arquivos privados",
     "sitefiles": "Arquivos do site",
     "sitefilesdesc": "Os outros arquivos que estão disponíveis a você neste site Moodle.",
-    "uploadfiles": "Enviar arquivos"
+    "uploadfiles": "Enviar arquivos de feedback"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ru.json b/www/addons/files/lang/ru.json
index 7da775bb875..10418095e77 100644
--- a/www/addons/files/lang/ru.json
+++ b/www/addons/files/lang/ru.json
@@ -8,5 +8,5 @@
     "privatefiles": "Личные файлы",
     "sitefiles": "Файлы сайта",
     "sitefilesdesc": "Другие файлы, доступные на этом сайте Moodle",
-    "uploadfiles": "Загрузка файлов"
+    "uploadfiles": "Отправить файлы с отзывами"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/uk.json b/www/addons/files/lang/uk.json
new file mode 100644
index 00000000000..a5b2ae08185
--- /dev/null
+++ b/www/addons/files/lang/uk.json
@@ -0,0 +1,13 @@
+{
+    "admindisableddownload": "Зверніть увагу, що ваш адміністратор Moodle відключив завантаження файлів, ви можете переглядати файли, але не завантажувати їх.",
+    "clicktoupload": "Натисніть на кнопку нижче, щоб завантажити ваші особисті файли.",
+    "couldnotloadfiles": "Список файлів не може бути завантажений.",
+    "emptyfilelist": "Немає файлів для показу",
+    "erroruploadnotworking": "На жаль, в даний час не представляється можливим завантажувати файли на ваш сайт.",
+    "files": "Файли",
+    "myprivatefilesdesc": "Файли, які доступні у приватній області на цьому сайті Moodle.",
+    "privatefiles": "Особисті файли",
+    "sitefiles": "Файли сайту",
+    "sitefilesdesc": "Інші файли, які доступні для вас на цьому сайті Moodle.",
+    "uploadfiles": "Надіслати файл-відгук(и)"
+}
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/uk.json b/www/addons/frontpage/lang/uk.json
new file mode 100644
index 00000000000..493df5bd7f4
--- /dev/null
+++ b/www/addons/frontpage/lang/uk.json
@@ -0,0 +1,4 @@
+{
+    "sitehome": "Головна сторінка",
+    "sitenews": "Новини сайту"
+}
\ No newline at end of file
diff --git a/www/addons/grades/lang/uk.json b/www/addons/grades/lang/uk.json
new file mode 100644
index 00000000000..32dd4de48eb
--- /dev/null
+++ b/www/addons/grades/lang/uk.json
@@ -0,0 +1,4 @@
+{
+    "nogradesreturned": "Немає оцінок",
+    "viewgrades": "Перегляд оцінок"
+}
\ No newline at end of file
diff --git a/www/addons/messageoutput/airnotifier/lang/uk.json b/www/addons/messageoutput/airnotifier/lang/uk.json
new file mode 100644
index 00000000000..4b64339848c
--- /dev/null
+++ b/www/addons/messageoutput/airnotifier/lang/uk.json
@@ -0,0 +1,3 @@
+{
+    "processorsettingsdesc": "Конфігурація пристроїв"
+}
\ No newline at end of file
diff --git a/www/addons/messages/lang/ca.json b/www/addons/messages/lang/ca.json
index 46e13618050..04139bc73b4 100644
--- a/www/addons/messages/lang/ca.json
+++ b/www/addons/messages/lang/ca.json
@@ -17,9 +17,9 @@
     "messagenotsent": "El missatge no s'ha enviat. Si us plau, intenteu-ho més tard",
     "messages": "Missatges",
     "mustbeonlinetosendmessages": "Heu de tenir connexió a la xarxa per a enviar missatges",
-    "newmessage": "Nou missatge...",
+    "newmessage": "Missatge nou",
     "newmessages": "Nous missatges",
-    "nomessages": "No hi ha missatges.",
+    "nomessages": "No teniu missatges pendents",
     "nousersfound": "No s'han trobat usuaris",
     "removecontact": "Suprimeix contacte",
     "removecontactconfirm": "El contacte s'eliminarà de la vostra llista de contactes.",
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index d3aa98a5834..90822283653 100644
--- a/www/addons/messages/lang/cs.json
+++ b/www/addons/messages/lang/cs.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Nastavení zpráv",
     "messages": "Zprávy",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
-    "newmessage": "Nová zpráva...",
+    "newmessage": "Nová zpráva",
     "newmessages": "Nové zprávy",
-    "nomessages": "Žádné zprávy.",
-    "nousersfound": "Nebyl nalezen žádný uživatel",
+    "nomessages": "Žádné zprávy",
+    "nousersfound": "Nenalezeni žádní uživatelé",
     "removecontact": "Odebrat kontakt",
     "removecontactconfirm": "Kontakt bude odstraněn ze seznamu kontaktů.",
     "send": "Odeslat",
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index 1f91de7f2a3..b77b53a24c1 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Mitteilungen konfigurieren",
     "messages": "Mitteilungen",
     "mustbeonlinetosendmessages": "Sie müssen online sein, um Mitteilungen zu senden",
-    "newmessage": "Neue Mitteilung ...",
+    "newmessage": "Neue Mitteilung",
     "newmessages": "Neue Mitteilungen",
     "nomessages": "Keine Mitteilungen",
-    "nousersfound": "Keine Personen gefunden",
+    "nousersfound": "Keine Nutzer/innen gefunden",
     "removecontact": "Kontakt entfernen",
     "removecontactconfirm": "Der Kontakt wird aus Ihrer Kontaktliste gelöscht.",
     "send": "Senden",
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index 4a4c3270fb7..6976449017a 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -14,9 +14,9 @@
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "newmessage": "Νέο μήνυμα...",
-    "nomessages": "Κανένα μήνυμα.",
-    "nousersfound": "Δεν βρέθηκαν χρήστες",
+    "newmessage": "Νέο μήνυμα",
+    "nomessages": "Δεν υπάρχουν μηνύματα σε αναμονή",
+    "nousersfound": "Δε βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "send": "Αποστολή",
     "sendmessage": "Αποστολή μηνύματος",
diff --git a/www/addons/messages/lang/es-mx.json b/www/addons/messages/lang/es-mx.json
index 8b435e15996..cb30898bdb8 100644
--- a/www/addons/messages/lang/es-mx.json
+++ b/www/addons/messages/lang/es-mx.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Preferencias de Mensaje",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Usted debe de estar en-linea para enviar mensajes",
-    "newmessage": "Nuevo mensaje...",
+    "newmessage": "Nuevo mensaje",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "Sin mensajes.",
-    "nousersfound": "No se encontraron usuarios",
+    "nomessages": "No hay mensajes",
+    "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto será quitado de su lista de contactos.",
     "send": "Enviar",
diff --git a/www/addons/messages/lang/eu.json b/www/addons/messages/lang/eu.json
index 45d02c19d0d..0258a06f78d 100644
--- a/www/addons/messages/lang/eu.json
+++ b/www/addons/messages/lang/eu.json
@@ -1,7 +1,7 @@
 {
     "addcontact": "Gehitu kontaktua",
     "blockcontact": "Blokeatu kontaktua",
-    "blockcontactconfirm": "Kontaktu honen mezuak jasotzeari utziko diozu.",
+    "blockcontactconfirm": "Kontaktu honen mezuak jasotzeari utziko diozu",
     "blocknoncontacts": "Ez utzi kontaktu ez direnei niri mezuak bidaltzen",
     "contactlistempty": "Kontaktu zerrenda hutsik dago",
     "contactname": "Kontaktuaren izena",
diff --git a/www/addons/messages/lang/fr.json b/www/addons/messages/lang/fr.json
index f0dd9fbacd0..c988ebada69 100644
--- a/www/addons/messages/lang/fr.json
+++ b/www/addons/messages/lang/fr.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Préférences des messages",
     "messages": "Messages personnels",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
-    "newmessage": "Nouveau message...",
+    "newmessage": "Nouveau message",
     "newmessages": "Nouveaux messages",
-    "nomessages": "Aucun message.",
-    "nousersfound": "Aucun utilisateur trouvé",
+    "nomessages": "Aucun message",
+    "nousersfound": "Aucun utilisateur n'a été trouvé",
     "removecontact": "Supprimer ce contact",
     "removecontactconfirm": "Le contact sera retiré de votre liste.",
     "send": "Envoyer",
diff --git a/www/addons/messages/lang/it.json b/www/addons/messages/lang/it.json
index 9052dd21da0..997e27210b3 100644
--- a/www/addons/messages/lang/it.json
+++ b/www/addons/messages/lang/it.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Preferenze messaggi",
     "messages": "Messaggi",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
-    "newmessage": "Nuovo messaggio...",
-    "nomessages": "Non ci sono messaggi.",
-    "nousersfound": "Non sono stati trovati utenti",
+    "newmessage": "Nuovo messaggio",
+    "nomessages": "Nessun messaggio",
+    "nousersfound": "Non trovato alcun utente",
     "removecontact": "Cancella contatti",
     "send": "Invia",
     "sendmessage": "Invia messaggio",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index 03ecde88321..2c9ecfc57d8 100644
--- a/www/addons/messages/lang/nl.json
+++ b/www/addons/messages/lang/nl.json
@@ -18,9 +18,9 @@
     "messagepreferences": "Berichten voorkeuren",
     "messages": "Berichten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
-    "newmessage": "Nieuw bericht...",
+    "newmessage": "Nieuw bericht",
     "newmessages": "Nieuwe berichten",
-    "nomessages": "Geen berichten.",
+    "nomessages": "Geen berichten",
     "nousersfound": "Geen gebruikers gevonden",
     "removecontact": "Verwijder contactpersoon",
     "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index 645056dbe47..d1ae86c8e24 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -17,9 +17,9 @@
     "messagenotsent": "A mensagem não foi enviada. Por favor tente novamente mais tarde.",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Você precisa estar conectado para enviar mensagens.",
-    "newmessage": "Nova mensagem...",
+    "newmessage": "Nova Mensagem",
     "newmessages": "Novas mensagens",
-    "nomessages": "Não há mensagens.",
+    "nomessages": "Sem novas mensagens",
     "nousersfound": "Nenhum usuário encontrado",
     "removecontact": "Eliminar contato",
     "removecontactconfirm": "O contato será removido da sua lista de contatos.",
diff --git a/www/addons/messages/lang/pt.json b/www/addons/messages/lang/pt.json
index 22d8a5385b2..e02c3d20af4 100644
--- a/www/addons/messages/lang/pt.json
+++ b/www/addons/messages/lang/pt.json
@@ -1,7 +1,7 @@
 {
     "addcontact": "Adicionar contacto",
     "blockcontact": "Bloquear contacto",
-    "blockcontactconfirm": "Irá deixar de receber mensagens deste contacto.",
+    "blockcontactconfirm": "Deixará de receber mensagens deste contacto.",
     "blocknoncontacts": "Bloquear mensagens de pessoas que não estão na minha lista de contactos",
     "contactlistempty": "A lista de contactos está vazia",
     "contactname": "Nome do contacto",
diff --git a/www/addons/messages/lang/ru.json b/www/addons/messages/lang/ru.json
index 4c6677f9138..763c739f876 100644
--- a/www/addons/messages/lang/ru.json
+++ b/www/addons/messages/lang/ru.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Настройки сообщений",
     "messages": "Сообщения",
     "mustbeonlinetosendmessages": "Вы должны быть на сайте, чтобы отправлять сообщения",
-    "newmessage": "Новое сообщение...",
+    "newmessage": "Новое сообщение",
     "newmessages": "Новые сообщения",
-    "nomessages": "Нет сообщений",
+    "nomessages": "Нет новых сообщений",
     "nousersfound": "Пользователи не найдены",
     "removecontact": "Удалить собеседника из моего списка",
     "send": "Отправить",
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index 21f7a6126c9..1539f736369 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -15,9 +15,9 @@
     "messagenotsent": "Meddelandet skickades inte, försök igen senare.",
     "messages": "Meddelanden",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
-    "newmessage": "Ny meddelande...",
-    "nomessages": "Inga meddelanden",
-    "nousersfound": "Inga användare hittades",
+    "newmessage": "Nytt meddelande",
+    "nomessages": "Inga avvaktande meddelanden",
+    "nousersfound": "Det gick inte att hitta några användare",
     "removecontact": "Ta bort kontakt",
     "send": "Skicka",
     "sendmessage": "Skicka meddelande",
diff --git a/www/addons/messages/lang/tr.json b/www/addons/messages/lang/tr.json
index 056f78c77d3..ad8dc3b2766 100644
--- a/www/addons/messages/lang/tr.json
+++ b/www/addons/messages/lang/tr.json
@@ -9,7 +9,7 @@
     "messagepreferences": "İleti tercihleri",
     "messages": "Mesajlar",
     "newmessage": "Yeni ileti",
-    "nomessages": "İleti yok.",
+    "nomessages": "Yeni ileti yok",
     "nousersfound": "Kullanıcı bulunamadı",
     "removecontact": "Kişiyi sil",
     "send": "Gönder",
diff --git a/www/addons/messages/lang/uk.json b/www/addons/messages/lang/uk.json
new file mode 100644
index 00000000000..67e1bc5c737
--- /dev/null
+++ b/www/addons/messages/lang/uk.json
@@ -0,0 +1,33 @@
+{
+    "addcontact": "Додати контакт",
+    "blockcontact": "Заблокувати контакт",
+    "blockcontactconfirm": "Ви не будете отримувати повідомлення від цього контакту.",
+    "blocknoncontacts": "Запобігти повідомленням, що не в моїх контактах",
+    "contactlistempty": "Список контактів порожній",
+    "contactname": "Ім'я контакту",
+    "contacts": "Контакти",
+    "errordeletemessage": "Помилка при видаленні повідомлення.",
+    "errorwhileretrievingcontacts": "Помилка при отриманні контактів з сервера.",
+    "errorwhileretrievingdiscussions": "Помилка при отриманні обговорення з сервера.",
+    "errorwhileretrievingmessages": "Помилка при отриманні повідомлень від сервера.",
+    "loadpreviousmessages": "Завантаження попередніх повідомлень",
+    "message": "Повідомлення",
+    "messagenotsent": "Повідомлення не було відправлено, будь ласка, спробуйте ще раз пізніше.",
+    "messages": "Повідомлення",
+    "mustbeonlinetosendmessages": "Ви повинні бути онлайн, щоб відправляти повідомлення",
+    "newmessage": "Нове повідомлення...",
+    "newmessages": "Нові повідомлення",
+    "nomessages": "Немає нових повідомлень",
+    "nousersfound": "Користувачів не знайдено",
+    "removecontact": "Видалити контакт",
+    "removecontactconfirm": "Контакт буде видалено зі списку контактів.",
+    "send": "Надіслати",
+    "sendmessage": "Надіслати повідомлення",
+    "type_blocked": "Заблоковано",
+    "type_offline": "Офлайн",
+    "type_online": "Онлайн",
+    "type_search": "Результати пошуку",
+    "type_strangers": "Інші",
+    "unblockcontact": "Розблокувати контакт",
+    "warningmessagenotsent": "Неможливо відправити повідомлення до  {{user}}. {{error}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/ar.json b/www/addons/mod/assign/lang/ar.json
index 0fa2999789a..72700f0eb7f 100644
--- a/www/addons/mod/assign/lang/ar.json
+++ b/www/addons/mod/assign/lang/ar.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "سيبدأ قبول التسليمات لهذا التكليف (المهمة) ابتداءً من <strong>{{$a}}</strong>",
     "applytoteam": "تطبيق الدرجات والتغذية الراجعة (الملاحظات) على المجموعة بأكملها",
     "assignmentisdue": "فات موعد التسليم",
-    "attemptnumber": "رقم المحاولة",
+    "attemptnumber": "محاولة",
     "attemptreopenmethod": "تم إعادة فتح المحاولة",
     "attemptreopenmethod_manual": "يدوياً",
     "attemptreopenmethod_untilpass": "تلقائياً حتى النجاح",
@@ -17,7 +17,7 @@
     "currentattempt": "هذه المحاولة {{$a}}.",
     "currentattemptof": "هذه المحاولة رقم{{$a.attemptnumber}} ( {{$a.maxattempts}} محاولات مسموحة ).",
     "currentgrade": "الدرجة الحالية في",
-    "duedate": "تاريخ تقديم مهمة",
+    "duedate": "موعد التسليم",
     "duedateno": "لا يوجد موعد لتقديم المهمة",
     "editsubmission": "حرر تسليمي",
     "grade": "درجة",
@@ -32,8 +32,8 @@
     "numberofsubmittedassignments": "مسلمة",
     "numwords": "{{$a}} كلمات",
     "outof": "من {{$a}}",
-    "overdue": "<font color=\"red\"></font>فات موعد تسليم الوظيفة بـ: {{$a}}",
-    "savechanges": "حفظ التغييرات",
+    "overdue": "متأخر جدا",
+    "savechanges": "أحفظ التغيرات",
     "submission": "تسليم",
     "submissionslocked": "هذه الوظيفة لا تقبل التسليم الآن",
     "submissionstatus": "حالة التسليم",
@@ -45,5 +45,5 @@
     "submittedearly": "تم تسليم الوظيفة مبكرة بـ{{$a}}",
     "submittedlate": "تم تسليم الوظيفة متأخرة بـ{{$a}}",
     "timemodified": "وقت التعديل",
-    "timeremaining": "الزمن المتبقي"
+    "timeremaining": "الزمن المتبقى"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/bg.json b/www/addons/mod/assign/lang/bg.json
index 295e547bd7b..6d87ce1aaca 100644
--- a/www/addons/mod/assign/lang/bg.json
+++ b/www/addons/mod/assign/lang/bg.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "По това задание се приемат работи от <strong>{{$a}}</strong>",
     "applytoteam": "Прилагане на оценки и забележки към цялата група",
     "assignmentisdue": "Заданието е приключило",
-    "attemptnumber": "Брой опити",
+    "attemptnumber": "Опит",
     "attemptreopenmethod": "Отворени отново опити",
     "attemptreopenmethod_manual": "Ръчно",
     "attemptreopenmethod_untilpass": "Автоматично до завършване",
@@ -46,15 +46,15 @@
     "nomoresubmissionsaccepted": "Само за участници, получили позволение за отлагане",
     "noonlinesubmissions": "Това задание не изисква от Вас нищо да качвате онлайн",
     "nosubmission": "Нищо не е изпратено по това задание",
-    "notgraded": "Неоценена",
+    "notgraded": "Неоценен",
     "numberofdraftsubmissions": "Чернови",
     "numberofparticipants": "Участници",
     "numberofsubmissionsneedgrading": "Изискващи оценка",
     "numberofsubmittedassignments": "Предадени",
     "numberofteams": "Групи",
     "numwords": "{{$a}} думи",
-    "outof": "{{$a.current}} от {{$a.total}}",
-    "overdue": "<font color=\"red\">Предаването на работата закъснява с {{$a}} след срока</font>",
+    "outof": "{{$a.grade}} от {{$a.maxgrade}}",
+    "overdue": "Закъсняло предаване",
     "savechanges": "Записване на промените",
     "submission": "Задание",
     "submissioneditable": "Студентът може да редактира това задание",
@@ -73,8 +73,8 @@
     "submitassignment_help": "Предадете ли веднъж работата по заданието, Вие няма да можете да я променяте повече.",
     "submittedearly": "Работата е предадена {{$a}} по-рано",
     "submittedlate": "Работата по заданието е предадена с {{$a}} закъснение",
-    "timemodified": "Последна промяна",
-    "timeremaining": "Оставащо време",
+    "timemodified": "Време на промяна",
+    "timeremaining": "Time Remaining",
     "unlimitedattempts": "Неограничен",
     "userswhoneedtosubmit": "Потребители, които трябва да предадат: {{$a}}",
     "viewsubmission": "Преглед на предадена работа"
diff --git a/www/addons/mod/assign/lang/ca.json b/www/addons/mod/assign/lang/ca.json
index 065ff663e07..ecf9351e561 100644
--- a/www/addons/mod/assign/lang/ca.json
+++ b/www/addons/mod/assign/lang/ca.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Aquesta tasca acceptarà trameses des de <strong>{{$a}}</strong>",
     "applytoteam": "Aplica les qualificacions i la retroacció al grup sencer",
     "assignmentisdue": "La tasca ha vençut",
-    "attemptnumber": "Número d'intent",
+    "attemptnumber": "Intent",
     "attemptreopenmethod": "Intents reoberts",
     "attemptreopenmethod_manual": "Manualment",
     "attemptreopenmethod_untilpass": "Automàticament fins superació",
@@ -23,7 +23,7 @@
     "currentgrade": "Qualificació actual en el llibre de qualificacions",
     "cutoffdate": "Data límit",
     "defaultteam": "Grup per omissió",
-    "duedate": "Data de venciment",
+    "duedate": "Data límit",
     "duedateno": "Sense data de venciment",
     "duedatereached": "La data de venciment de la tasca ja ha passat",
     "editingstatus": "S'està editant l'estat",
@@ -35,7 +35,7 @@
     "grade": "Qualificació",
     "graded": "Qualificada",
     "gradedby": "Qualificat per",
-    "gradedon": "Qualificat el",
+    "gradedon": "Qualificat: {{$a}}",
     "gradenotsynced": "La puntuació no està sincronitzada",
     "gradeoutof": "Qualificació sobre {{$a}}",
     "gradingstatus": "Estat de la qualificació",
@@ -57,15 +57,15 @@
     "nosubmission": "No s'ha tramès res per a aquesta tasca",
     "notallparticipantsareshown": "Els participants que no tinguin cap tramesa no es mostren",
     "noteam": "No és membre de cap grup",
-    "notgraded": "Sense qualificació",
+    "notgraded": "Sense qualificar",
     "numberofdraftsubmissions": "Esborranys",
     "numberofparticipants": "Participants",
     "numberofsubmissionsneedgrading": "Necessiten qualificació",
     "numberofsubmittedassignments": "S'han tramès",
     "numberofteams": "Grups",
     "numwords": "{{$a}} paraules",
-    "outof": "{{$a.current}} de {{$a.total}}",
-    "overdue": "<font color=\"red\">La tasca ha vençut fa: {{$a}}</font>",
+    "outof": "{{$a.grade}} d'un màxim de {{$a.maxgrade}}",
+    "overdue": "Venciment",
     "savechanges": "Desa els canvis",
     "submission": "Tramesa",
     "submissioneditable": "L'estudiant pot editar aquesta tramesa",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Un cop s'hagi tramès la tasca no podreu fer més canvis",
     "submittedearly": "La tasca s'ha tramès {{$a}} abans del límit",
     "submittedlate": "La tasca s'ha tramès {{$a}} tard",
-    "timemodified": "Darrera modificació",
+    "timemodified": "Hora de la modificació",
     "timeremaining": "Temps restant",
     "ungroupedusers": "El paràmetre «Cal formar part d'un grup per fer una tramesa» està activat, i alguns usuaris o no són membres de cap grup o són membres de més d'un grup, per la qual cosa no poden fer trameses.",
     "unlimitedattempts": "Il·limitats",
diff --git a/www/addons/mod/assign/lang/cs.json b/www/addons/mod/assign/lang/cs.json
index 5a161371d89..094a4ab20aa 100644
--- a/www/addons/mod/assign/lang/cs.json
+++ b/www/addons/mod/assign/lang/cs.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Odevzdat úkol bude možné od <strong>{{$a}}</strong>",
     "applytoteam": "Použít hodnocení pro celou skupinu",
     "assignmentisdue": "Úkol je zpožděn",
-    "attemptnumber": "Číslo pokusu",
+    "attemptnumber": "Pokus",
     "attemptreopenmethod": "Opětovné otevření pokusů",
     "attemptreopenmethod_manual": "Ručně",
     "attemptreopenmethod_untilpass": "Automaticky dokud neuspěje",
@@ -23,7 +23,7 @@
     "currentgrade": "Momentální známka v klasifikaci kurzu",
     "cutoffdate": "Datum ukončení",
     "defaultteam": "Výchozí skupina",
-    "duedate": "Termín odevzdání",
+    "duedate": "Termín dokončení",
     "duedateno": "Bez termínu odevzdání",
     "duedatereached": "Termín pro odevzdání tohoto úkolu vypršel",
     "editingstatus": "Stav úprav",
@@ -35,7 +35,7 @@
     "grade": "Známka",
     "graded": "Udělena známka",
     "gradedby": "Hodnoceno",
-    "gradedon": "Hodnoceno na",
+    "gradedon": "Známkování: {{$a}}",
     "gradenotsynced": "Známky nejsou synchronizovány",
     "gradeoutof": "Hodnoceno z {{$a}}",
     "gradingstatus": "Stav hodnocení",
@@ -57,17 +57,17 @@
     "nosubmission": "K tomuto úkolu nebylo nic odevzdáno",
     "notallparticipantsareshown": "Nejsou zobrazeni účastníci bez odevzdaného řešení úkolu",
     "noteam": "Není členem žádné skupiny",
-    "notgraded": "Nehodnoceno",
+    "notgraded": "Není hodnoceno",
     "numberofdraftsubmissions": "Návrhy",
     "numberofparticipants": "Účastníci",
     "numberofsubmissionsneedgrading": "Nutno ohodnotit",
     "numberofsubmittedassignments": "Odevzdáno",
     "numberofteams": "Skupiny",
     "numwords": "{{$a}} slov",
-    "outof": "{{$a.current}} ze {{$a.total}}",
-    "overdue": "<font color=\"red\">Úkol má zpoždění: {{$a}}</font>",
+    "outof": "{{$a.grade}} z možných {{$a.maxgrade}}",
+    "overdue": "Zpožděný",
     "savechanges": "Uložit změny",
-    "submission": "Odevzdané úkoly",
+    "submission": "Odeslání",
     "submissioneditable": "Student může upravit tento úkol",
     "submissionnoteditable": "Student nemůže upravit tento úkol",
     "submissionnotsupported": "Tento formát řešení úkolu není aplikací podporován a nemůže obsahovat  informace",
@@ -85,8 +85,8 @@
     "submitassignment_help": "Po odevzdání úkolu nebudete moci provádět žádné změny.",
     "submittedearly": "Úkoly byly odevzdány {{$a}} včas",
     "submittedlate": "Úkoly byly odevzdány {{$a}} po termínu",
-    "timemodified": "Naposledy změněno",
-    "timeremaining": "Zbývá",
+    "timemodified": "Čas poslední úpravy",
+    "timeremaining": "Zbývající čas",
     "ungroupedusers": "Nastavení \"Vyžadovat zařazení do skupiny\" je zapnuto a někteří uživatelé nejsou  zařazeni do skupiny, bude jim to bránit v odevzdání úkolu.",
     "unlimitedattempts": "Bez omezení",
     "userswhoneedtosubmit": "Uživatelé, kteří potřebují odevzdat úkol:  {{$a}}",
diff --git a/www/addons/mod/assign/lang/da.json b/www/addons/mod/assign/lang/da.json
index b8900d9e6d4..d079adeff83 100644
--- a/www/addons/mod/assign/lang/da.json
+++ b/www/addons/mod/assign/lang/da.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Denne opgave accepterer afleveringer fra <strong>{{$a}}</strong>",
     "applytoteam": "Anvend karakterer og feedback til hele gruppen",
     "assignmentisdue": "Afleveringsfristen er overskredet",
-    "attemptnumber": "Antal forsøg på besvarelse",
+    "attemptnumber": "Besvarelse",
     "attemptreopenmethod": "Besvarelser som er blevet genåbnet",
     "attemptreopenmethod_manual": "Manuelt",
     "attemptreopenmethod_untilpass": "Automatisk indtil bestået",
@@ -19,7 +19,7 @@
     "currentgrade": "Aktuelle karakter i karakterbogen",
     "cutoffdate": "Skæringsdato",
     "defaultteam": "Standardgruppe",
-    "duedate": "Afleveringsdato",
+    "duedate": "Udløbsdato",
     "duedateno": "Ingen afleveringsfrist",
     "duedatereached": "Afleveringsfristen er overskredet",
     "editingstatus": "Redigeringsstatus",
@@ -28,7 +28,7 @@
     "grade": "Karakter",
     "graded": "Bedømt",
     "gradedby": "Bedømt af",
-    "gradedon": "Bedømt",
+    "gradedon": "Bedømt: {{$a}}",
     "gradeoutof": "Bedømmelse af {{$a}}",
     "gradingstatus": "Vurderingsstatus",
     "groupsubmissionsettings": "Indstillinger for gruppeaflevering",
@@ -55,8 +55,8 @@
     "numberofsubmittedassignments": "Afleveret",
     "numberofteams": "Grupper",
     "numwords": "{{$a}} ord",
-    "outof": "{{$a.current}} ud af {{$a.total}}",
-    "overdue": "<font color=\"red\">Afleveringsdatoen er overskredet med {{$a}}</font>",
+    "outof": "{{$a.grade}} ud af {{$a.maxgrade}}",
+    "overdue": "For sent",
     "savechanges": "Gem ændringer",
     "submission": "Aflevering",
     "submissioneditable": "Den studerende kan redigere opgaven.",
@@ -75,8 +75,8 @@
     "submitassignment_help": "Når opgaven er afleveret kan du ikke længere foretage ændringer i den.",
     "submittedearly": "Opgaven blev afleveret {{$a}} for tidligt",
     "submittedlate": "Opgaven blev afleveret {{$a}} for sent",
-    "timemodified": "Seneste ændring",
-    "timeremaining": "Resterende tid",
+    "timemodified": "Ændret",
+    "timeremaining": "Tid tilbage",
     "ungroupedusers": "Indstillingen 'Kræv gruppeaflevering' er slået til, og nogle brugere er forhindret i at aflevere opgaver da de ikke er med i en gruppe eller er medlem af mere end en gruppe.",
     "unlimitedattempts": "Ubegrænset",
     "userswhoneedtosubmit": "Brugere, der skal aflevere: {{$a}}",
diff --git a/www/addons/mod/assign/lang/de.json b/www/addons/mod/assign/lang/de.json
index 02ebc2a9649..454b93867e6 100644
--- a/www/addons/mod/assign/lang/de.json
+++ b/www/addons/mod/assign/lang/de.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Abgabe möglich ab <strong>{{$a}}</strong>",
     "applytoteam": "Bewertungen und Feedback der gesamten Gruppe zuweisen.",
     "assignmentisdue": "Das Abgabeende ist vorbei",
-    "attemptnumber": "Nummer des Versuchs",
+    "attemptnumber": "Versuch",
     "attemptreopenmethod": "Versuche erneut bearbeitbar",
     "attemptreopenmethod_manual": "Manuell",
     "attemptreopenmethod_untilpass": "Automatisch bis zum Bestehen",
@@ -23,7 +23,7 @@
     "currentgrade": "Aktuelle Bewertung",
     "cutoffdate": "Letzte Abgabemöglichkeit",
     "defaultteam": "Standard-Gruppe",
-    "duedate": "Fälligkeitsdatum",
+    "duedate": "Abgabedatum",
     "duedateno": "Kein Fälligkeitsdatum",
     "duedatereached": "Das Fälligkeitsdatum für diese Aufgabe ist vorbei.",
     "editingstatus": "Bearbeitungsstatus",
@@ -35,7 +35,7 @@
     "grade": "Bewertung",
     "graded": "Bewertet",
     "gradedby": "Bewertet von",
-    "gradedon": "Bewertet am",
+    "gradedon": "{{$a}} bewertet",
     "gradenotsynced": "Bewertung nicht synchronisiert",
     "gradeoutof": "Bewertung (max. {{$a}})",
     "gradingstatus": "Bewertungsstatus",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Abgegeben",
     "numberofteams": "Gruppen",
     "numwords": "{{$a}} Wörter",
-    "outof": "{{$a.current}} von {{$a.total}}",
-    "overdue": "<font color=\"red\">Abgabeende überschritten seit: {{$a}}</font>",
-    "savechanges": "Änderungen sichern",
-    "submission": "Abgabe",
+    "outof": "{{$a.grade}} von {{$a.maxgrade}}",
+    "overdue": "Überfällig",
+    "savechanges": "Änderungen speichern",
+    "submission": "Leistungen",
     "submissioneditable": "Teilnehmer/innen können eingereichte Lösung bearbeiten",
     "submissionnoteditable": "Teilnehmer/innen können eingereichte Lösung nicht bearbeiten",
     "submissionnotsupported": "Diese Abgabe wird von der App nicht unterstützt und könnte möglicherweise Informationen unvollständig enthalten.",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Sobald diese Aufgabe abgegeben wird, sind keine weiteren Änderungen mehr möglich",
     "submittedearly": "Aufgabe wurde {{$a}} vor dem Abgabeende abgegeben",
     "submittedlate": "Aufgabe wurde {{$a}} verspätet abgegeben",
-    "timemodified": "Zuletzt geändert",
+    "timemodified": "Zeit geändert",
     "timeremaining": "Verbleibende Zeit",
     "ungroupedusers": "Die Option 'Gruppe notwendig, um etwas abgeben zu können' ist aktiviert. Es gibt Personen ohne Gruppe oder Personen mit mehreren Gruppen, die deshalb nichts abgeben können.",
     "unlimitedattempts": "Unbegrenzt",
diff --git a/www/addons/mod/assign/lang/el.json b/www/addons/mod/assign/lang/el.json
index bdc37c4dd93..5bca12edf13 100644
--- a/www/addons/mod/assign/lang/el.json
+++ b/www/addons/mod/assign/lang/el.json
@@ -6,7 +6,7 @@
     "addsubmission": "Υποβολή",
     "allowsubmissionsfromdate": "Επέτρεψε υποβολές από",
     "assignmentisdue": "Η προθεσμία έχει λήξει",
-    "attemptnumber": "Αριθμός προσπάθειας",
+    "attemptnumber": "Προσπάθεια",
     "attemptreopenmethod": "Να ξανανοίξουν οι προσπάθειες",
     "attemptreopenmethod_manual": "Χειροκίνητα",
     "attemptsettings": "Ρυθμίσεις προσπάθειας",
@@ -17,7 +17,7 @@
     "currentattemptof": "Αυτή είναι η  {{$a.attemptnumber}} προσπάθεια  ( {{$a.maxattempts}} προσπάθειες επιτρέπονται).",
     "currentgrade": "Τωρινός βαθμός στο βαθμολόγιο",
     "defaultteam": "Προεπιλεγμένη ομάδα",
-    "duedate": "Καταληκτική ημερομηνία",
+    "duedate": "Ημερομηνία εκπνοής",
     "duedateno": "Χωρίς καταληκτική ημερομηνία",
     "editingstatus": "Επεξεργασία κατάστασης",
     "editsubmission": "Τροποποίηση της υποβολής μου",
@@ -26,7 +26,7 @@
     "grade": "Βαθμός",
     "graded": "Βαθμολογήθηκε",
     "gradedby": "Βαθμολογήθηκε από",
-    "gradedon": "Βαθμολογήθηκε στις",
+    "gradedon": "Βαθμολογημένα: {{$a}}",
     "gradingstatus": "Κατάσταση Βαθμολόγησης",
     "groupsubmissionsettings": "Ρυθμίσεις ομαδικής υποβολής",
     "latesubmissions": "Εκπρόθεσμες υποβολές",
@@ -42,8 +42,8 @@
     "numberofteams": "Ομάδες",
     "numwords": "{{$a}} λέξεις",
     "outof": "{{$a.grade}} από ένα μέγιστο {{$a.maxgrade}}",
-    "overdue": "<font color=\"red\">Η εργασία είναι εκπρόθεσμη για: {{$a}}</font>",
-    "savechanges": "Αποθήκευση αλλαγών",
+    "overdue": "Καθυστερημένο",
+    "savechanges": "Αποθήκευση Αλλαγών",
     "submission": "Υποβολή",
     "submissionnoteditable": "Δε μπορεί να γίνει επεξεργασία της υποβολής",
     "submissionnotsupported": "Η υποβολή αυτή δεν υποστηρίζεται από την εφαρμογή και δεν μπορεί να περιέχει όλα τα στοιχεία που",
@@ -58,8 +58,8 @@
     "submitassignment": "Υποβολή εργασίας",
     "submittedearly": "Η εργασία υποβλήθηκε νωρίτερα κατά {{$a}}",
     "submittedlate": "Η εργασία υποβλήθηκε {{$a}} αργότερα",
-    "timemodified": "Τελευταία Τροποποίηση",
-    "timeremaining": "Υπολειπόμενος χρόνος",
+    "timemodified": "Ο χρόνος μεταβλήθηκε",
+    "timeremaining": "Υπολοιπόμενος χρόνος",
     "userwithid": "Ο χρήστης με id {{id}}",
     "viewsubmission": "Προβολή υποβολής",
     "warningsubmissiongrademodified": "Ο βαθμός υποβολής τροποποιήθηκε στο site.",
diff --git a/www/addons/mod/assign/lang/es-mx.json b/www/addons/mod/assign/lang/es-mx.json
index 1e8f0405cf7..8d1550acdf0 100644
--- a/www/addons/mod/assign/lang/es-mx.json
+++ b/www/addons/mod/assign/lang/es-mx.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Esta tarea aceptará entregas de <strong>{{$a}}</strong>",
     "applytoteam": "Aplicar calificaciones y retroalimentación a todo el equipo",
     "assignmentisdue": "La tarea ha vencido",
-    "attemptnumber": "Número de intento",
+    "attemptnumber": "Intento",
     "attemptreopenmethod": "Intentos reabiertos",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automáticamente hasta pasar",
@@ -23,7 +23,7 @@
     "currentgrade": "Calificación actual en el libro",
     "cutoffdate": "Fecha de corte",
     "defaultteam": "Grupo por defecto",
-    "duedate": "Fecha de entrega",
+    "duedate": "Fecha prometida/esperada",
     "duedateno": "No hay fecha de entrega",
     "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
     "editingstatus": "Estatus de edición",
@@ -35,7 +35,7 @@
     "grade": "Calificación",
     "graded": "Calificado",
     "gradedby": "Calificado por",
-    "gradedon": "Calificado en",
+    "gradedon": "Calificados {{$a}}",
     "gradenotsynced": "Calificación no sincronizada",
     "gradeoutof": "Calificación sobre {{$a}}",
     "gradingstatus": "Estatus de calificación",
@@ -57,17 +57,17 @@
     "nosubmission": "No se ha enviado nada en esta tarea",
     "notallparticipantsareshown": "Los participantes sin envíos no se muestran",
     "noteam": "No es miembro de ningún grupo",
-    "notgraded": "No calificado",
+    "notgraded": "No calificada",
     "numberofdraftsubmissions": "Borradores",
     "numberofparticipants": "Participantes",
     "numberofsubmissionsneedgrading": "Necesita calificarse",
     "numberofsubmittedassignments": "Enviados",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palabras",
-    "outof": "{{$a.current}} de un total de {{$a.total}}",
-    "overdue": "<font color=\"red\">La Tarea está retrasada por: {{$a}}</font>",
+    "outof": "{{$a.grade}} de un total de {{$a.maxgrade}}",
+    "overdue": "Vencido",
     "savechanges": "Guardar cambios",
-    "submission": "Entrega",
+    "submission": "Envío",
     "submissioneditable": "Los estudiantes pueden editar este envío",
     "submissionnoteditable": "Los estudiantes no pueden editar este envío",
     "submissionnotsupported": "Este envío no es soportado por la App y es posible que no contenga toda la información",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Una vez que esta tarea se haya enviado, usted no podrá hacerle más cambios",
     "submittedearly": "La tarea fue enviada {{$a}} antes",
     "submittedlate": "La tarea fue enviada {{$a}} después",
-    "timemodified": "Última modificación",
+    "timemodified": "Tiempo modificado",
     "timeremaining": "Tiempo restante",
     "ungroupedusers": "La configuración de 'Requerir grupo para hacer envío' está activada y algunos usuarios, o no son miembros de ningún grupo, o son miembros de más de un grupo, por lo que no pueden hacer envíos.",
     "unlimitedattempts": "Ilimitados",
diff --git a/www/addons/mod/assign/lang/es.json b/www/addons/mod/assign/lang/es.json
index 35e141f70c9..b5a5cc2f359 100644
--- a/www/addons/mod/assign/lang/es.json
+++ b/www/addons/mod/assign/lang/es.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Esta tarea aceptará entregas desde el <strong>{{$a}}</strong>",
     "applytoteam": "Aplicar las mismas calificaciones y comentarios al grupo completo",
     "assignmentisdue": "La tarea ha vencido",
-    "attemptnumber": "Número del intento",
+    "attemptnumber": "Intento",
     "attemptreopenmethod": "Permitir reapertura",
     "attemptreopenmethod_manual": "Manual",
     "attemptreopenmethod_untilpass": "Automática hasta aprobar",
@@ -23,7 +23,7 @@
     "currentgrade": "Calificación actual en el libro de calificaciones",
     "cutoffdate": "Fecha límite",
     "defaultteam": "Grupo predeterminado",
-    "duedate": "Fecha de entrega",
+    "duedate": "Fecha límite",
     "duedateno": "No hay fecha de entrega",
     "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
     "editingstatus": "Edición de estado",
@@ -35,7 +35,7 @@
     "grade": "Calificación",
     "graded": "Calificado",
     "gradedby": "Calificado por",
-    "gradedon": "Calificado sobre",
+    "gradedon": "Calificados {{$a}}",
     "gradeoutof": "Calificación sobre {{$a}}",
     "gradingstatus": "Estado de la calificación",
     "groupsubmissionsettings": "Configuración de entrega por grupo",
@@ -63,8 +63,8 @@
     "numberofsubmittedassignments": "Enviados",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palabras",
-    "outof": "{{$a.current}} de {{$a.total}}",
-    "overdue": "<font color=\"red\">La Tarea está retrasada por: {{$a}}</font>",
+    "outof": "{{$a.grade}} de {{$a.maxgrade}}",
+    "overdue": "Vencido",
     "savechanges": "Guardar cambios",
     "submission": "Entrega",
     "submissioneditable": "El estudiante puede editar esta entrega",
@@ -84,7 +84,7 @@
     "submitassignment_help": "Una vez que esta tarea se haya enviado usted no podrá hacer más cambios.",
     "submittedearly": "La tarea fue enviada {{$a}} antes",
     "submittedlate": "La tarea fue enviada {{$a}} después",
-    "timemodified": "Última modificación",
+    "timemodified": "Tiempo modificado",
     "timeremaining": "Tiempo restante",
     "ungroupedusers": "Si se activa la configuración \"se requiere formar parte de un grupo para realizar la entrega\" se evitará que los usuarios no asignados a lo sgrupos realicen entregas.",
     "unlimitedattempts": "Ilimitado",
diff --git a/www/addons/mod/assign/lang/eu.json b/www/addons/mod/assign/lang/eu.json
index c5b7f53de20..71e04444336 100644
--- a/www/addons/mod/assign/lang/eu.json
+++ b/www/addons/mod/assign/lang/eu.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Zeregin honetan bidalketak onartuko dira <strong>{{$a}}</strong>-tik aurrera",
     "applytoteam": "Kalifikazioak eta feedbackak talde osoari aplikatu",
     "assignmentisdue": "Epea bukatu da",
-    "attemptnumber": "Saiakera-kopurua",
+    "attemptnumber": "Saiakera",
     "attemptreopenmethod": "Saiakerak berriro ireki dira",
     "attemptreopenmethod_manual": "Eskuz",
     "attemptreopenmethod_untilpass": "Automatikoki gainditu arte",
@@ -35,7 +35,7 @@
     "grade": "Kalifikazioa",
     "graded": "Kalifikatua",
     "gradedby": "Nork kalifikatua",
-    "gradedon": "Noiz kalifikatua",
+    "gradedon": "Kalifikatuta: {{$a}}",
     "gradenotsynced": "Kalifikazioa ez da sinkronizatu",
     "gradeoutof": "Kalifikazioa ({{$a}}-(e)ra arte)",
     "gradingstatus": "Kalifikazioaren egoera",
@@ -64,8 +64,8 @@
     "numberofsubmittedassignments": "Bidalita",
     "numberofteams": "Taldeak",
     "numwords": "{{$a}} hitz",
-    "outof": "{{$a.current}}.a {{$a.total}}-tik",
-    "overdue": "<font color=\"red\">Zeregina bidaltzeko epea amaitu da orain dela {{$a}}</font>",
+    "outof": "{{$a.grade}} eta gehienez {{$a.maxgrade}}",
+    "overdue": "Atzeratuta",
     "savechanges": "Gorde aldaketak",
     "submission": "Bidalketa",
     "submissioneditable": "Ikasleak bere bidalketa edita dezake",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Behin zeregina bidalita, ezin izango duzu aldaketarik egin.",
     "submittedearly": "Bidalketagaraiz bidali zen: {{$a}}",
     "submittedlate": "Zeregina berandu bidali zen: {{$a}}",
-    "timemodified": "Azken aldaketa",
+    "timemodified": "Denbora aldatuta",
     "timeremaining": "Geratzen den denbora",
     "ungroupedusers": "'Taldeko kidea izatea behartu' ezarpena gaituta dago eta erabiltzaile batzuk ez dira inongo taldeko kide edo talde bat baino gehiagoko kideak dira, eta honek erabiltzaile horiek bidalketak egitea ekidingo du.",
     "unlimitedattempts": "Mugarik gabea",
diff --git a/www/addons/mod/assign/lang/fa.json b/www/addons/mod/assign/lang/fa.json
index 11c00c0a8db..ac0c3c3047a 100644
--- a/www/addons/mod/assign/lang/fa.json
+++ b/www/addons/mod/assign/lang/fa.json
@@ -16,7 +16,7 @@
     "currentgrade": "نمرهٔ فعلی در دفتر نمره",
     "cutoffdate": "تاریخ عدم پذیرش",
     "defaultteam": "گروه پیش‌فرض",
-    "duedate": "مهلت تحویل",
+    "duedate": "مهلت",
     "duedateno": "بدون موعد",
     "editingstatus": "وضعیت ویرایش",
     "editsubmission": "ویرایش پاسخ",
@@ -24,7 +24,7 @@
     "grade": "نمره",
     "graded": "نمره داده شده است",
     "gradedby": "نمره دهنده",
-    "gradedon": "تاریخ ثبت نمره",
+    "gradedon": "تاریخ نمره دادن: {{$a}}",
     "gradeoutof": "نمره از {{$a}}",
     "gradingstatus": "وضعیت تصحیح",
     "groupsubmissionsettings": "تنظیمات تحویل گروهی",
@@ -38,16 +38,16 @@
     "markingworkflowstatereleased": "منتشر‌شده",
     "noattempt": "هیچ چیزی تحویل داده نشده است",
     "nosubmission": "هیچ چیزی برای این تکلیف تحویل داده نشده است",
-    "notgraded": "نمره داده نشده است",
+    "notgraded": "نمره داده نشده",
     "numberofdraftsubmissions": "پیش‌نویس‌ها",
     "numberofparticipants": "شرکت کنندگان",
     "numberofsubmissionsneedgrading": "نیازمند نمره‌دهی",
     "numberofsubmittedassignments": "تحویل داده شده",
     "numberofteams": "تعداد گروه‌ها",
     "numwords": "{{$a}} کلمه",
-    "outof": "{{$a.current}} از {{$a.total}}",
-    "overdue": "<font color=\"red\">از موعد تحویل تکلیف {{$a}} گذشته است</font>",
-    "savechanges": "ذخیره تغییرات",
+    "outof": "{{$a.grade}} از {{$a.maxgrade}}",
+    "overdue": "تأخیر تحویل",
+    "savechanges": "ذخیرهٔ تغییرات",
     "submission": "پاسخ ارسالی",
     "submissioneditable": "شاگرد می‌تواند این تکلیف تحویل داده شده را ویرایش کند",
     "submissionnoteditable": "شاگرد نمی‌تواند این تکلیف را ویرایش کند",
@@ -64,7 +64,7 @@
     "submitassignment_help": "بعد از اینکه این تکلیف تحویل داده شد دیگر قادر به تغییر دادن آن نخواهید بود",
     "submittedearly": "تکلیف {{$a}} زود تحویل داده شد",
     "submittedlate": "تکلیف {{$a}} با تأخیر تحویل داده شد",
-    "timemodified": "آخرین تغییر",
+    "timemodified": "زمان آخرین تغییر",
     "timeremaining": "زمان باقیمانده",
     "ungroupedusers": "تنظیم «نیازمند گروه برای تحویل‌دادن» فعال است و بعضی از کاربران یا عضو هیچ گروهی نیستند، یا عضو بیش از یک گروه هستند. در نتیجه نمی‌توانند تکلیف را تحویل دهند.",
     "unlimitedattempts": "نامحدود",
diff --git a/www/addons/mod/assign/lang/fr.json b/www/addons/mod/assign/lang/fr.json
index 4dc3f9a1b2b..9ab4467b50e 100644
--- a/www/addons/mod/assign/lang/fr.json
+++ b/www/addons/mod/assign/lang/fr.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Ce devoir acceptera la remise de documents dès le <strong>{{$a}}</strong>",
     "applytoteam": "Appliquer les notes et le feedback à tout le groupe",
     "assignmentisdue": "Devoir à effectuer",
-    "attemptnumber": "Numéro de tentative",
+    "attemptnumber": "Tentative",
     "attemptreopenmethod": "Réouverture des travaux remis",
     "attemptreopenmethod_manual": "Manuellement",
     "attemptreopenmethod_untilpass": "Automatiquement jusqu'à réussite",
@@ -23,7 +23,7 @@
     "currentgrade": "Note actuelle dans le carnet de notes",
     "cutoffdate": "Date limite",
     "defaultteam": "Groupe par défaut",
-    "duedate": "Date de remise",
+    "duedate": "Délai d'achèvement",
     "duedateno": "Pas de date de remise",
     "duedatereached": "La date de remise de ce devoir est passée",
     "editingstatus": "Statut d'édition",
@@ -35,7 +35,7 @@
     "grade": "Note",
     "graded": "Noté",
     "gradedby": "Évalué par",
-    "gradedon": "Évalué le",
+    "gradedon": "Évalué le {{$a}}",
     "gradenotsynced": "Note non synchronisée",
     "gradeoutof": "Note sur {{$a}}",
     "gradingstatus": "Statut de l'évaluation",
@@ -57,17 +57,17 @@
     "nosubmission": "Rien n'a été déposé pour ce devoir",
     "notallparticipantsareshown": "Les participants sans travail remis ne sont pas affichés",
     "noteam": "Membre d'aucun groupe",
-    "notgraded": "Pas évalué",
+    "notgraded": "Non noté",
     "numberofdraftsubmissions": "Brouillons",
     "numberofparticipants": "Participants",
     "numberofsubmissionsneedgrading": "Nécessitant évaluation",
     "numberofsubmittedassignments": "Remis",
     "numberofteams": "Groupes",
     "numwords": "{{$a}} mots",
-    "outof": "{{$a.current}} de {{$a.total}}",
-    "overdue": "<span class=\"flagged-tag\">Le devoir est en retard de {{$a}}</span>",
-    "savechanges": "Enregistrer",
-    "submission": "Devoir rendu",
+    "outof": "{{$a.grade}} sur {{$a.maxgrade}}",
+    "overdue": "En retard",
+    "savechanges": "Enregistrer les modifications",
+    "submission": "Remise",
     "submissioneditable": "L'étudiant peut modifier ce travail remis",
     "submissionnoteditable": "L'étudiant ne peut pas modifier ce travail remis",
     "submissionnotsupported": "Le dépôt n'est pas supporté par l'app et pourrait ne pas contenir la totalité des informations",
@@ -85,8 +85,8 @@
     "submitassignment_help": "Une fois ce devoir envoyé, vous ne pourrez plus y effectuer de modification.",
     "submittedearly": "Le travail a été remis en avance de {{$a}}",
     "submittedlate": "Le travail a été remis en retard de {{$a}}",
-    "timemodified": "Dernière modification",
-    "timeremaining": "Temps restant",
+    "timemodified": "Date modification",
+    "timeremaining": "Durée restante",
     "ungroupedusers": "Le réglage « Requiert un groupe pour remettre un devoir » est activé et certains utilisateurs ne sont membres d'aucun groupe ou membres de plusieurs groupes. Cette situation les empêchera de remettre un travail.",
     "unlimitedattempts": "Illimité",
     "userswhoneedtosubmit": "Utilisateurs devant valider l'envoi du devoir : {{$a}}",
diff --git a/www/addons/mod/assign/lang/he.json b/www/addons/mod/assign/lang/he.json
index 2173768d9f5..1c97d0e611a 100644
--- a/www/addons/mod/assign/lang/he.json
+++ b/www/addons/mod/assign/lang/he.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "מטלה זו תאפשר הגשות החל מ- <strong>{{$a}}</strong>",
     "applytoteam": "החל ציונים ומשוב לכל הקבוצה",
     "assignmentisdue": "מועד ההגשה הסתיים",
-    "attemptnumber": "נסיון מספר",
+    "attemptnumber": "נסיון מענה",
     "attemptreopenmethod": "מנגנון הגשה חוזרת",
     "attemptreopenmethod_manual": "ידני",
     "attemptreopenmethod_untilpass": "אוטומטית עד ציון עובר",
@@ -28,7 +28,7 @@
     "grade": "ניקוד בפעילות",
     "graded": "נבדק",
     "gradedby": "נבדק על-ידי",
-    "gradedon": "הציון ניתן על",
+    "gradedon": "ניתן ציון: &a",
     "gradeoutof": "ציון מתוך {{$a}}",
     "gradingstatus": "מצב מתן הציון",
     "groupsubmissionsettings": "הגדרות הגשה בקבוצות",
@@ -55,10 +55,10 @@
     "numberofsubmittedassignments": "הוגש",
     "numberofteams": "קבוצות",
     "numwords": "{{$a}} מילים",
-    "outof": "{{$a.current}} מתוך ס\"ה {{$a.total}}",
-    "overdue": "<font color=\"red\">\nהמטלה באיחור של:\n{{$a}}</font>",
-    "savechanges": "שמירת שינויים",
-    "submission": "הגשה",
+    "outof": "{{$a.grade}} מתוך ציון מירבי של {{$a.maxgrade}}",
+    "overdue": "איחר את המועד",
+    "savechanges": "שמירת עדכונים",
+    "submission": "הגשה.",
     "submissioneditable": "סטודנטים יכולים לערוך הגשה זו",
     "submissionnoteditable": "סטודנטים אינם יכולים לערוך הגשה זו",
     "submissionslocked": "מטלה זו אינה מאפשרת הגשות",
@@ -75,8 +75,8 @@
     "submitassignment_help": "ברגע שהמטלה תוגש, לא ניתן יהיה לערוך שינויים נוספים",
     "submittedearly": "המטלה הוגשה {{$a}} לפני תאריך ההגשה הסופי.",
     "submittedlate": "המטלה הוגשה באחור של {{$a}}",
-    "timemodified": "עדכון אחרון",
-    "timeremaining": "זמן ההגשה (הראשוני)",
+    "timemodified": "זמן עדכון",
+    "timeremaining": "הזמן שנשאר",
     "ungroupedusers": "ההגדרה \"יש להיות חבר בקבוצה בכדי להגיש\" פעילה אך כמה משתמשים לא מוקצים לקבוצות, הדבר ימנע מהם מלהגיש את המטלות.",
     "unlimitedattempts": "לא מוגבל",
     "userswhoneedtosubmit": "משתמשים שצריכים להגיש: {{$a}}",
diff --git a/www/addons/mod/assign/lang/hu.json b/www/addons/mod/assign/lang/hu.json
index b7d94fa140c..790108fd192 100644
--- a/www/addons/mod/assign/lang/hu.json
+++ b/www/addons/mod/assign/lang/hu.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "A feladathoz <strong>{{$a}}</strong> időponttól lehet leadni munkát.",
     "applytoteam": "Osztályzatok és visszajelzés az egész csoportra kiterjesztve",
     "assignmentisdue": "A feladat teljesítendő",
-    "attemptnumber": "Próbálkozás száma",
+    "attemptnumber": "Próbálkozás",
     "attemptreopenmethod": "Újból megnyitott próbálkozások",
     "attemptreopenmethod_manual": "Kézileg",
     "attemptreopenmethod_untilpass": "Automatikusan a teljesítésig",
@@ -19,7 +19,7 @@
     "currentgrade": "Aktuális osztályzat az osztályozónaplóban",
     "cutoffdate": "Lezárás időpontja",
     "defaultteam": "Alapcsoport",
-    "duedate": "Határidő",
+    "duedate": "Esedékesség",
     "duedateno": "Nincs határidő",
     "duedatereached": "A feladat teljesítésének határideje lejárt.",
     "editingstatus": "Szerkesztés állapota",
@@ -28,7 +28,7 @@
     "grade": "Pont",
     "graded": "Pontozott",
     "gradedby": "Osztályozta",
-    "gradedon": "Osztályozás időpontja",
+    "gradedon": "Pontozott {{$a}}",
     "gradeoutof": "{{$a}} pontból",
     "gradingstatus": "Osztályozás állapota",
     "groupsubmissionsettings": "Csoportos leadás beállításai",
@@ -48,17 +48,17 @@
     "noonlinesubmissions": "Ehhez a feladathoz semmit nem kell neten keresztül leadnia.",
     "nosubmission": "A feladathoz nem érkezett leadott munka.",
     "noteam": "Ön egyik csoportnak sem tagja",
-    "notgraded": "Nincs osztályozva",
+    "notgraded": "Nincs lepontozva",
     "numberofdraftsubmissions": "Piszkozatok",
     "numberofparticipants": "Résztvevők",
     "numberofsubmissionsneedgrading": "Osztályozandó",
     "numberofsubmittedassignments": "Leadva",
     "numberofteams": "Csoportok",
     "numwords": "{{$a}} szó",
-    "outof": "{{$a.current}} / {{$a.total}}",
-    "overdue": "<font color=\"red\">A feladat lejárt: {{$a}}</font>",
+    "outof": "{{$a.grade}} a maximum {{$a.maxgrade}} közül",
+    "overdue": "Lejárt",
     "savechanges": "Módosítások mentése",
-    "submission": "Leadott munka",
+    "submission": "Leadás",
     "submissioneditable": "A tanuló a leadandót szerkesztheti.",
     "submissionnoteditable": "A tanuló a leadandót nem szerkesztheti.",
     "submissionslocked": "A feladathoz nem lehet munkát leadni.",
@@ -75,7 +75,7 @@
     "submitassignment_help": "A feladat leadás után nem módosítható.",
     "submittedearly": "Feladat {{$a}} idővel korábban leadva",
     "submittedlate": "Feladat {{$a}} idővel később leadva",
-    "timemodified": "Utolsó módosítás",
+    "timemodified": "Időpont módosult",
     "timeremaining": "Hátralévő idő",
     "ungroupedusers": "A Csoport számára leadás előírása be van kapcsolva és egyes felhasználók nincsenek csoporthoz - vagy több csoporthoz vannak - hozzárendelve, így nem adhatnak le munkát.",
     "unlimitedattempts": "Korlátlan",
diff --git a/www/addons/mod/assign/lang/it.json b/www/addons/mod/assign/lang/it.json
index bfcebef051d..447c7bf5f7b 100644
--- a/www/addons/mod/assign/lang/it.json
+++ b/www/addons/mod/assign/lang/it.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Questo compito accetta consegne a partire dal <strong>{{$a}}</strong>",
     "applytoteam": "Usa lo stesso feedback e la stessa valutazione per tutto il gruppo",
     "assignmentisdue": "Consegna compito",
-    "attemptnumber": "Numero tentativo",
+    "attemptnumber": "Tentativo",
     "attemptreopenmethod": "Riapertura tentativo",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente fino al superamento",
@@ -19,7 +19,7 @@
     "currentgrade": "Voto nel Registro delle valutazioni",
     "cutoffdate": "Data limite",
     "defaultteam": "Gruppo di default",
-    "duedate": "Termine consegne",
+    "duedate": "Data di scadenza",
     "duedateno": "Senza termine consegne",
     "duedatereached": "La data di scadenza del compito è già trascorsa",
     "editingstatus": "Possibilità di modifica",
@@ -28,7 +28,7 @@
     "grade": "Valutazione",
     "graded": "Valutata",
     "gradedby": "Valutatore",
-    "gradedon": "Data di valutazione",
+    "gradedon": "Valutato: {{$a}}",
     "gradeoutof": "Punteggio (su {{$a}})",
     "gradingstatus": "Stato valutazione",
     "groupsubmissionsettings": "Impostazioni consegna di gruppo",
@@ -56,10 +56,10 @@
     "numberofsubmittedassignments": "Consegne",
     "numberofteams": "Gruppi",
     "numwords": "{{$a}} parole",
-    "outof": "{{$a.current}} su {{$a.total}}",
-    "overdue": "<font color=\"red\">Consegna in ritardo da: {{$a}}</font>",
+    "outof": "{{$a.grade}} su un massimo di {{$a.maxgrade}}",
+    "overdue": "In ritardo",
     "savechanges": "Salva modifiche",
-    "submission": "Consegna",
+    "submission": "Invii",
     "submissioneditable": "Lo studente può modificare la consegna",
     "submissionnoteditable": "Gli studenti non possono modificare questa consegna",
     "submissionnotsupported": "Questa consegna non è supportata dalla app e può non contenere tutte le informazioni.",
@@ -77,8 +77,8 @@
     "submitassignment_help": "Dopo aver consegnato il compito non potrai più modificarlo",
     "submittedearly": "Il compito è stato consegnato {{$a}} in anticipo",
     "submittedlate": "Il compito è stato consegnato {{$a}} in ritardo",
-    "timemodified": "Ultima modifica",
-    "timeremaining": "Tempo rimasto",
+    "timemodified": "Data/ora modifica",
+    "timeremaining": "Tempo rimanente",
     "ungroupedusers": "L'impostazione 'Consegna di gruppo obbligatoria' è abilitata ma alcuni utenti non fanno parte di gruppi o fanno parte di più gruppi e pertanto non potranno effettuare consegne.",
     "unlimitedattempts": "Illimitati",
     "userswhoneedtosubmit": "Utenti che non hanno consegnato: {{$a}}",
diff --git a/www/addons/mod/assign/lang/ja.json b/www/addons/mod/assign/lang/ja.json
index 8738b2818e6..178125efdf8 100644
--- a/www/addons/mod/assign/lang/ja.json
+++ b/www/addons/mod/assign/lang/ja.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "この課題は <strong>{{$a}}</strong> から提出を受け付けます。",
     "applytoteam": "グループ全体に評定およびフィードバックを提供する",
     "assignmentisdue": "課題の提出期限が到来しました。",
-    "attemptnumber": "提出回数",
+    "attemptnumber": "受験",
     "attemptreopenmethod": "提出再オープン",
     "attemptreopenmethod_manual": "手動",
     "attemptreopenmethod_untilpass": "合格するまで自動",
@@ -19,7 +19,7 @@
     "currentgrade": "評定表内の現在の評定",
     "cutoffdate": "遮断日時",
     "defaultteam": "デフォルトグループ",
-    "duedate": "終了日時",
+    "duedate": "期限",
     "duedateno": "提出期限なし",
     "duedatereached": "この課題の提出期限を過ぎました。",
     "editingstatus": "編集ステータス",
@@ -28,7 +28,7 @@
     "grade": "評定",
     "graded": "評定済み",
     "gradedby": "評定者",
-    "gradedon": "評定日時",
+    "gradedon": "評定日時: {{$a}}",
     "gradeoutof": "{{$a}} 点中の評点",
     "gradingstatus": "評定ステータス",
     "groupsubmissionsettings": "グループ提出設定",
@@ -55,10 +55,10 @@
     "numberofsubmittedassignments": "提出",
     "numberofteams": "グループ",
     "numwords": "{{$a}} 語",
-    "outof": "{{$a.current}} / {{$a.total}}",
-    "overdue": "<font color=\"red\">課題は次の時間を超過しています: {{$a}}</font>",
+    "outof": "{{$a.grade}} / {{$a.maxgrade}}",
+    "overdue": "期限切れ",
     "savechanges": "変更を保存する",
-    "submission": "提出課題",
+    "submission": "送信",
     "submissioneditable": "学生はこの提出を編集できます。",
     "submissionnoteditable": "学生はこの提出を編集できません。",
     "submissionslocked": "この課題は提出を受け付けていません。",
@@ -75,7 +75,7 @@
     "submitassignment_help": "この課題を提出した時点であなたはこれ以上変更できないようになります。",
     "submittedearly": "課題は {{$a}} 早く提出されました。",
     "submittedlate": "課題は {{$a}} 遅く提出されました。",
-    "timemodified": "最終更新日時",
+    "timemodified": "修正日時",
     "timeremaining": "残り時間",
     "ungroupedusers": "設定「提出にグループを必要とする」が有効にされているため、そして何名かのユーザがグループのメンバーではないため、または2つ以上のグループメンバーであるため、提出することはできません。",
     "unlimitedattempts": "無制限",
diff --git a/www/addons/mod/assign/lang/lt.json b/www/addons/mod/assign/lang/lt.json
index 981dfa5b68b..81ede31f120 100644
--- a/www/addons/mod/assign/lang/lt.json
+++ b/www/addons/mod/assign/lang/lt.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Užduotis priims darbus nuo <strong>{{$a}}</strong>",
     "applytoteam": "Patvirtinti įvertinimus ir atsaką visai grupei",
     "assignmentisdue": "Užduoties atlikimo laikas baigės",
-    "attemptnumber": "Bandymo numeris",
+    "attemptnumber": "Bandymas",
     "attemptreopenmethod": "Pateikimų pakartotinis atidarymas",
     "attemptreopenmethod_manual": "Rankiniu būdu",
     "attemptreopenmethod_untilpass": "Automatiškai, kol negaunamas teigiamas įvertinimas",
@@ -23,7 +23,7 @@
     "currentgrade": "Dabartinis įvertis įverčių knygelėje",
     "cutoffdate": "Paskutinė diena pristatymui",
     "defaultteam": "Numatyta grupė",
-    "duedate": "Data pristatymui",
+    "duedate": "Terminas",
     "duedateno": "Nėra termino",
     "duedatereached": "Vėliausia įkėlimo data šiai užduočiai jau praėjo.",
     "editingstatus": "Darbo keitimo galimybė",
@@ -35,7 +35,7 @@
     "grade": "Įvertis",
     "graded": "Įvertinta",
     "gradedby": "Įvertino",
-    "gradedon": "Įvertinta",
+    "gradedon": "Įvertinta: {{$a}}",
     "gradeoutof": "Įvertinimas (iš galimų {{$a}})",
     "gradingstatus": "Vertinimo būsena",
     "groupsubmissionsettings": "Grupinio pateikimo nustatymai",
@@ -62,10 +62,10 @@
     "numberofsubmittedassignments": "Pateikta",
     "numberofteams": "Grupės",
     "numwords": "Žodžių: {{$a}}",
-    "outof": "{{$a.current}} iš {{$a.total}}",
-    "overdue": "<font color=\"red\">Vėluojama  įkelti darbą: {{$a}}</font>",
+    "outof": "{{$a.grade}} iš maks. {{$a.maxgrade}}",
+    "overdue": "Uždelstas",
     "savechanges": "Išsaugoti pakeitimus",
-    "submission": "Įkeltas darbas",
+    "submission": "Pateikimas",
     "submissioneditable": "Besimokantysis gali keisti savo darbą",
     "submissionnoteditable": "Besimokantysis negali keisti šio įkelto darbo",
     "submissionnotsupported": "Programėlė negali patvirtinti ir pateikti visos informacijos",
@@ -83,7 +83,7 @@
     "submitassignment_help": "Kai darbas bus pateiktas, Jūs negalėsite padaryti jokių pakeitimų.",
     "submittedearly": "Užduotis buvo įkelta {{$a}} anksčiau",
     "submittedlate": "Užduotis buvo įkelta vėluojant {{$a}}",
-    "timemodified": "Paskutinį kartą keista",
+    "timemodified": "Modifikavimo laikas",
     "timeremaining": "Liko laiko",
     "unlimitedattempts": "Neribotai",
     "userswhoneedtosubmit": "Naudotojai, kurie turi pateikti darbą: {{$a}}",
diff --git a/www/addons/mod/assign/lang/nl.json b/www/addons/mod/assign/lang/nl.json
index 6148bf53066..fffe821238a 100644
--- a/www/addons/mod/assign/lang/nl.json
+++ b/www/addons/mod/assign/lang/nl.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Deze opdracht zal inzendingen ontvangen vanaf <strong>{{$a}}</strong>",
     "applytoteam": "Cijfers en feedback aan de hele groep geven",
     "assignmentisdue": "Opdracht tegen",
-    "attemptnumber": "Pogingnummer",
+    "attemptnumber": "Poging",
     "attemptreopenmethod": "Heropende pogingen",
     "attemptreopenmethod_manual": "Manueel",
     "attemptreopenmethod_untilpass": "Automatisch tot geslaagd",
@@ -23,7 +23,7 @@
     "currentgrade": "Huidig cijfer in de cijferlijst",
     "cutoffdate": "Afsluitdatum",
     "defaultteam": "Standaard groep",
-    "duedate": "Uiterste inleverdatum",
+    "duedate": "Einddatum",
     "duedateno": "Geen uiterste inleverdatum",
     "duedatereached": "De datum waarop deze opdracht moest afgegeven worden is nu voorbij.",
     "editingstatus": "Status bewerken",
@@ -35,7 +35,7 @@
     "grade": "Beoordeling",
     "graded": "Beoordeeld",
     "gradedby": "Beoordeeld door",
-    "gradedon": "Beoordeeld op",
+    "gradedon": "Beoordeeld op {{$a}}",
     "gradenotsynced": "Cijfer niet gesynchroniseerd",
     "gradeoutof": "Cijfer op {{$a}}",
     "gradingstatus": "Beoordelingsstatus",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Ingestuurd",
     "numberofteams": "Groepen",
     "numwords": "{{$a}} woorden",
-    "outof": "{{$a.current}} van {{$a.total}}",
-    "overdue": "<font color=\"red\">Opdracht {{$a}} te laat ingestuurd</font>",
-    "savechanges": "Bewaar de wijzigingen",
-    "submission": "Ingestuurde opdracht",
+    "outof": "{{$a.grade}} op een maximum van {{$a.maxgrade}}",
+    "overdue": "Te laat",
+    "savechanges": "Bewaar wijzigingen",
+    "submission": "Inzending",
     "submissioneditable": "Leerling kan zijn ingestuurde opdracht bewerken",
     "submissionnoteditable": "Leerling kan ingestuurde opdracht niet bewerken",
     "submissionnotsupported": "Deze ingestuurde opdracht wordt niet ondersteund door de app bevat mogelijk niet alle informatie",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Als je deze opdracht hebt ingestuurd, dan zul je geen wijzigingen meer kunnen aanbrengen.",
     "submittedearly": "Opdracht was {{$a}} te vroeg ingestuurd",
     "submittedlate": "Opdracht was {{$a}} te laat ingestuurd",
-    "timemodified": "Laatst gewijzigd",
+    "timemodified": "Gewijzigd op",
     "timeremaining": "Resterende tijd",
     "ungroupedusers": "De insteling \"Groeplidmaatschap vereist om een inzending te maken\" is ingeschakeld en sommige gebruikers zijn niet toegewezen aan een groep of zijn lid van meerdere groepen. Dit zal het hen onmogelijk maken om hun opdracht in te sturen.",
     "unlimitedattempts": "Onbeperkt",
diff --git a/www/addons/mod/assign/lang/pl.json b/www/addons/mod/assign/lang/pl.json
index e86e6a78384..0e1c276e6bf 100644
--- a/www/addons/mod/assign/lang/pl.json
+++ b/www/addons/mod/assign/lang/pl.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Rozwiązania tego zadania będzie można przesyłać od <strong>{{$a}}</strong>",
     "applytoteam": "Zastosuj oceny i informacje zwrotne dla całej grupy",
     "assignmentisdue": "Zadanie jest zaległe",
-    "attemptnumber": "Numer próby",
+    "attemptnumber": "Próba",
     "attemptreopenmethod": "Ponowne otwieranie prób",
     "attemptreopenmethod_manual": "Ręcznie",
     "attemptreopenmethod_untilpass": "Automatycznie, aż przejdą",
@@ -19,7 +19,7 @@
     "currentgrade": "Bieżąca ocena w dzienniku ocen",
     "cutoffdate": "Ostateczny termin",
     "defaultteam": "Domyślna grupa",
-    "duedate": "Termin oddania",
+    "duedate": "Termin",
     "duedateno": "Brak terminu oddania",
     "duedatereached": "Minął termin oddania tego zadania",
     "editingstatus": "Edycja statusu",
@@ -28,7 +28,7 @@
     "grade": "Ocena",
     "graded": "Ocenione",
     "gradedby": "Ocenione przez",
-    "gradedon": "Ocenione dnia",
+    "gradedon": "Ocenienione: {{$a}}",
     "gradeoutof": "Ocena z max. {{$a}}",
     "gradingstatus": "Stan oceniania",
     "groupsubmissionsettings": "Ustawienia zadań grupowych",
@@ -48,17 +48,17 @@
     "noonlinesubmissions": "To zadanie nie wymaga wysyłania niczego online",
     "nosubmission": "Żadne rozwiązanie nie zostało przesłane do tego zadania",
     "noteam": "Nie jesteś członkiem żadnej grupy",
-    "notgraded": "Nie ocenione",
+    "notgraded": "Nie oceniono",
     "numberofdraftsubmissions": "Wersja robocza",
     "numberofparticipants": "Uczestnicy",
     "numberofsubmissionsneedgrading": "Wymaga oceny",
     "numberofsubmittedassignments": "Nadesłane",
     "numberofteams": "Grupy",
     "numwords": "{{$a}} słów",
-    "outof": "{{$a.current}} z {{$a.total}}",
-    "overdue": "<font color=\"red\">Opóźnienie w przesłaniu: {{$a}}</font>",
+    "outof": "{{$a.grade}} z możliwych do uzyskania {{$a.maxgrade}}",
+    "overdue": "Zaległy",
     "savechanges": "Zapisz zmiany",
-    "submission": "Oddane zadanie",
+    "submission": "Praca",
     "submissioneditable": "Student może edytować to zadanie",
     "submissionnoteditable": "Student nie może edytować tego zadania",
     "submissionslocked": "To zadanie nie akceptuje przesyłania rozwiązań",
@@ -75,7 +75,7 @@
     "submitassignment_help": "Po zgłoszeniu tego zadania, nie będzie można wprowadzić zmian.",
     "submittedearly": "Zadanie zostało złożone {{$a}} przed terminem",
     "submittedlate": "Zadanie zostało złożone {{$a}} po terminie",
-    "timemodified": "Ostatnio modyfikowane",
+    "timemodified": "Zmodyfikowano czas",
     "timeremaining": "Pozostały czas",
     "unlimitedattempts": "Nieograniczony",
     "userswhoneedtosubmit": "Użytkownicy, którzy muszą przesłać zadanie: {{$a}}",
diff --git a/www/addons/mod/assign/lang/pt-br.json b/www/addons/mod/assign/lang/pt-br.json
index 5623ab38711..3b8acb9e600 100644
--- a/www/addons/mod/assign/lang/pt-br.json
+++ b/www/addons/mod/assign/lang/pt-br.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Esta tarefa aceitará envios a partir de <strong>{{$a}}</strong>",
     "applytoteam": "Habilitar notas e feedback para todo grupo",
     "assignmentisdue": "Tarefa encerrada",
-    "attemptnumber": "Número da tentativa",
+    "attemptnumber": "Tentativa",
     "attemptreopenmethod": "Tentativas reabertas",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente até que passe",
@@ -23,7 +23,7 @@
     "currentgrade": "Nota atual no livro de notas",
     "cutoffdate": "Data limite",
     "defaultteam": "Grupo padrão",
-    "duedate": "Data de entrega",
+    "duedate": "Prazo",
     "duedateno": "Nenhuma data de entrega",
     "duedatereached": "A data de encerramento para essa tarefa já foi atingida",
     "editingstatus": "Editar estado",
@@ -35,7 +35,7 @@
     "grade": "Nota",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
-    "gradedon": "Avaliado em",
+    "gradedon": "Avaliado: {{$a}}",
     "gradenotsynced": "Avaliação não sincronizada",
     "gradeoutof": "Nota até {{$a}}",
     "gradingstatus": "Status da avaliação",
@@ -57,17 +57,17 @@
     "nosubmission": "Nada foi enviado para esta tarefa",
     "notallparticipantsareshown": "Participantes sem permissão não são exibidos",
     "noteam": "Você não é membro de nenhum grupo.",
-    "notgraded": "Não há notas",
+    "notgraded": "Não avaliada",
     "numberofdraftsubmissions": "Rascunhos",
     "numberofparticipants": "Participantes",
     "numberofsubmissionsneedgrading": "Precisa de avaliação",
     "numberofsubmittedassignments": "Enviado",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palavras",
-    "outof": "{{$a.current}} de {{$a.total}}",
-    "overdue": "<font color=\"red\">A tarefa está atrasada há: {{$a}}</font>",
-    "savechanges": "Salvar mudanças",
-    "submission": "Envio de tarefas",
+    "outof": "{{$a.grade}} de um máximo de {{$a.maxgrade}}",
+    "overdue": "Expirado",
+    "savechanges": "Guardar mudanças",
+    "submission": "Envio",
     "submissioneditable": "Estudantes podem editar essa submissão",
     "submissionnoteditable": "Estudante não pode editar este envio",
     "submissionnotsupported": "Esse envio não é suportado pelo aplicativo e pode não conter todas as informações",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Uma vez que a tarefa for enviada você não poderá mais fazer alterações.",
     "submittedearly": "A tarefa foi enviada {{$a}} adiantado",
     "submittedlate": "A tarefa foi enviada {{$a}} atrasada",
-    "timemodified": "Última modificação",
+    "timemodified": "Tempo modificado",
     "timeremaining": "Tempo restante",
     "ungroupedusers": "A configuração \"Somente membros de grupo podem fazer envio\" está ligada e existem usuários não alocados em grupos. Isso impedira que estes usuários consigam enviar tarefas.",
     "unlimitedattempts": "Ilimitado",
diff --git a/www/addons/mod/assign/lang/pt.json b/www/addons/mod/assign/lang/pt.json
index 6dd021409aa..8717104b955 100644
--- a/www/addons/mod/assign/lang/pt.json
+++ b/www/addons/mod/assign/lang/pt.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Pode submeter o trabalho a partir de <strong>{{$a}}</strong>",
     "applytoteam": "Atribuir notas e comentários a todo o grupo",
     "assignmentisdue": "Já terminou o prazo para submeter o trabalho",
-    "attemptnumber": "Número da tentativa",
+    "attemptnumber": "Tentativa",
     "attemptreopenmethod": "Tentativas reabertas",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente até obter aproveitamento",
@@ -23,7 +23,7 @@
     "currentgrade": "Nota atual na pauta",
     "cutoffdate": "Data de fecho",
     "defaultteam": "Grupo predefinido",
-    "duedate": "Data limite para submeter trabalhos",
+    "duedate": "Data limite",
     "duedateno": "Sem data limite",
     "duedatereached": "A data limite de submissão deste trabalho já foi ultrapassada.",
     "editingstatus": "Editar o estado",
@@ -35,7 +35,7 @@
     "grade": "Nota",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
-    "gradedon": "Avaliado em",
+    "gradedon": "Avaliado: {{$a}}",
     "gradenotsynced": "Nota não está sincronizada",
     "gradeoutof": "Nota (de 0 a {{$a}})",
     "gradingstatus": "Estado da avaliação",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Número de trabalhos submetidos",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palavra(s)",
-    "outof": "{{$a.current}} de {{$a.total}}",
-    "overdue": "<font color=\"red\">Trabalho entregue com atraso de {{$a}}</font>",
+    "outof": "{{$a.grade}} num máximo de {{$a.maxgrade}}",
+    "overdue": "Fora de prazo",
     "savechanges": "Gravar alterações",
-    "submission": "Trabalho",
+    "submission": "Submissão",
     "submissioneditable": "Os alunos podem editar esta submissão",
     "submissionnoteditable": "O aluno não pode editar esta submissão",
     "submissionnotsupported": "Esta submissão não é suportada pela aplicação e pode não conter toda a informação",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Assim que este trabalho for submetido não poderá fazer mais alterações.",
     "submittedearly": "O trabalho foi submetido '{{$a}}' antes do fim do prazo",
     "submittedlate": "O trabalho foi submetido {{$a}} depois do prazo",
-    "timemodified": "Última alteração",
+    "timemodified": "Data da última edição",
     "timeremaining": "Tempo restante",
     "ungroupedusers": "A configuração 'Requer grupo para submeter trabalho' está ativa e existem utilizadores que não pertencem a nenhum grupo, ou que se encontram inscritos em mais do que um, o que fará com que estes fiquem impossibilitados de submeter os seus trabalhos.",
     "unlimitedattempts": "Ilimitado",
diff --git a/www/addons/mod/assign/lang/ro.json b/www/addons/mod/assign/lang/ro.json
index 9e5786fe879..1ed31a35e8f 100644
--- a/www/addons/mod/assign/lang/ro.json
+++ b/www/addons/mod/assign/lang/ro.json
@@ -6,7 +6,7 @@
     "allowsubmissionsfromdatesummary": "Se acceptă lucrări de la <strong>{{$a}}</strong>",
     "applytoteam": "Aplică notele și feedback-ul întregului grup",
     "assignmentisdue": "Data predării",
-    "attemptnumber": "Numărul încercării",
+    "attemptnumber": "Încercare",
     "attemptreopenmethod": "Încercările sunt disponibile din nou",
     "attemptreopenmethod_manual": "Manual",
     "attemptsettings": "Setări încerecre",
@@ -23,7 +23,7 @@
     "grade": "Notă",
     "graded": "Notat",
     "gradedby": "Notat de",
-    "gradedon": "Notat în data de",
+    "gradedon": "Notat: {{$a}}",
     "gradeoutof": "O notă din {{$a}}",
     "hiddenuser": "Participant",
     "latesubmissionsaccepted": "Permis până în {{$a}}",
@@ -44,7 +44,7 @@
     "numberofsubmittedassignments": "Trimis",
     "numberofteams": "Grupuri",
     "numwords": "{{$a}} cuvinte",
-    "outof": "{{$a.current}} din {{$a.total}}",
+    "outof": "{{$a.grade}} din maxim {{$a.maxgrade}} posibil",
     "savechanges": "Salvează modificări",
     "submission": "Temă trimisă",
     "submissioneditable": "Cursanții își pot edita lucrările trimise",
diff --git a/www/addons/mod/assign/lang/ru.json b/www/addons/mod/assign/lang/ru.json
index d2e1917e97a..45801638537 100644
--- a/www/addons/mod/assign/lang/ru.json
+++ b/www/addons/mod/assign/lang/ru.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Это назначение будет приниматься с <strong>{{$a}}</strong>",
     "applytoteam": "Применить оценки и отзывы для всей группы.",
     "assignmentisdue": "Задание сдано",
-    "attemptnumber": "Номер попытки",
+    "attemptnumber": "Попытка",
     "attemptreopenmethod": "Разрешать новые попытки",
     "attemptreopenmethod_manual": "Вручную",
     "attemptreopenmethod_untilpass": "Автоматически (до проходной оценки)",
@@ -19,7 +19,7 @@
     "currentgrade": "Текущая оценка в журнале",
     "cutoffdate": "Запретить отправку с",
     "defaultteam": "Группа по умолчанию",
-    "duedate": "Последний срок сдачи",
+    "duedate": "Срок выполнения",
     "duedateno": "Срок сдачи не ограничен",
     "duedatereached": "Срок сдачи этого задания уже истек",
     "editingstatus": "Изменение статуса",
@@ -28,7 +28,7 @@
     "grade": "Оценка",
     "graded": "Оценено",
     "gradedby": "Оценено",
-    "gradedon": "Оценено в",
+    "gradedon": "Оценено: {{$a}}",
     "gradenotsynced": "Оценка не синхронизирована",
     "gradeoutof": "Оценка из {{$a}}",
     "gradingstatus": "Состояние оценивания",
@@ -49,17 +49,17 @@
     "noonlinesubmissions": "Ответ на задание должен быть представлен вне сайта",
     "nosubmission": "Ничего не было представлено",
     "noteam": "Не является членом какой-либо группы",
-    "notgraded": "Не оценено",
+    "notgraded": "Не оценен",
     "numberofdraftsubmissions": "Черновик",
     "numberofparticipants": "Участники",
     "numberofsubmissionsneedgrading": "Требуют оценки",
     "numberofsubmittedassignments": "Ответы",
     "numberofteams": "Группы",
     "numwords": "всего слов - {{$a}}",
-    "outof": "{{$a.current}} из {{$a.total}}",
-    "overdue": "<font color=\"red\">Задание просрочено на: {{$a}}</font>",
-    "savechanges": "Сохранить",
-    "submission": "Ответ",
+    "outof": "{{$a.grade}} из {{$a.maxgrade}}",
+    "overdue": "Срок закончился",
+    "savechanges": "Сохранить изменения",
+    "submission": "Представление",
     "submissioneditable": "Студент может править свой ответ",
     "submissionnoteditable": "Студент не может исправлять этот ответ",
     "submissionslocked": "Ответы на это задание не принимаются",
@@ -76,7 +76,7 @@
     "submitassignment_help": "Однажды представив ответ на это задание Вы больше не сможете  изменить его.",
     "submittedearly": "Задание представлено заранее - {{$a}}",
     "submittedlate": "Задание представлено с опозданием - {{$a}}",
-    "timemodified": "Последнее изменение",
+    "timemodified": "Время изменения",
     "timeremaining": "Оставшееся время",
     "ungroupedusers": "Включен параметр «Нужно быть в группе для отправки ответа». Некоторые пользователи не являются членами групп или являются членами нескольких групп, эти пользователи не смогут отправить ответы на задание.",
     "unlimitedattempts": "Неограничено",
diff --git a/www/addons/mod/assign/lang/sv.json b/www/addons/mod/assign/lang/sv.json
index a7fecd382cc..16b3a854b08 100644
--- a/www/addons/mod/assign/lang/sv.json
+++ b/www/addons/mod/assign/lang/sv.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Denna inlämningsuppgift kommer att tillåta inlämning från <strong>{{$a}}</strong>",
     "applytoteam": "Tillämpa betyg och återkoppling för hela gruppen",
     "assignmentisdue": "Inlämningstiden har gått ut.",
-    "attemptnumber": "Försök nummer",
+    "attemptnumber": "Försök",
     "attemptreopenmethod": "Försök återupptas",
     "attemptreopenmethod_manual": "Manuellt",
     "attemptreopenmethod_untilpass": "Automatiskt tills passerat",
@@ -19,7 +19,7 @@
     "currentgrade": "Aktuellt betyg/omdöme i betygskatalogen",
     "cutoffdate": "Avstängningsdatum",
     "defaultteam": "Förvald grupp",
-    "duedate": "Stoppdatum/tid",
+    "duedate": "Sista datum",
     "duedateno": "Inget stoppdatum/tid",
     "duedatereached": "Stoppdatum för denna inlämningsuppgift har nu passerat",
     "editingstatus": "Redigerar status",
@@ -28,7 +28,7 @@
     "grade": "Betyg",
     "graded": "Betygssatt",
     "gradedby": "Betygssatt av",
-    "gradedon": "Betygssatt den",
+    "gradedon": "Betygssatt {{$a}}",
     "gradeoutof": "Betyg ur {{$a}}",
     "gradingstatus": "Betygssättningsstatus",
     "groupsubmissionsettings": "Gruppinlämning inställningar",
@@ -48,16 +48,16 @@
     "noonlinesubmissions": "Denna inlämningsuppgift kräver inte att du lämnar in något online.",
     "nosubmission": "Inget har lämnats in för denna inlämningsuppgift",
     "noteam": "Inte medlem i någon grupp",
-    "notgraded": "Ej betygssatt",
+    "notgraded": "Inte rättad",
     "numberofdraftsubmissions": "Utkast",
     "numberofparticipants": "Deltagare",
     "numberofsubmissionsneedgrading": "Behöver betygssättas",
     "numberofsubmittedassignments": "Inlämnad",
     "numberofteams": "Grupper",
     "numwords": "{{$a}} ord",
-    "outof": "{{$a.current}} av totalt {{$a.total}}",
-    "overdue": "<font color=\"red\">Inlämningsuppgiften är försenad med: {{$a}}</font>",
-    "savechanges": "Spara ändringar.",
+    "outof": "av ett maximum på",
+    "overdue": "förfallen",
+    "savechanges": "Spara ändringar",
     "submission": "Inskickad uppgift",
     "submissioneditable": "Elev kan ändra denna inlämning",
     "submissionnoteditable": "Elev kan inte ändra denna inlämning",
@@ -75,7 +75,7 @@
     "submitassignment_help": "När du har lämnat in din uppgift kommer du inte längre att kunna göra ändringar i den.",
     "submittedearly": "Inlämningsuppgift lämnades in {{$a}} tidigt",
     "submittedlate": "Inlämningsuppgift lämnades in {{$a}} sent",
-    "timemodified": "Senast ändrad",
+    "timemodified": "Modifierad när",
     "timeremaining": "Återstående tid",
     "unlimitedattempts": "Obegränsad",
     "userswhoneedtosubmit": "Användare som behöver lämna in: {{$a}}",
diff --git a/www/addons/mod/assign/lang/tr.json b/www/addons/mod/assign/lang/tr.json
index d56c55e9e46..3852f07754c 100644
--- a/www/addons/mod/assign/lang/tr.json
+++ b/www/addons/mod/assign/lang/tr.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Ödev başvuruları <strong>{{$a}}</strong> adresinden kabul edilecek.",
     "applytoteam": "Notları onayla ve tüm gruba geri bildirimde bulun",
     "assignmentisdue": "Ödevin teslim süresi dolmuş",
-    "attemptnumber": "Deneme numarası",
+    "attemptnumber": "Uygulama",
     "attemptreopenmethod": "Denemeler tekrar açıldı",
     "attemptreopenmethod_manual": "El ile",
     "attemptreopenmethod_untilpass": "Geçene kadar otomatik",
@@ -19,7 +19,7 @@
     "currentgrade": "Notdefterindeki şuanki notu",
     "cutoffdate": "Kesilme tarihi",
     "defaultteam": "Varsayılan grup",
-    "duedate": "Son teslim tarihi",
+    "duedate": "Bitiş tarihi",
     "duedateno": "Süresiz",
     "duedatereached": "Bu ödevin teslim tarihi geçmiş",
     "editingstatus": "Durumu düzenleme",
@@ -27,7 +27,7 @@
     "extensionduedate": "Ek sürenin bitiş tarihi",
     "grade": "Başarı notu",
     "graded": "Notlandırıldı",
-    "gradedon": "Not verildi",
+    "gradedon": "Notlandırıldı: {{$a}}",
     "gradeoutof": "{{$a}} Dışarıdan notu",
     "gradingstatus": "Puan durumu",
     "groupsubmissionsettings": "Grup gönderimleri ayarları",
@@ -54,8 +54,8 @@
     "numberofsubmittedassignments": "Gönderilen",
     "numberofteams": "Gruplar",
     "numwords": "{{$a}} kelime",
-    "outof": "{{$a.current}} dışında {{$a.total}}",
-    "overdue": "<font color=\"red\">Tarafından göderilen geç kalmış ödev{{$a}}</font>",
+    "outof": "{{$a.maxgrade}} üzerinden {{$a.grade}}",
+    "overdue": "Süresi dolmuş",
     "savechanges": "Değişiklikleri kaydet",
     "submission": "Gönderim",
     "submissioneditable": "Öğrenci bu gönderimi düzenleyebilir",
@@ -74,7 +74,7 @@
     "submitassignment_help": "Ödevinizi gönderdiğinizde,  üzerinde değişiklik yapmanız mümkün olmayacak.",
     "submittedearly": "Ödev {{$a}} erken teslim edildi",
     "submittedlate": "Ödev {{$a}} geç teslim edildi",
-    "timemodified": "Son düzenleme",
+    "timemodified": "Düzenleme zamanı",
     "timeremaining": "Kalan süre",
     "ungroupedusers": "'Gönderim yapmak için grup gerekli' ayarı etkindir ve bazı kullanıcılar herhangi bir gruba üye değildir veya birden fazla gruba üye olduğundan, gönderim yapamazlar.",
     "unlimitedattempts": "Sınırsız",
diff --git a/www/addons/mod/assign/lang/uk.json b/www/addons/mod/assign/lang/uk.json
new file mode 100644
index 00000000000..81ec4685f73
--- /dev/null
+++ b/www/addons/mod/assign/lang/uk.json
@@ -0,0 +1,97 @@
+{
+    "acceptsubmissionstatement": "Будь ласка, прийміть заяву-згоду.",
+    "addattempt": "Дозволити іншу спробу",
+    "addnewattempt": "Додати нову спробу",
+    "addnewattemptfromprevious": "Додати нову спробу на основі попередньої",
+    "addsubmission": "Здати роботу",
+    "allowsubmissionsanddescriptionfromdatesummary": "Деталі завдання та можливість здачі робіт будуть відкрити з  <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Відповіді приймаються з",
+    "allowsubmissionsfromdatesummary": "Прийом робіт з цього завдання буде відкрито з <strong>{{$a}}</strong>",
+    "applytoteam": "Застосувати оцінки та відгуки для всієї групи",
+    "assignmentisdue": "Прийом робіт закінчено",
+    "attemptnumber": "Спроба",
+    "attemptreopenmethod": "Можливість перездачі",
+    "attemptreopenmethod_manual": "Вручну",
+    "attemptreopenmethod_untilpass": "Автоматично до виконання",
+    "attemptsettings": "Налаштування спроби",
+    "cannoteditduetostatementsubmission": "Ви не можете додати або змінити представлення в додатку, тому що ми не могли отримати заяву з сайту.",
+    "cannotgradefromapp": "Деякі методи класифікації поки не підтримуються додатком і не можуть бути змінені.",
+    "cannotsubmitduetostatementsubmission": "Ви не можете подати для сортування в додатку, тому що ми не могли отримати заява представлення з сайту.",
+    "confirmsubmission": "Відправити вашу роботу на перевірку? Після цього ви не зможете робити в ній ніяких змін.",
+    "currentattempt": "Це спроба {{$a}}.",
+    "currentattemptof": "Це спроба {{$a.attemptnumber}} (дозволено спроб - {{$a.maxattempts}}).",
+    "currentgrade": "Поточна оцінка в журналі",
+    "cutoffdate": "Термін неприйняття здачі",
+    "defaultteam": "Типова група",
+    "duedate": "Термін завершення",
+    "duedateno": "Термін здачі не обмежено",
+    "duedatereached": "Термін для здачі робіт цього завдання вже минув",
+    "editingstatus": "Зміна статусу",
+    "editsubmission": "Редагувати мою відповідь",
+    "erroreditpluginsnotsupported": "Ви не можете додати або змінити представлення в додатку, тому що деякі плагіни не підтримуються для редагування:",
+    "errorshowinginformation": "Ми не можемо відобразити інформацію представлення",
+    "extensionduedate": "Відстрочений кінцевий термін",
+    "feedbacknotsupported": "Цей зворотний зв'язок не підтримується програмою і не може містити всю інформацію",
+    "grade": "Оцінка",
+    "graded": "Оцінено",
+    "gradedby": "Оцінив",
+    "gradedon": "Оцінено: {{$a}}",
+    "gradenotsynced": "Оцінка не синхронізуються",
+    "gradeoutof": "Оцінка (макс. {{$a}})",
+    "gradingstatus": "Статус оцінення",
+    "groupsubmissionsettings": "Налаштування групової здачі",
+    "hiddenuser": "Учасник",
+    "latesubmissions": "Прострочені завдання",
+    "latesubmissionsaccepted": "Дозволено до {{$a}}",
+    "markingworkflowstate": "Стан оцінювання",
+    "markingworkflowstateinmarking": "В оцінюванні",
+    "markingworkflowstateinreview": "В перегляді",
+    "markingworkflowstatenotmarked": "Не оцінено",
+    "markingworkflowstatereadyforrelease": "Готово до показу",
+    "markingworkflowstatereadyforreview": "Оцінено",
+    "markingworkflowstatereleased": "Показано",
+    "multipleteams": "Учасник кількох груп",
+    "noattempt": "Немає спроб",
+    "nomoresubmissionsaccepted": "Дозволено лише для учасників, яким продовжено термін виконання",
+    "noonlinesubmissions": "Завдання не вимагає нічого здавати в онлайні",
+    "nosubmission": "Нічого не відправлялося",
+    "notallparticipantsareshown": "Учасники без представлення не показуються",
+    "noteam": "Ви не включені до жодної групи, зверніться, будь ласка, до викладача.",
+    "notgraded": "Не оцінено",
+    "numberofdraftsubmissions": "Чорновики",
+    "numberofparticipants": "Учасники",
+    "numberofsubmissionsneedgrading": "Потрібно оцінити",
+    "numberofsubmittedassignments": "Здано",
+    "numberofteams": "Групи",
+    "numwords": "{{$a}} слів",
+    "outof": "{{$a.grade}} з {{$a.maxgrade}} можливих",
+    "overdue": "Прострочено",
+    "savechanges": "Зберегти зміни",
+    "submission": "Подання",
+    "submissioneditable": "Студент може редагувати свою роботу",
+    "submissionnoteditable": "Студент не може редагувати свою роботу",
+    "submissionnotsupported": "Це подання не підтримується програмою і не може містити всю інформацію",
+    "submissionslocked": "Це завдання не приймає робіт",
+    "submissionstatus": "Статус роботи",
+    "submissionstatus_": "Не здано",
+    "submissionstatus_draft": "Чорновик (не здано)",
+    "submissionstatus_marked": "Оцінено",
+    "submissionstatus_new": "Немає відповіді",
+    "submissionstatus_reopened": "Дозволено перездати",
+    "submissionstatus_submitted": "Здано на оцінення",
+    "submissionstatusheading": "Статус роботи",
+    "submissionteam": "Група",
+    "submitassignment": "Відправити на оцінення",
+    "submitassignment_help": "Як тільки ви відішлете роботу на оцінення, ви не зможете зробити в ній ніяких змін",
+    "submittedearly": "Завдання здано раніше на {{$a}}",
+    "submittedlate": "Завдання здано пізніше на {{$a}}",
+    "timemodified": "Час модифікації",
+    "timeremaining": "Залишилося",
+    "ungroupedusers": "Включено параметр \"Необхідна група щоб здати роботу\" але деякі студенти не записані у жодну групу, це означає, що вони не зможуть здати роботу в цьому завданні.",
+    "unlimitedattempts": "Необмежено",
+    "userswhoneedtosubmit": "Користувачі, яким потрібно здати: {{$a}}",
+    "userwithid": "Користувач з Id {{id}}",
+    "viewsubmission": "Переглянути роботу",
+    "warningsubmissiongrademodified": "Ступінь представлення була змінена на сайті.",
+    "warningsubmissionmodified": "Представлення користувача було змінено на сайті."
+}
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/zh-cn.json b/www/addons/mod/assign/lang/zh-cn.json
index 0b6a1d8aa94..fed6b1038ba 100644
--- a/www/addons/mod/assign/lang/zh-cn.json
+++ b/www/addons/mod/assign/lang/zh-cn.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "本作业将从<strong>{{$a}}</strong>起接受提交",
     "applytoteam": "将分数和反馈意见应用到整个组",
     "assignmentisdue": "作业截止",
-    "attemptnumber": "作业提交次数",
+    "attemptnumber": "试卷",
     "attemptreopenmethod": "重试开启",
     "attemptreopenmethod_manual": "手工开启",
     "attemptreopenmethod_untilpass": "自动开启直到通过",
@@ -19,7 +19,7 @@
     "currentgrade": "成绩单中的当前成绩",
     "cutoffdate": "提交截止时间",
     "defaultteam": "默认分组",
-    "duedate": "截止时间",
+    "duedate": "截止日",
     "duedateno": "无截止时间",
     "duedatereached": "此作业的截止日期已经过了",
     "editingstatus": "编辑状态",
@@ -28,7 +28,7 @@
     "grade": "成绩",
     "graded": "已评分",
     "gradedby": "评分人",
-    "gradedon": "评分时间",
+    "gradedon": "评分：{{$a}}",
     "gradeoutof": "成绩（满分 {{$a}} ）",
     "gradingstatus": "评分状态",
     "groupsubmissionsettings": "分组提交设置",
@@ -55,9 +55,9 @@
     "numberofsubmittedassignments": "提交",
     "numberofteams": "群组",
     "numwords": "{{$a}}单词",
-    "outof": "{{$a.current}}，共有{{$a.total}}",
-    "overdue": "<font color=\"red\">作业截止日期：{{$a}}</font>",
-    "savechanges": "保存更改",
+    "outof": "{{$a.grade}}/满分{{$a.maxgrade}}",
+    "overdue": "超时",
+    "savechanges": "保存更动",
     "submission": "提交的作业",
     "submissioneditable": "学生可以编辑提交的作业",
     "submissionnoteditable": "学生不能编辑提交的作业",
@@ -75,7 +75,7 @@
     "submitassignment_help": "提交作业后，您将不能再做任何修改。",
     "submittedearly": "提早{{$a}}提交作业",
     "submittedlate": "过期{{$a}}才提交作业",
-    "timemodified": "最后修改",
+    "timemodified": "编辑时间",
     "timeremaining": "剩余时间",
     "ungroupedusers": "“需要小组合作完成的作业”的设置已经启用，某些用户未分配小组或者加入多个小组，将不能完成作业。",
     "unlimitedattempts": "不限",
diff --git a/www/addons/mod/assign/lang/zh-tw.json b/www/addons/mod/assign/lang/zh-tw.json
index 674e767eebf..6c776650bf4 100644
--- a/www/addons/mod/assign/lang/zh-tw.json
+++ b/www/addons/mod/assign/lang/zh-tw.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "這個作業將從<strong> {{$a}} </ strong>開始可以繳交",
     "applytoteam": "將分數和回饋套用到整個群組",
     "assignmentisdue": "作業繳交已截止",
-    "attemptnumber": "作業提交次數",
+    "attemptnumber": "作答數",
     "attemptreopenmethod": "重新開啟作業提交",
     "attemptreopenmethod_manual": "手動的",
     "attemptreopenmethod_untilpass": "自動的，直到通過",
@@ -23,7 +23,7 @@
     "currentgrade": "目前成績單中的分數",
     "cutoffdate": "拒收作業時間",
     "defaultteam": "預設群組",
-    "duedate": "規定繳交時間",
+    "duedate": "截止日期",
     "duedateno": "沒有規定繳交時間",
     "duedatereached": "此作業的規定繳交時間已經過了",
     "editingstatus": "編修狀態",
@@ -35,7 +35,7 @@
     "grade": "成績",
     "graded": "已評分",
     "gradedby": "已評分由",
-    "gradedon": "評分標準",
+    "gradedon": "分數：{{$a}}",
     "gradeoutof": "得分(配分{{$a}})",
     "gradingstatus": "評分狀態",
     "groupsubmissionsettings": "群組繳交作業設定",
@@ -56,17 +56,17 @@
     "nosubmission": "這個作業還沒人繳交",
     "notallparticipantsareshown": "沒有提交的參與者不會被顯示出來",
     "noteam": "不屬於任何群組",
-    "notgraded": "尚未評分",
+    "notgraded": "沒被計分的",
     "numberofdraftsubmissions": "草稿",
     "numberofparticipants": "參與者",
     "numberofsubmissionsneedgrading": "需要評分",
     "numberofsubmittedassignments": "已繳交",
     "numberofteams": "群組",
     "numwords": "{{$a}}字數",
-    "outof": "{{$a.current}}，共有{{$a.total}}",
-    "overdue": "<font color=\"red\">已經超過應繳交時間: {{$a}}</font>",
-    "savechanges": "儲存更改",
-    "submission": "繳交作業",
+    "outof": "{{$a.grade}}分（滿分為{{$a.maxgrade}}分）",
+    "overdue": "過期",
+    "savechanges": "儲存改變",
+    "submission": "提交作品",
     "submissioneditable": "學生可以編編輯這一繳交的作業",
     "submissionnoteditable": "學生不能編輯這一繳交的作業",
     "submissionnotsupported": "該應用程式不支援此提交, 並且可能不包含所有資訊",
@@ -84,7 +84,7 @@
     "submitassignment_help": "當這項作業繳交後，您將不能再做任何修改。",
     "submittedearly": "提早{{$a}}就繳交作業",
     "submittedlate": "過期{{$a}}才繳交作業",
-    "timemodified": "最後修改",
+    "timemodified": "修改的時間",
     "timeremaining": "剩餘時間",
     "ungroupedusers": "\"需要以群組方式提交作業\"的設定已經被啟動，但是仍有某些用戶沒有被指派到群組中，或者同一個人屬於多個群組，因此無法提交作業。",
     "unlimitedattempts": "無限制的",
diff --git a/www/addons/mod/chat/lang/ar.json b/www/addons/mod/chat/lang/ar.json
index 578e593e60d..b90e9c616f3 100644
--- a/www/addons/mod/chat/lang/ar.json
+++ b/www/addons/mod/chat/lang/ar.json
@@ -11,8 +11,8 @@
     "messagebeepsyou": "{{$a}}  أرسل نغمة لك!",
     "messageenter": "{{$a}}  دخل غرفة محادثة",
     "messageexit": "{{$a}}  خرج من غرفة محادثة",
-    "nomessages": "لا توجد رسائل بعد",
-    "send": "إرسل",
+    "nomessages": "لا يوجد رساله/رسائل جديدة",
+    "send": "إرسال",
     "sessionstart": "ي  {{$a.date}}, ({{$a.fromnow}} وسوف تبدأ جلسة  الدردشة القادمة في من الآن",
     "talk": "حديث"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/bg.json b/www/addons/mod/chat/lang/bg.json
index dd7f6963fde..d8c52aa1652 100644
--- a/www/addons/mod/chat/lang/bg.json
+++ b/www/addons/mod/chat/lang/bg.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}} току що Ви бибитна!",
     "messageenter": "{{$a}} току що влезе в този чат",
     "messageexit": "{{$a}} напусна този чат",
-    "nomessages": "Още няма съобщения",
+    "nomessages": "Няма чакащи съобщения",
     "send": "Изпращане",
     "sessionstart": "Следващата чат сесия ще започне след: {{$a}}",
     "talk": "Разговор"
diff --git a/www/addons/mod/chat/lang/ca.json b/www/addons/mod/chat/lang/ca.json
index 40e71c22702..064a89121a4 100644
--- a/www/addons/mod/chat/lang/ca.json
+++ b/www/addons/mod/chat/lang/ca.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} acaba d'entrar en aquest xat",
     "messageexit": "{{$a}} ha abandonat aquest xat",
     "mustbeonlinetosendmessages": "Heu d'estar connectat per poder enviar missatges",
-    "nomessages": "No hi ha missatges encara",
+    "nomessages": "No teniu missatges pendents",
     "send": "Envia",
     "sessionstart": "La propera sessió de xat començarà el: {{$a.date}}, (d'aquí a {{$a.fromnow}})",
     "talk": "Parla"
diff --git a/www/addons/mod/chat/lang/cs.json b/www/addons/mod/chat/lang/cs.json
index 5a2dbd232b7..b48b27b1a0f 100644
--- a/www/addons/mod/chat/lang/cs.json
+++ b/www/addons/mod/chat/lang/cs.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} právě vstoupil(a) do tohoto chatu",
     "messageexit": "{{$a}} opustil(a) tento chat",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
-    "nomessages": "Zatím žádné zprávy",
+    "nomessages": "Žádné zprávy",
     "send": "Odeslat",
     "sessionstart": "Další chatování začne v {{$a}}, (za {{$a.fromnow}})",
     "talk": "Diskuse"
diff --git a/www/addons/mod/chat/lang/da.json b/www/addons/mod/chat/lang/da.json
index 904a47e2359..2001d90c5de 100644
--- a/www/addons/mod/chat/lang/da.json
+++ b/www/addons/mod/chat/lang/da.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} er lige kommet til",
     "messageexit": "{{$a}} har forladt chatten",
     "mustbeonlinetosendmessages": "Du skal være online for at sende beskeder",
-    "nomessages": "Ingen beskeder endnu",
+    "nomessages": "Ingen beskeder",
     "send": "Send",
     "sessionstart": "Næste chat starter {{$a.date}}, ({{$a.fromnow}} fra nu af)",
     "talk": "Tal"
diff --git a/www/addons/mod/chat/lang/el.json b/www/addons/mod/chat/lang/el.json
index eb3c0910806..71ba80bb1de 100644
--- a/www/addons/mod/chat/lang/el.json
+++ b/www/addons/mod/chat/lang/el.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} έχει μπει σ' αυτή το συζήτηση",
     "messageexit": "{{$a}} έχει φύγει από αυτή το συζήτηση",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
+    "nomessages": "Δεν υπάρχουν μηνύματα σε αναμονή",
     "send": "Αποστολή",
     "sessionstart": "Η επόμενη συνεδρία τσάτ θα αρχίσει στις {{$a.date}}, ({{$a.fromnow}} από τώρα)"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/es-mx.json b/www/addons/mod/chat/lang/es-mx.json
index 8bef1491c16..f583b8e1a0c 100644
--- a/www/addons/mod/chat/lang/es-mx.json
+++ b/www/addons/mod/chat/lang/es-mx.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} entró a la sala",
     "messageexit": "{{$a}} salió de la sala",
     "mustbeonlinetosendmessages": "Usted debe de estar en-línea para enviar mensajes",
-    "nomessages": "Aún no hay mensajes",
+    "nomessages": "No hay mensajes",
     "send": "Enviar",
     "sessionstart": "La siguiente sesión de chat comenzará en {{$a.date}},  dentro de ({{$a.fromnow}} a partir de ahora)",
     "talk": "Charla"
diff --git a/www/addons/mod/chat/lang/es.json b/www/addons/mod/chat/lang/es.json
index 5b44e523fb1..d91ea9f9d16 100644
--- a/www/addons/mod/chat/lang/es.json
+++ b/www/addons/mod/chat/lang/es.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} entró a la sala",
     "messageexit": "{{$a}} salió de la sala",
     "mustbeonlinetosendmessages": "Usted debe de estar conectado a Internet para enviar mensajes",
-    "nomessages": "Aún no hay mensajes",
+    "nomessages": "No hay mensajes en espera",
     "send": "Enviar",
     "sessionstart": "La próxima sesión de chat empezará el {{$a.date}}, (dentro de {{$a.fromnow}})",
     "talk": "Charla"
diff --git a/www/addons/mod/chat/lang/eu.json b/www/addons/mod/chat/lang/eu.json
index f01f99a7374..3b484567484 100644
--- a/www/addons/mod/chat/lang/eu.json
+++ b/www/addons/mod/chat/lang/eu.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} oraintxe sartu da gelan",
     "messageexit": "{{$a}} irten egin da gelatik",
     "mustbeonlinetosendmessages": "On-line egon behar duzu mezuak bidaltzeko",
-    "nomessages": "Ez dago mezurik oraindik",
+    "nomessages": "Ez duzu mezurik",
     "send": "Bidali",
     "sessionstart": "Txat-saioa {{$a.date}}-(e)tan hasiko da, (hemendik {{$a.fromnow}}-(e)ra)",
     "talk": "Hitz egin"
diff --git a/www/addons/mod/chat/lang/fa.json b/www/addons/mod/chat/lang/fa.json
index 35925c4ea7b..9e9f6cef96e 100644
--- a/www/addons/mod/chat/lang/fa.json
+++ b/www/addons/mod/chat/lang/fa.json
@@ -5,7 +5,7 @@
     "messagebeepsyou": "{{$a}} برای شما بوق فرستاد!",
     "messageenter": "{{$a}} وارد اتاق گفتگو شد",
     "messageexit": "{{$a}} اتاق گفتگو را ترک کرد",
-    "nomessages": "هنوز پیامی گفته نشده است",
+    "nomessages": "هیچ پیغامی منتظر جواب نیست",
     "send": "ارسال",
     "sessionstart": "جلسهٔ بعدی گفتگو {{$a.date}} شروع خواهد شد ({{$a.fromnow}} دیگر)",
     "talk": "صحبت"
diff --git a/www/addons/mod/chat/lang/fr.json b/www/addons/mod/chat/lang/fr.json
index dea0b044a91..d3501f8dad4 100644
--- a/www/addons/mod/chat/lang/fr.json
+++ b/www/addons/mod/chat/lang/fr.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} vient d'entrer",
     "messageexit": "{{$a}} a quitté ce chat",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
-    "nomessages": "Pas encore de messages",
+    "nomessages": "Aucun message",
     "send": "Envoyer",
     "sessionstart": "La prochaine session de chat commencera le {{$a.date}}, (dans {{$a.fromnow}})",
     "talk": "Parler"
diff --git a/www/addons/mod/chat/lang/he.json b/www/addons/mod/chat/lang/he.json
index 8cd72c5f92d..afae33d5501 100644
--- a/www/addons/mod/chat/lang/he.json
+++ b/www/addons/mod/chat/lang/he.json
@@ -8,8 +8,8 @@
     "messageenter": "{{$a}} נכנס/ה לרב-שיח זה",
     "messageexit": "{{$a}} עזב/ה רב-שיח זה",
     "mustbeonlinetosendmessages": "עליך להיות מחובר בכדי לשלוח הודעות.",
-    "nomessages": "אין הודעות עדיין",
-    "send": "שליחה",
+    "nomessages": "אין מסרים ממתינים",
+    "send": "לשלוח",
     "sessionstart": "מפגש הרב-שיח הבא יתחיל ב: {{$a}}",
     "talk": "דברו"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/hu.json b/www/addons/mod/chat/lang/hu.json
index 4200be1473f..ca994d8b90a 100644
--- a/www/addons/mod/chat/lang/hu.json
+++ b/www/addons/mod/chat/lang/hu.json
@@ -7,8 +7,8 @@
     "messagebeepsyou": "{{$a}} most csöngetett Önnek!",
     "messageenter": "{{$a}} most lépett be a csevegésbe",
     "messageexit": "{{$a}} most lépett ki a csevegésből",
-    "nomessages": "Még nincs üzenet",
-    "send": "Elküld",
+    "nomessages": "Nincs üzenet.",
+    "send": "Küldés",
     "sessionstart": "A következő csevegés kezdete  {{$a.date}}, (mostantól {{$a.fromnow}})",
     "talk": "Beszéljen"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/it.json b/www/addons/mod/chat/lang/it.json
index e0543395d75..5af815637ed 100644
--- a/www/addons/mod/chat/lang/it.json
+++ b/www/addons/mod/chat/lang/it.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} è entrato nella chat",
     "messageexit": "{{$a}} ha lasciato la chat",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
-    "nomessages": "Non ci sono ancora messaggi",
+    "nomessages": "Nessun messaggio",
     "send": "Invia",
     "sessionstart": "La prossima sessione di chat inizierà il {{$a}}, ({{$a.fromnow}} da adesso)",
     "talk": "Parla"
diff --git a/www/addons/mod/chat/lang/ja.json b/www/addons/mod/chat/lang/ja.json
index 052232c43bf..ed78dcd76dd 100644
--- a/www/addons/mod/chat/lang/ja.json
+++ b/www/addons/mod/chat/lang/ja.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}} があなたにビープしました!",
     "messageenter": "このチャットに {{$a}} が入室しました。",
     "messageexit": "このチャットから {{$a}} が退室しました。",
-    "nomessages": "メッセージがありません。",
+    "nomessages": "メッセージはありません。",
     "send": "送信",
     "sessionstart": "次のチャットセッションは {{$a.date}} に開始されます (現在から {{$a.fromnow}} 後)。",
     "talk": "会話"
diff --git a/www/addons/mod/chat/lang/lt.json b/www/addons/mod/chat/lang/lt.json
index 0eb4caa16f1..8ed8ca0192c 100644
--- a/www/addons/mod/chat/lang/lt.json
+++ b/www/addons/mod/chat/lang/lt.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} ką tik prisijungė prie šio pokalbio",
     "messageexit": "{{$a}} ką tik paliko šį pokalbį",
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite būti prisijungęs.",
-    "nomessages": "Žinučių dar nėra",
+    "nomessages": "Nėra žinučių",
     "send": "Siųsti",
     "sessionstart": "Pokalbio seansas bus pradėtas po: {{$a}}",
     "talk": "Kalbėti"
diff --git a/www/addons/mod/chat/lang/nl.json b/www/addons/mod/chat/lang/nl.json
index ab169c31198..88fe821f3d9 100644
--- a/www/addons/mod/chat/lang/nl.json
+++ b/www/addons/mod/chat/lang/nl.json
@@ -12,8 +12,8 @@
     "messageenter": "{{$a}} is net deze chat binnen gekomen",
     "messageexit": "{{$a}} heeft deze chat verlaten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
-    "nomessages": "Nog geen berichten",
-    "send": "Stuur",
+    "nomessages": "Geen berichten",
+    "send": "Verstuur",
     "sessionstart": "De volgende chatsessie zal beginnen op {{$a.date}}, ({{$a.fromnow}} vanaf nu)",
     "talk": "Spreek"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/pl.json b/www/addons/mod/chat/lang/pl.json
index b1a54b073ef..61d20ec2e3c 100644
--- a/www/addons/mod/chat/lang/pl.json
+++ b/www/addons/mod/chat/lang/pl.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}} właśnie do Ciebie napisał",
     "messageenter": "{{$a}} właśnie wszedł na czat",
     "messageexit": "{{$a}} opuścił czat",
-    "nomessages": "Brak wiadomości",
+    "nomessages": "Brak oczekujących wiadomości",
     "send": "Wyślij",
     "sessionstart": "Sesja czatu rozpocznie się za:  {$ a}}",
     "talk": "Dyskusja"
diff --git a/www/addons/mod/chat/lang/pt-br.json b/www/addons/mod/chat/lang/pt-br.json
index 474fea465ec..b6571255d15 100644
--- a/www/addons/mod/chat/lang/pt-br.json
+++ b/www/addons/mod/chat/lang/pt-br.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} entrou no chat",
     "messageexit": "{{$a}} abandonou este chat",
     "mustbeonlinetosendmessages": "Você deve estar online para enviar mensagens",
-    "nomessages": "Nenhuma mensagem ainda",
+    "nomessages": "Sem novas mensagens",
     "send": "Enviar",
     "sessionstart": "A próxima sessão de chat irá começar em {{$a}}",
     "talk": "Falar"
diff --git a/www/addons/mod/chat/lang/pt.json b/www/addons/mod/chat/lang/pt.json
index 73de434c71a..e9f93528b1e 100644
--- a/www/addons/mod/chat/lang/pt.json
+++ b/www/addons/mod/chat/lang/pt.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} acabou de entrar neste chat",
     "messageexit": "{{$a}} acabou de sair deste chat",
     "mustbeonlinetosendmessages": "Tem de estar online para enviar mensagens",
-    "nomessages": "Ainda não há mensagens",
+    "nomessages": "Sem mensagens",
     "send": "Enviar",
     "sessionstart": "A próxima sessão de chat irá iniciar em {{$a.date}}, ({{$a.fromnow}} a partir de agora)",
     "talk": "Falar"
diff --git a/www/addons/mod/chat/lang/ro.json b/www/addons/mod/chat/lang/ro.json
index 71520bed6f8..8846f68b4f2 100644
--- a/www/addons/mod/chat/lang/ro.json
+++ b/www/addons/mod/chat/lang/ro.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} a intrat în această cameră de discuţii",
     "messageexit": "{{$a}} a ieşit din această cameră de discuţii",
     "mustbeonlinetosendmessages": "Trebuie să fiți conectat pentru a trimite mesaje",
-    "nomessages": "Nu a fost trimis încă niciun mesaj",
-    "send": "Trimis",
+    "nomessages": "Nu există mesaje în aşteptare",
+    "send": "Trimite",
     "sessionstart": "Următoarea sesiune de chat va începe în {{$a}}"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/ru.json b/www/addons/mod/chat/lang/ru.json
index 9a36351090d..484c7031f15 100644
--- a/www/addons/mod/chat/lang/ru.json
+++ b/www/addons/mod/chat/lang/ru.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} появился в чате",
     "messageexit": "{{$a}} ушел из чата",
     "mustbeonlinetosendmessages": "Вы должны быть онлайн, чтобы отправлять сообщения",
-    "nomessages": "Нет ни одного сообщения",
+    "nomessages": "Нет новых сообщений",
     "send": "Отправить",
     "sessionstart": "Следующий сеанс чата начнётся: {{$a.date}}, (через {{$a.fromnow}})",
     "talk": "Разговор"
diff --git a/www/addons/mod/chat/lang/sv.json b/www/addons/mod/chat/lang/sv.json
index cc26779e559..0d2c28e52e4 100644
--- a/www/addons/mod/chat/lang/sv.json
+++ b/www/addons/mod/chat/lang/sv.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} har precis kommit in i detta direktsamtal",
     "messageexit": "{{$a}} har lämnat det här direktsamtalet",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
-    "nomessages": "Inga meddelanden än",
+    "nomessages": "Inga avvaktande meddelanden",
     "send": "Skicka",
     "sessionstart": "Sessionen för direktsamtal kommer att starta inom: {{$a}}",
     "talk": "Tala"
diff --git a/www/addons/mod/chat/lang/tr.json b/www/addons/mod/chat/lang/tr.json
index f3deef5d519..c4e26e72e39 100644
--- a/www/addons/mod/chat/lang/tr.json
+++ b/www/addons/mod/chat/lang/tr.json
@@ -6,7 +6,7 @@
     "messagebeepsyou": "{{$a}} size sesleniyor!",
     "messageenter": "{{$a}} odaya girdi",
     "messageexit": "{{$a}} odadan ayrıldı",
-    "nomessages": "Henüz mesaj yok",
+    "nomessages": "Yeni ileti yok",
     "send": "Gönder",
     "sessionstart": "Bir sonraki görüşme oturumu {{$a.date}}, ({{$a.fromnow}} şu andan itibaren)",
     "talk": "Sohbet et"
diff --git a/www/addons/mod/chat/lang/uk.json b/www/addons/mod/chat/lang/uk.json
new file mode 100644
index 00000000000..31bf402d3ae
--- /dev/null
+++ b/www/addons/mod/chat/lang/uk.json
@@ -0,0 +1,19 @@
+{
+    "beep": "сигнал",
+    "currentusers": "Поточні користувачі",
+    "enterchat": "Увійти в чат",
+    "entermessage": "Введіть ваше повідомлення",
+    "errorwhileconnecting": "Помилка при підключенні до чату.",
+    "errorwhilegettingchatdata": "Помилка отримання даних чату.",
+    "errorwhilegettingchatusers": "Помилка отримання користувачів чату.",
+    "errorwhileretrievingmessages": "Помилка отримання повідомлень з серверу",
+    "errorwhilesendingmessage": "Помилка відправки повідомлення",
+    "messagebeepsyou": "{{$a}} відправив Вам сигнал!",
+    "messageenter": "{{$a}} з'явився в чаті",
+    "messageexit": "{{$a}} пішов із чату",
+    "mustbeonlinetosendmessages": "Ви повинні бути онлайн для відправки повідомлення",
+    "nomessages": "Немає нових повідомлень",
+    "send": "Надіслати",
+    "sessionstart": "Чат-сесію буде розпочато: {{$a}}",
+    "talk": "Розмова"
+}
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/zh-cn.json b/www/addons/mod/chat/lang/zh-cn.json
index 4f3bd2feeea..16055d4f6c9 100644
--- a/www/addons/mod/chat/lang/zh-cn.json
+++ b/www/addons/mod/chat/lang/zh-cn.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}}刚刚呼叫您！",
     "messageenter": "{{$a}}刚刚进入聊天室",
     "messageexit": "{{$a}}已退出聊天室",
-    "nomessages": "无消息",
+    "nomessages": "没有新消息",
     "send": "发送",
     "sessionstart": "聊天会话开始时间：{{$a}}",
     "talk": "交谈"
diff --git a/www/addons/mod/chat/lang/zh-tw.json b/www/addons/mod/chat/lang/zh-tw.json
index 193467d9f95..ab137ab4cd0 100644
--- a/www/addons/mod/chat/lang/zh-tw.json
+++ b/www/addons/mod/chat/lang/zh-tw.json
@@ -12,8 +12,8 @@
     "messageenter": "{{$a}} 剛加入這次聊天",
     "messageexit": "{{$a}} 已退出這次聊天",
     "mustbeonlinetosendmessages": "您必須上線才能傳送訊息",
-    "nomessages": "尚無訊息",
-    "send": "傳送",
+    "nomessages": "沒有待處理的簡訊",
+    "send": "送出",
     "sessionstart": "下一個聊天時段即將在{{$a.date}}開始，(離現在{{$a.fromnow}} )",
     "talk": "交談"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/ar.json b/www/addons/mod/choice/lang/ar.json
index 60ff70d91f6..43d31e38305 100644
--- a/www/addons/mod/choice/lang/ar.json
+++ b/www/addons/mod/choice/lang/ar.json
@@ -1,9 +1,9 @@
 {
     "choiceoptions": "خيارات الاختيار",
     "expired": "عذراً، تم إغلاق هذا النشاط في {{$a}} وهو غير متوفر الآن.",
-    "full": "(كامل)",
+    "full": "كامل",
     "noresultsviewable": "حالياً لا يمكن معاينة النتائج",
-    "notopenyet": "عذرا، هذا النشاط سيكون متوفر في {{$a}}",
+    "notopenyet": "عذراً، هذا النشاط لن يتاح حتى {{$a}}",
     "numberofuser": "عدد المستخدمين",
     "numberofuserinpercentage": "عدد المستخدمين كنسبة",
     "removemychoice": "استبعد خياري",
diff --git a/www/addons/mod/choice/lang/bg.json b/www/addons/mod/choice/lang/bg.json
index 8d68c62563d..2ff869c48ec 100644
--- a/www/addons/mod/choice/lang/bg.json
+++ b/www/addons/mod/choice/lang/bg.json
@@ -1,9 +1,9 @@
 {
     "choiceoptions": "Възможности за избиране",
-    "expired": "За съжаление тази дейност е затворена от {{$a}} и вече не е достъпна",
-    "full": "(Пълен)",
+    "expired": "За съжаление тази дейност е затворена в {{$a}} и вече не е достъпна",
+    "full": "Разгънато",
     "noresultsviewable": "В момента резултатите не са за показване.",
-    "notopenyet": "За съжаление тази дейност не е достъпна до {{$a}}",
+    "notopenyet": "За съжаление тази дейност не е достъпна от {{$a}}",
     "numberofuser": "Брой участници",
     "numberofuserinpercentage": "Процент потребители",
     "removemychoice": "Изтриване на моя избор",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index c0a93b72130..1bf28cfcc60 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -2,8 +2,8 @@
     "cannotsubmit": "Hi ha hagut un problema en la tramesa de la vostra resposta. Torneu-ho a intentar.",
     "choiceoptions": "Opcions de la tria",
     "errorgetchoice": "S'ha produït un error en recuperar les dades de la consulta.",
-    "expired": "Aquesta activitat es va tancar el dia {{$a}} i ja no està disponible.",
-    "full": "(Complet)",
+    "expired": "Aquesta activitat es va tancar el dia {{$a}} i ja no està disponible",
+    "full": "Completa",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
     "numberofuser": "Nombre de respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index f9a22aaf32e..a6f1b631b65 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Omlouváme se, nastal problém odesláním vaší odpovědi. Zkuste to prosím znovu.",
     "choiceoptions": "Možné odpovědi na anketu",
     "errorgetchoice": "Chyba při načítání  dat ankety.",
-    "expired": "Je nám líto, tato činnost byla uzavřena {{$a}} a není nadále dostupná",
-    "full": "(Obsazeno)",
+    "expired": "Promiňte, ale tato činnost byla {{$a}} uzavřena a již není k dispozici",
+    "full": "Úplný",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
-    "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
+    "notopenyet": "Promiňte, ale tato činnost nebude dostupná až do {{$a}}",
     "numberofuser": "Počet odpovědí",
     "numberofuserinpercentage": "Počet odpovědí v procentech",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
diff --git a/www/addons/mod/choice/lang/da.json b/www/addons/mod/choice/lang/da.json
index e462afcd51a..6e20a13e8f1 100644
--- a/www/addons/mod/choice/lang/da.json
+++ b/www/addons/mod/choice/lang/da.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Der var desværre problemer med at indsende dit valg. Prøv igen.",
     "choiceoptions": "Valgmuligheder",
     "errorgetchoice": "Fejl ved hentning af valgte data",
-    "expired": "Beklager, denne aktivitet er lukket d. {{$a}} og er ikke længere tilgængelig",
-    "full": "(Fuld)",
+    "expired": "Beklager, denne aktivitet lukkede {{$a}} og er ikke længere tilgængelig",
+    "full": "Fuld",
     "noresultsviewable": "Resultaterne er ikke tilgængelige på nuværende tidspunkt.",
-    "notopenyet": "Denne aktivitet er tilgængelig fra {{$a}}",
+    "notopenyet": "Beklager, denne aktivitet er ikke tilgængelig før {{$a}}",
     "numberofuser": "Antal svar",
     "numberofuserinpercentage": "Antal svar i procent",
     "previewonly": "Dette er en forhåndsvisning af de tilgængelige valgmuligheder i denne afstemning. Du kan ikke indsende dine valg før {{$a}}.",
     "removemychoice": "Slet mit valg",
-    "responses": "Besvarelser",
+    "responses": "Responser",
     "responsesresultgraphdescription": "{{number}}% af brugerne vælger denne mulighed: {{test}}",
     "responsesresultgraphheader": "Grafisk visning",
     "savemychoice": "Gem",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index be13d38af77..593f90971a9 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Ihre Auswahl konnte nicht gespeichert werden. Versuchen Sie es bitte noch einmal.",
     "choiceoptions": "Abstimmoptionen",
     "errorgetchoice": "Fehler beim Laden der Abstimmungsdaten",
-    "expired": "Diese Abstimmung ist seit {{$a}} beendet. Eine Auswahl ist nicht mehr möglich.",
-    "full": "(Nicht verfügbar)",
+    "expired": "Entschuldigung, die Aktivität wurde am {{$a}} geschlossen und ist nicht länger verfügbar",
+    "full": "Vollständig",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
-    "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
+    "notopenyet": "Entschuldigung, diese Aktivität ist nicht verfügbar bis {{$a}}",
     "numberofuser": "Anzahl der Antworten",
     "numberofuserinpercentage": "Prozent der Antworten",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
-    "responses": "Stimmabgaben",
+    "responses": "Eigene Eingaben",
     "responsesresultgraphdescription": "{{number}}% der Teilnehmer/innen haben die Option gewählt: {{text}}.",
     "responsesresultgraphheader": "Grafische Darstellung",
     "resultsnotsynced": "Die letzte Antwort ist in den Ergebnissen noch nicht enthalten. Synchronisieren Sie die Daten.",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 4b17c064e80..e73943fa063 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -1,9 +1,9 @@
 {
     "errorgetchoice": "Σφάλμα κατά τη λήψη των επιλεγμένων δεδομένων.",
-    "expired": "Η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη",
-    "full": "(Πλήρες)",
+    "expired": "Λυπάμαι, αλλά η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη",
+    "full": "Πλήρες",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
-    "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
+    "notopenyet": "Λυπάμαι, η δραστηριότητα αυτή δεν είναι διαθέσιμη πριν τις {{$a}}",
     "numberofuser": "Αριθμός απαντήσεων",
     "numberofuserinpercentage": "Ποσοστό απαντήσεων",
     "removemychoice": "Διαγραφή της επιλογής μου",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index ceddb82adc6..9205a29eafa 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Lo sentimos, hubo un problema al enviar su eleccción. Por favor, inténtelo de nuevo.",
     "choiceoptions": "Opciones de la elección",
     "errorgetchoice": "Error al obtener datos de elección.",
-    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
-    "full": "(Lleno)",
+    "expired": "Lo sentimos, esta actividad se cerró en {{$a}} y ya no está disponible",
+    "full": "Completo",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
-    "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
+    "notopenyet": "Esta actividad no estará disponible hasta {{$a}}",
     "numberofuser": "Número de respuestas",
     "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
-    "responses": "Respuestas",
+    "responses": "Respuestas del alumno",
     "responsesresultgraphdescription": "{{number}}% de los usuarios eligió la opción: {{text}}.",
     "responsesresultgraphheader": "Vista de Gráfica",
     "resultsnotsynced": "Los resultados no incluyen su última respuesta. Por favor, sincronícelos para actualizarlos.",
diff --git a/www/addons/mod/choice/lang/es.json b/www/addons/mod/choice/lang/es.json
index 74076baa791..39c93d4c220 100644
--- a/www/addons/mod/choice/lang/es.json
+++ b/www/addons/mod/choice/lang/es.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Lo lamentamos, se ha producido un error con el envío de su respuesta. Por favor inténtelo de nuevo.",
     "choiceoptions": "Opciones de la Consulta",
     "errorgetchoice": "Se ha producido un error recuperando los datos de la consulta.",
-    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
-    "full": "(Lleno)",
+    "expired": "Lo sentimos, esta actividad se cerró en {{$a}} y ya no está disponible",
+    "full": "Completo",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
-    "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
+    "notopenyet": "Esta actividad no estará disponible hasta {{$a}}",
     "numberofuser": "Número de respuestas",
     "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esta es solamente una previsualización de las opciones disponibles para esta actividad. No podrá enviar su respuesta a la consulta hasta el {{$a}}.",
     "removemychoice": "Eliminar mi elección",
-    "responses": "Respuestas",
+    "responses": "Respuestas -",
     "responsesresultgraphdescription": "{{number}}% de los usuarios han escogido la opción: {{text}}.",
     "responsesresultgraphheader": "Vista de gráfica",
     "resultsnotsynced": "Los resultados no incluyen su última respuesta. Por favor, sincronícelos para actualizarlos.",
diff --git a/www/addons/mod/choice/lang/eu.json b/www/addons/mod/choice/lang/eu.json
index 62e0810b4c4..dc12193a130 100644
--- a/www/addons/mod/choice/lang/eu.json
+++ b/www/addons/mod/choice/lang/eu.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Barkatu, arazoa gertatu da zure aukera bidaltzean. Mesedez, saiatu berriz.",
     "choiceoptions": "Kontsultaren aukerak",
     "errorgetchoice": "Errorea kontsultaren datuak eskuratzean.",
-    "expired": "Barkatu, jarduera hau {{$a}}(e)an itxi zen eta dagoeneko ez dago eskuragarri.",
-    "full": "(Beteta)",
+    "expired": "Barkatu, jarduera {{$a}} -n itxi zen eta dagoeneko ez dago eskura",
+    "full": "Osoa",
     "noresultsviewable": "Emaitzak ezin dira orain ikusi",
-    "notopenyet": "Barkatu, baina jarduera hau ez dago erabiltzeko moduan {{$a}} arte.",
+    "notopenyet": "Barkatu, jarduera hau ez dago eskuragarri {{$a}} arte",
     "numberofuser": "Erantzun-kopurua",
     "numberofuserinpercentage": "Erantzunen portzentajea",
     "previewonly": "Hau jarduera honetan eskuragarri dauden aukeren aurrebista besterik ez da. Ezingo duzu zure erantzuna bidali {{$a}}-(e)ra arte.",
     "removemychoice": "Ezabatu nire aukera",
-    "responses": "Erantzunak",
+    "responses": "Ebazpenak",
     "responsesresultgraphdescription": "Erabiltzaileen %{{number}}-ak aukera hau aukeratu zuten: {{text}}.",
     "responsesresultgraphheader": "Erakutsi grafikoa",
     "resultsnotsynced": "Emaitzek ez dute zure azken erantzunak barne hartzen. Mesedez, sinkronizatu datuak eguneratzeko.",
diff --git a/www/addons/mod/choice/lang/fa.json b/www/addons/mod/choice/lang/fa.json
index ccf5b036789..4a99a7a125e 100644
--- a/www/addons/mod/choice/lang/fa.json
+++ b/www/addons/mod/choice/lang/fa.json
@@ -1,13 +1,13 @@
 {
     "choiceoptions": "گزینه‌های انتخابی",
-    "expired": "با عرض پوزش، این فعالیت در {{$a}} بسته شد و دیگر در دسترس نیست",
-    "full": "(پر)",
+    "expired": "متأسفیم، این فعالیت در {{$a}} بسته شد و دیگر در دسترس نیست",
+    "full": "تفصیلی",
     "noresultsviewable": "نتایج در این لحظه قابل دیدن نیستند.",
-    "notopenyet": "با عرض معذرت، این فعالیت تا قبل از {{$a}} در دسترس نیست",
+    "notopenyet": "این فعالیت تا {{$a}} در دسترس نخواهد بود",
     "numberofuser": "تعداد کاربران",
     "numberofuserinpercentage": "درصد پاسخ‌ها",
     "removemychoice": "حذف انتخاب من",
-    "responses": "پاسخ‌ها",
+    "responses": "پاسخ‌های ارائه شده",
     "responsesresultgraphheader": "نمایش نمودار",
     "savemychoice": "ذخیرهٔ انتخاب من",
     "userchoosethisoption": "کاربرانی که این گزینه را انتخاب کرده‌اند",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 9ca0f50c2ea..06b219d340b 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -3,14 +3,14 @@
     "choiceoptions": "Options du sondage",
     "errorgetchoice": "Erreur lors de l'obtention des données du choix.",
     "expired": "Désolé, cette activité s'est terminée le {{$a}} et n'est plus disponible",
-    "full": "(complet)",
+    "full": "Complet",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
-    "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
+    "notopenyet": "Désolé, cette activité n'est pas disponible avant le {{$a}}",
     "numberofuser": "Nombre de réponses",
     "numberofuserinpercentage": "Pourcentage de réponses",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
-    "responses": "Réponses",
+    "responses": "Réponses du participant",
     "responsesresultgraphdescription": "{{number}} % des participants ont choisi l'option : {{text}}.",
     "responsesresultgraphheader": "Affichage graphique",
     "resultsnotsynced": "Les résultats n'incluent pas votre dernière réponse. Veuillez synchroniser pour les mettre à jour.",
diff --git a/www/addons/mod/choice/lang/he.json b/www/addons/mod/choice/lang/he.json
index 42ad44693a5..7cce9b15709 100644
--- a/www/addons/mod/choice/lang/he.json
+++ b/www/addons/mod/choice/lang/he.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "קרתה תקלה בשליחת הבחירה שלך, ניתן לנסות שנית מאוחר יותר.",
     "choiceoptions": "אפשרויות שאלת־סקר",
     "errorgetchoice": "שגיאה בטעינת המידע של שאלת הבחירה.",
-    "expired": "מצטערים, פעילות זו נסגרה על {{$a}} והיא איננה זמינה יותר",
-    "full": "(מלא)",
+    "expired": "פעילות זו הסתיימה ב- {{$a}} ואינה זמינה כעת.",
+    "full": "מלא",
     "noresultsviewable": "כרגע לא ניתן לצפות בתוצאות.",
-    "notopenyet": "לצערנו, פעילות זו אינה זמינה עד {{$a}}",
+    "notopenyet": "פעילות זאת איננה זמינה עד {{$a}}",
     "numberofuser": "מספר המשתתפים",
     "numberofuserinpercentage": "מספר  המשתתפים באחוזים",
     "previewonly": "זוהי תצוגה מקדימה לאפשרויות הזמינות עבור פעילות זו. לא ניתן יהיה הגיש את הבחירה שלך עד {{$a}}.",
     "removemychoice": "הסרת בחירתי",
-    "responses": "תשובות",
+    "responses": "תגובות",
     "responsesresultgraphdescription": "{{number}}% מהמשתמשים בחרו באפשרות {{text}}.",
     "responsesresultgraphheader": "תצוגה גרפית",
     "savemychoice": "שמירת הבחירה שלי",
diff --git a/www/addons/mod/choice/lang/hu.json b/www/addons/mod/choice/lang/hu.json
index f9ba9f23440..ad971a6a7ae 100644
--- a/www/addons/mod/choice/lang/hu.json
+++ b/www/addons/mod/choice/lang/hu.json
@@ -1,15 +1,15 @@
 {
     "cannotsubmit": "Választásának leadásával gondok vannak. Próbálja meg később.",
     "choiceoptions": "Választási lehetőségek",
-    "expired": "Ez a tevékenység {{$a}} időpontban lezárult és már nem érhető el",
-    "full": "(Betelt)",
+    "expired": "Ez a tevékenység {{$a}} időpontban lezárult és már nem érhető el.",
+    "full": "Teljes",
     "noresultsviewable": "Az eredmények jelenleg nem tekinthetők meg.",
-    "notopenyet": "Ez a tevékenység {{$a}} időpontig nem elérhető",
+    "notopenyet": "A tevékenység {{$a}} időpontig nem érhető el.",
     "numberofuser": "Válaszok száma",
     "numberofuserinpercentage": "Válaszok száma százalékban",
     "previewonly": "Ez a tevékenység lehetőségeinek előnézete. A választását {{$a}} időpontig nem közölheti.",
     "removemychoice": "Válaszlehetőségem törlése",
-    "responses": "Tanuló által adott válaszok",
+    "responses": "Tanuló válaszai",
     "responsesresultgraphheader": "Gráfmegjelenítés",
     "savemychoice": "Válaszlehetőségem mentése",
     "userchoosethisoption": "Ezt választó felhasználók",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index 01597a9058a..9e954f13897 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -3,14 +3,14 @@
     "choiceoptions": "Opzioni scelta",
     "errorgetchoice": "Si è verificato un errore durante la ricezione di dati della scelta.",
     "expired": "Spiacente, questa attività è stata chiusa il {{$a}} e non è più disponibile",
-    "full": "(Completo)",
+    "full": "Tutte le colonne",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
-    "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
+    "notopenyet": "Spiacente, questa attività non è disponibile fino al {{$a}}",
     "numberofuser": "Numero di risposte",
     "numberofuserinpercentage": "Percentuale delle risposte",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
-    "responses": "Scelte",
+    "responses": "Risposte date",
     "responsesresultgraphdescription": "Il {{number}}% ha scelto l'opzione {{text}}.",
     "responsesresultgraphheader": "Visualizzazione grafico",
     "savemychoice": "Salva la mia scelta",
diff --git a/www/addons/mod/choice/lang/ja.json b/www/addons/mod/choice/lang/ja.json
index 02afe740bcd..0b2245e0565 100644
--- a/www/addons/mod/choice/lang/ja.json
+++ b/www/addons/mod/choice/lang/ja.json
@@ -2,14 +2,14 @@
     "cannotsubmit": "申し訳ございません、あなたの投票送信時に問題が発生しました。再度お試しください。",
     "choiceoptions": "投票オプション",
     "expired": "申し訳ございません、この活動は {{$a}} に終了しているため、これ以上利用することはできません。",
-    "full": "(上限到達)",
+    "full": "フル",
     "noresultsviewable": "現在、投票結果は閲覧できません。",
     "notopenyet": "申し訳ございません、この活動は {{$a}} まで利用することができません。",
     "numberofuser": "投票者数",
     "numberofuserinpercentage": "投票者数 (%)",
     "previewonly": "これはこの活動で利用可能なオプションのプレビューです。あなたの投票は {{$a}} まで送信することができません。",
     "removemychoice": "私の投票を削除する",
-    "responses": "投票結果",
+    "responses": "解答",
     "responsesresultgraphheader": "グラフ表示",
     "savemychoice": "私の投票を保存する",
     "userchoosethisoption": "このオプションを選択したユーザ",
diff --git a/www/addons/mod/choice/lang/lt.json b/www/addons/mod/choice/lang/lt.json
index ee1bf2c25c3..e0a7c351068 100644
--- a/www/addons/mod/choice/lang/lt.json
+++ b/www/addons/mod/choice/lang/lt.json
@@ -2,8 +2,8 @@
     "cannotsubmit": "Atsiprašome, buvo problema pateikiant tavo pasirinkimą. Prašau, pabandykite dar kartą.",
     "choiceoptions": "Pasirinkimo parinktys",
     "errorgetchoice": "Klaida gaunant alternatyvius duomenis.",
-    "expired": "Atsiprašome, veikla uždaryta {{$a}} ir nebegalima",
-    "full": "(Visas)",
+    "expired": "Apgailestaujame, ši veikla uždaryta {{$a}} ir nebegalima",
+    "full": "Visas",
     "noresultsviewable": "Rezultatai dabar nematomi.",
     "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
     "numberofuser": "Atsakymų skaičius",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index d7e7f4cd7f3..627dd4e28f4 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Er was een probleem bij het insturen van je keuze. Probeer opnieuw",
     "choiceoptions": "Keuze-opties",
     "errorgetchoice": "Fout bij het ophalen van de keuzegegevens.",
-    "expired": "Sorry, deze activiteit is afgesloten op {{$a}} en is niet meer beschikbaar",
-    "full": "(volledig)",
+    "expired": "Sorry, deze activiteit is op {{$a}} gesloten en is niet langer beschikbaar",
+    "full": "Volledig",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
-    "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
+    "notopenyet": "Sorry, deze activiteit is niet beschikbaar tot {{$a}}",
     "numberofuser": "Aantal antwoorden",
     "numberofuserinpercentage": "Percentage antwoorden",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
-    "responses": "Antwoorden",
+    "responses": "Eigen antwoorden",
     "responsesresultgraphdescription": "{{number}}% van de gebruikers kozen optie: {{text}}.",
     "responsesresultgraphheader": "Grafiek tonen",
     "resultsnotsynced": "Jouw laatste reactie zit niet in de resultaten. Synchroniseer om deze te up to date te maken.",
diff --git a/www/addons/mod/choice/lang/pl.json b/www/addons/mod/choice/lang/pl.json
index 5a9baaa7221..5c51ab0cc95 100644
--- a/www/addons/mod/choice/lang/pl.json
+++ b/www/addons/mod/choice/lang/pl.json
@@ -1,14 +1,14 @@
 {
     "cannotsubmit": "Wystąpił problem podczas zatwierdzania twojego wyboru. Proszę spróbuj ponownie.",
     "choiceoptions": "Opcje wyboru odpowiedzi",
-    "expired": "Niestety ta aktywność została zamknięta {{$a}} i nie jest już dostępna.",
-    "full": "(pełne)",
+    "expired": "Niestety, ta aktywność została zamknięta {{$a}} i nie jest już dostępna",
+    "full": "Pełny",
     "noresultsviewable": "Nie ma wglądu w wyniki głosowania.",
-    "notopenyet": "Moduł nieczynny do {{$a}}",
+    "notopenyet": "Niestety, ta aktywność jest niedostępna do {{$a}}",
     "numberofuser": "Liczba użytkowników",
     "numberofuserinpercentage": "Ilość użytkowników w procentach",
     "removemychoice": "Usuń mój wybór",
-    "responses": "Odpowiedzi",
+    "responses": "Udzielone odpowiedzi",
     "responsesresultgraphheader": "Wyświetl wykres",
     "savemychoice": "Zapisz mój wybór",
     "userchoosethisoption": "Użytkownicy, którzy wybrali poszczególne opcje.",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index 01fbb57c4c1..5af252e3535 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Desculpe, houve um problema ao enviar sua escolha. Por favor, tente novamente.",
     "choiceoptions": "Opções de escolha",
     "errorgetchoice": "Erro ao obter dados do escolha.",
-    "expired": "Esta atividade está encerrada desde {{$a}}",
-    "full": "(Cheio)",
+    "expired": "Desculpe, este atividade fechada em {{$a}} e não está mais disponível",
+    "full": "Completo",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
-    "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
+    "notopenyet": "Desculpe, esta atividade não está disponível até {{$a}}",
     "numberofuser": "Número de usuários",
     "numberofuserinpercentage": "Percentual de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
diff --git a/www/addons/mod/choice/lang/pt.json b/www/addons/mod/choice/lang/pt.json
index 68e628591c5..1f372a01470 100644
--- a/www/addons/mod/choice/lang/pt.json
+++ b/www/addons/mod/choice/lang/pt.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Desculpe, surgiu um problema ao submeter a sua escolha. Por favor, tente novamente.",
     "choiceoptions": "Opções de resposta",
     "errorgetchoice": "Erro ao obter os dados da sondagem.",
-    "expired": "Esta atividade terminou em {{$a}} e já não está disponível",
-    "full": "Completa",
+    "expired": "A atividade fechou em {{$a}} e já não se encontra disponível",
+    "full": "Completo",
     "noresultsviewable": "Os resultados da sondagem ainda não estão disponíveis.",
-    "notopenyet": "Lamentamos mas esta atividade só estará disponível em {{$a}}",
+    "notopenyet": "Esta atividade não se encontra disponível até {{$a}}",
     "numberofuser": "Número de respostas",
     "numberofuserinpercentage": "Percentagem de respostas",
     "previewonly": "Esta é apenas uma pré-visualização das opções disponíveis para esta atividade. Não poderá submeter a sua escolha até {{$a}}.",
diff --git a/www/addons/mod/choice/lang/ro.json b/www/addons/mod/choice/lang/ro.json
index 2133b57b951..b700526a6d9 100644
--- a/www/addons/mod/choice/lang/ro.json
+++ b/www/addons/mod/choice/lang/ro.json
@@ -1,9 +1,9 @@
 {
     "errorgetchoice": "Eroare în obținerea de date pentru alegere",
-    "expired": "Ne pare rău, această activitate s-a închis la {{$a}} şi nu mai este disponibilă",
-    "full": "(plin)",
+    "expired": "Ne pare rău, această activitate închisă în {{$a}} nu mai este disponibilă",
+    "full": "Complet",
     "noresultsviewable": "În acest moment rezultatele nu pot fi vizualizate.",
-    "notopenyet": "Ne pare rău, această activitate nu este disponibilă mai devreme de {{$a}}",
+    "notopenyet": "Ne pare rău, această activitate nu este disponibilă până în {{$a}}",
     "numberofuser": "Numărul de răspunsuri",
     "numberofuserinpercentage": "Procentajul răspunsurilor",
     "previewonly": "Acesta este doar o prezentare a opțiunilor existente pentru această activitate. Nu veți putea trimite opțiunea dvs. până la {{$a}}.",
diff --git a/www/addons/mod/choice/lang/ru.json b/www/addons/mod/choice/lang/ru.json
index a8b13940e57..2a45162655a 100644
--- a/www/addons/mod/choice/lang/ru.json
+++ b/www/addons/mod/choice/lang/ru.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Извините, возникла проблема при отправке Вашего ответа на опрос. Пожалуйста, повторите снова.",
     "choiceoptions": "Варианты ответа",
     "errorgetchoice": "Ошибка при получении данных выбора",
-    "expired": "Извините эта активность закрыта {{$a}} и более недоступна",
-    "full": "(Заполнено)",
+    "expired": "Извините, данный элемент курса закрыт в {{$a}} и уже не доступен",
+    "full": "Полный",
     "noresultsviewable": "Вы не можете в данный момент просматривать результаты опроса.",
-    "notopenyet": "Извините, данное действие недоступно до {{$a}}",
+    "notopenyet": "Извините, данный элемент курса не доступен до {{$a}}",
     "numberofuser": "Количество ответов на опрос",
     "numberofuserinpercentage": "Доля ответивших на опрос",
     "previewonly": "Это только предварительный просмотр доступных вариантов для этого опроса. Вы не можете отправить свой ответ до {{$a}}.",
     "removemychoice": "Удалить мой выбор",
-    "responses": "Ответы",
+    "responses": "Свои ответы",
     "responsesresultgraphdescription": "{{number}}% пользователей выбрало вариант: {{text}}.",
     "responsesresultgraphheader": "Отображать график",
     "savemychoice": "Сохранить мой выбор",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 8ef6af50622..deac1e67ed0 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Tyvärr fanns det ett problem att lämna ditt val . Var god försök igen.",
     "choiceoptions": "Alternativ för opinonsundersökning",
     "errorgetchoice": "Fel vid hämtning av opinionsdata",
-    "expired": "Den här aktiviteten är stängd på {{$a}} och den är inte längre tillgänglig.",
-    "full": "(Full)",
+    "expired": "Den här aktiviteten är tyvärr avslutad den {{$a}} och den är inte längre tillgänglig",
+    "full": "Fullständig",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
-    "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
+    "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {$}}",
     "numberofuser": "Antal användare",
     "numberofuserinpercentage": "Antalet användare i procent.",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
-    "responses": "Svar",
+    "responses": "Responser",
     "responsesresultgraphdescription": "{{number}}% Av användarna valde alternativet: {{text}}",
     "responsesresultgraphheader": "Visa en graf",
     "savemychoice": "Spara min opinionsundersökning",
diff --git a/www/addons/mod/choice/lang/tr.json b/www/addons/mod/choice/lang/tr.json
index 05535649a7a..17549bb1abb 100644
--- a/www/addons/mod/choice/lang/tr.json
+++ b/www/addons/mod/choice/lang/tr.json
@@ -1,15 +1,15 @@
 {
     "cannotsubmit": "Üzgünüz, seçiminizi gönderirken bir sorun oluştu. Lütfen tekrar deneyin.",
     "choiceoptions": "Seçim seçenekleri",
-    "expired": "Üzgünüz, bu etkinlik {{$a}} tarihinde kapandı ve bu etkinliğe artık ulaşılamaz",
-    "full": "(Dolu)",
+    "expired": "Üzgünüz, bu etkinlik {{$a}} tarihinde kapatılmış ve artık erişilemez",
+    "full": "Tam",
     "noresultsviewable": "Sonuçlar şu anda görüntülenmemektedir.",
-    "notopenyet": "Üzgünüz, bu etkinliğe {{$a}} tarihine kadar ulaşılamaz",
+    "notopenyet": "Üzgünüz, bu etkinliğe {{$a}} tarihine kadar erişemezsiniz.",
     "numberofuser": "Yanıt sayısı",
     "numberofuserinpercentage": "Yanıtların yüzdesi",
     "previewonly": "Bu, bu etkinlik için mevcut seçeneklerin bir önizlemesidir. {{$a}} tarihine kadar seçiminizi yapamazsınız.",
     "removemychoice": "Seçimimi sil",
-    "responses": "Yanıtlar",
+    "responses": "Verilen yanıtlar",
     "responsesresultgraphheader": "Grafik ekranı",
     "savemychoice": "Seçeneğimi kaydet",
     "userchoosethisoption": "Bu seçeneği seçen kullanıcılar",
diff --git a/www/addons/mod/choice/lang/uk.json b/www/addons/mod/choice/lang/uk.json
new file mode 100644
index 00000000000..45d0a3a03d0
--- /dev/null
+++ b/www/addons/mod/choice/lang/uk.json
@@ -0,0 +1,20 @@
+{
+    "cannotsubmit": "Вибачте, але трапилася проблема під час збереження вашого вибору. Повторіть, будь ласка, ще раз.",
+    "choiceoptions": "Параметри вибору",
+    "errorgetchoice": "Помилка при отриманні даних вибору.",
+    "expired": "На жаль, ця діяльність закрита з {{$a}}  і більше недоступна",
+    "full": "Повністю",
+    "noresultsviewable": "В даний час результати не можна побачити.",
+    "notopenyet": "Вибачте, ця діяльність недоступна до {{$a}}",
+    "numberofuser": "Кількість користувачів",
+    "numberofuserinpercentage": "Кількість користувачів у відсотках",
+    "previewonly": "Це лише попередній перегляд доступних варіантів для цієї діяльності. Ви не можете відправити відповідь до {{$a}}.",
+    "removemychoice": "Видалити мій вибір",
+    "responses": "Відповіді",
+    "responsesresultgraphdescription": "{{number}}% користувачів вибрали пункт: {{text}}.",
+    "responsesresultgraphheader": "Показувати графік",
+    "resultsnotsynced": "Результати не включають останні відповіді. Будь ласка, синхронізуйтесь для поновлення.",
+    "savemychoice": "Зберегти відповідь",
+    "userchoosethisoption": "Користувачі, які вибрали цю опцію",
+    "yourselection": "Ваш вибір"
+}
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/zh-cn.json b/www/addons/mod/choice/lang/zh-cn.json
index 3204cfd0148..e5727c24749 100644
--- a/www/addons/mod/choice/lang/zh-cn.json
+++ b/www/addons/mod/choice/lang/zh-cn.json
@@ -1,15 +1,15 @@
 {
     "cannotsubmit": "对不起，你的提交有误，请再试一次。",
     "choiceoptions": "投票选项",
-    "expired": "对不起，该活动已于 {{$a}} 关闭，不能再参加",
-    "full": "(已满)",
+    "expired": "抱歉，本活动已于{{$a}}关闭，已不再可用。",
+    "full": "全屏",
     "noresultsviewable": "结果目前不能查看。",
-    "notopenyet": "对于起，此活动在 {{$a}} 之后才可用",
+    "notopenyet": "抱歉，这个活动直到{{$a}}才能进行",
     "numberofuser": "用户数",
     "numberofuserinpercentage": "用户数百分比",
     "previewonly": "这只是该活动的可用选项的预览。你要等到{{$a}}才可以进行投票。",
     "removemychoice": "删除我的投票",
-    "responses": "回复",
+    "responses": "作答",
     "responsesresultgraphheader": "图示",
     "savemychoice": "保存我的选择",
     "userchoosethisoption": "选择此选项的用户",
diff --git a/www/addons/mod/choice/lang/zh-tw.json b/www/addons/mod/choice/lang/zh-tw.json
index c97305fd6fa..cf166f787dd 100644
--- a/www/addons/mod/choice/lang/zh-tw.json
+++ b/www/addons/mod/choice/lang/zh-tw.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "抱歉，在提交你的投票時發生問題，請再試一次。",
     "choiceoptions": "票選的選項",
     "errorgetchoice": "取得選項資料時出錯",
-    "expired": "抱歉，此項活動已經在{{$a}}關閉，不再開放使用。",
-    "full": "(已滿)",
+    "expired": "抱歉，這活動已經在{{$a}}關閉，已經無法使用",
+    "full": "全部",
     "noresultsviewable": "目前無法檢視票選結果",
-    "notopenyet": "抱歉，這個活動在{{$a}}之前不能使用",
+    "notopenyet": "抱歉，這一活動要到{{$a}}才可以使用",
     "numberofuser": "回應的人數",
     "numberofuserinpercentage": "回應人數的百分比",
     "previewonly": "這只是這一活動的可用選項的預覽。你要等到{{$a}}才可以進行投票。",
     "removemychoice": "移除我的選擇",
-    "responses": "答覆",
+    "responses": "回答",
     "responsesresultgraphdescription": "{{number}}％的使用者選擇了選項: {{text}}.",
     "responsesresultgraphheader": "顯示圖表",
     "resultsnotsynced": "結果不包括您的上次回覆. 請同步更新.",
diff --git a/www/addons/mod/feedback/lang/ar.json b/www/addons/mod/feedback/lang/ar.json
index ddcafaf0d1a..76ad30ce026 100644
--- a/www/addons/mod/feedback/lang/ar.json
+++ b/www/addons/mod/feedback/lang/ar.json
@@ -8,21 +8,21 @@
     "continue_the_form": "استمر من",
     "feedbackclose": "إغلاق الأفادة",
     "feedbackopen": "فتح الإفادة",
-    "mode": "نمط",
+    "mode": "وضع",
     "next_page": "الصفحة التالية",
     "non_anonymous": "سيتم تسجيل اسم المستخدم وعرضه مع الإجابات",
     "non_respondents_students": "غير مستجيبين",
     "not_selected": "لم يتم الاختيار",
     "not_started": "لم يتم البدء",
-    "overview": "نظرة عامة",
+    "overview": "عرض عام",
     "page_after_submit": "الصفحة بعد الإرسال",
     "preview": "معاينة",
     "previous_page": "صفحة سابقة",
-    "questions": "أسئلة",
+    "questions": "أسئله",
     "responses": "إجابات",
     "save_entries": "سلم إجاباتك",
     "show_entries": "عرض الردود",
     "show_nonrespondents": "معاينة غير المستجيبين",
-    "started": "بداء",
+    "started": "بدأ",
     "this_feedback_is_already_submitted": "لقد قمت مسبقاً بإكمال هذا النشاط."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/bg.json b/www/addons/mod/feedback/lang/bg.json
index 335c218cf1c..8cc9e80a539 100644
--- a/www/addons/mod/feedback/lang/bg.json
+++ b/www/addons/mod/feedback/lang/bg.json
@@ -17,7 +17,7 @@
     "non_respondents_students": "не отговорили студенти",
     "not_selected": "Няма избран",
     "not_started": "не започната",
-    "overview": "Представяне",
+    "overview": "Обобщение",
     "page_after_submit": "Съобщение след попълване",
     "preview": "Преглед",
     "previous_page": "Предишна страница",
@@ -27,6 +27,6 @@
     "save_entries": "Изпращане на отговорите",
     "show_entries": "Преглед на отговорите",
     "show_nonrespondents": "Показване на не отговорилите",
-    "started": "започната",
+    "started": "Започнато",
     "this_feedback_is_already_submitted": "Вие вече сте изпълнили тази дейност."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ca.json b/www/addons/mod/feedback/lang/ca.json
index 4d936b89e1c..69f08255769 100644
--- a/www/addons/mod/feedback/lang/ca.json
+++ b/www/addons/mod/feedback/lang/ca.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Permet les respostes a",
     "feedbackopen": "Permet les respostes de",
     "mapcourses": "Mapatge de retroacció a cursos.",
-    "mode": "Mode",
+    "mode": "Moda",
     "next_page": "Pàgina següent",
     "non_anonymous": "El nom de l'usuari es registrarà i es mostrarà amb les respostes",
     "non_anonymous_entries": "entrades no anònimes",
@@ -20,9 +20,9 @@
     "not_selected": "No s'ha seleccionat",
     "not_started": "No s'ha iniciat",
     "numberoutofrange": "Número fora de l'interval",
-    "overview": "Descripció",
+    "overview": "Revisió",
     "page_after_submit": "Missatge de compleció",
-    "preview": "Vista prèvia",
+    "preview": "Previsualització",
     "previous_page": "Pàgina anterior",
     "questions": "Preguntes",
     "response_nr": "Número de resposta",
@@ -30,6 +30,6 @@
     "save_entries": "Envia les respostes",
     "show_entries": "Mostra les respostes",
     "show_nonrespondents": "Mostra els que no han respost",
-    "started": "s'ha iniciat",
+    "started": "Iniciat",
     "this_feedback_is_already_submitted": "Heu completat aquesta activitat"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/cs.json b/www/addons/mod/feedback/lang/cs.json
index 50c98674c0f..2f720cf1708 100644
--- a/www/addons/mod/feedback/lang/cs.json
+++ b/www/addons/mod/feedback/lang/cs.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Povolit odpovědi",
     "feedbackopen": "Dostupné od",
     "mapcourses": "Mapování kurzů",
-    "mode": "Režim",
+    "mode": "Modus",
     "next_page": "Další stránka",
     "non_anonymous": "Jména respondentů budou zaznamenána a ukázána s odpověďmi",
     "non_anonymous_entries": "Neanonymní záznamy ({{$a}})",
@@ -24,12 +24,12 @@
     "page_after_submit": "Zpráva o dokončení",
     "preview": "Náhled",
     "previous_page": "Předchozí stránka",
-    "questions": "Otázky",
+    "questions": "Úlohy",
     "response_nr": "Číslo odpovědi",
     "responses": "Odpovědi",
     "save_entries": "Odevzdejte vaše odpovědi",
     "show_entries": "Ukázat odpovědi",
     "show_nonrespondents": "Ukázat uživatele, kteří neodpověděli",
-    "started": "Spuštěno",
+    "started": "Zahájeno",
     "this_feedback_is_already_submitted": "Tento dotazník jste již vyplnili."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/da.json b/www/addons/mod/feedback/lang/da.json
index 55d1b3cd1ba..d51de3114d7 100644
--- a/www/addons/mod/feedback/lang/da.json
+++ b/www/addons/mod/feedback/lang/da.json
@@ -17,13 +17,13 @@
     "non_respondents_students": "Studerende der ikke har besvaret ({{$a}})",
     "not_selected": "Ikke valgt",
     "not_started": "Ikke startet",
-    "overview": "Overblik",
+    "overview": "Oversigt",
     "page_after_submit": "Fuldførelsesbesked",
-    "preview": "Forhåndsvisning",
+    "preview": "Prøvese",
     "previous_page": "Forrige side",
     "questions": "Spørgsmål",
     "response_nr": "Svar nummer",
-    "responses": "Svar",
+    "responses": "Responser",
     "save_entries": "Aflever dine svar",
     "show_entries": "Vis svar",
     "show_nonrespondents": "Vis ikke-respondenter",
diff --git a/www/addons/mod/feedback/lang/de.json b/www/addons/mod/feedback/lang/de.json
index d9fb285b01e..ee1c71e5e31 100644
--- a/www/addons/mod/feedback/lang/de.json
+++ b/www/addons/mod/feedback/lang/de.json
@@ -2,8 +2,8 @@
     "analysis": "Auswertung",
     "anonymous": "Anonym",
     "anonymous_entries": "Anonyme Einträge ({{$a}})",
-    "average": "Mittelwert",
-    "captchaofflinewarning": "Ein Feedback mit Captcha kann nicht beendet werden, wenn der Server nicht konfiguriert ist oder nicht antwortet. Captcha funktioniert im Offline-Modus nicht.",
+    "average": "Durchschnitt",
+    "captchaofflinewarning": "Ein Feedback mit Captcha kann offline nicht beendet werden. Captcha funktioniert nicht, wenn der Server nicht konfiguriert ist oder der Server nicht antwortet.",
     "complete_the_form": "Formular ausfüllen...",
     "completed_feedbacks": "Ausgefüllte Feedbacks",
     "continue_the_form": "Ausfüllen fortsetzen",
@@ -20,13 +20,13 @@
     "not_selected": "Nicht ausgewählt",
     "not_started": "Nicht begonnen",
     "numberoutofrange": "Zahl außerhalb des Bereichs",
-    "overview": "Überblick",
+    "overview": "Übersicht",
     "page_after_submit": "Abschlussmitteilung",
     "preview": "Vorschau",
     "previous_page": "Vorherige Seite",
     "questions": "Fragen",
     "response_nr": "Antwort Nr.",
-    "responses": "Antworten",
+    "responses": "Eigene Eingaben",
     "save_entries": "Einträge speichern",
     "show_entries": "Einträge anzeigen",
     "show_nonrespondents": "Ohne Antwort",
diff --git a/www/addons/mod/feedback/lang/el.json b/www/addons/mod/feedback/lang/el.json
index 7dd8e2abab8..66db88eec02 100644
--- a/www/addons/mod/feedback/lang/el.json
+++ b/www/addons/mod/feedback/lang/el.json
@@ -10,12 +10,12 @@
     "feedbackclose": "Κλείσε το σχόλιο στις",
     "feedbackopen": "Άνοιξε το σχόλιο στις",
     "mapcourses": "Αντιστοίχηση σχόλιου σε μαθήματα",
-    "mode": "Λειτουργία",
+    "mode": "Φάση",
     "next_page": "Επόμενη σελίδα",
     "non_anonymous": "Το όνομα του χρήστη θα καταγραφεί και θα εμφανίζεται με τις απαντήσεις",
     "non_anonymous_entries": "χωρίς ανώνυμες καταχωρήσεις",
     "not_selected": "Δεν έχουν επιλεχθεί",
-    "overview": "Επισκόπηση",
+    "overview": "Σύνοψη",
     "page_after_submit": "Σελίδα μετά την υποβολή",
     "preview": "Προεπισκόπηση",
     "previous_page": "Προηγούμενη σελίδα",
diff --git a/www/addons/mod/feedback/lang/es-mx.json b/www/addons/mod/feedback/lang/es-mx.json
index 6c9cfa558f6..42aa7fe3332 100644
--- a/www/addons/mod/feedback/lang/es-mx.json
+++ b/www/addons/mod/feedback/lang/es-mx.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Permitir respuestas a",
     "feedbackopen": "Permitir respuestas de",
     "mapcourses": "Asignar retroalimentación a cursos",
-    "mode": "Modo",
+    "mode": "Moda",
     "next_page": "Siguiente página",
     "non_anonymous": "Los nombres de los usuarios se mostrarán y registrarán con las respuestas",
     "non_anonymous_entries": "Entradas no anónimas ({{$a}})",
@@ -20,16 +20,16 @@
     "not_selected": "No seleccionada",
     "not_started": "No comenzado",
     "numberoutofrange": "Número fuera del rango",
-    "overview": "Vista general",
+    "overview": "Visión general",
     "page_after_submit": "Página a mostrar tras la terminación del envío",
-    "preview": "Previsualizar",
+    "preview": "Vista previa",
     "previous_page": "Página anterior",
     "questions": "Preguntas",
     "response_nr": "Respuesta número",
-    "responses": "Respuestas",
+    "responses": "Respuestas del alumno",
     "save_entries": "Enviar sus respuestas",
     "show_entries": "Mostrar respuestas",
     "show_nonrespondents": "Mostrar no respondientes",
-    "started": "Comenzado",
+    "started": "Iniciado/a",
     "this_feedback_is_already_submitted": "Usted ya ha finalizado esta actividad."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/es.json b/www/addons/mod/feedback/lang/es.json
index b0d70fa540b..7cefdcb0f63 100644
--- a/www/addons/mod/feedback/lang/es.json
+++ b/www/addons/mod/feedback/lang/es.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Permitir respuestas a",
     "feedbackopen": "Permitir respuestas de",
     "mapcourses": "Asignar encuesta a cursos",
-    "mode": "Modo",
+    "mode": "Moda",
     "next_page": "Siguiente página",
     "non_anonymous": "Los nombres de los usuarios se mostrarán y registrarán con las respuestas",
     "non_anonymous_entries": "entradas no anónimas",
@@ -18,16 +18,16 @@
     "not_selected": "No seleccionada",
     "not_started": "no comenzado",
     "numberoutofrange": "Número fuera de rango",
-    "overview": "Vista general",
+    "overview": "Revisión",
     "page_after_submit": "Página a mostrar tras el envío",
-    "preview": "Previsualizar",
+    "preview": "Vista previa",
     "previous_page": "Página anterior",
     "questions": "Preguntas",
     "response_nr": "Respuesta número",
-    "responses": "Respuestas",
+    "responses": "Respuestas -",
     "save_entries": "Enviar sus respuestas",
     "show_entries": "Mostrar respuestas",
     "show_nonrespondents": "Mostrar no respondientes",
-    "started": "comenzado",
+    "started": "Iniciado/a",
     "this_feedback_is_already_submitted": "Usted ya ha finalizado esta actividad."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/eu.json b/www/addons/mod/feedback/lang/eu.json
index b063f30fe36..7035a7febcc 100644
--- a/www/addons/mod/feedback/lang/eu.json
+++ b/www/addons/mod/feedback/lang/eu.json
@@ -3,10 +3,12 @@
     "anonymous": "Anonimoa",
     "anonymous_entries": "Sarrera anonimoak ({{$a}})",
     "average": "Batez bestekoa",
+    "captchaofflinewarning": "captcha-dun feedback-ak ezin dira osatu konfiguratuta ez badaude, lineaz kanpoko modu erabilita edo zerbitzaria eskuragarri ez badago.",
     "complete_the_form": "Erantzun galderei...",
     "completed_feedbacks": "Bidalitako erantzunak",
     "continue_the_form": "Jarraitu formularioarekin",
     "feedback_is_not_open": "Inkesta ez dago zabalik",
+    "feedback_submitted_offline": "Feedback hau beranduago bidaltzeko gorde da.",
     "feedbackclose": "Noiz itxi inkesta",
     "feedbackopen": "Noiz zabaldu inkesta",
     "mapcourses": "Esleitu feedback-a ikastaroetarako",
@@ -18,16 +20,16 @@
     "not_selected": "Aukeratu gabea",
     "not_started": "hasi gabea",
     "numberoutofrange": "Tartetik kanpoko zenbakia",
-    "overview": "Ikuspegi orokorra",
+    "overview": "Laburpena",
     "page_after_submit": "Osaketa-mezua",
-    "preview": "Aurrebista",
+    "preview": "Aurreikusi",
     "previous_page": "Aurreko orria",
     "questions": "Galderak",
     "response_nr": "Erantzun-kopurua",
-    "responses": "Erantzunak",
+    "responses": "Ebazpenak",
     "save_entries": "Bidali zure erantzunak",
     "show_entries": "Erakutsi erantzunak",
     "show_nonrespondents": "Erakutsi erantzun gabeak",
-    "started": "hasita",
+    "started": "Hasita",
     "this_feedback_is_already_submitted": "Dagoeneko egina duzu jarduera hau."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/fa.json b/www/addons/mod/feedback/lang/fa.json
index c51a518902b..d62c4b9a502 100644
--- a/www/addons/mod/feedback/lang/fa.json
+++ b/www/addons/mod/feedback/lang/fa.json
@@ -10,23 +10,23 @@
     "feedbackclose": "بستن بازخورد در",
     "feedbackopen": "باز کردن بازخورد در",
     "mapcourses": "نسبت دادن بازخورد به درس‌ها",
-    "mode": "حالت",
+    "mode": "روش",
     "next_page": "صفحهٔ بعد",
     "non_anonymous": "نام کاربران ثبت و به همراه پاسخ‌ها نمایش داده خواهد شد",
     "non_anonymous_entries": "اطلاعا وارد شده به صورت غیر ناشناس",
     "non_respondents_students": "شاگردانی که پاسخ نداده‌اند",
     "not_selected": "انتخاب نشده",
     "not_started": "شروع نکرده است",
-    "overview": "مرور اجمالی",
+    "overview": "مرور کلی",
     "page_after_submit": "صفحهٔ بعد از پر کردن فرم",
     "preview": "پیش‌نمایش",
     "previous_page": "صفحهٔ قبل",
     "questions": "سوال‌ها",
     "response_nr": "پاسخ شمارهٔ",
-    "responses": "پاسخ‌ها",
+    "responses": "پاسخ‌های ارائه شده",
     "save_entries": "فرستادن پاسخ‌های شما",
     "show_entries": "نمایش پاسخ‌ها",
     "show_nonrespondents": "نمایش کسانی که پاسخ نداده‌اند",
-    "started": "شروع کرده است",
+    "started": "شروع شد",
     "this_feedback_is_already_submitted": "شما قبلا این فعالیت را کامل کرده‌اید."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/fr.json b/www/addons/mod/feedback/lang/fr.json
index e043077cb6a..476111f5c18 100644
--- a/www/addons/mod/feedback/lang/fr.json
+++ b/www/addons/mod/feedback/lang/fr.json
@@ -24,7 +24,7 @@
     "previous_page": "Page précédente",
     "questions": "Questions",
     "response_nr": "Réponse No",
-    "responses": "Réponses",
+    "responses": "Réponses du participant",
     "save_entries": "Remettre vos réponses",
     "show_entries": "Afficher les réponses",
     "show_nonrespondents": "Afficher les utilisateurs sans réponse",
diff --git a/www/addons/mod/feedback/lang/he.json b/www/addons/mod/feedback/lang/he.json
index 52e5c8f67b8..e596bb8c1b6 100644
--- a/www/addons/mod/feedback/lang/he.json
+++ b/www/addons/mod/feedback/lang/he.json
@@ -2,7 +2,7 @@
     "analysis": "ניתוח",
     "anonymous": "אנונימי",
     "anonymous_entries": "משובים אנונימיים",
-    "average": "ממוצע",
+    "average": "ממוצע (בקורס)",
     "complete_the_form": "מענה על השאלות...",
     "completed_feedbacks": "תשובות אשר הוגשו",
     "continue_the_form": "המשך השאלון",
@@ -17,7 +17,7 @@
     "non_respondents_students": "לא קיימות תגובות של סטודנטים",
     "not_selected": "לא נבחר",
     "not_started": "לא התחיל",
-    "overview": "סקירה",
+    "overview": "סקירה כללית",
     "page_after_submit": "הודעת השלמה",
     "preview": "תצוגה מקדימה",
     "previous_page": "העמוד הקודם",
diff --git a/www/addons/mod/feedback/lang/hu.json b/www/addons/mod/feedback/lang/hu.json
index 4c096d23974..b52ac3f2aec 100644
--- a/www/addons/mod/feedback/lang/hu.json
+++ b/www/addons/mod/feedback/lang/hu.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Válaszok engedélyezése a címzettnek",
     "feedbackopen": "Válaszok engedélyezése a feladótól",
     "mapcourses": "A visszajelzés illesztése kurzusokhoz.",
-    "mode": "Mód",
+    "mode": "Leggyakoribb",
     "next_page": "Következő oldal",
     "non_anonymous": "A felhasználó nevét a rendszer naplózza és a válaszok mellett megjeleníti",
     "non_anonymous_entries": "Nem névtelen bejegyzések ({{$a}})",
@@ -20,7 +20,7 @@
     "numberoutofrange": "Tartományon kívül eső szám",
     "overview": "Áttekintés",
     "page_after_submit": "Teljesítéssel kapcsolatos üzenet",
-    "preview": "Előkép",
+    "preview": "Előzetes megtekintés",
     "previous_page": "Előző oldal",
     "questions": "Kérdések",
     "response_nr": "Válasz száma:",
diff --git a/www/addons/mod/feedback/lang/it.json b/www/addons/mod/feedback/lang/it.json
index d31469322d6..d7adab94e62 100644
--- a/www/addons/mod/feedback/lang/it.json
+++ b/www/addons/mod/feedback/lang/it.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Chiusura",
     "feedbackopen": "Apertura",
     "mapcourses": "Associa feedback ai corsi",
-    "mode": "Modalità",
+    "mode": "Moda",
     "next_page": "Pagina successiva",
     "non_anonymous": "Il nome del partecipante verrà registrato e visualizzato nelle risposte",
     "non_anonymous_entries": "Risposte non anonime ({{$a}})",
@@ -18,16 +18,16 @@
     "not_selected": "Nessuna scelta",
     "not_started": "Non iniziato",
     "numberoutofrange": "Il numero è fuori scala",
-    "overview": "Panoramica",
+    "overview": "Riepilogo",
     "page_after_submit": "Messaggio da visualizzare dopo la compilazione",
     "preview": "Anteprima",
     "previous_page": "Pagina precedente",
     "questions": "Domande",
     "response_nr": "Risposta numero",
-    "responses": "Risposte",
+    "responses": "Risposte date",
     "save_entries": "Invia le risposte",
     "show_entries": "Risposte",
     "show_nonrespondents": "Risposte mancanti",
-    "started": "Aperto",
+    "started": "Iniziato",
     "this_feedback_is_already_submitted": "Hai già completato questa attività."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ja.json b/www/addons/mod/feedback/lang/ja.json
index 63503d3cc28..2092085605f 100644
--- a/www/addons/mod/feedback/lang/ja.json
+++ b/www/addons/mod/feedback/lang/ja.json
@@ -10,7 +10,7 @@
     "feedbackclose": "フィードバック終了日時",
     "feedbackopen": "フィードバック開始日時",
     "mapcourses": "フィードバックをコースにマップする",
-    "mode": "モード",
+    "mode": "最頻値",
     "next_page": "次のページ",
     "non_anonymous": "ユーザ名を記録して回答と共に表示する",
     "non_anonymous_entries": "非匿名エントリ ({{$a}})",
@@ -22,12 +22,12 @@
     "page_after_submit": "完了メッセージ",
     "preview": "プレビュー",
     "previous_page": "前のページ",
-    "questions": "質問",
+    "questions": "問題",
     "response_nr": "回答No",
-    "responses": "回答",
+    "responses": "解答",
     "save_entries": "あなたの回答を送信する",
     "show_entries": "回答を表示する",
     "show_nonrespondents": "未回答者を表示する",
-    "started": "開始済み",
+    "started": "開始",
     "this_feedback_is_already_submitted": "あなたはすでにこの活動を完了しています。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/lt.json b/www/addons/mod/feedback/lang/lt.json
index dbe395c1dd6..2e72078803c 100644
--- a/www/addons/mod/feedback/lang/lt.json
+++ b/www/addons/mod/feedback/lang/lt.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Uždaryti atsiliepimą",
     "feedbackopen": "Atidaryti atsiliepimą",
     "mapcourses": "Susieti atsiliepimą su kursais",
-    "mode": "Režimas",
+    "mode": "Moda",
     "next_page": "Kitas puslapis",
     "non_anonymous": "Naudotojo vardas bus užregistruotas ir rodomas su atsakymais",
     "non_anonymous_entries": "Neanoniminiai įrašai ({{$a}})",
@@ -28,6 +28,6 @@
     "save_entries": "Pateikite savo atsakymus",
     "show_entries": "Rodyti atsakymus",
     "show_nonrespondents": "Rodyti ne respondentus",
-    "started": "Pradėjo",
+    "started": "Pradėta",
     "this_feedback_is_already_submitted": "Jau užbaigėte šią veiklą."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/nl.json b/www/addons/mod/feedback/lang/nl.json
index 92250c29608..dfca9892e77 100644
--- a/www/addons/mod/feedback/lang/nl.json
+++ b/www/addons/mod/feedback/lang/nl.json
@@ -22,11 +22,11 @@
     "numberoutofrange": "Aantal buiten bereik",
     "overview": "Overzicht",
     "page_after_submit": "Bericht na voltooien",
-    "preview": "Voorbeeld",
+    "preview": "Controleer test",
     "previous_page": "Vorige pagina",
     "questions": "Vragen",
     "response_nr": "Antwoordnummer",
-    "responses": "Antwoorden",
+    "responses": "Eigen antwoorden",
     "save_entries": "Verzend je antwoorden",
     "show_entries": "Toon antwoorden",
     "show_nonrespondents": "Niet geantwoord",
diff --git a/www/addons/mod/feedback/lang/pl.json b/www/addons/mod/feedback/lang/pl.json
index 7c904cb371a..56d639ec322 100644
--- a/www/addons/mod/feedback/lang/pl.json
+++ b/www/addons/mod/feedback/lang/pl.json
@@ -18,13 +18,13 @@
     "not_selected": "Nie wybrano",
     "not_started": "nie rozpoczęto",
     "numberoutofrange": "Liczba poza zakresem",
-    "overview": "Przegląd",
+    "overview": "Skrócony",
     "page_after_submit": "Wyświetl stronę po zatwierdzeniu",
     "preview": "Podgląd",
     "previous_page": "Poprzednia strona\n",
     "questions": "Pytania",
     "response_nr": "Liczba odpowiedzi",
-    "responses": "Odpowiedzi",
+    "responses": "Udzielone odpowiedzi",
     "save_entries": "Zatwierdź swoją odpowiedź",
     "show_entries": "Pokaż odpowiedzi",
     "show_nonrespondents": "Pokaż kto nie udzielił opinii*",
diff --git a/www/addons/mod/feedback/lang/pt-br.json b/www/addons/mod/feedback/lang/pt-br.json
index 98fb2ece613..c5e5a29da40 100644
--- a/www/addons/mod/feedback/lang/pt-br.json
+++ b/www/addons/mod/feedback/lang/pt-br.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Permitir respostas até",
     "feedbackopen": "Permitir respostas de",
     "mapcourses": "Mapear pesquisa para os cursos",
-    "mode": "Modo",
+    "mode": "Tendência",
     "next_page": "Próxima página",
     "non_anonymous": "O nome do usuário será registrado e mostrado com as respostas",
     "non_anonymous_entries": "entradas não anônimas",
@@ -19,7 +19,7 @@
     "not_started": "não iniciado",
     "overview": "Visão geral",
     "page_after_submit": "Mensagem de conclusão",
-    "preview": "Previsão",
+    "preview": "Visualização prévia",
     "previous_page": "Página anterior",
     "questions": "Questões",
     "response_nr": "Resposta numérica",
@@ -27,6 +27,6 @@
     "save_entries": "Submeter as suas respostas",
     "show_entries": "Mostrar respostas",
     "show_nonrespondents": "Mostrar não respondentes",
-    "started": "iniciado",
+    "started": "Iniciada",
     "this_feedback_is_already_submitted": "Você já terminou esta atividade."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/pt.json b/www/addons/mod/feedback/lang/pt.json
index 66f19fd361e..f85fe6ee15b 100644
--- a/www/addons/mod/feedback/lang/pt.json
+++ b/www/addons/mod/feedback/lang/pt.json
@@ -3,14 +3,16 @@
     "anonymous": "Anónimo",
     "anonymous_entries": "Respostas anónimas ({{$a}})",
     "average": "Média",
+    "captchaofflinewarning": "Inquérito com captcha não pode ser concluído se não estiver configurado, nem em modo offline ou com o servidor em baixo.",
     "complete_the_form": "Responder às questões...",
     "completed_feedbacks": "Respostas submetidas",
     "continue_the_form": "Continuar o inquérito",
     "feedback_is_not_open": "O inquérito não está aberto",
+    "feedback_submitted_offline": "O Inquérito foi gravado para ser enviado mais tarde.",
     "feedbackclose": "Permitir respostas até",
     "feedbackopen": "Permitir respostas a partir de",
     "mapcourses": "Associar o inquérito a disciplinas",
-    "mode": "Modo",
+    "mode": "Moda",
     "next_page": "Página seguinte",
     "non_anonymous": "O nome do utilizador será registado e apresentado com as respostas",
     "non_anonymous_entries": "Respostas não anónimas ({{$a}})",
@@ -18,16 +20,16 @@
     "not_selected": "Não respondido",
     "not_started": "Por iniciar",
     "numberoutofrange": "Valor fora do intervalo",
-    "overview": "Visão geral",
+    "overview": "Perspetiva global",
     "page_after_submit": "Mensagem de conclusão",
     "preview": "Pré-visualização",
     "previous_page": "Página anterior",
-    "questions": "Questões",
+    "questions": "Perguntas",
     "response_nr": "Número da resposta",
     "responses": "Respostas",
     "save_entries": "Submeter respostas",
     "show_entries": "Respostas",
     "show_nonrespondents": "Utilizadores que não responderam",
-    "started": "iniciado",
+    "started": "Iniciado",
     "this_feedback_is_already_submitted": "Já completou esta atividade"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ro.json b/www/addons/mod/feedback/lang/ro.json
index b7e3b467ea1..3980cc35ea4 100644
--- a/www/addons/mod/feedback/lang/ro.json
+++ b/www/addons/mod/feedback/lang/ro.json
@@ -2,7 +2,7 @@
     "analysis": "Analiză",
     "anonymous": "Anonim",
     "anonymous_entries": "Postări anonime",
-    "average": "Medie",
+    "average": "Media",
     "complete_the_form": "Răspunde la întrebare",
     "completed_feedbacks": "Răspunsuri trimise",
     "feedback_is_not_open": "Feedback-ul nu este disponibil",
@@ -13,13 +13,13 @@
     "not_started": "neînceput",
     "numberoutofrange": "Număr în afara intervalului",
     "page_after_submit": "Pagina după trimitere",
-    "preview": "Previzualizare",
+    "preview": "Afişare",
     "previous_page": "Pagina precedentă",
     "questions": "Întrebări",
     "response_nr": "Numărul răspunsuluii",
     "responses": "Răspunsuri",
     "save_entries": "Trimiteți răspunsurile",
     "show_entries": "Afișează răspunsuri",
-    "started": "început",
+    "started": "Început",
     "this_feedback_is_already_submitted": "Ați completat deja această activitate."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ru.json b/www/addons/mod/feedback/lang/ru.json
index e006d1ef678..f0dff3e0b4d 100644
--- a/www/addons/mod/feedback/lang/ru.json
+++ b/www/addons/mod/feedback/lang/ru.json
@@ -2,7 +2,7 @@
     "analysis": "Анализ результатов",
     "anonymous": "Анонимный",
     "anonymous_entries": "Анонимные записи ({{$a}})",
-    "average": "Средний",
+    "average": "Средняя оценка",
     "complete_the_form": "Ответьте на вопросы ...",
     "completed_feedbacks": "Отправлено ответов",
     "continue_the_form": "Продолжить форму",
@@ -10,7 +10,7 @@
     "feedbackclose": "Разрешить отвечать до",
     "feedbackopen": "Разрешить отвечать с",
     "mapcourses": "Сопоставление Обратной связи с курсами",
-    "mode": "Режим",
+    "mode": "Мода",
     "next_page": "Следующая страница",
     "non_anonymous": "Имя пользователя будет записано и показано с его ответами",
     "non_anonymous_entries": "Не анонимные записи ({{$a}})",
@@ -18,16 +18,16 @@
     "not_selected": "Не выбрано",
     "not_started": "не началось",
     "numberoutofrange": "Значение вне диапазона",
-    "overview": "Просмотр",
+    "overview": "Обзор",
     "page_after_submit": "Сообщение о завершении",
-    "preview": "Предварительный просмотр",
+    "preview": "Просмотр",
     "previous_page": "Предыдущая страница",
-    "questions": "Вопросов",
+    "questions": "Вопросы",
     "response_nr": "Номер ответа",
-    "responses": "Ответы",
+    "responses": "Свои ответы",
     "save_entries": "Отправить свои ответы",
     "show_entries": "Показать ответивших",
     "show_nonrespondents": "Показать не ответивших",
-    "started": "начало",
+    "started": "Начало",
     "this_feedback_is_already_submitted": "Вы уже завершили этот учебный элемент"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/sv.json b/www/addons/mod/feedback/lang/sv.json
index c749faa8094..215da47b51f 100644
--- a/www/addons/mod/feedback/lang/sv.json
+++ b/www/addons/mod/feedback/lang/sv.json
@@ -2,7 +2,7 @@
     "analysis": "Analys",
     "anonymous": "Anonym",
     "anonymous_entries": "Anonyma inlägg",
-    "average": "Medel",
+    "average": "Medelvärde",
     "complete_the_form": "Fyll i hela formuläret",
     "completed_feedbacks": "Fullgjorda Egna enkäter",
     "continue_the_form": "Fortsätt formuläret",
@@ -17,16 +17,16 @@
     "non_respondents_students": "Studenter/elever/deltagare/lärande som inte har lämnat några svar",
     "not_selected": "Inte vald",
     "not_started": "inte påbörjad",
-    "overview": "Översikt",
+    "overview": "Överblick",
     "page_after_submit": "Sida efter inskickning",
     "preview": "Förhandsgranska",
     "previous_page": "Föregående sida",
     "questions": "Frågor",
     "response_nr": "Antal svar",
-    "responses": "Svar",
+    "responses": "Responser",
     "save_entries": "Spara inlägg",
     "show_entries": "Visa inlägg",
     "show_nonrespondents": "Visa dem som inte har lämnat några svar",
-    "started": "startad",
+    "started": "Startad",
     "this_feedback_is_already_submitted": "Du har redan fullföljt den här Egen enkät"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/tr.json b/www/addons/mod/feedback/lang/tr.json
index b1c57c37b04..e273019c18e 100644
--- a/www/addons/mod/feedback/lang/tr.json
+++ b/www/addons/mod/feedback/lang/tr.json
@@ -18,13 +18,13 @@
     "not_selected": "Seçilmedi",
     "not_started": "Başlatılmadı",
     "numberoutofrange": "Aralık dışı numara",
-    "overview": "Gözat",
+    "overview": "Gözden geçir",
     "page_after_submit": "Geribildirim doldurulduktan sonraki sayfa",
     "preview": "Önizleme",
     "previous_page": "Önceki sayfa",
     "questions": "Sorular",
     "response_nr": "Yanıt No.",
-    "responses": "Yanıtlar",
+    "responses": "Verilen yanıtlar",
     "save_entries": "Cevaplarınızı gönderin",
     "show_entries": "Yanıtları göster",
     "show_nonrespondents": "Katılımcıları gösterme",
diff --git a/www/addons/mod/feedback/lang/uk.json b/www/addons/mod/feedback/lang/uk.json
new file mode 100644
index 00000000000..a95b1bab394
--- /dev/null
+++ b/www/addons/mod/feedback/lang/uk.json
@@ -0,0 +1,35 @@
+{
+    "analysis": "Аналіз",
+    "anonymous": "Анонімно",
+    "anonymous_entries": "Анонімні записи",
+    "average": "Середня оцінка",
+    "captchaofflinewarning": "Зворотній зв'язок із captcha не може бути завершений, якщо не налаштований, в автономному режимі або сервер не працює.",
+    "complete_the_form": "Відповідь на питання..",
+    "completed_feedbacks": "Надані відповіді",
+    "continue_the_form": "Продовжити форму",
+    "feedback_is_not_open": "Зворотний зв'язок не відкрито",
+    "feedback_submitted_offline": "Цей зворотний зв'язок був збережений, та буде представлений пізніше.",
+    "feedbackclose": "Закрити зворотний зв’язок до",
+    "feedbackopen": "Відкрити  зворотний зв’язок до",
+    "mapcourses": "Прив’язка зворотного зв’язку до курсів",
+    "mode": "Мода",
+    "next_page": "Наступна сторінка",
+    "non_anonymous": "Ім'я користувача буде записане та показане з відповідями",
+    "non_anonymous_entries": "немає анонімних відповідей",
+    "non_respondents_students": "немає опитаних студентів",
+    "not_selected": "Не вибрано",
+    "not_started": "не почато",
+    "numberoutofrange": "Значення поза діапазоном",
+    "overview": "Переглянути",
+    "page_after_submit": "Сторінка після відсилання відповіді",
+    "preview": "Перегляд",
+    "previous_page": "Попередня сторінка",
+    "questions": "Питання",
+    "response_nr": "Номер відповіді",
+    "responses": "Відповіді",
+    "save_entries": "Відправити ваші відповіді",
+    "show_entries": "Показати відповіді",
+    "show_nonrespondents": "Показати користувачів без відповіді",
+    "started": "Розпочато",
+    "this_feedback_is_already_submitted": "Ви вже пройшли цю діяльність"
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/zh-cn.json b/www/addons/mod/feedback/lang/zh-cn.json
index 5d53cc04b5d..ab5b9c36dd0 100644
--- a/www/addons/mod/feedback/lang/zh-cn.json
+++ b/www/addons/mod/feedback/lang/zh-cn.json
@@ -2,7 +2,7 @@
     "analysis": "分析",
     "anonymous": "匿名",
     "anonymous_entries": "匿名条目",
-    "average": "平均",
+    "average": "平均值",
     "complete_the_form": "回答问题...",
     "completed_feedbacks": "已提交的答复",
     "continue_the_form": "继续填表",
@@ -17,16 +17,16 @@
     "non_respondents_students": "未答复的学生",
     "not_selected": "未选择",
     "not_started": "还未答题",
-    "overview": "概述",
+    "overview": "概览",
     "page_after_submit": "提交后页面",
     "preview": "预览",
     "previous_page": "前一页",
-    "questions": "问题",
+    "questions": "题目",
     "response_nr": "答复编号",
-    "responses": "答复",
+    "responses": "作答",
     "save_entries": "提交您的答复",
     "show_entries": "显示答复",
     "show_nonrespondents": "显示未答复者",
-    "started": "已经开始",
+    "started": "开始",
     "this_feedback_is_already_submitted": "您已经完成此活动。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/zh-tw.json b/www/addons/mod/feedback/lang/zh-tw.json
index 97aace4bc77..90f21437489 100644
--- a/www/addons/mod/feedback/lang/zh-tw.json
+++ b/www/addons/mod/feedback/lang/zh-tw.json
@@ -2,7 +2,7 @@
     "analysis": "分析",
     "anonymous": "匿名",
     "anonymous_entries": "匿名輸入({{$a}})",
-    "average": "平均數",
+    "average": "平均",
     "complete_the_form": "開始填寫回答...",
     "completed_feedbacks": "已回答",
     "continue_the_form": "繼續填表",
@@ -10,7 +10,7 @@
     "feedbackclose": "結束填答時間",
     "feedbackopen": "開始填答時間",
     "mapcourses": "對應回饋單到課程",
-    "mode": "模式",
+    "mode": "眾數",
     "next_page": "下一頁",
     "non_anonymous": "用戶名稱和回應將被記錄",
     "non_anonymous_entries": "具名輸入({{$a}})",
@@ -22,9 +22,9 @@
     "page_after_submit": "完成後的訊息",
     "preview": "預覽",
     "previous_page": "上一頁",
-    "questions": "問題",
+    "questions": "試題",
     "response_nr": "回應編號",
-    "responses": "回應",
+    "responses": "回答",
     "save_entries": "送出並結束",
     "show_entries": "顯示回應",
     "show_nonrespondents": "顯示沒有回應的學生",
diff --git a/www/addons/mod/folder/lang/ca.json b/www/addons/mod/folder/lang/ca.json
index b2f87d440ac..2208f493a4b 100644
--- a/www/addons/mod/folder/lang/ca.json
+++ b/www/addons/mod/folder/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hi ha fitxers per mostrar.",
+    "emptyfilelist": "No hi ha fitxers per mostrar",
     "errorwhilegettingfolder": "S'ha produït un error en recuperar les dades de la carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/cs.json b/www/addons/mod/folder/lang/cs.json
index 66b256adf4c..04e2822f6a0 100644
--- a/www/addons/mod/folder/lang/cs.json
+++ b/www/addons/mod/folder/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Žádný soubor k zobrazení.",
+    "emptyfilelist": "Žádný soubor k zobrazení",
     "errorwhilegettingfolder": "Chyba při načítání dat složky."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/de.json b/www/addons/mod/folder/lang/de.json
index 022d05baeea..00b4ea2a954 100644
--- a/www/addons/mod/folder/lang/de.json
+++ b/www/addons/mod/folder/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Keine Dateien",
+    "emptyfilelist": "Es liegen keine Dateien vor",
     "errorwhilegettingfolder": "Fehler beim Laden der Verzeichnisdaten"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/es-mx.json b/www/addons/mod/folder/lang/es-mx.json
index 5b9563d5c0d..e2f470725df 100644
--- a/www/addons/mod/folder/lang/es-mx.json
+++ b/www/addons/mod/folder/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hay archivos para mostrar.",
+    "emptyfilelist": "No hay archivos que mostrar",
     "errorwhilegettingfolder": "Error al obtener datos de carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/fr.json b/www/addons/mod/folder/lang/fr.json
index 86d36f87890..e16e5c1aeb4 100644
--- a/www/addons/mod/folder/lang/fr.json
+++ b/www/addons/mod/folder/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Aucun fichier à afficher.",
+    "emptyfilelist": "Il n'y a pas de fichier à afficher",
     "errorwhilegettingfolder": "Erreur lors de l'obtention des données du dossier."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/it.json b/www/addons/mod/folder/lang/it.json
index 93e13593395..b828249f904 100644
--- a/www/addons/mod/folder/lang/it.json
+++ b/www/addons/mod/folder/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Non ci sono file da visualizzare.",
+    "emptyfilelist": "Non ci sono file da visualizzare",
     "errorwhilegettingfolder": "Si è verificato un errore durante la ricezione dei dati della cartella."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/nl.json b/www/addons/mod/folder/lang/nl.json
index 92b48519e9d..7b544820480 100644
--- a/www/addons/mod/folder/lang/nl.json
+++ b/www/addons/mod/folder/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Geen bestanden.",
+    "emptyfilelist": "Er zijn geen bestanden om te tonen",
     "errorwhilegettingfolder": "Fout bij het ophalen van de mapgegevens"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/pt-br.json b/www/addons/mod/folder/lang/pt-br.json
index 1588790327d..4e9c9589aa3 100644
--- a/www/addons/mod/folder/lang/pt-br.json
+++ b/www/addons/mod/folder/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Não há arquivos para mostrar",
+    "emptyfilelist": "Não há arquivos para exibir",
     "errorwhilegettingfolder": "Erro ao obter dados da pasta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/uk.json b/www/addons/mod/folder/lang/uk.json
new file mode 100644
index 00000000000..1357444e2a4
--- /dev/null
+++ b/www/addons/mod/folder/lang/uk.json
@@ -0,0 +1,4 @@
+{
+    "emptyfilelist": "Немає файлів для показу",
+    "errorwhilegettingfolder": "Помилка отримання інформації про папку"
+}
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/ar.json b/www/addons/mod/forum/lang/ar.json
index ff95e890cbb..e7a256d4938 100644
--- a/www/addons/mod/forum/lang/ar.json
+++ b/www/addons/mod/forum/lang/ar.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "ليس لديك الصلاحيات لإضافة نقاش لكل المشتركين.",
     "couldnotadd": "تعذر إرسال مقالة نتيجة خطأ غير معروف",
     "discussion": "نقاش",
-    "edit": "حرر",
+    "edit": "تحرير",
     "group": "مجموعة",
     "message": "رسالة",
     "modeflatnewestfirst": "عرض الردود حسب الأحدث",
diff --git a/www/addons/mod/forum/lang/bg.json b/www/addons/mod/forum/lang/bg.json
index 14f634ffe01..0802018adb9 100644
--- a/www/addons/mod/forum/lang/bg.json
+++ b/www/addons/mod/forum/lang/bg.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Нямате разрешение да добавяте нова тема за всички участници.",
     "cannotcreatediscussion": "Не може да се създаде нова дискусия",
     "couldnotadd": "Вашето мнение не можа да се добави поради неизвестна грешка.",
-    "discussion": "Обсъждане",
+    "discussion": "Дискусия",
     "discussionpinned": "Забодена",
     "discussionsubscription": "Абониране за обсъждането",
     "edit": "Редактиране",
@@ -12,7 +12,7 @@
     "erroremptysubject": "Темата на мнението не може да бъде празна.",
     "forumnodiscussionsyet": "Няма теми за обсъждане в този форум",
     "group": "Група",
-    "message": "Вашето мнение",
+    "message": "Съобщение",
     "modeflatnewestfirst": "Плоско показване на отговорите. Най-новият е първи.",
     "modeflatoldestfirst": "Плоско показване на отговорите. Най-старият е първи.",
     "modenested": "Показване на отговорите във вложена форма.",
diff --git a/www/addons/mod/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index 38dca8ad7f1..425a6a7aca7 100644
--- a/www/addons/mod/forum/lang/da.json
+++ b/www/addons/mod/forum/lang/da.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Du har ikke tilladelse til at oprette en ny tråd for alle deltagere.",
     "cannotcreatediscussion": "Kunne ikke oprette en ny tråd.",
     "couldnotadd": "Kunne ikke tilføje dit indlæg pga. en ukendt fejl",
-    "discussion": "Tråd",
+    "discussion": "Diskussion",
     "discussionpinned": "Fastgjort",
     "discussionsubscription": "Abonnement på tråd",
     "edit": "Rediger",
@@ -14,7 +14,7 @@
     "errorgetgroups": "Fejl ved hentning af gruppeindstillinger.",
     "forumnodiscussionsyet": "Der er endnu ingen indlæg i dette forum.",
     "group": "Gruppe",
-    "message": "Meddelelse",
+    "message": "Besked",
     "modeflatnewestfirst": "Kronologisk visning med seneste indlæg først",
     "modeflatoldestfirst": "Kronologisk visning med første indlæg først",
     "modenested": "Trådet visning, udfoldet",
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index bee3c7cb0d4..d86833af2aa 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Sie dürfen kein neues Thema für alle Teilnehmer/innen hinzufügen.",
     "cannotcreatediscussion": "Das neue Thema wurde leider nicht gespeichert.",
     "couldnotadd": "Der Beitrag wurde wegen eines Fehlers nicht hinzugefügt.",
-    "discussion": "Thema",
+    "discussion": "Diskussion",
     "discussionlocked": "Dieses Thema wurde gesperrt, so dass Sie hier nicht weiter antworten können.",
     "discussionpinned": "Angepinnt",
     "discussionsubscription": "Themenabonnement",
diff --git a/www/addons/mod/forum/lang/es.json b/www/addons/mod/forum/lang/es.json
index 2389777bf37..409b10efc54 100644
--- a/www/addons/mod/forum/lang/es.json
+++ b/www/addons/mod/forum/lang/es.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "No tiene permiso para añadir un nuevo tema de discusión para todos los participantes.",
     "cannotcreatediscussion": "No se pudo crear un debate nuevo",
     "couldnotadd": "No se puede colocar su mensaje debido a un problema desconocido.",
-    "discussion": "Tema",
+    "discussion": "Discusión",
     "discussionlocked": "Este tema ha sido bloqueado así que no podrás responder en el.",
     "discussionpinned": "Fijado",
     "discussionsubscription": "Suscripción a la discusión",
diff --git a/www/addons/mod/forum/lang/fa.json b/www/addons/mod/forum/lang/fa.json
index c2909c73988..7fe418db42b 100644
--- a/www/addons/mod/forum/lang/fa.json
+++ b/www/addons/mod/forum/lang/fa.json
@@ -13,7 +13,7 @@
     "erroremptysubject": "موضوع مطلب نمی‌تواند خالی باشد.",
     "forumnodiscussionsyet": "هنوز هیچ مباحثه ای در این تالار شروع نشده است.",
     "group": "گروه",
-    "message": "متن",
+    "message": "پیام",
     "modeflatnewestfirst": "نمایش مطالب به صورت مسطح (از جدید به قدیمی)",
     "modeflatoldestfirst": "نمایش مطالب به صورت مسطح (از قدیمی به جدید)",
     "modenested": "نمایش مطالب به صورت تو در تو",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 566c52681f0..f30d204ed66 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -15,7 +15,7 @@
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
     "group": "Groupe",
-    "message": "Message",
+    "message": "Message personnel",
     "modeflatnewestfirst": "Réponses en ligne, la plus récente en premier",
     "modeflatoldestfirst": "Réponses en ligne, la plus ancienne en premier",
     "modenested": "Réponses emboîtées",
diff --git a/www/addons/mod/forum/lang/he.json b/www/addons/mod/forum/lang/he.json
index 665cc87e1b4..f44515e44c7 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -14,7 +14,7 @@
     "errorgetgroups": "שגיאה בטעינת הגדרות קבוצה.",
     "forumnodiscussionsyet": "עדיין לא קיימים נושאי דיונים בפורום זה.",
     "group": "קבוצה",
-    "message": "הודעה",
+    "message": "מסר",
     "modeflatnewestfirst": "הצגת תגובות בצורה שטוחה, החדשות ביותר ראשונות",
     "modeflatoldestfirst": "הצגת תגובות בצורה שטוחה, הישנות ביותר ראשונות",
     "modenested": "הצגת תגובות באופן מקונן",
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 93f37fba562..5907bdba32b 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Neturite teisės įtraukti naujos diskusijų temos, skirtos visiems dalyviams.",
     "cannotcreatediscussion": "Nepavyko sukurti naujos diskusijos",
     "couldnotadd": "Jūsų skelbimo nepavyko įtraukti dėl nežinomos klaidos",
-    "discussion": "Pavadinimas",
+    "discussion": "Diskusija2",
     "discussionlocked": "Ši diskusija buvo užrakinta, todėl jūs negalite pateikti atsakymus joje.",
     "discussionpinned": "Prisegta",
     "discussionsubscription": "Diskusijos prenumerata",
@@ -15,7 +15,7 @@
     "errorgetgroups": "Klaida gaunant grupės nustatymus.",
     "forumnodiscussionsyet": "Pokalbio temų forume dar nėra.",
     "group": "Grupė",
-    "message": "Žinutės tekstas",
+    "message": "Žinutė",
     "modeflatnewestfirst": "Rodyti atsakymus standartiškai, pirmiausia rodant naujausią",
     "modeflatoldestfirst": "Rodyti atsakymus standartiškai, pirmiausia rodant seniausią",
     "modenested": "Rodyti atsakymus įdėtuoju formatu",
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 8f7fe7dad45..611234840a2 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -8,7 +8,7 @@
     "discussionlocked": "Deze discussie is geblokkeerd, zodat u niet meer kan beantwoorden.",
     "discussionpinned": "Vastgepind",
     "discussionsubscription": "Inschrijving discussie",
-    "edit": "Wijzig",
+    "edit": "Bewerk",
     "erroremptymessage": "Bericht kan niet leeg zijn",
     "erroremptysubject": "Onderwerp kan niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
diff --git a/www/addons/mod/forum/lang/pl.json b/www/addons/mod/forum/lang/pl.json
index 67a495dd1a6..253a38a5591 100644
--- a/www/addons/mod/forum/lang/pl.json
+++ b/www/addons/mod/forum/lang/pl.json
@@ -4,11 +4,11 @@
     "cannotadddiscussionall": "Nie masz uprawnień, aby dodać nową dyskusję dla wszystkich uczestników.",
     "cannotcreatediscussion": "Nie można utworzyć nowego wątku",
     "couldnotadd": "Nie można dodać twojego wpisu z powodu nieznanego błędu",
-    "discussion": "Temat",
+    "discussion": "Dyskusja",
     "discussionlocked": "Dyskusja została zablokowana, więc nie możesz już odpowiedzieć.",
     "discussionpinned": "Przypięta",
     "discussionsubscription": "Subskrypcja dyskusja",
-    "edit": "Edycja",
+    "edit": "Edytuj",
     "erroremptymessage": "Wiadomość nie może być pusta",
     "erroremptysubject": "Tytuł wpisu nie może być pusty.",
     "forumnodiscussionsyet": "Brak tematów dyskusji na tym forum",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index aebbce61f21..13e363575e6 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Você não tem permissão para abrir um novo tópico de discussão para todos os participantes.",
     "cannotcreatediscussion": "Não foi possível criar uma nova discussão",
     "couldnotadd": "Não foi possível publicar a sua mensagem. Infelizmente a causa do erro não foi identificada.",
-    "discussion": "Tópico",
+    "discussion": "Discussão",
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
diff --git a/www/addons/mod/forum/lang/pt.json b/www/addons/mod/forum/lang/pt.json
index 8700ce438bd..7051f5dc931 100644
--- a/www/addons/mod/forum/lang/pt.json
+++ b/www/addons/mod/forum/lang/pt.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Não tem permissão para criar um novo tópico disponível para todos os participantes",
     "cannotcreatediscussion": "Não foi possível criar o novo tópico de discussão",
     "couldnotadd": "Não foi possível inserir a mensagem que submeteu devido a um erro desconhecido",
-    "discussion": "Tópico",
+    "discussion": "Discussão",
     "discussionlocked": "Este tópico de discussão foi bloqueado, logo já não pode responder ao mesmo",
     "discussionpinned": "Destacado",
     "discussionsubscription": "Subscrição da discussão",
diff --git a/www/addons/mod/forum/lang/ro.json b/www/addons/mod/forum/lang/ro.json
index 2dd31a2be41..543ac42e397 100644
--- a/www/addons/mod/forum/lang/ro.json
+++ b/www/addons/mod/forum/lang/ro.json
@@ -4,8 +4,8 @@
     "cannotadddiscussionall": "Nu aveţi permisiunea de a adăuga o temă de discuţii pentru toţi participanţii.",
     "cannotcreatediscussion": "Nu se poate crea discuție nouă",
     "couldnotadd": "Intervenţia ta nu a fost publicată datorită unei erori necunoscute",
-    "discussion": "Discuție",
-    "edit": "Modifică",
+    "discussion": "Discuţie",
+    "edit": "Editare",
     "erroremptymessage": "Mesajul nu poate fi necompletat",
     "erroremptysubject": "Subiectul nu poate fi necompletat",
     "errorgetforum": "A apărut o eroare la obținerea datelor despre forum.",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index 46a510d03d2..07d7ef487d9 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "У вас нет привилегий для добавления новой темы обсуждения для всех участников.",
     "cannotcreatediscussion": "Невозможно создать новое обсуждение",
     "couldnotadd": "Сообщение не добавлено из-за неизвестной ошибки",
-    "discussion": "Обсуждение",
+    "discussion": "Дискуссия",
     "discussionlocked": "Обсуждение было заблокировано, поэтому на него нельзя больше отвечать.",
     "discussionpinned": "Закреплено",
     "discussionsubscription": "Подписаться на эту тему.",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 5d9eb54b6ad..8cfb154fe52 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Du har inte tillstånd att lägga till ett nytt diskussionsämne för alla deltagare. ",
     "cannotcreatediscussion": "Det gick inte att skapa en ny diskussion",
     "couldnotadd": "Det gick inte att lägga till Ditt inlägg på grund av okänt fel.",
-    "discussion": "Diskussionsämne",
+    "discussion": "Diskussion",
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
diff --git a/www/addons/mod/forum/lang/tr.json b/www/addons/mod/forum/lang/tr.json
index 6106581a1a4..8e47e5207e9 100644
--- a/www/addons/mod/forum/lang/tr.json
+++ b/www/addons/mod/forum/lang/tr.json
@@ -8,7 +8,7 @@
     "discussionlocked": "Bu tartışma kilitli olduğundan artık yanıtlayamıyorsunuz.",
     "discussionpinned": "Sabitlenmiş",
     "discussionsubscription": "Tartışma aboneliği",
-    "edit": "Düzelt",
+    "edit": "Düzenle",
     "erroremptymessage": "Yazı mesajı boş olamaz",
     "erroremptysubject": "Gönderi konusu boş olamaz.",
     "forumnodiscussionsyet": "Bu forum da henuz hiç tartışma başlığı yok",
diff --git a/www/addons/mod/forum/lang/uk.json b/www/addons/mod/forum/lang/uk.json
new file mode 100644
index 00000000000..bf8cfd7742c
--- /dev/null
+++ b/www/addons/mod/forum/lang/uk.json
@@ -0,0 +1,30 @@
+{
+    "addanewdiscussion": "Додати тему для обговорення",
+    "cannotadddiscussion": "Додання тем обговорення на цей форум вимагає членства у групі.",
+    "cannotadddiscussionall": "Ви не маєте права створювати нові теми дискусії для всіх учасників",
+    "cannotcreatediscussion": "Не вдається створити нову дискусію",
+    "couldnotadd": "Повідомлення не додане через невідому помилку",
+    "discussion": "Обговорення",
+    "discussionpinned": "Прикріплено",
+    "discussionsubscription": "Підписатися на дискусію",
+    "edit": "Редагувати",
+    "erroremptymessage": "Повідомлення не може бути порожнім",
+    "erroremptysubject": "Тема повідомлення не може бути порожньою",
+    "errorgetforum": "Помилка отримання даних форуму",
+    "errorgetgroups": "Помилка отримання групових налаштувань.",
+    "forumnodiscussionsyet": "Відсутні обговорення в даному форумі.",
+    "group": "Група",
+    "message": "Повідомлення",
+    "modeflatnewestfirst": "Показувати відповіді простим списком, найновіші спочатку",
+    "modeflatoldestfirst": "Показувати відповіді простим списком, найстаріші спочатку",
+    "modenested": "Показувати відповіді у формі вкладених повідомлень",
+    "numdiscussions": "{{numdiscussions}} дискусій",
+    "numreplies": "{{numreplies}} відповідей",
+    "posttoforum": "Надіслати до форуму",
+    "refreshdiscussions": "Оновити обговорення",
+    "refreshposts": "Оновити пости з обговоренням",
+    "reply": "Відповісти",
+    "subject": "Тема",
+    "unread": "Непрочитані",
+    "unreadpostsnumber": "{{$a}} непрочитаних повідомлень"
+}
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/zh-cn.json b/www/addons/mod/forum/lang/zh-cn.json
index 922482dd98c..9df1bc53422 100644
--- a/www/addons/mod/forum/lang/zh-cn.json
+++ b/www/addons/mod/forum/lang/zh-cn.json
@@ -4,14 +4,14 @@
     "cannotadddiscussionall": "您没有向所有人添加新话题的权限",
     "cannotcreatediscussion": "不能建立新话题",
     "couldnotadd": "由于一个未知的错误，您的帖子无法发表",
-    "discussion": "话题",
+    "discussion": "讨论",
     "discussionsubscription": "话题订阅",
     "edit": "编辑",
     "erroremptymessage": "帖子正文不能为空",
     "erroremptysubject": "帖子标题不能为空。",
     "forumnodiscussionsyet": "此论坛中还没有讨论话题",
     "group": "小组",
-    "message": "正文",
+    "message": "消息",
     "modeflatnewestfirst": "列表显示回帖内容，新帖在前",
     "modeflatoldestfirst": "列表显示回帖内容，旧帖在前",
     "modenested": "嵌套显示回帖内容",
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index 81db9790069..cec13a8393e 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "您沒有權限新增討論主題給所有參與者。",
     "cannotcreatediscussion": "不能建立新的議題",
     "couldnotadd": "由於不明錯誤， 無法新增您的貼文",
-    "discussion": "議題",
+    "discussion": "互動",
     "discussionlocked": "這一議題已經被封鎖，所以你無法回應它",
     "discussionpinned": "已經釘選",
     "discussionsubscription": "議題訂閱",
@@ -15,7 +15,7 @@
     "errorgetgroups": "讀取群組設定發生錯誤",
     "forumnodiscussionsyet": "這個討論區還沒有討論主題",
     "group": "分組",
-    "message": "訊息",
+    "message": "簡訊",
     "modeflatnewestfirst": "以平舖方式呈現回應的貼文，最晚貼出的在前",
     "modeflatoldestfirst": "以平舖方式呈現回應的貼文，最早貼出的在前",
     "modenested": "以縮排方式呈現回應的貼文",
diff --git a/www/addons/mod/glossary/lang/ca.json b/www/addons/mod/glossary/lang/ca.json
index 5cbf4a2bb6a..a0af30fc35e 100644
--- a/www/addons/mod/glossary/lang/ca.json
+++ b/www/addons/mod/glossary/lang/ca.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Fitxer adjunt",
-    "browsemode": "Navegueu per les entrades",
+    "browsemode": "Mode exploració",
     "byalphabet": "Alfabèticament",
     "byauthor": "Agrupat per autor",
     "bycategory": "Agrupa per categoria",
diff --git a/www/addons/mod/glossary/lang/cs.json b/www/addons/mod/glossary/lang/cs.json
index 9d81e677a27..db30da2ce2e 100644
--- a/www/addons/mod/glossary/lang/cs.json
+++ b/www/addons/mod/glossary/lang/cs.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Příloha",
-    "browsemode": "Prohlížení příspěvků",
+    "browsemode": "Režim náhledu",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
     "bycategory": "Skupina podle kategorie",
diff --git a/www/addons/mod/glossary/lang/de.json b/www/addons/mod/glossary/lang/de.json
index 03bb7f1a602..c5afa42c3fc 100644
--- a/www/addons/mod/glossary/lang/de.json
+++ b/www/addons/mod/glossary/lang/de.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anhang",
-    "browsemode": "Einträge durchblättern",
+    "browsemode": "Vorschaumodus",
     "byalphabet": "Alphabetisch",
     "byauthor": "Nach Autor/in",
     "bycategory": "Nach Kategorie",
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index 0f544630722..226aa549be7 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Επισυναπτόμενο",
-    "browsemode": "Περιήγηση στις καταχωρήσεις",
+    "browsemode": "Φάση Προεπισκόπισης",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bynewestfirst": "Νεότερα πρώτα",
diff --git a/www/addons/mod/glossary/lang/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index 3c23deb2d2a..46307467a49 100644
--- a/www/addons/mod/glossary/lang/es-mx.json
+++ b/www/addons/mod/glossary/lang/es-mx.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Archivo adjunto",
-    "browsemode": "Ver entradas",
+    "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoría",
diff --git a/www/addons/mod/glossary/lang/fr.json b/www/addons/mod/glossary/lang/fr.json
index f72096c8b1b..976057ed4e7 100644
--- a/www/addons/mod/glossary/lang/fr.json
+++ b/www/addons/mod/glossary/lang/fr.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Annexe",
-    "browsemode": "Parcourir les articles",
+    "browsemode": "Mode prévisualisation",
     "byalphabet": "Alphabétiquement",
     "byauthor": "Grouper par auteur",
     "bycategory": "Grouper par catégorie",
diff --git a/www/addons/mod/glossary/lang/nl.json b/www/addons/mod/glossary/lang/nl.json
index 5a53d5a1d7a..a7e834e6b2a 100644
--- a/www/addons/mod/glossary/lang/nl.json
+++ b/www/addons/mod/glossary/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bijlage",
-    "browsemode": "Blader door items",
+    "browsemode": "Probeermodus",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
     "bycategory": "Groepeer per categorie",
diff --git a/www/addons/mod/glossary/lang/pt-br.json b/www/addons/mod/glossary/lang/pt-br.json
index 57059a9b327..37cf8ed2dab 100644
--- a/www/addons/mod/glossary/lang/pt-br.json
+++ b/www/addons/mod/glossary/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexo",
-    "browsemode": "Navegar nas entradas",
+    "browsemode": "Prévia",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
diff --git a/www/addons/mod/glossary/lang/sv.json b/www/addons/mod/glossary/lang/sv.json
index 7fb8c3d2643..3cfa169d56c 100644
--- a/www/addons/mod/glossary/lang/sv.json
+++ b/www/addons/mod/glossary/lang/sv.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bilaga",
-    "browsemode": "Bläddrar bland poster",
+    "browsemode": "Läge för förhandsgranskning",
     "byalphabet": "Alfabetiskt",
     "byauthor": "Sortera efter författare",
     "bynewestfirst": "Nyaste först",
diff --git a/www/addons/mod/glossary/lang/uk.json b/www/addons/mod/glossary/lang/uk.json
new file mode 100644
index 00000000000..14b9d95ea51
--- /dev/null
+++ b/www/addons/mod/glossary/lang/uk.json
@@ -0,0 +1,20 @@
+{
+    "attachment": "Вкладення",
+    "browsemode": "Режим перегляду",
+    "byalphabet": "По алфавіту",
+    "byauthor": "Групувати за автором",
+    "bycategory": "Групувати за категорією",
+    "bynewestfirst": "Новіші перші",
+    "byrecentlyupdated": "Недавно оновлені",
+    "bysearch": "Пошук",
+    "cannoteditentry": "Неможливо задагувати запис",
+    "casesensitive": "Чутливість відповіді до регістра",
+    "categories": "Категорії",
+    "entriestobesynced": "Записи будуть синхронізовані",
+    "entrypendingapproval": "Цей запис очікує схвалення.",
+    "errorloadingentries": "Сталася помилка під час завантаження записів.",
+    "errorloadingentry": "Сталася помилка під час завантаження запису.",
+    "errorloadingglossary": "Сталася помилка під час завантаження глосарію.",
+    "noentriesfound": "Немає записів",
+    "searchquery": "Пошуковий запит"
+}
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/uk.json b/www/addons/mod/imscp/lang/uk.json
new file mode 100644
index 00000000000..871816777a9
--- /dev/null
+++ b/www/addons/mod/imscp/lang/uk.json
@@ -0,0 +1,3 @@
+{
+    "showmoduledescription": "Показати опис"
+}
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/uk.json b/www/addons/mod/label/lang/uk.json
new file mode 100644
index 00000000000..dc1348438f8
--- /dev/null
+++ b/www/addons/mod/label/lang/uk.json
@@ -0,0 +1,3 @@
+{
+    "label": "Напис"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/ar.json b/www/addons/mod/lesson/lang/ar.json
index a469b377ab6..78b0eb31ff1 100644
--- a/www/addons/mod/lesson/lang/ar.json
+++ b/www/addons/mod/lesson/lang/ar.json
@@ -1,5 +1,5 @@
 {
-    "answer": "أجب",
+    "answer": "إجابة",
     "averagescore": "متوسط الدرجة",
     "averagetime": "متوسط الوقت",
     "branchtable": "محتوى",
@@ -29,7 +29,7 @@
     "numberofpagesviewed": "عدد الصفحات التي تم مشاهدتها: {{$a}}",
     "or": "أو",
     "overview": "عرض عام",
-    "preview": "معاينه",
+    "preview": "معاينة",
     "question": "سؤال",
     "reports": "تقارير",
     "response": "إجابة",
@@ -40,7 +40,7 @@
     "thatsthecorrectanswer": "هذه إجابة صحيحة",
     "thatsthewronganswer": "هذه إجابة خاطئة",
     "timeremaining": "الزمن المتبقى",
-    "timetaken": "الزمن المستنفذ",
+    "timetaken": "الوقت المستغرق",
     "welldone": "أحسنت!",
     "youranswer": "إجابتك",
     "youshouldview": "يجب أن تجب على الأقل: {{$a}}"
diff --git a/www/addons/mod/lesson/lang/bg.json b/www/addons/mod/lesson/lang/bg.json
index a1b9df04b2a..957fca81b30 100644
--- a/www/addons/mod/lesson/lang/bg.json
+++ b/www/addons/mod/lesson/lang/bg.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "Грешка: не може да бъде намерен опит",
     "cannotfinduser": "Грешка: не може да се намерят потребители",
     "clusterjump": "Непоказван въпрос в група",
-    "completed": "Завършена",
+    "completed": "Приключен",
     "congratulations": "Поздравления - достигнахте до края на урока",
     "continue": "Продължаване",
     "continuetonextpage": "Продължи към следващата страница",
@@ -49,13 +49,13 @@
     "progresscompleted": "Вие сте изпълнили {{$a}}% от урока",
     "question": "Въпрос",
     "reports": "Отчети",
-    "response": "Забележка",
+    "response": "Отговор",
     "review": "Преглед",
     "reviewlesson": "Review Lesson",
     "reviewquestionback": "Да, искам да опитам отново",
     "reviewquestioncontinue": "Не, искам само да мина на следващия въпрос",
     "secondpluswrong": "Не е точно така.  Искате ли да опитате отново?",
-    "submit": "Продължаване",
+    "submit": "Изпращане",
     "teacherjumpwarning": "В този урок е използван преход \"{{$a.cluster}}\" или преход \"{{$a.unseen}}\".  Вместо това ще бъде използван преход \"Следваща страница\". Влезте като студент за да изпробвате тези преходи.",
     "teacherongoingwarning": "Получените точки се показват само на студент. Влезте като студент за да проверите как се начисляват точки.",
     "teachertimerwarning": "Timer only works for students.  Test the timer by loggin in as a student.",
diff --git a/www/addons/mod/lesson/lang/ca.json b/www/addons/mod/lesson/lang/ca.json
index ad28463c750..e72865a476d 100644
--- a/www/addons/mod/lesson/lang/ca.json
+++ b/www/addons/mod/lesson/lang/ca.json
@@ -26,7 +26,7 @@
     "finishretakeoffline": "Aquest intent s'ha finalitzat fora de línia.",
     "firstwrong": "La vostra resposta no és correcta. Voleu reintentar-ho? (Si ara responeu correctament, no s'incrementarà la puntuació final).",
     "gotoendoflesson": "Vés al final de la lliçó",
-    "grade": "Qualifica",
+    "grade": "Qualificació",
     "highscore": "Puntuació més alta",
     "hightime": "Temps màxim",
     "leftduringtimed": "Heu abandonat una lliçó cronometrada.<br />Feu clic a Continua per tornar-la a començar.",
@@ -56,11 +56,11 @@
     "question": "Pregunta",
     "rawgrade": "Qualificació bruta",
     "reports": "Informes",
-    "response": "Reacció",
+    "response": "Resposta",
     "retakefinishedinsync": "S'ha sincronitzat un intent fora de línia. Voleu revisar-lo?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Revisa",
+    "review": "Revisió",
     "reviewlesson": "Revisa la lliçó",
     "reviewquestionback": "Sí, vull tornar-ho a provar",
     "reviewquestioncontinue": "No, vull anar a la pregunta següent",
@@ -72,7 +72,7 @@
     "thatsthecorrectanswer": "Aquesta és la resposta correcta",
     "thatsthewronganswer": "Aquesta resposta és errònia",
     "timeremaining": "Temps restant",
-    "timetaken": "Temps dedicat",
+    "timetaken": "Temps emprat",
     "unseenpageinbranch": "Pregunta no vista en una pàgina de contingut",
     "warningretakefinished": "L'intent s'ha finalitzat al lloc web",
     "welldone": "Molt bé",
diff --git a/www/addons/mod/lesson/lang/cs.json b/www/addons/mod/lesson/lang/cs.json
index c6b5605a360..e2b8bcffef1 100644
--- a/www/addons/mod/lesson/lang/cs.json
+++ b/www/addons/mod/lesson/lang/cs.json
@@ -53,10 +53,10 @@
     "preview": "Náhled",
     "progressbarteacherwarning2": "Ukazatel průchodu se zobrazuje pouze studentům. Chcete-li si jej ověřit, přihlaste se jako student.",
     "progresscompleted": "Dokončili jste {{$a}} % přednášky",
-    "question": "Otázka",
+    "question": "Úloha",
     "rawgrade": "Hrubá známka",
     "reports": "Výsledky",
-    "response": "Reakce",
+    "response": "Odpověď",
     "retakefinishedinsync": "Offline pokus byl synchronizován. Chcete jej zobrazit?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
@@ -72,7 +72,7 @@
     "thatsthecorrectanswer": "Tato odpověď je správná.",
     "thatsthewronganswer": "Tato odpověď není správná.",
     "timeremaining": "Zbývající čas",
-    "timetaken": "Doba průchodu",
+    "timetaken": "Délka pokusu",
     "unseenpageinbranch": "Nezobrazená otázka v rámci stránky",
     "warningretakefinished": "Pokus byl dokončen na webu.",
     "welldone": "Výborně!",
diff --git a/www/addons/mod/lesson/lang/da.json b/www/addons/mod/lesson/lang/da.json
index d00ff2ab04e..e2d93d98db9 100644
--- a/www/addons/mod/lesson/lang/da.json
+++ b/www/addons/mod/lesson/lang/da.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Fejl: kunne ikke finde forsøget",
     "cannotfinduser": "Fejl: kunne ikke finde brugere",
     "clusterjump": "Usete spørgsmål i en klynge",
-    "completed": "Gennemført",
+    "completed": "Færdigt",
     "congratulations": "Tillykke - Denne lektion er slut.",
     "continue": "Fortsæt",
     "continuetonextpage": "Fortsæt til næste side.",
@@ -48,14 +48,14 @@
     "ongoingnormal": "Du har besvaret {{$a.correct}} spørgsmål rigtigt ud af  {{$a.viewed}} viste.",
     "or": "ELLER",
     "overview": "Oversigt",
-    "preview": "Forhåndsvisning",
+    "preview": "Prøvese",
     "progressbarteacherwarning2": "Du kan ikke se progressionslinjen da ud kan redigere lektionen",
     "progresscompleted": "Du har gennemført {{$a}}% af lektionen",
     "question": "Spørgsmål",
     "rawgrade": "Rå point",
     "reports": "Rapporter",
     "response": "Respons",
-    "review": "Prøv igen",
+    "review": "Gennemse",
     "reviewlesson": "Prøv en gang mere",
     "reviewquestionback": "Ja, jeg vil gerne prøve igen",
     "reviewquestioncontinue": "Nej, jeg vil bare videre til næste spørgsmål",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "Rigtigt svar!  :-)",
     "thatsthewronganswer": "Desværre, svaret er forkert.",
     "timeremaining": "Tid tilbage",
-    "timetaken": "Varighed",
+    "timetaken": "Tidsforbrug",
     "unseenpageinbranch": "Usete spørgsmål på en indholdsside",
     "welldone": "Fint!",
     "youhaveseen": "Du har allerede set mere end en side af denne lektion. <br />Ønsker du at starte på den sidste side du så?",
diff --git a/www/addons/mod/lesson/lang/de.json b/www/addons/mod/lesson/lang/de.json
index 60f5cf0ae98..c5e6665135e 100644
--- a/www/addons/mod/lesson/lang/de.json
+++ b/www/addons/mod/lesson/lang/de.json
@@ -26,7 +26,7 @@
     "finishretakeoffline": "Dieser Versuch wurde offline beendet.",
     "firstwrong": "Ihre Antwort ist falsch. Wollen Sie noch einmal (ohne Bewertung) wiederholen?",
     "gotoendoflesson": "Zum Lektionende gehen",
-    "grade": "Relative Bewertung",
+    "grade": "Bewertung",
     "highscore": "Beste Bewertung",
     "hightime": "Beste Zeit",
     "leftduringtimed": "Sie haben die Lektion abgebrochen. Die Bearbeitung der Lektion ist zeitlich begrenzt. <br />Klicken Sie auf Fortsetzen, um die Lektion erneut zu beginnen.",
@@ -55,24 +55,24 @@
     "progresscompleted": "Sie haben {{$a}}% der Lektion erledigt",
     "question": "Frage",
     "rawgrade": "Absolute Bewertung",
-    "reports": "Ergebnisse",
-    "response": "Feedback",
+    "reports": "Berichte",
+    "response": "Eingabe TN",
     "retakefinishedinsync": "Ein Offline-Versuch wurde synchronisiert. Möchten Sie ihn überprüfen?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Rückschau",
+    "review": "Bericht",
     "reviewlesson": "Zur Lektion",
     "reviewquestionback": "Wiederholen",
     "reviewquestioncontinue": "Fortsetzen",
     "secondpluswrong": "Nicht ganz. Wollen Sie noch einmal wiederholen?",
-    "submit": "Einreichen",
+    "submit": "Abgabe",
     "teacherjumpwarning": "In der Lektion werden '{{$a.cluster}}'-Sprünge und/oder '{{$a.unseen}}'-Sprünge verwendet. Diese Sprünge werden durch 'Nächste Seite'-Sprünge ersetzt. Melden Sie sich als Teilnehmer/in an, um die Sprünge zu testen.",
     "teacherongoingwarning": "Die aktuelle Bewertung wird nur für Teilnehmer/innen angezeigt. Melden Sie sich als Teilnehmer/in an, um diese Funktion zu testen.",
     "teachertimerwarning": "Die Zeitbegrenzung funktioniert nur für Teilnehmer/innen. Melden Sie sich als Teilnehmer/in an, um diese Funktion zu testen.",
     "thatsthecorrectanswer": "Richtig",
     "thatsthewronganswer": "Falsch",
     "timeremaining": "Verbleibende Zeit",
-    "timetaken": "Aufgewendete Zeit",
+    "timetaken": "Verbrauchte Zeit",
     "unseenpageinbranch": "Noch nicht angezeigte Frage innerhalb des Zweiges",
     "warningretakefinished": "Der Versuch wurde auf der Website beendet.",
     "welldone": "In den Kurs gelangen Sie mit Klick auf \"Zurückkehren zu ...\"",
diff --git a/www/addons/mod/lesson/lang/el.json b/www/addons/mod/lesson/lang/el.json
index d2c0aa91741..c4d412fb37a 100644
--- a/www/addons/mod/lesson/lang/el.json
+++ b/www/addons/mod/lesson/lang/el.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "Σφάλμα: αποτυχία εύρεσης απάντησης",
     "cannotfinduser": "Σφάλμα: αποτυχία εύρεσης χρηστών",
     "clusterjump": "Ερώτηση μέσα σε συστοιχεία που δεν εμφανίστηκε",
-    "completed": "Ολοκληρώθηκε",
+    "completed": "Ολοκληρωμένο",
     "congratulations": "Συγχαρητήρια - τελειώσατε την ενότητα",
     "continue": "Συνέχεια",
     "defaultessayresponse": "Η έκθεσή σας θα βαθμολογηθεί από τον καθηγητή του μαθήματος.",
@@ -43,12 +43,12 @@
     "ongoingnormal": "Έχετε απαντήσει {{$a.correct}} σωστά από τις {{$a.viewed}} προσπάθειες.",
     "or": "Ή",
     "overview": "Σύνοψη",
-    "preview": "Προεπισκόπιση",
+    "preview": "Προεπισκόπηση",
     "progressbarteacherwarning2": "Δεν θα δείτε την μπάρα προόδου γιατί μπορείτε να επεξεργαστείτε αυτή την ενότητα",
     "question": "Ερώτηση",
     "rawgrade": "Βαθμός χωρίς επεξεργασία",
     "reports": "Αναφορές",
-    "response": "Ανταπόκριση",
+    "response": "Απάντηση",
     "review": "Αναθεώρηση",
     "reviewlesson": "Αναθεώρηση ενότητας",
     "reviewquestionback": "Ναι, θα ήθελα να δοκιμάσω πάλι",
diff --git a/www/addons/mod/lesson/lang/es-mx.json b/www/addons/mod/lesson/lang/es-mx.json
index ead72ecbab5..9141cdf0824 100644
--- a/www/addons/mod/lesson/lang/es-mx.json
+++ b/www/addons/mod/lesson/lang/es-mx.json
@@ -50,13 +50,13 @@
     "ongoingnormal": "Usted ha respondido correctamente {{$a.correct}} pregunta(s) de un total de {{$a.viewed}} pregunta(s).",
     "or": "O",
     "overview": "Visión general",
-    "preview": "Previsualizar",
+    "preview": "Vista previa",
     "progressbarteacherwarning2": "Usted no verá la barra de progreso porque puede editar esta lección",
     "progresscompleted": "Usted ha completado  {{$a}}% de la lección",
     "question": "Pregunta",
     "rawgrade": "Calificación en bruto",
     "reports": "Reportes",
-    "response": "Comentario",
+    "response": "Respuesta",
     "retakefinishedinsync": "Un intento fuera-de-línea fue sincronizado.¿Quiere Usted revisarlo?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
diff --git a/www/addons/mod/lesson/lang/es.json b/www/addons/mod/lesson/lang/es.json
index 1b960b84214..aca4c83246d 100644
--- a/www/addons/mod/lesson/lang/es.json
+++ b/www/addons/mod/lesson/lang/es.json
@@ -48,13 +48,13 @@
     "ongoingnormal": "Usted ha respondido correctamente {{$a.correct}} pregunta(s) de un total de {{$a.viewed}} pregunta(s).",
     "or": "O",
     "overview": "Revisión",
-    "preview": "Previsualizar",
+    "preview": "Vista previa",
     "progressbarteacherwarning2": "Usted no verá la barra de progreso porque puede editar esta lección",
     "progresscompleted": "Ha alcanzado el {{$a}}% de esta lección",
     "question": "Pregunta",
     "rawgrade": "Calificación en bruto",
     "reports": "Informes",
-    "response": "Comentario",
+    "response": "Respuesta",
     "review": "Revisión",
     "reviewlesson": "Revisar lección",
     "reviewquestionback": "Sí, me gustaría probar de nuevo",
diff --git a/www/addons/mod/lesson/lang/eu.json b/www/addons/mod/lesson/lang/eu.json
index 9b2a9d0dd80..875747bed51 100644
--- a/www/addons/mod/lesson/lang/eu.json
+++ b/www/addons/mod/lesson/lang/eu.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Errorea: ezin da saiakera aurkitu",
     "cannotfinduser": "Errorea: ezin dira erabiltzaileak aurkitu",
     "clusterjump": "Cluster batean ikusi gabeko galdera",
-    "completed": "Osatuta",
+    "completed": "Osatua",
     "congratulations": "Zorionak! Ikasgaiaren bukaerara iritsi zara",
     "continue": "Jarraitu",
     "continuetonextpage": "Jarraitu hurrengo orrira.",
@@ -21,7 +21,9 @@
     "emptypassword": "Pasahitza ezin da hutsik egon",
     "enterpassword": "Idatzi pasahitza, mesedez:",
     "eolstudentoutoftimenoanswers": "Ez duzu erantzunik eman. Ikasgai honetan 0 puntu lortu duzu.",
+    "errorreviewretakenotlast": "Saiakera hau ezin da berrikusi dagoeneko beste saiakera bat amaitu duzulako.",
     "finish": "Amaitu",
+    "finishretakeoffline": "Saiakera lineaz kanpo bukatu da.",
     "firstwrong": "Sentitzen dugu. Ez duzu puntua lortu zure erantzuna zuzena izan ez delako. Berriz saiatu nahi al duzu? (ikasteko bakarrik, ez puntua lortzeko).",
     "gotoendoflesson": "Joan ikasgaiaren amaierara",
     "grade": "Kalifikazioa",
@@ -55,7 +57,10 @@
     "rawgrade": "Puntuazio gordina",
     "reports": "Txostenak",
     "response": "Ebazpena",
-    "review": "Berrikuspena",
+    "retakefinishedinsync": "Lineaz kanpoko saiakera bat sinkronizatu da. Berrikusi nahi duzu?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
+    "review": "Birpasatu",
     "reviewlesson": "Ikasgaia berrikusi",
     "reviewquestionback": "Bai, berriz saiatu nahi nuke",
     "reviewquestioncontinue": "Ez, hurrengora pasa nahi dut",
@@ -67,8 +72,9 @@
     "thatsthecorrectanswer": "Hauxe da erantzun zuzena",
     "thatsthewronganswer": "Hauxe da erantzun okerra",
     "timeremaining": "Geratzen den denbora",
-    "timetaken": "Erabilitako denbora",
+    "timetaken": "Hartutako denbora",
     "unseenpageinbranch": "Eduki-orrian ikusi ez den galdera",
+    "warningretakefinished": "Saiakera gunean bukatu da.",
     "welldone": "Ederki!",
     "youhaveseen": "Ikasgai honetako orri bat edo gehiago ikusi duzu jadanik.<br />Ikusitako azken orritik hasi nahi al duzu?",
     "youranswer": "Zure erantzuna",
diff --git a/www/addons/mod/lesson/lang/fa.json b/www/addons/mod/lesson/lang/fa.json
index 79774430714..7292c45d401 100644
--- a/www/addons/mod/lesson/lang/fa.json
+++ b/www/addons/mod/lesson/lang/fa.json
@@ -1,5 +1,5 @@
 {
-    "answer": "جواب",
+    "answer": "پاسخ",
     "attemptsremaining": "می‌توانید {{$a}} بار دیگر تلاش کنید",
     "averagescore": "نمرهٔ میانگین",
     "averagetime": "زمان میانگین",
@@ -7,7 +7,7 @@
     "cannotfindattempt": "خطا: پیدا کردن تلاش مقدور نبود",
     "cannotfinduser": "خطا: پیدا کردن کاربران مقدور نبود",
     "clusterjump": "سؤال دیده نشده از یک خوشه",
-    "completed": "تکمیل",
+    "completed": "کامل شده",
     "congratulations": "تبریک - به انتهای مبحث درسی رسیدید",
     "continue": "ادامه",
     "defaultessayresponse": "پاسخ تشریحی شما توسط استادتان تصحیح خواهد شد.",
@@ -49,13 +49,13 @@
     "question": "سؤال",
     "rawgrade": "نمرهٔ خام",
     "reports": "گزارش‌ها",
-    "response": "واکنش به جواب",
+    "response": "پاسخ",
     "review": "مرور",
     "reviewlesson": "مرور مبحث درسی",
     "reviewquestionback": "بله، می‌خواهم مجدداً تلاش کنم",
     "reviewquestioncontinue": "خیر، می‌خواهم به سؤال بعدی بروم",
     "secondpluswrong": "صحیح نیست. آیا مایلید مجدداً تلاش کنید؟",
-    "submit": "ارائه",
+    "submit": "ارسال",
     "teacherjumpwarning": "در این مبحث درسی از یک پرش به {{$a.cluster}} یا پرش به {{$a.unseen}} استفاده شده است. به جای آن‌ها از پرش به «صفحهٔ بعد» استفاده خواهد شد. برای آزمایش این پرش‌ها بعنوان شاگرد وارد شوید.",
     "teacherongoingwarning": "نمره در حال شرکت فقط به شاگردان نمایش داده می‌شود. برای آزمایش نمره در حال شرکت، در قالب یک شاگر وارد شوید.",
     "teachertimerwarning": "تایمر فقط برای شاگردان کار می‌کند. با ورود در قالب یک شاگرد، تایمر را آزمایش کنید.",
diff --git a/www/addons/mod/lesson/lang/fr.json b/www/addons/mod/lesson/lang/fr.json
index 2b8652437b9..70c5c7fe65b 100644
--- a/www/addons/mod/lesson/lang/fr.json
+++ b/www/addons/mod/lesson/lang/fr.json
@@ -51,10 +51,10 @@
     "preview": "Prévisualisation",
     "progressbarteacherwarning2": "La barre de progression ne sera pas affichée, car vous pouvez modifier cette leçon",
     "progresscompleted": "Vous avez terminé {{$a}} % de la leçon",
-    "question": "Question",
+    "question": "Libellé de la question",
     "rawgrade": "Note brute",
     "reports": "Rapports",
-    "response": "Feedback",
+    "response": "Réponse du participant",
     "review": "Relecture",
     "reviewlesson": "Revoir la leçon",
     "reviewquestionback": "Oui, j'aimerais essayer à nouveau",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "C'est une réponse correcte",
     "thatsthewronganswer": "C'est une mauvaise réponse",
     "timeremaining": "Durée restante",
-    "timetaken": "Durée utilisée",
+    "timetaken": "Temps mis",
     "unseenpageinbranch": "Question non vue au sein d'une page de contenu",
     "welldone": "Bien joué !",
     "youhaveseen": "Vous avez déjà vu au moins une page de cette leçon.<br />Voulez-vous commencer à la dernière page que vous avez vue ?",
diff --git a/www/addons/mod/lesson/lang/he.json b/www/addons/mod/lesson/lang/he.json
index cc0a9600655..b99bca39d0b 100644
--- a/www/addons/mod/lesson/lang/he.json
+++ b/www/addons/mod/lesson/lang/he.json
@@ -24,7 +24,7 @@
     "finish": "סיום",
     "firstwrong": "למרבה הצער, אינך יכול לזכות בנקודה זו מפני שהתשובה שלך היתה שגויה. האם תרצה להמשיך לנחש בשביל האושר שכרוך בלמידה (אבל ללא נקודות נוספות)?",
     "gotoendoflesson": "המשך לסוף השיעור",
-    "grade": "ציון",
+    "grade": "ניקוד בפעילות",
     "highscore": "תוצאה גבוהה",
     "hightime": "זמן גבוה",
     "leftduringtimed": "עזבת באמצע שיעור מתוזמן.<br />אנא הקליקו על 'המשך' בשביל להתחיל מחדש את השיעור.",
@@ -54,19 +54,19 @@
     "rawgrade": "ציון גולמי",
     "reports": "דוחות",
     "response": "תגובה",
-    "review": "סקירה",
+    "review": "עיון בתשובות",
     "reviewlesson": "סקירת השיעור",
     "reviewquestionback": "כן, הייתי רוצה לנסות בשנית",
     "reviewquestioncontinue": "לא, אני רוצה להמשיך לשאלה הבאה",
     "secondpluswrong": "לא בדיוק. תרצה לנסות שוב?",
-    "submit": "הגש",
+    "submit": "הגשה",
     "teacherjumpwarning": "שיעור זה משתמש באשכול־מעברים {{$a.cluster}} או במעברים {{$a.unseen}}. כחלופה, יעשה שימוש במעבר ל'עמוד הבא'. יש להתחבר כסטודנט על מנת לבחון את התנהגות מעבר העמודים לעיל.",
     "teacherongoingwarning": "תוצאה מצטברת מוצגת רק בפני הסטודנט. התחבר כסטודנט כדי לבחון את התוצאה המתמשכת.",
     "teachertimerwarning": "שעון העצר עובד רק לסטודנטים. התחבר כסטודנט כדי לבחון את שעון העצר.",
     "thatsthecorrectanswer": "זוהי התשובה הנכונה.",
     "thatsthewronganswer": "זוהי לא התשובה הנכונה.",
     "timeremaining": "הזמן שנשאר",
-    "timetaken": "זמן שנלקח",
+    "timetaken": "הזמן שלקח",
     "unseenpageinbranch": "שאלת אנסין בתוך ההסתעפות",
     "welldone": "כל הכבוד!",
     "youhaveseen": "כבר ראית יותר מעמוד אחד בשיעור זה.<br />האם תרצה להתחיל בעמוד האחרון שראית?",
diff --git a/www/addons/mod/lesson/lang/it.json b/www/addons/mod/lesson/lang/it.json
index de8299fe5af..ab792f9d489 100644
--- a/www/addons/mod/lesson/lang/it.json
+++ b/www/addons/mod/lesson/lang/it.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Errore: non è stato possibile trovare il tentativo",
     "cannotfinduser": "Errore: non è stato possibile trovare utenti",
     "clusterjump": "Domanda non visualizzata di un gruppo ",
-    "completed": "Completata",
+    "completed": "Completato",
     "congratulations": "Congratulazioni - hai raggiunto la fine della lezione",
     "continue": "Continua",
     "continuetonextpage": "Vai alla prossima pagina.",
@@ -24,7 +24,7 @@
     "finish": "Termina",
     "firstwrong": "la tua risposta non è corretta. Desideri provare a rispondere di nuovo? (L'eventuale risposta corretta non sarà comunque tenuta in considerazione per il calcolo del punteggio finale).",
     "gotoendoflesson": "Vai alla fine della lezione",
-    "grade": "Punteggio",
+    "grade": "Valutazione",
     "highscore": "Voto migliore",
     "hightime": "Tempo migliore",
     "leftduringtimed": "Hai abbandonato il tentativo durante una lezione a tempo.<br />Clicca su Continua per ricominciare la lezione.",
@@ -53,8 +53,8 @@
     "progresscompleted": "Hai completato il {{$a}}% della lezione",
     "question": "Domanda",
     "rawgrade": "Voto grezzo",
-    "reports": "Risultati",
-    "response": "Replica",
+    "reports": "Report",
+    "response": "Risposta data",
     "review": "Revisione",
     "reviewlesson": "Rivedi la lezione",
     "reviewquestionback": "Si, voglio provare ancora",
diff --git a/www/addons/mod/lesson/lang/ja.json b/www/addons/mod/lesson/lang/ja.json
index 18e3ade173c..833e1e0f12b 100644
--- a/www/addons/mod/lesson/lang/ja.json
+++ b/www/addons/mod/lesson/lang/ja.json
@@ -1,5 +1,5 @@
 {
-    "answer": "答え/選択肢",
+    "answer": "答え",
     "attemptheader": "受験",
     "attemptsremaining": "あなたには {{$a}} 回の受験回数が残っています。",
     "averagescore": "平均評点",
@@ -24,7 +24,7 @@
     "finish": "終了",
     "firstwrong": "あなたの解答は正しくありません。問題を再度受験しますか?  (今から問題に正しく解答した場合、あなたの最終評点には加算されません)",
     "gotoendoflesson": "レッスンの最後に移動する",
-    "grade": "評点",
+    "grade": "評定",
     "highscore": "最高評点",
     "hightime": "最長時間",
     "leftduringtimed": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンを再スタートするには「続ける」をクリックしてください。",
@@ -54,7 +54,7 @@
     "question": "問題",
     "rawgrade": "素点",
     "reports": "レポート",
-    "response": "返答",
+    "response": "解答",
     "review": "レビュー",
     "reviewlesson": "レッスンをレビューする",
     "reviewquestionback": "はい、もう一度受験します",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "正解です。",
     "thatsthewronganswer": "不正解です。",
     "timeremaining": "残り時間",
-    "timetaken": "経過時間",
+    "timetaken": "所要時間",
     "unseenpageinbranch": "コンテンツページ内の未閲覧の問題",
     "welldone": "よくできました!",
     "youhaveseen": "あなたはすでにこのレッスンを2ページ以上表示しました。<br />あなたが表示した最後のページから始めますか?",
diff --git a/www/addons/mod/lesson/lang/lt.json b/www/addons/mod/lesson/lang/lt.json
index e088a565222..bd1f65cd301 100644
--- a/www/addons/mod/lesson/lang/lt.json
+++ b/www/addons/mod/lesson/lang/lt.json
@@ -1,5 +1,5 @@
 {
-    "answer": "Atsakyti",
+    "answer": "Atsakymas",
     "attemptheader": "Bandymas",
     "attemptsremaining": "Turite likusių bandymų: {{$a}}",
     "averagescore": "Vidutinis balas",
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Klaida: nepavyko rasti bandymo",
     "cannotfinduser": "Klaida: nepavyko rasti naudotojų",
     "clusterjump": "Telkinyje nematomas klausimas",
-    "completed": "Baigta",
+    "completed": "Užbaigta",
     "congratulations": "Sveikiname. Pasiekta pamokos pabaiga.",
     "continue": "Tęsti",
     "continuetonextpage": "Toliau į sekantį puslapį.",
diff --git a/www/addons/mod/lesson/lang/nl.json b/www/addons/mod/lesson/lang/nl.json
index e2620a8cabf..80e3848afc4 100644
--- a/www/addons/mod/lesson/lang/nl.json
+++ b/www/addons/mod/lesson/lang/nl.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Fout: kon poging niet vinden",
     "cannotfinduser": "Fout: kon geen gebruikers vinden",
     "clusterjump": "Ongeziene vraag binnen een cluster",
-    "completed": "Voltooid",
+    "completed": "Volledig",
     "congratulations": "Proficiat - je hebt het einde van de les bereikt",
     "continue": "Ga verder",
     "continuetonextpage": "Ga naar volgende pagina",
@@ -26,7 +26,7 @@
     "finishretakeoffline": "Deze poging is voltooid in offline modus",
     "firstwrong": "Je antwoord is fout.  Wil je de vraag opnieuw proberen te beantwoorden? Als je het antwoord weet, zul je er geen punten meer mee verdienen.",
     "gotoendoflesson": "Ga naar het einde van de les",
-    "grade": "Cijfer",
+    "grade": "Beoordeling",
     "highscore": "Hoogste score",
     "hightime": "Langste duur",
     "leftduringtimed": "Je bent weggegaan tijdens een getimede les. <br />Klik op ga verder om de les te hervatten.",
@@ -50,22 +50,22 @@
     "ongoingnormal": "Je hebt {{$a.correct}} vragen van de {{$a.viewed}} juist beantwoord.",
     "or": "OF",
     "overview": "Overzicht",
-    "preview": "Voorbeeld",
+    "preview": "Controleer test",
     "progressbarteacherwarning2": "Je zult de vorderingsbalk niet zien omdat je deze les kunt bewerken",
     "progresscompleted": "Je hebt {{$a}}% van de les beëindigd",
     "question": "Vraag",
     "rawgrade": "Ruwe score",
     "reports": "Rapporten",
-    "response": "Respons",
+    "response": "Antwoord",
     "retakefinishedinsync": "Er werd een offline poging gesynchroniseerd. Wil je ze bekijken?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Nalezen",
+    "review": "Lees na",
     "reviewlesson": "Les nalezen",
     "reviewquestionback": "Ja, ik wil nog eens proberen",
     "reviewquestioncontinue": "Nee, ik wil naar de volgende vraag gaan",
     "secondpluswrong": "Niet echt. Wil je nog eens proberen?",
-    "submit": "Insturen",
+    "submit": "Afgeven",
     "teacherjumpwarning": "Er wordt een {{$a.cluster}} sprong of een {{$a.unseen}} sprong gebruikt in deze les. De sprong naar de volgende pagina zal in de plaats gebruikt worden. Meld je aan als leerling om deze sprongen te testen.",
     "teacherongoingwarning": "De score tijdens de les wordt alleen aan leerlingen getoond. Meld je aan als leerling om deze optie te testen",
     "teachertimerwarning": "De timer werkt enkel voor leerlingen. Test de timer door je als leerling aan te melden.",
diff --git a/www/addons/mod/lesson/lang/pl.json b/www/addons/mod/lesson/lang/pl.json
index c36b7ae91cf..538a7158415 100644
--- a/www/addons/mod/lesson/lang/pl.json
+++ b/www/addons/mod/lesson/lang/pl.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Błąd: nie znaleziono podejść",
     "cannotfinduser": "Błąd: nie znaleziono użytkowników",
     "clusterjump": "Nie widziane pytanie w obrębie klastra",
-    "completed": "Skończono",
+    "completed": "Zakończone",
     "congratulations": "Gratulacje - koniec lekcji",
     "continue": "Kontynuuj",
     "continuetonextpage": "Kontynuuj do następnej strony.",
@@ -54,20 +54,20 @@
     "question": "Pytanie",
     "rawgrade": "Surowa (nie przeliczona) ocena",
     "reports": "Raporty",
-    "response": "Informacja zwrotna",
+    "response": "Odpowiedź",
     "review": "Przegląd",
     "reviewlesson": "Przejrzyj ponownie lekcje",
     "reviewquestionback": "Tak, chcę spróbować ponownie",
     "reviewquestioncontinue": "Nie, chcę przejść do następnego pytania",
     "secondpluswrong": "Niezupełnie. Chcesz spróbować ponownie?",
-    "submit": "Prześlij",
+    "submit": "Zatwierdź",
     "teacherjumpwarning": "Skoki typu {{$a.cluster}} lub {{$a.unseen}} są używane w tej lekcji. Skok do następnej strony będzie używany zamiast tego. Zaloguj się jako student, żeby przetestować przejścia",
     "teacherongoingwarning": "Wynik jest pokazywany tylko studentowi. Zaloguj się jako student.",
     "teachertimerwarning": "Licznik czasu działa tylko dla studentów, Aby przetestować, zaloguj się jako student.",
     "thatsthecorrectanswer": "To jest poprawna odpowiedź",
     "thatsthewronganswer": "To jest błędna odpowiedź",
     "timeremaining": "Pozostały czas",
-    "timetaken": "Łączny czas",
+    "timetaken": "Wykorzystany czas",
     "unseenpageinbranch": "Nie wyświetlane dotąd pytanie w treści strony",
     "welldone": "Dobrze zrobione!",
     "youhaveseen": "Widziałeś już więcej niż jedną stronę tej lekcji. <br />Czy chciałbyś zacząć od ostatniej strony, którą przeglądałeś?",
diff --git a/www/addons/mod/lesson/lang/pt-br.json b/www/addons/mod/lesson/lang/pt-br.json
index a50382f3902..37c054de65b 100644
--- a/www/addons/mod/lesson/lang/pt-br.json
+++ b/www/addons/mod/lesson/lang/pt-br.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Erro: não foi possível encontrar a tentativa",
     "cannotfinduser": "Erro: não foi possível encontrar os usuários",
     "clusterjump": "Questão não vista em um cluster",
-    "completed": "Concluída",
+    "completed": "Concluído",
     "congratulations": "Você chegou ao fim desta lição",
     "continue": "Continuar",
     "continuetonextpage": "Continuar para a próxima página.",
@@ -24,7 +24,7 @@
     "finish": "Finalizado",
     "firstwrong": "Infelizmente esta resposta não é correta e portanto não aumentará a sua pontuação. Você gostaria de continuar tentando para conhecer a resposta certa (mas sem direito à revisão da pontuação)?",
     "gotoendoflesson": "Ir para o final da lição",
-    "grade": "Avaliação",
+    "grade": "Nota",
     "highscore": "Pontuação alta",
     "hightime": "Tempo alto",
     "leftduringtimed": "Você interrompeu uma lição com tempo de duração definido.<br />Por favor clique em Continuar para recomeçar a lição.",
@@ -48,13 +48,13 @@
     "ongoingnormal": "Você respondeu corretamente {{$a.correct}} questões de um total de {{$a.viewed}} .",
     "or": "OU",
     "overview": "Visão geral",
-    "preview": "Visualizar",
+    "preview": "Visualização prévia",
     "progressbarteacherwarning2": "Você não verá a barra de progresso porque você pode editar esta lição.",
     "progresscompleted": "Você completou {{$a}}% da lição",
-    "question": "Questão",
+    "question": "Pergunta",
     "rawgrade": "Nota não ponderada",
     "reports": "Relatórios",
-    "response": "Retorno",
+    "response": "Resposta",
     "review": "Revisão",
     "reviewlesson": "Rever Lição",
     "reviewquestionback": "Sim, eu gostaria de tentar novamente",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "Esta é a resposta correta",
     "thatsthewronganswer": "Esta é a resposta errada",
     "timeremaining": "Tempo restante",
-    "timetaken": "Tempo utilizado",
+    "timetaken": "Tempo empregado",
     "unseenpageinbranch": "Questão não vista de uma seção",
     "welldone": "Muito bem!",
     "youhaveseen": "Você já visitou algumas páginas desta lição.<br />Você quer iniciar a partir da última página visitada?",
diff --git a/www/addons/mod/lesson/lang/pt.json b/www/addons/mod/lesson/lang/pt.json
index 16a88172b79..06a95417e22 100644
--- a/www/addons/mod/lesson/lang/pt.json
+++ b/www/addons/mod/lesson/lang/pt.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Erro: não foi possível encontrar a tentativa",
     "cannotfinduser": "Erro: não foi possível encontrar utilizadores",
     "clusterjump": "Pergunta não vista dentro do grupo",
-    "completed": "Completou",
+    "completed": "Completo",
     "congratulations": "Parabéns - chegou ao fim da lição",
     "continue": "Continuar",
     "continuetonextpage": "Continuar para a página seguinte",
@@ -21,7 +21,9 @@
     "emptypassword": "A palava-chave não pode estar em branco",
     "enterpassword": "Introduza a senha:",
     "eolstudentoutoftimenoanswers": "Não respondeu a nenhuma pergunta. Obteve uma classificação de 0 para esta lição.",
+    "errorreviewretakenotlast": "Não é possível rever esta tentativa porque outra tentativa foi terminada.",
     "finish": "Terminar",
+    "finishretakeoffline": "Esta tentativa foi concluída em modo offline.",
     "firstwrong": "Não respondeu corretamente. Gostaria de tentar responder novamente? (se responder corretamente não contará para a sua nota final.)",
     "gotoendoflesson": "Ir para o fim da lição",
     "grade": "Nota",
@@ -51,11 +53,14 @@
     "preview": "Pré-visualização",
     "progressbarteacherwarning2": "Não vê a barra de progresso porque pode editar esta lição",
     "progresscompleted": "Completou {{$a}}% da lição",
-    "question": "Inserir página de pergunta",
+    "question": "Pergunta",
     "rawgrade": "Nota bruta",
     "reports": "Relatórios",
-    "response": "Feedback",
-    "review": "Revisão",
+    "response": "Resposta",
+    "retakefinishedinsync": "Uma tentativa offline foi sincronizada. Pretende rever a tentativa?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
+    "review": "Rever",
     "reviewlesson": "Rever lição",
     "reviewquestionback": "Sim, quero tentar novamente",
     "reviewquestioncontinue": "Não, quero avançar para a pergunta seguinte",
@@ -67,8 +72,9 @@
     "thatsthecorrectanswer": "A sua resposta está correta.",
     "thatsthewronganswer": "A sua resposta <b>não<b> está correta.",
     "timeremaining": "Tempo restante",
-    "timetaken": "Tempo usado",
+    "timetaken": "Tempo gasto",
     "unseenpageinbranch": "Pergunta não vista da sequência",
+    "warningretakefinished": "A tentativa foi terminada no site.",
     "welldone": "Muito bem!",
     "youhaveseen": "Já viu mais do que uma página desta lição.<br />Quer continuar a partir da última página que viu?",
     "youranswer": "A sua resposta",
diff --git a/www/addons/mod/lesson/lang/ro.json b/www/addons/mod/lesson/lang/ro.json
index e921358830b..44d9d09817b 100644
--- a/www/addons/mod/lesson/lang/ro.json
+++ b/www/addons/mod/lesson/lang/ro.json
@@ -37,7 +37,7 @@
     "numberofpagesviewednotice": "Aţi răspuns la {{$a.nquestions}} întrebări; (Trebuie să răspundeţi la cel puţin {{$a.minquestions}} întrebări)",
     "ongoingcustom": "Până în acest moment aţi obţinut {{$a.score}} point(s) puncte din {{$a.currenthigh}} point(s) posibile.",
     "or": "SAU",
-    "preview": "Previzualizare",
+    "preview": "Afişare",
     "progresscompleted": "Ați completat {{$a}}% din lecție",
     "question": "Întrebare",
     "reports": "Rapoarte",
@@ -51,7 +51,7 @@
     "thatsthecorrectanswer": "Răspuns corect",
     "thatsthewronganswer": "Răspuns incorect",
     "timeremaining": "Timp rămas",
-    "timetaken": "Timp necesar",
+    "timetaken": "Timp luat",
     "welldone": "Foarte bine!",
     "youhaveseen": "Aţi vizualizat deja mai mult de o pagină din această lecţie.<br />Doriţi să reveniţi la prima pagină pe care aţi văzut-o?",
     "youranswer": "Răspunsul dumneavoastră",
diff --git a/www/addons/mod/lesson/lang/ru.json b/www/addons/mod/lesson/lang/ru.json
index cdfe818e247..a7de74688e9 100644
--- a/www/addons/mod/lesson/lang/ru.json
+++ b/www/addons/mod/lesson/lang/ru.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Ошибка: попытка не найдена",
     "cannotfinduser": "Ошибка: не удалось найти пользователей",
     "clusterjump": "Непросмотренный вопрос в кластере",
-    "completed": "Лекция завершена",
+    "completed": "Завершено",
     "congratulations": "Поздравления - лекция завершена",
     "continue": "Продолжить",
     "continuetonextpage": "Перейти к следующей странице",
@@ -54,8 +54,8 @@
     "question": "Вопрос",
     "rawgrade": "Предварительная оценка",
     "reports": "Отчеты",
-    "response": "Отзыв",
-    "review": "Пересмотр",
+    "response": "Ответ",
+    "review": "Просмотр",
     "reviewlesson": "Пересмотр лекции",
     "reviewquestionback": "Да, мне хотелось бы попробовать еще раз",
     "reviewquestioncontinue": "Нет, я просто хочу перейти к следующему вопросу",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "Это правильный ответ",
     "thatsthewronganswer": "Это неправильный ответ",
     "timeremaining": "Оставшееся время",
-    "timetaken": "Затраченное время",
+    "timetaken": "Прошло времени",
     "unseenpageinbranch": "Страница непросмотренного вопроса из раздела",
     "welldone": "Отлично!",
     "youhaveseen": "Вы уже работали с этой лекцией.<br /> Хотите продолжить с того места, на котором Вы остановились?",
diff --git a/www/addons/mod/lesson/lang/sv.json b/www/addons/mod/lesson/lang/sv.json
index fe0a53b2702..fc97510fb69 100644
--- a/www/addons/mod/lesson/lang/sv.json
+++ b/www/addons/mod/lesson/lang/sv.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "Fel: det gick inte att hitta försök",
     "cannotfinduser": "Fel: det gick inte att hitta användare",
     "clusterjump": "Ej visad fråga inom ett kluster",
-    "completed": "Avslutad",
+    "completed": "Slutfört",
     "congratulations": "Gratulerar - lektionen är slut här",
     "continue": "Fortsätt",
     "continuetonextpage": "Fortsätt till nästa sida.",
@@ -23,7 +23,7 @@
     "finish": "Avsluta",
     "firstwrong": "Tyvärr har Du inte uppnått den här poängen eftersom Du inte svarade rätt. Vill Du fortsätta att gissa, för lärandets skull (men inte för någon poäng)?",
     "gotoendoflesson": "Gå till slutet av lektionen",
-    "grade": "Betyg/omdöme",
+    "grade": "Betyg",
     "highscore": "Högt resultat",
     "hightime": "Hög tid",
     "leftduringtimed": "Du har avbrutit under en tidsstyrd lektion.<br>Var snäll och välj \"Fortsätt\" för att starta om lektionen.",
@@ -51,20 +51,20 @@
     "question": "Fråga",
     "rawgrade": "Grovt antaget betyg/omdöme",
     "reports": "Rapporter",
-    "response": "Återkoppling på svar",
+    "response": "Respons",
     "review": "Granska",
     "reviewlesson": "Visa lektion igen",
     "reviewquestionback": "Ja, jag vill försöka igen",
     "reviewquestioncontinue": "Nej, jag vill gå vidare till nästa fråga",
     "secondpluswrong": "Inte helt. Vill Du försöka igen?",
-    "submit": "Skicka in",
+    "submit": "Skicka",
     "teacherjumpwarning": "Det finns ett {{$a.cluster}} hopp eller ett {{$a.unseen}} hopp med i den här lektionen. Hoppet \"Nästa sida\" kommer att användas istället. Logga in som en student/elev/deltagare/lärande för att testa dessa hopp.",
     "teacherongoingwarning": "Ett pågående resultat visas bara för studenter/elever/deltagare/lärande. Logga in som en sådan för att se pågående resultat.",
     "teachertimerwarning": "Tidtagaren fungerar bara för studenter/elever/deltagare/lärande. Logga in som en sådan för att testa tidtagaren.",
     "thatsthecorrectanswer": "Det är rätt svar",
     "thatsthewronganswer": "Det är ett felaktigt svar",
     "timeremaining": "Återstående tid",
-    "timetaken": "Använd tid",
+    "timetaken": "Tid för genomförande",
     "unseenpageinbranch": "Ej visad fråga inom en innehållssida",
     "welldone": "Bra gjort!",
     "youhaveseen": "Du har redan sett mer än en sida av den här lektionen.<br />Vill Du börja med den senaste sidan som Du såg?",
diff --git a/www/addons/mod/lesson/lang/tr.json b/www/addons/mod/lesson/lang/tr.json
index 99d0bd338e2..fec20555f48 100644
--- a/www/addons/mod/lesson/lang/tr.json
+++ b/www/addons/mod/lesson/lang/tr.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Hata: uygulama bulunamadı",
     "cannotfinduser": "Hata: kullanıcılar bulunamadı",
     "clusterjump": "Küme içindeki bakılmamış soru",
-    "completed": "Bitirmeli",
+    "completed": "Tamamlandı",
     "congratulations": "Tebrikler, dersin sonuna geldiniz",
     "continue": "Devam et",
     "continuetonextpage": "Sonraki sayfaya devam et.",
@@ -24,7 +24,7 @@
     "finish": "Bitiş",
     "firstwrong": "Cevabınız doğru olmadığı için maalesef bu puanı alamazsınız. Öğrenmenizi daha çok pekiştirmek için tahmin etmeye devam etmek ister misiniz (ama puan verilmez)?",
     "gotoendoflesson": "Dersin sonuna git",
-    "grade": "Not",
+    "grade": "Başarı notu",
     "highscore": "Yüksek not",
     "hightime": "Yüksek zaman",
     "leftduringtimed": "Zamanlı bir dersin süresini aştınız.<br />Dersi tekrar başlatmak için Devam Et butonuna tıklayın.",
@@ -54,8 +54,8 @@
     "question": "Soru",
     "rawgrade": "Ham not",
     "reports": "Raporlar",
-    "response": "Yanıtına karşılık dönüt",
-    "review": "Gözden geçir",
+    "response": "Verilen yanıt",
+    "review": "Önizleme",
     "reviewlesson": "Dersi tekrar gözden geçir",
     "reviewquestionback": "Evet, tekrar deneyeyim",
     "reviewquestioncontinue": "Hayır, sonraki soruya geçeyim",
diff --git a/www/addons/mod/lesson/lang/uk.json b/www/addons/mod/lesson/lang/uk.json
new file mode 100644
index 00000000000..3c5260abead
--- /dev/null
+++ b/www/addons/mod/lesson/lang/uk.json
@@ -0,0 +1,83 @@
+{
+    "answer": "Відповідь",
+    "attemptheader": "Спроба",
+    "attemptsremaining": "У Вас залишилося {{$a}} спроб(и)",
+    "averagescore": "Середній бал",
+    "averagetime": "Середній час",
+    "branchtable": "Вміст",
+    "cannotfindattempt": "Помилка: не знайдено спробу",
+    "cannotfinduser": "Помилка: користувачів не знайдено",
+    "clusterjump": "Не переглянута сторінка кластеру",
+    "completed": "Завершено",
+    "congratulations": "Вітаємо - Ви повністю пройшли цей урок",
+    "continue": "Продовжити",
+    "continuetonextpage": "Продовжити до наступної сторінки.",
+    "defaultessayresponse": "Ваше есе буде оцінене вашим викладачем.",
+    "detailedstats": "Детальна статистика",
+    "didnotanswerquestion": "Немає відповіді на питання",
+    "displayofgrade": "Показати оцінки (тільки для студентів)",
+    "displayscorewithessays": "Ви отримали {{$a.score}} балів із {{$a.tempmaxgrade}} за питання, оцінені автоматично. <br> Оцінки за {{$a.essayquestions}} эссе будуть виставленні і враховані при виставленні результативної оцінки. <br> Ваша поточна оцінка (без врахування эсе): {{$a.score}} из {{$a.grade}}.",
+    "displayscorewithoutessays": "Ваша оцінка {{$a.score}} (з {{$a.grade}}).",
+    "emptypassword": "Пароль не може бути порожнім",
+    "enterpassword": "Будь ласка, введіть пароль:",
+    "eolstudentoutoftimenoanswers": "Ви не дали відповіді на жодне запитання. Ви отримуєте нуль за цей урок.",
+    "errorreviewretakenotlast": "Ця спроба не може бути переглянута більше, тому що ще одна спроба була закінчена.",
+    "finish": "Завершити",
+    "finishretakeoffline": "Ця спроба була закінчена в автономному режимі.",
+    "firstwrong": "На жаль, за неправильної відповіді Ви не можете отримати бал. Ви хочете продовжити вгадування в цілях навчання (але не в цілях отримання балів)?",
+    "gotoendoflesson": "Перейти на кінець уроку",
+    "grade": "Оцінка",
+    "highscore": "Найвищій бал",
+    "hightime": "Найбільший час",
+    "leftduringtimed": "Ви закінчили урок із заданим часом його проходу. <br/> Будь-ласка, клацніть на кнопку «Продовжити», щоб почати урок знову.",
+    "leftduringtimednoretake": "Ви покинули урок під час його проходження і не можете пройти його знову або продовжити.",
+    "lessonmenu": "Меню уроку",
+    "lessonstats": "Статистика уроку",
+    "linkedmedia": "Зв'язані медіа",
+    "loginfail": "Помилка входу, будь ласка, спробуйте ще раз...",
+    "lowscore": "Найнижчий бал",
+    "lowtime": "Менший час",
+    "maximumnumberofattemptsreached": "Досягнуто максимальної кількості спроб - Перехід до наступної сторінки",
+    "modattemptsnoteacher": "Перегляд студентів доступний лише для студентів.",
+    "noanswer": "Одне або більше питань залишилися без відповіді. Будь ласка, поверніться і дайте відповідь.",
+    "nolessonattempts": "спроби проходження цього уроку не знайдено.",
+    "nolessonattemptsgroup": "Студенти групи {{$a}} не зробили жодної спроби проходження уроку.",
+    "notcompleted": "Не завершено",
+    "numberofcorrectanswers": "Кількість правильних відповідей: {{$a}}",
+    "numberofpagesviewed": "Кількість запитань, на які було дано відповідь: {{$a}}",
+    "numberofpagesviewednotice": "Кількість запитань, на які було дано відповідь: {{$a.nquestions}}; (вам потрібно відповісти хоча б на: {{$a.minquestions}})",
+    "ongoingcustom": "Ви отримали {{$a.score}} бал(ів) з {{$a.currenthigh}} можливих.",
+    "ongoingnormal": "Ви відповіли правильно на {{$a.correct}} запитань із {{$a.viewed}} переглянутих.",
+    "or": "АБО",
+    "overview": "Переглянути",
+    "preview": "Перегляд",
+    "progressbarteacherwarning2": "Ви не зможете побачити показник виконання, тому що Ви редагуєте цей урок",
+    "progresscompleted": "Ви вже пройшли {{$a}}% уроку",
+    "question": "Питання",
+    "rawgrade": "Попередня оцінка",
+    "reports": "Звіти",
+    "response": "Відповідь",
+    "retakefinishedinsync": "Офлайн спроба була синхронізована. Ви хочете розглянути її?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
+    "review": "Огляд",
+    "reviewlesson": "Переглянути урок",
+    "reviewquestionback": "Так, я хочу спробувати знов",
+    "reviewquestioncontinue": "Ні, я просто хочу перейти до наступного питання",
+    "secondpluswrong": "Недостатньо. Ви хочете спробувати знову?",
+    "submit": "Перевірити",
+    "teacherjumpwarning": "Перехід {{$a.cluster}} або перехід {{$a.unseen}} повинен використовуватися в цьому уроці. Натомість буде використаний перехід на наступну сторінку. Увійдіть під ім'ям якого-небудь студента, щоб протестувати ці переходи.",
+    "teacherongoingwarning": "Поточна оцінка показується лише студенту. Зайдіть в систему як студент, щоб перевірити поточні оцінки",
+    "teachertimerwarning": "Таймер працює лише для студентів. Перевірте таймер, зайшовши в систему як студент.",
+    "thatsthecorrectanswer": "Це правильна відповідь",
+    "thatsthewronganswer": "Це неправильна відповідь",
+    "timeremaining": "Залишилося",
+    "timetaken": "Витрачено часу",
+    "unseenpageinbranch": "Не переглянута сторінка гілки",
+    "warningretakefinished": "Спроба була закінчена на сайті.",
+    "welldone": "Відмінно!",
+    "youhaveseen": "Ви вже працювали з цим уроком.<br /> Хочете продовжити з того місця, на якому Ви зупинились?",
+    "youranswer": "Ваша відповідь",
+    "yourcurrentgradeisoutof": "Ваша оцінка {{$a.grade}} з {{$a.total}}",
+    "youshouldview": "Вам потрібно відповісти хоча б на: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/zh-cn.json b/www/addons/mod/lesson/lang/zh-cn.json
index 3c06c89a713..d9174e6c9a5 100644
--- a/www/addons/mod/lesson/lang/zh-cn.json
+++ b/www/addons/mod/lesson/lang/zh-cn.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "错误：找不到试答",
     "cannotfinduser": "错误：找不到用户",
     "clusterjump": "在簇中的题目不可见",
-    "completed": "完成",
+    "completed": "已完成",
     "congratulations": "恭喜 － 已到达练习终点",
     "continue": "继续",
     "continuetonextpage": "继续到下一页。",
@@ -49,11 +49,11 @@
     "preview": "预览",
     "progressbarteacherwarning2": "因为您可以编辑此程序教学，所以您看不到进度条",
     "progresscompleted": "您已完成此程序教学的 {{$a}}%",
-    "question": "题目",
+    "question": "试题",
     "rawgrade": "原始分数",
     "reports": "报表",
-    "response": "回应",
-    "review": "复习",
+    "response": "回答",
+    "review": "回顾",
     "reviewlesson": "复习程序教学",
     "reviewquestionback": "再试一次",
     "reviewquestioncontinue": "不，我只想继续看下一题",
@@ -65,7 +65,7 @@
     "thatsthecorrectanswer": "此答案正确",
     "thatsthewronganswer": "此答案错误",
     "timeremaining": "剩余时间",
-    "timetaken": "开始时间",
+    "timetaken": "耗时",
     "unseenpageinbranch": "内容页面内未查看的题目",
     "welldone": "非常好!",
     "youhaveseen": "您已经浏览了本程序教学的多个页面。<br />想从上次结束的页面开始吗？",
diff --git a/www/addons/mod/lesson/lang/zh-tw.json b/www/addons/mod/lesson/lang/zh-tw.json
index 42b9529905a..7ab451fd0e8 100644
--- a/www/addons/mod/lesson/lang/zh-tw.json
+++ b/www/addons/mod/lesson/lang/zh-tw.json
@@ -24,7 +24,7 @@
     "finish": "完成",
     "firstwrong": "你答錯了，你想要再答一次嗎？(若你回答正確，也不會算入最後正式分數)？",
     "gotoendoflesson": "跳到這編序學習的結束",
-    "grade": "分數",
+    "grade": "成績",
     "highscore": "最高分",
     "hightime": "最長時間",
     "leftduringtimed": "您在一個有計時的編序教學中離開了。<br>請按\"繼續\"以重新開始這編序教學",
@@ -54,20 +54,20 @@
     "question": "試題",
     "rawgrade": "原始分數",
     "reports": "報表",
-    "response": "回覆",
+    "response": "回答",
     "review": "復習",
     "reviewlesson": "復習編序學習",
     "reviewquestionback": "是的，我想要再試",
     "reviewquestioncontinue": "不，我只想要繼續下一個問題",
     "secondpluswrong": "不離開嗎?您想要再試試?",
-    "submit": "提交",
+    "submit": "送出",
     "teacherjumpwarning": "此編序學習正使用群集{{$a.cluster}}跳躍，或{{$a.unseen}}隱藏跳躍。將使用下一頁的跳躍方式來取代。以學生身份登入來測試這些跳躍。",
     "teacherongoingwarning": "正進行中的分數只顯示給學生。以學生身份登入來測試這個進行中的分數。",
     "teachertimerwarning": "計時器只提供給學生。以學生身份登入來測試這個計時器。",
     "thatsthecorrectanswer": "這是正確的答案",
     "thatsthewronganswer": "這是錯誤的答案",
     "timeremaining": "剩餘時間",
-    "timetaken": "使用時間",
+    "timetaken": "所用時間",
     "unseenpageinbranch": "在內容頁面中未瀏覽的試題",
     "welldone": "做的好！",
     "youhaveseen": "您已經瀏覽了該課程的多個頁面。<br />想從最後瀏覽的頁面開始嗎?",
diff --git a/www/addons/mod/lti/lang/uk.json b/www/addons/mod/lti/lang/uk.json
new file mode 100644
index 00000000000..cc542981fd4
--- /dev/null
+++ b/www/addons/mod/lti/lang/uk.json
@@ -0,0 +1,5 @@
+{
+    "errorgetlti": "Помилка при отриманні даних модуля.",
+    "errorinvalidlaunchurl": "Запуск URL не є дійсним.",
+    "launchactivity": "Запуск діяльності"
+}
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/uk.json b/www/addons/mod/page/lang/uk.json
new file mode 100644
index 00000000000..a7cf81bfcc7
--- /dev/null
+++ b/www/addons/mod/page/lang/uk.json
@@ -0,0 +1,3 @@
+{
+    "errorwhileloadingthepage": "Помилка при завантаженні вмісту сторінки."
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/ar.json b/www/addons/mod/quiz/lang/ar.json
index 1c73660d4bd..28be917d4e9 100644
--- a/www/addons/mod/quiz/lang/ar.json
+++ b/www/addons/mod/quiz/lang/ar.json
@@ -14,14 +14,14 @@
     "continuepreview": "استمر اخر معاينة",
     "errordownloading": "خطأ عن تنزيل البيانات المطلوبة",
     "errorgetquiz": "خطأ عند الحصول على بيانات الاختبار",
-    "feedback": "تعليق",
+    "feedback": "(تغذية راجعة (ملاحظات",
     "grade": "درجة",
     "gradeaverage": "متوسط الدرجة",
     "gradehighest": "أعلى درجة",
     "grademethod": "أسلوب التقييم",
     "hasdatatosync": "هذا الاختبار فيه بيانات يمكن الوصول إليها بدون اتصال بالانترنت وتحتاج للمزامنة",
-    "marks": "الدرجات",
-    "noquestions": "لم يتم إضافة أية أسئلة بعد",
+    "marks": "علامات",
+    "noquestions": "لم يتم العثور على الأسئلة لتصديرها. تأكد من أنك قمت بتحديد التصنيف الذي يحتوي على الأسئلة لتصديره.",
     "outof": "من {{$a}}",
     "overdue": "متأخر جدا",
     "preview": "معاينة",
@@ -37,7 +37,7 @@
     "startedon": "بداء في",
     "stateinprogress": "قيد التنفيذ",
     "stateoverdue": "مُتأخر",
-    "status": "الحالة",
+    "status": "السماح بدخول ضيف",
     "submitallandfinish": "سلم الجميع وانهي",
     "summaryofattempt": "ملخص المحاولة",
     "summaryofattempts": "ملخص محاولاتك السابقة",
diff --git a/www/addons/mod/quiz/lang/bg.json b/www/addons/mod/quiz/lang/bg.json
index d39754517d4..6da8ef7afae 100644
--- a/www/addons/mod/quiz/lang/bg.json
+++ b/www/addons/mod/quiz/lang/bg.json
@@ -20,7 +20,7 @@
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "marks": "Точки",
     "mustbesubmittedby": "Това изпълнение трябва да бъде предадено до {{$a}}.",
-    "noquestions": "Още не са добавени въпроси",
+    "noquestions": "Не са намерени въпроси, които да могат да се експортират. Проверете дали сте избрали категория за експортиране, която съдържа въпроси.",
     "noreviewattempt": "Вие нямате право да прегледате този опит.",
     "notyetgraded": "Още не е оценен",
     "outof": "{{$a.grade}} от {{$a.maxgrade}}",
@@ -49,7 +49,7 @@
     "stateinprogress": "В процес",
     "stateoverdue": "Закъснял",
     "stateoverduedetails": "Трябва да се предаде до {{$a}}",
-    "status": "Състояние",
+    "status": "Позволяване достъп като гост",
     "submitallandfinish": "Предаване на всичко и приключване",
     "summaryofattempt": "Обобщение на опита",
     "summaryofattempts": "Обобщение на предишните Ви опити",
diff --git a/www/addons/mod/quiz/lang/ca.json b/www/addons/mod/quiz/lang/ca.json
index 0996d785247..aab90187cf8 100644
--- a/www/addons/mod/quiz/lang/ca.json
+++ b/www/addons/mod/quiz/lang/ca.json
@@ -35,9 +35,9 @@
     "grademethod": "Mètode de qualificació",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Aquest qüestionari té dades fora de línia per sincronitzar.",
-    "marks": "Punts",
+    "marks": "Puntuacions",
     "mustbesubmittedby": "Aquest intent s'ha d'enviar abans de {{$a}}.",
-    "noquestions": "Encara no s'han afegit preguntes",
+    "noquestions": "No s'han trobat preguntes que puguin ser exportades. Assegureu-vos que seleccioneu una categoria d'exportació que contingui preguntes.",
     "noreviewattempt": "No teniu permís per revisar aquest intent.",
     "notyetgraded": "Encara no s'ha avaluat",
     "opentoc": "Obre la navegació per preguntes.",
@@ -67,7 +67,7 @@
     "stateinprogress": "En progrés",
     "stateoverdue": "Venciment",
     "stateoverduedetails": "Ha d'enviar-se en {{$a}}",
-    "status": "Estat",
+    "status": "Permetre l'accés de visitants",
     "submitallandfinish": "Envia i acaba",
     "summaryofattempt": "Resum de l'intent",
     "summaryofattempts": "Resum dels vostres intents anteriors",
diff --git a/www/addons/mod/quiz/lang/cs.json b/www/addons/mod/quiz/lang/cs.json
index 7218ee18af2..04e533bd0b2 100644
--- a/www/addons/mod/quiz/lang/cs.json
+++ b/www/addons/mod/quiz/lang/cs.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Při ukládání dat pokusu došlo k chybě.",
     "errorsyncquiz": "Při synchronizaci došlo k chybě. Zkuste to znovu, prosím.",
     "errorsyncquizblocked": "Tento test nelze synchronizovat z důvodu probíhajícího procesu. Prosím zkuste to znovu později. Pokud problém přetrvává, zkuste restartovat aplikaci.",
-    "feedback": "Komentář",
+    "feedback": "Reakce",
     "finishattemptdots": "Dokončení pokusu ...",
     "finishnotsynced": "Ukončeno bez synchronizace",
     "grade": "Známka",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Tento test má offline data, která mají být synchronizována.",
     "marks": "Body",
     "mustbesubmittedby": "Tento pokus musí být odeslán nejpozději {{$a}}.",
-    "noquestions": "Dosud nebyly vloženy žádné úlohy.",
+    "noquestions": "Nenalezeny žádné úlohy k exportu. Vybrali jste správnou kategorii k exportu?",
     "noreviewattempt": "Nemůžete revidovat tento pokus.",
     "notyetgraded": "Dosud nehodnoceno",
     "opentoc": "Otevřete navigaci.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Probíhá",
     "stateoverdue": "Překročen časový limit",
     "stateoverduedetails": "Musí být odesláno {{$a}}",
-    "status": "Stav",
+    "status": "Povolit přístup pro hosty",
     "submitallandfinish": "Odeslat vše a ukončit pokus",
     "summaryofattempt": "Souhrn pokusu",
     "summaryofattempts": "Souhrn vašich předchozích pokusů",
diff --git a/www/addons/mod/quiz/lang/da.json b/www/addons/mod/quiz/lang/da.json
index 0a636b82677..5e91aea6688 100644
--- a/www/addons/mod/quiz/lang/da.json
+++ b/www/addons/mod/quiz/lang/da.json
@@ -15,7 +15,7 @@
     "connectionerror": "Har mistet forbindelse til netværket. (Autosave slog fejl).\n\nNoter alle svar, der er skrevet på denne side i løbet af de sidste par minutter, og prøv så at genoprette forbindelsen.\n\nNår forbindelsen er genoprettet, skulle dine svar være gemt, og denne besked forsvinder.",
     "continueattemptquiz": "Fortsæt fra sidste forsøg",
     "continuepreview": "Fortsæt sidste gennemsyn",
-    "feedback": "Tilbagemelding",
+    "feedback": "Feedback",
     "finishattemptdots": "Afslut quizzen...",
     "finishnotsynced": "Afsluttet, men ikke synkroniseret",
     "grade": "Karakter",
@@ -26,7 +26,7 @@
     "hasdatatosync": "Quizzen har data offline der skal synkroniseres.",
     "marks": "Point",
     "mustbesubmittedby": "Svaret skal indsendes senest {{$a}}",
-    "noquestions": "Der er ikke tilføjet nogen spørgsmål  endnu",
+    "noquestions": "Der var ingen spørgsmål, som kunne eksporteres. Sørg for at vælge en kategori til eksport, der indeholder spørgsmål.",
     "noreviewattempt": "Du har ikke tilladelse til at gennemse denne besvarelse.",
     "notyetgraded": "Ikke vurderet endnu",
     "outof": "{{$a.grade}} ud af {{$a.maxgrade}}",
@@ -55,7 +55,7 @@
     "stateinprogress": "I gang",
     "stateoverdue": "Tiden er udløbet",
     "stateoverduedetails": "Skal afleveres senest {{$a}}",
-    "status": "Status",
+    "status": "Tillad gæsteadgang",
     "submitallandfinish": "--== Gem og aflever ==--",
     "summaryofattempt": "Oversigt over besvarelse",
     "summaryofattempts": "Oversigt over dine besvarelser",
diff --git a/www/addons/mod/quiz/lang/de.json b/www/addons/mod/quiz/lang/de.json
index 5039eb5f17d..f1b5f5dc5d8 100644
--- a/www/addons/mod/quiz/lang/de.json
+++ b/www/addons/mod/quiz/lang/de.json
@@ -37,7 +37,7 @@
     "hasdatatosync": "Dieser Test enthält Offline-Daten, die synchonisiert werden müssen.",
     "marks": "Punkte",
     "mustbesubmittedby": "Dieser Versuch muss abgegeben werden vor {{$a}}.",
-    "noquestions": "Es wurden noch keine Fragen eingetragen.",
+    "noquestions": "Es wurden keine Fragen gefunden, die exportiert werden könnten. Stellen Sie sicher, dass Sie eine Kategorie ausgewählt haben, die auch Fragen enthält.",
     "noreviewattempt": "Sie dürfen diesen Versuch nicht prüfen.",
     "notyetgraded": "Bisher nicht bewertet",
     "opentoc": "Offenes Navigationsfeld",
@@ -67,7 +67,7 @@
     "stateinprogress": "In Bearbeitung",
     "stateoverdue": "Überfällig",
     "stateoverduedetails": "Muss abgegeben werden von {{$a}}",
-    "status": "Status",
+    "status": "Gastzugang erlauben",
     "submitallandfinish": "Abgabe",
     "summaryofattempt": "Zusammenfassung der Versuche",
     "summaryofattempts": "Zusammenfassung der vorherigen Versuche",
diff --git a/www/addons/mod/quiz/lang/el.json b/www/addons/mod/quiz/lang/el.json
index 2f0e390e7db..8a79bcadbf7 100644
--- a/www/addons/mod/quiz/lang/el.json
+++ b/www/addons/mod/quiz/lang/el.json
@@ -23,7 +23,7 @@
     "errorsaveattempt": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια αποθήκευσης των δεδομένων.",
     "errorsyncquiz": "Παρουσιάστηκε σφάλμα κατά το συγχρονισμό. Παρακαλώ προσπαθήστε ξανα.",
     "errorsyncquizblocked": "Αυτό το κουίζ δεν μπορεί να συγχρονιστεί τώρα εξαιτίας μιας εκτελούμενης διαδικασίας. Παρακαλώ δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, δοκιμάστε να επανεκκινήσετε την εφαρμογή.",
-    "feedback": "Ανάδραση",
+    "feedback": "Ανατροφοδότηση",
     "finishattemptdots": "Τελειώστε την προσπάθεια ...",
     "finishnotsynced": "Ολοκληρωμένο αλλά όχι συγχρονισμένο",
     "grade": "Βαθμός",
@@ -59,7 +59,7 @@
     "statefinished": "Ολοκληρωμένο",
     "statefinisheddetails": "Υποβλήθηκε {{$a}}",
     "stateoverduedetails": "Πρέπει να υποβληθεί μέχρι {{$a}}",
-    "status": "Κατάσταση",
+    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
     "submitallandfinish": "Υποβολή όλων και τέλος",
     "summaryofattempt": "Περίληψη προσπάθειας",
     "summaryofattempts": "Περίληψη προηγούμενων προσπαθειών",
diff --git a/www/addons/mod/quiz/lang/es-mx.json b/www/addons/mod/quiz/lang/es-mx.json
index c731842aa83..bd49eed6816 100644
--- a/www/addons/mod/quiz/lang/es-mx.json
+++ b/www/addons/mod/quiz/lang/es-mx.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Ocurrió un error al guardar los datos del intento.",
     "errorsyncquiz": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente.",
     "errorsyncquizblocked": "Este examen no puede sincronizarse ahorita mismo porque existe una operación en curso. Por favor inténtelo nuevamente después. Si el problema persiste, por favor reinicie la App.",
-    "feedback": "Comentario de retroalimentación",
+    "feedback": "Retroalimentación",
     "finishattemptdots": "Terminar intento ...",
     "finishnotsynced": "Terminado pero no sincronizado",
     "grade": "Calificación",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Este examen tiene datos fuera-de-línea para ser sincronizados.",
     "marks": "Puntos",
     "mustbesubmittedby": "Este intento debe ser enviado para {{$a}}.",
-    "noquestions": "Aún no se han agregado preguntas",
+    "noquestions": "No se encontraron preguntas que pudiesen ser exportadas. Asegúrese de que elija una categoría para exportar que si contenga preguntas.",
     "noreviewattempt": "Usted no tiene permiso para revisar este intento.",
     "notyetgraded": "Sin calificar aún",
     "opentoc": "Abrir ventanilla de navegación.",
@@ -67,7 +67,7 @@
     "stateinprogress": "En progreso",
     "stateoverdue": "Retrasado",
     "stateoverduedetails": "Debe ser enviado para {{$a}}",
-    "status": "Estatus",
+    "status": "Se permite el acceso de invitados",
     "submitallandfinish": "Enviar todo y terminar",
     "summaryofattempt": "Resumen del intento",
     "summaryofattempts": "Resumen de sus intentos previos",
diff --git a/www/addons/mod/quiz/lang/es.json b/www/addons/mod/quiz/lang/es.json
index 7752e7926e8..bfc7906b0f8 100644
--- a/www/addons/mod/quiz/lang/es.json
+++ b/www/addons/mod/quiz/lang/es.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Ocurrió un error al guardar los datos del intento.",
     "errorsyncquiz": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente.",
     "errorsyncquizblocked": "Este cuestionario no puede sincronizarse ahora mismo porque existe una operación en curso. Por favor inténtelo nuevamente después. Si el problema persiste, por favor reinicie la app.",
-    "feedback": "Comentario -",
+    "feedback": "Retroalimentación",
     "finishattemptdots": "Terminar intento...",
     "finishnotsynced": "Finalizado pero no sincronizado.",
     "grade": "Calificación",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Este cuestionario tienen datos fuera de línea pendientes de ser sincronizados.",
     "marks": "Puntos",
     "mustbesubmittedby": "Este intento debe ser presentado por {{$a}}.",
-    "noquestions": "Aún no se han agregado preguntas",
+    "noquestions": "No se encontraron preguntas que pudiesen ser exportadas. Asegúrese de que ha seleccionado una categoría para exportar que contenga preguntas.",
     "noreviewattempt": "Usted no tiene permiso para revisar este intento.",
     "notyetgraded": "Sin calificar aún",
     "opentoc": "Abrir menú de navegación.",
@@ -67,7 +67,7 @@
     "stateinprogress": "En curso",
     "stateoverdue": "Atrasado",
     "stateoverduedetails": "Debe ser presentado por {{$a}}",
-    "status": "Estatus",
+    "status": "Se permite el acceso de invitados",
     "submitallandfinish": "Enviar todo y terminar",
     "summaryofattempt": "Resumen del intento",
     "summaryofattempts": "Resumen de sus intentos previos",
diff --git a/www/addons/mod/quiz/lang/eu.json b/www/addons/mod/quiz/lang/eu.json
index a09d62d8049..600230508ed 100644
--- a/www/addons/mod/quiz/lang/eu.json
+++ b/www/addons/mod/quiz/lang/eu.json
@@ -29,15 +29,15 @@
     "feedback": "Feedbacka",
     "finishattemptdots": "Amaitu saiakera...",
     "finishnotsynced": "Bukatua baina sinkronizatu gabe.",
-    "grade": "Nota",
+    "grade": "Kalifikazioa",
     "gradeaverage": "Batez besteko kalifikazioa",
     "gradehighest": "Notarik altuena",
     "grademethod": "Kalifikazio-metodoa",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Galdetegi honek sinkronizatu beharreko lineaz kanpoko datuak ditu.",
-    "marks": "Puntuak",
+    "marks": "Puntuazioak",
     "mustbesubmittedby": "Saiakera hau {{$a}}-(e)k bidali behar du.",
-    "noquestions": "Ez da galderarik gehitu oraindik",
+    "noquestions": "Ez da esporta daitekeen galderarik aurkitu. Ziurta ezazu aukeratu duzun kategoriak galderak badituela.",
     "noreviewattempt": "Ez duzu saiakera hau berrikusteko baimenik.",
     "notyetgraded": "Ez da oraindik kalifikatu",
     "opentoc": "Ireki nabigazioa gainean.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Ari da",
     "stateoverdue": "Atzeratutakoak",
     "stateoverduedetails": "{{$a}}-(e)k bidali behar du.",
-    "status": "Egoera",
+    "status": "Bisitarien sarbidea baimendu",
     "submitallandfinish": "Bidali dena eta bukatu",
     "summaryofattempt": "Saiakeren laburpena",
     "summaryofattempts": "Orain arteko zure saiakeren laburpena",
diff --git a/www/addons/mod/quiz/lang/fa.json b/www/addons/mod/quiz/lang/fa.json
index 32834035097..deb11e1a177 100644
--- a/www/addons/mod/quiz/lang/fa.json
+++ b/www/addons/mod/quiz/lang/fa.json
@@ -4,7 +4,7 @@
     "attemptnumber": "تلاش",
     "attemptquiznow": "شرکت در آزمون",
     "attemptstate": "وضعیت",
-    "comment": "توضیح",
+    "comment": "دیدگاه",
     "completedon": "پایان",
     "confirmclose": "شما در آستانهٔ اتمام شرکت خود در آزمون هستید. پس ا ز اتمام شرکت دیگر نمی‌توانید پاسخ‌های خود را تغییر دهید.",
     "confirmleavequizonerror": "در حین ذخیرهٔ پاسخ‌ها خطایی رخ داد. آیا مطمئن هستید که می‌خواهید از آزمون خارج شوید؟",
@@ -17,7 +17,7 @@
     "gradehighest": "بیشترین نمره",
     "grademethod": "روش نمره دادن",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} از {{$a.quizgrade}}.",
-    "marks": "جمع نمره",
+    "marks": "نمره",
     "mustbesubmittedby": "تا پیش از {{$a}} باید پاسخ‌های خود را ثبت کنید.",
     "noquestions": "هنوز سؤالی اضافه نشده است",
     "outof": "{{$a.grade}} از {{$a.maxgrade}}",
@@ -42,7 +42,7 @@
     "statefinisheddetails": "ثبت شده در: {{$a}}",
     "stateinprogress": "در جریان",
     "stateoverdue": "از موعد گذشته",
-    "status": "وضعیت",
+    "status": "اجازهٔ ورود به عنوان مهمان",
     "submitallandfinish": "ثبت همهٔ پاسخ‌ها و اتمام آزمون",
     "summaryofattempt": "وضعیت شرکت در آزمون",
     "summaryofattempts": "نتایج خلاصهٔ دفعه‌های قبلی شرکت شما در آزمون",
diff --git a/www/addons/mod/quiz/lang/fr.json b/www/addons/mod/quiz/lang/fr.json
index 5877d4c76d2..0412f724288 100644
--- a/www/addons/mod/quiz/lang/fr.json
+++ b/www/addons/mod/quiz/lang/fr.json
@@ -35,9 +35,9 @@
     "grademethod": "Méthode d'évaluation",
     "gradesofar": "{{$a.method}} : {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Ce test a des données à synchroniser.",
-    "marks": "Points",
+    "marks": "Notes",
     "mustbesubmittedby": "Cette tentative doit être envoyée avant {{$a}}.",
-    "noquestions": "Aucune question n'a été encore ajoutée",
+    "noquestions": "Aucune question à exporter. Assurez-vous que vous avez sélectionné pour l'exportation une catégorie contenant des questions.",
     "noreviewattempt": "Vous n'êtes pas autorisé à relire cette tentative.",
     "notyetgraded": "Pas encore évalué",
     "opentoc": "Ouvrir la navigation",
@@ -67,7 +67,7 @@
     "stateinprogress": "En cours",
     "stateoverdue": "En retard",
     "stateoverduedetails": "Doit être remis par {{$a}}",
-    "status": "État",
+    "status": "Permettre l'accès anonyme",
     "submitallandfinish": "Tout envoyer et terminer",
     "summaryofattempt": "Résumé de la tentative",
     "summaryofattempts": "Résumé de vos tentatives précédentes",
diff --git a/www/addons/mod/quiz/lang/he.json b/www/addons/mod/quiz/lang/he.json
index ca948e5453b..e45e53000cb 100644
--- a/www/addons/mod/quiz/lang/he.json
+++ b/www/addons/mod/quiz/lang/he.json
@@ -11,16 +11,16 @@
     "confirmstartheader": "בוחן מתוזמן",
     "continueattemptquiz": "המשך נסיון המענה האחרון שלך",
     "continuepreview": "המשך בצפיה המוקדמת האחרונה",
-    "feedback": "משוב",
+    "feedback": "משוב לבחירה בתשובה זו",
     "finishattemptdots": "סיום נסיון מענה...",
-    "grade": "ציון",
+    "grade": "ניקוד בפעילות",
     "gradeaverage": "ציון ממוצע",
     "gradehighest": "הציון הגבוה ביותר",
     "grademethod": "שיטת מתן ציונים",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "marks": "נקודות",
     "mustbesubmittedby": "יש צורך להגיש את נסיון מענה זה",
-    "noquestions": "בשלב זה, יש להוסיף שאלות לבוחן על מנת שאפשר יהיה להציג אותו בפני התלמידים",
+    "noquestions": "לא נמצאו שאלות ליצוא. יש לוודא כי נבחרה הקטגוריה ובה תוכן השאלות לבחירה.",
     "noreviewattempt": "אין הרשאה לצפות בנסיון מענה זה",
     "notyetgraded": "לא ניתן ציון עדיין",
     "outof": "{{$a.grade}} מתוך ציון מירבי של {{$a.maxgrade}}",
@@ -49,7 +49,7 @@
     "stateinprogress": "בתהליך",
     "stateoverdue": "באיחור",
     "stateoverduedetails": "מוכרח להיות מוגש עד {{$a}}",
-    "status": "מצב",
+    "status": "הקורס זמין לאורחים",
     "submitallandfinish": "הגשה סופית וסיום ניסיון המענה (בוחן)",
     "summaryofattempt": "סיכום הנסיון",
     "summaryofattempts": "סיכום ניסיונות המענה הקודמים שלך",
diff --git a/www/addons/mod/quiz/lang/hu.json b/www/addons/mod/quiz/lang/hu.json
index 7672fda34fe..dc398af2717 100644
--- a/www/addons/mod/quiz/lang/hu.json
+++ b/www/addons/mod/quiz/lang/hu.json
@@ -19,9 +19,9 @@
     "gradehighest": "Legmagasabb pont",
     "grademethod": "Pontozási módszer",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Pontok",
+    "marks": "Osztályzatok",
     "mustbesubmittedby": "A próbálkozást {{$a}} időpontig le kell adni.",
-    "noquestions": "Nincs még hozzáadva kérdés",
+    "noquestions": "Nincs exportálható kérdés. Ellenőrizze, hogy az exportálandó kategória tartalmaz-e kérdéseket.",
     "noreviewattempt": "Ezt a próbálkozást nem ellenőrizheti.",
     "notyetgraded": "Még nincs lepontozva",
     "outof": "{{$a.grade}} a maximum {{$a.maxgrade}} közül",
@@ -50,7 +50,7 @@
     "stateinprogress": "Folyamatban",
     "stateoverdue": "Lejárt",
     "stateoverduedetails": "Leadanadó eddig: {{$a}}",
-    "status": "Állapot",
+    "status": "Vendégkénti belépés engedélyezése",
     "submitallandfinish": "Az összes leadása és befejezés",
     "summaryofattempt": "Próbálkozások összegzése",
     "summaryofattempts": "Korábbi próbálkozásainak összegzése",
diff --git a/www/addons/mod/quiz/lang/it.json b/www/addons/mod/quiz/lang/it.json
index 95eff85b569..c077b20d0a9 100644
--- a/www/addons/mod/quiz/lang/it.json
+++ b/www/addons/mod/quiz/lang/it.json
@@ -29,7 +29,7 @@
     "hasdatatosync": "Il quiz ha dati offline da sincronizzare.",
     "marks": "Punteggio",
     "mustbesubmittedby": "Questo tentativo deve essere inviato entro {{$a}}.",
-    "noquestions": "Ancora non sono state aggiunte domande",
+    "noquestions": "Non sono state trovate domande da esportare. Accertati di aver selezionato per l'esportazione una categoria che contenga domande.",
     "noreviewattempt": "Non hai il privilegio di rivedere questo tentativo.",
     "notyetgraded": "Non ancora valutato",
     "outof": "{{$a.grade}} su un massimo di {{$a.maxgrade}}",
@@ -58,7 +58,7 @@
     "stateinprogress": "In svolgimento",
     "stateoverdue": "Fuori tempo massimo",
     "stateoverduedetails": "Deve essere inviato da {{$a}}",
-    "status": "Stato",
+    "status": "Consenti l'accesso agli ospiti",
     "submitallandfinish": "Invia tutto e termina",
     "summaryofattempt": "Riepilogo del tentativo",
     "summaryofattempts": "Riepilogo dei tuoi tentativi precedenti ",
diff --git a/www/addons/mod/quiz/lang/ja.json b/www/addons/mod/quiz/lang/ja.json
index f7b4d3d133f..28d69ebaccf 100644
--- a/www/addons/mod/quiz/lang/ja.json
+++ b/www/addons/mod/quiz/lang/ja.json
@@ -14,14 +14,14 @@
     "continuepreview": "前回受験のプレビューを続ける",
     "feedback": "フィードバック",
     "finishattemptdots": "受験を終了する ...",
-    "grade": "評点",
+    "grade": "評定",
     "gradeaverage": "平均評点",
     "gradehighest": "最高評点",
     "grademethod": "評定方法",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
-    "marks": "得点",
+    "marks": "評点",
     "mustbesubmittedby": "この受験は {{$a}} までに送信される必要があります。",
-    "noquestions": "まだ問題が追加されていません。",
+    "noquestions": "エクスポートできる問題が見つかりませんでした。あなたがエクスポートする問題が含まれるカテゴリを選択したか確認してください。",
     "noreviewattempt": "あなたはこの受験のレビューを許可されていません。",
     "notyetgraded": "未評定",
     "outof": "{{$a.grade}} / {{$a.maxgrade}}",
@@ -50,7 +50,7 @@
     "stateinprogress": "進行中",
     "stateoverdue": "期限切れ",
     "stateoverduedetails": "送信期限: {{$a}}",
-    "status": "ステータス",
+    "status": "ゲストアクセスを許可する",
     "submitallandfinish": "すべてを送信して終了する",
     "summaryofattempt": "受験概要",
     "summaryofattempts": "あなたの前回の受験概要",
diff --git a/www/addons/mod/quiz/lang/lt.json b/www/addons/mod/quiz/lang/lt.json
index 3d18000f600..a9b84de258e 100644
--- a/www/addons/mod/quiz/lang/lt.json
+++ b/www/addons/mod/quiz/lang/lt.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Klaida saugant duomenis.",
     "errorsyncquiz": "Klaida sinchronizuojant. Pamėginkite vėliau.",
     "errorsyncquizblocked": "Testo negalima sinchronizuoti dėl vykstančių procesų. Mėginkite vėliau. Jei nepavyks, perkraukite programėlę.",
-    "feedback": "Atsiliepimas",
+    "feedback": "Grįžtamasis ryšys",
     "finishattemptdots": "Baigti bandymą...",
     "finishnotsynced": "Baigta, bet nesinchronizuota",
     "grade": "Įvertis",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Neprijungti duomenys teste turi būti sinchronizuojami.",
     "marks": "Balai",
     "mustbesubmittedby": "Atsakymą turi pateikti {{$a}}.",
-    "noquestions": "Dar neįtraukta jokių klausimų",
+    "noquestions": "Nerasta klausimų, kuriuos galima eksportuoti. Įsitikinkite, kad eksportavimui pasirinkote kategoriją turinčią klausimų.",
     "noreviewattempt": "Jūs negalite peržiūrėti šio bandymo.",
     "notyetgraded": "Dar neįvertinta",
     "opentoc": "Atidaryti naršymo skirtuką.",
@@ -66,7 +66,7 @@
     "stateinprogress": "Nebaigta",
     "stateoverdue": "Pavėluotas",
     "stateoverduedetails": "Turi būti pateiktas {{$a}}",
-    "status": "Būsena",
+    "status": "Leisti svečio prieigą",
     "submitallandfinish": "Pateikti viską ir baigti",
     "summaryofattempt": "Bandymo suvestinė",
     "summaryofattempts": "Ankstesnių bandymų suvestinė",
diff --git a/www/addons/mod/quiz/lang/nl.json b/www/addons/mod/quiz/lang/nl.json
index 34e77ec88d4..da17aac110f 100644
--- a/www/addons/mod/quiz/lang/nl.json
+++ b/www/addons/mod/quiz/lang/nl.json
@@ -5,7 +5,7 @@
     "attemptquiznow": "Start de test nu",
     "attemptstate": "Status",
     "cannotsubmitquizdueto": "De test can niet ingestuurd worden om volgende redenen:",
-    "comment": "Commentaar",
+    "comment": "Opmerking",
     "completedon": "Voltooid op",
     "confirmclose": "Je gaat deze poging afsluiten. Eens afgesloten kun je je antwoorden voor deze poging niet meer wijzigen.",
     "confirmcontinueoffline": "Deze poging is niet meer gesynchroniseerd sinds {{$a}}. Als je verder gewerkt hebt aan deze poging met een ander toestel na dit moment, dan kun je data verliezen.",
@@ -29,15 +29,15 @@
     "feedback": "Feedback",
     "finishattemptdots": "Beëindig poging...",
     "finishnotsynced": "Klaar maar niet gesynchroniseerd",
-    "grade": "Cijfer",
+    "grade": "Beoordeling",
     "gradeaverage": "Gemiddelde cijfer",
     "gradehighest": "Hoogste cijfer",
     "grademethod": "Beoordelingsmethode",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
     "hasdatatosync": "De test heeft offline data die gesynchroniseerd moet worden.",
-    "marks": "Punten",
+    "marks": "Cijfers",
     "mustbesubmittedby": "Deze poging moet ingestuurd worden door {{$a}}.",
-    "noquestions": "Er zijn nog geen vragen toegevoegd",
+    "noquestions": "Er zijn geen vragen gevonden die geëxporteerd kunnen worden. Zorg ervoor dat en een categorie geselecteerd die vragen bevat om te exporteren.",
     "noreviewattempt": "Je mag deze poging niet nakijken",
     "notyetgraded": "Nog niet beoordeeld",
     "opentoc": "Open navigatie.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Bezig",
     "stateoverdue": "Te laat",
     "stateoverduedetails": "Moet ingestuurd worden door {{$a}}",
-    "status": "Status",
+    "status": "Gasttoegang toestaan",
     "submitallandfinish": "Bewaar alles en beëindig test",
     "summaryofattempt": "Samenvatting van poging",
     "summaryofattempts": "Samenvatting van al je pogingen",
diff --git a/www/addons/mod/quiz/lang/pl.json b/www/addons/mod/quiz/lang/pl.json
index 14072e4ed74..8ca44ba3694 100644
--- a/www/addons/mod/quiz/lang/pl.json
+++ b/www/addons/mod/quiz/lang/pl.json
@@ -21,7 +21,7 @@
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
     "marks": "Punkty",
     "mustbesubmittedby": "Próba musi być wykonana przez {{$a}}.",
-    "noquestions": "Nie dodano jeszcze żadnego pytania",
+    "noquestions": "Brak pytań do eksportowania. Upewnij się, że wybrano kategorię, który zawiera pytania.",
     "noreviewattempt": "Nie masz uprawnień do dokonania przeglądu tej próby.",
     "notyetgraded": "Jeszcze nie ocenione",
     "outof": "{{$a.grade}} z możliwych do uzyskania {{$a.maxgrade}}",
@@ -49,7 +49,7 @@
     "stateinprogress": "W toku",
     "stateoverdue": "Zaległe",
     "stateoverduedetails": "Musi być przesłane przez {{$a}}",
-    "status": "Stan",
+    "status": "Zezwól na dostęp gości",
     "submitallandfinish": "Zatwierdź wszystkie i zakończ",
     "summaryofattempt": "Podsumowanie próby",
     "summaryofattempts": "Podsumowanie twoich poprzednich podejść",
diff --git a/www/addons/mod/quiz/lang/pt-br.json b/www/addons/mod/quiz/lang/pt-br.json
index d7a242a292f..006a0a7827a 100644
--- a/www/addons/mod/quiz/lang/pt-br.json
+++ b/www/addons/mod/quiz/lang/pt-br.json
@@ -10,7 +10,7 @@
     "confirmclose": "Uma vez enviada, você não poderá alterar as respostas para esta tentativa.",
     "confirmcontinueoffline": "A tentativa não foi sincronizada desde {{$a}}. Se você continuou essa tentativa em outro dispositivo desde então, você poderá perder dados.",
     "confirmleavequizonerror": "Ocorreu um erro ao salvar as respostas. Você tem certeza que quer sair do questionário?",
-    "confirmstart": "O questionário tem um limite de tempo de {{$a}}. O cronómetro começará a contar a partir do momento em que iniciar a tentativa e deverá submetê-la antes do tempo acabar. Tem certeza que quer iniciar a tentativa agora?",
+    "confirmstart": "O questionário tem um limite de tempo de {{$a}}. O cronômetro começará a contar a partir do momento em que iniciar a tentativa e deverá submetê-la antes do tempo acabar. Tem certeza que quer iniciar a tentativa agora?",
     "confirmstartheader": "Questionário com limite de tempo",
     "connectionerror": "Conexão de rede perdida. (Salvamento automático falhou). Anote quaisquer respostas registradas nesta página nos últimos minutos e tente conectar-se novamente. Quando a conexão for restabelecida, suas respostas devem ser salvas e esta mensagem irá desaparecer.",
     "continueattemptquiz": "Continuar a última tentativa",
@@ -26,18 +26,18 @@
     "errorsaveattempt": "Aconteceu um erro ao salvar os dados da tentativa.",
     "errorsyncquiz": "Aconteceu um erro enquanto sincronizava. Por favor tente novamente.",
     "errorsyncquizblocked": "Esse questionário não pode ser sincronizado nesse exato momento por causa de um processo em andamento.Por favor tente mais tarde. Se o problema persistir, tente reiniciar o aplicativo.",
-    "feedback": "Comentários",
+    "feedback": "Feedback",
     "finishattemptdots": "Tentativas encerradas",
     "finishnotsynced": "Finalizado, mas não sincronizado",
-    "grade": "Avaliar",
+    "grade": "Nota",
     "gradeaverage": "Nota média",
     "gradehighest": "Nota mais alta",
     "grademethod": "Método de avaliação",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Esse questionário tem dados offline que precisam ser sincronizados.",
-    "marks": "Notas",
+    "marks": "Pontos",
     "mustbesubmittedby": "Esta tentativa precisa ser enviada até {{$a}}.",
-    "noquestions": "Ainda não foi inserida nenhuma pergunta",
+    "noquestions": "Nenhuma questão encontrada pode ser exportada. Certifique-se de que você selecionou uma categoria que contem questões para exportar.",
     "noreviewattempt": "Você não tem permissão para revisar esta tentativa.",
     "notyetgraded": "Ainda não avaliado",
     "opentoc": "Abrir dicas de navegação.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Em progresso",
     "stateoverdue": "Vencidas",
     "stateoverduedetails": "Precisam ser enviadas até {{$a}}",
-    "status": "Status",
+    "status": "Permitir o acesso de visitantes",
     "submitallandfinish": "Enviar tudo e terminar",
     "summaryofattempt": "Resumo de tentativas",
     "summaryofattempts": "Resumo das suas tentativas anteriores",
diff --git a/www/addons/mod/quiz/lang/pt.json b/www/addons/mod/quiz/lang/pt.json
index 6c553803f34..5a07d22677e 100644
--- a/www/addons/mod/quiz/lang/pt.json
+++ b/www/addons/mod/quiz/lang/pt.json
@@ -37,7 +37,7 @@
     "hasdatatosync": "Este teste tem dados offline que precisam de ser sincronizados.",
     "marks": "Nota",
     "mustbesubmittedby": "Esta tentativa deve ser submetida até {{$a}}.",
-    "noquestions": "Ainda não foi adicionada nenhuma pergunta",
+    "noquestions": "Não foram encontradas perguntas para exportação. Certifique-se que selecionou uma categoria com perguntas.",
     "noreviewattempt": "Não pode rever esta tentativa",
     "notyetgraded": "Por avaliar",
     "opentoc": "Abrir navegação",
@@ -67,7 +67,7 @@
     "stateinprogress": "Em progresso",
     "stateoverdue": "Expiradas",
     "stateoverduedetails": "Deve ser submetido até {{$a}}",
-    "status": "Estado",
+    "status": "Permitir o acesso de visitantes",
     "submitallandfinish": "Submeter tudo e terminar",
     "summaryofattempt": "Síntese da tentativa",
     "summaryofattempts": "Síntese das tentativas anteriores",
diff --git a/www/addons/mod/quiz/lang/ro.json b/www/addons/mod/quiz/lang/ro.json
index d45b35aa390..4217fceec67 100644
--- a/www/addons/mod/quiz/lang/ro.json
+++ b/www/addons/mod/quiz/lang/ro.json
@@ -9,13 +9,13 @@
     "continueattemptquiz": "Continuă ultima încercare",
     "continuepreview": "Continuă ultima vizualizare",
     "feedback": "Feedback",
-    "grade": "Notează",
+    "grade": "Notă",
     "gradeaverage": "Nota medie",
     "gradehighest": "Nota maximă",
     "grademethod": "Metoda de notare",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Puncte",
-    "noquestions": "Nici o întrebare nu a fost adăugată încă",
+    "marks": "Note",
+    "noquestions": "Nu s-au găsit întrebări care ar putea fi exportate. Asigurați-vă că ați selectat o categorie pentru export  care conține întrebări.",
     "outof": "{{$a.grade}} din maxim {{$a.maxgrade}} posibil",
     "outofpercent": "{{$a.grade}} din maxim {{$a.maxgrade}} ({{$a.percent}}%) posibil",
     "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
@@ -29,7 +29,7 @@
     "showall": "Afişează toate întrebările pe o singură pagină",
     "startedon": "Început la",
     "statefinished": "Terminat",
-    "status": "Status",
+    "status": "Permite accesul vizitatorilor",
     "submitallandfinish": "Trimite tot şi termină",
     "summaryofattempts": "Rezumatul încercărilor anterioare efectuate de dumneavoastră",
     "timeleft": "Timp rămas",
diff --git a/www/addons/mod/quiz/lang/ru.json b/www/addons/mod/quiz/lang/ru.json
index f6e5e3fee00..9933d98f310 100644
--- a/www/addons/mod/quiz/lang/ru.json
+++ b/www/addons/mod/quiz/lang/ru.json
@@ -22,7 +22,7 @@
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "marks": "Баллы",
     "mustbesubmittedby": "Эта попытка должна быть отправлена до {{$a}}.",
-    "noquestions": "Пока не добавлено ни одного вопроса",
+    "noquestions": "Не найдены вопросы, которые могут быть экспортированы. Убедитесь, что для экспорта Вы выбрали категорию, которая содержит вопросы.",
     "noreviewattempt": "Вам не разрешен просмотр этой попытки.",
     "notyetgraded": "Еще не оценено",
     "outof": "{{$a.grade}} из {{$a.maxgrade}}",
@@ -51,7 +51,7 @@
     "stateinprogress": "В процессе",
     "stateoverdue": "Просроченные",
     "stateoverduedetails": "Должны быть представлены {{$a}}",
-    "status": "Состояние",
+    "status": "Разрешить гостевой доступ",
     "submitallandfinish": "Отправить всё и завершить тест",
     "summaryofattempt": "Результат попытки",
     "summaryofattempts": "Результаты ваших предыдущих попыток",
diff --git a/www/addons/mod/quiz/lang/sv.json b/www/addons/mod/quiz/lang/sv.json
index cb771aab8be..5655a7b195d 100644
--- a/www/addons/mod/quiz/lang/sv.json
+++ b/www/addons/mod/quiz/lang/sv.json
@@ -12,14 +12,14 @@
     "continuepreview": "Fortsätt med den senaste förhandsgranskningen",
     "feedback": "Återkoppling",
     "finishattemptdots": "Avsluta försök",
-    "grade": "Betyg/omdöme",
+    "grade": "Betyg",
     "gradeaverage": "Medelbetyg",
     "gradehighest": "Högsta betyg",
     "grademethod": "Betygsättningsmetod",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Poäng",
+    "marks": "Rätt",
     "mustbesubmittedby": "Detta försöket måste skickas in av {{$a}}.",
-    "noquestions": "Inga frågor har ännu lagts till",
+    "noquestions": "Inga frågor hittades som kunde exporteras. Se till att du har valt en kategori att exportera som innehåller frågor.",
     "noreviewattempt": "Du har inte rätt att granska det här försöket. ",
     "notyetgraded": "Ännu inte betygssatta",
     "outof": "av ett maximum på",
@@ -48,7 +48,7 @@
     "stateinprogress": "Pågående",
     "stateoverdue": "Tiden har gått ut",
     "stateoverduedetails": "Måste skickas in av {{$a}}",
-    "status": "Status",
+    "status": "Tillåt gäster",
     "submitallandfinish": "Skicka in allt och avsluta",
     "summaryofattempt": "Sammanfattning av försök",
     "summaryofattempts": "Sammanfattning av dina tidigare försök",
diff --git a/www/addons/mod/quiz/lang/tr.json b/www/addons/mod/quiz/lang/tr.json
index 1c158b34a63..34957ae844a 100644
--- a/www/addons/mod/quiz/lang/tr.json
+++ b/www/addons/mod/quiz/lang/tr.json
@@ -14,14 +14,14 @@
     "continuepreview": "Son gözden geçirmeden itibaren devam et",
     "feedback": "Geribildirim",
     "finishattemptdots": "Uyuluma bitiyor...",
-    "grade": "Not",
+    "grade": "Başarı notu",
     "gradeaverage": "Not ortalaması",
     "gradehighest": "En yüksek not",
     "grademethod": "Notlandırma yöntemi",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Puanlar",
+    "marks": "Notlar",
     "mustbesubmittedby": "Bu uygulama {{$a}} tarafından gönderilmelidir.",
-    "noquestions": "Henüz bir soru eklenmemiş",
+    "noquestions": "ihraç edilecek soru bulunamadı. ihraç etmek için bir kategori seçtiğinize ve kategorinizin sorular içerdiğine emin olun.",
     "noreviewattempt": "Bu uygulamayı gözden geçirmek için izniniz yok.",
     "notyetgraded": "Henüz puanlanmadı",
     "outof": "{{$a.maxgrade}} üzerinden {{$a.grade}}",
@@ -50,7 +50,7 @@
     "stateinprogress": "Devam etmekte",
     "stateoverdue": "Süresi dolmuş",
     "stateoverduedetails": "{{$a}} tarafından teslim edilmelidir",
-    "status": "Durum",
+    "status": "Konuk erişimine izin ver",
     "submitallandfinish": "Tümünü gönder ve bitir",
     "summaryofattempt": "Uygulama özeti",
     "summaryofattempts": "Önceki uygulamalarınızın özeti",
diff --git a/www/addons/mod/quiz/lang/uk.json b/www/addons/mod/quiz/lang/uk.json
new file mode 100644
index 00000000000..52d19fb68a3
--- /dev/null
+++ b/www/addons/mod/quiz/lang/uk.json
@@ -0,0 +1,80 @@
+{
+    "attemptfirst": "Перша спроба",
+    "attemptlast": "Остання спроба",
+    "attemptnumber": "Спроба",
+    "attemptquiznow": "Почати тестування",
+    "attemptstate": "Стан",
+    "cannotsubmitquizdueto": "Ця спроба тесту не може бути представлена з наступних причин:",
+    "comment": "Коментар",
+    "completedon": "Завершено",
+    "confirmclose": "Ви вибрали закінчення тесту (даної спроби). Якщо ви це підтверджуєте, Ви більше не зможете змінювати ваші відповіді.",
+    "confirmcontinueoffline": "Ця спроба не була синхронізована, {{$a}}. Якщо ви продовжили цю спробу в іншому пристрої з тих пір, ви можете втратити дані.",
+    "confirmleavequizonerror": "При збереженні відповідей сталася помилка. Ви впевнені, що хочете залишити тест?",
+    "confirmstart": "Цей тест має обмеження в часі {{$a}}. Час почне відраховуватися з моменту, коли ви починаєте вашу спробу, і ви повинні будете закінчити вашу спробу допоки не спливе термін. Ви впевнені, що хочете почати зараз?",
+    "confirmstartheader": "Тест з обмеженням в часі",
+    "connectionerror": "Мережеве підключення втрачено. (Автозбереження не вдалося).\n\nЗапишіть відповіді введені на цій сторінці за останні кілька хвилин, потім спробуйте знову підключити.\n\nПісля того, як з'єднання буде відновлено, ваші відповіді мають бути збережені і це повідомлення зникне.",
+    "continueattemptquiz": "Продовжити останню спробу",
+    "continuepreview": "Продовжити останній перегляд",
+    "errorbehaviournotsupported": "Цей тест не може бути зроблений в додатку, тому що поведінка не підтримуються додатком:",
+    "errordownloading": "Помилка при завантаженні потрібних даних.",
+    "errorgetattempt": "Помилка при отриманні даних спроби.",
+    "errorgetquestions": "Помилка отримання питань.",
+    "errorgetquiz": "Помилка при отриманні даних тесту.",
+    "errorparsequestions": "Сталася помилка під час читання питання. Будь ласка, спроба цей тест в веб-браузері.",
+    "errorquestionsnotsupported": "Цей тест не може бути вирішених в додатку, оскільки він може містити питання, які не підтримуються додатком:",
+    "errorrulesnotsupported": "Цей тест не може бути зроблений в додатку, оскільки він має правило доступу, що не підтримується додатком:",
+    "errorsaveattempt": "При збереженні даних спроби сталася помилка.",
+    "errorsyncquiz": "Під час синхронізації сталася помилка. Будь ласка спробуйте ще раз.",
+    "errorsyncquizblocked": "Цей тест не може бути синхронізований прямо зараз через триваючий процес. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
+    "feedback": "Коментар",
+    "finishattemptdots": "Завершити спробу...",
+    "finishnotsynced": "Готово, але не синхронізовано",
+    "grade": "Оцінка",
+    "gradeaverage": "Середня оцінка",
+    "gradehighest": "Краща оцінка",
+    "grademethod": "Метод оцінювання",
+    "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
+    "hasdatatosync": "Цей тест має автономні дані будуть синхронізовані.",
+    "marks": "Оцінки",
+    "mustbesubmittedby": "Ця спроба має бути відправлена до {{$a}}.",
+    "noquestions": "Не знайдено жодного питання для експорту. Переконайтеся, що ви вибрали категорію для експорту, яка містить питання.",
+    "noreviewattempt": "Вам не дозволено переглядати цю спробу.",
+    "notyetgraded": "Ще не оцінено",
+    "opentoc": "Відкрити навігаційне повідомлення.",
+    "outof": "{{$a.grade}} з {{$a.maxgrade}} можливих",
+    "outofpercent": "{{$a.grade}} з можливих {{$a.maxgrade}} ({{$a.percent}}%)",
+    "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
+    "overallfeedback": "Розширений відгук",
+    "overdue": "Прострочено",
+    "overduemustbesubmittedby": "Ця спроба в даний час прострочена. Вона повинна вже були відправлена. Якщо Ви хочете, щоб цей тест було оцінено, Ви повинні відправити його до {{$a}}. Якщо ви не відправите його до вказаного часу, оцінки за цю спробу не будуть зараховані.",
+    "preview": "Перегляд",
+    "previewquiznow": "Переглянути тест зараз",
+    "question": "Питання",
+    "quizpassword": "Кодове слово тесту",
+    "reattemptquiz": "Зробити наступну спробу",
+    "requirepasswordmessage": "Щоб почати спробу тесту, ви повинні знати кодове слово тесту",
+    "returnattempt": "Повернутися до спроби",
+    "review": "Огляд",
+    "reviewofattempt": "Огляд спроби {{$a}}",
+    "reviewofpreview": "Огляд попереднього перегляду",
+    "showall": "Показати всі питання на одній сторінці",
+    "showeachpage": "Показати одну сторінку за раз",
+    "startattempt": "Почати спробу",
+    "startedon": "Розпочато",
+    "stateabandoned": "Не здано",
+    "statefinished": "Завершено",
+    "statefinisheddetails": "Здано {{$a}}",
+    "stateinprogress": "В процесі",
+    "stateoverdue": "Прострочено",
+    "stateoverduedetails": "Повинно бути надіслано {{$a}}",
+    "status": "Дозволити доступ для гостя",
+    "submitallandfinish": "Відправити все та завершити",
+    "summaryofattempt": "Результати спроби",
+    "summaryofattempts": "Результати ваших попередніх спроб",
+    "timeleft": "Залишилося часу",
+    "timetaken": "Витрачено часу",
+    "warningattemptfinished": "Offline спроби були відкинуті, так як вони були закінчені на сайті або не знайдені.",
+    "warningdatadiscarded": "Деякі відповіді форуму були відкинуті, бо питання були змінені в Інтернеті.",
+    "warningdatadiscardedfromfinished": "Спроба незакінчена, тому що деякі відповіді форуму були відкинуті. Будь ласка, ознайомтеся з Вашими відповідями і спробуйте ще раз.",
+    "yourfinalgradeis": "Ваша підсумкова оцінка за цей тест: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/zh-cn.json b/www/addons/mod/quiz/lang/zh-cn.json
index 1963fef5e87..f990b53b9c5 100644
--- a/www/addons/mod/quiz/lang/zh-cn.json
+++ b/www/addons/mod/quiz/lang/zh-cn.json
@@ -4,7 +4,7 @@
     "attemptnumber": "试卷",
     "attemptquiznow": "现在参加测验",
     "attemptstate": "状态",
-    "comment": "评论",
+    "comment": "评语",
     "completedon": "完成于",
     "confirmclose": "一旦提交，您将不能再修改在这次答题的答案。",
     "confirmstart": "这一测验有 {{$a}} 的时间限制。时间将从你开始做测验时倒数计时，而你必须在时限到之前提交答案。你确定你现在就要开始作答？",
@@ -19,9 +19,9 @@
     "gradehighest": "最高分",
     "grademethod": "评分办法",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
-    "marks": "分数",
+    "marks": "得分",
     "mustbesubmittedby": "此试卷必须在 {{$a}} 以前提交。",
-    "noquestions": "尚未添加试题",
+    "noquestions": "未找到可导出的题。请确认您要导出的类别包含题目。",
     "noreviewattempt": "您无权回顾此试卷。",
     "notyetgraded": "仍未评分",
     "outof": "{{$a.grade}}/满分{{$a.maxgrade}}",
@@ -50,7 +50,7 @@
     "stateinprogress": "进行中",
     "stateoverdue": "逾期",
     "stateoverduedetails": "必须于 {{$a}} 前提交",
-    "status": "状态",
+    "status": "允许访客访问",
     "submitallandfinish": "提交所有答案并结束",
     "summaryofattempt": "答题情况报告",
     "summaryofattempts": "您上次答题的概要",
diff --git a/www/addons/mod/quiz/lang/zh-tw.json b/www/addons/mod/quiz/lang/zh-tw.json
index 7447f9d66dd..1378a8f72bf 100644
--- a/www/addons/mod/quiz/lang/zh-tw.json
+++ b/www/addons/mod/quiz/lang/zh-tw.json
@@ -29,15 +29,15 @@
     "feedback": "回饋",
     "finishattemptdots": "完成作答....",
     "finishnotsynced": "已完成但未同步",
-    "grade": "分數",
+    "grade": "成績",
     "gradeaverage": "平均分數",
     "gradehighest": "最高分數",
     "grademethod": "評分方式",
     "gradesofar": "{{$a.method}}：{{$a.mygrade}} / {{$a.quizgrade}}。",
     "hasdatatosync": "此測驗有離線資料要做同步",
-    "marks": "得分",
+    "marks": "所有得分",
     "mustbesubmittedby": "這作答應該由{{$a}}提交",
-    "noquestions": "尚未加入題目",
+    "noquestions": "沒有找到可以被匯出的試題。要確定你有選出一個有包含試題的類別來匯出。",
     "noreviewattempt": "你不被允許重新檢視作答結果",
     "notyetgraded": "還沒被計分過",
     "opentoc": "打開導航彈出視窗.",
@@ -67,7 +67,7 @@
     "stateinprogress": "進行中",
     "stateoverdue": "過期",
     "stateoverduedetails": "必須在{{$a}}之前提交",
-    "status": "狀態",
+    "status": "允許訪客瀏覽",
     "submitallandfinish": "全部送出並結束",
     "summaryofattempt": "作答紀錄摘要",
     "summaryofattempts": "你的先前作答記錄摘要",
diff --git a/www/addons/mod/resource/lang/uk.json b/www/addons/mod/resource/lang/uk.json
new file mode 100644
index 00000000000..e21c3fdcd3c
--- /dev/null
+++ b/www/addons/mod/resource/lang/uk.json
@@ -0,0 +1,4 @@
+{
+    "errorwhileloadingthecontent": "Помилка при завантаженні вмісту.",
+    "openthefile": "Відкрити файл"
+}
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ar.json b/www/addons/mod/scorm/lang/ar.json
index 2c6c03156a5..14448e4ae61 100644
--- a/www/addons/mod/scorm/lang/ar.json
+++ b/www/addons/mod/scorm/lang/ar.json
@@ -11,17 +11,17 @@
     "errordownloadscorm": "خطأ عن تنزيل الحزمة التعليمية: \"{{name}}\"",
     "failed": "فشل",
     "firstattempt": "المحاولة الأولى",
-    "gradeaverage": "المتوسط",
+    "gradeaverage": "متوسط الدرجة",
     "gradeforattempt": "درجة للمحاولة",
-    "gradehighest": "الدرجة العليا",
-    "grademethod": "طريقة رصد الدرجات",
+    "gradehighest": "أعلى درجة",
+    "grademethod": "أسلوب التقييم",
     "gradereported": "الدرجة المعلنة",
     "gradescoes": "كائنات تعلّم",
     "gradesum": "الدرجة الاجمالية",
     "highestattempt": "أعلى محاولة",
     "incomplete": "غير مكتمل",
     "lastattempt": "المحاولاة الأخيرة",
-    "mode": "نمط",
+    "mode": "وضع",
     "newattempt": "ابداء محاولة جديدة",
     "noattemptsallowed": "عدد المحاولات المسموح بها",
     "noattemptsmade": "عدد المحاولات التي قمت بها",
@@ -30,5 +30,5 @@
     "organizations": "تنظيمات",
     "passed": "نجح",
     "reviewmode": "وضع المراجعة",
-    "suspended": "معلّق"
+    "suspended": "حساب معلّق"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ca.json b/www/addons/mod/scorm/lang/ca.json
index 196c9ad1c08..e62b9409f9c 100644
--- a/www/addons/mod/scorm/lang/ca.json
+++ b/www/addons/mod/scorm/lang/ca.json
@@ -32,7 +32,7 @@
     "highestattempt": "Intent més alt",
     "incomplete": "Incomplet",
     "lastattempt": "Darrer intent completat",
-    "mode": "Mode",
+    "mode": "Moda",
     "newattempt": "Comença un nou intent",
     "noattemptsallowed": "Nombre d'intents permesos",
     "noattemptsmade": "Nombre d'intents realitzats",
@@ -45,7 +45,7 @@
     "reviewmode": "Mode de revisió",
     "scormstatusnotdownloaded": "Aquest SCORM no s'ha descarregat. Ho farà automàticament quan l'obriu.",
     "scormstatusoutdated": "Aquest SCORM s'ha modificat des de la darrera descàrrega. Es descarregarà automàticament quan l'obriu.",
-    "suspended": "Suspès",
+    "suspended": "Compte invalidat",
     "warningofflinedatadeleted": "Algunes dades fora de línia de l'intent {{number}} s'han eliminat perquè no poden crear-se al nou intent.",
     "warningsynconlineincomplete": "Alguns intents no poden sincronitzar-se amb el lloc perquè el darrer intent en línia no ha finalitzat. Acabeu l'intent primer."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/cs.json b/www/addons/mod/scorm/lang/cs.json
index 533ab1989ac..4856bdd1546 100644
--- a/www/addons/mod/scorm/lang/cs.json
+++ b/www/addons/mod/scorm/lang/cs.json
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Dosáhli jste nejvyššího možného počtu pokusů.",
     "failed": "Nedokončeno úspěšně",
     "firstattempt": "První pokus",
-    "gradeaverage": "Průměrný bodový zisk",
+    "gradeaverage": "Průměrná známka",
     "gradeforattempt": "Hodnocení pokusu",
-    "gradehighest": "Nejvyšší bodový zisk",
+    "gradehighest": "Nejvyšší známka",
     "grademethod": "Metoda známkování",
     "gradereported": "Zobrazené hodnocení",
     "gradescoes": "Učební objekty",
@@ -32,7 +32,7 @@
     "highestattempt": "Nejlepší pokus",
     "incomplete": "Nedokončeno",
     "lastattempt": "Poslední pokus",
-    "mode": "Režim",
+    "mode": "Modus",
     "newattempt": "Začít nový pokus",
     "noattemptsallowed": "Počet povolených pokusů",
     "noattemptsmade": "Počet pokusů, které jste vyčerpali",
@@ -45,7 +45,7 @@
     "reviewmode": "Režim opakovaného náhledu",
     "scormstatusnotdownloaded": "Tento SCORM není stažen. Bude automaticky stažen, když jej otevřete.",
     "scormstatusoutdated": "Tento SCORM byl od posledního stažení změněn. Bude automaticky stažen, když jej otevřete.",
-    "suspended": "Pozastaveno",
+    "suspended": "Pozastavený účet",
     "warningofflinedatadeleted": "Některá offline data pokusu {{number}} byla zrušena, protože by nebylo možné vytvořit na nový pokus",
     "warningsynconlineincomplete": "Některé pokusy nemohou být synchronizovány s webem, protože poslední online pokus není dokončen. Prosím, dokončete nejprve online pokus."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/da.json b/www/addons/mod/scorm/lang/da.json
index b87612d58d4..880c09196ad 100644
--- a/www/addons/mod/scorm/lang/da.json
+++ b/www/addons/mod/scorm/lang/da.json
@@ -1,7 +1,7 @@
 {
     "asset": "Materiale",
     "assetlaunched": "Materiale - vist",
-    "attempts": "Forsøg",
+    "attempts": "Besvarelser",
     "averageattempt": "Gennemsnitlige forsøg",
     "browse": "Vis",
     "browsed": "Vist",
@@ -22,10 +22,10 @@
     "exceededmaxattempts": "Du har nået det maksimale antal forsøg.",
     "failed": "Dumpet",
     "firstattempt": "Første forsøg",
-    "gradeaverage": "Gennemsnitlig bedømmelse",
+    "gradeaverage": "Gennemsnitlig vurdering",
     "gradeforattempt": "Karakter for besvarelse",
-    "gradehighest": "Højeste bedømmelse",
-    "grademethod": "Bedømmelsesmetode",
+    "gradehighest": "Højeste vurdering",
+    "grademethod": "Vurdering ved gentagne forsøg",
     "gradereported": "Karakter rapporteret",
     "gradescoes": "Læringsobjekter",
     "gradesum": "Samlet bedømmelse",
@@ -45,7 +45,7 @@
     "reviewmode": "Gennemsynstilstand",
     "scormstatusnotdownloaded": "Denne SCORM er ikke downloadet. Den bliver automatisk downloadet når du åbner den.",
     "scormstatusoutdated": "Denne SCORM er ændret efter den sidste download. Den bliver automatisk downloadet når du åbner den.",
-    "suspended": "Suspenderet",
+    "suspended": "Suspenderet konto",
     "warningofflinedatadeleted": "Nogle af forsøgets offlinedata {{number}} er blevet slettet fordi de ikke kunne oprettes i et nyt forsøg.",
     "warningsynconlineincomplete": "Nogle forsøg kunne ikke synkroniseres med webstedet, fordi det sidste onlineforsøg ikke er afsluttet. Afslut først onlineforsøget."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/de.json b/www/addons/mod/scorm/lang/de.json
index f9c2cd8d027..19bf126366a 100644
--- a/www/addons/mod/scorm/lang/de.json
+++ b/www/addons/mod/scorm/lang/de.json
@@ -13,7 +13,7 @@
     "enter": "Start",
     "errorcreateofflineattempt": "Fehler beim Hinzufügen eines Offline-Versuchs. Versuchen Sie es noch einmal.",
     "errordownloadscorm": "Fehler beim Laden des Lernpakets '{{name}}'.",
-    "errorgetscorm": "Fehler beim Laden von Lernpaketdaten.",
+    "errorgetscorm": "Fehler beim Laden von Lernpaketdaten",
     "errorinvalidversion": "Die App unterstützt ausschließlich Lernpakete mit SCORM 1.2.",
     "errornotdownloadable": "Das Herunterladen von Lernpaketen ist für Ihre Website deaktiviert. Wenden Sie sich an den Administrator der Website.",
     "errornovalidsco": "Dieses Lernpaket hat kein sichtbares SCO zum Laden.",
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Sie haben die Höchstzahl der Versuche erreicht.",
     "failed": "Fehlgeschlagen",
     "firstattempt": "Erster Versuch",
-    "gradeaverage": "Durchschnittsnote",
+    "gradeaverage": "Durchschnitt",
     "gradeforattempt": "Bewertung für Versuch",
-    "gradehighest": "Höchstnote",
+    "gradehighest": "Bester Versuch",
     "grademethod": "Bewertungsmethode",
     "gradereported": "Bewertung veröffentlicht",
     "gradescoes": "Zahl der Lernobjekte",
@@ -32,7 +32,7 @@
     "highestattempt": "Bester Versuch",
     "incomplete": "Unvollständig",
     "lastattempt": "Letzter vollständiger Versuch",
-    "mode": "Einstellung",
+    "mode": "Modus",
     "newattempt": "Neuen Versuch beginnen",
     "noattemptsallowed": "Zahl zulässiger Versuche",
     "noattemptsmade": "Zahl Ihrer Versuche",
@@ -45,7 +45,7 @@
     "reviewmode": "Rückblick-Modus",
     "scormstatusnotdownloaded": "Dieses Lernpaket ist noch nicht geladen. Es wird automatisch heruntergeladen, wenn Sie es öffnen.",
     "scormstatusoutdated": "Dieses Lernpaket wurde seit dem Herunterladen verändert. Es wird automatisch heruntergeladen, wenn Sie es öffnen.",
-    "suspended": "Ausgeschlossen",
+    "suspended": "Gesperrtes Nutzerkonto",
     "warningofflinedatadeleted": "Die Offline-Daten von Versuch {{number}} wurden gelöscht, weil sie nicht für einen neuen Versuch verwendet werden können.",
     "warningsynconlineincomplete": "Die Versuche konnten nicht synchronisiert werden, weil der letzte Online-Versuchnicht beendet wurde. Beenden Sie zuerst den Online-Versuch."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/el.json b/www/addons/mod/scorm/lang/el.json
index a819301fbee..1073bd9a33f 100644
--- a/www/addons/mod/scorm/lang/el.json
+++ b/www/addons/mod/scorm/lang/el.json
@@ -24,7 +24,7 @@
     "firstattempt": "Πρώτη προσπάθεια",
     "gradeaverage": "Μέσος βαθμός",
     "gradeforattempt": "Βαθμός προσπάθειας",
-    "gradehighest": "Υψηλότερος βαθμός",
+    "gradehighest": "Ο υψηλότερος βαθμός",
     "grademethod": "Μέθοδος βαθμολόγησης",
     "gradereported": "Βαθμολογία",
     "gradescoes": "Μαθησιακά αντικείμενα",
@@ -45,6 +45,6 @@
     "reviewmode": "Φάση ανασκόπησης",
     "scormstatusnotdownloaded": "Αυτό το SCORM δεν έχει κατέβει. Θα κατέβει αυτόματα όταν το ανοίξετε.",
     "scormstatusoutdated": "Αυτό το SCORM έχει τροποποιηθεί από την τελευταία λήψη. Θα κατέβει αυτόματα όταν το ανοίξετε.",
-    "suspended": "Αναστέλλεται",
+    "suspended": "Ανεσταλμένος λογαριασμός",
     "warningsynconlineincomplete": "Κάποιες προσπάθειες δεν μπόρεσαν να συγχρονιστούν με το site διότι η τελευταία online προσπάθεια δεν έχει ολοκληρωθεί. Παρακαλώ τελειώστε την online προσπάθεια πρώτα."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/es-mx.json b/www/addons/mod/scorm/lang/es-mx.json
index 2c72808a5b1..9fb465e35bf 100644
--- a/www/addons/mod/scorm/lang/es-mx.json
+++ b/www/addons/mod/scorm/lang/es-mx.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Ha alcanzado el número máximo de intentos",
     "failed": "Error",
     "firstattempt": "Primer intento",
-    "gradeaverage": "Calificación promedio",
+    "gradeaverage": "Promedio de calificaciones",
     "gradeforattempt": "Calificación del intento",
     "gradehighest": "Calificación más alta",
     "grademethod": "Método de calificación",
@@ -45,7 +45,7 @@
     "reviewmode": "Modo Revisión",
     "scormstatusnotdownloaded": "Este SCORM no está descargado. Será descargado automáticamente cuando Usted lo abra.",
     "scormstatusoutdated": "Este SCORM ha sido modificado desde la última descarga. Será descargado automáticamente cuando Usted lo abra.",
-    "suspended": "Suspendido",
+    "suspended": "Cuenta suspendida",
     "warningofflinedatadeleted": "Algunos datos fuera-de-línea del intento {{number}} han sido eliminados porque no pudieron usarse para crear un nuevo intento.",
     "warningsynconlineincomplete": "Algunos intentos no pudieron ser sincronizados con el sitio debido a que el último intento en-línea no está terminado. Por favor, termine primeramente el intento en-línea."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/es.json b/www/addons/mod/scorm/lang/es.json
index 518b5cf6da7..8d99978ae22 100644
--- a/www/addons/mod/scorm/lang/es.json
+++ b/www/addons/mod/scorm/lang/es.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Ha alcanzado el número máximo de intentos",
     "failed": "Error",
     "firstattempt": "Primer intento",
-    "gradeaverage": "Calificación promedio",
+    "gradeaverage": "Promedio de calificaciones",
     "gradeforattempt": "Calificación del intento",
     "gradehighest": "Calificación más alta",
     "grademethod": "Método de calificación",
@@ -45,7 +45,7 @@
     "reviewmode": "Modo Revisión",
     "scormstatusnotdownloaded": "Este SCORM no se ha descargado. Lo hará automáticamente cuando lo abras.",
     "scormstatusoutdated": "Este SCORM se ha modificado desde la última descarga. Se descargará automáticamente cuando lo abras.",
-    "suspended": "Suspendido",
+    "suspended": "Cuenta de usuario suspendida",
     "warningofflinedatadeleted": "Algunos datos fuera de línea del intento {{number}} se han eliminado porque no pueden crearse en el nuevo intento.",
     "warningsynconlineincomplete": "Algunos intentos no pueden sincronizarse con el sitio porque el último intento en línea no ha finalizado. Por favor acabe primero el intento."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/eu.json b/www/addons/mod/scorm/lang/eu.json
index d6315ef6681..9c1959e8a42 100644
--- a/www/addons/mod/scorm/lang/eu.json
+++ b/www/addons/mod/scorm/lang/eu.json
@@ -24,7 +24,7 @@
     "firstattempt": "Lehenengo saiakera",
     "gradeaverage": "Batez besteko kalifikazioa",
     "gradeforattempt": "Saikerarako kalifikazioa",
-    "gradehighest": "Kalifikazio altuena",
+    "gradehighest": "Notarik altuena",
     "grademethod": "Kalifikazio-metodoa",
     "gradereported": "Emandako kalifikazioa",
     "gradescoes": "Ikasteko objektuak",
@@ -45,7 +45,7 @@
     "reviewmode": "Berrikusketa-modua",
     "scormstatusnotdownloaded": "SCORM hau ez dago aurretik jaitsita. Automatikoki jaitsiko da irekitzen duzunean.",
     "scormstatusoutdated": "SCORM hau eguneratua izan da azkenekoz jaitsi zenuenetik. Automatikoki jaitsiko da irekitzen duzunean.",
-    "suspended": "Bere horretan utzia",
+    "suspended": "Etendako kontua",
     "warningofflinedatadeleted": "{{number}}. saiakeraren lineaz kanpoko datu batzuk ezabatu dira ezin izan direlako saiakera berri batean sortu.",
     "warningsynconlineincomplete": "Saiakera batzuk ezin izan dira Moodle gunearekin sinkronizatu azken online saiakera ez delako bukatu. Mesedez, bukatu online saiakera aurretik."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/fa.json b/www/addons/mod/scorm/lang/fa.json
index 28c96dadd4e..fd06c8f66fd 100644
--- a/www/addons/mod/scorm/lang/fa.json
+++ b/www/addons/mod/scorm/lang/fa.json
@@ -1,7 +1,7 @@
 {
     "asset": "دارایی",
     "assetlaunched": "دارایی - دیده شده",
-    "attempts": "تلاش",
+    "attempts": "دفعات شرکت",
     "averageattempt": "متوسط تعداد دفعات تلاش",
     "browse": "پیش‌نمایش",
     "browsed": "به صورت پیش‌نمایش دیده شده",
@@ -16,15 +16,15 @@
     "firstattempt": "اولین تلاش",
     "gradeaverage": "نمرهٔ میانگین",
     "gradeforattempt": "نمرهٔ تلاش",
-    "gradehighest": "بالاترین نمره",
-    "grademethod": "روش نمره‌دهی",
+    "gradehighest": "بیشترین نمره",
+    "grademethod": "روش نمره دادن",
     "gradereported": "نمرهٔ گزارش شده",
     "gradescoes": "اهداف آموزشی",
     "gradesum": "جمع نمره",
     "highestattempt": "بالاترین تلاش",
     "incomplete": "ناتمام",
     "lastattempt": "آخرین تلاش",
-    "mode": "حالت",
+    "mode": "روش",
     "newattempt": "شروع یک تلاش جدید",
     "noattemptsallowed": "تعداد تلاش‌های مجاز",
     "noattemptsmade": "تعداد تلاش‌هایی که انجام داده‌اید",
@@ -33,5 +33,5 @@
     "organizations": "سازمان‌ها",
     "passed": "موفق",
     "reviewmode": "حالت مرور",
-    "suspended": "معلق"
+    "suspended": "حساب کاربری تعلیق‌شده"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/fr.json b/www/addons/mod/scorm/lang/fr.json
index 5798f9a67eb..6ecd714e003 100644
--- a/www/addons/mod/scorm/lang/fr.json
+++ b/www/addons/mod/scorm/lang/fr.json
@@ -1,7 +1,7 @@
 {
     "asset": "Élément",
     "assetlaunched": "Élément - affiché",
-    "attempts": "tentatives",
+    "attempts": "Tentatives",
     "averageattempt": "Moyenne des tentatives",
     "browse": "Prévisualiser",
     "browsed": "Consulté",
@@ -45,7 +45,7 @@
     "reviewmode": "Mode relecture",
     "scormstatusnotdownloaded": "Ce SCORM n'est pas téléchargé. Il sera téléchargé automatiquement dès que vous l'ouvrirez.",
     "scormstatusoutdated": "Ce SCORM a été modifié depuis son dernier téléchargement. Il sera téléchargé automatiquement dès que vous l'ouvrirez.",
-    "suspended": "Suspendu",
+    "suspended": "Compte suspendu",
     "warningofflinedatadeleted": "Des données hors ligne de la tentative {{number}} ont été supprimées, car elles n'ont pas pu être intégrées dans une nouvelle tentative.",
     "warningsynconlineincomplete": "Certaines tentatives n'ont pas pu être synchronisées avec la plateforme, car la dernière tentative en ligne n'est pas terminée. Veuillez d'abord finir votre tentative en ligne."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/he.json b/www/addons/mod/scorm/lang/he.json
index 9eaf549856b..50bd81a1489 100644
--- a/www/addons/mod/scorm/lang/he.json
+++ b/www/addons/mod/scorm/lang/he.json
@@ -1,7 +1,7 @@
 {
     "asset": "נכס",
     "assetlaunched": "משאב - נצפה",
-    "attempts": "ניסיונות",
+    "attempts": "נסיונות מענה",
     "averageattempt": "ממוצע ניסיונות",
     "browse": "תצוגה מקדימה",
     "browsed": "נצפה",
@@ -12,10 +12,10 @@
     "exceededmaxattempts": "הגעת למספר המירבי המותר של נסיונות.",
     "failed": "נכשל",
     "firstattempt": "ניסיון מענה ראשון",
-    "gradeaverage": "ממוצע הניקוד בניסיונות המענה",
+    "gradeaverage": "ציון ממוצע",
     "gradeforattempt": "הניקוד לנסיון",
-    "gradehighest": "הניקוד הגבוה ביותר",
-    "grademethod": "שיטת מתן ניקוד",
+    "gradehighest": "הציון הגבוה ביותר",
+    "grademethod": "שיטת מתן ציונים",
     "gradereported": "הניקוד הסופי",
     "gradescoes": "רכיבי למידה",
     "gradesum": "סיכום הניקוד בניסיונות המענה",
@@ -31,5 +31,5 @@
     "organizations": "רצפי־למידה",
     "passed": "עבר",
     "reviewmode": "מצב עיון בתשובות",
-    "suspended": "מושהה"
+    "suspended": "חשבון מושהה"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/hu.json b/www/addons/mod/scorm/lang/hu.json
index 6d62c92cb3d..c1da70aab63 100644
--- a/www/addons/mod/scorm/lang/hu.json
+++ b/www/addons/mod/scorm/lang/hu.json
@@ -31,5 +31,5 @@
     "organizations": "Szervezetek",
     "passed": "Sikerült",
     "reviewmode": "Ellenőrző üzemmód",
-    "suspended": "Felfüggesztve"
+    "suspended": "Felfüggesztett fiók"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/it.json b/www/addons/mod/scorm/lang/it.json
index 8556f3bf7ab..d858aa53da9 100644
--- a/www/addons/mod/scorm/lang/it.json
+++ b/www/addons/mod/scorm/lang/it.json
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Hai raggiunto il massimo numero di tentativi consentito.",
     "failed": "Fallito",
     "firstattempt": "Primo tentativo",
-    "gradeaverage": "Media dei voti",
+    "gradeaverage": "Voto medio",
     "gradeforattempt": "Valutazione del tentativo",
-    "gradehighest": "Voto migliore",
+    "gradehighest": "Voto più alto",
     "grademethod": "Metodo di valutazione",
     "gradereported": "Voto ottenuto",
     "gradescoes": "Learning object",
@@ -32,7 +32,7 @@
     "highestattempt": "Tentativo migliore",
     "incomplete": "Incompleto",
     "lastattempt": "Ultimo tentativo completato",
-    "mode": "Modalità",
+    "mode": "Moda",
     "newattempt": "Avvia un nuovo tentativo",
     "noattemptsallowed": "Numero di tentativi consentito",
     "noattemptsmade": "Numero di tentativi che hai effettuato",
@@ -45,7 +45,7 @@
     "reviewmode": "Modalità revisione",
     "scormstatusnotdownloaded": "Questo SCORM non è stato scaricato, lo sarà non appena lo aprirai.",
     "scormstatusoutdated": "Questo SCORM è stato modificato dall'ultimo scaricamento e sarà scaricato nuovamente non appena lo aprirai.",
-    "suspended": "Sospeso",
+    "suspended": "Account sospeso",
     "warningofflinedatadeleted": "Alcuni dati offline del tentativo {{number}}  sono stati eliminati perché non è stato possibile inserirli in un nuovo tentativo.",
     "warningsynconlineincomplete": "Alcuni tentativi non sono stati sincronizzati sul sito poiché è presente un tentativo svolto online che non è stato terminato. Per sincronizzare, devi prima terminare il tentativo online."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ja.json b/www/addons/mod/scorm/lang/ja.json
index df57f44b198..ae46163251c 100644
--- a/www/addons/mod/scorm/lang/ja.json
+++ b/www/addons/mod/scorm/lang/ja.json
@@ -22,7 +22,7 @@
     "highestattempt": "最高評点",
     "incomplete": "不完全",
     "lastattempt": "最新の完了済み受験",
-    "mode": "モード",
+    "mode": "最頻値",
     "newattempt": "新しい受験を開始する",
     "noattemptsallowed": "許可された受験回数",
     "noattemptsmade": "あなたの受験回数",
@@ -31,5 +31,5 @@
     "organizations": "組織",
     "passed": "合格",
     "reviewmode": "レビューモード",
-    "suspended": "一時停止"
+    "suspended": "利用停止アカウント"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/lt.json b/www/addons/mod/scorm/lang/lt.json
index 5ff4711bf91..e5fe5f75ff3 100644
--- a/www/addons/mod/scorm/lang/lt.json
+++ b/www/addons/mod/scorm/lang/lt.json
@@ -32,7 +32,7 @@
     "highestattempt": "Aukščiausiai įvertintas bandymas",
     "incomplete": "Neužbaigta",
     "lastattempt": "Paskutinis bandymas",
-    "mode": "Režimas",
+    "mode": "Moda",
     "newattempt": "Pradėti naują bandymą",
     "noattemptsallowed": "Leidžiamų bandymų skaičius",
     "noattemptsmade": "Išnaudotų bandymų skaičius",
@@ -45,7 +45,7 @@
     "reviewmode": "Peržiūros režimas",
     "scormstatusnotdownloaded": "SCORM neatsiųsta. Programa automatiškai atsisiųs ją atidarius.",
     "scormstatusoutdated": "SCORM pakeista nuo paskutiniojo atsisiuntimo. Programa automatiškai atsisiųs ją atidarius.",
-    "suspended": "Sulaikyta",
+    "suspended": "Sulaikyta paskyra",
     "warningofflinedatadeleted": "Kai kurie neprijungti  bandymo {{number}} duomenys  buvo ištrinti, nes jie negalėjo būti perkelti į naują bandymą.",
     "warningsynconlineincomplete": "Kaikurie bandymai negali būti sinchronizuoti su svetaine dėl to, kad paskutiniai prisijungimo duomenys nebuvo pabaigti. Prašome pabaigti."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/nl.json b/www/addons/mod/scorm/lang/nl.json
index 0a418c7071f..2cee256d9f1 100644
--- a/www/addons/mod/scorm/lang/nl.json
+++ b/www/addons/mod/scorm/lang/nl.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Je hebt het maximale aantal pogingen bereikt.",
     "failed": "Mislukt",
     "firstattempt": "Eerste poging",
-    "gradeaverage": "Gemiddeld cijfer",
+    "gradeaverage": "Gemiddelde cijfer",
     "gradeforattempt": "Beoordeling van de poging",
     "gradehighest": "Hoogste cijfer",
     "grademethod": "Beoordelingsmethode",
@@ -45,7 +45,7 @@
     "reviewmode": "Nalezen",
     "scormstatusnotdownloaded": "Deze SCORM is niet gedownload. Het zal automatisch gedownload worden als je het opent.",
     "scormstatusoutdated": "Deze SCORM is gewijzigd sinds de laatste download. Het zal automatisch gedownload worden wanneer je het opent.",
-    "suspended": "Onderbroken",
+    "suspended": "Geschorste account",
     "warningofflinedatadeleted": "Sommige offline gegevens van poging {{number}} zijn verwijderd omdat ze niet in een nieuwe poging konden omgezet worden.",
     "warningsynconlineincomplete": "Sommige pogingen konden niet gesynchroniseerd worden met de site omdat de laatste online-poging niet beëindigd was. Beëindig eerst de online-poging."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/pl.json b/www/addons/mod/scorm/lang/pl.json
index 0d6fae34178..f81ec35bb37 100644
--- a/www/addons/mod/scorm/lang/pl.json
+++ b/www/addons/mod/scorm/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "asset": "Zasób",
     "assetlaunched": "Zasób - obejrzany",
-    "attempts": "Próby",
+    "attempts": "Podejścia",
     "averageattempt": "Średnia prób",
     "browse": "Przeglądaj",
     "browsed": "Przeglądane",
@@ -31,5 +31,5 @@
     "organizations": "Organizacje",
     "passed": "Udane",
     "reviewmode": "Tryb przeglądu",
-    "suspended": "Zawieszone"
+    "suspended": "Zawieszone konto"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/pt-br.json b/www/addons/mod/scorm/lang/pt-br.json
index 458dcebee2a..85f8588915d 100644
--- a/www/addons/mod/scorm/lang/pt-br.json
+++ b/www/addons/mod/scorm/lang/pt-br.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Você atingiu a número máximo de tentativas.",
     "failed": "Falhou",
     "firstattempt": "Primeira tentativa",
-    "gradeaverage": "Média das notas",
+    "gradeaverage": "Nota média",
     "gradeforattempt": "Avaliação por tentativa",
     "gradehighest": "Nota mais alta",
     "grademethod": "Método de avaliação",
@@ -32,7 +32,7 @@
     "highestattempt": "Tentativa mais alta",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa",
-    "mode": "Modalidade",
+    "mode": "Tendência",
     "newattempt": "Começar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
     "noattemptsmade": "Número de tentativas feitas",
@@ -45,7 +45,7 @@
     "reviewmode": "Modalidade de revisão",
     "scormstatusnotdownloaded": "Este SCORM não é baixado. Ele será baixado automaticamente quando você abri-lo.",
     "scormstatusoutdated": "Este SCORM foi modificado desde o último download. Ele será baixado automaticamente quando você abri-lo.",
-    "suspended": "Suspenso",
+    "suspended": "Conta suspensa",
     "warningofflinedatadeleted": "Alguns dados off-line da tentativa {{number}} foram excluídas porque ele não pôde ser criado em uma nova tentativa.",
     "warningsynconlineincomplete": "Algumas tentativas não poderiam ser sincronizadas com o site porque a última tentativa não foi finalizada. Por favor termine a tentativa online primeiro."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/pt.json b/www/addons/mod/scorm/lang/pt.json
index b3539194c48..6f23389ff1b 100644
--- a/www/addons/mod/scorm/lang/pt.json
+++ b/www/addons/mod/scorm/lang/pt.json
@@ -32,7 +32,7 @@
     "highestattempt": "Tentativa com melhor nota",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa concluída",
-    "mode": "Modo",
+    "mode": "Moda",
     "newattempt": "Iniciar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
     "noattemptsmade": "Número de tentativas realizadas",
@@ -45,7 +45,7 @@
     "reviewmode": "Modo de revisão",
     "scormstatusnotdownloaded": "Este SCORM não foi descarregado. Será descarregado assim que o abrir.",
     "scormstatusoutdated": "Este SCORM foi modificado desde a última vez que o descarregou. A versão mais recente do mesmo será descarregada automaticamente assim que o abrir.",
-    "suspended": "Suspenso",
+    "suspended": "Conta suspensa",
     "warningofflinedatadeleted": "Alguns dados offline da tentativa {{number}} foram excluídos porque não podem ser utilizados numa nova tentativa.",
     "warningsynconlineincomplete": "Algumas tentativas ainda não foram sincronizadas com o site porque a última tentativa não se encontra finalizada. Por favor, termine a tentativa online primeiro."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ro.json b/www/addons/mod/scorm/lang/ro.json
index 24087ff80da..5b3b79bc149 100644
--- a/www/addons/mod/scorm/lang/ro.json
+++ b/www/addons/mod/scorm/lang/ro.json
@@ -1,7 +1,7 @@
 {
     "asset": "Fişier curs",
     "assetlaunched": "Fişier - Afişat",
-    "attempts": "Încercări de parcurgere",
+    "attempts": "Încercări",
     "averageattempt": "Numărul mediu de încercări de parcurgere",
     "browse": "Caută",
     "browsed": "Căutat",
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Ați atins numărul maxim de încercări",
     "failed": "Eşuat",
     "firstattempt": "Prima încercare parcurgere",
-    "gradeaverage": "Punctaj mediu",
-    "gradehighest": "Punctaj maxim",
-    "grademethod": "Metodă punctare",
+    "gradeaverage": "Nota medie",
+    "gradehighest": "Nota maximă",
+    "grademethod": "Metoda de notare",
     "gradescoes": "Modul de studiu",
     "gradesum": "Sumă punctaje",
     "highestattempt": "Cea mai completă încercare de parcurgere",
@@ -43,7 +43,7 @@
     "reviewmode": "Mod Verificare",
     "scormstatusnotdownloaded": "Acest SCORM nu a fost descărcat. Va fi descărcat automat când îl veți deschide.",
     "scormstatusoutdated": "Acest SCORM a fost modificat de la ultima descărcare. Va fi redescărcat automat când îl veți deschide.",
-    "suspended": "Suspendat",
+    "suspended": "Cont suspendat",
     "warningofflinedatadeleted": "Unele date ale încercării offline cu numărul {{number}} au fost șterse deoarece nu s-au putut constitui într-o nouă încercare.",
     "warningsynconlineincomplete": "Această încercare nu poate fi sincronizată cu siteul pentru că ultima încercare efectuată nu a fost finalizată. Vă rugăm să o finalizați."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ru.json b/www/addons/mod/scorm/lang/ru.json
index 2cc8016e9c1..e2469fa9abc 100644
--- a/www/addons/mod/scorm/lang/ru.json
+++ b/www/addons/mod/scorm/lang/ru.json
@@ -25,7 +25,7 @@
     "highestattempt": "Лучшая попытка",
     "incomplete": "Не завершено",
     "lastattempt": "Завершена последняя попытка",
-    "mode": "Режим",
+    "mode": "Мода",
     "newattempt": "Начать новую попытку",
     "noattemptsallowed": "Количество попыток",
     "noattemptsmade": "Выполнено попыток",
@@ -34,5 +34,5 @@
     "organizations": "Организаций",
     "passed": "Выполнено успешно",
     "reviewmode": "Режим просмотра",
-    "suspended": "Приостановлено"
+    "suspended": "Учетная запись заблокирована"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/sv.json b/www/addons/mod/scorm/lang/sv.json
index 6cbde1646b4..3b30b9a2d63 100644
--- a/www/addons/mod/scorm/lang/sv.json
+++ b/www/addons/mod/scorm/lang/sv.json
@@ -22,10 +22,10 @@
     "exceededmaxattempts": "Du har redan använt samtliga tillåtna försök.",
     "failed": "Det fungerade inte",
     "firstattempt": "Första försöket",
-    "gradeaverage": "Medelbetyg/omdöme",
+    "gradeaverage": "Medelbetyg",
     "gradeforattempt": "Betyg/omdöme för försök",
-    "gradehighest": "Högsta betyg/omdöme",
-    "grademethod": "Metod för betyg/omdömen",
+    "gradehighest": "Högsta betyg",
+    "grademethod": "Betygsättningsmetod",
     "gradereported": "Betyg rapporterat",
     "gradescoes": "Lärobjekt ",
     "gradesum": "Summera betyg/omdöme(n)",
@@ -45,7 +45,7 @@
     "reviewmode": "Läge för granskning",
     "scormstatusnotdownloaded": "Detta SCORM är inte nedladdat. Det kommer att laddas ner automatiskt när du öppnar den",
     "scormstatusoutdated": "Detta SCORM har modifierats sedan sista nedladdningen. Det kommer att laddas ner automatiskt när du öppnar den",
-    "suspended": "Avstängd",
+    "suspended": "Avaktiverat konto",
     "warningofflinedatadeleted": "Vissa offlinedata av försöket {{nummer}} har tagits bort eftersom den inte kunnat skapas in ett nytt försök .",
     "warningsynconlineincomplete": "Vissa försök kunde inte synkroniseras med sidan, eftersom senaste online försök inte är klar än . Vänligen avsluta online- försöket först ."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/tr.json b/www/addons/mod/scorm/lang/tr.json
index 244c50c5460..31f5789cb82 100644
--- a/www/addons/mod/scorm/lang/tr.json
+++ b/www/addons/mod/scorm/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "asset": "Öge",
     "assetlaunched": "Öge - Bakıldı",
-    "attempts": "Uygulama (lar)",
+    "attempts": "Uygulamalar",
     "averageattempt": "Uygulama ortalaması",
     "browse": "Önizleme",
     "browsed": "Gözatıldı",
@@ -12,10 +12,10 @@
     "exceededmaxattempts": "En fazla uygulama sayısına ulaştınız.",
     "failed": "Hata oluştu",
     "firstattempt": "İlk uygulama",
-    "gradeaverage": "Ortalama not",
+    "gradeaverage": "Not ortalaması",
     "gradeforattempt": "Uygulama notu",
     "gradehighest": "En yüksek not",
-    "grademethod": "Not verme yöntemi",
+    "grademethod": "Notlandırma yöntemi",
     "gradereported": "Not verme raporu",
     "gradescoes": "Öğrenme Nesneleri",
     "gradesum": "Notları topla",
@@ -31,5 +31,5 @@
     "organizations": "Düzenlemeler",
     "passed": "Geçti",
     "reviewmode": "Önizleme Modu",
-    "suspended": "Durduruldu"
+    "suspended": "Askıya alınmış hesap"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/uk.json b/www/addons/mod/scorm/lang/uk.json
new file mode 100644
index 00000000000..94c375eb0ff
--- /dev/null
+++ b/www/addons/mod/scorm/lang/uk.json
@@ -0,0 +1,51 @@
+{
+    "asset": "Актив",
+    "assetlaunched": "Актив - Переглянуто",
+    "attempts": "Спроби",
+    "averageattempt": "Середнє по спробах",
+    "browse": "Перегляд",
+    "browsed": "Переглянуто",
+    "browsemode": "Режим перегляду",
+    "cannotcalculategrade": "Оцінка не може бути обчислена.",
+    "completed": "Завершено",
+    "contents": "Зміст",
+    "dataattemptshown": "Ці дані належать до спроби № {{number}}.",
+    "enter": "Ввести",
+    "errorcreateofflineattempt": "При створенні нового форуму сталася помилка. Будь ласка спробуйте ще раз.",
+    "errordownloadscorm": "Помилка завантаження  SCORM: \"{{name}}\".",
+    "errorgetscorm": "Помилка отримання SCORM-даних.",
+    "errorinvalidversion": "На жаль, додаток підтримує тільки SCORM 1.2.",
+    "errornotdownloadable": "Завантаження SCORM пакетів відключене у вашому сайті Moodle. Будь ласка, зверніться до адміністратора сайту Moodle.",
+    "errornovalidsco": "Це SCORM не має доступних SCO для завантаження.",
+    "errorpackagefile": "На жаль, додаток підтримує тільки ZIP пакети.",
+    "errorsyncscorm": "Під час синхронізації сталася помилка. Будь ласка спробуйте ще раз.",
+    "exceededmaxattempts": "Ви досягли максимальної кількості спроб.",
+    "failed": "Невдалі",
+    "firstattempt": "Перша спроба",
+    "gradeaverage": "Середня оцінка",
+    "gradeforattempt": "Оцінка спроби",
+    "gradehighest": "Краща оцінка",
+    "grademethod": "Метод оцінювання",
+    "gradereported": "Звіт оцінювання",
+    "gradescoes": "Об’єкти навчання",
+    "gradesum": "Сумарна оцінка",
+    "highestattempt": "Найкраща спроба",
+    "incomplete": "Не завершено",
+    "lastattempt": "Остання завершена спроба",
+    "mode": "Мода",
+    "newattempt": "Почати нову спробу",
+    "noattemptsallowed": "Кількість дозволених спроб",
+    "noattemptsmade": "Кількість спроб, які ви повінні зробити",
+    "normal": "Нормальний",
+    "notattempted": "Не було спроб",
+    "offlineattemptnote": "Ця спроба має дані, що не були синхронізовані.",
+    "offlineattemptovermax": "Ця спроба не може бути відправлена, так як ви перевершили максимальну кількість спроб.",
+    "organizations": "Організації",
+    "passed": "Пропущено",
+    "reviewmode": "Режим перегляду",
+    "scormstatusnotdownloaded": "Це SCORM не завантажується. Він буде автоматично завантажуватися при її відкритті.",
+    "scormstatusoutdated": "Цей SCORM був змінений з моменту останнього завантаження. Він буде автоматично завантажуватися при її відкритті.",
+    "suspended": "Заблокований обліковий запис",
+    "warningofflinedatadeleted": "Деякі автономні дані про спробу № {{number}} були видалений, тому що він не може бути створений в новій спробі.",
+    "warningsynconlineincomplete": "Деякі спроби не можуть бути синхронізовані з сайтом, тому що онлайн спроба не закінчена. Будь ласка закінчіть спробу онлайн спершу."
+}
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/zh-cn.json b/www/addons/mod/scorm/lang/zh-cn.json
index 994a7576861..5ac6087eb45 100644
--- a/www/addons/mod/scorm/lang/zh-cn.json
+++ b/www/addons/mod/scorm/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "asset": "资产",
     "assetlaunched": "资产 - 已浏览",
-    "attempts": "次",
+    "attempts": "试卷",
     "averageattempt": "平均分",
     "browse": "预览",
     "browsed": "已浏览",
@@ -15,7 +15,7 @@
     "gradeaverage": "平均分",
     "gradeforattempt": "尝试的得分",
     "gradehighest": "最高分",
-    "grademethod": "评分方法",
+    "grademethod": "评分办法",
     "gradereported": "成绩报告",
     "gradescoes": "学习对象",
     "gradesum": "分数和",
@@ -31,5 +31,5 @@
     "organizations": "组织",
     "passed": "已通过",
     "reviewmode": "复习模式",
-    "suspended": "已暂停"
+    "suspended": "停用账号"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/zh-tw.json b/www/addons/mod/scorm/lang/zh-tw.json
index ec476e126b9..30e8539dffa 100644
--- a/www/addons/mod/scorm/lang/zh-tw.json
+++ b/www/addons/mod/scorm/lang/zh-tw.json
@@ -1,7 +1,7 @@
 {
     "asset": "資源",
     "assetlaunched": "已閱讀的資源",
-    "attempts": "作答次",
+    "attempts": "作答次數",
     "averageattempt": "平均使用次數",
     "browse": "預覽",
     "browsed": "已瀏覽",
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "你已經達到最大的作答次數",
     "failed": "失敗",
     "firstattempt": "第一次使用",
-    "gradeaverage": "平均成績",
+    "gradeaverage": "平均分數",
     "gradeforattempt": "作答次的分數",
-    "gradehighest": "最高成績",
+    "gradehighest": "最高分數",
     "grademethod": "評分方式",
     "gradereported": "成績報告",
     "gradescoes": "學習目標",
@@ -32,7 +32,7 @@
     "highestattempt": "最高使用次數",
     "incomplete": "不完整",
     "lastattempt": "最後完成的作答次",
-    "mode": "模式",
+    "mode": "眾數",
     "newattempt": "開始新的使用",
     "noattemptsallowed": "允許作答的次數",
     "noattemptsmade": "你已經作答的次數",
@@ -45,7 +45,7 @@
     "reviewmode": "複習模式",
     "scormstatusnotdownloaded": "此SCORM未下載. 它會在您打開時自動下載.",
     "scormstatusoutdated": "此SCORM自上次下載以來已被修改. 它會在您打開時自動下載.",
-    "suspended": "中止",
+    "suspended": "已被停用的帳號",
     "warningofflinedatadeleted": "嘗試{{number}}的某些離線資料已被刪除, 因為無法建立新的嘗試.",
     "warningsynconlineincomplete": "某些嘗試無法與網站同步, 因為上次上線嘗試未完成, 請先完成上線嘗試."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/de.json b/www/addons/mod/survey/lang/de.json
index 28c0d5d47da..6a98bc5bd3e 100644
--- a/www/addons/mod/survey/lang/de.json
+++ b/www/addons/mod/survey/lang/de.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Fehler beim Empfangen der Umfragedaten",
     "ifoundthat": "Dies findet statt:",
     "ipreferthat": "Ich bevorzuge es so:",
-    "responses": "Antworten",
+    "responses": "Eigene Eingaben",
     "results": "Ergebnisse",
     "surveycompletednograph": "Sie haben diese Umfrage abgeschlossen."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/es-mx.json b/www/addons/mod/survey/lang/es-mx.json
index 1057c59be73..382d3383af7 100644
--- a/www/addons/mod/survey/lang/es-mx.json
+++ b/www/addons/mod/survey/lang/es-mx.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Error al obtener datos de la encuesta.",
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
-    "responses": "Respuestas",
+    "responses": "Respuestas del alumno",
     "results": "Resultados",
     "surveycompletednograph": "Usted ha completado esta encuesta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/es.json b/www/addons/mod/survey/lang/es.json
index e8ce6c8504e..de6e4082611 100644
--- a/www/addons/mod/survey/lang/es.json
+++ b/www/addons/mod/survey/lang/es.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Se ha producido un error recuperando los datos de la encuesta.",
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
-    "responses": "Respuestas",
+    "responses": "Respuestas -",
     "results": "Resultados",
     "surveycompletednograph": "Has completado esta encuesta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/eu.json b/www/addons/mod/survey/lang/eu.json
index a1f8ef5c146..4510a258ef4 100644
--- a/www/addons/mod/survey/lang/eu.json
+++ b/www/addons/mod/survey/lang/eu.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Errorea hausnarketaren datuak eskuratzean.",
     "ifoundthat": "Hau aurkitu dut",
     "ipreferthat": "Nahiago dut",
-    "responses": "Erantzunak",
+    "responses": "Ebazpenak",
     "results": "Emaitzak",
     "surveycompletednograph": "Bete duzu hausnarketa hau"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/fa.json b/www/addons/mod/survey/lang/fa.json
index eac2b9fbf74..7ecd2796c5b 100644
--- a/www/addons/mod/survey/lang/fa.json
+++ b/www/addons/mod/survey/lang/fa.json
@@ -2,6 +2,6 @@
     "cannotsubmitsurvey": "متاسفیم. مشکلی در ثبت نظرسنجی شما وجود داشت. لطفا دوباره تلاش کنید.",
     "ifoundthat": "متوجه شدم که:",
     "ipreferthat": "ترجیح می‌دهم که:",
-    "responses": "پاسخ‌ها",
+    "responses": "پاسخ‌های ارائه شده",
     "results": "نتایج"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/fr.json b/www/addons/mod/survey/lang/fr.json
index 9cd6773b6fe..30cc88b1de6 100644
--- a/www/addons/mod/survey/lang/fr.json
+++ b/www/addons/mod/survey/lang/fr.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Erreur lors de l'obtention des données de la consultation.",
     "ifoundthat": "J'ai trouvé que",
     "ipreferthat": "J'aime mieux quand",
-    "responses": "Réponses",
+    "responses": "Réponses du participant",
     "results": "Résultats",
     "surveycompletednograph": "Vous avez terminé ce sondage."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/hu.json b/www/addons/mod/survey/lang/hu.json
index 46363dbb602..346243c9c2b 100644
--- a/www/addons/mod/survey/lang/hu.json
+++ b/www/addons/mod/survey/lang/hu.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "Azt találtam",
     "ipreferthat": "Inkább ezt szeretném",
-    "responses": "Tanuló által adott válaszok",
+    "responses": "Tanuló válaszai",
     "results": "Eredmények",
     "surveycompletednograph": "A felmérést befejezte."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/it.json b/www/addons/mod/survey/lang/it.json
index cb9f71b951c..f5090e6850e 100644
--- a/www/addons/mod/survey/lang/it.json
+++ b/www/addons/mod/survey/lang/it.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Si è verificato un errore durante la ricezione di dati del sondaggio.",
     "ifoundthat": "Realmente",
     "ipreferthat": "Idealmente",
-    "responses": "Risposte",
+    "responses": "Risposte date",
     "results": "Risultati",
     "surveycompletednograph": "Hai completato il sondaggio."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/ja.json b/www/addons/mod/survey/lang/ja.json
index f95e9e8cf86..4fd5be4f06c 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "私は次のことを発見しました:",
     "ipreferthat": "私は次のことが好きです:",
-    "responses": "回答",
+    "responses": "解答",
     "results": "受験結果",
     "surveycompletednograph": "あなたはこの調査を完了しました。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/nl.json b/www/addons/mod/survey/lang/nl.json
index fbe668d10e9..25f0ef3c02f 100644
--- a/www/addons/mod/survey/lang/nl.json
+++ b/www/addons/mod/survey/lang/nl.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Fout bij het ophalen van onderzoeksdata.",
     "ifoundthat": "Ik vond dat",
     "ipreferthat": "Mijn voorkeur zou zijn",
-    "responses": "Antwoorden",
+    "responses": "Eigen antwoorden",
     "results": "Resultaten",
     "surveycompletednograph": "Je hebt dit onderzoek afgerond."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/pl.json b/www/addons/mod/survey/lang/pl.json
index cc6f6480b61..d70fe505132 100644
--- a/www/addons/mod/survey/lang/pl.json
+++ b/www/addons/mod/survey/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "Stwierdziłem, że",
     "ipreferthat": "Wolę to",
-    "responses": "Odpowiedzi",
+    "responses": "Udzielone odpowiedzi",
     "results": "Wyniki",
     "surveycompletednograph": "Już wypełniłeś tą ankietę."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/ru.json b/www/addons/mod/survey/lang/ru.json
index 9930cff9c3d..17aca4add06 100644
--- a/www/addons/mod/survey/lang/ru.json
+++ b/www/addons/mod/survey/lang/ru.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Ошибка при получении данных опроса",
     "ifoundthat": "Я узнал, что",
     "ipreferthat": "Я предпочитаю",
-    "responses": "Ответы",
+    "responses": "Свои ответы",
     "results": "Результаты",
     "surveycompletednograph": "Вы уже ответили на эту анкету."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/sv.json b/www/addons/mod/survey/lang/sv.json
index 6a82d257471..579a3ddeb3e 100644
--- a/www/addons/mod/survey/lang/sv.json
+++ b/www/addons/mod/survey/lang/sv.json
@@ -3,6 +3,6 @@
     "errorgetsurvey": "Fel vid hämtning av enkätdata",
     "ifoundthat": "Jag har funnit att",
     "ipreferthat": "Jag föredrar att",
-    "responses": "Svar",
+    "responses": "Responser",
     "results": "Resultat"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/tr.json b/www/addons/mod/survey/lang/tr.json
index 471798df02c..97aeda74561 100644
--- a/www/addons/mod/survey/lang/tr.json
+++ b/www/addons/mod/survey/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "Gerçekte olan",
     "ipreferthat": "İstediğim",
-    "responses": "Yanıtlar",
+    "responses": "Verilen yanıtlar",
     "results": "Sonuçlar",
     "surveycompletednograph": "Bu anketi tamamladınız."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/uk.json b/www/addons/mod/survey/lang/uk.json
new file mode 100644
index 00000000000..74dd0374658
--- /dev/null
+++ b/www/addons/mod/survey/lang/uk.json
@@ -0,0 +1,9 @@
+{
+    "cannotsubmitsurvey": "На жаль, існує проблема представлення вашого обстеження. Будь ласка спробуйте ще раз.",
+    "errorgetsurvey": "Помилка при отриманні даних обстеження.",
+    "ifoundthat": "Я довідався, що",
+    "ipreferthat": "Я волію, щоб",
+    "responses": "Відповіді",
+    "results": "Результати",
+    "surveycompletednograph": "Ви завершили цю анкету."
+}
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/zh-cn.json b/www/addons/mod/survey/lang/zh-cn.json
index 7ef142e9e7a..160f7b82917 100644
--- a/www/addons/mod/survey/lang/zh-cn.json
+++ b/www/addons/mod/survey/lang/zh-cn.json
@@ -1,6 +1,6 @@
 {
     "ifoundthat": "我发现",
     "ipreferthat": "我希望的是",
-    "responses": "回复",
+    "responses": "作答",
     "results": "结果"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/zh-tw.json b/www/addons/mod/survey/lang/zh-tw.json
index e6ad7be4230..7aaaa3b566b 100644
--- a/www/addons/mod/survey/lang/zh-tw.json
+++ b/www/addons/mod/survey/lang/zh-tw.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "取得調查資料時出錯",
     "ifoundthat": "我發現",
     "ipreferthat": "我希望的是",
-    "responses": "回應",
+    "responses": "回答",
     "results": "結果",
     "surveycompletednograph": "你已經完成這一份問卷。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/uk.json b/www/addons/mod/url/lang/uk.json
new file mode 100644
index 00000000000..cd55163898b
--- /dev/null
+++ b/www/addons/mod/url/lang/uk.json
@@ -0,0 +1,4 @@
+{
+    "accessurl": "Доступ до URL",
+    "pointingtourl": "Точки URL цього ресурсу"
+}
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ca.json b/www/addons/mod/wiki/lang/ca.json
index b827bb47066..fb0c7bfab1e 100644
--- a/www/addons/mod/wiki/lang/ca.json
+++ b/www/addons/mod/wiki/lang/ca.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Títol de la pàgina nova",
     "nocontent": "No hi ha contingut per a aquesta pàgina",
     "notingroup": "No en grup",
-    "page": "Pàgina",
+    "page": "Pàgina: {{$a}}",
     "pageexists": "Aquesta pàgina ja existeix.",
     "pagename": "Nom de la pàgina",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/cs.json b/www/addons/mod/wiki/lang/cs.json
index 89723ca1da7..052676bb598 100644
--- a/www/addons/mod/wiki/lang/cs.json
+++ b/www/addons/mod/wiki/lang/cs.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nový název stránky",
     "nocontent": "Pro tuto stránku není obsah",
     "notingroup": "Není ve skupině",
-    "page": "Stránka",
+    "page": "Stránka: {{$a}}",
     "pageexists": "Tato stránka již existuje.",
     "pagename": "Název stránky",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/de.json b/www/addons/mod/wiki/lang/de.json
index 7bb8187eaff..6fe1fc4dba9 100644
--- a/www/addons/mod/wiki/lang/de.json
+++ b/www/addons/mod/wiki/lang/de.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titel für neue Seite\n",
     "nocontent": "Kein Inhalt auf dieser Seite",
     "notingroup": "Nicht in Gruppen",
-    "page": "Seite",
+    "page": "Seite: {{$a}}",
     "pageexists": "Diese Seite existiert bereits.",
     "pagename": "Seitenname",
     "subwiki": "Teilwiki",
diff --git a/www/addons/mod/wiki/lang/el.json b/www/addons/mod/wiki/lang/el.json
index 7a3a3058446..8eec41f7ee2 100644
--- a/www/addons/mod/wiki/lang/el.json
+++ b/www/addons/mod/wiki/lang/el.json
@@ -3,7 +3,7 @@
     "errornowikiavailable": "Αυτό το wiki δεν έχει ακόμα περιεχόμενο.",
     "gowikihome": "Go Wiki home",
     "notingroup": "Συγγνώμη, αλλά πρέπει να είστε μέλος ομάδας για να δείτε αυτό την ομάδα συζητήσεων.",
-    "page": "Σελίδα",
+    "page": "Σελίδα: {{$a}}",
     "subwiki": "Subwiki",
     "titleshouldnotbeempty": "Ο τίτλος δεν πρέπει να είναι κενός",
     "viewpage": "Δείτε τη σελίδα",
diff --git a/www/addons/mod/wiki/lang/es-mx.json b/www/addons/mod/wiki/lang/es-mx.json
index cbd65b371f9..5a53592ed79 100644
--- a/www/addons/mod/wiki/lang/es-mx.json
+++ b/www/addons/mod/wiki/lang/es-mx.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Título nuevo de la página",
     "nocontent": "No hay contenido para esta página",
     "notingroup": "No está en un grupo",
-    "page": "Página",
+    "page": "Página: {{$a}}",
     "pageexists": "Esta página ya existe.",
     "pagename": "Nombre de página",
     "subwiki": "Sub-wiki",
diff --git a/www/addons/mod/wiki/lang/fr.json b/www/addons/mod/wiki/lang/fr.json
index 3d4ff31273f..e18eeba1d13 100644
--- a/www/addons/mod/wiki/lang/fr.json
+++ b/www/addons/mod/wiki/lang/fr.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titre de la nouvelle page",
     "nocontent": "Cette page n'a pas de contenu",
     "notingroup": "Pas dans le groupe",
-    "page": "Page",
+    "page": "Page : {{$a}}",
     "pageexists": "Cette page existe déjà.",
     "pagename": "Nom de page",
     "subwiki": "Sous-wiki",
diff --git a/www/addons/mod/wiki/lang/nl.json b/www/addons/mod/wiki/lang/nl.json
index 2d4ec194f27..de4427ee53d 100644
--- a/www/addons/mod/wiki/lang/nl.json
+++ b/www/addons/mod/wiki/lang/nl.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nieuwe paginatitel",
     "nocontent": "Er is geen inhoud voor deze pagina",
     "notingroup": "Niet in groep",
-    "page": "Pagina",
+    "page": "Pagina: {{$a}}",
     "pageexists": "Deze pagina bestaat al.",
     "pagename": "Paginanaam",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/pt-br.json b/www/addons/mod/wiki/lang/pt-br.json
index 6c2036aa656..710e219e39c 100644
--- a/www/addons/mod/wiki/lang/pt-br.json
+++ b/www/addons/mod/wiki/lang/pt-br.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Novo título da página",
     "nocontent": "Não existe conteúdo para esta página",
     "notingroup": "Não existe no grupo",
-    "page": "Página",
+    "page": "Página: {{$a}}",
     "pageexists": "Esta página já existe. Redirecionado para ela.",
     "pagename": "Nome da página",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/ru.json b/www/addons/mod/wiki/lang/ru.json
index d1aad170e59..efca795f742 100644
--- a/www/addons/mod/wiki/lang/ru.json
+++ b/www/addons/mod/wiki/lang/ru.json
@@ -9,7 +9,7 @@
     "newpagetitle": "Заголовок новой страницы",
     "nocontent": "Нет содержимого у этой страницы",
     "notingroup": "Не в группе",
-    "page": "Страница",
+    "page": "Страница: {{$a}}",
     "pageexists": "Такая страница уже существует.",
     "pagename": "Название страницы",
     "titleshouldnotbeempty": "Заголовок не должен быть пустым",
diff --git a/www/addons/mod/wiki/lang/tr.json b/www/addons/mod/wiki/lang/tr.json
index 8ddfdfd95b3..f1167632e26 100644
--- a/www/addons/mod/wiki/lang/tr.json
+++ b/www/addons/mod/wiki/lang/tr.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Yeni sayfa başlığı",
     "nocontent": "Bu sayfa için içerik yok",
     "notingroup": "Grupta değil",
-    "page": "Sayfa",
+    "page": "Sayfa: {{$a}}",
     "pageexists": "Bu sayfa zaten var.",
     "pagename": "Sayfa adı",
     "wrongversionlock": "Başka bir kullanıcı sizin düzenlemeniz sırasında bu sayfayı düzenledi ve içeriğiniz geçersiz."
diff --git a/www/addons/mod/wiki/lang/uk.json b/www/addons/mod/wiki/lang/uk.json
new file mode 100644
index 00000000000..ed4f6c6208e
--- /dev/null
+++ b/www/addons/mod/wiki/lang/uk.json
@@ -0,0 +1,21 @@
+{
+    "cannoteditpage": "Ви не можете редагувати цю сторінку",
+    "createpage": "Створити сторінку",
+    "editingpage": "Редагувати сторінку '{{$a}}",
+    "errorloadingpage": "Сталася помилка під час завантаження сторінки.",
+    "errornowikiavailable": "Ця вікі ще не має ніякого змісту.",
+    "gowikihome": "Перейти на Вікі головну",
+    "map": "Мапа",
+    "newpagehdr": "Нова сторінка",
+    "newpagetitle": "Заголовок нової сторінки",
+    "nocontent": "Немає контенту для цієї сторінки",
+    "notingroup": "Не в групі",
+    "page": "Сторінка: {{$a}}",
+    "pageexists": "Ця сторінка вже існує. Перенаправити до неї.",
+    "pagename": "Назва сторінки",
+    "subwiki": "Сабвікі",
+    "titleshouldnotbeempty": "Заголовок не може бути порожнім",
+    "viewpage": "Переглянути сторінку",
+    "wikipage": "Вікі-сторінка",
+    "wrongversionlock": "Інший користувач змінив сторінку, тож версія, яку ви редагуєте - вже застаріла."
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/nl.json b/www/addons/myoverview/lang/nl.json
index e351dee92a9..5497b3d06b9 100644
--- a/www/addons/myoverview/lang/nl.json
+++ b/www/addons/myoverview/lang/nl.json
@@ -7,9 +7,9 @@
     "nocourses": "Geen cursussen",
     "nocoursesfuture": "Geen toekomstige cursussen",
     "nocoursesinprogress": "Geen actieve cursussen",
-    "nocoursespast": "Geen cursussen in verleden",
+    "nocoursespast": "Geen voltooide cursussen",
     "noevents": "Er zijn geen verwachte activiteiten",
-    "past": "Verleden",
+    "past": "Voltooid",
     "pluginname": "Cursusoverzicht",
     "recentlyoverdue": "Recent te laat",
     "sortbycourses": "Op cursus sorteren",
diff --git a/www/addons/notes/lang/ca.json b/www/addons/notes/lang/ca.json
index 1c044e61b29..9367384a78e 100644
--- a/www/addons/notes/lang/ca.json
+++ b/www/addons/notes/lang/ca.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "S'ha creat la nota",
     "nonotes": "Encara no hi ha notes d'aquest tipus",
     "note": "Anotació",
-    "notes": "Anotacions",
+    "notes": "El teu anàlisi privat i les teves notes",
     "personalnotes": "Anotacions personals",
     "publishstate": "Context",
     "sitenotes": "Anotacions del lloc",
diff --git a/www/addons/notes/lang/cs.json b/www/addons/notes/lang/cs.json
index fd3b1a46f42..984816ff5e7 100644
--- a/www/addons/notes/lang/cs.json
+++ b/www/addons/notes/lang/cs.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Poznámka vytvořena",
     "nonotes": "Doposud neexistují žádné poznámky tohoto typu",
     "note": "Poznámka",
-    "notes": "Poznámky",
+    "notes": "Vaše soukromé postřehy a poznámky",
     "personalnotes": "Osobní poznámky",
     "publishstate": "Kontext",
     "sitenotes": "Poznámky stránek",
diff --git a/www/addons/notes/lang/de.json b/www/addons/notes/lang/de.json
index b4ed60eb088..06d550d7211 100644
--- a/www/addons/notes/lang/de.json
+++ b/www/addons/notes/lang/de.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anmerkung angelegt",
     "nonotes": "Keine Anmerkungen",
     "note": "Anmerkung",
-    "notes": "Anmerkungen",
+    "notes": "Ihre persönliche Analyse und Anmerkungen",
     "personalnotes": "Meine Anmerkungen",
     "publishstate": "Kontext",
     "sitenotes": "Anmerkungen zur Website",
diff --git a/www/addons/notes/lang/el.json b/www/addons/notes/lang/el.json
index e796b19cabe..9bc5d02d49e 100644
--- a/www/addons/notes/lang/el.json
+++ b/www/addons/notes/lang/el.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Το σημείωμα δημιουργήθηκε",
     "nonotes": "Δεν υπάρχουν σημειώσεις αυτού του τύπου ακόμα",
     "note": "Σημείωση",
-    "notes": "Σημειώσεις",
+    "notes": "Οι προσωπικές σας αναλύσεις και σημειώσεις",
     "personalnotes": "Προσωπικές σημειώσεις",
     "publishstate": "Γενικό πλαίσιο",
     "sitenotes": "Σημειώσεις της ιστοσελίδας",
diff --git a/www/addons/notes/lang/es-mx.json b/www/addons/notes/lang/es-mx.json
index aabd17d948f..1c91ea47373 100644
--- a/www/addons/notes/lang/es-mx.json
+++ b/www/addons/notes/lang/es-mx.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Nota creada",
     "nonotes": "Todavía no hay notas de este tipo todavía",
     "note": "Nota",
-    "notes": "Notas",
+    "notes": "Su análisis privado y sus notas",
     "personalnotes": "Notas personales",
     "publishstate": "Contexto",
     "sitenotes": "Notas del sitio",
diff --git a/www/addons/notes/lang/fr.json b/www/addons/notes/lang/fr.json
index 21d624c4af2..346f886976d 100644
--- a/www/addons/notes/lang/fr.json
+++ b/www/addons/notes/lang/fr.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Annotation créée",
     "nonotes": "Il n'y a pas encore d'annotation de ce type",
     "note": "Annotation",
-    "notes": "Annotations",
+    "notes": "Votre analyse et vos remarques personnelles",
     "personalnotes": "Annotations personnelles",
     "publishstate": "Contexte",
     "sitenotes": "Annotations du site",
diff --git a/www/addons/notes/lang/it.json b/www/addons/notes/lang/it.json
index 0e9b001f16c..90c300a1f85 100644
--- a/www/addons/notes/lang/it.json
+++ b/www/addons/notes/lang/it.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Creata annotazione",
     "nonotes": "Non sono presenti annotazioni di questo tipo.",
     "note": "Annotazione",
-    "notes": "Annotazioni",
+    "notes": "Le tue note e analisi",
     "personalnotes": "Annotazioni personali",
     "publishstate": "Contesto",
     "sitenotes": "Annotazioni del sito",
diff --git a/www/addons/notes/lang/nl.json b/www/addons/notes/lang/nl.json
index 49a0c0209c4..64e66285bed 100644
--- a/www/addons/notes/lang/nl.json
+++ b/www/addons/notes/lang/nl.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Notitie gemaakt",
     "nonotes": "Er zijn nog geen notities van dit type.",
     "note": "Notitie",
-    "notes": "Notities",
+    "notes": "Je persoonlijke analyse en aantekeningen",
     "personalnotes": "Persoonlijke notities",
     "publishstate": "Context",
     "sitenotes": "Site notities",
diff --git a/www/addons/notes/lang/pt-br.json b/www/addons/notes/lang/pt-br.json
index ce6908d1d3e..5634bc70e89 100644
--- a/www/addons/notes/lang/pt-br.json
+++ b/www/addons/notes/lang/pt-br.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anotação criada",
     "nonotes": "Não há mais anotações desse típo",
     "note": "Anotação",
-    "notes": "Anotações",
+    "notes": "Suas análises e anotações pessoais",
     "personalnotes": "Anotações pessoais",
     "publishstate": "Contexto",
     "sitenotes": "Anotações do site",
diff --git a/www/addons/notes/lang/ru.json b/www/addons/notes/lang/ru.json
index ce3b230d19d..5b45804576d 100644
--- a/www/addons/notes/lang/ru.json
+++ b/www/addons/notes/lang/ru.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Заметка создана",
     "nonotes": "Тут нет заметок такого типа",
     "note": "Заметка",
-    "notes": "Заметки",
+    "notes": "Ваши анализы и заметки",
     "personalnotes": "Личные заметки",
     "publishstate": "Контекст",
     "sitenotes": "Заметки сайта",
diff --git a/www/addons/notes/lang/sv.json b/www/addons/notes/lang/sv.json
index 8fcd87edc6d..75049c59549 100644
--- a/www/addons/notes/lang/sv.json
+++ b/www/addons/notes/lang/sv.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anteckning skapade",
     "nonotes": "Det finns inga anteckningar av denna typ ännu",
     "note": "Anteckning",
-    "notes": "Anteckningar",
+    "notes": "Din privata analys och anteckningar",
     "personalnotes": "Personliga anteckningar",
     "publishstate": "Sammanhang",
     "sitenotes": "Webbplats anteckningar",
diff --git a/www/addons/notes/lang/uk.json b/www/addons/notes/lang/uk.json
new file mode 100644
index 00000000000..07ded7d1af1
--- /dev/null
+++ b/www/addons/notes/lang/uk.json
@@ -0,0 +1,13 @@
+{
+    "addnewnote": "Додати нову записку",
+    "coursenotes": "Записки курсу",
+    "eventnotecreated": "Записка створена",
+    "nonotes": "Наразі немає записок такого типу",
+    "note": "Записка",
+    "notes": "Ваш особистий аналіз і нотатки",
+    "personalnotes": "Персональні записки",
+    "publishstate": "Контекст",
+    "sitenotes": "Записки сайту",
+    "userwithid": "Користувач з Id {{id}}",
+    "warningnotenotsent": "Неможливо додати записку до курсу{{course}}. {{error}}"
+}
\ No newline at end of file
diff --git a/www/addons/notifications/lang/de.json b/www/addons/notifications/lang/de.json
index 6dc2a08c68c..276f9265449 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
-    "notificationpreferences": "Systemmitteilungen",
-    "notifications": "Systemmitteilungen",
+    "notificationpreferences": "Benachrichtigungen konfigurieren",
+    "notifications": "Benachrichtigungen",
     "playsound": "Audio abspielen",
     "therearentnotificationsyet": "Keine Mitteilungen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/eu.json b/www/addons/notifications/lang/eu.json
index 53670d1e38d..2363a8e19af 100644
--- a/www/addons/notifications/lang/eu.json
+++ b/www/addons/notifications/lang/eu.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Errorea jakinarazpenak jasotzean",
     "notificationpreferences": "Jakinarazpenen hobespenak",
     "notifications": "Jakinarazpenak",
+    "playsound": "Erreproduzitu soinua",
     "therearentnotificationsyet": "Ez dago jakinarazpenik"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/fa.json b/www/addons/notifications/lang/fa.json
index dcfecb86fba..4db075e4716 100644
--- a/www/addons/notifications/lang/fa.json
+++ b/www/addons/notifications/lang/fa.json
@@ -1,5 +1,5 @@
 {
     "notificationpreferences": "ترجیحات اطلاعیه‌ها",
-    "notifications": "هشدارها",
+    "notifications": "اطلاعیه‌ها",
     "therearentnotificationsyet": "هیچ هشداری وجود ندارد"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/nl.json b/www/addons/notifications/lang/nl.json
index c884b7364ea..1f96952c939 100644
--- a/www/addons/notifications/lang/nl.json
+++ b/www/addons/notifications/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fout bij het ophalen van notificaties",
-    "notificationpreferences": "Notificatievoorkeuren",
+    "notificationpreferences": "Meldingen  voorkeuren",
     "notifications": "Meldingen",
     "playsound": "Speel geluid",
     "therearentnotificationsyet": "Er zijn geen meldingen"
diff --git a/www/addons/notifications/lang/pt-br.json b/www/addons/notifications/lang/pt-br.json
index 33e2586486c..c7ff82adb19 100644
--- a/www/addons/notifications/lang/pt-br.json
+++ b/www/addons/notifications/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Erro ao receber notificações",
-    "notificationpreferences": "Preferência de notificações",
-    "notifications": "Notificação",
+    "notificationpreferences": "Preferências de notificação",
+    "notifications": "Notificações",
     "therearentnotificationsyet": "Não há notificações"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/pt.json b/www/addons/notifications/lang/pt.json
index 96ab6a55c9b..b642b4d7a9e 100644
--- a/www/addons/notifications/lang/pt.json
+++ b/www/addons/notifications/lang/pt.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Erro ao obter notificações",
     "notificationpreferences": "Preferências das notificações",
     "notifications": "Notificações",
+    "playsound": "Reproduzir som",
     "therearentnotificationsyet": "Não existem notificações"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sv.json b/www/addons/notifications/lang/sv.json
index 2aa4e69322a..024d0fef099 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,5 +1,5 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
-    "notifications": "Meddelanden",
+    "notifications": "Meddelande",
     "therearentnotificationsyet": "Det finns inga meddelanden"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/uk.json b/www/addons/notifications/lang/uk.json
new file mode 100644
index 00000000000..791d1338ac3
--- /dev/null
+++ b/www/addons/notifications/lang/uk.json
@@ -0,0 +1,7 @@
+{
+    "errorgetnotifications": "Помилка отримання сповіщень",
+    "notificationpreferences": "Налаштування сповіщень",
+    "notifications": "Повідомлення",
+    "playsound": "Грати звук",
+    "therearentnotificationsyet": "Немає сповіщень"
+}
\ No newline at end of file
diff --git a/www/addons/participants/lang/ca.json b/www/addons/participants/lang/ca.json
index 3c6638a3af7..1c214eda823 100644
--- a/www/addons/participants/lang/ca.json
+++ b/www/addons/participants/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No s'han trobat participants per aquest curs",
+    "noparticipants": "No s'han trobat participants.",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/cs.json b/www/addons/participants/lang/cs.json
index 2092b03a730..4ae4dd88392 100644
--- a/www/addons/participants/lang/cs.json
+++ b/www/addons/participants/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Pro tento kurz nenalezeni účastníci",
-    "participants": "Účastníci"
+    "noparticipants": "Nebyl nalezen žádný účastník",
+    "participants": "Přispěvatelé"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/de.json b/www/addons/participants/lang/de.json
index 95a259f09bd..087591cfe5d 100644
--- a/www/addons/participants/lang/de.json
+++ b/www/addons/participants/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Keine Personen für diesen Kurs gefunden",
-    "participants": "Personen"
+    "noparticipants": "Keine Teilnehmer gefunden",
+    "participants": "Teilnehmer/innen"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/el.json b/www/addons/participants/lang/el.json
index 846f209c0b0..e1a786afbb1 100644
--- a/www/addons/participants/lang/el.json
+++ b/www/addons/participants/lang/el.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Δεν βρέθηκαν συμμετέχοντες σε αυτό το μάθημα",
+    "noparticipants": "Δε βρέθηκαν συμμετέχονες γι' αυτό το μάθημα",
     "participants": "Συμμετέχοντες"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es-mx.json b/www/addons/participants/lang/es-mx.json
index 56f80358ad5..5c6014bd522 100644
--- a/www/addons/participants/lang/es-mx.json
+++ b/www/addons/participants/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se encontraron participantes para este curso",
+    "noparticipants": "No se encontraron participantes.",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/fr.json b/www/addons/participants/lang/fr.json
index fc97610a609..0a75ac6f8c8 100644
--- a/www/addons/participants/lang/fr.json
+++ b/www/addons/participants/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Aucun participant trouvé dans ce cours",
+    "noparticipants": "Aucun participant trouvé",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/it.json b/www/addons/participants/lang/it.json
index 0d16202be57..21d39dce004 100644
--- a/www/addons/participants/lang/it.json
+++ b/www/addons/participants/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "In questo corso non sono stati trovati partecipanti",
-    "participants": "Partecipanti"
+    "noparticipants": "Non sono stati trovati partecipanti.",
+    "participants": "Sono autorizzati ad inserire record"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/nl.json b/www/addons/participants/lang/nl.json
index 2beef686f18..a7b39b547fc 100644
--- a/www/addons/participants/lang/nl.json
+++ b/www/addons/participants/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Geen deelnemers gevonden in deze cursus",
+    "noparticipants": "Geen deelnemers gevonden",
     "participants": "Deelnemers"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt-br.json b/www/addons/participants/lang/pt-br.json
index 792fea1d8fd..a107a2f8ee1 100644
--- a/www/addons/participants/lang/pt-br.json
+++ b/www/addons/participants/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nenhum dos participantes encontrados para este curso",
+    "noparticipants": "Nenhum participante encontrado.",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sv.json b/www/addons/participants/lang/sv.json
index ab7780c8f28..54221f5de3f 100644
--- a/www/addons/participants/lang/sv.json
+++ b/www/addons/participants/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Inga deltagare hittades för kursen",
+    "noparticipants": "Inga deltagare funna.",
     "participants": "Deltagare"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/tr.json b/www/addons/participants/lang/tr.json
index 05e3c834e4a..307ef1e120f 100644
--- a/www/addons/participants/lang/tr.json
+++ b/www/addons/participants/lang/tr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Bu derste hiç katılımcı bulunamadı",
+    "noparticipants": "Hiçbir katılımcı bulunamadı.",
     "participants": "Katılımcılar"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/uk.json b/www/addons/participants/lang/uk.json
new file mode 100644
index 00000000000..2899a99f372
--- /dev/null
+++ b/www/addons/participants/lang/uk.json
@@ -0,0 +1,4 @@
+{
+    "noparticipants": "Жодного учасника не знайдено",
+    "participants": "Учасники"
+}
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-cn.json b/www/addons/participants/lang/zh-cn.json
index f2ce4c8e36a..4a9403ae5c7 100644
--- a/www/addons/participants/lang/zh-cn.json
+++ b/www/addons/participants/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "未找到此项课程的参与者",
-    "participants": "课程参与者"
+    "participants": "参与者"
 }
\ No newline at end of file
diff --git a/www/config.json b/www/config.json
index 9539fb2d134..8567b881866 100644
--- a/www/config.json
+++ b/www/config.json
@@ -5,7 +5,7 @@
     "versionname" : "3.3.0",
     "cache_expiration_time" : 300000,
     "default_lang" : "en",
-    "languages": {"ar": "عربي", "bg": "Български", "ca": "Català", "cs": "Čeština", "da": "Dansk", "de": "Deutsch","en": "English", "es": "Español", "es-mx": "Español - México", "eu": "Euskara", "fa": "فارسی", "fr" : "Français", "he" : "עברית", "hu": "magyar", "it": "Italiano", "ja": "日本語","nl": "Nederlands", "pl": "Polski", "pt-br": "Português - Brasil", "pt": "Português - Portugal", "ro": "Română", "ru": "Русский", "sv": "Svenska", "tr" : "Türkçe", "zh-cn" : "简体中文", "zh-tw" : "正體中文"},
+    "languages": {"ar": "عربي", "bg": "Български", "ca": "Català", "cs": "Čeština", "da": "Dansk", "de": "Deutsch", "el": "Ελληνικά", "en": "English", "es": "Español", "es-mx": "Español - México", "eu": "Euskara", "fa": "فارسی", "fr" : "Français", "he" : "עברית", "hu": "magyar", "it": "Italiano", "ja": "日本語","nl": "Nederlands", "pl": "Polski", "pt-br": "Português - Brasil", "pt": "Português - Portugal", "ro": "Română", "ru": "Русский", "sv": "Svenska", "tr" : "Türkçe", "uk" : "Українська", "zh-cn" : "简体中文", "zh-tw" : "正體中文"},
     "wsservice" : "moodle_mobile_app",
     "wsextservice" : "local_mobile",
     "demo_sites": {"student": {"url": "http://school.demo.moodle.net", "username": "student", "password": "moodle"}, "teacher": {"url": "http://school.demo.moodle.net", "username": "teacher", "password": "moodle"}, "cva": {"url": "http://mm.cvaconsulting.com/moodle", "username": "student", "password": "student"}},
diff --git a/www/core/components/contentlinks/lang/uk.json b/www/core/components/contentlinks/lang/uk.json
new file mode 100644
index 00000000000..a759354d9f2
--- /dev/null
+++ b/www/core/components/contentlinks/lang/uk.json
@@ -0,0 +1,7 @@
+{
+    "chooseaccount": "Виберіть аккаунт",
+    "chooseaccounttoopenlink": "Виберіть обліковий запис, щоб відкрити посилання.",
+    "confirmurlothersite": "Це посилання відноситься до іншого місця. Ви хочете відкрити?",
+    "errornoactions": "Не вдалося знайти дію, яка виконує за цим посиланням.",
+    "errornosites": "Не вдалося знайти сайт, щоб впоратися з цим посиланням."
+}
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index 4d5f44fc1cc..840bea85604 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
-    "showall": "Mostra-ho tot",
+    "showall": "Mostra totes les preguntes en una pàgina",
     "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index e8cac178795..c9c69290ccd 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
-    "showall": "Zobrazit vše",
+    "showall": "Zobrazit všechny úlohy na jedné stránce",
     "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index 16ab12b9912..82fdbc2a7d5 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
     "nocontentavailable": "Momentan sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
-    "showall": "Alles anzeigen",
+    "showall": "Alle Fragen auf einer Seite anzeigen",
     "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index 5882734e565..ad864c0ff41 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -16,5 +16,5 @@
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Προβολή όλων"
+    "showall": "Εμφάνιση όλων των ερωτήσεων σε μία σελίδα"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index 1745ce4e20a..2bf6762b6e9 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Usted está a punto de descargar {{size}}. ¿Está Usted seguro de querer continuar?",
     "confirmdownloadunknownsize": "No pudimos calcular el tamaño de la descarga. ¿Está Usted seguro de querer descargarla?",
     "confirmpartialdownloadsize": "Usted está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está Usted seguro de querer continuar?",
-    "contents": "Contenidos",
+    "contents": "Contenido",
     "couldnotloadsectioncontent": "No pudo cargarse el contenido de la sección; por favor inténtelo nuevamente después.",
     "couldnotloadsections": "No pudieron cargarse las secciones; por favor inténtelo nuevamente después.",
     "errordownloadingsection": "Error al descargar sección",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todo",
+    "showall": "Mostrar todas las preguntas en una página",
     "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index cb91088f8e6..21ef443c8c8 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -5,10 +5,10 @@
     "confirmdownload": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmdownloadunknownsize": "ما نتوانستیم حجم دریافت را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmpartialdownloadsize": "شما در آستانهٔ دریافت <strong>حداقل</strong> {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
-    "contents": "محتواها",
+    "contents": "محتویات",
     "couldnotloadsectioncontent": "محتوای قسمت نتوانست بارگیری شود. لطفا بعدا دوباره تلاش کنید.",
     "couldnotloadsections": "قسمت‌ها نتوانستند بارگیری شوند. لطفا بعدا دوباره تلاش کنید.",
     "hiddenfromstudents": "پنهان از شاگردان",
-    "showall": "نمایش همه",
+    "showall": "نمایش همهٔ سؤال‌ها در یک صفحه",
     "useactivityonbrowser": "البته همچنان می‌توانید با استفاده از مرورگر دستگاه خود، از آن استفاده کنید."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index fa5ca9f7fb7..511b6fcedf4 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
-    "showall": "Tout afficher",
+    "showall": "Afficher toutes les questions sur une page",
     "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index 2f6968177c8..2b09768bc49 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -9,5 +9,5 @@
     "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutto"
+    "showall": "Visualizza tutte le domande nella stessa pagina"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index e341c7adfe2..4386ada4fd0 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
-    "showall": "Toon alle",
+    "showall": "Toon alle vragen op één pagina",
     "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index e95b7c4187c..4823f129bed 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
     "confirmdownloadunknownsize": "Não fomos capazes de calcular o tamanho do download. Tem certeza de que deseja fazer o download?",
     "confirmpartialdownloadsize": "Você está prestes a baixar <strong>pelo menos</strong> {{size}}. Você tem certeza que quer continuar?",
-    "contents": "Conteúdos",
+    "contents": "Conteúdo",
     "couldnotloadsectioncontent": "Não foi possível carregar o conteúdo da seção, por favor tente mais tarde.",
     "couldnotloadsections": "Não foi possível carregar a seção, por favor tente mais tarde.",
     "errordownloadingsection": "Erro ao baixar seção.",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
     "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente.",
-    "showall": "Mostrar todos",
+    "showall": "Mostrar todas as questões em uma página",
     "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index 6a0a1c3f43a..f05042ab16d 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -6,5 +6,5 @@
     "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Показать все"
+    "showall": "Отображать все вопросы на одной странице"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index 0063575e970..d4f3f97d71b 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -10,5 +10,5 @@
     "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla"
+    "showall": "Visa alla frågor på en sida"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/tr.json b/www/core/components/course/lang/tr.json
index 027484a1cc3..8d09b5affd9 100644
--- a/www/core/components/course/lang/tr.json
+++ b/www/core/components/course/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "allsections": "Tüm Bölümler",
-    "contents": "İçerik(ler)",
+    "contents": "İçerik",
     "hiddenfromstudents": "Öğrencilerden gizli",
     "overriddennotice": "Bu etkinlikteki final notunuz, elle ayarlandı.",
-    "showall": "Tümünü göster"
+    "showall": "Bütün soruları tek sayfada göster"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/uk.json b/www/core/components/course/lang/uk.json
new file mode 100644
index 00000000000..b142c43a2f0
--- /dev/null
+++ b/www/core/components/course/lang/uk.json
@@ -0,0 +1,22 @@
+{
+    "activitydisabled": "Ваша організація відключила цю активність в мобільному додатку.",
+    "activitynotyetviewableinapp": "Ми працюємо на підтримку {{$a}} діяльності.",
+    "activitynotyetviewableremoteaddon": "Ваша організація встановила плагін, який ще не підтримується.",
+    "activitynotyetviewablesiteupgradeneeded": "Установка Moodle вашої організації повинна бути оновлена.",
+    "allsections": "Всі секції",
+    "askadmintosupport": "Зверніться до адміністратора сайту і скажіть їм, що ви хочете використовувати цю діяльність з додатком Moodle Mobile.",
+    "confirmdeletemodulefiles": "Ви впевнені, що хочете видалити цей модуль?",
+    "confirmdownload": "Ви збираєтеся завантажити {{size}}. Ви впевнені, що хочете продовжити?",
+    "confirmdownloadunknownsize": "Ми не змогли розрахувати розмір файлу. Ви впевнені, що ви хочете завантажити?",
+    "confirmpartialdownloadsize": "Ви збираєтеся завантажити <strong> принаймні </strong> {{size}}. Ви впевнені, що хочете продовжити?",
+    "contents": "Зміст",
+    "couldnotloadsectioncontent": "Не вдалося завантажити вміст розділу, будь ласка, спробуйте ще раз пізніше.",
+    "couldnotloadsections": "Не вдалося завантажити розділи, будь ласка, спробуйте ще раз пізніше.",
+    "errordownloadingsection": "Помилка в завантаженні.",
+    "errorgetmodule": "Помилка при отриманні даних модуля.",
+    "hiddenfromstudents": "Сховане від студентів",
+    "nocontentavailable": "Немає контенту, доступного в даний момент.",
+    "overriddennotice": "Ваші фінальні бали з даної активності були відкореговані вручну.",
+    "showall": "Показати всі питання на одній сторінці",
+    "useactivityonbrowser": "Ви все ще можете використовувати його за допомогою браузера пристрою."
+}
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-cn.json b/www/core/components/course/lang/zh-cn.json
index c60b61bdc0b..85734e6d23c 100644
--- a/www/core/components/course/lang/zh-cn.json
+++ b/www/core/components/course/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "contents": "内容",
     "hiddenfromstudents": "对学生隐藏",
     "overriddennotice": "您在该活动中的最终成绩将自动调整。",
-    "showall": "全部显示"
+    "showall": "所有题目显示在一页"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/ca.json b/www/core/components/courses/lang/ca.json
index 4eecef3495a..48a43540ee7 100644
--- a/www/core/components/courses/lang/ca.json
+++ b/www/core/components/courses/lang/ca.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrar els meus cursos",
     "frontpage": "Pàgina principal",
     "mycourses": "Els meus cursos",
-    "nocourses": "No hi ha informació del curs per mostrar.",
+    "nocourses": "Encara no hi ha cursos",
     "nocoursesyet": "No hi ha cursos en aquesta categoria",
-    "nosearchresults": "No hi ha resultats per la vostra cerca",
-    "notenroled": "No esteu inscrit en aquest curs",
+    "nosearchresults": "Cap resultat",
+    "notenroled": "No us heu inscrit en aquest curs",
     "notenrollable": "No podeu autoinscriure-us en aquest curs.",
-    "password": "Clau d'inscripció",
+    "password": "Contrasenya",
     "search": "Cerca...",
     "searchcourses": "Cerca cursos",
     "searchcoursesadvice": "Podeu fer servir el botó de cercar cursos per accedir als cursos com a convidat o autoinscriure-us en cursos que ho permetin.",
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index db3178d0886..2149d9de359 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -5,7 +5,7 @@
     "categories": "Kategorie",
     "confirmselfenrol": "Jste si jisti, že chcete zapsat se do tohoto kurzu?",
     "courses": "Kurzy",
-    "enrolme": "Zapsat se",
+    "enrolme": "Zapsat se do kurzu",
     "errorloadcategories": "Při načítání kategorií došlo k chybě.",
     "errorloadcourses": "Při načítání kurzů došlo k chybě.",
     "errorsearching": "Při vyhledávání došlo k chybě.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
-    "nocourses": "O kurzu nejsou žádné informace.",
+    "nocourses": "Žádné kurzy",
     "nocoursesyet": "Žádný kurz v této kategorii",
-    "nosearchresults": "Z vašeho hledání nebyly nalezeny žádné výsledky",
-    "notenroled": "V tomto kurzu nejste zapsán",
+    "nosearchresults": "Žádné výsledky",
+    "notenroled": "Nejste zapsáni v tomto kurzu",
     "notenrollable": "Do tohoto kurzu se nemůžete sami zapsat.",
-    "password": "Klíč zápisu",
+    "password": "Heslo",
     "search": "Vyhledávání...",
     "searchcourses": "Vyhledat kurzy",
     "searchcoursesadvice": "Můžete použít tlačítko Vyhledat kurzy, pracovat jako host nebo se zapsat do kurzů, které to umožňují.",
diff --git a/www/core/components/courses/lang/de.json b/www/core/components/courses/lang/de.json
index e570f9df7bd..44a6eb68eef 100644
--- a/www/core/components/courses/lang/de.json
+++ b/www/core/components/courses/lang/de.json
@@ -5,7 +5,7 @@
     "categories": "Kategorien",
     "confirmselfenrol": "Möchten Sie sich selbst in diesen Kurs einschreiben?",
     "courses": "Kurse",
-    "enrolme": "Selbst einschreiben",
+    "enrolme": "Einschreiben",
     "errorloadcategories": "Fehler beim Laden der Kursbereiche",
     "errorloadcourses": "Fehler beim Laden der Kurse",
     "errorsearching": "Fehler beim Suchen",
@@ -13,12 +13,12 @@
     "filtermycourses": "Meine Kurse filtern",
     "frontpage": "Startseite",
     "mycourses": "Meine Kurse",
-    "nocourses": "Keine Kursinformation",
+    "nocourses": "Keine Kurse",
     "nocoursesyet": "Keine Kurse in diesem Kursbereich",
-    "nosearchresults": "Keine Suchergebnisse",
-    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben.",
+    "nosearchresults": "Keine Ergebnisse",
+    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben",
     "notenrollable": "Sie können sich nicht selbst in diesen Kurs einschreiben.",
-    "password": "Einschreibeschlüssel",
+    "password": "Gastschlüssel",
     "search": "Suchen...",
     "searchcourses": "Kurse suchen",
     "searchcoursesadvice": "Sie können Kurse suchen, um als Gast teilzunehmen oder sich selbst einzuschreiben, falls dies erlaubt ist.",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index b7408250b69..c229315e83e 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Φιλτράρισμα των μαθημάτων μου",
     "frontpage": "Αρχική σελίδα",
     "mycourses": "Τα μαθήματά μου",
-    "nocourses": "Δεν υπάρχουν πληροφορίες για αυτό το μάθημα.",
+    "nocourses": "Δεν υπάρχουν μαθήματα ακόμα",
     "nocoursesyet": "Δεν υπάρχουν μαθήματα σε αυτήν την κατηγορία",
-    "nosearchresults": "Δεν βρέθηκαν αποτελέσματα",
-    "notenroled": "Δεν έχετε εγγραφεί σε αυτό το μάθημα",
+    "nosearchresults": "Δε βρέθηκαν αποτελέσματα για την αναζήτησή σας",
+    "notenroled": "Δεν είσαι εγγεγραμμένος σε αυτό το μάθημα",
     "notenrollable": "Δεν μπορείτε να αυτο-εγγραφείτε σε αυτό το μάθημα.",
-    "password": "Κλειδί εγγραφής",
+    "password": "Κωδικός πρόσβασης",
     "search": "Αναζήτηση...",
     "searchcourses": "Αναζήτηση μαθημάτων",
     "searchcoursesadvice": "Μπορείτε να χρησιμοποιήσετε το κουμπί Αναζήτηση μαθημάτων για πρόσβαση ως επισκέπτης ή για να αυτο-εγγραφείτε σε μαθήματα που το επιτρέπουν.",
diff --git a/www/core/components/courses/lang/es-mx.json b/www/core/components/courses/lang/es-mx.json
index efaa185521b..59e8d8d7f1e 100644
--- a/www/core/components/courses/lang/es-mx.json
+++ b/www/core/components/courses/lang/es-mx.json
@@ -13,12 +13,12 @@
     "filtermycourses": "<<<filtrar mis cursos",
     "frontpage": "Portada",
     "mycourses": "Mis cursos",
-    "nocourses": "Sin información del curso para mostrar.",
+    "nocourses": "Ningun curso",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "No hubo resultados de su búsqueda",
+    "nosearchresults": "Sin resultados",
     "notenroled": "Usted no está inscrito en este curso",
     "notenrollable": "Usted no puede inscribirse a Usted mismo en este curso.",
-    "password": "Clave de inscripción",
+    "password": "Contraseña",
     "search": "Buscar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Usted puede usar el botón de 'buscar cursos' para acceder como invitado o para inscribirse Usted mismo en los cursos que lo permitan.",
diff --git a/www/core/components/courses/lang/fr.json b/www/core/components/courses/lang/fr.json
index 25d105f1132..6fa919a52d9 100644
--- a/www/core/components/courses/lang/fr.json
+++ b/www/core/components/courses/lang/fr.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrer mes cours",
     "frontpage": "Page d'accueil",
     "mycourses": "Mes cours",
-    "nocourses": "Aucune information de cours à afficher",
+    "nocourses": "Pas de cours",
     "nocoursesyet": "Il n'y a pas encore de cours",
-    "nosearchresults": "Votre recherche n'a donné aucun résultat",
+    "nosearchresults": "Aucun résultat",
     "notenroled": "Vous n'êtes pas inscrit à ce cours",
     "notenrollable": "Vous ne pouvez pas vous inscrire vous-même à ce cours.",
-    "password": "Clef d'inscription",
+    "password": "Mot de passe",
     "search": "Recherche...",
     "searchcourses": "Rechercher les cours",
     "searchcoursesadvice": "Veuillez utiliser le bouton de recherche de cours pour accéder anonymement à des cours ou vous inscrire vous-même à des cours qui le permettent.",
diff --git a/www/core/components/courses/lang/it.json b/www/core/components/courses/lang/it.json
index a62c6475bca..78743b9a170 100644
--- a/www/core/components/courses/lang/it.json
+++ b/www/core/components/courses/lang/it.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Filtra i miei corsi",
     "frontpage": "Pagina home",
     "mycourses": "I miei corsi",
-    "nocourses": "Non sono presenti informazioni sul corso.",
+    "nocourses": "Non ci sono corsi",
     "nocoursesyet": "Questa categoria non ha corsi",
-    "nosearchresults": "La ricerca non ha prodotto risultati",
+    "nosearchresults": "Nessun risultato",
     "notenroled": "Non sei iscritto in questo corso",
     "notenrollable": "Non puoi iscriverti al corso.",
-    "password": "Chiave di iscrizione",
+    "password": "Chiave",
     "search": "Cerca...",
     "searchcourses": "Cerca corsi",
     "searchcoursesadvice": "Puoi utilizzare la ricerca corsi per accedere come ospite oppure iscriverti nei corsi che lo consentono.",
diff --git a/www/core/components/courses/lang/nl.json b/www/core/components/courses/lang/nl.json
index 71fd4592a9e..3ccabdad311 100644
--- a/www/core/components/courses/lang/nl.json
+++ b/www/core/components/courses/lang/nl.json
@@ -5,7 +5,7 @@
     "categories": "Categorieën",
     "confirmselfenrol": "Weet je zeker dat je je wil aanmelden in deze cursus?",
     "courses": "Cursussen",
-    "enrolme": "Meld me aan",
+    "enrolme": "Laat me in de cursus",
     "errorloadcategories": "Er is een fout opgetreden bij het ophalen van categorieën",
     "errorloadcourses": "Er is een fout opgetreden tijdens het laden van de cursussen.",
     "errorsearching": "Er is een fout opgetreden tijdens het zoeken.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filter mijn cursussen",
     "frontpage": "Startpagina",
     "mycourses": "Mijn cursussen",
-    "nocourses": "Geen cursusinformatie beschikbaar.",
+    "nocourses": "Geen cursussen",
     "nocoursesyet": "Er zijn geen cursussen in deze categorie",
-    "nosearchresults": "Je zoekopdracht gaf geen resultaten",
-    "notenroled": "Je bent niet aangemeld in deze cursus.",
+    "nosearchresults": "Geen resultaten",
+    "notenroled": "Je bent niet aangemeld in deze cursus",
     "notenrollable": "Je kunt jezelf niet aanmelden in deze cursus.",
-    "password": "Aanmeldingssleutel",
+    "password": "Wachtwoord",
     "search": "Zoeken...",
     "searchcourses": "Zoek cursussen",
     "searchcoursesadvice": "Je kunt via de cursus zoekknop toegang krijgen als gast of jezelf aanmelden in cursussen die dit toestaan.",
diff --git a/www/core/components/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index 6f8671b937b..c321354487f 100644
--- a/www/core/components/courses/lang/pt-br.json
+++ b/www/core/components/courses/lang/pt-br.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrar meus cursos",
     "frontpage": "Primeira página",
     "mycourses": "Meus cursos",
-    "nocourses": "Sem informações sobre o curso para mostrar.",
+    "nocourses": "Ainda não existem cursos",
     "nocoursesyet": "Nenhum curso nesta categoria",
-    "nosearchresults": "Não foram encontrados resultados da sua pesquisa",
-    "notenroled": "Você não está registrado neste curso",
+    "nosearchresults": "Nenhum resultado",
+    "notenroled": "Você não está inscrito como estudante neste curso",
     "notenrollable": "Você não pode inscrever-se neste curso.",
-    "password": "Chave de inscrição",
+    "password": "Senha",
     "search": "Procurar...",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Você pode usar o botão de busca para acessar os cursos como convidado ou matricular-se em cursos que permitem que ele.",
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index dd610088dbb..2852a04f2d5 100644
--- a/www/core/components/courses/lang/sv.json
+++ b/www/core/components/courses/lang/sv.json
@@ -4,19 +4,19 @@
     "categories": "Kategorier",
     "confirmselfenrol": "Är du säker att du vill registrera dig i den här kursen ?",
     "courses": "Kurser",
-    "enrolme": "Registrera mig",
+    "enrolme": "Koppla mig",
     "errorloadcourses": "Ett fel uppstod vid inläsning av kursen",
     "errorsearching": "Fel uppstod vid sökning",
     "errorselfenrol": "Fel uppstod vid registrering",
     "filtermycourses": "Filtrera mina kurser",
     "frontpage": "Ingångssidan",
     "mycourses": "Mina kurser",
-    "nocourses": "Ingen kursinfomration att visa",
+    "nocourses": "Det finns inga kurser ännu",
     "nocoursesyet": "Inga kurser i denna kategori",
-    "nosearchresults": "Inga sökningsresultat",
-    "notenroled": "Du är inte registrerad i kursen",
+    "nosearchresults": "Inga resultat",
+    "notenroled": "Du är inte registrerad i den här kursen",
     "notenrollable": "Du kan inte självregistrera dig i kursen",
-    "password": "Kursnyckel",
+    "password": "Gästlösenord",
     "search": "Sök...",
     "searchcourses": "Sök kurser",
     "searchcoursesadvice": "Du kan använda knappen \"Sök kurser\" för att få tillgång som gäst eller registrera dig på kurser som tillåter det .",
diff --git a/www/core/components/courses/lang/uk.json b/www/core/components/courses/lang/uk.json
new file mode 100644
index 00000000000..d73443b49fe
--- /dev/null
+++ b/www/core/components/courses/lang/uk.json
@@ -0,0 +1,27 @@
+{
+    "allowguests": "Дозволено гостьовий доступ до курсу",
+    "availablecourses": "Доступні курси",
+    "cannotretrievemorecategories": "Категорії глибші, ніж рівень {{$a}} не можуть бути відновлені.",
+    "categories": "Категорії",
+    "confirmselfenrol": "Ви впевнені, що хочете зареєструвати себе в цьому курсі?",
+    "courses": "Курси",
+    "enrolme": "Зареєструвати мене",
+    "errorloadcategories": "Сталася помилка під час завантаження категорій.",
+    "errorloadcourses": "Сталася помилка під час завантаження курсів.",
+    "errorsearching": "Під час пошуку сталася помилка.",
+    "errorselfenrol": "Сталася помилка при самостійному зарахування.",
+    "filtermycourses": "Відфільтрувати мої курси",
+    "frontpage": "Титульна сторінка",
+    "mycourses": "Мої курси",
+    "nocourses": "Ще немає курсів",
+    "nocoursesyet": "У цій категорії немає курсів",
+    "nosearchresults": "Немає результатів",
+    "notenroled": "Ви не зареєстровані як студент цього курсу",
+    "notenrollable": "Ви не можете зареєструвати себе в цьому курсі.",
+    "password": "Пароль",
+    "search": "Пошук...",
+    "searchcourses": "Пошук курсів",
+    "searchcoursesadvice": "Ви можете використовувати кнопку пошуку курсів, щоб отримати доступ в якості гостя або зареєструвати себе в курсах, які дозволяють їй.",
+    "selfenrolment": "Самостійна реєстрація",
+    "totalcoursesearchresults": "Всього курсів:  {{$a}}"
+}
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ca.json b/www/core/components/fileuploader/lang/ca.json
index f5e46ff7e10..68323beba4b 100644
--- a/www/core/components/fileuploader/lang/ca.json
+++ b/www/core/components/fileuploader/lang/ca.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "S'ha produït un error descarregant la imatge de l'àlbum.",
     "errormustbeonlinetoupload": "Heu d'estar connectat per pujar arxius.",
     "errornoapp": "No teniu instal·lada una app per realitzar aquesta acció.",
-    "errorreadingfile": "S'ha produït un error llegint el fitxer.",
+    "errorreadingfile": "S'ha produït un error en llegir el fitxer \"{{$a}}\"",
     "errorwhileuploading": "S'ha produït un error penjant el fitxer.",
-    "file": "Arxiu",
+    "file": "Fitxers de la retroacció",
     "fileuploaded": "S'ha penjat el fitxer",
-    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima de càrrega és {{$a.size}}.",
+    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima que podeu pujar és de {{$a.size}}.",
     "photoalbums": "Àlbums de fotos",
     "readingfile": "S'està llegint un fitxer",
     "selectafile": "Selecciona un fitxer",
     "uploadafile": "Penja un fitxer",
-    "uploading": "S'està penjant",
+    "uploading": "S'està carregant...",
     "uploadingperc": "S'està pujant: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/cs.json b/www/core/components/fileuploader/lang/cs.json
index 4c0277d01ff..66897f21800 100644
--- a/www/core/components/fileuploader/lang/cs.json
+++ b/www/core/components/fileuploader/lang/cs.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
     "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
     "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
-    "errorreadingfile": "Chyba při čtení souboru.",
+    "errorreadingfile": "Chyba při čtení souboru \"{{$a}}\"",
     "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
-    "file": "Soubor",
+    "file": "Soubory se zpětnou vazbou",
     "fileuploaded": "Soubor nahrán",
-    "maxbytesfile": "Soubor {{$a.file}} je příliš veliký. Maximální velikost nahrávaného souboru je {{$a.size}}.",
+    "maxbytesfile": "Soubor {{$a.file}} je příliš velký. Maximální velikost, kterou můžete nahrát, je  {{$a.size}}.",
     "photoalbums": "Fotoalba",
     "readingfile": "Čtení souboru",
     "selectafile": "Vyberte soubor",
-    "uploadafile": "Nahrát soubor",
-    "uploading": "Nahrávání",
+    "uploadafile": "Vložit soubor",
+    "uploading": "Nahrávání ...",
     "uploadingperc": "Nahrávání: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/de.json b/www/core/components/fileuploader/lang/de.json
index e54ab178c4f..72384b4829e 100644
--- a/www/core/components/fileuploader/lang/de.json
+++ b/www/core/components/fileuploader/lang/de.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
     "errormustbeonlinetoupload": "Dateien können nur online hochgeladen werden.",
     "errornoapp": "Keine App zum Ausführen dieser Aktion gefunden",
-    "errorreadingfile": "Fehler beim Lesen der Datei",
+    "errorreadingfile": "Fehler beim Lesen der Datei \"{{$a}}\"",
     "errorwhileuploading": "Fehler beim Hochladen der Datei",
-    "file": "Datei",
+    "file": "Feedbackdateien",
     "fileuploaded": "Datei hochgeladen",
     "maxbytesfile": "Die Datei {{$a.file}} ist zu groß. Die maximale Größe zum Hochladen ist {{$a.size}}.",
     "photoalbums": "Fotoalbum",
     "readingfile": "Datei lesen",
     "selectafile": "Wählen Sie eine Datei.",
     "uploadafile": "Datei hochladen",
-    "uploading": "Hochladen",
+    "uploading": "Wird hochgeladen...",
     "uploadingperc": "Hochladen: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/el.json b/www/core/components/fileuploader/lang/el.json
index 57aa3c4745c..26043910c12 100644
--- a/www/core/components/fileuploader/lang/el.json
+++ b/www/core/components/fileuploader/lang/el.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από το αλμπουμ.",
     "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
     "errornoapp": "Δεν έχετε εγκατεστημένη εφαρμογή για να εκτελέσετε αυτή την ενέργεια.",
-    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
+    "errorreadingfile": "Σφάλμα στην ανάγνωση του αρχείου \"{{$a}}\"",
     "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου.",
-    "file": "Αρχείο",
+    "file": "Αρχεία ανατροφοδότησης",
     "fileuploaded": "Το αρχείο ανέβηκε επιτυχώς.",
     "maxbytesfile": "Το αρχείο {{$a.file}} είναι πολύ μεγάλο. Το μέγιστο μέγεθος που μπορείτε να ανεβάσετε είναι {{$a.size}}.",
     "photoalbums": "Άλμπουμ φωτογραφιών",
     "readingfile": "Ανάγνωση αρχείου",
     "selectafile": "Επιλογή αρχείου",
-    "uploadafile": "Ανεβάστε ένα αρχείο",
-    "uploading": "Ανέβασμα",
+    "uploadafile": "Φόρτωση ενός αρχείου",
+    "uploading": "Ανέβασμα...",
     "uploadingperc": "Ανέβασμα: {{$a}}%",
     "video": "Βίντεο"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/es-mx.json b/www/core/components/fileuploader/lang/es-mx.json
index d299651b204..ec27c0f9ba3 100644
--- a/www/core/components/fileuploader/lang/es-mx.json
+++ b/www/core/components/fileuploader/lang/es-mx.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Error al obtener imagen del album.",
     "errormustbeonlinetoupload": "Usted tiene que estar en-línea para subir archivos.",
     "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
-    "errorreadingfile": "Error al leer archivo.",
+    "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
     "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
-    "file": "Archivo",
+    "file": "Archivos de retroalimentación",
     "fileuploaded": "El archivo fue subido exitosamente.",
-    "maxbytesfile": "El archivo {{$a.file}} es demasido grande. El tamaño máximo que Usted puede subir es {{$a.size}}.",
+    "maxbytesfile": "El archivo {{$a.file}} es demasiado grande. El tamaño máximo que Usted puede subir es de {{$a.size}}.",
     "photoalbums": "Foto álbumes",
     "readingfile": "Leyendo archivo",
     "selectafile": "Seleccionar un archivo",
     "uploadafile": "Subir un archivo",
-    "uploading": "Subiendo",
+    "uploading": "Subiendo...",
     "uploadingperc": "Subiendo: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/fr.json b/www/core/components/fileuploader/lang/fr.json
index 68434825ec0..78d6ece3168 100644
--- a/www/core/components/fileuploader/lang/fr.json
+++ b/www/core/components/fileuploader/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Ajouter le fichier",
+    "addfiletext": "Ajouter un fichier",
     "audio": "Audio",
     "camera": "Caméra",
     "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erreur lors de la récupération de l'image de l'album.",
     "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
     "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
-    "errorreadingfile": "Erreur de lecture du fichier.",
+    "errorreadingfile": "Erreur lors de la lecture du fichier « {{$a}} »",
     "errorwhileuploading": "Une erreur est survenue lors du dépôt du fichier.",
-    "file": "Fichier",
+    "file": "Fichiers de feedback",
     "fileuploaded": "Le fichier a été déposé.",
-    "maxbytesfile": "Le fichier {{$a.file}} est trop gros. La taille maximale permise est de {{$a.size}}.",
+    "maxbytesfile": "La taille du fichier {{$a.file}} est trop grande. La taille maximale d'un fichier à déposer est de {{$a.size}}.",
     "photoalbums": "Albums de photos",
     "readingfile": "Lecture du fichier",
     "selectafile": "Choisir un fichier",
     "uploadafile": "Déposer un fichier",
-    "uploading": "Envoi",
+    "uploading": "En cours de dépôt...",
     "uploadingperc": "Dépôt en cours : {{$a}} %",
     "video": "Vidéo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/it.json b/www/core/components/fileuploader/lang/it.json
index a6eac6c923f..5f5fb84e300 100644
--- a/www/core/components/fileuploader/lang/it.json
+++ b/www/core/components/fileuploader/lang/it.json
@@ -10,15 +10,15 @@
     "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
     "errormustbeonlinetoupload": "Devi essere online per caricare file.",
     "errornoapp": "Non hai un'app per svolgere questa azione.",
-    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
+    "errorreadingfile": "Si è verificato un errore leggendo il file \"{{$a}}\"",
     "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
-    "file": "File",
+    "file": "File di commento",
     "fileuploaded": "File caricato correttamente",
-    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima consentita è {{$a.size}}.",
+    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima che è possibile caricare è pari a {{$a.size}}.",
     "photoalbums": "Album fotografico",
     "readingfile": "Letture file in corso",
-    "uploadafile": "Carica un file",
-    "uploading": "Caricamento in corso",
+    "uploadafile": "Carica un file sul server",
+    "uploading": "Caricamento in corso...",
     "uploadingperc": "Caricamento: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/nl.json b/www/core/components/fileuploader/lang/nl.json
index bded0b189f9..a9642735d2d 100644
--- a/www/core/components/fileuploader/lang/nl.json
+++ b/www/core/components/fileuploader/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Voeg bestand toe",
+    "addfiletext": "Bestand toevoegen",
     "audio": "Audio",
     "camera": "Camera",
     "confirmuploadfile": "Je gaat {{size}} uploaden. Weet je zeker dat je wil verder gaan?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fout bij het ophalen van een foto uit het album.",
     "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
     "errornoapp": "Je hebt geen app geïnstalleerd om dit te kunnen doen.",
-    "errorreadingfile": "Fout bij het lezen van het bestand.",
+    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
     "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
-    "file": "Bestand",
+    "file": "Feedbackbestanden",
     "fileuploaded": "Het uploaden van het bestand is gelukt.",
-    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale uploadgrootte is {{$a.size}}.",
+    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale grootte die je kunt uploaden is {{$a.size}}.",
     "photoalbums": "Foto-albums",
     "readingfile": "Bestand lezen",
     "selectafile": "Selecteer een bestand",
-    "uploadafile": "Bestand uploaden",
-    "uploading": "Aan het uploaden",
+    "uploadafile": "Upload een bestand",
+    "uploading": "Uploaden...",
     "uploadingperc": "Uploaden: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pt-br.json b/www/core/components/fileuploader/lang/pt-br.json
index f9a5cffca49..550047884c5 100644
--- a/www/core/components/fileuploader/lang/pt-br.json
+++ b/www/core/components/fileuploader/lang/pt-br.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erro ao pegar imagem a partir do álbum.",
     "errormustbeonlinetoupload": "Você precisa estar online para enviar arquivos.",
     "errornoapp": "Você não tem um aplicativo instalado para fazer essa ação.",
-    "errorreadingfile": "Erro ao ler arquivo.",
+    "errorreadingfile": "Erro na leitura do arquivo \"{{$a}}\"",
     "errorwhileuploading": "Houve um erro durante o envio do arquivo.",
-    "file": "Arquivo",
+    "file": "Arquivos de feedback",
     "fileuploaded": "Arquivo enviado",
     "maxbytesfile": "O arquivo {{$a.file}} é muito grande. O tamanho máximo que você pode enviar é {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
     "readingfile": "Lendo arquivos",
     "selectafile": "Selecione um arquivo",
-    "uploadafile": "Enviando um arquivo",
-    "uploading": "Enviando",
+    "uploadafile": "Enviar um arquivo",
+    "uploading": "Enviando...",
     "uploadingperc": "Enviando: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ru.json b/www/core/components/fileuploader/lang/ru.json
index 50c3136d898..f903ba3a582 100644
--- a/www/core/components/fileuploader/lang/ru.json
+++ b/www/core/components/fileuploader/lang/ru.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Ошибка получения изображения из альбома",
     "errormustbeonlinetoupload": "Вы должны быть на сайте, чтобы загружать файлы.",
     "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
-    "errorreadingfile": "Ошибка при чтении файла",
+    "errorreadingfile": "Ошибка чтения файла «{{$a}}»",
     "errorwhileuploading": "Произошла ошибка во время загрузки файла",
-    "file": "Файл",
+    "file": "Отзыв в виде файла",
     "fileuploaded": "Файл загружен",
     "maxbytesfile": "Файл «{{$a.file}}» слишком большой. Максимальный размер файла, который Вы можете загрузить: {{$a.size}}.",
     "photoalbums": "Фотоальбомы",
     "readingfile": "Чтение файла",
-    "uploadafile": "Загрузка файла",
-    "uploading": "Загрузка",
+    "uploadafile": "Загрузить файл",
+    "uploading": "Идет загрузка файла на сервер...",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/sv.json b/www/core/components/fileuploader/lang/sv.json
index 05123140c0e..a6f69716ad7 100644
--- a/www/core/components/fileuploader/lang/sv.json
+++ b/www/core/components/fileuploader/lang/sv.json
@@ -8,13 +8,13 @@
     "errorgettingimagealbum": "Fel att få bild från album.",
     "errormustbeonlinetoupload": "Du måste vara online för att ladda upp filer.",
     "errornoapp": "Du behöver att ha en app installerat för att utföra den här åtgärden.",
-    "errorreadingfile": "Fel vid läsning av fil.",
+    "errorreadingfile": "Fel i samband med läsningen av filen  \"{{$a}}\"",
     "errorwhileuploading": "Ett fel uppstod under filöverföringen.",
-    "file": "Fil",
+    "file": "Återkopplingsfiler",
     "fileuploaded": "Fil laddades upp",
     "photoalbums": "Fotoalbum",
     "readingfile": "Läsa fil",
     "uploadafile": "Ladda upp en fil",
-    "uploading": "Laddar upp",
+    "uploading": "Laddar upp...",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/tr.json b/www/core/components/fileuploader/lang/tr.json
index e95ef77a496..3af13fbd546 100644
--- a/www/core/components/fileuploader/lang/tr.json
+++ b/www/core/components/fileuploader/lang/tr.json
@@ -7,6 +7,6 @@
     "fileuploaded": "Dosya başarıyla yüklendi",
     "maxbytesfile": "Dosya {{$a.file}} çok büyük. Yüklediğiniz maksimum boyutu {{$a.size}} olduğunu.",
     "uploadafile": "Bir dosya yükle",
-    "uploading": "Yükleniyor",
+    "uploading": "Yükleniyor...",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/uk.json b/www/core/components/fileuploader/lang/uk.json
new file mode 100644
index 00000000000..724d4219bd7
--- /dev/null
+++ b/www/core/components/fileuploader/lang/uk.json
@@ -0,0 +1,25 @@
+{
+    "addfiletext": "Додати файл",
+    "audio": "Аудіо",
+    "camera": "Камера",
+    "confirmuploadfile": "Ви збираєтеся завантажити {{size}}. Ви впевнені, що хочете продовжити?",
+    "confirmuploadunknownsize": "Ми не змогли розрахувати розмір завантаження. Ви впевнені, що хочете продовжити?",
+    "errorcapturingaudio": "Помилка захоплення аудіо.",
+    "errorcapturingimage": "Помилка захоплення зображення.",
+    "errorcapturingvideo": "Помилка захоплення відео.",
+    "errorgettingimagealbum": "Помилка отримання зображення з альбома.",
+    "errormustbeonlinetoupload": "Ви повинні бути в мережі для завантаження файлів.",
+    "errornoapp": "У вас немає програми, встановленої для виконання цієї дії.",
+    "errorreadingfile": "Помилка при читанні файлу \"{{$a}}\"",
+    "errorwhileuploading": "Помилка при завантаженні файлу.",
+    "file": "Відгук - файлом",
+    "fileuploaded": "Файл був успішно завантажений.",
+    "maxbytesfile": "Файл {{$a.file}} занадто великий. Максимальний розмір, який ви можете завантажити - {{$a.size}}.",
+    "photoalbums": "Фото альбом.",
+    "readingfile": "Читання файлу",
+    "selectafile": "Виберіть файл",
+    "uploadafile": "Завантажити файл",
+    "uploading": "Завантаження...",
+    "uploadingperc": "Завантаження: {{$a}}%",
+    "video": "Відео"
+}
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index 465e7156f29..75ac82bace1 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -9,6 +9,6 @@
     "maxbytesfile": "这个文件 {{$a.file}} 太大了。你可以上传的文件最大容量是 {{$a.size}}。",
     "readingfile": "Odczytywanie pliku",
     "uploadafile": "上传一个文件",
-    "uploading": "上传中",
+    "uploading": "上传中...",
     "video": "视频"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/uk.json b/www/core/components/grades/lang/uk.json
new file mode 100644
index 00000000000..ae349f2a21c
--- /dev/null
+++ b/www/core/components/grades/lang/uk.json
@@ -0,0 +1,15 @@
+{
+    "average": "Середня оцінка",
+    "badgrade": "Проставлена оцінка - недопустима",
+    "contributiontocoursetotal": "Внесок у підсумок курсу",
+    "feedback": "Коментар",
+    "grade": "Оцінка",
+    "grades": "Оцінки",
+    "itemname": "Назва елементу",
+    "lettergrade": "Буквена оцінка",
+    "nooutcome": "Без результату",
+    "percentage": "Відсоток",
+    "range": "Інтервал",
+    "rank": "Порядок",
+    "weight": "значимість"
+}
\ No newline at end of file
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index 19ff1bbfed4..49d4981eac9 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -4,14 +4,14 @@
     "cancel": "Zrušit",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
-    "connect": "Připojit!",
+    "connect": "Spojit",
     "connecttomoodle": "Připojit k Moodle",
     "contactyouradministrator": "Pro další pomoc se obraťte na správce webu.",
     "contactyouradministratorissue": "Požádejte správce, prosím, aby zkontroloval následující problém: {{$a}}",
     "createaccount": "Vytvořit můj nový účet",
     "createuserandpass": "Vytvořit nové uživatelské jméno a heslo pro přihlášení",
     "credentialsdescription": "Pro přihlášení uveďte své uživatelské jméno a heslo.",
-    "emailconfirmsent": "<p>E-mail by měl být zaslán na Vaši adresu na <b>{{$a}}</b></p><p>Obsahuje jednoduché instrukce pro dokončení registrace. </p><p>Pokud budou potíže pokračovat, obraťte se na správce webu. </p>",
+    "emailconfirmsent": "<p>Na vaši adresu <b>{{$a}}</b> byl odeslán e-mail s jednoduchými pokyny k dokončení vaší registrace.</p><p>Narazíte-li na nějaké obtíže, spojte se se správcem těchto stránek.</p>",
     "emailnotmatch": "E-maily se neshodují",
     "enterthewordsabove": "Vložte výše uvedená slova",
     "erroraccesscontrolalloworigin": "Cross-Origin volání -  váš pokus o provedení byl odmítnut. Zkontrolujte prosím https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index 5f20787751c..10cc82ae64b 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -11,7 +11,7 @@
     "createaccount": "Zugang anlegen (Registrierung)",
     "createuserandpass": "Wählen Sie Ihren Anmeldenamen und Ihr Kennwort",
     "credentialsdescription": "Geben Sie den Anmeldenamen und das Kennwort ein. ",
-    "emailconfirmsent": "<p>In Kürze wird eine E-Mail an <b>{{$a}}</b> gesendet.</p><p>Sie finden eine einfache Anleitung, wie Sie die Registrierung abschließen. Bei Schwierigkeiten wenden Sie sich an den Administrator der Website.</p>",
+    "emailconfirmsent": "<p>Um sicherzugehen, dass sich niemand unberechtigt über die von Ihnen angegebene E-Mail anmeldet, wird eine automatische Benachrichtigung an diese Adresse <b>{{$a}}</b> gesendet. Je nach Netzlast trifft sie sofort oder auch etwas später bei Ihnen ein.</p>\n<p>Die Benachrichtigung enthält eine Anleitung, wie Sie Ihre Registrierung bestätigen.\nDanach sind Sie auf dieser Moodle-Seite registriert und können sofort loslegen.</p>\n<p>Bei Problemen wenden Sie sich bitte an die Administrator/innen der Website.</p>",
     "emailnotmatch": "Die E-Mail-Adressen stimmen nicht überein.",
     "enterthewordsabove": "Geben Sie die gezeigten Wörter ein",
     "erroraccesscontrolalloworigin": "Der Cross-Origin Aufruf wurde zurückgewiesen. Weitere Informationen: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index 7768de9816d..44ccc1d8784 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -11,7 +11,7 @@
     "createaccount": "Δημιουργία του λογαριασμού μου",
     "createuserandpass": "Δημιουργία ενός νέου ονόματος χρήστη και κωδικού πρόσβασης για είσοδο στον δικτυακό τόπο",
     "credentialsdescription": "Δώστε το όνομα χρήστη και τον κωδικό πρόσβασής σας για να συνδεθείτε.",
-    "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
+    "emailconfirmsent": "<p>Ένα μήνυμα ηλεκτρονικού ταχυδρομείου θα πρέπει να έχει σταλεί στη διεύθυνσή σας, <b>{{$a}}</b> </p>\n   <p>Περιέχει απλές οδηγίες για την ολοκλήρωση της εγγραφής σας. </p>\n   <p>Αν συνεχίζετε να αντιμετωπίζετε δυσκολίες, επικοινωνήστε με το διαχειριστή του δικτυακού τόπου. </p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
     "enterthewordsabove": "Enter the words above",
     "errordeletesite": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαγραφής του site. Δοκιμάστε ξανά αργότερα.",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index bb37772a367..0d0c4738c6c 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Revisar que su sitio usa Moodle 2.4 o más reciente.",
     "confirmdeletesite": "¿Está Usted seguro de querer eliminar el sitio {{sitename}}?",
-    "connect": "¡Conectar!",
+    "connect": "Conectar",
     "connecttomoodle": "Conectar a Moodle",
     "contactyouradministrator": "Contacte a su administrador del sitio para más ayuda.",
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear mi cuenta nueva",
     "createuserandpass": "Elegir su nombre_de_usuario y contraseña",
     "credentialsdescription": "Por favor proporcione su nombre_de_usuario y contraseña para ingresar.",
-    "emailconfirmsent": "<p>Debería de haberse enviado un Email a su dirección en <b>{{$a}}</b></p><p>El Email contiene instrucciones sencillas para completar su registro.</p><p>Si continúa teniendo dificultades, contacte al administrador del sitio.</p>",
+    "emailconfirmsent": "<p>Hemos enviado un correo electrónico a <b>{{$a}}</b></p>\n<p>En él encontrará instrucciones sencillas para concluir el proceso.</p>\n<p>Si tuviera alguna dificultad, contacte con el Administrador del Sistema.</p>",
     "emailnotmatch": "No coinciden los Emails",
     "enterthewordsabove": "Escriba las palabras de arriba",
     "erroraccesscontrolalloworigin": "La llamada de Orígen Cruzado (''Cross-Origin'') que Usted está tratando de realizar ha sido rechazada. Por favor revise  https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index d177bab9b72..375dc7590c2 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -4,14 +4,14 @@
     "cancel": "Annuler",
     "checksiteversion": "Veuillez vérifier que votre site utilise Moodle 2.4 ou une version ultérieure.",
     "confirmdeletesite": "Voulez-vous vraiment supprimer la plateforme {{sitename}} ?",
-    "connect": "Connecter !",
+    "connect": "Connecter",
     "connecttomoodle": "Connexion à Moodle",
     "contactyouradministrator": "Veuillez contacter l'administrateur de la plateforme pour plus d'aide.",
     "contactyouradministratorissue": "Veuillez demander à l'administrateur de la plateforme de vérifier l'élément suivant : {{$a}}",
     "createaccount": "Créer mon compte",
     "createuserandpass": "Créer un compte",
     "credentialsdescription": "Veuillez fournir votre nom d'utilisateur et votre mot de passe pour vous connecter.",
-    "emailconfirmsent": "<p>Un message vous a été envoyé par courriel à l'adresse <b>{{$a}}</b></p><p>Il contient des instructions vous permettant de terminer votre enregistrement.</p><p>En cas de difficulté, viellez contacter l'administrateur de la plateforme.</p>",
+    "emailconfirmsent": "<p>Un message vous a été envoyé à l'adresse de courriel <strong>{{$a}}</strong>.</p><p>Il contient les instructions pour terminer votre enregistrement.</p><p>Si vous rencontrez des difficultés, veuillez contacter l'administrateur du site.</p>",
     "emailnotmatch": "Les adresses de courriel ne correspondent pas",
     "enterthewordsabove": "Tapez les mots ci-dessus",
     "erroraccesscontrolalloworigin": "La tentative d'appel « Cross-Origin » que vous avez effectuée a été rejetée. Veuillez consulter https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index 0f291730dce..23251dd157e 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -2,7 +2,7 @@
     "authenticating": "Autenticazione in corso",
     "cancel": "Annulla",
     "confirmdeletesite": "Sei sicuro di eliminare il sito {{sitename}}?",
-    "connect": "Collegati!",
+    "connect": "Connetti",
     "connecttomoodle": "Collegati a Moodle",
     "createaccount": "Crea il mio nuovo account",
     "createuserandpass": "Scegli username e password",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index bbc9031fd53..bc5e768a4fd 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -4,14 +4,14 @@
     "cancel": "Annuleer",
     "checksiteversion": "Controleer of je site minstens Moodle 2.4 of nieuwe gebruikt.",
     "confirmdeletesite": "Weet je zeker dat je de site {{sitename}} wil verwijderen?",
-    "connect": "Verbinden!",
+    "connect": "Verbind",
     "connecttomoodle": "Verbinden met Moodle",
     "contactyouradministrator": "Neem contact op met je site-beheerder voor meer hulp.",
     "contactyouradministratorissue": "Vraag aan je site-beheerder om volgend probleem te onderzoeken: {{$a}}",
     "createaccount": "Maak mijn nieuwe account aan",
     "createuserandpass": "Kies een gebruikersnaam en wachtwoord",
     "credentialsdescription": "Geef je gebruikersnaam en wachtwoord op om je aan te melden",
-    "emailconfirmsent": "<p>Er zou een e-mail gestuurd moeten zijn naar jouw adres <b>{{$a}}</b></p><p>Het bericht bevat eenvoudige instructies om je registratie te voltooien.</p><p>Als je problemen blijft ondervinden, neem dan contact op met de sitebeheerder.</p>",
+    "emailconfirmsent": "<p>Als het goed is, is er een e-mail verzonden naar <b>{{$a}}</b></p>\n<p>Daarin staan eenvoudige instructies voor het voltooien van de registratie.</p>\n<p>Indien je moeilijkheden blijft ondervinden, neem dan contact op met je sitebeheerder.</p>",
     "emailnotmatch": "E-mailadressen komen niet overeen",
     "enterthewordsabove": "Vul hier bovenstaande woorden in",
     "erroraccesscontrolalloworigin": "De Cross-Origin call die je probeerde uit te voeren,  werd geweigerd. Controleer https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index c0fbcba22ee..b63d1fe4266 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Verifique se seu site usa Moodle 2.4 ou superior.",
     "confirmdeletesite": "Você tem certeza que quer excluir o site {{sitename}}?",
-    "connect": "Conectar!",
+    "connect": "Conectar",
     "connecttomoodle": "Conectar ao moodle",
     "contactyouradministrator": "Contate o administrador do site para ter mais ajuda.",
     "contactyouradministratorissue": "Por favor, pergunte ao administrador para verificar o seguinte problema: {{$a}}",
     "createaccount": "Cadastrar este novo usuário",
     "createuserandpass": "Escolha seu usuário e senha",
     "credentialsdescription": "Por favor, informe seu nome de usuário e senha para efetuar o login",
-    "emailconfirmsent": "<p>Um e-mail irá ser enviado para o seu endereço em <b>{{$a}}</b></p><p> Ele irá conter instruções fáceis para completar seu registro.</p><p>Se você continua a ter dificuldades, contate o administrador do site.</p>",
+    "emailconfirmsent": "<p>Uma mensagem foi enviada para o seu endereço <b>{{$a}}</b></p><p>Esta mensagem contém instruções para completar a sua inscrição.</p><p>Se você encontrar dificuldades contate o administrador.</p>",
     "emailnotmatch": "Os e-mail não coincidem",
     "enterthewordsabove": "Digite as palavras acima",
     "erroraccesscontrolalloworigin": "A chamada de Cross-Origin que você está tentando executar foi rejeitada. Por favor, verifique https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index 4608e1fa1f9..960d9784abe 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -34,7 +34,7 @@
     "localmobileunexpectedresponse": "A verificação do Moodle Mobile Additional Features teve um erro inesperado, a ligação será feita através do serviço Mobile padrão.",
     "loggedoutssodescription": "Tem de autenticar-se novamente. A autenticação no site tem de ser numa janela do navegador.",
     "login": "Autentique-se com seus dados de acesso",
-    "loginbutton": "Entrar!",
+    "loginbutton": "Iniciar sessão",
     "logininsiterequired": "Precisa de entrar no site através de uma janela de navegador.",
     "loginsteps": "Para ter acesso completo a este site, primeiro precisa de criar uma nova conta de utilizador.",
     "missingemail": "Falta o e-mail",
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index 8ad130b0c6d..5cfebad7e60 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -2,7 +2,7 @@
     "authenticating": "Аутентификация",
     "cancel": "Отменить",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
-    "connect": "Подключено!",
+    "connect": "Подключить",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index e24c8948325..106de07ced2 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -2,7 +2,7 @@
     "authenticating": "Autentisera",
     "cancel": "Avbryt",
     "confirmdeletesite": "Är du säker på att du vill ta bort webbsidan {{sitename}}?",
-    "connect": "Anslut!",
+    "connect": "Anslut",
     "connecttomoodle": "Anslut till Moodle",
     "createaccount": "Skapa mitt nya konto",
     "createuserandpass": "Skapa ett nytt användarnamn och lösenord för att logga in med.",
diff --git a/www/core/components/login/lang/uk.json b/www/core/components/login/lang/uk.json
new file mode 100644
index 00000000000..2811146c30d
--- /dev/null
+++ b/www/core/components/login/lang/uk.json
@@ -0,0 +1,77 @@
+{
+    "auth_email": "Email на основі самостійної реєстрації",
+    "authenticating": "Аутинтифікація",
+    "cancel": "Скасувати",
+    "checksiteversion": "Переконайтеся, що ваш сайт використовує Moodle 2.4 або більш пізньої версії.",
+    "confirmdeletesite": "Видалити сайт {{sitename}}?",
+    "connect": "З’єднання",
+    "connecttomoodle": "Відключитись до Moodle",
+    "contactyouradministrator": "Зверніться до адміністратора сайту для подальшої допомоги.",
+    "contactyouradministratorissue": "Будь ласка, зверніться до адміністратора, щоб перевірити наступне питання: {{$a}}",
+    "createaccount": "Створити запис",
+    "createuserandpass": "Створити користувача для входу в систему",
+    "credentialsdescription": "Будь ласка, введіть Ваше ім'я користувача та пароль, щоб увійти в систему.",
+    "emailconfirmsent": "На зазначену Вами адресу електронної пошти (<b>{{$a}}</b>) було відправлено листа з інструкціями із завершення реєстрації. Якщо у Вас з'являться проблеми з реєстрацією, зв'яжіться з адміністратором сайту.",
+    "emailnotmatch": "Email не співпадають",
+    "enterthewordsabove": "Введіть символи, які бачите вище",
+    "erroraccesscontrolalloworigin": "Cross-Origin дзвінок Ви намагаєтеся виконати відхилено. Будь ласка, перевірте https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
+    "errordeletesite": "Під час видалення цього сайту сталася помилка. Будь ласка спробуйте ще раз.",
+    "errorupdatesite": "При оновленні токена сайту сталася помилка.",
+    "firsttime": "Ви вперше на нашому сайті?",
+    "getanothercaptcha": "Отримати інший варант",
+    "help": "Допомога",
+    "helpmelogin": "<p> Є багато тисяч сайтів Moodle по всьому світу. Ця програма може підключатися тільки до сайтів Moodle, які спеціально з підтримкою мобільного доступу додатків. </p> <p> Якщо ви не можете підключитися до вашого сайту Moodle, то вам необхідно звернутися до адміністратора Moodle в тому місці, де планується отримати доступ і попросіть їх прочитати <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\"> http://docs.moodle.org/en/Mobile_app </a> </p> <p> Щоб перевірити додаток в типі Moodle демо сайті <i> учитель </i> або <i> студент </i> в <i> адреса сайту </i> поля і натисніть кнопку <b> Підключення </b>. </p>",
+    "instructions": "Інструкції",
+    "invalidaccount": "Будь ласка, перевірте ваші реєстраційні дані, або зверніться до адміністратора сайту, щоб перевірити конфігурацію сайту.",
+    "invaliddate": "Невірна дата",
+    "invalidemail": "Неправильний формат для ел.пошти",
+    "invalidmoodleversion": "Невірна версія Moodle. Мінімальна версія 2.4 потрібно.",
+    "invalidsite": "URL сайту недійсний.",
+    "invalidtime": "Невірний час",
+    "invalidurl": "Вказано неправильну URL адресу",
+    "invalidvaluemax": "Максимальне значення {{$a}}",
+    "invalidvaluemin": "Мінімальне значення {{$a}}",
+    "localmobileunexpectedresponse": "Moodle Mobile Additional Features при  перевірці повернуло несподівану відповідь, ви будете проходити перевірку автентичності з використанням стандартного мобільного сервісу.",
+    "loggedoutssodescription": "Ви повинні знову перевірити справжність. Вам необхідно увійти на сайт у вікні браузера.",
+    "login": "Вхід",
+    "loginbutton": "Вхід",
+    "logininsiterequired": "Вам необхідно увійти на сайт у вікні браузера.",
+    "loginsteps": "Привіт! Для повного доступу до курсів вам необхідно створити для себе новий обліковий запис на цьому веб-сайті. Для кожного окремого курсу також може бути потрібним \"кодове слово\", яке вам повинен повідомити викладач. Покрокова інструкція: <ol> <li>Заповніть <a href=\"{{$a}}\">новий обліковий запис</a> (форму, що містить дані про вас).</li> <li>На вашу електронну пошту буде відправлено листа.</li> <li>Прочитайте лист і зверніться за посиланням, зазначеним у ньому.</li> <li>Обліковий запис буде підтверджено й система вас ідентифікує.</li> <li>Оберіть курс, для навчання.</li> <li>Якщо для запису на курс потрібно знання \"кодового слова\", викладач повідомить його вам.</li> <li>Отже, у вас з'явився повний доступ до курсу: з цього моменту ви будете користуватися своїм логіном (іменем користувача) та паролем, щоб потрапити на нього.</li> </ol>",
+    "missingemail": "Не вказано адресу електронної пошти",
+    "missingfirstname": "Не вказано ім'я",
+    "missinglastname": "Не вказано прізвище",
+    "mobileservicesnotenabled": "Мобільні послуги не включені в вашому сайті. Будь ласка, зверніться до адміністратора вашого Moodle сайт, якщо ви вважаєте, мобільний доступ повинен бути включений.",
+    "newaccount": "Новий обліковий запис",
+    "newsitedescription": "Будь ласка, введіть адресу вашого сайту Moodle. Зверніть увагу, що це не може бути налаштоване для роботи з цим додатком.",
+    "notloggedin": "Ви повинні увійти в систему.",
+    "password": "Пароль",
+    "passwordrequired": "Пароль необхідний",
+    "policyaccept": "Я розумію та погоджуюся",
+    "policyagree": "Ви повинні погодитися з цими правилами для використання цього сайту. Ви згодні?",
+    "policyagreement": "Угода Сайту",
+    "policyagreementclick": "Читати Угоду",
+    "potentialidps": "Ви зазвичай входите з іншої сторінки для того щоб попасти сюди? <br />Виберіть зі списку, звідки ви звичайно приходите:",
+    "problemconnectingerror": "Виникли проблеми з підключенням до",
+    "problemconnectingerrorcontinue": "Двічі перевірте, що ви ввели адресу правильно, і спробуйте ще раз.",
+    "profileinvaliddata": "Невірне значення",
+    "recaptchachallengeimage": "виклик reCAPTCHA",
+    "reconnect": "Повторне з'єднання",
+    "reconnectdescription": "Ваш маркер аутентифікації недійсний або закінчився, ви повинні підключитися до сайту.",
+    "reconnectssodescription": "Ваш маркер аутентифікації недійсний або закінчився, ви повинні підключитися до сайту. Вам необхідно увійти на сайт у вікні браузера.",
+    "security_question": "Контрольне питання",
+    "selectacountry": "Країна",
+    "signupplugindisabled": "{{$a}} не доступно.",
+    "siteaddress": "Адреса сайту",
+    "siteinmaintenance": "Сайт в режимі обслуговування",
+    "sitepolicynotagreederror": "Політики сайту не погоджені",
+    "siteurl": "URL сайту",
+    "siteurlrequired": "URL сайту повинно бути схоже на <i>http://www.yourmoodlesite.abc or https://www.yourmoodlesite.efg</i>",
+    "startsignup": "Створити новий обліковий запис",
+    "stillcantconnect": "До сих пір не можу підключитися?",
+    "supplyinfo": "Більше інформації",
+    "username": "Псевдо",
+    "usernamerequired": "Ім'я користувача необхідне",
+    "usernotaddederror": "Користувач не доданий - помилка",
+    "visitchangepassword": "Ви хочете відвідати сайт, щоб змінити пароль?",
+    "webservicesnotenabled": "Веб-служба не включені в вашому сайті. Будь ласка, зверніться до адміністратора вашого Moodle сайт, якщо ви вважаєте, мобільний доступ повинен бути включений."
+}
\ No newline at end of file
diff --git a/www/core/components/question/lang/ca.json b/www/core/components/question/lang/ca.json
index 52bd86fd1d3..aece96d8870 100644
--- a/www/core/components/question/lang/ca.json
+++ b/www/core/components/question/lang/ca.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Cal puntuar",
-    "unknown": "No es pot determinar l'estat"
+    "unknown": "Desconegut"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/cs.json b/www/core/components/question/lang/cs.json
index acb5034afe8..ed2f90af4f1 100644
--- a/www/core/components/question/lang/cs.json
+++ b/www/core/components/question/lang/cs.json
@@ -17,5 +17,5 @@
     "questionmessage": "Úloha {{$a}}: {{$b}}",
     "questionno": "Úloha {{$a}}",
     "requiresgrading": "Vyžaduje hodnocení",
-    "unknown": "Stav nelze určit"
+    "unknown": "Neznámý"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/de.json b/www/core/components/question/lang/de.json
index 75ee149e500..a248f6250e5 100644
--- a/www/core/components/question/lang/de.json
+++ b/www/core/components/question/lang/de.json
@@ -17,5 +17,5 @@
     "questionmessage": "Frage {{$a}}: {{$b}}",
     "questionno": "Frage {{$a}}",
     "requiresgrading": "Bewertung notwendig",
-    "unknown": "Der Status kann nicht bestimmt werden."
+    "unknown": "Unbekannt"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/es-mx.json b/www/core/components/question/lang/es-mx.json
index adeff045b27..f304a7602ec 100644
--- a/www/core/components/question/lang/es-mx.json
+++ b/www/core/components/question/lang/es-mx.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere re-calificar",
-    "unknown": "No se puede determinar el estatus"
+    "unknown": "Desconocido"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/fr.json b/www/core/components/question/lang/fr.json
index 1284a6a8d2a..82dddeba70a 100644
--- a/www/core/components/question/lang/fr.json
+++ b/www/core/components/question/lang/fr.json
@@ -17,5 +17,5 @@
     "questionmessage": "Question {{$a}} : {{$b}}",
     "questionno": "Question {{$a}}",
     "requiresgrading": "Nécessite évaluation",
-    "unknown": "Impossible de déterminer l'état"
+    "unknown": "Inconnu"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/it.json b/www/core/components/question/lang/it.json
index 20bb79efc49..23bcbb55847 100644
--- a/www/core/components/question/lang/it.json
+++ b/www/core/components/question/lang/it.json
@@ -13,5 +13,5 @@
     "questionmessage": "Domanda {{$a}}: {{$b}}",
     "questionno": "Domanda {{$a}}",
     "requiresgrading": "Richiede valutazione",
-    "unknown": "Non è possibile determinare lo stato"
+    "unknown": "Sconosciuto"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/nl.json b/www/core/components/question/lang/nl.json
index 871c95b1c10..48faa456e67 100644
--- a/www/core/components/question/lang/nl.json
+++ b/www/core/components/question/lang/nl.json
@@ -17,5 +17,5 @@
     "questionmessage": "Vraag  {{$a}}: {{$b}}",
     "questionno": "Vraag {{$a}}",
     "requiresgrading": "Beoordelen vereist",
-    "unknown": "Kan status niet bepalen"
+    "unknown": "Onbekend"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/pt-br.json b/www/core/components/question/lang/pt-br.json
index 99a33590a15..f5b6766c1a6 100644
--- a/www/core/components/question/lang/pt-br.json
+++ b/www/core/components/question/lang/pt-br.json
@@ -17,5 +17,5 @@
     "questionmessage": "Questão {{$a}}: {{$b}}",
     "questionno": "Questão {{$a}}",
     "requiresgrading": "Requer avaliação",
-    "unknown": "Não pôde determinar o estado"
+    "unknown": "Desconhecido"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/uk.json b/www/core/components/question/lang/uk.json
new file mode 100644
index 00000000000..1acd3ac851e
--- /dev/null
+++ b/www/core/components/question/lang/uk.json
@@ -0,0 +1,21 @@
+{
+    "answer": "Відповідь",
+    "answersaved": "Відповідь збережено",
+    "complete": "Завершено",
+    "correct": "Правильно",
+    "errorattachmentsnotsupported": "Додаток не підтримує прикріплення файлів відповідей",
+    "errorinlinefilesnotsupported": "Додаток ще не підтримує редагування вбудованих файлів.",
+    "errorquestionnotsupported": "Цей тип питання не підтримує додатком: {{$a}}.",
+    "feedback": "Коментар",
+    "howtodraganddrop": "Натисніть, щоб вибрати і перемістить.",
+    "incorrect": "Неправильно",
+    "information": "Інформація",
+    "invalidanswer": "Неповна відповідь",
+    "notanswered": "Відповіді не було",
+    "notyetanswered": "Відповіді ще не було",
+    "partiallycorrect": "Частково правильно",
+    "questionmessage": "Питання {{$a}}: {{$b}}",
+    "questionno": "Питання {{$a}}",
+    "requiresgrading": "Потрібно оцінити",
+    "unknown": "Невідоме"
+}
\ No newline at end of file
diff --git a/www/core/components/settings/lang/it.json b/www/core/components/settings/lang/it.json
index 15da5268622..e659bf2f70e 100644
--- a/www/core/components/settings/lang/it.json
+++ b/www/core/components/settings/lang/it.json
@@ -34,6 +34,7 @@
     "navigatorlanguage": "Navigator language",
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Stato della connessione internet",
+    "processorsettings": "Impostazioni gestore",
     "reportinbackground": "Invia errori automaticamente",
     "settings": "Impostazioni",
     "sites": "Siti",
diff --git a/www/core/components/settings/lang/uk.json b/www/core/components/settings/lang/uk.json
new file mode 100644
index 00000000000..00c05658b93
--- /dev/null
+++ b/www/core/components/settings/lang/uk.json
@@ -0,0 +1,58 @@
+{
+    "about": "Про",
+    "appready": "Додаток готовий",
+    "cacheexpirationtime": "Час закінчення кеша (мілісекунди)",
+    "cannotsyncoffline": "Неможливо синхронізувати в автономному режимі.",
+    "cannotsyncwithoutwifi": "Неможливо синхронізувати, так як поточні настройки тільки дозволяють синхронізувати при підключенні до Wi-Fi. Підключіться до мережі Wi-Fi.",
+    "configuringnotifications": "Ви налаштовуєте '{{$a}}' повідомлення.",
+    "cordovadevicemodel": "Модель пристрою Кордова",
+    "cordovadeviceosversion": "Cordova Device OS version",
+    "cordovadeviceplatform": "Cordova Device platform",
+    "cordovadeviceuuid": "Cordova Device uuid",
+    "cordovaversion": "Cordova version",
+    "credits": "Про",
+    "currentlanguage": "Обрана мова",
+    "deletesitefiles": "Ви впевнені, що хочете видалити завантажені файли з сайту '{{sitename}}'?",
+    "deletesitefilestitle": "Видалити файли сайту",
+    "deviceinfo": "Інформація про пристрій",
+    "deviceos": "ОС пристрою",
+    "devicewebworkers": "Device Web Workers підтримується",
+    "disableall": "Тимчасово заборонити повідомлення",
+    "disabled": "Відключено",
+    "displayformat": "Формат відображення",
+    "enabledebugging": "Включити відладку",
+    "enabledownloadsection": "Увімкнути секцію завантаження",
+    "enabledownloadsectiondescription": "Вимкніть цей параметр, щоб прискорити завантаження курсу секцій.",
+    "enablerichtexteditor": "Включити редактор тексту",
+    "enablerichtexteditordescription": "Якщо цей параметр включений, розширений текстовий редактор буде показаний в тих місцях, які дозволяють їй.",
+    "enablesyncwifi": "Дозволити синхронізацію тільки тоді, коли на Wi-Fi",
+    "errordeletesitefiles": "Помилка видалення файлів сайту",
+    "errorsyncsite": "Помилка синхронізації даних сайту, будь ласка, перевірте підключення до Інтернету і спробуйте ще раз.",
+    "estimatedfreespace": "Розрахунковий вільний простір",
+    "filesystemroot": "Коренева файлова система",
+    "general": "Головні дані",
+    "language": "Мова інтерфейсу",
+    "license": "Ліцензія",
+    "localnotifavailable": "Локальні сповіщення доступні",
+    "locationhref": "Webview URL",
+    "loggedin": "В мережі",
+    "loggedoff": "Поза мережею",
+    "navigatorlanguage": "Мова навігації",
+    "navigatoruseragent": "Navigator userAgent",
+    "networkstatus": "Статут інтернет з'єднання",
+    "privacypolicy": "Політика конфіденційності",
+    "reportinbackground": "Відправляти помилки автоматично",
+    "settings": "Налаштування",
+    "sites": "Сайти",
+    "spaceusage": "Використане місце",
+    "storagetype": "Тип сховища",
+    "synchronization": "Синхронізація",
+    "synchronizenow": "Синхронізувати зараз",
+    "synchronizing": "Синхронізація",
+    "syncsettings": "Налаштування синхронізації",
+    "syncsitesuccess": "Дані сайту синхронізовані і всі кеші визнані недійсними.",
+    "total": "Всього",
+    "versioncode": "Версія коду",
+    "versionname": "Ім'я версії",
+    "wificonnection": "WiFi з'єднання"
+}
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/ca.json b/www/core/components/sharedfiles/lang/ca.json
index 56cb9344708..af0c921ccaf 100644
--- a/www/core/components/sharedfiles/lang/ca.json
+++ b/www/core/components/sharedfiles/lang/ca.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "No hi ha llocs desats. Afegiu un lloc per poder compartir fitxers amb l'aplicació.",
     "nosharedfiles": "No hi ha fitxers compartits desats en aquest lloc.",
     "nosharedfilestoupload": "No hi ha fitxers per pujar. Si voleu pujar un fitxer des d'un altra aplicació, busqueu-lo i feu clic al botó «Obre a».",
-    "rename": "Reanomena",
+    "rename": "Canvia el nom",
     "replace": "Reemplaça",
     "sharedfiles": "Fitxers compartits",
     "successstorefile": "S'ha desat el fitxer amb èxit. Podeu seleccionar-lo i pujar-lo als vostres fitxers privats o adjuntar-lo a alguna activitat."
diff --git a/www/core/components/sharedfiles/lang/cs.json b/www/core/components/sharedfiles/lang/cs.json
index 2cd35a9d0d4..9a19d1f00b1 100644
--- a/www/core/components/sharedfiles/lang/cs.json
+++ b/www/core/components/sharedfiles/lang/cs.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Na tomto webu nejsou uložené žádné sdílené soubory.",
     "nosharedfilestoupload": "Nemáte žádné nahrané soubory. Pokud chcete nahrát soubor z jiné aplikace, vyhledejte tento soubor a klikněte na tlačítko \"Otevřít v\".",
     "rename": "Přejmenovat",
-    "replace": "Nahradit",
+    "replace": "Přepsat",
     "sharedfiles": "Sdílené soubory",
     "successstorefile": "Soubor byl úspěšně uložen. Nyní můžete vybrat tento soubor a nahrát do vašich soukromých souborů nebo připojit ji do některých činností."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/de.json b/www/core/components/sharedfiles/lang/de.json
index f682d1fb09c..835afa40cf1 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Keine freigegebenen Dateien für diese Website",
     "nosharedfilestoupload": "Sie haben noch keine Dateien zum Hochladen freigegeben. Wenn Sie eine Datei aus einer anderen App hochladen möchten, suchen Sie diese Datei und tippen Sie auf die Taste 'Öffnen in'.",
     "rename": "Umbenennen",
-    "replace": "Ersetzen",
+    "replace": "Ersetze",
     "sharedfiles": "Freigegebene Dateien",
     "successstorefile": "Die Datei wurde gespeichert. Sie können die Datei verwenden, um Sie in 'Meine Dateien' hochzuladen oder bei Aktivitäten anzuhängen."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/es-mx.json b/www/core/components/sharedfiles/lang/es-mx.json
index d2732c41c62..6cd58565e88 100644
--- a/www/core/components/sharedfiles/lang/es-mx.json
+++ b/www/core/components/sharedfiles/lang/es-mx.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "No hay archivos compartidos en este sitio.",
     "nosharedfilestoupload": "Usted no tiene archivos para subir aquí. Si Usted desea subir un archivo desde otra App, localice ese archivo y haga click en el botón para 'Abrir en'.",
     "rename": "Renombrar",
-    "replace": "Remplazar",
+    "replace": "Reemplazar",
     "sharedfiles": "Archivos compartidos",
     "successstorefile": "Archivo almacenado exitosamente. Ahora Usted puede seleccionar a este archivo para subirlo a sus archivos privados, o anexarlo a algunas actividades."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/tr.json b/www/core/components/sharedfiles/lang/tr.json
index 94ea98f2214..76c25af6f7c 100644
--- a/www/core/components/sharedfiles/lang/tr.json
+++ b/www/core/components/sharedfiles/lang/tr.json
@@ -1,5 +1,5 @@
 {
-    "rename": "Yeniden adlandır",
+    "rename": "Ad değiştir",
     "replace": "Değiştir",
     "sharedfiles": "Paylaşılan dosyalar"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/uk.json b/www/core/components/sharedfiles/lang/uk.json
new file mode 100644
index 00000000000..f16da3ef448
--- /dev/null
+++ b/www/core/components/sharedfiles/lang/uk.json
@@ -0,0 +1,11 @@
+{
+    "chooseaccountstorefile": "Виберіть обліковий запис, щоб зберегти файл",
+    "chooseactionrepeatedfile": "Існує файл з таким ім'ям. Ви хочете замінити існуючий файл або перейменувати його в \"{{$a}}\"?",
+    "errorreceivefilenosites": "Немає сайтів. Будь ласка, додайте сайт, перш ніж відправляє файл з додатком.",
+    "nosharedfiles": "Немає загальних файлів, що зберігаються на цьому сайті.",
+    "nosharedfilestoupload": "У вас немає файлів для завантаження. Якщо ви хочете завантажити файл з іншої програми, знайдіть цей файл і натисніть кнопку «Відкрити\".",
+    "rename": "Перейменувати",
+    "replace": "Замінити",
+    "sharedfiles": "Розшарити файли",
+    "successstorefile": "Файл успішно збережений. Тепер ви можете вибрати цей файл, щоб завантажити його на ваші особисті файли або прикріпити його в деяких видах діяльності."
+}
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ca.json b/www/core/components/sidemenu/lang/ca.json
index 321730fec1f..1f492266956 100644
--- a/www/core/components/sidemenu/lang/ca.json
+++ b/www/core/components/sidemenu/lang/ca.json
@@ -2,7 +2,7 @@
     "appsettings": "Paràmetres de l'aplicació",
     "changesite": "Canvia de lloc",
     "help": "Ajuda",
-    "logout": "Desconnecta",
+    "logout": "Tanca la sessió",
     "mycourses": "Els meus cursos",
     "togglemenu": "Canvia menú",
     "website": "Lloc web"
diff --git a/www/core/components/sidemenu/lang/cs.json b/www/core/components/sidemenu/lang/cs.json
index 7de80a2bb9b..68c7fe8de79 100644
--- a/www/core/components/sidemenu/lang/cs.json
+++ b/www/core/components/sidemenu/lang/cs.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "Nastavení aplikace",
     "changesite": "Změnit stránky",
-    "help": "Nápověda",
-    "logout": "Odhlásit",
+    "help": "Pomoc",
+    "logout": "Odhlásit se",
     "mycourses": "Moje kurzy",
     "togglemenu": "Přepnout nabídku",
     "website": "Webová stránka"
diff --git a/www/core/components/sidemenu/lang/es-mx.json b/www/core/components/sidemenu/lang/es-mx.json
index e2079172694..fb36a0997ba 100644
--- a/www/core/components/sidemenu/lang/es-mx.json
+++ b/www/core/components/sidemenu/lang/es-mx.json
@@ -2,7 +2,7 @@
     "appsettings": "Configuraciones del App",
     "changesite": "Cambiar sitio",
     "help": "Ayuda",
-    "logout": "Salir del sitio",
+    "logout": "Salir",
     "mycourses": "Mis cursos",
     "togglemenu": "Alternar menú",
     "website": "Página web"
diff --git a/www/core/components/sidemenu/lang/fa.json b/www/core/components/sidemenu/lang/fa.json
index 7d4184a0d64..34bdcc7018f 100644
--- a/www/core/components/sidemenu/lang/fa.json
+++ b/www/core/components/sidemenu/lang/fa.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "تنظیمات برنامه",
     "changesite": "خروج",
-    "help": "راهنما",
-    "logout": "خروج",
+    "help": "راهنمایی",
+    "logout": "خروج از سایت",
     "mycourses": "درس‌های من",
     "website": "پایگاه اینترنتی"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/nl.json b/www/core/components/sidemenu/lang/nl.json
index d06e70ec6d8..7caa7f9041a 100644
--- a/www/core/components/sidemenu/lang/nl.json
+++ b/www/core/components/sidemenu/lang/nl.json
@@ -2,7 +2,7 @@
     "appsettings": "App instellingen",
     "changesite": "Naar andere site",
     "help": "Help",
-    "logout": "Afmelden",
+    "logout": "Uitloggen",
     "mycourses": "Mijn cursussen",
     "togglemenu": "Menu schakelen",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/uk.json b/www/core/components/sidemenu/lang/uk.json
new file mode 100644
index 00000000000..21328fec9b5
--- /dev/null
+++ b/www/core/components/sidemenu/lang/uk.json
@@ -0,0 +1,9 @@
+{
+    "appsettings": "Налаштування додатку",
+    "changesite": "Змінити сайт",
+    "help": "Допомога",
+    "logout": "Вихід",
+    "mycourses": "Мої курси",
+    "togglemenu": "Перемикання меню",
+    "website": "Веб-сайт"
+}
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/zh-cn.json b/www/core/components/sidemenu/lang/zh-cn.json
index ea6cd6e91e1..ce1e1892a81 100644
--- a/www/core/components/sidemenu/lang/zh-cn.json
+++ b/www/core/components/sidemenu/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "changesite": "注销",
     "help": "帮助",
-    "logout": "注销",
+    "logout": "登出",
     "mycourses": "我的课程",
     "website": "网站"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/ca.json b/www/core/components/user/lang/ca.json
index 730cb065191..a556ba985d1 100644
--- a/www/core/components/user/lang/ca.json
+++ b/www/core/components/user/lang/ca.json
@@ -4,7 +4,7 @@
     "contact": "Contacte",
     "country": "País",
     "description": "Descripció",
-    "details": "Detalls",
+    "details": "Detalls de seguiment",
     "detailsnotavailable": "No tens accés als detalls d'aquest usuari.",
     "editingteacher": "Professor",
     "email": "Correu electrònic",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Nova imatge",
     "phone1": "Telèfon",
-    "phone2": "Mòbil",
+    "phone2": "Telèfon mòbil",
     "roles": "Rols",
     "sendemail": "Correu-e",
     "student": "Estudiant",
diff --git a/www/core/components/user/lang/cs.json b/www/core/components/user/lang/cs.json
index d6a2f04ff29..5533c565060 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Země",
     "description": "Popis",
-    "details": "Detaily",
+    "details": "Podrobnosti o průchodu",
     "detailsnotavailable": "Podrobnosti o tomto uživateli nejsou k dispozici.",
     "editingteacher": "Učitel",
     "email": "Poslat e-mailem",
     "emailagain": "E-mail (znovu)",
     "firstname": "Křestní jméno",
     "interests": "Zájmy",
-    "invaliduser": "Neplatný uživatel.",
+    "invaliduser": "Neplatný uživatel",
     "lastname": "Příjmení",
     "manager": "Manažer",
     "newpicture": "Nový obrázek",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobilní telefon",
     "roles": "Role",
     "sendemail": "Email",
     "student": "Student",
diff --git a/www/core/components/user/lang/de.json b/www/core/components/user/lang/de.json
index c5acfba8273..9d95a7c6312 100644
--- a/www/core/components/user/lang/de.json
+++ b/www/core/components/user/lang/de.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beschreibung",
-    "details": "Details",
+    "details": "Trackingdetails",
     "detailsnotavailable": "Die Nutzerdetails zu dieser Person sind für Sie nicht verfügbar.",
     "editingteacher": "Trainer/in",
     "email": "E-Mail",
     "emailagain": "E-Mail (wiederholen)",
     "firstname": "Vorname",
     "interests": "Persönliche Interessen",
-    "invaliduser": "Nutzer/in ungültig",
+    "invaliduser": "Ungültige Nutzer/in",
     "lastname": "Nachname",
     "manager": "Manager/in",
     "newpicture": "Neues Foto",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobiltelefon",
     "roles": "Rollen",
     "sendemail": "E-Mail",
     "student": "Teilnehmer/in",
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index c5bb23b5a13..dabd4a46d5b 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -4,19 +4,19 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descripción",
-    "details": "Detalles",
+    "details": "Detalles del seguimiento",
     "detailsnotavailable": "Los detalles de este usuario no están disponibles para Usted.",
     "editingteacher": "Profesor",
     "email": "Email",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
-    "invaliduser": "Usuario inválido.",
+    "invaliduser": "Usuario no válido",
     "lastname": "Apellido(s)",
     "manager": "Mánager",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Móvil",
+    "phone2": "Teléfono móvil",
     "roles": "Roles",
     "sendemail": "Email",
     "student": "Estudiante",
diff --git a/www/core/components/user/lang/fa.json b/www/core/components/user/lang/fa.json
index 8f04d8269cb..9980ecf4e7f 100644
--- a/www/core/components/user/lang/fa.json
+++ b/www/core/components/user/lang/fa.json
@@ -1,10 +1,10 @@
 {
     "address": "آدرس",
     "city": "شهر/شهرک",
-    "contact": "مخاطب",
+    "contact": "تماس",
     "country": "کشور",
     "description": "توصیف",
-    "details": "جزئیات",
+    "details": "دنبال کردن جزئیات",
     "email": "پست الکترونیک",
     "emailagain": "پست الکترونیک (دوباره)",
     "firstname": "نام",
@@ -13,7 +13,7 @@
     "lastname": "نام خانوادگی",
     "newpicture": "عکس جدید",
     "phone1": "تلفن",
-    "phone2": "همراه",
+    "phone2": "تلفن همراه",
     "roles": "نقش‌ها",
     "student": "شاگرد",
     "viewprofile": "مشاهدهٔ صفحهٔ مشخصات فردی",
diff --git a/www/core/components/user/lang/fr.json b/www/core/components/user/lang/fr.json
index 55ae03508ff..06e5d47b78d 100644
--- a/www/core/components/user/lang/fr.json
+++ b/www/core/components/user/lang/fr.json
@@ -4,22 +4,22 @@
     "contact": "Contact",
     "country": "Pays",
     "description": "Description",
-    "details": "Détails",
+    "details": "Détails du parcours",
     "detailsnotavailable": "Vous n'avez pas accès aux informations de cet utilisateur.",
     "editingteacher": "Enseignant",
     "email": "Courriel",
     "emailagain": "Courriel (confirmation)",
     "firstname": "Prénom",
     "interests": "Centres d'intérêt",
-    "invaliduser": "Utilisateur non valide.",
+    "invaliduser": "Utilisateur non valide",
     "lastname": "Nom",
     "manager": "Gestionnaire",
     "newpicture": "Nouvelle image",
     "phone1": "Téléphone",
-    "phone2": "Mobile",
+    "phone2": "Téléphone mobile",
     "roles": "Rôles",
     "sendemail": "Courriel",
-    "student": "Étudiant",
+    "student": "Participants",
     "teacher": "Enseignant non-éditeur",
     "viewprofile": "Consulter le profil",
     "webpage": "Page Web"
diff --git a/www/core/components/user/lang/it.json b/www/core/components/user/lang/it.json
index 8d2c83785c7..9aa43cad4d0 100644
--- a/www/core/components/user/lang/it.json
+++ b/www/core/components/user/lang/it.json
@@ -4,19 +4,19 @@
     "contact": "Contatto",
     "country": "Nazione",
     "description": "Descrizione",
-    "details": "Dettagli",
+    "details": "Dettagli tracciamento",
     "detailsnotavailable": "Non puoi visualizzare i dettagli di questo utente.",
     "editingteacher": "Docente",
     "email": "Email",
     "emailagain": "Indirizzo email (ripeti)",
     "firstname": "Nome",
     "interests": "Interessi",
-    "invaliduser": "Utente non valido.",
+    "invaliduser": "Utente non valido",
     "lastname": "Cognome",
     "manager": "Manager",
     "newpicture": "Nuova immagine",
     "phone1": "Telefono",
-    "phone2": "Mobile",
+    "phone2": "Cellulare",
     "roles": "Ruoli",
     "student": "Studente",
     "teacher": "Docente non editor",
diff --git a/www/core/components/user/lang/nl.json b/www/core/components/user/lang/nl.json
index 0ca1abf5ab6..040c2592de8 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -4,14 +4,14 @@
     "contact": "Contact",
     "country": "Land",
     "description": "Beschrijving",
-    "details": "Details",
+    "details": "SCO opvolgdetails",
     "detailsnotavailable": "Je kunt de details voor deze gebruiker niet bekijken.",
     "editingteacher": "Leraar",
     "email": "E-mail",
     "emailagain": "E-mail (nogmaals)",
     "firstname": "Voornaam",
     "interests": "Interesses",
-    "invaliduser": "Ongeldige gebuiker",
+    "invaliduser": "Ongeldige gebruiker",
     "lastname": "Achternaam",
     "manager": "Manager",
     "newpicture": "Nieuwe foto",
diff --git a/www/core/components/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index 424401d439f..e212093a063 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -4,19 +4,19 @@
     "contact": "Contato",
     "country": "País",
     "description": "Descrição",
-    "details": "Detalhes",
+    "details": "Detalhes do registro",
     "detailsnotavailable": "Os detalhes desse usuário não estão disponíveis para você.",
     "editingteacher": "Professor",
     "email": "Email",
     "emailagain": "Confirmar endereço de e-mail",
     "firstname": "Nome",
     "interests": "Interesses",
-    "invaliduser": "Usuário inválido.",
+    "invaliduser": "Usuário inválido",
     "lastname": "Sobrenome",
     "manager": "Gerente",
     "newpicture": "Nova imagem",
     "phone1": "Fone",
-    "phone2": "Celular",
+    "phone2": "Telefone celular",
     "roles": "Papéis",
     "sendemail": "Email",
     "student": "Estudante",
diff --git a/www/core/components/user/lang/ru.json b/www/core/components/user/lang/ru.json
index 0ded3856726..eec8fc8030f 100644
--- a/www/core/components/user/lang/ru.json
+++ b/www/core/components/user/lang/ru.json
@@ -4,19 +4,19 @@
     "contact": "Контакты",
     "country": "Страна",
     "description": "Описание",
-    "details": "Подробнее",
+    "details": "Подробный отчет",
     "detailsnotavailable": "Вам не доступны подробности этого пользователя",
     "editingteacher": "Учитель",
     "email": "Email",
     "emailagain": "Адрес электронной почты (еще раз)",
     "firstname": "Имя",
     "interests": "Интересы",
-    "invaliduser": "Неправильный пользователь",
+    "invaliduser": "Некорректный пользователь",
     "lastname": "Фамилия",
     "manager": "Управляющий",
     "newpicture": "Новое изображение",
     "phone1": "Телефон",
-    "phone2": "Мобильный",
+    "phone2": "Мобильный телефон",
     "roles": "Роли",
     "student": "Студент",
     "teacher": "Учитель без права редактирования (ассистент)",
diff --git a/www/core/components/user/lang/sv.json b/www/core/components/user/lang/sv.json
index de1a0d62c87..94ca7299b23 100644
--- a/www/core/components/user/lang/sv.json
+++ b/www/core/components/user/lang/sv.json
@@ -4,21 +4,21 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beskrivning",
-    "details": "Detaljer",
+    "details": "Detaljerad SCO spårning",
     "detailsnotavailable": "Detaljerna till denna användare är inte tillgängliga för dig.",
     "editingteacher": "Lärare",
     "email": "E-post",
     "emailagain": "E-post (igen)",
     "firstname": "Förnamn",
     "interests": "Intressen",
-    "invaliduser": "Ogiltig användare.",
+    "invaliduser": "Ogiltig användare",
     "lastname": "Efternamn",
     "manager": "Manager",
     "newpicture": "Ny bild",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Mobiltelefon",
     "roles": "Roller",
-    "student": "Student",
+    "student": "Student/elev/deltagare/lärande",
     "teacher": "Icke editerande lärare",
     "viewprofile": "Visa profil",
     "webpage": "Webbsida"
diff --git a/www/core/components/user/lang/tr.json b/www/core/components/user/lang/tr.json
index 5a2649c0939..0415b166cdc 100644
--- a/www/core/components/user/lang/tr.json
+++ b/www/core/components/user/lang/tr.json
@@ -1,21 +1,21 @@
 {
     "address": "Adres",
     "city": "Şehir",
-    "contact": "Kişi",
+    "contact": "İletişim",
     "country": "Ülke",
     "description": "Açıklama",
-    "details": "Detaylar",
+    "details": "İzleme ayrıntıları",
     "editingteacher": "Öğretmen",
     "email": "E-posta",
     "emailagain": "E-posta (tekrar)",
     "firstname": "Adı",
     "interests": "İlgi alanları",
-    "invaliduser": "Geçersiz kullanıcı.",
+    "invaliduser": "Geçersiz kullanıcı",
     "lastname": "Soyadı",
     "manager": "Yönetici",
     "newpicture": "Yeni resim",
     "phone1": "Telefon",
-    "phone2": "Mobil",
+    "phone2": "Cep telefonu",
     "roles": "Roller",
     "student": "Öğrenci",
     "teacher": "Düzenleme yetkisi olmayan öğretmen",
diff --git a/www/core/components/user/lang/uk.json b/www/core/components/user/lang/uk.json
new file mode 100644
index 00000000000..94b6b0bd9ad
--- /dev/null
+++ b/www/core/components/user/lang/uk.json
@@ -0,0 +1,26 @@
+{
+    "address": "Адреса",
+    "city": "Місто",
+    "contact": "Контакт",
+    "country": "Країна",
+    "description": "Опис",
+    "details": "Деталі запису",
+    "detailsnotavailable": "Деталі цього користувача вам не доступні",
+    "editingteacher": "Вчитель",
+    "email": "Ел.пошта",
+    "emailagain": "Електронна пошта (повторно)",
+    "firstname": "Ім'я",
+    "interests": "Інтереси",
+    "invaliduser": "Неправильний користувач",
+    "lastname": "Прізвище",
+    "manager": "Менеджер",
+    "newpicture": "Новий малюнок",
+    "phone1": "Телефон",
+    "phone2": "Мобільний телефон",
+    "roles": "Ролі",
+    "sendemail": "Email",
+    "student": "Студент",
+    "teacher": "Учитель без прав редагування",
+    "viewprofile": "Переглянути профіль",
+    "webpage": "Веб-сторінка"
+}
\ No newline at end of file
diff --git a/www/core/components/user/lang/zh-cn.json b/www/core/components/user/lang/zh-cn.json
index e87f7ac73ef..f1e99807e98 100644
--- a/www/core/components/user/lang/zh-cn.json
+++ b/www/core/components/user/lang/zh-cn.json
@@ -1,10 +1,10 @@
 {
     "address": "地址",
     "city": "市/县",
-    "contact": "联系方式",
+    "contact": "联系",
     "country": "国家和地区",
     "description": "描述",
-    "details": "详情",
+    "details": "查看详情",
     "email": "Email",
     "emailagain": "Email (重复)",
     "firstname": "名",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index ba029792d77..afc3322e39b 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -40,7 +40,7 @@
     "days": "Dies",
     "decsep": ",",
     "delete": "Suprimeix",
-    "deleting": "S'està eliminant",
+    "deleting": "S'està suprimint",
     "description": "Descripció",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -134,7 +134,7 @@
     "nocomments": "No hi ha comentaris",
     "nograde": "No hi ha qualificació.",
     "none": "Cap",
-    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya.",
+    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya, però no està disponible cap pàgina on pugueu canviar-la. Contacteu amb l'administració del vostre Moodle.",
     "nopermissions": "Actualment no teniu permisos per a fer això ({{$a}})",
     "noresults": "Sense resultats",
     "notapplicable": "n/a",
@@ -142,7 +142,7 @@
     "notsent": "No enviat",
     "now": "ara",
     "numwords": "{{$a}} paraules",
-    "offline": "No es requereix cap tramesa en línia",
+    "offline": "Fora de línia",
     "online": "En línia",
     "openfullimage": "Feu clic per veure la imatge a tamany complert",
     "openinbrowser": "Obre-ho al navegador",
@@ -160,7 +160,7 @@
     "retry": "Reintenta",
     "save": "Desa",
     "search": "Cerca...",
-    "searching": "S'està cercant",
+    "searching": "S'està cercant en...",
     "searchresults": "Resultats de la cerca",
     "sec": "segon",
     "secs": "segons",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index a5c85690c79..84139b952b3 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -17,9 +17,9 @@
     "comments": "Komentáře",
     "commentscount": "Komentáře ({{$a}})",
     "commentsnotworking": "Komentáře nemohou být obnoveny",
-    "completion-alt-auto-fail": "Splněno: {{$a}} ; ale nedosáhli se potřebné známky",
+    "completion-alt-auto-fail": "Splněno: {{$a}} (nebylo dosaženo požadované známky)",
     "completion-alt-auto-n": "Nesplněno: {{$a}}",
-    "completion-alt-auto-pass": "Splněno: {{$a}}; dosáhli se potřebné známky",
+    "completion-alt-auto-pass": "Splněno: {{$a}} (bylo dosaženo požadované známky)",
     "completion-alt-auto-y": "Splněno: {{$a}}",
     "completion-alt-manual-n": "Nesplněno: {{$a}}. Výběrem označíte jako splněné.",
     "completion-alt-manual-y": "Splněno: {{$a}}. Výběrem označíte jako nesplněné.",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Obrázek",
     "imageviewer": "Prohlížeč obrázků",
-    "info": "Informace",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Naposledy změněno",
@@ -135,7 +135,7 @@
     "nocomments": "Nejsou žádné komentáře",
     "nograde": "Žádné hodnocení.",
     "none": "Žádné",
-    "nopasswordchangeforced": "Nelze pokračovat beze změny hesla.",
+    "nopasswordchangeforced": "Nemůžete pokračovat dál bez změny hesla, ale stránka pro jeho změnu není k dispozici. Kontaktujte správce Vašeho eLearningu Moodle.",
     "nopermissions": "Je mi líto, ale momentálně nemáte oprávnění vykonat tuto operaci ({{$a}})",
     "noresults": "Žádné výsledky",
     "notapplicable": "n/a",
@@ -161,13 +161,13 @@
     "retry": "Opakovat",
     "save": "Uložit",
     "search": "Vyhledávání...",
-    "searching": "Hledání",
+    "searching": "Vyhledávám v ...",
     "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
     "send": "Odeslat",
-    "sending": "Odeslání",
+    "sending": "Odesílání",
     "serverconnection": "Chyba spojení se serverem",
     "show": "Ukázat",
     "showmore": "Zobrazit více...",
@@ -181,7 +181,7 @@
     "sorry": "Promiňte...",
     "start": "Začátek",
     "submit": "Odeslat",
-    "success": "Úspěch!",
+    "success": "Úspěch",
     "tablet": "Tablet",
     "teachers": "Učitelé",
     "thereisdatatosync": "K dispozici jsou v  offline režimu {{$a}}, které mají být synchronizovány.",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index f0984392ce7..42451063cb8 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -17,12 +17,12 @@
     "comments": "Kommentare",
     "commentscount": "Kommentare ({{$a}})",
     "commentsnotworking": "Kommentare können nicht mehr abgerufen werden",
-    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (Anforderung nicht erreicht)",
+    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (ohne Erfolg)",
     "completion-alt-auto-n": "Nicht abgeschlossen: {{$a}}",
-    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (Anforderung erreicht)",
+    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (mit Erfolg)",
     "completion-alt-auto-y": "Abgeschlossen: {{$a}}",
-    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}}. Auswählen, um als abgeschlossen zu markieren.",
-    "completion-alt-manual-y": "Abgeschlossen: {{$a}}. Auswählen, um als nicht abgeschlossen zu markieren.",
+    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}} - mit Auswahl als abgeschlossen markieren",
+    "completion-alt-manual-y": "Abgeschlossen: {{$a}}  - mit Auswahl als nicht abgeschlossen markieren",
     "confirmcanceledit": "Möchten Sie diese Seite wirklich verlassen? Alle Änderungen gehen verloren!",
     "confirmdeletefile": "Möchten Sie diese Datei wirklich löschen?",
     "confirmloss": "Möchten Sie wirklich alle Änderungen verlieren?",
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Standard ({{$a}})",
     "delete": "Löschen",
-    "deleting": "Löschen ...",
+    "deleting": "Lösche",
     "description": "Beschreibung",
     "dfdaymonthyear": "DD.MM.YYYY",
     "dfdayweekmonth": "ddd, D. MMM",
@@ -135,7 +135,7 @@
     "nocomments": "Keine Kommentare",
     "nograde": "Keine Bewertung.",
     "none": "--",
-    "nopasswordchangeforced": "Sie können nicht weitermachen, ohne das Kennwort zu ändern.",
+    "nopasswordchangeforced": "Ohne die Änderung des Kennworts können Sie nicht weitermachen. Falls die Seite zur Änderung des Kennworts nicht verfügbar ist, wenden Sie sich an den Administrator der Website.",
     "nopermissions": "Sie besitzen derzeit keine Rechte, dies zu tun ({{$a}}).",
     "noresults": "Keine Ergebnisse",
     "notapplicable": "n/a",
@@ -161,13 +161,13 @@
     "retry": "Neu versuchen",
     "save": "Sichern",
     "search": "Suchen...",
-    "searching": "Suchen",
+    "searching": "Suche in ...",
     "searchresults": "Suchergebnisse",
     "sec": "Sekunde",
     "secs": "Sekunden",
     "seemoredetail": "Hier klicken, um weitere Details sichtbar zu machen",
     "send": "Senden",
-    "sending": "Senden",
+    "sending": "wird gesendet",
     "serverconnection": "Fehler beim Aufbau der Verbindung zum Server",
     "show": "Zeigen",
     "showmore": "Mehr anzeigen ...",
@@ -181,7 +181,7 @@
     "sorry": "Sorry ...",
     "start": "Start",
     "submit": "Abgabe",
-    "success": "Fertig!",
+    "success": "erfolgreich",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
     "thereisdatatosync": "Die Offline-Daten {{$a}} müssen synchronisiert werden.",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index b16fa971c6f..9f12ddb37a5 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -17,12 +17,12 @@
     "comments": "Σχόλια",
     "commentscount": "Σχόλια ({{$a}})",
     "commentsnotworking": "Τα σχόλια δεν μπορούν να ανακτηθούν",
-    "completion-alt-auto-fail": "Ολοκληρώθηκε: {{$a}} (δεν πετύχατε βαθμό πρόσβασης)",
-    "completion-alt-auto-n": "Δεν ολοκληρώθηκε: {{$a}}",
-    "completion-alt-auto-pass": "Ολοκληρώθηκε: {{$a}} (πετύχατε βαθμό πρόσβασης)",
-    "completion-alt-auto-y": "Ολοκληρώθηκε: {{$a}}",
-    "completion-alt-manual-n": "Δεν ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως ολοκληρωμένο.",
-    "completion-alt-manual-y": "Ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως μη ολοκληρωμένο.",
+    "completion-alt-auto-fail": "Ολοκληρωμένο (με βαθμό κάτω της βάσης)",
+    "completion-alt-auto-n": "Μη ολοκληρωμένο",
+    "completion-alt-auto-pass": "Ολοκληρωμένο (με βαθμό άνω της βάσης)",
+    "completion-alt-auto-y": "Ολοκληρωμένο",
+    "completion-alt-manual-n": "Μη ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως ολοκληρωμένο",
+    "completion-alt-manual-y": "Ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως μη ολοκληρωμένο",
     "confirmcanceledit": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν τη σελίδα; Όλες οι αλλαγές θα χαθούν.",
     "confirmdeletefile": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmopeninbrowser": "Θέλετε να το ανοίξετε στο πρόγραμμα περιήγησης;",
@@ -38,7 +38,7 @@
     "days": "Ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
-    "deleting": "Γίνεται διαγραφή",
+    "deleting": "Διαγραφή",
     "description": "Περιγραφή",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -127,7 +127,7 @@
     "nocomments": "Δεν υπάρχουν σχόλια",
     "nograde": "Κανένα βαθμό.",
     "none": "Κανένα",
-    "nopasswordchangeforced": "Δεν μπορείτε να προχωρήσετε χωρίς να αλλάξετε τον κωδικό πρόσβασής σας.",
+    "nopasswordchangeforced": "You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.",
     "nopermissions": "Συγνώμη, αλλά επί του τρεχόντως δεν έχετε το δικαίωμα να το κάνετε αυτό ({{$a}})",
     "noresults": "Κανένα αποτέλεσμα",
     "notapplicable": "n/a",
@@ -135,7 +135,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Εκτός σύνδεσης",
+    "offline": "Αποσυνδεδεμένος",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -153,13 +153,13 @@
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
     "search": "Αναζήτηση...",
-    "searching": "Αναζήτηση",
+    "searching": "Γίνεται έρευνα στο...",
     "searchresults": "Αναζήτηση στα αποτελέσματα",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
-    "sending": "Αποστολή",
+    "sending": "Αποστέλλεται",
     "show": "Δείξε",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
@@ -172,7 +172,7 @@
     "sorry": "Λυπάμαι...",
     "start": "Αρχή",
     "submit": "Υποβολή",
-    "success": "Επιτυχία!",
+    "success": "Επιτυχία",
     "tablet": "Tablet",
     "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index 081f675765b..68918a5acbb 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -17,12 +17,12 @@
     "comments": "Comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
-    "completion-alt-auto-fail": "Completado: {{$a}} (no obtuvo calificación aprobatoria)",
-    "completion-alt-auto-n": "No completado: {{$a}}",
-    "completion-alt-auto-pass": "Completado: {{$a}} (obtuvo calificación aprobatoria)",
-    "completion-alt-auto-y": "Completado: {{$a}}",
-    "completion-alt-manual-n": "No-completado: {{$a}}. Seleccionar mara marcarlo como completado.",
-    "completion-alt-manual-y": "Completado: {{$a}}. Seleccionar mara marcarlo como no completado.",
+    "completion-alt-auto-fail": "Finalizado {{$a}} (no obtuvo calificación de aprobado)",
+    "completion-alt-auto-n": "Sin finalizar: {{$a}}",
+    "completion-alt-auto-pass": "Finalizado: {{$a}} (obtuvo calificación de aprobado)",
+    "completion-alt-auto-y": "Finalizado: {{$a}}",
+    "completion-alt-manual-n": "No finalizado; {{$a}}. Seleccione para marcar como finalizado",
+    "completion-alt-manual-y": "Finalizado; {{$a}} seleccione para marcar como no finalizado",
     "confirmcanceledit": "¿Está Usted seguro de que quiere abandonar esta página? Se perderán todos los cambios.",
     "confirmdeletefile": "¿Está seguro de que desea eliminar este archivo?",
     "confirmloss": "¿Está Usted seguro? Se perderán todos los cambios.",
@@ -135,7 +135,7 @@
     "nocomments": "No hay comentarios",
     "nograde": "Sin calificación.",
     "none": "Ninguno(a)",
-    "nopasswordchangeforced": "Usted no puede proceder sin cambiar su contraseña.",
+    "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
     "noresults": "Sin resultados",
     "notapplicable": "no disp.",
@@ -143,8 +143,8 @@
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "Fuera-de-línea",
-    "online": "En-línea",
+    "offline": "Fuera de línea",
+    "online": "En línea",
     "openfullimage": "Hacer click aquí para mostrar la imagen a tamaño completo",
     "openinbrowser": "Abrir en navegador",
     "othergroups": "Otros grupos",
@@ -161,7 +161,7 @@
     "retry": "Reintentar",
     "save": "Guardar",
     "search": "Buscar...",
-    "searching": "Buscando",
+    "searching": "Buscando en ...",
     "searchresults": "Resultado",
     "sec": "segundos",
     "secs": "segundos",
@@ -181,7 +181,7 @@
     "sorry": "Lo siento...",
     "start": "Inicio",
     "submit": "Enviar",
-    "success": "¡Éxito!",
+    "success": "Éxito",
     "tablet": "Tableta",
     "teachers": "Profesores",
     "thereisdatatosync": "Existen {{$a}} fuera-de-línea para ser sincronizados/as.",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index 3c62499e565..3dcf03486fe 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -44,6 +44,7 @@
     "description": "Deskribapena",
     "dfdaymonthyear": "YYYY-MM-DD",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
@@ -53,6 +54,7 @@
     "download": "Klikatu esportatutako kategoria-fitxategia deskargatzeko",
     "downloading": "Jaisten",
     "edit": "Editatu",
+    "emptysplit": "Orri hau hutsik agertuko da ezkerreko panela hutsik badago edo kargatzen ari bada.",
     "error": "Errore ezezagun bat gertatu da!",
     "errorchangecompletion": "Errorea gertatu da osaketa-egoera aldatzean. Mesedez saiatu berriz.",
     "errordeletefile": "Errorea fitxategia ezabatzean. Mesedez, saiatu berriz.",
@@ -91,6 +93,7 @@
     "lastsync": "Azken sinkronizazioa",
     "listsep": ";",
     "loading": "Igotzen...",
+    "loadmore": "Kargatu gehiago",
     "lostconnection": "Zure token-a orain ez da baliozkoa edo iraungitu da, gunera berriz konektatu beharko zara.",
     "maxsizeandattachments": "Gehienezko tamaina fitxategi berrietarako: {{$a.size}}, gehienezko eranskin-kopurua: {{$a.attachments}}",
     "min": "Baxuena",
@@ -188,7 +191,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Oh oh!",
     "unexpectederror": "Ezusteko errorea. Mesedez ireki eta berriz ireki app-a eta berriz saiatu",
-    "unicodenotsupported": "Unicode testua (emoji-ak adibidez) ez dira gune honetan onartzen, testua karaktere horiek kenduta bidaliko da.",
+    "unicodenotsupported": "Emoji batzuk ez dira gune honetan onartzen. Mezua karaktere horiek kenduta bidaliko da.",
     "unicodenotsupportedcleanerror": "Testu hutsa aurkitu da Unicode karaktereak ezabatzean.",
     "unknown": "Ezezaguna",
     "unlimited": "Mugarik gabe",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index ece0b0da482..c1cdd4a8af7 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Défaut ({{$a}})",
     "delete": "Supprimer",
-    "deleting": "Suppression",
+    "deleting": "En cours de suppression",
     "description": "Description",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -132,7 +132,7 @@
     "nocomments": "Aucun commentaire",
     "nograde": "Aucune note.",
     "none": "Aucun",
-    "nopasswordchangeforced": "Vous ne pouvez pas continuer ans changer votre mot de passe.",
+    "nopasswordchangeforced": "Vous ne pouvez pas continuer sans modifier votre mot de passe. Cependant, il n'y a aucun moyen disponible de le modifier. Veuillez contacter l'administrateur de votre Moodle.",
     "nopermissions": "Désolé, vous n'avez actuellement pas les droits d'accès requis pour effectuer ceci ({{$a}})",
     "noresults": "Pas de résultat",
     "notapplicable": "n/a",
@@ -140,7 +140,7 @@
     "notsent": "Pas envoyé",
     "now": "maintenant",
     "numwords": "{{$a}} mots",
-    "offline": "Hors ligne",
+    "offline": "Déconnecté",
     "online": "En ligne",
     "openfullimage": "Cliquer ici pour afficher l'image en pleine grandeur",
     "openinbrowser": "Ouvrir dans le navigateur",
@@ -158,7 +158,7 @@
     "retry": "Essayer à nouveau",
     "save": "Enregistrer",
     "search": "Recherche...",
-    "searching": "Recherche",
+    "searching": "Recherche dans...",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
@@ -178,7 +178,7 @@
     "sorry": "Désolé...",
     "start": "Début",
     "submit": "Envoyer",
-    "success": "Succès !",
+    "success": "Succès",
     "tablet": "Tablette",
     "teachers": "Enseignants",
     "thereisdatatosync": "Il y a des {{$a}} locales à synchroniser",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index fbb552bed44..81fe258864b 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -16,12 +16,12 @@
     "comments": "Commenti",
     "commentscount": "Commenti ({{$a}})",
     "commentsnotworking": "Non è possibile scaricare i commenti",
-    "completion-alt-auto-fail": "Completato: {{$a}} (senza la sufficienza)",
-    "completion-alt-auto-n": "Non completato: {{$a}}",
-    "completion-alt-auto-pass": "Completato: {{$a}} (con la sufficienza)",
-    "completion-alt-auto-y": "Completato: {{$a}}",
-    "completion-alt-manual-n": "Non completato: {{$a}}. Selezionare per indicare come completato.",
-    "completion-alt-manual-y": "Completato: {{$a}}. Selezionare per indicare come non completato.",
+    "completion-alt-auto-fail": "Completato: {{$a}} (senza raggiungere la sufficienza)",
+    "completion-alt-auto-n": "Non completata: {{$a}}",
+    "completion-alt-auto-pass": "Completato: {{$a}} (raggiunta la sufficienza)",
+    "completion-alt-auto-y": "Completata: {{$a}}",
+    "completion-alt-manual-n": "Non completata: {{$a}}.\nSelezionarla per spuntarla come completata.",
+    "completion-alt-manual-y": "Completata: {{$a}}. Selezionarla per spuntarla come non completata.",
     "confirmcanceledit": "Sei sicuro di abbandonare questa pagina? Tutte le modifiche saranno perdute.",
     "confirmdeletefile": "Sei sicuro di voler eliminare questo file?",
     "confirmopeninbrowser": "Desideri aprirlo nel browser?",
@@ -35,7 +35,7 @@
     "decsep": ",",
     "defaultvalue": "Default ({{$a}})",
     "delete": "Elimina",
-    "deleting": "Eliminazione in corso",
+    "deleting": "Eliminazione",
     "description": "Descrizione",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -70,7 +70,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Immagine",
     "imageviewer": "Visualizzatore di immagini",
-    "info": "Informazioni",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Ultima modifica",
@@ -141,13 +141,13 @@
     "retry": "Riprova",
     "save": "Salva",
     "search": "Cerca...",
-    "searching": "Ricerca in corso",
+    "searching": "Ricerca in ...",
     "searchresults": "Risultati delle ricerche",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
     "send": "Invia",
-    "sending": "Invio in c orso",
+    "sending": "Invio in corso",
     "serverconnection": "Si è verificato un errore durante la connessione al server",
     "show": "Visualizza",
     "site": "Sito",
@@ -158,7 +158,7 @@
     "sizetb": "TB",
     "start": "Apertura",
     "submit": "Invia",
-    "success": "OK!",
+    "success": "Operazione eseguita con successo",
     "tablet": "Tablet",
     "teachers": "Docenti",
     "time": "Ora",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index fbb079fddac..7018500b84e 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -17,12 +17,12 @@
     "comments": "Opmerkingen",
     "commentscount": "Opmerkingen ({{$a}})",
     "commentsnotworking": "Opmerkingen konden niet opgehaald worden",
-    "completion-alt-auto-fail": "Voltooid: {{$a}} (slaagcijfer niet behaald)",
+    "completion-alt-auto-fail": "Voltooid:  {{$a}}  (bereikte het cijfer voor geslaagd niet)",
     "completion-alt-auto-n": "Niet voltooid: {{$a}}",
-    "completion-alt-auto-pass": "Voltooid: {{$a}} (slaagcijfer behaald)",
+    "completion-alt-auto-pass": "Voltooid:  {{$a}} (slaagcijfer bereikt)",
     "completion-alt-auto-y": "Voltooid: {{$a}}",
-    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om als voltooid te markeren.",
-    "completion-alt-manual-y": "Voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
+    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om te markeren als voltooid",
+    "completion-alt-manual-y": "voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
     "confirmcanceledit": "Weet je zeker dat je deze pagina wil verlaten? Alle wijzigingen zullen verloren gaan.",
     "confirmdeletefile": "Wil je dit bestand echt verwijderen?",
     "confirmloss": "Ben je zeker? Alle wijzigingen zullen verloren gaan.",
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Standaard ({{$a}})",
     "delete": "Verwijder",
-    "deleting": "Verwijderen.",
+    "deleting": "Verwijderen",
     "description": "Beschrijving",
     "dfdaymonthyear": "MM-DD-JJJJ",
     "dfdayweekmonth": "ddd, D, MMM",
@@ -135,7 +135,7 @@
     "nocomments": "Er zijn geen opmerkingen",
     "nograde": "Geen cijfer.",
     "none": "Geen",
-    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te veranderen.",
+    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te wijzigen, hoewel er geen pagina voorzien is om dat te doen. Neem contact op met je Moodlebeheerder",
     "nopermissions": "Sorry, maar je hebt nu niet het recht om dat te doen ({{$a}}).",
     "noresults": "Geen resultaat",
     "notapplicable": "n/a",
@@ -161,13 +161,13 @@
     "retry": "Probeer opnieuw",
     "save": "Bewaar",
     "search": "Zoeken...",
-    "searching": "Zoeken",
+    "searching": "Zoeken in ...",
     "searchresults": "Zoekresultaten",
     "sec": "seconde",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
     "send": "Verstuur",
-    "sending": "Sturen",
+    "sending": "Versturen",
     "serverconnection": "Fout bij het verbinden met de server",
     "show": "Laat zien",
     "showmore": "Toon meer...",
@@ -181,7 +181,7 @@
     "sorry": "Sorry...",
     "start": "Start",
     "submit": "Afgeven",
-    "success": "Gelukt!",
+    "success": "Succes",
     "tablet": "Tablet",
     "teachers": "leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 638775195bd..0cf22e1b2e0 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -17,12 +17,12 @@
     "comments": "Comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Os comentários não podem ser recuperados",
-    "completion-alt-auto-fail": "Concluído: {{$a}} (não alcançou a nota para passar)",
-    "completion-alt-auto-n": "Não concluído: {{$a}}",
-    "completion-alt-auto-pass": "Concluído: {{$a}} (nota para passar foi alcançada)",
+    "completion-alt-auto-fail": "Concluído: {{$a}} (não obteve nota para aprovação)",
+    "completion-alt-auto-n": "Não concluído(s): {{$a}}",
+    "completion-alt-auto-pass": "Concluído: {{$a}} (foi atingida a nota de aprovação)",
     "completion-alt-auto-y": "Concluído: {{$a}}",
-    "completion-alt-manual-n": "Não concluído: {{$a}}. Selecione para marcar como concluída.",
-    "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
+    "completion-alt-manual-n": "Não concluído(s): {{$a}}. Selecione para marcar como concluído.",
+    "completion-alt-manual-y": "Concluído(s): {{$a}}. Selecione para marcar como não concluído.",
     "confirmcanceledit": "Você tem certeza que quer sair dessa página? Todas as mudanças serão perdidas.",
     "confirmdeletefile": "Você tem certeza que quer excluir este arquivo?",
     "confirmloss": "Você tem certeza? Todas as alterações serão perdidas.",
@@ -131,7 +131,7 @@
     "nocomments": "Não existem comentários",
     "nograde": "Não há nota",
     "none": "Nenhum",
-    "nopasswordchangeforced": "Você não pode proceder sem mudar sua senha.",
+    "nopasswordchangeforced": "Você não pode continuar sem mudar sua senha. Mas infelizmente não existe uma página para esse propósito.\nPor favor contate o Administrador Moodle.",
     "nopermissions": "Você não tem permissão para {{$a}}",
     "noresults": "Nenhum resultado",
     "notapplicable": "n/a",
@@ -139,8 +139,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavras",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Desconectado",
+    "online": "Conectado",
     "openfullimage": "Clique aqui para exibir a imagem no tamanho completo",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -157,7 +157,7 @@
     "retry": "Tentar novamente",
     "save": "Salvar",
     "search": "Procurar...",
-    "searching": "Procurando",
+    "searching": "Pesquisando em....",
     "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",
@@ -177,7 +177,7 @@
     "sorry": "Desculpe...",
     "start": "Início",
     "submit": "Enviar",
-    "success": "Sucesso!",
+    "success": "Sucesso",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index c45456ec562..ce3895ea1c0 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -44,6 +44,7 @@
     "description": "Descrição",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "hh[:]mm",
@@ -53,6 +54,7 @@
     "download": "Clique para descarregar o ficheiro de categorias exportado",
     "downloading": "A descarregar",
     "edit": "Editar",
+    "emptysplit": "Esta página aparecerá em branco se o painel esquerdo estiver vazio ou enquanto estiver a ser carregado.",
     "error": "Ocorreu um erro desconhecido!",
     "errorchangecompletion": "Ocorreu um erro ao alterar o estado de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao apagar o ficheiro. Por favor, tente novamente.",
@@ -91,6 +93,7 @@
     "lastsync": "Última sincronização",
     "listsep": ";",
     "loading": "A carregar...",
+    "loadmore": "Ver mais",
     "lostconnection": "O seu token é inválido ou expirou, terá de se autenticar novamente no site.",
     "maxsizeandattachments": "Tamanho máximo para novos ficheiros: {{$a.size}}, número máximo de anexos: {{$a.attachments}}",
     "min": "Mais baixa",
@@ -188,7 +191,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Erro inesperado. Por favor, feche e abra novamente a aplicação para tentar de novo",
-    "unicodenotsupported": "Texto Unicode, tais como emojis, não são suportados neste site. O texto será enviado sem estes caracteres.",
+    "unicodenotsupported": "Alguns emojis não são suportados neste site. Estes caracteres serão removidos quando a mensagem for enviada.",
     "unicodenotsupportedcleanerror": "Foi encontrado texto vazio ao limpar caracteres Unicode.",
     "unknown": "Desconhecido(a)",
     "unlimited": "Ilimitado(a)",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index 885c20ba531..af99d470510 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -15,12 +15,12 @@
     "close": "Stäng fönster",
     "comments": "Kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Avslutad: {{$a}} (uppnådde inte gräns för godkänd)",
+    "completion-alt-auto-fail": "Fullföljd (uppnådde inte godkänt resultat)",
     "completion-alt-auto-n": "Inte avslutad: {{$a}}",
-    "completion-alt-auto-pass": "Avslutad: {{$a}} (uppnådde gräns för godkänd)",
-    "completion-alt-auto-y": "Avslutad: {{$a}}",
-    "completion-alt-manual-n": "Inte avslutad: {{$a}}. Välj att markera som avslutad",
-    "completion-alt-manual-y": "Avslutad: {{$a}}. Välj att markera som INTE avslutad",
+    "completion-alt-auto-pass": "Fullföljd (godkänt resultat)",
+    "completion-alt-auto-y": "Fullföljd",
+    "completion-alt-manual-n": "Ej fullföljd; välj för att markera som fullföljd",
+    "completion-alt-manual-y": "Fullföljd; välj för att markera som ej fullföljd",
     "confirmdeletefile": "Är Du säker på att Du vill ta bort den här filen?",
     "confirmopeninbrowser": "Vill du öppna den i webbläsaren ?",
     "content": "Innehåll",
@@ -32,7 +32,7 @@
     "days": "Dagar",
     "decsep": ",",
     "delete": "Ta bort",
-    "deleting": "ta bort",
+    "deleting": "Tar bort",
     "description": "Beskrivning",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -117,8 +117,8 @@
     "notice": "Meddelande",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Frånkopplat läge",
+    "online": "Uppkopplad",
     "openfullimage": "Klick här för att visa bilden i full storlek",
     "openinbrowser": "Öppna i webbläsare",
     "othergroups": "Andra grupper",
@@ -133,7 +133,7 @@
     "requireduserdatamissing": "Den här användaren saknar vissa nödvändiga profildata. Vänligen fyll i uppgifterna i din Moodle och försök igen. <br>{{$a}}",
     "save": "Spara",
     "search": "Sök...",
-    "searching": "Söker",
+    "searching": "Söker i...",
     "searchresults": "Sökresultat",
     "sec": "Sekund",
     "secs": "Sekunder",
@@ -150,7 +150,7 @@
     "sizetb": "Tb",
     "start": "Starta",
     "submit": "Skicka",
-    "success": "Succé!",
+    "success": "Framgång",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
     "time": "Tid",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index d43bf2b3b08..efec2826202 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -114,7 +114,7 @@
     "required": "Gerekli",
     "save": "Kaydet",
     "search": "Arama...",
-    "searching": "Aranıyor",
+    "searching": "Aranıyor...",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
diff --git a/www/core/lang/uk.json b/www/core/lang/uk.json
new file mode 100644
index 00000000000..4263ac20093
--- /dev/null
+++ b/www/core/lang/uk.json
@@ -0,0 +1,199 @@
+{
+    "accounts": "Акаунти",
+    "allparticipants": "Усі учасники",
+    "android": "Android",
+    "areyousure": "Ви впевнені?",
+    "back": "Повернутися до перегляду запитання",
+    "cancel": "Скасувати",
+    "cannotconnect": "Неможливо з'єднатися: Переконайтеся, що ви ввели правильно URL і що сайт використовує Moodle 2.4 або більш пізньої версії.",
+    "cannotdownloadfiles": "Завантаження файлів відключена у вашій мобільній службі. Будь ласка, зверніться до адміністратора сайту.",
+    "category": "Категорія",
+    "choose": "Вибрати",
+    "choosedots": "Вибрати...",
+    "clearsearch": "Очистити пошук",
+    "clicktohideshow": "Натисніть, щоб розгорнути або згорнути",
+    "clicktoseefull": "Натисніть, щоб побачити весь вміст.",
+    "close": "Закрити вікно",
+    "comments": "Коментарі",
+    "commentscount": "Коментарі ({{$a}})",
+    "commentsnotworking": "Коментар не може бути відновлений",
+    "completion-alt-auto-fail": "Виконано: {{$a}}  (не вдалося досягти прохідного балу)",
+    "completion-alt-auto-n": "Не виконано: {{$a}}",
+    "completion-alt-auto-pass": "Виконано: {{$a}} (перевищено прохідний бал)",
+    "completion-alt-auto-y": "Виконано: {{$a}}",
+    "completion-alt-manual-n": "Не виконано: {{$a}}. Виберіть для позначення виконання",
+    "completion-alt-manual-y": "Виконано: {{$a}}. Виберіть для позначення не виконання",
+    "confirmcanceledit": "Ви впевнені, що хочете залишити цю сторінку? Всі зміни будуть втрачені.",
+    "confirmdeletefile": "Ви впевнені, що хочете видалити цей файл?",
+    "confirmloss": "Ви впевнені? Всі зміни будуть втрачені.",
+    "confirmopeninbrowser": "Ви хочете відкрити в браузері?",
+    "content": "Контент",
+    "contenteditingsynced": "Ви редагуєте вміст який був синхронізований.",
+    "continue": "Продовжити",
+    "copiedtoclipboard": "Текст скопійований",
+    "course": "Курс",
+    "coursedetails": "Деталі курсу",
+    "currentdevice": "Поточний пристрій",
+    "datastoredoffline": "Дані зберігаються в пристрої, оскільки не можуть бути надіслані. Вони будуть автоматично відправлені пізніше.",
+    "date": "Дата",
+    "day": "День(ів)",
+    "days": "Днів",
+    "decsep": ",",
+    "delete": "Вилучити",
+    "deleting": "Видалення",
+    "description": "Опис",
+    "dfdaymonthyear": "MM-DD-YYYY",
+    "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
+    "dflastweekdate": "ddd",
+    "dfmediumdate": "LLL",
+    "dftimedate": "h[:]mm A",
+    "discard": "Скинути",
+    "dismiss": "Відхилити",
+    "done": "Зроблено",
+    "download": "Натисніть для збереження файлу експорту на своєму комп'ютері.",
+    "downloading": "Завантаження",
+    "edit": "Редагувати",
+    "emptysplit": "Ця сторінка буде виглядати порожньою, якщо ліва панель порожня або завантажується.",
+    "error": "Виникла невідома помилка!",
+    "errorchangecompletion": "При зміні стану завершення сталася помилка. Будь ласка спробуйте ще раз.",
+    "errordeletefile": "Помилка видалення файлу. Будь ласка спробуйте ще раз.",
+    "errordownloading": "Помилка завантаження файлу.",
+    "errordownloadingsomefiles": "Помилка завантаження модуля файлів. Деякі файли можуть бути відсутні.",
+    "errorfileexistssamename": "Файл з таким ім'ям існує.",
+    "errorinvalidform": "Форма містить невірні дані. Будь ласка, переконайтеся, що всі необхідні поля з даними вірні.",
+    "errorinvalidresponse": "Неправильна відповідь отримана. Будь ласка, зверніться до адміністратора сайту Moodle, якщо роботу не відновлено.",
+    "errorloadingcontent": "Помилка завантаження контенту.",
+    "erroropenfilenoapp": "Помилка відкриття файлу: немає програми, щоб відкрити цей тип файлу.",
+    "erroropenfilenoextension": "Помилка відкриття файлу: файл не має розширення.",
+    "erroropenpopup": "Ця діяльність намагається відкрити спливаюче вікно. Це не підтримується в цьому додатку.",
+    "errorrenamefile": "Помилка перейменування файлу. Будь ласка спробуйте ще раз.",
+    "errorsync": "Під час синхронізації сталася помилка. Будь ласка спробуйте ще раз.",
+    "errorsyncblocked": "Це {{$a}} не може бути синхронізований прямо зараз через триваючого процесу. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
+    "filename": "Ім’я файлу",
+    "filenameexist": "Файл вже існує: {{$a}}",
+    "folder": "Тека",
+    "forcepasswordchangenotice": "Щоб продовжити, ви повинні змінити свій пароль.",
+    "fulllistofcourses": "Всі курси",
+    "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Окремі групи",
+    "groupsvisible": "Доступні групи",
+    "hasdatatosync": "{{$a}} має автономні дані які будуть синхронізовані.",
+    "help": "Допомога",
+    "hide": "Сховати",
+    "hour": "година",
+    "hours": "години",
+    "humanreadablesize": "{{size}} {{unit}}",
+    "image": "Зображення",
+    "imageviewer": "Переглядач зображень",
+    "info": "Інформація",
+    "ios": "iOS",
+    "labelsep": ":",
+    "lastmodified": "Востаннє змінено",
+    "lastsync": "Остання синхронізація",
+    "listsep": ";",
+    "loading": "Завантаження...",
+    "loadmore": "Завнтажити більше",
+    "lostconnection": "Ваш маркер аутентифікації недійсний або закінчився, вам доведеться підключитися до сайту.",
+    "maxsizeandattachments": "Макс. обсяг для нових файлів: {{$a.size}}, макс. кількість прикріплених файлів: {{$a.attachments}}",
+    "min": "Мінімальна",
+    "mins": "хв",
+    "mod_assign": "Завдання",
+    "mod_chat": "Чат",
+    "mod_choice": "Вибір",
+    "mod_data": "База даних",
+    "mod_feedback": "Зворотний зв’язок",
+    "mod_forum": "Форум",
+    "mod_lesson": "Урок",
+    "mod_lti": "ЗНВ",
+    "mod_quiz": "Тест",
+    "mod_scorm": "SCORM пакет",
+    "mod_survey": "Обстеження",
+    "mod_wiki": "Вікі",
+    "moduleintro": "Опис",
+    "mygroups": "Мої групи",
+    "name": "Назва",
+    "networkerrormsg": "Мережа не включена або не працює.",
+    "never": "Ніколи",
+    "next": "Продовжити",
+    "no": "Ні",
+    "nocomments": "Коментарів немає",
+    "nograde": "Немає оцінки.",
+    "none": "немає",
+    "nopasswordchangeforced": "Ви не можете перейти не змінивши ваш пароль, але не вказано ніякої сторінки для цього процесу. Будь ласка, зверніться до вашого Адміністратора.",
+    "nopermissions": "Вибачте, але ваші поточні права не дозволяють вам цього робити ({{$a}})",
+    "noresults": "Результат відсутній",
+    "notapplicable": "n/a",
+    "notice": "Помітити",
+    "notsent": "Не відправлено",
+    "now": "зараз",
+    "numwords": "{{$a}} слів",
+    "offline": "Поза мережею",
+    "online": "В мережі",
+    "openfullimage": "Натисніть тут, щоб побачити зображення в повному розмірі",
+    "openinbrowser": "Відкрити у браузері",
+    "othergroups": "Інші групи",
+    "pagea": "Сторінка {{$a}}",
+    "percentagenumber": "{{$a}}%",
+    "phone": "Телефон",
+    "pictureof": "Фото {{$a}}",
+    "previous": "Попередній стан",
+    "pulltorefresh": "Потягніть щоб оновити",
+    "redirectingtosite": "Ви будете перенаправлені на сайт.",
+    "refresh": "Оновити",
+    "required": "Обов’язкове",
+    "requireduserdatamissing": "Цей користувач не має деяких необхідних даних в профілі. Заповніть, будь ласка, ці дані у вашому профілі Moodle і спробуйте ще раз.<br>{{$a}}",
+    "retry": "Повторити",
+    "save": "Зберегти",
+    "search": "Пошук...",
+    "searching": "Пошук в ...",
+    "searchresults": "Результати пошуку",
+    "sec": "сек",
+    "secs": "сек",
+    "seemoredetail": "Деталі...",
+    "send": "Надіслати",
+    "sending": "Відсилання",
+    "serverconnection": "Помилка з’єднання з сервером",
+    "show": "Показати",
+    "showmore": "Показати більше",
+    "site": "Сайт",
+    "sitemaintenance": "Сайт проходить обслуговування і в даний час не доступний",
+    "sizeb": "байт",
+    "sizegb": "Гб",
+    "sizekb": "Кб",
+    "sizemb": "Мб",
+    "sizetb": "TB",
+    "sorry": "Вибачте...",
+    "start": "Початок",
+    "submit": "Перевірити",
+    "success": "Успішно",
+    "tablet": "пЛАНШЕТ",
+    "teachers": "Викладачі",
+    "thereisdatatosync": "Офлайн {{$a}} повинні бути синхронізовані.",
+    "time": "Час",
+    "timesup": "Час вичерпано!",
+    "today": "Сьогодні",
+    "tryagain": "Спробувати ще раз",
+    "twoparagraphs": "{{p1}}<br><br>{{p2}}",
+    "uhoh": "Опана...",
+    "unexpectederror": "Неочікувана помилка. Будь ласка, закрийте і знову відкрийте додаток, щоб спробувати ще раз",
+    "unicodenotsupported": "Деякі Emojis не підтримуються на цьому сайті. Такі символи будуть видалені, коли повідомлення було відправлено.",
+    "unicodenotsupportedcleanerror": "Порожній текст був знайдений при чищенні Unicode символів.",
+    "unknown": "Невідоме",
+    "unlimited": "Не обмежено",
+    "unzipping": "Розпакування",
+    "upgraderunning": "Сайт оновлюється, повторіть спробу пізніше.",
+    "userdeleted": "Реєстраційний запис користувача було вилучено",
+    "userdetails": "Детально",
+    "users": "Користувачі",
+    "view": "Перегляд",
+    "viewprofile": "Переглянути профіль",
+    "warningofflinedatadeleted": "Offline дані  {{component}} '{{name}}' були видалений.  {{error}}",
+    "whoops": "Упс!",
+    "whyisthishappening": "Чому це відбувається?",
+    "windowsphone": "Windows Phone",
+    "wsfunctionnotavailable": "Функція веб-сервіс не доступна.",
+    "year": "Роки",
+    "years": "роки",
+    "yes": "Так"
+}
\ No newline at end of file

From 709b10ecac639114911bbc26422b450e98137441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 26 May 2017 11:41:05 +0200
Subject: [PATCH 214/218] MOBILE-2103 grades: Fix link not set on grade items

---
 www/core/components/grades/templates/grade.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/core/components/grades/templates/grade.html b/www/core/components/grades/templates/grade.html
index 91723f837fe..492d620a809 100644
--- a/www/core/components/grades/templates/grade.html
+++ b/www/core/components/grades/templates/grade.html
@@ -5,10 +5,14 @@
         </ion-refresher>
         <mm-loading hide-until="gradeLoaded">
             <div ng-if="grade">
-                <a ng-if="grade.itemname" mm-link capture-link="true" class="item item-divider" href="{{ grade.link }}" title="{{ grade.itemname }}">
+                <a ng-if="grade.itemname && grade.link" mm-link capture-link="true" class="item item-divider" href="{{ grade.link }}" title="{{ grade.itemname }}">
                     <h2><mm-format-text watch="true">{{ grade.itemname }}</mm-format-text></h2>
                 </a>
 
+                <div ng-if="grade.itemname && !grade.link" class="item item-divider">
+                    <h2><mm-format-text watch="true">{{ grade.itemname }}</mm-format-text></h2>
+                </div>
+
                 <div ng-if="grade.weight" class="item item-text-wrap">
                     <h2>{{ 'mm.grades.weight' | translate}}</h2>
                     <p><mm-format-text watch="true">{{ grade.weight }}</mm-format-text></p>

From 5d783ba34fb790e277c6622475d526d19d4e5b30 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 26 May 2017 11:46:29 +0200
Subject: [PATCH 215/218] MOBILE-2103 release: Auto-translated strings
 (omitting double translation)

---
 www/addons/badges/lang/sv.json                |  2 +-
 www/addons/badges/lang/tr.json                |  2 +-
 www/addons/calendar/lang/cs.json              |  2 +-
 www/addons/calendar/lang/da.json              |  2 +-
 www/addons/calendar/lang/de.json              |  2 +-
 www/addons/calendar/lang/es-mx.json           |  2 +-
 www/addons/calendar/lang/es.json              |  2 +-
 www/addons/calendar/lang/fa.json              |  2 +-
 www/addons/calendar/lang/he.json              |  2 +-
 www/addons/calendar/lang/pt-br.json           |  2 +-
 www/addons/calendar/lang/sv.json              |  2 +-
 www/addons/calendar/lang/zh-cn.json           |  2 +-
 www/addons/competency/lang/ar.json            |  6 +-
 www/addons/competency/lang/bg.json            |  2 +-
 www/addons/competency/lang/ca.json            | 12 ++--
 www/addons/competency/lang/cs.json            | 10 +--
 www/addons/competency/lang/da.json            | 10 +--
 www/addons/competency/lang/de.json            | 14 ++--
 www/addons/competency/lang/el.json            |  4 +-
 www/addons/competency/lang/es-mx.json         | 12 ++--
 www/addons/competency/lang/es.json            |  8 +--
 www/addons/competency/lang/eu.json            |  8 +--
 www/addons/competency/lang/fa.json            | 10 +--
 www/addons/competency/lang/fr.json            | 10 +--
 www/addons/competency/lang/he.json            | 14 ++--
 www/addons/competency/lang/hu.json            | 12 ++--
 www/addons/competency/lang/it.json            | 12 ++--
 www/addons/competency/lang/ja.json            | 12 ++--
 www/addons/competency/lang/lt.json            | 12 ++--
 www/addons/competency/lang/nl.json            | 10 +--
 www/addons/competency/lang/pl.json            | 10 +--
 www/addons/competency/lang/pt-br.json         | 10 +--
 www/addons/competency/lang/pt.json            | 12 ++--
 www/addons/competency/lang/ro.json            |  4 +-
 www/addons/competency/lang/ru.json            | 14 ++--
 www/addons/competency/lang/sv.json            | 14 ++--
 www/addons/competency/lang/tr.json            | 12 ++--
 www/addons/competency/lang/uk.json            | 16 ++---
 www/addons/competency/lang/zh-cn.json         |  6 +-
 www/addons/competency/lang/zh-tw.json         | 12 ++--
 www/addons/coursecompletion/lang/ar.json      |  6 +-
 www/addons/coursecompletion/lang/bg.json      | 10 +--
 www/addons/coursecompletion/lang/ca.json      | 12 ++--
 www/addons/coursecompletion/lang/cs.json      | 14 ++--
 www/addons/coursecompletion/lang/da.json      | 14 ++--
 www/addons/coursecompletion/lang/de.json      | 12 ++--
 www/addons/coursecompletion/lang/el.json      |  4 +-
 www/addons/coursecompletion/lang/es-mx.json   | 12 ++--
 www/addons/coursecompletion/lang/es.json      | 10 +--
 www/addons/coursecompletion/lang/eu.json      | 14 ++--
 www/addons/coursecompletion/lang/fa.json      |  8 +--
 www/addons/coursecompletion/lang/fr.json      |  8 +--
 www/addons/coursecompletion/lang/he.json      | 10 +--
 www/addons/coursecompletion/lang/hu.json      | 10 +--
 www/addons/coursecompletion/lang/it.json      | 10 +--
 www/addons/coursecompletion/lang/ja.json      |  6 +-
 www/addons/coursecompletion/lang/lt.json      | 12 ++--
 www/addons/coursecompletion/lang/nl.json      | 14 ++--
 www/addons/coursecompletion/lang/pl.json      | 10 +--
 www/addons/coursecompletion/lang/pt-br.json   | 12 ++--
 www/addons/coursecompletion/lang/pt.json      | 10 +--
 www/addons/coursecompletion/lang/ro.json      | 10 +--
 www/addons/coursecompletion/lang/ru.json      | 12 ++--
 www/addons/coursecompletion/lang/sv.json      |  6 +-
 www/addons/coursecompletion/lang/tr.json      | 10 +--
 www/addons/coursecompletion/lang/uk.json      | 10 +--
 www/addons/coursecompletion/lang/zh-cn.json   | 14 ++--
 www/addons/coursecompletion/lang/zh-tw.json   | 14 ++--
 www/addons/files/lang/es.json                 |  2 +-
 www/addons/files/lang/pt.json                 |  2 +-
 www/addons/files/lang/ro.json                 |  2 +-
 www/addons/grades/lang/bg.json                |  2 +-
 www/addons/grades/lang/el.json                |  2 +-
 www/addons/grades/lang/fa.json                |  2 +-
 www/addons/grades/lang/fr.json                |  2 +-
 www/addons/grades/lang/he.json                |  2 +-
 www/addons/grades/lang/it.json                |  2 +-
 www/addons/grades/lang/ja.json                |  2 +-
 www/addons/grades/lang/nl.json                |  2 +-
 www/addons/grades/lang/pl.json                |  2 +-
 www/addons/grades/lang/ru.json                |  2 +-
 www/addons/grades/lang/uk.json                |  2 +-
 www/addons/grades/lang/zh-tw.json             |  2 +-
 www/addons/messages/lang/ar.json              |  4 +-
 www/addons/messages/lang/bg.json              |  6 +-
 www/addons/messages/lang/ca.json              |  6 +-
 www/addons/messages/lang/cs.json              |  6 +-
 www/addons/messages/lang/da.json              |  6 +-
 www/addons/messages/lang/el.json              |  4 +-
 www/addons/messages/lang/es-mx.json           |  6 +-
 www/addons/messages/lang/es.json              |  6 +-
 www/addons/messages/lang/eu.json              |  6 +-
 www/addons/messages/lang/fa.json              |  6 +-
 www/addons/messages/lang/fr.json              |  8 +--
 www/addons/messages/lang/he.json              | 10 +--
 www/addons/messages/lang/hu.json              |  6 +-
 www/addons/messages/lang/it.json              |  6 +-
 www/addons/messages/lang/ja.json              |  4 +-
 www/addons/messages/lang/lt.json              |  6 +-
 www/addons/messages/lang/nl.json              |  6 +-
 www/addons/messages/lang/pl.json              |  6 +-
 www/addons/messages/lang/pt-br.json           |  6 +-
 www/addons/messages/lang/pt.json              |  4 +-
 www/addons/messages/lang/ro.json              |  6 +-
 www/addons/messages/lang/ru.json              |  4 +-
 www/addons/messages/lang/sv.json              |  6 +-
 www/addons/messages/lang/tr.json              |  4 +-
 www/addons/messages/lang/uk.json              |  6 +-
 www/addons/messages/lang/zh-cn.json           |  6 +-
 www/addons/messages/lang/zh-tw.json           | 10 +--
 www/addons/mod/assign/lang/ar.json            | 10 +--
 www/addons/mod/assign/lang/bg.json            | 12 ++--
 www/addons/mod/assign/lang/ca.json            | 16 ++---
 www/addons/mod/assign/lang/cs.json            | 18 ++---
 www/addons/mod/assign/lang/da.json            | 14 ++--
 www/addons/mod/assign/lang/de.json            | 18 ++---
 www/addons/mod/assign/lang/el.json            | 16 ++---
 www/addons/mod/assign/lang/es-mx.json         | 16 ++---
 www/addons/mod/assign/lang/es.json            | 12 ++--
 www/addons/mod/assign/lang/eu.json            | 12 ++--
 www/addons/mod/assign/lang/fa.json            | 14 ++--
 www/addons/mod/assign/lang/fr.json            | 20 +++---
 www/addons/mod/assign/lang/he.json            | 18 ++---
 www/addons/mod/assign/lang/hu.json            | 16 ++---
 www/addons/mod/assign/lang/it.json            | 18 ++---
 www/addons/mod/assign/lang/ja.json            | 16 ++---
 www/addons/mod/assign/lang/lt.json            | 14 ++--
 www/addons/mod/assign/lang/nl.json            | 18 ++---
 www/addons/mod/assign/lang/pl.json            | 16 ++---
 www/addons/mod/assign/lang/pt-br.json         | 20 +++---
 www/addons/mod/assign/lang/pt.json            | 16 ++---
 www/addons/mod/assign/lang/ro.json            |  8 +--
 www/addons/mod/assign/lang/ru.json            | 18 ++---
 www/addons/mod/assign/lang/sv.json            | 18 ++---
 www/addons/mod/assign/lang/tr.json            | 14 ++--
 www/addons/mod/assign/lang/uk.json            | 18 ++---
 www/addons/mod/assign/lang/zh-cn.json         | 14 ++--
 www/addons/mod/assign/lang/zh-tw.json         | 20 +++---
 www/addons/mod/chat/lang/ar.json              |  4 +-
 www/addons/mod/chat/lang/bg.json              |  2 +-
 www/addons/mod/chat/lang/ca.json              |  2 +-
 www/addons/mod/chat/lang/cs.json              |  2 +-
 www/addons/mod/chat/lang/da.json              |  2 +-
 www/addons/mod/chat/lang/el.json              |  2 +-
 www/addons/mod/chat/lang/es-mx.json           |  2 +-
 www/addons/mod/chat/lang/es.json              |  2 +-
 www/addons/mod/chat/lang/eu.json              |  2 +-
 www/addons/mod/chat/lang/fa.json              |  2 +-
 www/addons/mod/chat/lang/fr.json              |  2 +-
 www/addons/mod/chat/lang/he.json              |  4 +-
 www/addons/mod/chat/lang/hu.json              |  4 +-
 www/addons/mod/chat/lang/it.json              |  2 +-
 www/addons/mod/chat/lang/ja.json              |  2 +-
 www/addons/mod/chat/lang/lt.json              |  2 +-
 www/addons/mod/chat/lang/nl.json              |  4 +-
 www/addons/mod/chat/lang/pl.json              |  2 +-
 www/addons/mod/chat/lang/pt-br.json           |  2 +-
 www/addons/mod/chat/lang/pt.json              |  2 +-
 www/addons/mod/chat/lang/ro.json              |  4 +-
 www/addons/mod/chat/lang/ru.json              |  2 +-
 www/addons/mod/chat/lang/sv.json              |  2 +-
 www/addons/mod/chat/lang/tr.json              |  2 +-
 www/addons/mod/chat/lang/uk.json              |  4 +-
 www/addons/mod/chat/lang/zh-cn.json           |  2 +-
 www/addons/mod/chat/lang/zh-tw.json           |  4 +-
 www/addons/mod/choice/lang/ar.json            |  4 +-
 www/addons/mod/choice/lang/bg.json            |  6 +-
 www/addons/mod/choice/lang/ca.json            |  4 +-
 www/addons/mod/choice/lang/cs.json            |  6 +-
 www/addons/mod/choice/lang/da.json            |  8 +--
 www/addons/mod/choice/lang/de.json            |  8 +--
 www/addons/mod/choice/lang/el.json            |  6 +-
 www/addons/mod/choice/lang/es-mx.json         |  8 +--
 www/addons/mod/choice/lang/es.json            |  8 +--
 www/addons/mod/choice/lang/eu.json            |  8 +--
 www/addons/mod/choice/lang/fa.json            |  8 +--
 www/addons/mod/choice/lang/fr.json            |  6 +-
 www/addons/mod/choice/lang/he.json            |  8 +--
 www/addons/mod/choice/lang/hu.json            |  8 +--
 www/addons/mod/choice/lang/it.json            |  6 +-
 www/addons/mod/choice/lang/ja.json            |  4 +-
 www/addons/mod/choice/lang/lt.json            |  4 +-
 www/addons/mod/choice/lang/nl.json            |  8 +--
 www/addons/mod/choice/lang/pl.json            |  8 +--
 www/addons/mod/choice/lang/pt-br.json         |  6 +-
 www/addons/mod/choice/lang/pt.json            |  6 +-
 www/addons/mod/choice/lang/ro.json            |  6 +-
 www/addons/mod/choice/lang/ru.json            |  8 +--
 www/addons/mod/choice/lang/sv.json            |  8 +--
 www/addons/mod/choice/lang/tr.json            |  8 +--
 www/addons/mod/choice/lang/uk.json            |  6 +-
 www/addons/mod/choice/lang/zh-cn.json         |  8 +--
 www/addons/mod/choice/lang/zh-tw.json         |  8 +--
 www/addons/mod/feedback/lang/ar.json          |  8 +--
 www/addons/mod/feedback/lang/bg.json          |  4 +-
 www/addons/mod/feedback/lang/ca.json          |  8 +--
 www/addons/mod/feedback/lang/cs.json          |  6 +-
 www/addons/mod/feedback/lang/da.json          |  6 +-
 www/addons/mod/feedback/lang/de.json          |  6 +-
 www/addons/mod/feedback/lang/el.json          |  4 +-
 www/addons/mod/feedback/lang/es-mx.json       | 10 +--
 www/addons/mod/feedback/lang/es.json          | 10 +--
 www/addons/mod/feedback/lang/eu.json          |  8 +--
 www/addons/mod/feedback/lang/fa.json          |  8 +--
 www/addons/mod/feedback/lang/fr.json          |  2 +-
 www/addons/mod/feedback/lang/he.json          |  4 +-
 www/addons/mod/feedback/lang/hu.json          |  4 +-
 www/addons/mod/feedback/lang/it.json          |  8 +--
 www/addons/mod/feedback/lang/ja.json          |  8 +--
 www/addons/mod/feedback/lang/lt.json          |  4 +-
 www/addons/mod/feedback/lang/nl.json          |  4 +-
 www/addons/mod/feedback/lang/pl.json          |  4 +-
 www/addons/mod/feedback/lang/pt-br.json       |  6 +-
 www/addons/mod/feedback/lang/pt.json          |  8 +--
 www/addons/mod/feedback/lang/ro.json          |  6 +-
 www/addons/mod/feedback/lang/ru.json          | 14 ++--
 www/addons/mod/feedback/lang/sv.json          |  8 +--
 www/addons/mod/feedback/lang/tr.json          |  4 +-
 www/addons/mod/feedback/lang/uk.json          |  8 +--
 www/addons/mod/feedback/lang/zh-cn.json       | 10 +--
 www/addons/mod/feedback/lang/zh-tw.json       |  8 +--
 www/addons/mod/forum/lang/ar.json             |  2 +-
 www/addons/mod/forum/lang/bg.json             |  4 +-
 www/addons/mod/forum/lang/da.json             |  4 +-
 www/addons/mod/forum/lang/de.json             |  2 +-
 www/addons/mod/forum/lang/es.json             |  2 +-
 www/addons/mod/forum/lang/fa.json             |  2 +-
 www/addons/mod/forum/lang/fr.json             |  2 +-
 www/addons/mod/forum/lang/he.json             |  2 +-
 www/addons/mod/forum/lang/lt.json             |  4 +-
 www/addons/mod/forum/lang/nl.json             |  2 +-
 www/addons/mod/forum/lang/pl.json             |  4 +-
 www/addons/mod/forum/lang/pt-br.json          |  2 +-
 www/addons/mod/forum/lang/pt.json             |  2 +-
 www/addons/mod/forum/lang/ro.json             |  4 +-
 www/addons/mod/forum/lang/ru.json             |  2 +-
 www/addons/mod/forum/lang/sv.json             |  2 +-
 www/addons/mod/forum/lang/tr.json             |  2 +-
 www/addons/mod/forum/lang/zh-cn.json          |  4 +-
 www/addons/mod/forum/lang/zh-tw.json          |  4 +-
 www/addons/mod/glossary/lang/ar.json          |  6 +-
 www/addons/mod/glossary/lang/bg.json          |  6 +-
 www/addons/mod/glossary/lang/ca.json          |  6 +-
 www/addons/mod/glossary/lang/cs.json          |  6 +-
 www/addons/mod/glossary/lang/da.json          |  6 +-
 www/addons/mod/glossary/lang/de.json          |  6 +-
 www/addons/mod/glossary/lang/el.json          |  6 +-
 www/addons/mod/glossary/lang/es-mx.json       |  4 +-
 www/addons/mod/glossary/lang/es.json          |  4 +-
 www/addons/mod/glossary/lang/eu.json          |  6 +-
 www/addons/mod/glossary/lang/fa.json          |  6 +-
 www/addons/mod/glossary/lang/fr.json          |  6 +-
 www/addons/mod/glossary/lang/he.json          |  6 +-
 www/addons/mod/glossary/lang/hu.json          |  6 +-
 www/addons/mod/glossary/lang/it.json          |  6 +-
 www/addons/mod/glossary/lang/ja.json          |  6 +-
 www/addons/mod/glossary/lang/lt.json          |  6 +-
 www/addons/mod/glossary/lang/nl.json          |  6 +-
 www/addons/mod/glossary/lang/pl.json          |  6 +-
 www/addons/mod/glossary/lang/pt-br.json       |  6 +-
 www/addons/mod/glossary/lang/pt.json          |  6 +-
 www/addons/mod/glossary/lang/ro.json          |  6 +-
 www/addons/mod/glossary/lang/ru.json          |  6 +-
 www/addons/mod/glossary/lang/sv.json          |  6 +-
 www/addons/mod/glossary/lang/tr.json          |  6 +-
 www/addons/mod/glossary/lang/uk.json          |  6 +-
 www/addons/mod/glossary/lang/zh-cn.json       |  6 +-
 www/addons/mod/glossary/lang/zh-tw.json       |  6 +-
 www/addons/mod/lesson/lang/ar.json            |  8 +--
 www/addons/mod/lesson/lang/bg.json            |  6 +-
 www/addons/mod/lesson/lang/ca.json            |  8 +--
 www/addons/mod/lesson/lang/cs.json            |  6 +-
 www/addons/mod/lesson/lang/da.json            |  8 +--
 www/addons/mod/lesson/lang/de.json            | 12 ++--
 www/addons/mod/lesson/lang/el.json            |  6 +-
 www/addons/mod/lesson/lang/es-mx.json         |  4 +-
 www/addons/mod/lesson/lang/es.json            |  4 +-
 www/addons/mod/lesson/lang/eu.json            |  6 +-
 www/addons/mod/lesson/lang/fa.json            |  8 +--
 www/addons/mod/lesson/lang/fr.json            |  6 +-
 www/addons/mod/lesson/lang/he.json            |  8 +--
 www/addons/mod/lesson/lang/it.json            |  8 +--
 www/addons/mod/lesson/lang/ja.json            |  8 +--
 www/addons/mod/lesson/lang/lt.json            |  4 +-
 www/addons/mod/lesson/lang/nl.json            | 12 ++--
 www/addons/mod/lesson/lang/pl.json            |  8 +--
 www/addons/mod/lesson/lang/pt-br.json         | 12 ++--
 www/addons/mod/lesson/lang/pt.json            | 10 +--
 www/addons/mod/lesson/lang/ro.json            |  4 +-
 www/addons/mod/lesson/lang/ru.json            |  8 +--
 www/addons/mod/lesson/lang/sv.json            | 10 +--
 www/addons/mod/lesson/lang/tr.json            |  8 +--
 www/addons/mod/lesson/lang/uk.json            |  8 +--
 www/addons/mod/lesson/lang/zh-cn.json         | 10 +--
 www/addons/mod/lesson/lang/zh-tw.json         |  8 +--
 www/addons/mod/quiz/lang/ar.json              |  8 +--
 www/addons/mod/quiz/lang/bg.json              |  4 +-
 www/addons/mod/quiz/lang/ca.json              |  6 +-
 www/addons/mod/quiz/lang/cs.json              |  6 +-
 www/addons/mod/quiz/lang/da.json              |  6 +-
 www/addons/mod/quiz/lang/de.json              |  4 +-
 www/addons/mod/quiz/lang/el.json              |  4 +-
 www/addons/mod/quiz/lang/es-mx.json           |  6 +-
 www/addons/mod/quiz/lang/es.json              |  6 +-
 www/addons/mod/quiz/lang/eu.json              |  8 +--
 www/addons/mod/quiz/lang/fa.json              |  6 +-
 www/addons/mod/quiz/lang/fr.json              |  6 +-
 www/addons/mod/quiz/lang/he.json              |  8 +--
 www/addons/mod/quiz/lang/hu.json              |  6 +-
 www/addons/mod/quiz/lang/it.json              |  4 +-
 www/addons/mod/quiz/lang/ja.json              |  8 +--
 www/addons/mod/quiz/lang/lt.json              |  6 +-
 www/addons/mod/quiz/lang/nl.json              | 10 +--
 www/addons/mod/quiz/lang/pl.json              |  4 +-
 www/addons/mod/quiz/lang/pt-br.json           | 10 +--
 www/addons/mod/quiz/lang/pt.json              |  4 +-
 www/addons/mod/quiz/lang/ro.json              |  8 +--
 www/addons/mod/quiz/lang/ru.json              |  4 +-
 www/addons/mod/quiz/lang/sv.json              |  8 +--
 www/addons/mod/quiz/lang/tr.json              |  8 +--
 www/addons/mod/quiz/lang/uk.json              |  8 +--
 www/addons/mod/quiz/lang/zh-cn.json           |  8 +--
 www/addons/mod/quiz/lang/zh-tw.json           |  8 +--
 www/addons/mod/scorm/lang/ar.json             | 10 +--
 www/addons/mod/scorm/lang/ca.json             |  4 +-
 www/addons/mod/scorm/lang/cs.json             |  8 +--
 www/addons/mod/scorm/lang/da.json             | 10 +--
 www/addons/mod/scorm/lang/de.json             |  8 +--
 www/addons/mod/scorm/lang/el.json             |  4 +-
 www/addons/mod/scorm/lang/es-mx.json          |  4 +-
 www/addons/mod/scorm/lang/es.json             |  4 +-
 www/addons/mod/scorm/lang/eu.json             |  4 +-
 www/addons/mod/scorm/lang/fa.json             | 10 +--
 www/addons/mod/scorm/lang/fr.json             |  4 +-
 www/addons/mod/scorm/lang/he.json             | 10 +--
 www/addons/mod/scorm/lang/hu.json             |  2 +-
 www/addons/mod/scorm/lang/it.json             |  8 +--
 www/addons/mod/scorm/lang/ja.json             |  4 +-
 www/addons/mod/scorm/lang/lt.json             |  4 +-
 www/addons/mod/scorm/lang/nl.json             |  4 +-
 www/addons/mod/scorm/lang/pl.json             |  4 +-
 www/addons/mod/scorm/lang/pt-br.json          |  6 +-
 www/addons/mod/scorm/lang/pt.json             |  4 +-
 www/addons/mod/scorm/lang/ro.json             | 10 +--
 www/addons/mod/scorm/lang/ru.json             |  4 +-
 www/addons/mod/scorm/lang/sv.json             |  8 +--
 www/addons/mod/scorm/lang/tr.json             |  8 +--
 www/addons/mod/scorm/lang/uk.json             |  4 +-
 www/addons/mod/scorm/lang/zh-cn.json          |  6 +-
 www/addons/mod/scorm/lang/zh-tw.json          | 10 +--
 www/addons/mod/survey/lang/de.json            |  2 +-
 www/addons/mod/survey/lang/es-mx.json         |  2 +-
 www/addons/mod/survey/lang/es.json            |  2 +-
 www/addons/mod/survey/lang/eu.json            |  2 +-
 www/addons/mod/survey/lang/fa.json            |  2 +-
 www/addons/mod/survey/lang/fr.json            |  2 +-
 www/addons/mod/survey/lang/hu.json            |  2 +-
 www/addons/mod/survey/lang/it.json            |  2 +-
 www/addons/mod/survey/lang/ja.json            |  4 +-
 www/addons/mod/survey/lang/nl.json            |  2 +-
 www/addons/mod/survey/lang/pl.json            |  4 +-
 www/addons/mod/survey/lang/ru.json            |  2 +-
 www/addons/mod/survey/lang/sv.json            |  2 +-
 www/addons/mod/survey/lang/tr.json            |  4 +-
 www/addons/mod/survey/lang/zh-cn.json         |  4 +-
 www/addons/mod/survey/lang/zh-tw.json         |  4 +-
 www/addons/mod/wiki/lang/ar.json              |  2 +-
 www/addons/mod/wiki/lang/bg.json              |  4 +-
 www/addons/mod/wiki/lang/ca.json              |  2 +-
 www/addons/mod/wiki/lang/cs.json              |  2 +-
 www/addons/mod/wiki/lang/da.json              |  2 +-
 www/addons/mod/wiki/lang/de.json              |  2 +-
 www/addons/mod/wiki/lang/el.json              |  4 +-
 www/addons/mod/wiki/lang/es-mx.json           |  2 +-
 www/addons/mod/wiki/lang/es.json              |  2 +-
 www/addons/mod/wiki/lang/eu.json              |  2 +-
 www/addons/mod/wiki/lang/fa.json              |  2 +-
 www/addons/mod/wiki/lang/fr.json              |  2 +-
 www/addons/mod/wiki/lang/he.json              |  2 +-
 www/addons/mod/wiki/lang/hu.json              |  2 +-
 www/addons/mod/wiki/lang/it.json              |  2 +-
 www/addons/mod/wiki/lang/ja.json              |  2 +-
 www/addons/mod/wiki/lang/lt.json              |  2 +-
 www/addons/mod/wiki/lang/nl.json              |  2 +-
 www/addons/mod/wiki/lang/pl.json              |  2 +-
 www/addons/mod/wiki/lang/pt-br.json           |  2 +-
 www/addons/mod/wiki/lang/pt.json              |  2 +-
 www/addons/mod/wiki/lang/ro.json              |  4 +-
 www/addons/mod/wiki/lang/ru.json              |  2 +-
 www/addons/mod/wiki/lang/sv.json              |  2 +-
 www/addons/mod/wiki/lang/tr.json              |  2 +-
 www/addons/mod/wiki/lang/uk.json              |  2 +-
 www/addons/mod/wiki/lang/zh-cn.json           |  2 +-
 www/addons/mod/wiki/lang/zh-tw.json           |  2 +-
 www/addons/notifications/lang/cs.json         |  2 +-
 www/addons/notifications/lang/da.json         |  2 +-
 www/addons/notifications/lang/de.json         |  2 +-
 www/addons/notifications/lang/es-mx.json      |  2 +-
 www/addons/notifications/lang/es.json         |  2 +-
 www/addons/notifications/lang/fa.json         |  2 +-
 www/addons/notifications/lang/he.json         |  2 +-
 www/addons/notifications/lang/pt-br.json      |  2 +-
 www/addons/notifications/lang/sv.json         |  2 +-
 www/addons/notifications/lang/zh-cn.json      |  2 +-
 www/addons/participants/lang/ar.json          |  2 +-
 www/addons/participants/lang/ca.json          |  2 +-
 www/addons/participants/lang/cs.json          |  4 +-
 www/addons/participants/lang/da.json          |  2 +-
 www/addons/participants/lang/de.json          |  2 +-
 www/addons/participants/lang/es-mx.json       |  2 +-
 www/addons/participants/lang/eu.json          |  2 +-
 www/addons/participants/lang/fa.json          |  2 +-
 www/addons/participants/lang/fr.json          |  2 +-
 www/addons/participants/lang/he.json          |  2 +-
 www/addons/participants/lang/hu.json          |  2 +-
 www/addons/participants/lang/it.json          |  4 +-
 www/addons/participants/lang/ja.json          |  2 +-
 www/addons/participants/lang/nl.json          |  2 +-
 www/addons/participants/lang/pl.json          |  2 +-
 www/addons/participants/lang/pt-br.json       |  2 +-
 www/addons/participants/lang/pt.json          |  4 +-
 www/addons/participants/lang/ru.json          |  2 +-
 www/addons/participants/lang/sv.json          |  2 +-
 www/addons/participants/lang/tr.json          |  2 +-
 www/addons/participants/lang/uk.json          |  2 +-
 www/addons/participants/lang/zh-cn.json       |  2 +-
 www/addons/participants/lang/zh-tw.json       |  4 +-
 www/core/components/course/lang/ar.json       |  2 +-
 www/core/components/course/lang/bg.json       |  2 +-
 www/core/components/course/lang/ca.json       |  2 +-
 www/core/components/course/lang/cs.json       |  2 +-
 www/core/components/course/lang/da.json       |  2 +-
 www/core/components/course/lang/de.json       |  2 +-
 www/core/components/course/lang/el.json       |  2 +-
 www/core/components/course/lang/es-mx.json    |  2 +-
 www/core/components/course/lang/es.json       |  2 +-
 www/core/components/course/lang/eu.json       |  2 +-
 www/core/components/course/lang/fa.json       |  2 +-
 www/core/components/course/lang/fr.json       |  2 +-
 www/core/components/course/lang/he.json       |  2 +-
 www/core/components/course/lang/hu.json       |  2 +-
 www/core/components/course/lang/it.json       |  2 +-
 www/core/components/course/lang/ja.json       |  2 +-
 www/core/components/course/lang/lt.json       |  2 +-
 www/core/components/course/lang/nl.json       |  2 +-
 www/core/components/course/lang/pl.json       |  2 +-
 www/core/components/course/lang/pt-br.json    |  2 +-
 www/core/components/course/lang/pt.json       |  2 +-
 www/core/components/course/lang/ro.json       |  2 +-
 www/core/components/course/lang/ru.json       |  2 +-
 www/core/components/course/lang/sv.json       |  2 +-
 www/core/components/course/lang/tr.json       |  2 +-
 www/core/components/course/lang/uk.json       |  2 +-
 www/core/components/course/lang/zh-cn.json    |  2 +-
 www/core/components/course/lang/zh-tw.json    |  2 +-
 www/core/components/courses/lang/ar.json      | 10 +--
 www/core/components/courses/lang/bg.json      |  8 +--
 www/core/components/courses/lang/ca.json      | 10 +--
 www/core/components/courses/lang/cs.json      | 10 +--
 www/core/components/courses/lang/da.json      | 12 ++--
 www/core/components/courses/lang/de.json      | 10 +--
 www/core/components/courses/lang/el.json      |  8 +--
 www/core/components/courses/lang/es-mx.json   |  8 +--
 www/core/components/courses/lang/es.json      |  8 +--
 www/core/components/courses/lang/eu.json      | 12 ++--
 www/core/components/courses/lang/fa.json      | 12 ++--
 www/core/components/courses/lang/fr.json      | 12 ++--
 www/core/components/courses/lang/he.json      | 10 +--
 www/core/components/courses/lang/hu.json      | 12 ++--
 www/core/components/courses/lang/it.json      | 10 +--
 www/core/components/courses/lang/ja.json      | 10 +--
 www/core/components/courses/lang/lt.json      | 10 +--
 www/core/components/courses/lang/nl.json      | 10 +--
 www/core/components/courses/lang/pl.json      | 12 ++--
 www/core/components/courses/lang/pt-br.json   | 10 +--
 www/core/components/courses/lang/pt.json      | 10 +--
 www/core/components/courses/lang/ro.json      | 10 +--
 www/core/components/courses/lang/ru.json      | 12 ++--
 www/core/components/courses/lang/sv.json      | 10 +--
 www/core/components/courses/lang/tr.json      | 12 ++--
 www/core/components/courses/lang/uk.json      | 10 +--
 www/core/components/courses/lang/zh-cn.json   |  8 +--
 www/core/components/courses/lang/zh-tw.json   | 10 +--
 www/core/components/fileuploader/lang/ar.json |  2 +-
 www/core/components/fileuploader/lang/bg.json |  2 +-
 www/core/components/fileuploader/lang/ca.json |  2 +-
 www/core/components/fileuploader/lang/cs.json |  2 +-
 www/core/components/fileuploader/lang/da.json |  2 +-
 www/core/components/fileuploader/lang/de.json |  2 +-
 www/core/components/fileuploader/lang/el.json |  2 +-
 .../components/fileuploader/lang/es-mx.json   |  2 +-
 www/core/components/fileuploader/lang/es.json |  2 +-
 www/core/components/fileuploader/lang/eu.json |  2 +-
 www/core/components/fileuploader/lang/fa.json |  2 +-
 www/core/components/fileuploader/lang/fr.json |  2 +-
 www/core/components/fileuploader/lang/he.json |  2 +-
 www/core/components/fileuploader/lang/hu.json |  2 +-
 www/core/components/fileuploader/lang/it.json |  2 +-
 www/core/components/fileuploader/lang/ja.json |  2 +-
 www/core/components/fileuploader/lang/lt.json |  2 +-
 www/core/components/fileuploader/lang/nl.json |  2 +-
 www/core/components/fileuploader/lang/pl.json |  2 +-
 .../components/fileuploader/lang/pt-br.json   |  2 +-
 www/core/components/fileuploader/lang/pt.json |  2 +-
 www/core/components/fileuploader/lang/ro.json |  2 +-
 www/core/components/fileuploader/lang/ru.json |  2 +-
 www/core/components/fileuploader/lang/sv.json |  2 +-
 www/core/components/fileuploader/lang/tr.json |  2 +-
 www/core/components/fileuploader/lang/uk.json |  2 +-
 .../components/fileuploader/lang/zh-cn.json   |  2 +-
 .../components/fileuploader/lang/zh-tw.json   |  2 +-
 www/core/components/grades/lang/ar.json       |  2 +-
 www/core/components/grades/lang/bg.json       |  2 +-
 www/core/components/grades/lang/ca.json       |  4 +-
 www/core/components/grades/lang/cs.json       |  4 +-
 www/core/components/grades/lang/da.json       |  4 +-
 www/core/components/grades/lang/de.json       |  6 +-
 www/core/components/grades/lang/el.json       |  2 +-
 www/core/components/grades/lang/es-mx.json    |  2 +-
 www/core/components/grades/lang/es.json       |  2 +-
 www/core/components/grades/lang/eu.json       |  4 +-
 www/core/components/grades/lang/he.json       |  8 +--
 www/core/components/grades/lang/it.json       |  4 +-
 www/core/components/grades/lang/ja.json       |  2 +-
 www/core/components/grades/lang/lt.json       |  2 +-
 www/core/components/grades/lang/nl.json       |  4 +-
 www/core/components/grades/lang/pl.json       |  4 +-
 www/core/components/grades/lang/pt-br.json    |  4 +-
 www/core/components/grades/lang/pt.json       |  8 +--
 www/core/components/grades/lang/ro.json       |  4 +-
 www/core/components/grades/lang/ru.json       |  4 +-
 www/core/components/grades/lang/sv.json       |  8 +--
 www/core/components/grades/lang/tr.json       |  8 +--
 www/core/components/grades/lang/uk.json       |  8 +--
 www/core/components/grades/lang/zh-cn.json    |  4 +-
 www/core/components/grades/lang/zh-tw.json    |  4 +-
 www/core/components/login/lang/ar.json        |  6 +-
 www/core/components/login/lang/bg.json        |  4 +-
 www/core/components/login/lang/ca.json        |  4 +-
 www/core/components/login/lang/cs.json        | 10 +--
 www/core/components/login/lang/da.json        |  6 +-
 www/core/components/login/lang/de.json        |  6 +-
 www/core/components/login/lang/el.json        |  6 +-
 www/core/components/login/lang/es-mx.json     |  6 +-
 www/core/components/login/lang/es.json        |  6 +-
 www/core/components/login/lang/eu.json        |  6 +-
 www/core/components/login/lang/fa.json        |  4 +-
 www/core/components/login/lang/fr.json        |  6 +-
 www/core/components/login/lang/he.json        |  6 +-
 www/core/components/login/lang/hu.json        |  8 +--
 www/core/components/login/lang/it.json        |  4 +-
 www/core/components/login/lang/ja.json        |  6 +-
 www/core/components/login/lang/lt.json        |  6 +-
 www/core/components/login/lang/nl.json        |  6 +-
 www/core/components/login/lang/pl.json        |  4 +-
 www/core/components/login/lang/pt-br.json     |  6 +-
 www/core/components/login/lang/pt.json        |  8 +--
 www/core/components/login/lang/ro.json        |  6 +-
 www/core/components/login/lang/ru.json        |  8 +--
 www/core/components/login/lang/sv.json        |  6 +-
 www/core/components/login/lang/tr.json        |  6 +-
 www/core/components/login/lang/uk.json        |  6 +-
 www/core/components/login/lang/zh-cn.json     |  6 +-
 www/core/components/login/lang/zh-tw.json     | 10 +--
 www/core/components/question/lang/ar.json     | 14 ++--
 www/core/components/question/lang/bg.json     | 12 ++--
 www/core/components/question/lang/ca.json     | 10 +--
 www/core/components/question/lang/cs.json     | 12 ++--
 www/core/components/question/lang/da.json     | 10 +--
 www/core/components/question/lang/de.json     |  8 +--
 www/core/components/question/lang/el.json     |  4 +-
 www/core/components/question/lang/es-mx.json  | 12 ++--
 www/core/components/question/lang/es.json     | 12 ++--
 www/core/components/question/lang/eu.json     |  8 +--
 www/core/components/question/lang/fa.json     |  8 +--
 www/core/components/question/lang/fr.json     |  4 +-
 www/core/components/question/lang/he.json     | 12 ++--
 www/core/components/question/lang/hu.json     |  6 +-
 www/core/components/question/lang/it.json     | 12 ++--
 www/core/components/question/lang/ja.json     |  8 +--
 www/core/components/question/lang/lt.json     | 14 ++--
 www/core/components/question/lang/nl.json     |  6 +-
 www/core/components/question/lang/pl.json     | 10 +--
 www/core/components/question/lang/pt-br.json  | 12 ++--
 www/core/components/question/lang/pt.json     |  6 +-
 www/core/components/question/lang/ro.json     | 10 +--
 www/core/components/question/lang/ru.json     |  6 +-
 www/core/components/question/lang/sv.json     |  6 +-
 www/core/components/question/lang/tr.json     | 10 +--
 www/core/components/question/lang/uk.json     |  4 +-
 www/core/components/question/lang/zh-cn.json  | 10 +--
 www/core/components/question/lang/zh-tw.json  | 14 ++--
 www/core/components/settings/lang/ar.json     |  8 +--
 www/core/components/settings/lang/bg.json     |  6 +-
 www/core/components/settings/lang/ca.json     |  6 +-
 www/core/components/settings/lang/cs.json     |  6 +-
 www/core/components/settings/lang/da.json     |  8 +--
 www/core/components/settings/lang/de.json     |  6 +-
 www/core/components/settings/lang/el.json     |  6 +-
 www/core/components/settings/lang/es-mx.json  |  6 +-
 www/core/components/settings/lang/es.json     |  6 +-
 www/core/components/settings/lang/eu.json     |  6 +-
 www/core/components/settings/lang/fa.json     |  6 +-
 www/core/components/settings/lang/fr.json     |  6 +-
 www/core/components/settings/lang/he.json     | 10 +--
 www/core/components/settings/lang/hu.json     |  8 +--
 www/core/components/settings/lang/it.json     |  6 +-
 www/core/components/settings/lang/ja.json     |  6 +-
 www/core/components/settings/lang/lt.json     |  6 +-
 www/core/components/settings/lang/nl.json     |  6 +-
 www/core/components/settings/lang/pl.json     |  8 +--
 www/core/components/settings/lang/pt-br.json  |  6 +-
 www/core/components/settings/lang/pt.json     |  6 +-
 www/core/components/settings/lang/ro.json     |  8 +--
 www/core/components/settings/lang/ru.json     | 10 +--
 www/core/components/settings/lang/sv.json     |  8 +--
 www/core/components/settings/lang/tr.json     |  6 +-
 www/core/components/settings/lang/uk.json     |  8 +--
 www/core/components/settings/lang/zh-cn.json  | 10 +--
 www/core/components/settings/lang/zh-tw.json  | 10 +--
 www/core/components/sharedfiles/lang/ar.json  |  2 +-
 www/core/components/sharedfiles/lang/it.json  |  2 +-
 www/core/components/sharedfiles/lang/sv.json  |  2 +-
 www/core/components/sharedfiles/lang/tr.json  |  2 +-
 www/core/components/sidemenu/lang/ca.json     |  2 +-
 www/core/components/sidemenu/lang/cs.json     |  2 +-
 www/core/components/sidemenu/lang/de.json     |  2 +-
 www/core/components/sidemenu/lang/eu.json     |  2 +-
 www/core/components/sidemenu/lang/he.json     |  2 +-
 www/core/components/sidemenu/lang/it.json     |  2 +-
 www/core/components/sidemenu/lang/lt.json     |  2 +-
 www/core/components/sidemenu/lang/nl.json     |  2 +-
 www/core/components/sidemenu/lang/pl.json     |  2 +-
 www/core/components/sidemenu/lang/ro.json     |  2 +-
 www/core/components/sidemenu/lang/ru.json     |  2 +-
 www/core/components/sidemenu/lang/tr.json     |  2 +-
 www/core/components/sidemenu/lang/zh-cn.json  |  2 +-
 www/core/components/sidemenu/lang/zh-tw.json  |  2 +-
 www/core/components/user/lang/ar.json         |  4 +-
 www/core/components/user/lang/bg.json         |  4 +-
 www/core/components/user/lang/ca.json         |  2 +-
 www/core/components/user/lang/cs.json         |  4 +-
 www/core/components/user/lang/da.json         |  4 +-
 www/core/components/user/lang/de.json         |  2 +-
 www/core/components/user/lang/el.json         |  4 +-
 www/core/components/user/lang/es-mx.json      |  4 +-
 www/core/components/user/lang/es.json         |  2 +-
 www/core/components/user/lang/eu.json         |  2 +-
 www/core/components/user/lang/fa.json         |  4 +-
 www/core/components/user/lang/fr.json         |  2 +-
 www/core/components/user/lang/he.json         |  4 +-
 www/core/components/user/lang/hu.json         |  4 +-
 www/core/components/user/lang/it.json         |  4 +-
 www/core/components/user/lang/ja.json         |  2 +-
 www/core/components/user/lang/lt.json         |  4 +-
 www/core/components/user/lang/nl.json         |  4 +-
 www/core/components/user/lang/pl.json         |  4 +-
 www/core/components/user/lang/pt-br.json      |  4 +-
 www/core/components/user/lang/pt.json         |  2 +-
 www/core/components/user/lang/ro.json         |  4 +-
 www/core/components/user/lang/ru.json         |  4 +-
 www/core/components/user/lang/sv.json         |  4 +-
 www/core/components/user/lang/tr.json         |  4 +-
 www/core/components/user/lang/uk.json         |  4 +-
 www/core/components/user/lang/zh-cn.json      |  4 +-
 www/core/components/user/lang/zh-tw.json      |  4 +-
 www/core/lang/ar.json                         | 44 ++++++-------
 www/core/lang/bg.json                         | 40 +++++------
 www/core/lang/ca.json                         | 48 +++++++-------
 www/core/lang/cs.json                         | 56 ++++++++--------
 www/core/lang/da.json                         | 46 ++++++-------
 www/core/lang/de.json                         | 50 +++++++-------
 www/core/lang/el.json                         | 46 ++++++-------
 www/core/lang/es-mx.json                      | 54 +++++++--------
 www/core/lang/es.json                         | 52 +++++++--------
 www/core/lang/eu.json                         | 42 ++++++------
 www/core/lang/fa.json                         | 32 ++++-----
 www/core/lang/fr.json                         | 42 ++++++------
 www/core/lang/he.json                         | 56 ++++++++--------
 www/core/lang/hu.json                         | 54 +++++++--------
 www/core/lang/it.json                         | 52 +++++++--------
 www/core/lang/ja.json                         | 28 ++++----
 www/core/lang/lt.json                         | 54 +++++++--------
 www/core/lang/nl.json                         | 54 +++++++--------
 www/core/lang/pl.json                         | 52 +++++++--------
 www/core/lang/pt-br.json                      | 54 +++++++--------
 www/core/lang/pt.json                         | 52 +++++++--------
 www/core/lang/ro.json                         | 66 +++++++++----------
 www/core/lang/ru.json                         | 48 +++++++-------
 www/core/lang/sv.json                         | 46 ++++++-------
 www/core/lang/tr.json                         | 52 +++++++--------
 www/core/lang/uk.json                         | 50 +++++++-------
 www/core/lang/zh-cn.json                      | 46 ++++++-------
 www/core/lang/zh-tw.json                      | 54 +++++++--------
 694 files changed, 2636 insertions(+), 2636 deletions(-)

diff --git a/www/addons/badges/lang/sv.json b/www/addons/badges/lang/sv.json
index 878282c5e4f..4c67f9031ef 100644
--- a/www/addons/badges/lang/sv.json
+++ b/www/addons/badges/lang/sv.json
@@ -1,6 +1,6 @@
 {
     "badgedetails": "Detaljer för märke",
-    "badges": "Märken",
+    "badges": "Badges",
     "contact": "Kontakt",
     "dateawarded": "Utfärdandedatum",
     "expirydate": "Förfallodatum",
diff --git a/www/addons/badges/lang/tr.json b/www/addons/badges/lang/tr.json
index 5c79f345058..b540e7cabae 100644
--- a/www/addons/badges/lang/tr.json
+++ b/www/addons/badges/lang/tr.json
@@ -1,6 +1,6 @@
 {
     "badgedetails": "Nişan ayrıntıları",
-    "badges": "Nişanlar",
+    "badges": "Rozetler",
     "contact": "İletişim",
     "dateawarded": "Verilen tarih",
     "expirydate": "Bitiş Tarihi",
diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index dc0b5327079..5dca11fb0e2 100644
--- a/www/addons/calendar/lang/cs.json
+++ b/www/addons/calendar/lang/cs.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Chyba při načítání události.",
     "errorloadevents": "Chyba při načítání událostí.",
     "noevents": "Žádné nadcházející činnosti",
-    "notifications": "Oznámení"
+    "notifications": "Informace"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/da.json b/www/addons/calendar/lang/da.json
index 3731c7e4ad3..70693816a85 100644
--- a/www/addons/calendar/lang/da.json
+++ b/www/addons/calendar/lang/da.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fejl ved indlæsning af begivenhed.",
     "errorloadevents": "Fejl ved indlæsning af begivenheder.",
     "noevents": "Der er ingen begivenheder",
-    "notifications": "Underretninger"
+    "notifications": "Beskeder"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/de.json b/www/addons/calendar/lang/de.json
index ba88248af7f..e38e81f16cd 100644
--- a/www/addons/calendar/lang/de.json
+++ b/www/addons/calendar/lang/de.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Fehler beim Laden des Kalendereintrags",
     "errorloadevents": "Fehler beim Laden der Kalendereinträge",
     "noevents": "Keine anstehenden Aktivitäten fällig",
-    "notifications": "Benachrichtigungen"
+    "notifications": "Systemmitteilungen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es-mx.json b/www/addons/calendar/lang/es-mx.json
index d54a5abc6ad..d4be495ef94 100644
--- a/www/addons/calendar/lang/es-mx.json
+++ b/www/addons/calendar/lang/es-mx.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Error al cargar evento.",
     "errorloadevents": "Error al cargar eventos.",
     "noevents": "No hay actividades próximas pendientes",
-    "notifications": "Notificaciones"
+    "notifications": "Avisos"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es.json b/www/addons/calendar/lang/es.json
index 7125c2b6049..9b7fc329f8e 100644
--- a/www/addons/calendar/lang/es.json
+++ b/www/addons/calendar/lang/es.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Error cargando el evento.",
     "errorloadevents": "Error cargando los eventos.",
     "noevents": "No hay actividades próximas pendientes",
-    "notifications": "Notificaciones"
+    "notifications": "Avisos"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 344affea7df..76813733c1d 100644
--- a/www/addons/calendar/lang/fa.json
+++ b/www/addons/calendar/lang/fa.json
@@ -4,5 +4,5 @@
     "errorloadevent": "خطا در بارگیری رویداد.",
     "errorloadevents": "خطا در بارگیری رویدادها.",
     "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
-    "notifications": "اطلاعیه‌ها"
+    "notifications": "تذکرات"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/he.json b/www/addons/calendar/lang/he.json
index dbd55cacb5f..3702664d6e1 100644
--- a/www/addons/calendar/lang/he.json
+++ b/www/addons/calendar/lang/he.json
@@ -3,5 +3,5 @@
     "errorloadevent": "שגיאה בטעינת האירוע.",
     "errorloadevents": "שגיאה בטעינת האירועים.",
     "noevents": "לא קיימות פעילויות עתידיות להן מועד הגשה",
-    "notifications": "הודעות"
+    "notifications": "עדכונים והודעות"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index 77451b11a5d..dab7f4360aa 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
     "noevents": "Sem eventos",
-    "notifications": "Notificações"
+    "notifications": "Avisos"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sv.json b/www/addons/calendar/lang/sv.json
index 7599b1d1f89..12cef7ef2eb 100644
--- a/www/addons/calendar/lang/sv.json
+++ b/www/addons/calendar/lang/sv.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fel vid inläsning av händelse.",
     "errorloadevents": "Fel vid inläsning av händelser",
     "noevents": "Det finns inga händelser",
-    "notifications": "Meddelande"
+    "notifications": "Administration"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/zh-cn.json b/www/addons/calendar/lang/zh-cn.json
index 5fc1088f46f..2d363916b74 100644
--- a/www/addons/calendar/lang/zh-cn.json
+++ b/www/addons/calendar/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noevents": "没有事件",
-    "notifications": "通知"
+    "notifications": "通告"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ar.json b/www/addons/competency/lang/ar.json
index 546b0528429..5952485e905 100644
--- a/www/addons/competency/lang/ar.json
+++ b/www/addons/competency/lang/ar.json
@@ -1,11 +1,11 @@
 {
-    "activities": "أنشطة",
-    "duedate": "موعد التسليم",
+    "activities": "الأنشطة",
+    "duedate": "تاريخ تقديم مهمة",
     "errornocompetenciesfound": "لا يوجد أي قدرات موجودة",
     "myplans": "خططي للتعلم",
     "nocompetencies": "لا يوجد أي قدرات",
     "path": "مسار",
     "progress": "تقدّم الطالب",
-    "status": "السماح بدخول ضيف",
+    "status": "الحالة",
     "template": "قالب"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/bg.json b/www/addons/competency/lang/bg.json
index 34c3faee740..3b3a332e5fb 100644
--- a/www/addons/competency/lang/bg.json
+++ b/www/addons/competency/lang/bg.json
@@ -6,6 +6,6 @@
     "myplans": "Моите учебни планове",
     "noplanswerecreated": "Не бяха създадени учебни планове.",
     "path": "Път",
-    "status": "Позволяване достъп като гост",
+    "status": "Състояние",
     "template": "Шаблон"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index 91a5c0fde71..f0dbfd1e860 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -3,7 +3,7 @@
     "competenciesmostoftennotproficientincourse": "Competències que més sovint no s'assoleixen en aquest curs",
     "coursecompetencies": "Competències del curs",
     "crossreferencedcompetencies": "Competències referenciades",
-    "duedate": "Data límit",
+    "duedate": "Data de venciment",
     "errornocompetenciesfound": "No s'han trobat competències",
     "evidence": "Evidència",
     "learningplancompetencies": "Competències del pla d'aprenentatge",
@@ -14,13 +14,13 @@
     "nocrossreferencedcompetencies": "No hi ha competències amb referències a aquesta.",
     "noevidence": "Cap evidència",
     "noplanswerecreated": "No s'ha creat cap pla d'aprenentatge.",
-    "path": "Ruta:",
+    "path": "Camí",
     "proficient": "Superada",
-    "progress": "Progrés",
-    "rating": "Qualificació",
+    "progress": "Progrés de l'estudiant",
+    "rating": "Valoració",
     "reviewstatus": "Estat de la revisió",
-    "status": "Permetre l'accés de visitants",
-    "template": "Plantilla de pla d'aprenentatge",
+    "status": "Estat",
+    "template": "Plantilla",
     "xcompetenciesproficientoutofy": "{{$a.x}} de {{$a.y}} competències superades",
     "xcompetenciesproficientoutofyincourse": "Heu superat {{$a.x}} de {{$a.y}} competències en aquest curs."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index 2e584cd9176..c9580755936 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Hodnocení kompetencí v tomto kurzu nemají vliv na studijní plány.",
     "coursecompetencyratingsarepushedtouserplans": "Hodnocení kompetencí v tomto kurzu jsou okamžitě aktualizovány v studijních plánech.",
     "crossreferencedcompetencies": "Průřezové kompetence",
-    "duedate": "Termín dokončení",
+    "duedate": "Termín odevzdání",
     "errornocompetenciesfound": "Nebyly nalezeny žádné kompetence",
     "evidence": "Evidence",
     "learningplancompetencies": "Kompetence studijního plánu",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "K této kompetenci nebyly spojeny další průřezové kompetence.",
     "noevidence": "Bez záznamu",
     "noplanswerecreated": "Nebyly vytvořeny žádné studijní plány.",
-    "path": "Cesta:",
+    "path": "Cesta",
     "proficient": "Splněno",
-    "progress": "Pokrok",
+    "progress": "Pokrok studenta",
     "rating": "Hodnocení",
     "reviewstatus": "Stav revize",
-    "status": "Povolit přístup pro hosty",
-    "template": "Šablona studijního plánu",
+    "status": "Stav",
+    "template": "Šablona",
     "xcompetenciesproficientoutofy": "máte splněno {{$a.x}} z {{$a.y}} kompetencí",
     "xcompetenciesproficientoutofyincourse": "V tomto kurzu máte splněno {{$a.x}} z {{$a.y}} kompetencí."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/da.json b/www/addons/competency/lang/da.json
index b469e30cc5e..57b4efe1f8c 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -4,7 +4,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetencebedømmelser på dette kursus påvirker ikke læringsplaner.",
     "coursecompetencyratingsarepushedtouserplans": "Kompetencebedømmelser på dette kursus opdateres straks i læringsplaner.",
     "crossreferencedcompetencies": "Kryds-refererede kompetencer",
-    "duedate": "Udløbsdato",
+    "duedate": "Afleveringsdato",
     "errornocompetenciesfound": "Ingen kompetencer fundet",
     "evidence": "Vidnesbyrd",
     "learningplancompetencies": "Læringsplankompetencer",
@@ -15,9 +15,9 @@
     "nocrossreferencedcompetencies": "Ingen andre kompetencer er krydsrefereret til denne kompetence.",
     "noevidence": "Ingen vidnesbyrd",
     "noplanswerecreated": "Der blev ikke oprettet nogen læringsplaner.",
-    "path": "Sti:",
-    "progress": "Progression",
+    "path": "Sti",
+    "progress": "Studerendes fremskridt",
     "rating": "Bedømmelse",
-    "status": "Tillad gæsteadgang",
-    "template": "Læringsplanskabelon"
+    "status": "Status",
+    "template": "Skabelon"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index 744b6c16535..1b3ec35457c 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -5,9 +5,9 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetenzbewertungen in diesem Kurs beeinflussen keine Lernpläne.",
     "coursecompetencyratingsarepushedtouserplans": "Kompetenzbewertungen in diesem Kurs werden sofort in den Lernplänen aktualisiert.",
     "crossreferencedcompetencies": "Querverwiesene Kompetenzen",
-    "duedate": "Abgabedatum",
+    "duedate": "Fälligkeitsdatum",
     "errornocompetenciesfound": "Keine Kompetenzen gefunden",
-    "evidence": "Beleg",
+    "evidence": "Evidenz",
     "learningplancompetencies": "Kompetenzen des Lernplans",
     "learningplans": "Lernpläne",
     "myplans": "Meine Lernpläne",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Keine anderen Kompetenzen wurden zu dieser Kompetenz referiert.",
     "noevidence": "Keine Belege",
     "noplanswerecreated": "Bisher sind keine Lernpläne angelegt.",
-    "path": "Pfad:",
+    "path": "Pfad",
     "proficient": "Erfahren",
-    "progress": "Fortschritt",
-    "rating": "Wertung",
+    "progress": "Bearbeitungsstand",
+    "rating": "Bewertung",
     "reviewstatus": "Überprüfungsstatus",
-    "status": "Gastzugang erlauben",
-    "template": "Lernplanvorlage",
+    "status": "Status",
+    "template": "Vorlage",
     "xcompetenciesproficientoutofy": "{{$a.x}} von {{$a.y}} Kompetenzen sind eingeübt",
     "xcompetenciesproficientoutofyincourse": "Du bist in {{$a.x}} von {{$a.y}} Kompetenzen geübt"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/el.json b/www/addons/competency/lang/el.json
index 940c9116122..3a61231a7af 100644
--- a/www/addons/competency/lang/el.json
+++ b/www/addons/competency/lang/el.json
@@ -1,10 +1,10 @@
 {
     "activities": "Δραστηριότητες",
-    "duedate": "Ημερομηνία εκπνοής",
+    "duedate": "Καταληκτική ημερομηνία",
     "errornocompetenciesfound": "Δεν βρέθηκαν ικανότητες",
     "nocompetencies": "Δεν βρέθηκαν ικανότητες",
     "path": "Διαδρομή",
     "progress": "Πρόοδος μαθητών",
-    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
+    "status": "Κατάσταση",
     "template": "Πρότυπο"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index b6b1c272d25..0b59da87bc5 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Las valoraciones de competencia en este curso no afectan a los planes de aprendizaje.",
     "coursecompetencyratingsarepushedtouserplans": "Las valoraciones de competencia en este curso son actualizadas inmediatamente dentro de planes de aprendizaje.",
     "crossreferencedcompetencies": "Competencias con referencias-cruzadas",
-    "duedate": "Fecha prometida/esperada",
+    "duedate": "Fecha de entrega",
     "errornocompetenciesfound": "No se encontraron competencias",
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "No se han referenciado cruzadamente otras competencias con esta competencia.",
     "noevidence": "Sin evidencia",
     "noplanswerecreated": "No se crearon planes de aprendizaje.",
-    "path": "Ruta:",
+    "path": "Ruta",
     "proficient": "Dominio/pericia",
-    "progress": "Progreso",
-    "rating": "Valoración",
+    "progress": "Progreso del estudiante",
+    "rating": "Valuación (rating)",
     "reviewstatus": "Revisar estatus",
-    "status": "Se permite el acceso de invitados",
-    "template": "Plantilla de plan de aprendizaje",
+    "status": "Estatus",
+    "template": "Plantilla",
     "xcompetenciesproficientoutofy": "{{$a.x}} de un total de {{$a.y}} competencias se tienen dominadas",
     "xcompetenciesproficientoutofyincourse": "Usted es capaz/perito/experto en {{$a.x}} de un total de {{$a.y}} competencias en este curso."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/es.json b/www/addons/competency/lang/es.json
index f2300d130e0..21b8ae5fe9f 100644
--- a/www/addons/competency/lang/es.json
+++ b/www/addons/competency/lang/es.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Las calificaciones de competencias de este curso no afectan los planes de aprendizaje.",
     "coursecompetencyratingsarepushedtouserplans": "Las calificaciones de competencias en este curso actualizan de inmediato los planes de aprendizaje.",
     "crossreferencedcompetencies": "Competencias referenciadas",
-    "duedate": "Fecha límite",
+    "duedate": "Fecha de entrega",
     "errornocompetenciesfound": "No se encontraron competencias",
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
@@ -17,10 +17,10 @@
     "noevidence": "Sin evidencias",
     "path": "Ruta",
     "proficient": "Superada",
-    "progress": "Avance",
-    "rating": "Calificación",
+    "progress": "Progreso del estudiante",
+    "rating": "Clasificación",
     "reviewstatus": "Estado de la revisión",
-    "status": "Se permite el acceso de invitados",
+    "status": "Estado",
     "template": "Plantilla",
     "xcompetenciesproficientoutofy": "{{$a.x}} de {{$a.y}} competencias superadas",
     "xcompetenciesproficientoutofyincourse": "Has superado {{$a.x}} de las {{$a.y}} competencias del curso."
diff --git a/www/addons/competency/lang/eu.json b/www/addons/competency/lang/eu.json
index 43617aa4e31..8382f8a4223 100644
--- a/www/addons/competency/lang/eu.json
+++ b/www/addons/competency/lang/eu.json
@@ -12,11 +12,11 @@
     "nocompetencies": "Ezin izan gaitasunik sortu marko honetan.",
     "noevidence": "Ez dago ebidentziarik",
     "noplanswerecreated": "Ez da ikasketa-planik sortu.",
-    "path": "Bidea:",
+    "path": "Bidea",
     "proficient": "Gai",
-    "progress": "Aurrerapena",
+    "progress": "Ikaslearen aurrerapena",
     "rating": "Puntuazioa",
     "reviewstatus": "Berrikusi egora",
-    "status": "Bisitarien sarbidea baimendu",
-    "template": "Ikasketa-planerako txantiloia"
+    "status": "Egoera",
+    "template": "Txantiloia"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/fa.json b/www/addons/competency/lang/fa.json
index d435e4ecaa6..7bec744c8a6 100644
--- a/www/addons/competency/lang/fa.json
+++ b/www/addons/competency/lang/fa.json
@@ -4,7 +4,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "امتیازهای شایستگی‌ها در این درس تاثیری در برنامه‌های یادگیری ندارند.",
     "coursecompetencyratingsarepushedtouserplans": "امتیازهای شایستگی‌ها در این درس بلافاصله در برنامه‌های یادگیری به‌روز می‌شوند.",
     "crossreferencedcompetencies": "شایستگی‌های دارای ارجاع متقابل",
-    "duedate": "مهلت",
+    "duedate": "مهلت تحویل",
     "errornocompetenciesfound": "هیچ شایستگی‌ای پیدا نشد",
     "evidence": "مدرک",
     "learningplancompetencies": "شایستگی‌های برنامه یادگیری",
@@ -13,13 +13,13 @@
     "nocrossreferencedcompetencies": "هیچ شایستگی دیگری به این شایستگی به‌طور متقابل ارجاع داده نشده است.",
     "noevidence": "بدون مدرک",
     "noplanswerecreated": "هیچ برنامهٔ یادگیری‌ای ساخته نشده است.",
-    "path": "مسیر:",
+    "path": "مسیر",
     "proficient": "کسب مهارت",
-    "progress": "پیشروی",
+    "progress": "پیشروی شاگردان",
     "rating": "امتیاز",
     "reviewstatus": "بازبینی وضعیت",
-    "status": "اجازهٔ ورود به عنوان مهمان",
-    "template": "الگوی برنامه یادگیری",
+    "status": "وضعیت",
+    "template": "الگو",
     "xcompetenciesproficientoutofy": "در {{$a.x}} شایستگی از مجموع {{$a.y}} شایستگی مهارت کسب شده است",
     "xcompetenciesproficientoutofyincourse": "شما در {{$a.x}} شایستگی از {{$a.y}} شایستگی ماهر هستید."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index f8af723914c..a38300a90d2 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Les évaluations de compétences de ce cours n'ont pas d'influence sur les plans de formation.",
     "coursecompetencyratingsarepushedtouserplans": "Les évaluations de compétences de ce cours sont immédiatement reportées dans les plans de formation.",
     "crossreferencedcompetencies": "Compétences transversales",
-    "duedate": "Délai d'achèvement",
+    "duedate": "Date de remise",
     "errornocompetenciesfound": "Aucune compétence trouvée",
     "evidence": "Preuve",
     "learningplancompetencies": "Compétences du plan de formation",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Aucune autre compétence n'est transversale pour cette compétence.",
     "noevidence": "Aucune preuve d'acquis",
     "noplanswerecreated": "Aucun plan de formation n'a été créé.",
-    "path": "Chemin :",
+    "path": "Chemin",
     "proficient": "Compétence acquise",
-    "progress": "Progrès",
+    "progress": "Suivi des activités des participants",
     "rating": "Évaluation",
     "reviewstatus": "Statut de validation",
-    "status": "Permettre l'accès anonyme",
-    "template": "Modèle de plan de formation",
+    "status": "Statut",
+    "template": "Modèle",
     "xcompetenciesproficientoutofy": "{{$a.x}} compétences sur {{$a.y}} sont acquises",
     "xcompetenciesproficientoutofyincourse": "Vous avez acquis {{$a.x}} compétences sur {{$a.y}} dans ce cours."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/he.json b/www/addons/competency/lang/he.json
index 95d0a41b64a..ffae1727aab 100644
--- a/www/addons/competency/lang/he.json
+++ b/www/addons/competency/lang/he.json
@@ -5,8 +5,8 @@
     "coursecompetencyratingsarenotpushedtouserplans": "השלמת מיומנויות בקורס זה לא מתעדכנות בתוכניות־הלימוד",
     "coursecompetencyratingsarepushedtouserplans": "מצב רכישת מיומנות כתוצאה מהשלמת פעילות בקורס, מתעדכן באופן מידי בתוכניות־הלימוד.",
     "crossreferencedcompetencies": "מקושר למיומנויות",
-    "duedate": "עד לתאריך",
-    "evidence": "ראיה לבקיאות",
+    "duedate": "תאריך סופי",
+    "evidence": "סימוכין",
     "learningplancompetencies": "מיומנויות תוכנית־הלימוד",
     "learningplans": "תוכניות־לימוד",
     "myplans": "תוכניות הלימודים שלי",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "אף מיומנות לא מקושרת למיומנות זו.",
     "noevidence": "טרם צורפה ראיה לבקיאות",
     "noplanswerecreated": "טרם נוצרו תוכניות־לימוד.",
-    "path": "נתיב",
+    "path": "נתיב:",
     "proficient": "בקיאות",
-    "progress": "התקדמות",
-    "rating": "דרוג",
+    "progress": "מעקב התקדמות למידה",
+    "rating": "דירוג",
     "reviewstatus": "סקירת מצב",
-    "status": "הקורס זמין לאורחים",
-    "template": "תבנית תוכנית־לימוד",
+    "status": "מצב",
+    "template": "תבנית",
     "xcompetenciesproficientoutofy": "בקיאות ב {{$a.x}} מיומנויות מתוך {{$a.y}}",
     "xcompetenciesproficientoutofyincourse": "רכשתם בקיאות ב {{$a.x}} מתוך {{$a.y}} המיומנויות בקורס זה."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/hu.json b/www/addons/competency/lang/hu.json
index cc80f882d34..101f0f9a6a0 100644
--- a/www/addons/competency/lang/hu.json
+++ b/www/addons/competency/lang/hu.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "A kurzus készségbesorolásai nem érintik a tanulási terveket.",
     "coursecompetencyratingsarepushedtouserplans": "A kurzus készségbesorolásai azonnal frissülnek a tanulási tervekben.",
     "crossreferencedcompetencies": "Kereszthivatkozott készségek",
-    "duedate": "Esedékesség",
+    "duedate": "Határidő",
     "evidence": "Bizonyíték",
     "learningplancompetencies": "Tanulási tervhez tartozó készségek",
     "learningplans": "Tanulási tervek",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "A készséghez kereszthivatkozással nem kapcsolódik más készség.",
     "noevidence": "Nincs bizonyíték",
     "noplanswerecreated": "Nem jött létre tanulási terv.",
-    "path": "Útvonal:",
+    "path": "Útvonal",
     "proficient": "Sikeres",
-    "progress": "Előmenetel",
-    "rating": "Besorolás",
+    "progress": "A tanuló előmenetele",
+    "rating": "Értékelés",
     "reviewstatus": "Ellenőrzés állapota",
-    "status": "Vendégkénti belépés engedélyezése",
-    "template": "Tanulási tervsablon",
+    "status": "Állapot",
+    "template": "Sablon",
     "xcompetenciesproficientoutofy": "{{$a.x}} / {{$a.y}} készség eredményes",
     "xcompetenciesproficientoutofyincourse": "Ön a kurzusban  {{$a.y}} közül {{$a.x}} készség tekintetében eredményesnek bizonyul."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index aedcc17cab4..4284b4b1ebe 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -5,9 +5,9 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Le valutazioni delle competenze nel corso non si riflettono nei piani di formazione.",
     "coursecompetencyratingsarepushedtouserplans": "Le valutazione delle competenze nel corso si riflettono immediatamente nei piani di formazione.",
     "crossreferencedcompetencies": "Competenze con riferimento incrociato",
-    "duedate": "Data di scadenza",
+    "duedate": "Termine consegne",
     "errornocompetenciesfound": "Non sono state trovate competenze",
-    "evidence": "Attestazione",
+    "evidence": "Verifica",
     "learningplancompetencies": "Competenze del piano di formazione",
     "learningplans": "Piani di formazione",
     "myplans": "I miei piani di formazione",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Non ci sono competenze con riferimenti incrociati a questa competenza",
     "noevidence": "Non sono presenti attestazioni.",
     "noplanswerecreated": "Non sono stati creati piani di formazione",
-    "path": "Percorso:",
+    "path": "Percorso",
     "proficient": "Esperto",
-    "progress": "Avanzamento",
+    "progress": "Situazione dello studente",
     "rating": "Valutazione",
     "reviewstatus": "Stato della revisione",
-    "status": "Consenti l'accesso agli ospiti",
-    "template": "Modello di piano di formazione",
+    "status": "Stato",
+    "template": "Modello",
     "xcompetenciesproficientoutofy": "{{$a.x}} competenze su {{$a.y}} sono a livello di esperto",
     "xcompetenciesproficientoutofyincourse": "Possiedi un livello di esperto in {{$a.x}} competenze su {{$a.y}} competenze di questo corso."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ja.json b/www/addons/competency/lang/ja.json
index 0ed9aba2752..5b45ea08016 100644
--- a/www/addons/competency/lang/ja.json
+++ b/www/addons/competency/lang/ja.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "このコース内でのコンピテンシー評定は学習プランに影響しません。",
     "coursecompetencyratingsarepushedtouserplans": "このコース内でのコンピテンシー評定は学習プラン内ですぐに更新されます。",
     "crossreferencedcompetencies": "クロスリファレンスコンピテンシー",
-    "duedate": "期限",
+    "duedate": "終了日時",
     "evidence": "エビデンス",
     "learningplancompetencies": "学習プランコンピテンシー",
     "learningplans": "学習プラン",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "このコンピテンシーに相互参照されている他のコンピテンシーはありません。",
     "noevidence": "エビデンスなし",
     "noplanswerecreated": "学習プランは作成されませんでした。",
-    "path": "パス:",
+    "path": "パス",
     "proficient": "熟達",
-    "progress": "進捗",
-    "rating": "評定",
+    "progress": "学生の進捗",
+    "rating": "評価",
     "reviewstatus": "レビューステータス",
-    "status": "ゲストアクセスを許可する",
-    "template": "学習プランテンプレート",
+    "status": "ステータス",
+    "template": "テンプレート",
     "xcompetenciesproficientoutofy": "{{$a.x}} / {{$a.y}} のコンピテンシーで熟達しています。",
     "xcompetenciesproficientoutofyincourse": "あなたはこのコースに関して {{$a.x}} / {{$a.y}} のコンピテンシーで熟達しています。"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/lt.json b/www/addons/competency/lang/lt.json
index 9135a29feee..6e177d8c323 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -1,8 +1,8 @@
 {
-    "activities": "Veiklos",
+    "activities": "Veikla",
     "coursecompetencies": "Kurso kompetencijos",
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetencijų reitingai šiame kurse neturi įtakos mokymosi planams.",
-    "duedate": "Terminas",
+    "duedate": "Data pristatymui",
     "errornocompetenciesfound": "Kompetencijų nerasta",
     "evidence": "Įrodymas",
     "learningplancompetencies": "Mokymosi plano kompetencijos",
@@ -12,8 +12,8 @@
     "nocompetencies": "Šioje sistemoje nebuvo sukurta kompetencijų.",
     "noplanswerecreated": "Nebuvo sukurta mokymosi planų.",
     "path": "Kelias",
-    "progress": "Progresas",
-    "rating": "Reitingas",
-    "status": "Leisti svečio prieigą",
-    "template": "Mokymosi plano šablonas"
+    "progress": "Besimokančiojo pažanga",
+    "rating": "Vertinimas",
+    "status": "Būsena",
+    "template": "Šablonas"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index 8f923295c43..b6aa4c90671 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Competentiebeoordelingen in deze cursus hebben geen invloed op studieplannnen.",
     "coursecompetencyratingsarepushedtouserplans": "Competentiebeoordelingen in deze cursus worden onmiddellijk aangepast in studieplannen.",
     "crossreferencedcompetencies": "Competenties met kruisverwijzingen",
-    "duedate": "Einddatum",
+    "duedate": "Uiterste inleverdatum",
     "errornocompetenciesfound": "Geen competenties gevonden",
     "evidence": "Bewijs",
     "learningplancompetencies": "Studieplan competenties",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Er zijn geen andere competenties met een kruisverwijzing naar deze competentie.",
     "noevidence": "Geen bewijs",
     "noplanswerecreated": "Er zijn nog geen studieplannen gemaakt",
-    "path": "Pad:",
+    "path": "Pad",
     "proficient": "Geslaagd",
-    "progress": "Vordering",
+    "progress": "Vordering leerling",
     "rating": "Beoordeling",
     "reviewstatus": "Beoordelingsstatus",
-    "status": "Gasttoegang toestaan",
-    "template": "Studieplansjabloon",
+    "status": "Status",
+    "template": "Sjabloon",
     "xcompetenciesproficientoutofy": "{{$a.x}} van de  {{$a.y}} competenties zijn bekwaam",
     "xcompetenciesproficientoutofyincourse": "Je bent bekwaam in {{$a.x}} van de {{$a.y}} competenties in deze cursus."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/pl.json b/www/addons/competency/lang/pl.json
index 8cabf83f795..2b72a64195a 100644
--- a/www/addons/competency/lang/pl.json
+++ b/www/addons/competency/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "activities": "Aktywności",
     "coursecompetencies": "Kompetencje kursu",
-    "duedate": "Termin",
+    "duedate": "Termin oddania",
     "evidence": "Dowód",
     "learningplancompetencies": "Kompetencje planu nauczania",
     "learningplans": "Plany nauczania",
@@ -10,10 +10,10 @@
     "nocompetencies": "Nie utworzono żadnych kompetencji w tych ramach kwalifikacji.",
     "noevidence": "Brak dowodów",
     "noplanswerecreated": "Nie utworzono planów uczenia się.",
-    "path": "Ścieżka:",
-    "progress": "Postęp",
+    "path": "Ścieżka",
+    "progress": "Postępy studenta w nauce",
     "rating": "Ocena",
     "reviewstatus": "Status przeglądu",
-    "status": "Zezwól na dostęp gości",
-    "template": "Szablon planu uczenia się."
+    "status": "Status",
+    "template": "Szablon"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index b63b0689b05..4afd49ee616 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Avaliações de competência neste curso não afetam os planos de aprendizagem.",
     "coursecompetencyratingsarepushedtouserplans": "Avaliações de competência neste curso são atualizadas imediatamente nos planos de aprendizagem.",
     "crossreferencedcompetencies": "Competências referenciadas",
-    "duedate": "Prazo",
+    "duedate": "Data de entrega",
     "errornocompetenciesfound": "Nenhuma competência encontrada",
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Nenhuma outra competência foi referenciada a esta competência.",
     "noevidence": "Nenhuma evidência",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
-    "path": "Caminho:",
+    "path": "Caminho",
     "proficient": "Proficiente",
-    "progress": "Progresso",
+    "progress": "Progresso do aluno",
     "rating": "Avaliação",
     "reviewstatus": "Estado da revisão",
-    "status": "Permitir o acesso de visitantes",
-    "template": "Modelo de plano de aprendizagem",
+    "status": "Status",
+    "template": "Modelo",
     "xcompetenciesproficientoutofy": "{{$a.x}} de {{$a.y}} competências são proficiêntes",
     "xcompetenciesproficientoutofyincourse": "Você é proficiente em {{$a.x}} de {{$a.y}} competências  neste curso."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/pt.json b/www/addons/competency/lang/pt.json
index ef6c73e845b..09243e3fe6c 100644
--- a/www/addons/competency/lang/pt.json
+++ b/www/addons/competency/lang/pt.json
@@ -5,9 +5,9 @@
     "coursecompetencyratingsarenotpushedtouserplans": "As avaliações das competências nesta disciplina não afetam os planos de aprendizagem.",
     "coursecompetencyratingsarepushedtouserplans": "As avaliações das competências nesta disciplina são automaticamente atualizadas nos planos de aprendizagem.",
     "crossreferencedcompetencies": "Competências referenciadas",
-    "duedate": "Data limite",
+    "duedate": "Data limite para submeter trabalhos",
     "errornocompetenciesfound": "Competências não encontradas",
-    "evidence": "Comprovativo",
+    "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "Planos de aprendizagem",
     "myplans": "Os meus planos de aprendizagem",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Nenhuma competência foi referenciada a esta competência.",
     "noevidence": "Não foi adicionado nenhum comprovativo",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
-    "path": "Localização:",
+    "path": "Caminho",
     "proficient": "Proficiente",
-    "progress": "Progresso",
+    "progress": "Progresso do aluno",
     "rating": "Avaliação",
     "reviewstatus": "Estado da revisão",
-    "status": "Permitir o acesso de visitantes",
-    "template": "Modelo de plano de aprendizagem",
+    "status": "Estado",
+    "template": "Modelo",
     "xcompetenciesproficientoutofy": "Tem proficiência em {{$a.x}} de {{$a.y}} competências",
     "xcompetenciesproficientoutofyincourse": "Tem proficiência em {{$a.x}} de {{$a.y}} competências nesta disciplina"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ro.json b/www/addons/competency/lang/ro.json
index 1578e6ba3fd..63d6243c09f 100644
--- a/www/addons/competency/lang/ro.json
+++ b/www/addons/competency/lang/ro.json
@@ -1,10 +1,10 @@
 {
-    "activities": "Activități",
+    "activities": "Activităţi",
     "duedate": "Termen de predare",
     "evidence": "Evidență",
     "path": "Cale",
     "progress": "Progres student",
     "rating": "Rating",
-    "status": "Permite accesul vizitatorilor",
+    "status": "Status",
     "template": "Șablon"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ru.json b/www/addons/competency/lang/ru.json
index 230b243b4f9..d268e9046ac 100644
--- a/www/addons/competency/lang/ru.json
+++ b/www/addons/competency/lang/ru.json
@@ -1,12 +1,12 @@
 {
-    "activities": "Элементы",
+    "activities": "Элементы курса",
     "competenciesmostoftennotproficientincourse": "Компетенции, которые чаще всего оказываются не освоенными в этом курсе",
     "coursecompetencies": "Компетенции курса",
     "coursecompetencyratingsarenotpushedtouserplans": "Рейтинги компетенций из этого курса не влияют на учебные планы.",
     "coursecompetencyratingsarepushedtouserplans": "Рейтинги компетенций из этого курса сразу же обновляются в учебных планах.",
     "crossreferencedcompetencies": "Перекрестные компетенции",
-    "duedate": "Срок выполнения",
-    "evidence": "Доказательство",
+    "duedate": "Последний срок сдачи",
+    "evidence": "Подтверждение",
     "learningplancompetencies": "Компетенции учебного плана",
     "learningplans": "Учебные планы",
     "myplans": "Мои учебные планы",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "Нет других компетенций, перекрестно ссылающихся на эту компетенцию.",
     "noevidence": "Нет доказательств",
     "noplanswerecreated": "Учебные планы не были созданы.",
-    "path": "Путь:",
+    "path": "Путь",
     "proficient": "Освоено",
-    "progress": "В процессе",
+    "progress": "Достижения студента",
     "rating": "Рейтинг",
     "reviewstatus": "Статус пересмотра",
-    "status": "Разрешить гостевой доступ",
-    "template": "Шаблон учебного плана",
+    "status": "Статус",
+    "template": "Шаблон",
     "xcompetenciesproficientoutofy": "{{$a.x}} из {{$a.y}} компетенций освоены",
     "xcompetenciesproficientoutofyincourse": "Вы освоили {{$a.x}} из {{$a.y}} компетенций в этом курсе."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/sv.json b/www/addons/competency/lang/sv.json
index 74cdccdfedb..a87634db442 100644
--- a/www/addons/competency/lang/sv.json
+++ b/www/addons/competency/lang/sv.json
@@ -5,8 +5,8 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Bedömning av kompetenser i denna kurs kommer inte att påverka studieplaner.",
     "coursecompetencyratingsarepushedtouserplans": "Bedömning av kompetenser i denna kurs uppdateras omedelbart i studieplanerna.",
     "crossreferencedcompetencies": "Korsrefererade kompetenser.",
-    "duedate": "Sista datum",
-    "evidence": "Verifiering",
+    "duedate": "Stoppdatum/tid",
+    "evidence": "Bevis",
     "learningplancompetencies": "Kompetenser i studieplaner",
     "learningplans": "Studieplaner",
     "myplans": "Mina studieplaner",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "Inga andra kompetenser har korsrefererats till denna kompetens.",
     "noevidence": "Inga verifieringar",
     "noplanswerecreated": "Inga studieplaner var skapade.",
-    "path": "Sökväg:",
+    "path": "Sökväg",
     "proficient": "Kunnig",
-    "progress": "Utveckling",
-    "rating": "Bedömning",
+    "progress": "Kursdeltagares progression",
+    "rating": "Betygssättning/omdömen",
     "reviewstatus": "Granska status",
-    "status": "Tillåt gäster",
-    "template": "Mall för studieplan",
+    "status": "Status",
+    "template": "Mall",
     "xcompetenciesproficientoutofy": "{{$a.x}} av {{$a.y}} kompetenser är uppnådda",
     "xcompetenciesproficientoutofyincourse": "Du har uppnått  {{$a.x}} av {{$a.y}} kompetenser i denna kurs.."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/tr.json b/www/addons/competency/lang/tr.json
index c9004bec886..aaf5e15f532 100644
--- a/www/addons/competency/lang/tr.json
+++ b/www/addons/competency/lang/tr.json
@@ -5,8 +5,8 @@
     "coursecompetencyratingsarenotpushedtouserplans": "Bu dersin yetkinlik dereceleri öğrenme planlarını etkilemez.",
     "coursecompetencyratingsarepushedtouserplans": "Bu dersin yetkinlik dereceleri öğrenme planlarında anında güncellenir.",
     "crossreferencedcompetencies": "Çapraz referanslı yetkinlikler",
-    "duedate": "Bitiş tarihi",
-    "evidence": "Öğrenme kanıtı",
+    "duedate": "Son teslim tarihi",
+    "evidence": "Kanıt",
     "learningplancompetencies": "Öğrenme planı yetkinlikleri",
     "learningplans": "Öğrenme planları",
     "myplans": "Benim öğrenme planlarım",
@@ -15,13 +15,13 @@
     "nocrossreferencedcompetencies": "Bu yetkinliğe çapraz referanslı başka yetkinlik bulunmamaktadır.",
     "noevidence": "Öğrenme kanıtı yok",
     "noplanswerecreated": "Hiçbir öğrenme planı oluşturulmadı.",
-    "path": "Yol:",
+    "path": "Yol",
     "proficient": "Yeterli",
-    "progress": "İlerleme",
+    "progress": "Öğrenci ilerlemesi",
     "rating": "Derecelendirme",
     "reviewstatus": "İnceleme durumu",
-    "status": "Konuk erişimine izin ver",
-    "template": "Öğrenme planı şablonu",
+    "status": "Durum",
+    "template": "Şablon",
     "xcompetenciesproficientoutofy": "{{$a.y}} yetkinliğinden {{$a.x}} dışarıda yeterli",
     "xcompetenciesproficientoutofyincourse": "Bu derste {{$a.y}} yetkinliğin dışında {{$a.x}} yeterliliğe sahibisiniz."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/uk.json b/www/addons/competency/lang/uk.json
index a3bc8358537..a84995bc5b8 100644
--- a/www/addons/competency/lang/uk.json
+++ b/www/addons/competency/lang/uk.json
@@ -1,13 +1,13 @@
 {
-    "activities": "Діяльності",
+    "activities": "Види діяльності",
     "competenciesmostoftennotproficientincourse": "Компетентності, які найчастіше не досягаються у цьому курсі",
     "coursecompetencies": "Компетентності курсу",
     "coursecompetencyratingsarenotpushedtouserplans": "Оцінювання компетентностей цього курсу не впливають на навчальні плани",
     "coursecompetencyratingsarepushedtouserplans": "Оцінювання компетентностей цього курсу будуть зразу  передані в навчальні плани.",
     "crossreferencedcompetencies": "Пов'язані компетентності",
-    "duedate": "Термін завершення",
+    "duedate": "Кінцевий термін здачі",
     "errornocompetenciesfound": "Не знайдено компетенції",
-    "evidence": "Підтвердження",
+    "evidence": "Докази",
     "learningplancompetencies": "Компетентності навчального плану",
     "learningplans": "Навчальний план",
     "myplans": "Мої навчальні плани",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "Жодна інша компетентність не пов'язана з даною",
     "noevidence": "Жодного підтвердження",
     "noplanswerecreated": "Жодного навчального плану не було створено",
-    "path": "Шлях:",
+    "path": "Шлях",
     "proficient": "Набута компетентність",
-    "progress": "Прогрес",
-    "rating": "Оцінювання",
+    "progress": "Прогрес студента",
+    "rating": "Оцінка",
     "reviewstatus": "Статус підтвердження",
-    "status": "Дозволити доступ для гостя",
-    "template": "Шаблон навчального плану",
+    "status": "Статус",
+    "template": "Шаблон",
     "xcompetenciesproficientoutofy": "{{$a.x}} компетентностей з {{$a.y}} набуті",
     "xcompetenciesproficientoutofyincourse": "Ви набули {{$a.x}} компетентностей з {{$a.y}} наявних у цьому курсі"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/zh-cn.json b/www/addons/competency/lang/zh-cn.json
index e6973f6a203..e22e787d956 100644
--- a/www/addons/competency/lang/zh-cn.json
+++ b/www/addons/competency/lang/zh-cn.json
@@ -2,15 +2,15 @@
     "activities": "活动",
     "competenciesmostoftennotproficientincourse": "在这门课程中你有太多不精通的能力",
     "coursecompetencies": "课程能力",
-    "duedate": "截止日",
+    "duedate": "截止时间",
     "evidence": "凭据",
     "noactivities": "没有设置活动",
     "path": "路径",
     "proficient": "精通",
     "progress": "学生进度",
     "rating": "正在评分",
-    "status": "允许访客访问",
-    "template": "学习计划模板",
+    "status": "状态",
+    "template": "模板",
     "xcompetenciesproficientoutofy": "{{$a.y}}个能力中的{{$a.x}}是精通的",
     "xcompetenciesproficientoutofyincourse": "你精通这门课程{{$a.y}}个能力中的{{$a.x}}个。"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/zh-tw.json b/www/addons/competency/lang/zh-tw.json
index 9d27ee941d6..be50bdc5edf 100644
--- a/www/addons/competency/lang/zh-tw.json
+++ b/www/addons/competency/lang/zh-tw.json
@@ -5,7 +5,7 @@
     "coursecompetencyratingsarenotpushedtouserplans": "在這一課程的核心能力評等不會影響學習計畫",
     "coursecompetencyratingsarepushedtouserplans": "在這一課程的核心能力評等在學習計畫上會立即更新",
     "crossreferencedcompetencies": "交互參照的核心能力",
-    "duedate": "截止日期",
+    "duedate": "規定繳交時間",
     "errornocompetenciesfound": "找不到能使用的功能",
     "evidence": "證據",
     "learningplancompetencies": "學習計畫核心能力",
@@ -16,13 +16,13 @@
     "nocrossreferencedcompetencies": "沒有其他核心能力被交互參照這一核心能力",
     "noevidence": "沒有證據",
     "noplanswerecreated": "沒有學習計畫被建立",
-    "path": "路徑：",
+    "path": "路徑",
     "proficient": "精熟",
-    "progress": "進度",
-    "rating": "評等",
+    "progress": "學生進度",
+    "rating": "評比",
     "reviewstatus": "審查狀況",
-    "status": "允許訪客瀏覽",
-    "template": "學習計畫樣版",
+    "status": "狀態",
+    "template": "範本",
     "xcompetenciesproficientoutofy": "在{{$a.y}}個核心能力中有{{$a.x}}個已經精熟",
     "xcompetenciesproficientoutofyincourse": "在此課程中有{{$a.y}}個核心能力，你已經精熟{{$a.x}}個。"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ar.json b/www/addons/coursecompletion/lang/ar.json
index 99d421ba9d2..7faf3c038ac 100644
--- a/www/addons/coursecompletion/lang/ar.json
+++ b/www/addons/coursecompletion/lang/ar.json
@@ -1,5 +1,5 @@
 {
-    "complete": "تم/كامل",
+    "complete": "كامل",
     "completecourse": "مقرر مكتمل",
     "completed": "تم",
     "completiondate": "تاريخ إكمال المقرر",
@@ -13,9 +13,9 @@
     "manualselfcompletion": "إكمال يدوي ذاتي",
     "notyetstarted": "لم يبدأ بعد",
     "pending": "معلق",
-    "required": "مطلوب",
+    "required": "مفروض",
     "requiredcriteria": "المعايير المطلوبة",
     "requirement": "المتطلبات",
-    "status": "السماح بدخول ضيف",
+    "status": "الحالة",
     "viewcoursereport": "عرض تقرير المقرر"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/bg.json b/www/addons/coursecompletion/lang/bg.json
index ba9a2e7620d..e60bae81321 100644
--- a/www/addons/coursecompletion/lang/bg.json
+++ b/www/addons/coursecompletion/lang/bg.json
@@ -1,14 +1,14 @@
 {
-    "complete": "Отговорен",
-    "completed": "Приключен",
-    "coursecompletion": "Напредване в курса",
+    "complete": "Завършен",
+    "completed": "Завършено",
+    "coursecompletion": "Завършване на курса",
     "criteria": "Критерии",
     "criteriagroup": "Група критерии",
     "criteriarequiredall": "Всички критерии по-долу са задължителни",
     "criteriarequiredany": "Някои критерии по-долу са задължителни",
     "inprogress": "Не е приключен",
     "manualselfcompletion": "Ръчно самоотбелязване на завършването",
-    "required": "Задължителен",
-    "status": "Позволяване достъп като гост",
+    "required": "Задължително",
+    "status": "Състояние",
     "viewcoursereport": "Вижте отчет за курса"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ca.json b/www/addons/coursecompletion/lang/ca.json
index 9a551225fed..1c81e04c587 100644
--- a/www/addons/coursecompletion/lang/ca.json
+++ b/www/addons/coursecompletion/lang/ca.json
@@ -1,10 +1,10 @@
 {
-    "complete": "Completa",
+    "complete": "Complet",
     "completecourse": "Curs complet",
-    "completed": "Completat",
+    "completed": "completat",
     "completiondate": "Data de compleció",
     "couldnotloadreport": "No es pot carregar l'informe de compleció del curs, torneu a intentar-ho més tard.",
-    "coursecompletion": "Els usuaris han de completar aquest curs.",
+    "coursecompletion": "Compleció del curs",
     "criteria": "Criteris",
     "criteriagroup": "Grup de criteris",
     "criteriarequiredall": "Cal que es compleixin tots els criteris que es mostren a continuació",
@@ -12,10 +12,10 @@
     "inprogress": "En curs",
     "manualselfcompletion": "Auto-compleció manual",
     "notyetstarted": "No s'ha començat encara",
-    "pending": "Pendent",
-    "required": "Requerit",
+    "pending": "Pendents",
+    "required": "Necessari",
     "requiredcriteria": "Criteri requerit",
     "requirement": "Requisit",
-    "status": "Permetre l'accés de visitants",
+    "status": "Estat",
     "viewcoursereport": "Visualitza l'informe del curs"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/cs.json b/www/addons/coursecompletion/lang/cs.json
index ba2add0dc81..d236a17e7ec 100644
--- a/www/addons/coursecompletion/lang/cs.json
+++ b/www/addons/coursecompletion/lang/cs.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Hotovo",
+    "complete": "Splněno",
     "completecourse": "Absolvovaný kurz",
-    "completed": "Dokončeno",
+    "completed": "Splněno",
     "completiondate": "Datum ukončení",
     "couldnotloadreport": "Nelze načíst zprávu o absolvování kurzu, zkuste to prosím později.",
-    "coursecompletion": "Studenti musí absolvovat tento kurz",
+    "coursecompletion": "Absolvování kurzu",
     "criteria": "Podmínky",
     "criteriagroup": "Skupina podmínek",
     "criteriarequiredall": "Všechny podmínky musí být splněny",
     "criteriarequiredany": "Jakákoli z podmínek musí být splněna",
-    "inprogress": "Probíhající",
+    "inprogress": "Probíhá",
     "manualselfcompletion": "Označení absolvování kurzu samotným studentem",
     "notyetstarted": "Zatím nezačalo",
-    "pending": "Probíhající",
-    "required": "Povinné",
+    "pending": "Čeká",
+    "required": "Vyžadováno",
     "requiredcriteria": "Vyžadované podmínky",
     "requirement": "Požadavek",
-    "status": "Povolit přístup pro hosty",
+    "status": "Stav",
     "viewcoursereport": "Zobrazit přehled kurzu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/da.json b/www/addons/coursecompletion/lang/da.json
index 87f94706c77..21281be057e 100644
--- a/www/addons/coursecompletion/lang/da.json
+++ b/www/addons/coursecompletion/lang/da.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Gennemført",
+    "complete": "Færdiggør",
     "completecourse": "Fuldfør kursus",
-    "completed": "Færdigt",
+    "completed": "Gennemført",
     "completiondate": "Afslutningsdato",
     "couldnotloadreport": "Kunne ikke indlæse rapporten vedrørende  kursusfuldførelse, prøv igen senere.",
-    "coursecompletion": "Brugere skal gennemføre dette kursus.",
+    "coursecompletion": "Kursusgennemførelse",
     "criteria": "Kriterie",
     "criteriagroup": "Kriteriegruppe",
     "criteriarequiredall": "Alle kriterier herunder er påkrævet",
     "criteriarequiredany": "Ethvert kriterium herunder er påkrævet",
-    "inprogress": "Under udførelse",
+    "inprogress": "Igangværende",
     "manualselfcompletion": "Manuel selvregistrering af gennemførelse",
     "notyetstarted": "Ikke begyndt endnu",
-    "pending": "Afventer",
-    "required": "Krævet",
+    "pending": "Behandles",
+    "required": "Påkrævet",
     "requiredcriteria": "Påkrævede kriterier",
     "requirement": "Krav",
-    "status": "Tillad gæsteadgang",
+    "status": "Status",
     "viewcoursereport": "Se kursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/de.json b/www/addons/coursecompletion/lang/de.json
index 926a8f3eed6..b3c079e25ce 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Vollständig",
+    "complete": "Fertig",
     "completecourse": "Kurs abschließen",
     "completed": "Abgeschlossen",
     "completiondate": "Abschlussdatum",
     "couldnotloadreport": "Fehler beim Laden des Kursabschlussberichts. Versuchen Sie es später noch einmal.",
-    "coursecompletion": "Teilnehmer/innen müssen diesen Kurs abschließen.",
+    "coursecompletion": "Kursabschluss",
     "criteria": "Kriterien",
     "criteriagroup": "Kriteriengruppe",
     "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig",
     "criteriarequiredany": "Eine der nachfolgenden Kriterien ist notwendig",
-    "inprogress": "Laufend",
+    "inprogress": "In Bearbeitung",
     "manualselfcompletion": "Manueller eigener Abschluss",
     "notyetstarted": "Noch nicht begonnen",
-    "pending": "Wartend",
-    "required": "Notwendig",
+    "pending": "Unerledigt",
+    "required": "Erforderlich",
     "requiredcriteria": "Notwendiges Kriterium",
     "requirement": "Anforderung",
-    "status": "Gastzugang erlauben",
+    "status": "Status",
     "viewcoursereport": "Kursbericht ansehen"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index 4152345abc0..50f490cb6d3 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -1,7 +1,7 @@
 {
     "complete": "Ολοκλήρωση",
     "completecourse": "Ολοκλήρωση μαθήματος",
-    "completed": "Ολοκληρωμένο",
+    "completed": "ολοκληρώθηκε",
     "completiondate": "Ημερομηνία ολοκλήρωσης",
     "couldnotloadreport": "Δεν ήταν δυνατή η φόρτωση της αναφοράς ολοκλήρωσης του μαθήματος, δοκιμάστε ξανά αργότερα.",
     "coursecompletion": "Ολοκλήρωση μαθήματος",
@@ -16,6 +16,6 @@
     "required": "Απαιτείται",
     "requiredcriteria": "Απαιτούμενα κριτήρια",
     "requirement": "Απαίτηση",
-    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
+    "status": "Κατάσταση",
     "viewcoursereport": "Προβολή αναφορά μαθήματος"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es-mx.json b/www/addons/coursecompletion/lang/es-mx.json
index 72d16395f3d..a1801e0134e 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completada",
+    "complete": "Completado",
     "completecourse": "Curso completo",
-    "completed": "Finalizado",
+    "completed": "Completado",
     "completiondate": "Fecha de terminación",
     "couldnotloadreport": "No pudo cargarse el reporte de finalización del curso; por favor inténtelo más tarde.",
-    "coursecompletion": "Los usuarios deben completar este curso.",
+    "coursecompletion": "Finalización del curso",
     "criteria": "Criterios",
     "criteriagroup": "Grupo de criterios",
     "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
     "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
-    "inprogress": "En progreso",
+    "inprogress": "En curso",
     "manualselfcompletion": "Auto-finalizar manualmente",
     "notyetstarted": "Aún no ha comenzado",
     "pending": "Pendiente",
-    "required": "Requerido",
+    "required": "Obligatorio",
     "requiredcriteria": "Criterios necesarios",
     "requirement": "Requisito",
-    "status": "Se permite el acceso de invitados",
+    "status": "Estatus",
     "viewcoursereport": "Ver reporte del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es.json b/www/addons/coursecompletion/lang/es.json
index 09c4a3032af..450fdda8b2c 100644
--- a/www/addons/coursecompletion/lang/es.json
+++ b/www/addons/coursecompletion/lang/es.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Finalizado",
+    "complete": "Completado",
     "completecourse": "Curso completado",
-    "completed": "Finalizado",
+    "completed": "completada",
     "completiondate": "Fecha de finalización",
     "couldnotloadreport": "No se puede cargar el informe de finalización del curso, por favor inténtalo de nuevo más tarde.",
-    "coursecompletion": "Los usuarios deben finalizar este curso.",
+    "coursecompletion": "Finalización del curso",
     "criteria": "Criterios",
     "criteriagroup": "Grupo de criterios",
     "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
     "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
-    "inprogress": "En progreso",
+    "inprogress": "En curso",
     "manualselfcompletion": "Autocompletar manualmente",
     "notyetstarted": "Aún no comenzado",
     "pending": "Pendiente",
     "required": "Obligatorio",
     "requiredcriteria": "Criterios necesarios",
     "requirement": "Requisito",
-    "status": "Se permite el acceso de invitados",
+    "status": "Estado",
     "viewcoursereport": "Ver informe del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/eu.json b/www/addons/coursecompletion/lang/eu.json
index f9e4e0ed228..4735d6035c9 100644
--- a/www/addons/coursecompletion/lang/eu.json
+++ b/www/addons/coursecompletion/lang/eu.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Osatu",
+    "complete": "Osoa",
     "completecourse": "Ikastaroa osatu",
-    "completed": "Osatua",
+    "completed": "Osatuta",
     "completiondate": "Osaketa-data",
     "couldnotloadreport": "Ezin izan da ikastaro-osaketaren txostena kargatu, mesedez saiatu beranduago.",
-    "coursecompletion": "Erabiltzaileek ikastaro hau osatu behar dute",
+    "coursecompletion": "Ikastaro-osaketa",
     "criteria": "Irizpidea",
     "criteriagroup": "Irizpide-multzoa",
     "criteriarequiredall": "Beheko irizpide guztiak dira beharrezko",
     "criteriarequiredany": "Beheko hainbat irizpide dira beharrezko",
-    "inprogress": "Martxan",
+    "inprogress": "Ari da",
     "manualselfcompletion": "Norberak eskuz osatu",
     "notyetstarted": "Ez da hasi",
-    "pending": "Zain",
-    "required": "Beharrekoa",
+    "pending": "Egin gabe",
+    "required": "Beharrezkoa",
     "requiredcriteria": "Irizpidea behar da",
     "requirement": "Eskakizuna",
-    "status": "Bisitarien sarbidea baimendu",
+    "status": "Egoera",
     "viewcoursereport": "Ikastaroaren txostena ikusi"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fa.json b/www/addons/coursecompletion/lang/fa.json
index e785f269e31..10688aff85a 100644
--- a/www/addons/coursecompletion/lang/fa.json
+++ b/www/addons/coursecompletion/lang/fa.json
@@ -1,7 +1,7 @@
 {
     "complete": "کامل",
-    "completed": "کامل شده",
-    "coursecompletion": "کاربر باید این درس را تکمیل کند.",
+    "completed": "تکمیل‌شده",
+    "coursecompletion": "تکمیل درس",
     "criteria": "ضابطه",
     "criteriagroup": "گروه ضوابط",
     "criteriarequiredall": "تمام ضوابط زیر باید برآورده شوند",
@@ -10,8 +10,8 @@
     "manualselfcompletion": "علامت زدن به عنوان کامل توسط خود افراد",
     "notyetstarted": "هنوز شروع نشده است",
     "pending": "معلق",
-    "required": "اجباری",
+    "required": "لازم است",
     "requiredcriteria": "ضوابط مورد نیاز",
-    "status": "اجازهٔ ورود به عنوان مهمان",
+    "status": "وضعیت",
     "viewcoursereport": "مشاهده گزارش درس"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fr.json b/www/addons/coursecompletion/lang/fr.json
index 5f763cc0ad5..d6edb61e9df 100644
--- a/www/addons/coursecompletion/lang/fr.json
+++ b/www/addons/coursecompletion/lang/fr.json
@@ -1,10 +1,10 @@
 {
-    "complete": "Terminer",
+    "complete": "Complet",
     "completecourse": "Terminer le cours",
     "completed": "Terminé",
     "completiondate": "Date d'achèvement",
     "couldnotloadreport": "Impossible de charger le rapport d'achèvement de cours. Veuillez essayer plus tard.",
-    "coursecompletion": "Les participants doivent achever ce cours.",
+    "coursecompletion": "Achèvement de cours",
     "criteria": "Critères",
     "criteriagroup": "Groupe de critères",
     "criteriarequiredall": "Tous les critères ci-dessous sont requis",
@@ -12,10 +12,10 @@
     "inprogress": "En cours",
     "manualselfcompletion": "Auto-achèvement manuel",
     "notyetstarted": "Pas encore commencé",
-    "pending": "En attente",
+    "pending": "En suspens",
     "required": "Requis",
     "requiredcriteria": "Critères requis",
     "requirement": "Condition",
-    "status": "Permettre l'accès anonyme",
+    "status": "Statut",
     "viewcoursereport": "Consulter le rapport du cours"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/he.json b/www/addons/coursecompletion/lang/he.json
index bea3b53f5bb..3036661befc 100644
--- a/www/addons/coursecompletion/lang/he.json
+++ b/www/addons/coursecompletion/lang/he.json
@@ -3,18 +3,18 @@
     "completecourse": "השלמת קורס",
     "completed": "הושלם",
     "completiondate": "תאריך השלמה",
-    "coursecompletion": "לומדים חייבים להשלים קורס זה.",
+    "coursecompletion": "השלמת הקורס",
     "criteria": "תנאי",
     "criteriagroup": "קבוצת תנאים",
     "criteriarequiredall": "כל התנאים המצויינים מטה נדרשים",
     "criteriarequiredany": "לפחות אחד מהתנאים המצויינים מטה נדרשים",
-    "inprogress": "בלמידה",
+    "inprogress": "בתהליך",
     "manualselfcompletion": "השלמה עצמאית ידנית",
     "notyetstarted": "עדיין לא התחיל",
-    "pending": "ממתין",
-    "required": "נדרש",
+    "pending": "בתהליך למידה",
+    "required": "דרוש",
     "requiredcriteria": "תנאי נדרש",
     "requirement": "דרישה",
-    "status": "הקורס זמין לאורחים",
+    "status": "מצב",
     "viewcoursereport": "צפיה בדוח הקורס"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/hu.json b/www/addons/coursecompletion/lang/hu.json
index 1522098017e..d07a78bbda4 100644
--- a/www/addons/coursecompletion/lang/hu.json
+++ b/www/addons/coursecompletion/lang/hu.json
@@ -1,17 +1,17 @@
 {
-    "complete": "Kész",
-    "completed": "Kész",
-    "coursecompletion": "A tanulóknak teljesíteni kell ezt a kurzust",
+    "complete": "Teljes",
+    "completed": "Teljesítve",
+    "coursecompletion": "Kurzus teljesítése",
     "criteria": "Követelmények",
     "criteriagroup": "Követelménycsoport",
     "criteriarequiredall": "Az összes alábbi követelmény teljesítendő",
     "criteriarequiredany": "Bármely alábbi követelmény teljesítendő",
-    "inprogress": "Folyamatban lévő",
+    "inprogress": "Folyamatban",
     "manualselfcompletion": "Saját teljesítés kézzel",
     "notyetstarted": "Még nem kezdődött el",
     "pending": "Függőben",
     "required": "Kitöltendő",
     "requiredcriteria": "Előírt követelmények",
-    "status": "Vendégkénti belépés engedélyezése",
+    "status": "Állapot",
     "viewcoursereport": "Kurzusjelentés megtekintése"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/it.json b/www/addons/coursecompletion/lang/it.json
index cac35851b3a..527fe3af5c6 100644
--- a/www/addons/coursecompletion/lang/it.json
+++ b/www/addons/coursecompletion/lang/it.json
@@ -1,21 +1,21 @@
 {
     "complete": "Completo",
     "completecourse": "Corso completato",
-    "completed": "Completato",
+    "completed": "Completata",
     "completiondate": "Data di completamento",
     "couldnotloadreport": "Non è stato possibile caricare il report di completamento del corso, per favore riporva.",
-    "coursecompletion": "Gli utenti devono completare il corso",
+    "coursecompletion": "Completamento corso",
     "criteria": "Criteri",
     "criteriagroup": "Gruppo di criteri",
     "criteriarequiredall": "E' richiesto il soddisfacimento di tutti i criteri elencati",
     "criteriarequiredany": "E' richiesto il soddisfacimento di almeno uno dei criteri elencati",
-    "inprogress": "in svolgimento",
+    "inprogress": "In corso",
     "manualselfcompletion": "Conferma personale di completamento",
     "notyetstarted": "Non ancora iniziato",
     "pending": "In attesa",
-    "required": "Obbligatorio",
+    "required": "La risposta è obbligatoria",
     "requiredcriteria": "Criteri da soddisfare",
     "requirement": "Requisito",
-    "status": "Consenti l'accesso agli ospiti",
+    "status": "Stato",
     "viewcoursereport": "Visualizza il report del corso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ja.json b/www/addons/coursecompletion/lang/ja.json
index 0ed8cf0bc71..f53547d1c99 100644
--- a/www/addons/coursecompletion/lang/ja.json
+++ b/www/addons/coursecompletion/lang/ja.json
@@ -1,7 +1,7 @@
 {
-    "complete": "完了",
+    "complete": "詳細",
     "completed": "完了",
-    "coursecompletion": "ユーザはこのコースを完了する必要があります。",
+    "coursecompletion": "コース完了",
     "criteria": "クライテリア",
     "criteriagroup": "クライテリアグループ",
     "criteriarequiredall": "下記のクライテリアすべてが必須である",
@@ -12,6 +12,6 @@
     "pending": "保留",
     "required": "必須",
     "requiredcriteria": "必須クライテリア",
-    "status": "ゲストアクセスを許可する",
+    "status": "ステータス",
     "viewcoursereport": "コースレポートを表示する"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/lt.json b/www/addons/coursecompletion/lang/lt.json
index bb13b86372b..3379372eedf 100644
--- a/www/addons/coursecompletion/lang/lt.json
+++ b/www/addons/coursecompletion/lang/lt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Baigta",
+    "complete": "Užbaigti",
     "completecourse": "Visa kursų medžiaga",
-    "completed": "Užbaigta",
+    "completed": "Baigtas",
     "completiondate": "Užbaigimo data",
     "couldnotloadreport": "Nepavyko įkelti kursų baigimo ataskaitos, prašome pabandyti vėliau.",
-    "coursecompletion": "Naudotojas turi baigti šį kursą.",
+    "coursecompletion": "Kursų užbaigimas",
     "criteria": "Kriterijai",
     "criteriagroup": "Kriterijų grupė",
     "criteriarequiredall": "Visi žemiau pateikti kriterijai yra būtini",
     "criteriarequiredany": "Bet kuris žemiau pateiktas kriterijus yra būtinas",
-    "inprogress": "Atliekama",
+    "inprogress": "Nebaigta",
     "manualselfcompletion": "Savas užbaigimas neautomatiniu būdu",
     "notyetstarted": "Dar nepradėta",
     "pending": "Laukiama",
-    "required": "Privalomas",
+    "required": "Būtina",
     "requiredcriteria": "Būtini kriterijai",
     "requirement": "Būtina sąlyga",
-    "status": "Leisti svečio prieigą",
+    "status": "Būsena",
     "viewcoursereport": "Peržiūrėti kursų ataskaitą"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/nl.json b/www/addons/coursecompletion/lang/nl.json
index a6a621c5fa0..c2203da1dc2 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Volledig",
+    "complete": "Voltooid",
     "completecourse": "Voltooi cursus",
-    "completed": "Volledig",
+    "completed": "Voltooid",
     "completiondate": "Voltooiingsdatum",
     "couldnotloadreport": "Kon het voltooiingsrapport van de cursus niet laden. Probeer later opnieuw.",
-    "coursecompletion": "Leerlingen moeten deze cursus voltooien.",
+    "coursecompletion": "Cursus voltooien",
     "criteria": "Criteria",
     "criteriagroup": "Criteria groep",
     "criteriarequiredall": "Alle onderstaande criteria zijn vereist",
     "criteriarequiredany": "Al onderstaande criteria zijn vereist",
-    "inprogress": "Actief",
+    "inprogress": "Bezig",
     "manualselfcompletion": "Manueel voltooien",
     "notyetstarted": "Nog niet begonnen",
-    "pending": "In behandeling",
-    "required": "Vereist",
+    "pending": "Bezig",
+    "required": "Verplicht",
     "requiredcriteria": "Vereiste criteria",
     "requirement": "Vereiste",
-    "status": "Gasttoegang toestaan",
+    "status": "Status",
     "viewcoursereport": "Bekijk cursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pl.json b/www/addons/coursecompletion/lang/pl.json
index a9d8c51e844..db69489a520 100644
--- a/www/addons/coursecompletion/lang/pl.json
+++ b/www/addons/coursecompletion/lang/pl.json
@@ -1,7 +1,7 @@
 {
-    "complete": "Zakończone",
-    "completed": "Zakończone",
-    "coursecompletion": "Użytkownicy muszą ukończyć ten kurs.",
+    "complete": "Pełna wersja",
+    "completed": "Ukończony",
+    "coursecompletion": "Ukończenie kursu",
     "criteria": "Kryteria",
     "criteriagroup": "Grupa kryteriów",
     "criteriarequiredall": "Wszystkie poniższe kryteria są wymagane",
@@ -9,9 +9,9 @@
     "inprogress": "W toku",
     "manualselfcompletion": "Samodzielne oznaczenie ukończenia",
     "notyetstarted": "Jeszcze nie rozpoczęto",
-    "pending": "Oczekujące",
+    "pending": "Oczekujący",
     "required": "Wymagane",
     "requiredcriteria": "Wymagane kryteria",
-    "status": "Zezwól na dostęp gości",
+    "status": "Status",
     "viewcoursereport": "Zobacz raport kursu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt-br.json b/www/addons/coursecompletion/lang/pt-br.json
index ca01e849231..946450a9dcc 100644
--- a/www/addons/coursecompletion/lang/pt-br.json
+++ b/www/addons/coursecompletion/lang/pt-br.json
@@ -1,10 +1,10 @@
 {
-    "complete": "Completo",
+    "complete": "Concluído",
     "completecourse": "Curso concluído",
-    "completed": "Concluído",
+    "completed": "terminado",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão do curso, por favor tente novamente mais tarde.",
-    "coursecompletion": "Participantes precisam completar este curso.",
+    "coursecompletion": "Andamento do curso",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
     "criteriarequiredall": "Todos os critérios abaixo são necessários",
@@ -12,10 +12,10 @@
     "inprogress": "Em andamento",
     "manualselfcompletion": "Conclusão manual por si mesmo",
     "notyetstarted": "Não iniciado ainda",
-    "pending": "Pendente",
-    "required": "Obrigatório",
+    "pending": "Pendentes",
+    "required": "Necessários",
     "requiredcriteria": "Critérios exigidos",
     "requirement": "Exigência",
-    "status": "Permitir o acesso de visitantes",
+    "status": "Status",
     "viewcoursereport": "Ver relatório do curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt.json b/www/addons/coursecompletion/lang/pt.json
index 9f7d87e4c5f..9c847ed41d6 100644
--- a/www/addons/coursecompletion/lang/pt.json
+++ b/www/addons/coursecompletion/lang/pt.json
@@ -1,10 +1,10 @@
 {
-    "complete": "Respondida",
+    "complete": "Completo",
     "completecourse": "Disciplina concluída",
-    "completed": "Completo",
+    "completed": "Concluído",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão da disciplina, por favor tente mais tarde.",
-    "coursecompletion": "Os utilizadores têm de completar esta disciplina",
+    "coursecompletion": "Conclusão da disciplina",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
     "criteriarequiredall": "Todos os critérios abaixo são exigidos",
@@ -13,9 +13,9 @@
     "manualselfcompletion": "Conclusão manual pelo próprio",
     "notyetstarted": "Ainda não iniciou",
     "pending": "Pendente",
-    "required": "Obrigatório",
+    "required": "Resposta obrigatória",
     "requiredcriteria": "Critério obrigatório",
     "requirement": "Requisito",
-    "status": "Permitir o acesso de visitantes",
+    "status": "Estado",
     "viewcoursereport": "Ver relatório da disciplina"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ro.json b/www/addons/coursecompletion/lang/ro.json
index abe5ed918c8..39692945b36 100644
--- a/www/addons/coursecompletion/lang/ro.json
+++ b/www/addons/coursecompletion/lang/ro.json
@@ -1,10 +1,10 @@
 {
-    "complete": "Complet",
+    "complete": "Finalizează",
     "completecourse": "Curs complet",
-    "completed": "Finalizat",
+    "completed": "Finalizare",
     "completiondate": "Data limita până la completarea acțiunii",
     "couldnotloadreport": "Raportul cu privire la situația completării cursului nu se poate încărca, încercați mai târziu.",
-    "coursecompletion": "Utilizatorul trebuie să completeze acest curs.",
+    "coursecompletion": "Absolvire curs",
     "criteria": "Criterii",
     "criteriagroup": "Grup criterii",
     "criteriarequiredall": "Toate criteriile de mai jos sunt necesare",
@@ -13,9 +13,9 @@
     "manualselfcompletion": "Auto-finalizare manuală",
     "notyetstarted": "Nu a fost încă început",
     "pending": "În așteptare",
-    "required": "Necesar",
+    "required": "Obligatoriu",
     "requiredcriteria": "Criteriu necesar",
     "requirement": "Cerințe",
-    "status": "Permite accesul vizitatorilor",
+    "status": "Status",
     "viewcoursereport": "Vezi raportul cursului"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ru.json b/www/addons/coursecompletion/lang/ru.json
index ad7b8ac320c..571f34f91df 100644
--- a/www/addons/coursecompletion/lang/ru.json
+++ b/www/addons/coursecompletion/lang/ru.json
@@ -1,9 +1,9 @@
 {
-    "complete": "Выполнен",
+    "complete": "Завершено",
     "completecourse": "Завершить курс",
-    "completed": "Завершено",
+    "completed": "Выполнено",
     "completiondate": "Дата завершения",
-    "coursecompletion": "Пользователи должны завершить этот курс.",
+    "coursecompletion": "Окончание курса",
     "criteria": "Критерии",
     "criteriagroup": "Группа критериев",
     "criteriarequiredall": "Требуются соответствие всем указанным ниже критериям",
@@ -11,10 +11,10 @@
     "inprogress": "В процессе",
     "manualselfcompletion": "Пользователь может сам поставить отметку о выполнении",
     "notyetstarted": "Еще не началось",
-    "pending": "Ожидаемые",
-    "required": "Обязательно",
+    "pending": "Ожидается",
+    "required": "Необходимо заполнить",
     "requiredcriteria": "Необходимые критерии",
     "requirement": "Требование",
-    "status": "Разрешить гостевой доступ",
+    "status": "Статус",
     "viewcoursereport": "Просмотреть отчет по курсу"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index a6e9b4208a6..246d9117ada 100644
--- a/www/addons/coursecompletion/lang/sv.json
+++ b/www/addons/coursecompletion/lang/sv.json
@@ -1,10 +1,10 @@
 {
     "complete": "Komplett",
     "completecourse": "",
-    "completed": "Slutfört",
+    "completed": "Ifyllt",
     "completiondate": "Datum för fullföljande",
     "couldnotloadreport": "Det gick inte att läsa in rapporten för fullföljande av kursen, vänligen försök igen senare .",
-    "coursecompletion": "Studerande måste slutföra den här kursen.",
+    "coursecompletion": "Fullföljande av kurs",
     "criteria": "Kriterier",
     "criteriagroup": "Kriterier för grupp",
     "criteriarequiredall": "Alla kriterier är obligatoriska",
@@ -16,6 +16,6 @@
     "required": "Obligatorisk",
     "requiredcriteria": "Obligatoriskt kriterium",
     "requirement": "Krav",
-    "status": "Tillåt gäster",
+    "status": "Status",
     "viewcoursereport": "Visa kursrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/tr.json b/www/addons/coursecompletion/lang/tr.json
index 548a8574418..89efac25b4d 100644
--- a/www/addons/coursecompletion/lang/tr.json
+++ b/www/addons/coursecompletion/lang/tr.json
@@ -1,17 +1,17 @@
 {
-    "complete": "Tamamlandı",
-    "completed": "Tamamlandı",
-    "coursecompletion": "Kullanıcılar bu dersi tamamlamalıdır",
+    "complete": "Tamamlanmış",
+    "completed": "Bitirmeli",
+    "coursecompletion": "Ders tamamlama",
     "criteria": "Ölçüt",
     "criteriagroup": "Ölçüt Grubu",
     "criteriarequiredall": "Aşağıdaki ölçütlerin tümü gereklidir",
     "criteriarequiredany": "Aşağıdaki herhangi bir kriter gereklidir",
-    "inprogress": "Devam etmekte",
+    "inprogress": "Devam ediyor",
     "manualselfcompletion": "Kendi kendine elle tamamlama",
     "notyetstarted": "Henüz başlamadı",
     "pending": "Bekliyor",
     "required": "Gerekli",
     "requiredcriteria": "Gerekli Ölçüt",
-    "status": "Konuk erişimine izin ver",
+    "status": "Durum",
     "viewcoursereport": "Kurs raporunu görüntüle"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/uk.json b/www/addons/coursecompletion/lang/uk.json
index acc5ff8ddda..aa1147d5ddb 100644
--- a/www/addons/coursecompletion/lang/uk.json
+++ b/www/addons/coursecompletion/lang/uk.json
@@ -1,10 +1,10 @@
 {
     "complete": "Завершено",
     "completecourse": "Завершити курсу",
-    "completed": "Завершено",
+    "completed": "Виконано",
     "completiondate": "Дата завершення",
     "couldnotloadreport": "Не вдалося завантажити звіт про закінчення курсу, будь ласка, спробуйте ще раз пізніше.",
-    "coursecompletion": "Користувачі повинні завершити цей курс.",
+    "coursecompletion": "Курс закінчено",
     "criteria": "Критерій",
     "criteriagroup": "Група критеріїв",
     "criteriarequiredall": "Потрібна відповідність всім вказаним критеріям",
@@ -12,10 +12,10 @@
     "inprogress": "В процесі",
     "manualselfcompletion": "Самореєстрація завершення",
     "notyetstarted": "Ще не почато",
-    "pending": "В очікуванні",
-    "required": "Обов’язкове",
+    "pending": "Очікується",
+    "required": "Необхідні",
     "requiredcriteria": "Необхідний критерій",
     "requirement": "Вимога",
-    "status": "Дозволити доступ для гостя",
+    "status": "Статус",
     "viewcoursereport": "Переглянути звіт курсу"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/zh-cn.json b/www/addons/coursecompletion/lang/zh-cn.json
index 46a98830ede..f46cbe0662d 100644
--- a/www/addons/coursecompletion/lang/zh-cn.json
+++ b/www/addons/coursecompletion/lang/zh-cn.json
@@ -1,17 +1,17 @@
 {
-    "complete": "完成",
-    "completed": "已完成",
-    "coursecompletion": "用户必须完成此课程。",
+    "complete": "完全",
+    "completed": "完成",
+    "coursecompletion": "修完课程",
     "criteria": "条件",
     "criteriagroup": "条件组",
     "criteriarequiredall": "必须满足以下条件",
     "criteriarequiredany": "必须满足下列任一条件",
-    "inprogress": "进行中",
+    "inprogress": "处理中",
     "manualselfcompletion": "手动自设完成",
     "notyetstarted": "还未开始",
-    "pending": "待决",
-    "required": "必须回答",
+    "pending": "等待中",
+    "required": "必需的",
     "requiredcriteria": "必备条件",
-    "status": "允许访客访问",
+    "status": "状态",
     "viewcoursereport": "查看课程报告"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/zh-tw.json b/www/addons/coursecompletion/lang/zh-tw.json
index c0deca8eec7..574a8cb4b64 100644
--- a/www/addons/coursecompletion/lang/zh-tw.json
+++ b/www/addons/coursecompletion/lang/zh-tw.json
@@ -1,21 +1,21 @@
 {
-    "complete": "完成",
+    "complete": "完全",
     "completecourse": "完成課程",
-    "completed": "已完成",
+    "completed": "完成",
     "completiondate": "完成日期",
     "couldnotloadreport": "無法載入課程完成報表,請稍後再試.",
-    "coursecompletion": "用戶必須完成這一課程",
+    "coursecompletion": "課程進度",
     "criteria": "規準",
     "criteriagroup": "各種判斷條件",
     "criteriarequiredall": "必須滿足以下所有條件",
     "criteriarequiredany": "必須滿足以下任一條件",
-    "inprogress": "進行中",
+    "inprogress": "處理中",
     "manualselfcompletion": "手動自我完成",
     "notyetstarted": "尚未開始",
-    "pending": "待決",
-    "required": "必要的",
+    "pending": "等待中",
+    "required": "必須的",
     "requiredcriteria": "必要條件",
     "requirement": "需要",
-    "status": "允許訪客瀏覽",
+    "status": "狀態",
     "viewcoursereport": "查看課程報告"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es.json b/www/addons/files/lang/es.json
index 7521ea196f2..19e67205370 100644
--- a/www/addons/files/lang/es.json
+++ b/www/addons/files/lang/es.json
@@ -4,7 +4,7 @@
     "couldnotloadfiles": "La lista de archivos no ha podido cargarse.",
     "emptyfilelist": "No hay archivos que mostrar",
     "erroruploadnotworking": "Desafortunadamente en estos momentos no es posible subir archivos al sitio.",
-    "files": "Ficheros",
+    "files": "Archivos",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
     "privatefiles": "Ficheros privados",
     "sitefiles": "Archivos del sitio",
diff --git a/www/addons/files/lang/pt.json b/www/addons/files/lang/pt.json
index aad6d0a66be..6c19e745305 100644
--- a/www/addons/files/lang/pt.json
+++ b/www/addons/files/lang/pt.json
@@ -4,7 +4,7 @@
     "couldnotloadfiles": "Não foi possível carregar a lista de ficheiros",
     "emptyfilelist": "Este repositório está vazio",
     "erroruploadnotworking": "Infelizmente não é possível carregar ficheiros para o seu site.",
-    "files": "Anexos",
+    "files": "Ficheiros",
     "myprivatefilesdesc": "Ficheiros disponíveis na sua área privada neste site Moodle",
     "privatefiles": "Ficheiros privados",
     "sitefiles": "Ficheiros do site",
diff --git a/www/addons/files/lang/ro.json b/www/addons/files/lang/ro.json
index d8113b20c3d..269b6780a16 100644
--- a/www/addons/files/lang/ro.json
+++ b/www/addons/files/lang/ro.json
@@ -3,7 +3,7 @@
     "clicktoupload": "Apăsați butonul de mai jos pentru a încarcă fișierele în contul dumneavoastră.",
     "couldnotloadfiles": "Lista fișierelor nu a putut fi încărcată.",
     "emptyfilelist": "Nu există fișiere",
-    "files": "Fișiere",
+    "files": "Fişiere",
     "myprivatefilesdesc": "Fișierele disponibile din zona personală, pe care o dețineți pe acest site.",
     "privatefiles": "Fișiere private",
     "sitefiles": "Fişiere site",
diff --git a/www/addons/grades/lang/bg.json b/www/addons/grades/lang/bg.json
index 02c842d1272..49ff4539d55 100644
--- a/www/addons/grades/lang/bg.json
+++ b/www/addons/grades/lang/bg.json
@@ -1,3 +1,3 @@
 {
-    "viewgrades": "Разглеждане на оценки"
+    "viewgrades": "Виждане на оценките"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/el.json b/www/addons/grades/lang/el.json
index 5517b193e17..c1625a02671 100644
--- a/www/addons/grades/lang/el.json
+++ b/www/addons/grades/lang/el.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Δεν επιστράφηκε κανένας βαθμός",
-    "viewgrades": "Προβολή Βαθμών"
+    "viewgrades": "Προβολή βαθμών"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/fa.json b/www/addons/grades/lang/fa.json
index fd0241c2bc7..6c9c03151dd 100644
--- a/www/addons/grades/lang/fa.json
+++ b/www/addons/grades/lang/fa.json
@@ -1,3 +1,3 @@
 {
-    "viewgrades": "دیدن نمره‌ها"
+    "viewgrades": "مشاهدهٔ نمره‌ها"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/fr.json b/www/addons/grades/lang/fr.json
index 1c1ce861d2d..37ee094566f 100644
--- a/www/addons/grades/lang/fr.json
+++ b/www/addons/grades/lang/fr.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Aucune note retournée",
-    "viewgrades": "Affichage des notes"
+    "viewgrades": "Afficher les notes"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/he.json b/www/addons/grades/lang/he.json
index f6450d5c884..63f5df64a1c 100644
--- a/www/addons/grades/lang/he.json
+++ b/www/addons/grades/lang/he.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "לא הוחזרו ציונים",
-    "viewgrades": "תצוגת ציונים"
+    "viewgrades": "ראה ציונים"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/it.json b/www/addons/grades/lang/it.json
index 883d830fb4f..194c13b5f5a 100644
--- a/www/addons/grades/lang/it.json
+++ b/www/addons/grades/lang/it.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Non è stata ottenuta alcuna valutazione",
-    "viewgrades": "Visualizza valutazioni"
+    "viewgrades": "Visualizza risultati"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ja.json b/www/addons/grades/lang/ja.json
index 23abe78a3be..c49db645dae 100644
--- a/www/addons/grades/lang/ja.json
+++ b/www/addons/grades/lang/ja.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "評点がありません。",
-    "viewgrades": "評定を表示する"
+    "viewgrades": "評点を表示する"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/nl.json b/www/addons/grades/lang/nl.json
index a11f8e821e2..1b33ee8446a 100644
--- a/www/addons/grades/lang/nl.json
+++ b/www/addons/grades/lang/nl.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Geen cijfers",
-    "viewgrades": "Bekijk cijfers"
+    "viewgrades": "Bekijk de cijfers"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pl.json b/www/addons/grades/lang/pl.json
index 0f2f359336e..b2abf06357d 100644
--- a/www/addons/grades/lang/pl.json
+++ b/www/addons/grades/lang/pl.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Brak stopni",
-    "viewgrades": "Podgląd ocen"
+    "viewgrades": "Pokaż oceny"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ru.json b/www/addons/grades/lang/ru.json
index 733ed0c23e6..fac7633651b 100644
--- a/www/addons/grades/lang/ru.json
+++ b/www/addons/grades/lang/ru.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Нет оценок",
-    "viewgrades": "Просмотр оценок"
+    "viewgrades": "Посмотреть оценки"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/uk.json b/www/addons/grades/lang/uk.json
index 32dd4de48eb..86c7bf00584 100644
--- a/www/addons/grades/lang/uk.json
+++ b/www/addons/grades/lang/uk.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Немає оцінок",
-    "viewgrades": "Перегляд оцінок"
+    "viewgrades": "Подивитися оцінки"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/zh-tw.json b/www/addons/grades/lang/zh-tw.json
index 7dedc8d3d0c..9a7313f470a 100644
--- a/www/addons/grades/lang/zh-tw.json
+++ b/www/addons/grades/lang/zh-tw.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "未找到成績",
-    "viewgrades": "檢視成績"
+    "viewgrades": "檢視分數"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/ar.json b/www/addons/messages/lang/ar.json
index 09addb61436..a047f3dfa6a 100644
--- a/www/addons/messages/lang/ar.json
+++ b/www/addons/messages/lang/ar.json
@@ -10,10 +10,10 @@
     "messages": "رسائل",
     "mustbeonlinetosendmessages": "لابد أن تكون متصل بالأنترنت لكي ترسل أي رسائل",
     "newmessage": "رسالة جديدة",
-    "nomessages": "لا يوجد رساله/رسائل جديدة",
+    "nomessages": "لا توجد رسائل بعد",
     "nousersfound": "لا يوجد مستخدمون",
     "removecontact": "ازل عنوان الاتصال",
-    "send": "إرسال",
+    "send": "إرسل",
     "sendmessage": "إرسل رسالة",
     "type_offline": "غير متصل",
     "type_online": "متصل",
diff --git a/www/addons/messages/lang/bg.json b/www/addons/messages/lang/bg.json
index 29b451daeb9..7ca6c96125f 100644
--- a/www/addons/messages/lang/bg.json
+++ b/www/addons/messages/lang/bg.json
@@ -10,16 +10,16 @@
     "errorwhileretrievingcontacts": "Грешка при изчитането на списъка с контакти от сървъра.",
     "errorwhileretrievingdiscussions": "Грешка при изчитането на дискусиите от сървъра.",
     "errorwhileretrievingmessages": "Грешка при изчитането на съобщенията от сървъра.",
-    "message": "Съобщение",
+    "message": "Текст на съобщението",
     "messagenotsent": "Съобщението не беше изпратено. Моля опитайте пак по-късно.",
     "messagepreferences": "Предпочитания за съобщенията",
     "messages": "Съобщения",
     "mustbeonlinetosendmessages": "Трябва да сте онлайн, за да изпращате съобщения.",
     "newmessage": "Ново съобщение ...",
-    "nomessages": "Няма чакащи съобщения",
+    "nomessages": "Още няма съобщения",
     "nousersfound": "Не са намерени потребители",
     "removecontact": "Премахване на контакт",
-    "send": "Изпращане",
+    "send": "изпращане",
     "sendmessage": "Изпращане на съобщение",
     "type_blocked": "Блокиран",
     "type_offline": "Офлайн",
diff --git a/www/addons/messages/lang/ca.json b/www/addons/messages/lang/ca.json
index 04139bc73b4..4f5ba4c4f2f 100644
--- a/www/addons/messages/lang/ca.json
+++ b/www/addons/messages/lang/ca.json
@@ -13,17 +13,17 @@
     "errorwhileretrievingdiscussions": "S'ha produït un error mentre es recuperaven els debats del servidor.",
     "errorwhileretrievingmessages": "S'ha produït un error descarregant els missatges.",
     "loadpreviousmessages": "Carrega els missatges anteriors",
-    "message": "Missatge",
+    "message": "Cos del missatge",
     "messagenotsent": "El missatge no s'ha enviat. Si us plau, intenteu-ho més tard",
     "messages": "Missatges",
     "mustbeonlinetosendmessages": "Heu de tenir connexió a la xarxa per a enviar missatges",
     "newmessage": "Missatge nou",
     "newmessages": "Nous missatges",
-    "nomessages": "No teniu missatges pendents",
+    "nomessages": "No hi ha missatges encara",
     "nousersfound": "No s'han trobat usuaris",
     "removecontact": "Suprimeix contacte",
     "removecontactconfirm": "El contacte s'eliminarà de la vostra llista de contactes.",
-    "send": "Envia",
+    "send": "envia",
     "sendmessage": "Envia missatge",
     "type_blocked": "Bloquejat",
     "type_offline": "Fora de línia",
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index 90822283653..f5b9255069c 100644
--- a/www/addons/messages/lang/cs.json
+++ b/www/addons/messages/lang/cs.json
@@ -20,12 +20,12 @@
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
     "newmessage": "Nová zpráva",
     "newmessages": "Nové zprávy",
-    "nomessages": "Žádné zprávy",
+    "nomessages": "Zatím žádné zprávy",
     "nousersfound": "Nenalezeni žádní uživatelé",
     "removecontact": "Odebrat kontakt",
     "removecontactconfirm": "Kontakt bude odstraněn ze seznamu kontaktů.",
-    "send": "Odeslat",
-    "sendmessage": "Poslat zprávu",
+    "send": "odeslat",
+    "sendmessage": "Odeslat zprávu",
     "type_blocked": "Blokováno",
     "type_offline": "Offline",
     "type_online": "Online",
diff --git a/www/addons/messages/lang/da.json b/www/addons/messages/lang/da.json
index a77aadc57eb..160591f104a 100644
--- a/www/addons/messages/lang/da.json
+++ b/www/addons/messages/lang/da.json
@@ -11,16 +11,16 @@
     "errorwhileretrievingcontacts": "Fejl ved hentning af kontakter fra serveren",
     "errorwhileretrievingdiscussions": "Fejl ved hentning af diskussioner fra serveren",
     "errorwhileretrievingmessages": "Fejl ved hentning af beskeder fra serveren.",
-    "message": "Besked",
+    "message": "Beskedtekst",
     "messagenotsent": "Beskeden blev ikke sendt, prøv igen senere.",
     "messagepreferences": "Indstillinger for beskeder",
     "messages": "Beskeder",
     "mustbeonlinetosendmessages": "Du skal være online for at sende beskeder",
     "newmessage": "Ny besked",
-    "nomessages": "Ingen beskeder",
+    "nomessages": "Ingen beskeder endnu",
     "nousersfound": "Ingen brugere fundet",
     "removecontact": "Fjern kontakt",
-    "send": "Send",
+    "send": "send",
     "sendmessage": "Send besked",
     "type_blocked": "Blokeret",
     "type_offline": "Offline",
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index 6976449017a..bc1a86b23f3 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -9,13 +9,13 @@
     "errorwhileretrievingcontacts": "Σφάλμα κατά την ανάκτηση των επαφών από το διακομιστή.",
     "errorwhileretrievingdiscussions": "Σφάλμα κατά την ανάκτηση των συζητήσεων από το διακομιστή.",
     "errorwhileretrievingmessages": "Σφάλμα κατά την ανάκτηση των μηνυμάτων από το διακομιστή.",
-    "message": "Μήνυμα",
+    "message": "Σώμα μηνύματος",
     "messagenotsent": "Το μήνυμα δεν στάλθηκε, δοκιμάστε ξανά αργότερα.",
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
     "newmessage": "Νέο μήνυμα",
-    "nomessages": "Δεν υπάρχουν μηνύματα σε αναμονή",
+    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
     "nousersfound": "Δε βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "send": "Αποστολή",
diff --git a/www/addons/messages/lang/es-mx.json b/www/addons/messages/lang/es-mx.json
index cb30898bdb8..6fb2e3fd56a 100644
--- a/www/addons/messages/lang/es-mx.json
+++ b/www/addons/messages/lang/es-mx.json
@@ -13,18 +13,18 @@
     "errorwhileretrievingdiscussions": "Error al recuperar las discusiones del servidor.",
     "errorwhileretrievingmessages": "Error al recuperar los mensajes del servidor.",
     "loadpreviousmessages": "Cargar mensajes anteriores",
-    "message": "Mensaje",
+    "message": "Cuerpo del mensaje",
     "messagenotsent": "El mensaje no fue enviado; por favor inténtelo nuevamente después.",
     "messagepreferences": "Preferencias de Mensaje",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Usted debe de estar en-linea para enviar mensajes",
     "newmessage": "Nuevo mensaje",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "No hay mensajes",
+    "nomessages": "Aún no hay mensajes",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto será quitado de su lista de contactos.",
-    "send": "Enviar",
+    "send": "enviar",
     "sendmessage": "Enviar mensaje",
     "type_blocked": "Bloqueado",
     "type_offline": "Fuera-de-línea",
diff --git a/www/addons/messages/lang/es.json b/www/addons/messages/lang/es.json
index ffce3f75b23..4305590900f 100644
--- a/www/addons/messages/lang/es.json
+++ b/www/addons/messages/lang/es.json
@@ -11,16 +11,16 @@
     "errorwhileretrievingcontacts": "Error al recuperar los contactos del servidor.",
     "errorwhileretrievingdiscussions": "Error al recuperar las discusiones del servidor.",
     "errorwhileretrievingmessages": "Error al recuperar los mensajes del servidor.",
-    "message": "Mensaje",
+    "message": "Cuerpo del mensaje",
     "messagenotsent": "El mensaje no fue enviado; por favor inténtelo nuevamente después.",
     "messagepreferences": "Preferencias de mensajes",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Debe conectarse para enviar mensajes",
     "newmessage": "Nuevo mensaje",
-    "nomessages": "No hay mensajes en espera",
+    "nomessages": "Aún no hay mensajes",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
-    "send": "Enviar",
+    "send": "enviar",
     "sendmessage": "Enviar mensaje",
     "type_blocked": "Bloqueado",
     "type_offline": "Desconectado",
diff --git a/www/addons/messages/lang/eu.json b/www/addons/messages/lang/eu.json
index 0258a06f78d..58cbf5bd111 100644
--- a/www/addons/messages/lang/eu.json
+++ b/www/addons/messages/lang/eu.json
@@ -13,18 +13,18 @@
     "errorwhileretrievingdiscussions": "Errorea elkarrizketak zerbitzaritik jasotzean.",
     "errorwhileretrievingmessages": "Errorea mezuak zerbitzaritik jasotzean.",
     "loadpreviousmessages": "Kargatu aurreko mezuak",
-    "message": "Mezua",
+    "message": "Mezuren gurputza",
     "messagenotsent": "Mezua ez da bidali, mesedez saiatu beranduago.",
     "messagepreferences": "Mezuen hobespenak",
     "messages": "Mezuak",
     "mustbeonlinetosendmessages": "Online egon behar zara mezuak bidaltzeko.",
     "newmessage": "Mezu berria",
     "newmessages": "Mezu beriak",
-    "nomessages": "Ez duzu mezurik",
+    "nomessages": "Ez dago mezurik oraindik",
     "nousersfound": "Ez da erabiltzailerik aurkitu",
     "removecontact": "Ezabatu kontaktua",
     "removecontactconfirm": "Kontaktua zure kontaktuen zerrendatik ezabatuko da.",
-    "send": "Bidali",
+    "send": "bidali",
     "sendmessage": "Mezua bidali",
     "type_blocked": "Blokeatuta",
     "type_offline": "Lineaz kanpo",
diff --git a/www/addons/messages/lang/fa.json b/www/addons/messages/lang/fa.json
index 9e85892ad32..a6d80f69982 100644
--- a/www/addons/messages/lang/fa.json
+++ b/www/addons/messages/lang/fa.json
@@ -6,14 +6,14 @@
     "contactname": "نام مخاطب",
     "contacts": "مخاطبین",
     "errorwhileretrievingdiscussions": "خطا در دریافت مباحثه‌ها از کارگزار.",
-    "message": "پیام",
+    "message": "متن پیام",
     "messagepreferences": "ترجیحات پیام‌دهی",
     "messages": "پیام‌ها",
     "newmessage": "پیام جدید",
-    "nomessages": "هیچ پیغامی منتظر جواب نیست",
+    "nomessages": "هنوز پیامی گفته نشده است",
     "nousersfound": "کاربری پیدا نشد",
     "removecontact": "حذف کردن مخاطب",
-    "send": "ارسال",
+    "send": "فرستادن",
     "sendmessage": "ارسال پیام",
     "unblockcontact": "خارج کردن مخاطب از حالت مسدود"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/fr.json b/www/addons/messages/lang/fr.json
index c988ebada69..4e23fec2fc0 100644
--- a/www/addons/messages/lang/fr.json
+++ b/www/addons/messages/lang/fr.json
@@ -13,19 +13,19 @@
     "errorwhileretrievingdiscussions": "Erreur lors de la récupération des discussions depuis le serveur.",
     "errorwhileretrievingmessages": "Erreur lors de la récupération des messages depuis le serveur.",
     "loadpreviousmessages": "Charger les messages antérieurs",
-    "message": "Message personnel",
+    "message": "Corps du message",
     "messagenotsent": "Ce message n'a pas été envoyé. Veuillez essayer plus tard.",
     "messagepreferences": "Préférences des messages",
-    "messages": "Messages personnels",
+    "messages": "Messages",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
     "newmessage": "Nouveau message",
     "newmessages": "Nouveaux messages",
-    "nomessages": "Aucun message",
+    "nomessages": "Pas encore de messages",
     "nousersfound": "Aucun utilisateur n'a été trouvé",
     "removecontact": "Supprimer ce contact",
     "removecontactconfirm": "Le contact sera retiré de votre liste.",
     "send": "Envoyer",
-    "sendmessage": "Envoyer message personnel",
+    "sendmessage": "Envoyer message",
     "type_blocked": "Bloqué",
     "type_offline": "Hors ligne",
     "type_online": "En ligne",
diff --git a/www/addons/messages/lang/he.json b/www/addons/messages/lang/he.json
index f6f5f5402ec..fb473cf8205 100644
--- a/www/addons/messages/lang/he.json
+++ b/www/addons/messages/lang/he.json
@@ -10,17 +10,17 @@
     "errorwhileretrievingcontacts": "שגיאה בזמן טעינת אנשי קשר מהשרת.",
     "errorwhileretrievingdiscussions": "שגיאה בזמן טעינת הדיונים מהשרת.",
     "errorwhileretrievingmessages": "שגיאה בזמן טעינת המסרים מהשרת.",
-    "message": "מסר",
+    "message": "גוף ההודעה",
     "messagenotsent": "מסר זה לא נשלח, אנא נסה שוב מאוחר יותר.",
     "messagepreferences": "העדפות מסרים",
-    "messages": "מסרים",
+    "messages": "הודעות",
     "mustbeonlinetosendmessages": "עליך להיות מחובר/ת בכדי לשלוח מסר.",
     "newmessage": "הודעה חדשה",
-    "nomessages": "אין מסרים ממתינים",
+    "nomessages": "אין הודעות עדיין",
     "nousersfound": "לתשומת-לב",
     "removecontact": "הסרת איש הקשר",
-    "send": "לשלוח",
-    "sendmessage": "שליחת מסר",
+    "send": "שליחה",
+    "sendmessage": "שליחת הודעה",
     "type_blocked": "חסומים",
     "type_offline": "לא מחוברים",
     "type_online": "מחוברים",
diff --git a/www/addons/messages/lang/hu.json b/www/addons/messages/lang/hu.json
index 4b9bc7e02c1..324fe26fe60 100644
--- a/www/addons/messages/lang/hu.json
+++ b/www/addons/messages/lang/hu.json
@@ -7,14 +7,14 @@
     "contacts": "Kapcsolatok",
     "deletemessage": "Üzenet törlése",
     "deletemessageconfirmation": "Biztosan törli az üzenetet? Az csak a korábbi üzeneteiből törlődik, az azt küldő vagy fogadó fél továbbra is láthatja.",
-    "message": "Üzenet",
+    "message": "Üzenet törzsszövege",
     "messagepreferences": "Üzenet beállításai",
     "messages": "Üzenetek",
     "newmessage": "Új üzenet",
-    "nomessages": "Nincs üzenet.",
+    "nomessages": "Még nincs üzenet",
     "nousersfound": "Nincs felhasználó",
     "removecontact": "Kapcsolat törlése",
-    "send": "Küldés",
+    "send": "Elküld",
     "sendmessage": "Üzenet küldése",
     "unblockcontact": "Kapcsolat zárolásának feloldása"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/it.json b/www/addons/messages/lang/it.json
index 997e27210b3..50754d818b9 100644
--- a/www/addons/messages/lang/it.json
+++ b/www/addons/messages/lang/it.json
@@ -11,16 +11,16 @@
     "errorwhileretrievingcontacts": "Si è verificato un errore durante la ricezione dei contatti dal server.",
     "errorwhileretrievingdiscussions": "Si è verificato un errore durante la ricezione delle discussioni dal server.",
     "errorwhileretrievingmessages": "Si è verificato un errore durante la ricezione dei messaggi dal server.",
-    "message": "Messaggio",
+    "message": "Corpo del messaggio",
     "messagenotsent": "Il messaggio non è stato inviato, per favore riprova più tardi.",
     "messagepreferences": "Preferenze messaggi",
     "messages": "Messaggi",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
     "newmessage": "Nuovo messaggio",
-    "nomessages": "Nessun messaggio",
+    "nomessages": "Non ci sono ancora messaggi",
     "nousersfound": "Non trovato alcun utente",
     "removecontact": "Cancella contatti",
-    "send": "Invia",
+    "send": "invia",
     "sendmessage": "Invia messaggio",
     "type_blocked": "Bloccato",
     "type_offline": "Offline",
diff --git a/www/addons/messages/lang/ja.json b/www/addons/messages/lang/ja.json
index caabf24157e..fdd373a6acd 100644
--- a/www/addons/messages/lang/ja.json
+++ b/www/addons/messages/lang/ja.json
@@ -7,11 +7,11 @@
     "contacts": "コンタクト",
     "deletemessage": "メッセージを削除する",
     "deletemessageconfirmation": "本当にこのメッセージを削除してもよろしいですか? あなたのメッセージング履歴からのみ削除され、メッセージを送受信したユーザはまだ閲覧することができます。",
-    "message": "メッセージ",
+    "message": "メッセージ本文",
     "messagepreferences": "メッセージプリファレンス",
     "messages": "メッセージ",
     "newmessage": "新しいメッセージ",
-    "nomessages": "メッセージはありません。",
+    "nomessages": "メッセージがありません。",
     "nousersfound": "ユーザは見つかりませんでした。",
     "removecontact": "コンタクトから削除する",
     "send": "送信",
diff --git a/www/addons/messages/lang/lt.json b/www/addons/messages/lang/lt.json
index 32ed85f2598..f7896a10853 100644
--- a/www/addons/messages/lang/lt.json
+++ b/www/addons/messages/lang/lt.json
@@ -9,16 +9,16 @@
     "errorwhileretrievingcontacts": "Klaida nuskaitant kontaktus iš serverio.",
     "errorwhileretrievingdiscussions": "Klaida nuskaitant diskusijas iš serverio.",
     "errorwhileretrievingmessages": "Klaida nuskaitant pranešimus iš serverio.",
-    "message": "Žinutė",
+    "message": "Pranešimo tekstas",
     "messagenotsent": "Žinutė nebuvo išsiųsta, pabandykite vėliau.",
     "messagepreferences": "Žinučių nuostatos",
     "messages": "Žinutės",
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite prisijungti",
     "newmessage": "Nauja žinutė",
-    "nomessages": "Nėra žinučių",
+    "nomessages": "Žinučių dar nėra",
     "nousersfound": "Nerasta naudotojų",
     "removecontact": "Pašalinti kontaktą",
-    "send": "Siųsti",
+    "send": "siųsti",
     "sendmessage": "Siųsti žinutę",
     "type_blocked": "Užblokuota",
     "type_offline": "Neprisjungęs",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index 2c9ecfc57d8..a6059a8c50a 100644
--- a/www/addons/messages/lang/nl.json
+++ b/www/addons/messages/lang/nl.json
@@ -13,18 +13,18 @@
     "errorwhileretrievingdiscussions": "Fout bij het ophalen van discussies van de server.",
     "errorwhileretrievingmessages": "Fout bij het ophalen van berichten van de server.",
     "loadpreviousmessages": "Laad vorige berichten",
-    "message": "Bericht",
+    "message": "Berichtinhoud",
     "messagenotsent": "Het bericht is niet verzonden. Probeer het later opnieuw.",
     "messagepreferences": "Berichten voorkeuren",
     "messages": "Berichten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
     "newmessage": "Nieuw bericht",
     "newmessages": "Nieuwe berichten",
-    "nomessages": "Geen berichten",
+    "nomessages": "Nog geen berichten",
     "nousersfound": "Geen gebruikers gevonden",
     "removecontact": "Verwijder contactpersoon",
     "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
-    "send": "Verstuur",
+    "send": "Stuur",
     "sendmessage": "Stuur bericht",
     "type_blocked": "Geblokkeerd",
     "type_offline": "Offline",
diff --git a/www/addons/messages/lang/pl.json b/www/addons/messages/lang/pl.json
index 6cb4279d4f9..a0b20dc95eb 100644
--- a/www/addons/messages/lang/pl.json
+++ b/www/addons/messages/lang/pl.json
@@ -7,14 +7,14 @@
     "contacts": "Kontakty",
     "deletemessage": "Usuń wiadomość",
     "deletemessageconfirmation": "Czy jesteś pewien, że chcesz usunąć tę wiadomość? Zostanie ona usunięta wyłącznie z twojej historii wiadomości, użytkownik który ją wysłał lub odebrał nadal będzie mógł ją wyświetlić.",
-    "message": "Wiadomość",
+    "message": "Treść wiadomości",
     "messagepreferences": "Preferencje wiadomości",
     "messages": "Wiadomości",
     "newmessage": "Nowa wiadomość",
-    "nomessages": "Brak oczekujących wiadomości",
+    "nomessages": "Brak wiadomości",
     "nousersfound": "Nie znaleziono użytkowników",
     "removecontact": "Usuń kontakt",
-    "send": "Wyślij",
+    "send": "wyślij",
     "sendmessage": "Wyślij wiadomość",
     "unblockcontact": "Odblokuj kontakt"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index d1ae86c8e24..1f86ead74e4 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -13,17 +13,17 @@
     "errorwhileretrievingdiscussions": "Erro ao recuperar discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao recuperar as mensagens do servidor.",
     "loadpreviousmessages": "Carregar mensagens anteriores",
-    "message": "Mensagem",
+    "message": "Corpo da mensagem",
     "messagenotsent": "A mensagem não foi enviada. Por favor tente novamente mais tarde.",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Você precisa estar conectado para enviar mensagens.",
     "newmessage": "Nova Mensagem",
     "newmessages": "Novas mensagens",
-    "nomessages": "Sem novas mensagens",
+    "nomessages": "Nenhuma mensagem ainda",
     "nousersfound": "Nenhum usuário encontrado",
     "removecontact": "Eliminar contato",
     "removecontactconfirm": "O contato será removido da sua lista de contatos.",
-    "send": "Enviar",
+    "send": "enviar",
     "sendmessage": "Enviar mensagem",
     "type_blocked": "Bloqueado",
     "type_offline": "Offline",
diff --git a/www/addons/messages/lang/pt.json b/www/addons/messages/lang/pt.json
index e02c3d20af4..bff883b381f 100644
--- a/www/addons/messages/lang/pt.json
+++ b/www/addons/messages/lang/pt.json
@@ -13,14 +13,14 @@
     "errorwhileretrievingdiscussions": "Erro ao obter os tópicos de discussão do servidor.",
     "errorwhileretrievingmessages": "Erro ao obter as mensagens do servidor.",
     "loadpreviousmessages": "Carregar mensagens antigas",
-    "message": "Mensagem",
+    "message": "Corpo da mensagem",
     "messagenotsent": "A mensagem não foi enviada. Por favor, tente novamente mais tarde.",
     "messagepreferences": "Preferências das mensagens",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Precisa de estar online para enviar mensagens",
     "newmessage": "Nova mensagem",
     "newmessages": "Novas mensagens",
-    "nomessages": "Sem mensagens",
+    "nomessages": "Ainda não há mensagens",
     "nousersfound": "Nenhum utilizador encontrado",
     "removecontact": "Remover contacto",
     "removecontactconfirm": "O contacto será removido da sua lista de contactos.",
diff --git a/www/addons/messages/lang/ro.json b/www/addons/messages/lang/ro.json
index c3b70e79457..9b497816099 100644
--- a/www/addons/messages/lang/ro.json
+++ b/www/addons/messages/lang/ro.json
@@ -11,15 +11,15 @@
     "errorwhileretrievingcontacts": "A apărut o eroare în găsirea contactelor pe server.",
     "errorwhileretrievingdiscussions": "A apărut o eroare în găsirea conversațiilor de pe server.",
     "errorwhileretrievingmessages": "A apărut o eroare în găsirea mesajelor de pe server.",
-    "message": "Mesaj",
+    "message": "Conținut mesaj",
     "messagenotsent": "Mesajul nu a fost expediat, vă rugăm să încercați mai târziu.",
     "messages": "Mesaje",
     "mustbeonlinetosendmessages": "Trebuie să fiți online pentru a putea trimite mesaje",
     "newmessage": "Mesaj nou!",
-    "nomessages": "Nu există mesaje în aşteptare",
+    "nomessages": "Nu a fost trimis încă niciun mesaj",
     "nousersfound": "Nu s-au găsit utilizatori",
     "removecontact": "Şterge prieten din listă",
-    "send": "Trimite",
+    "send": "Trimis",
     "sendmessage": "Trimite mesaj",
     "type_blocked": "Blocat",
     "type_offline": "Deconectat",
diff --git a/www/addons/messages/lang/ru.json b/www/addons/messages/lang/ru.json
index 763c739f876..60b687c8d20 100644
--- a/www/addons/messages/lang/ru.json
+++ b/www/addons/messages/lang/ru.json
@@ -11,14 +11,14 @@
     "errorwhileretrievingdiscussions": "Ошибка при получении обсуждения с сервера.",
     "errorwhileretrievingmessages": "Ошибка при получении сообщения с сервера",
     "loadpreviousmessages": "Загрузить предыдущее сообщение",
-    "message": "Сообщение",
+    "message": "Текст сообщения",
     "messagenotsent": "Сообщение не было отправлено. Повторите попытку позже.",
     "messagepreferences": "Настройки сообщений",
     "messages": "Сообщения",
     "mustbeonlinetosendmessages": "Вы должны быть на сайте, чтобы отправлять сообщения",
     "newmessage": "Новое сообщение",
     "newmessages": "Новые сообщения",
-    "nomessages": "Нет новых сообщений",
+    "nomessages": "Нет ни одного сообщения",
     "nousersfound": "Пользователи не найдены",
     "removecontact": "Удалить собеседника из моего списка",
     "send": "Отправить",
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index 1539f736369..67a28f6c9e3 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -11,15 +11,15 @@
     "errorwhileretrievingcontacts": "Fel vid hämtning av kontakter från servern.",
     "errorwhileretrievingdiscussions": "Fel vid hämtning  av diskussionerna från servern.",
     "errorwhileretrievingmessages": "Fel vid hämtning meddelanden från servern.",
-    "message": "Meddelande",
+    "message": "Meddelandets brödtext",
     "messagenotsent": "Meddelandet skickades inte, försök igen senare.",
     "messages": "Meddelanden",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
     "newmessage": "Nytt meddelande",
-    "nomessages": "Inga avvaktande meddelanden",
+    "nomessages": "Inga meddelanden än",
     "nousersfound": "Det gick inte att hitta några användare",
     "removecontact": "Ta bort kontakt",
-    "send": "Skicka",
+    "send": "skicka",
     "sendmessage": "Skicka meddelande",
     "type_blocked": "blockerad",
     "type_offline": "Offline",
diff --git a/www/addons/messages/lang/tr.json b/www/addons/messages/lang/tr.json
index ad8dc3b2766..eb07c45148f 100644
--- a/www/addons/messages/lang/tr.json
+++ b/www/addons/messages/lang/tr.json
@@ -5,11 +5,11 @@
     "contactlistempty": "Kişi listeniz şu anda boş",
     "contactname": "Adı",
     "contacts": "Kişiler",
-    "message": "Mesaj",
+    "message": "Mesaj gövdesi",
     "messagepreferences": "İleti tercihleri",
     "messages": "Mesajlar",
     "newmessage": "Yeni ileti",
-    "nomessages": "Yeni ileti yok",
+    "nomessages": "Henüz mesaj yok",
     "nousersfound": "Kullanıcı bulunamadı",
     "removecontact": "Kişiyi sil",
     "send": "Gönder",
diff --git a/www/addons/messages/lang/uk.json b/www/addons/messages/lang/uk.json
index 67e1bc5c737..7ad5731c9cd 100644
--- a/www/addons/messages/lang/uk.json
+++ b/www/addons/messages/lang/uk.json
@@ -11,17 +11,17 @@
     "errorwhileretrievingdiscussions": "Помилка при отриманні обговорення з сервера.",
     "errorwhileretrievingmessages": "Помилка при отриманні повідомлень від сервера.",
     "loadpreviousmessages": "Завантаження попередніх повідомлень",
-    "message": "Повідомлення",
+    "message": "Текст повідомлення",
     "messagenotsent": "Повідомлення не було відправлено, будь ласка, спробуйте ще раз пізніше.",
     "messages": "Повідомлення",
     "mustbeonlinetosendmessages": "Ви повинні бути онлайн, щоб відправляти повідомлення",
     "newmessage": "Нове повідомлення...",
     "newmessages": "Нові повідомлення",
-    "nomessages": "Немає нових повідомлень",
+    "nomessages": "Ще немає повідомлень",
     "nousersfound": "Користувачів не знайдено",
     "removecontact": "Видалити контакт",
     "removecontactconfirm": "Контакт буде видалено зі списку контактів.",
-    "send": "Надіслати",
+    "send": "Відіслати",
     "sendmessage": "Надіслати повідомлення",
     "type_blocked": "Заблоковано",
     "type_offline": "Офлайн",
diff --git a/www/addons/messages/lang/zh-cn.json b/www/addons/messages/lang/zh-cn.json
index 95fc354d0fb..38ed871a73d 100644
--- a/www/addons/messages/lang/zh-cn.json
+++ b/www/addons/messages/lang/zh-cn.json
@@ -6,12 +6,12 @@
     "contactname": "联系人",
     "contacts": "联系人",
     "deletemessage": "删除消息",
-    "message": "消息",
+    "message": "内容",
     "messages": "消息",
-    "nomessages": "没有新消息",
+    "nomessages": "无消息",
     "nousersfound": "未找到用户",
     "removecontact": "删除联系人",
     "send": "发送",
-    "sendmessage": "发送消息",
+    "sendmessage": "发消息",
     "unblockcontact": "不再阻拦联系人"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/zh-tw.json b/www/addons/messages/lang/zh-tw.json
index 6933c72f05a..7cdec1f8ea1 100644
--- a/www/addons/messages/lang/zh-tw.json
+++ b/www/addons/messages/lang/zh-tw.json
@@ -11,17 +11,17 @@
     "errorwhileretrievingcontacts": "從伺服器存取聯絡人時出錯",
     "errorwhileretrievingdiscussions": "從伺服器存取討論區時出錯",
     "errorwhileretrievingmessages": "從伺服器存取訊息時出錯",
-    "message": "簡訊",
+    "message": "訊息主文",
     "messagenotsent": "訊息未發送, 請稍後再試.",
     "messagepreferences": "簡訊偏好",
-    "messages": "簡訊",
+    "messages": "訊息",
     "mustbeonlinetosendmessages": "您必須上線才能發送訊息",
     "newmessage": "新簡訊",
-    "nomessages": "沒有待處理的簡訊",
+    "nomessages": "尚無訊息",
     "nousersfound": "找不到用戶",
     "removecontact": "刪除聯絡人",
-    "send": "送出",
-    "sendmessage": "傳送簡訊",
+    "send": "傳送",
+    "sendmessage": "寄送訊息",
     "type_blocked": "已停止",
     "type_offline": "離線",
     "type_online": "上線",
diff --git a/www/addons/mod/assign/lang/ar.json b/www/addons/mod/assign/lang/ar.json
index 72700f0eb7f..0fa2999789a 100644
--- a/www/addons/mod/assign/lang/ar.json
+++ b/www/addons/mod/assign/lang/ar.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "سيبدأ قبول التسليمات لهذا التكليف (المهمة) ابتداءً من <strong>{{$a}}</strong>",
     "applytoteam": "تطبيق الدرجات والتغذية الراجعة (الملاحظات) على المجموعة بأكملها",
     "assignmentisdue": "فات موعد التسليم",
-    "attemptnumber": "محاولة",
+    "attemptnumber": "رقم المحاولة",
     "attemptreopenmethod": "تم إعادة فتح المحاولة",
     "attemptreopenmethod_manual": "يدوياً",
     "attemptreopenmethod_untilpass": "تلقائياً حتى النجاح",
@@ -17,7 +17,7 @@
     "currentattempt": "هذه المحاولة {{$a}}.",
     "currentattemptof": "هذه المحاولة رقم{{$a.attemptnumber}} ( {{$a.maxattempts}} محاولات مسموحة ).",
     "currentgrade": "الدرجة الحالية في",
-    "duedate": "موعد التسليم",
+    "duedate": "تاريخ تقديم مهمة",
     "duedateno": "لا يوجد موعد لتقديم المهمة",
     "editsubmission": "حرر تسليمي",
     "grade": "درجة",
@@ -32,8 +32,8 @@
     "numberofsubmittedassignments": "مسلمة",
     "numwords": "{{$a}} كلمات",
     "outof": "من {{$a}}",
-    "overdue": "متأخر جدا",
-    "savechanges": "أحفظ التغيرات",
+    "overdue": "<font color=\"red\"></font>فات موعد تسليم الوظيفة بـ: {{$a}}",
+    "savechanges": "حفظ التغييرات",
     "submission": "تسليم",
     "submissionslocked": "هذه الوظيفة لا تقبل التسليم الآن",
     "submissionstatus": "حالة التسليم",
@@ -45,5 +45,5 @@
     "submittedearly": "تم تسليم الوظيفة مبكرة بـ{{$a}}",
     "submittedlate": "تم تسليم الوظيفة متأخرة بـ{{$a}}",
     "timemodified": "وقت التعديل",
-    "timeremaining": "الزمن المتبقى"
+    "timeremaining": "الزمن المتبقي"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/bg.json b/www/addons/mod/assign/lang/bg.json
index 6d87ce1aaca..295e547bd7b 100644
--- a/www/addons/mod/assign/lang/bg.json
+++ b/www/addons/mod/assign/lang/bg.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "По това задание се приемат работи от <strong>{{$a}}</strong>",
     "applytoteam": "Прилагане на оценки и забележки към цялата група",
     "assignmentisdue": "Заданието е приключило",
-    "attemptnumber": "Опит",
+    "attemptnumber": "Брой опити",
     "attemptreopenmethod": "Отворени отново опити",
     "attemptreopenmethod_manual": "Ръчно",
     "attemptreopenmethod_untilpass": "Автоматично до завършване",
@@ -46,15 +46,15 @@
     "nomoresubmissionsaccepted": "Само за участници, получили позволение за отлагане",
     "noonlinesubmissions": "Това задание не изисква от Вас нищо да качвате онлайн",
     "nosubmission": "Нищо не е изпратено по това задание",
-    "notgraded": "Неоценен",
+    "notgraded": "Неоценена",
     "numberofdraftsubmissions": "Чернови",
     "numberofparticipants": "Участници",
     "numberofsubmissionsneedgrading": "Изискващи оценка",
     "numberofsubmittedassignments": "Предадени",
     "numberofteams": "Групи",
     "numwords": "{{$a}} думи",
-    "outof": "{{$a.grade}} от {{$a.maxgrade}}",
-    "overdue": "Закъсняло предаване",
+    "outof": "{{$a.current}} от {{$a.total}}",
+    "overdue": "<font color=\"red\">Предаването на работата закъснява с {{$a}} след срока</font>",
     "savechanges": "Записване на промените",
     "submission": "Задание",
     "submissioneditable": "Студентът може да редактира това задание",
@@ -73,8 +73,8 @@
     "submitassignment_help": "Предадете ли веднъж работата по заданието, Вие няма да можете да я променяте повече.",
     "submittedearly": "Работата е предадена {{$a}} по-рано",
     "submittedlate": "Работата по заданието е предадена с {{$a}} закъснение",
-    "timemodified": "Време на промяна",
-    "timeremaining": "Time Remaining",
+    "timemodified": "Последна промяна",
+    "timeremaining": "Оставащо време",
     "unlimitedattempts": "Неограничен",
     "userswhoneedtosubmit": "Потребители, които трябва да предадат: {{$a}}",
     "viewsubmission": "Преглед на предадена работа"
diff --git a/www/addons/mod/assign/lang/ca.json b/www/addons/mod/assign/lang/ca.json
index ecf9351e561..9d246a7ff12 100644
--- a/www/addons/mod/assign/lang/ca.json
+++ b/www/addons/mod/assign/lang/ca.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Aquesta tasca acceptarà trameses des de <strong>{{$a}}</strong>",
     "applytoteam": "Aplica les qualificacions i la retroacció al grup sencer",
     "assignmentisdue": "La tasca ha vençut",
-    "attemptnumber": "Intent",
+    "attemptnumber": "Número d'intent",
     "attemptreopenmethod": "Intents reoberts",
     "attemptreopenmethod_manual": "Manualment",
     "attemptreopenmethod_untilpass": "Automàticament fins superació",
@@ -23,7 +23,7 @@
     "currentgrade": "Qualificació actual en el llibre de qualificacions",
     "cutoffdate": "Data límit",
     "defaultteam": "Grup per omissió",
-    "duedate": "Data límit",
+    "duedate": "Data de venciment",
     "duedateno": "Sense data de venciment",
     "duedatereached": "La data de venciment de la tasca ja ha passat",
     "editingstatus": "S'està editant l'estat",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "No es pot mostrar la informació de la tramesa",
     "extensionduedate": "Data de venciment de la pròrroga",
     "feedbacknotsupported": "Aquesta retroacció no està admesa per l'aplicació i podria no contenir tota la informació",
-    "grade": "Qualificació",
+    "grade": "Qualifica",
     "graded": "Qualificada",
     "gradedby": "Qualificat per",
-    "gradedon": "Qualificat: {{$a}}",
+    "gradedon": "Qualificat el",
     "gradenotsynced": "La puntuació no està sincronitzada",
     "gradeoutof": "Qualificació sobre {{$a}}",
     "gradingstatus": "Estat de la qualificació",
@@ -57,15 +57,15 @@
     "nosubmission": "No s'ha tramès res per a aquesta tasca",
     "notallparticipantsareshown": "Els participants que no tinguin cap tramesa no es mostren",
     "noteam": "No és membre de cap grup",
-    "notgraded": "Sense qualificar",
+    "notgraded": "Sense qualificació",
     "numberofdraftsubmissions": "Esborranys",
     "numberofparticipants": "Participants",
     "numberofsubmissionsneedgrading": "Necessiten qualificació",
     "numberofsubmittedassignments": "S'han tramès",
     "numberofteams": "Grups",
     "numwords": "{{$a}} paraules",
-    "outof": "{{$a.grade}} d'un màxim de {{$a.maxgrade}}",
-    "overdue": "Venciment",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">La tasca ha vençut fa: {{$a}}</font>",
     "savechanges": "Desa els canvis",
     "submission": "Tramesa",
     "submissioneditable": "L'estudiant pot editar aquesta tramesa",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Un cop s'hagi tramès la tasca no podreu fer més canvis",
     "submittedearly": "La tasca s'ha tramès {{$a}} abans del límit",
     "submittedlate": "La tasca s'ha tramès {{$a}} tard",
-    "timemodified": "Hora de la modificació",
+    "timemodified": "Darrera modificació",
     "timeremaining": "Temps restant",
     "ungroupedusers": "El paràmetre «Cal formar part d'un grup per fer una tramesa» està activat, i alguns usuaris o no són membres de cap grup o són membres de més d'un grup, per la qual cosa no poden fer trameses.",
     "unlimitedattempts": "Il·limitats",
diff --git a/www/addons/mod/assign/lang/cs.json b/www/addons/mod/assign/lang/cs.json
index 094a4ab20aa..5a161371d89 100644
--- a/www/addons/mod/assign/lang/cs.json
+++ b/www/addons/mod/assign/lang/cs.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Odevzdat úkol bude možné od <strong>{{$a}}</strong>",
     "applytoteam": "Použít hodnocení pro celou skupinu",
     "assignmentisdue": "Úkol je zpožděn",
-    "attemptnumber": "Pokus",
+    "attemptnumber": "Číslo pokusu",
     "attemptreopenmethod": "Opětovné otevření pokusů",
     "attemptreopenmethod_manual": "Ručně",
     "attemptreopenmethod_untilpass": "Automaticky dokud neuspěje",
@@ -23,7 +23,7 @@
     "currentgrade": "Momentální známka v klasifikaci kurzu",
     "cutoffdate": "Datum ukončení",
     "defaultteam": "Výchozí skupina",
-    "duedate": "Termín dokončení",
+    "duedate": "Termín odevzdání",
     "duedateno": "Bez termínu odevzdání",
     "duedatereached": "Termín pro odevzdání tohoto úkolu vypršel",
     "editingstatus": "Stav úprav",
@@ -35,7 +35,7 @@
     "grade": "Známka",
     "graded": "Udělena známka",
     "gradedby": "Hodnoceno",
-    "gradedon": "Známkování: {{$a}}",
+    "gradedon": "Hodnoceno na",
     "gradenotsynced": "Známky nejsou synchronizovány",
     "gradeoutof": "Hodnoceno z {{$a}}",
     "gradingstatus": "Stav hodnocení",
@@ -57,17 +57,17 @@
     "nosubmission": "K tomuto úkolu nebylo nic odevzdáno",
     "notallparticipantsareshown": "Nejsou zobrazeni účastníci bez odevzdaného řešení úkolu",
     "noteam": "Není členem žádné skupiny",
-    "notgraded": "Není hodnoceno",
+    "notgraded": "Nehodnoceno",
     "numberofdraftsubmissions": "Návrhy",
     "numberofparticipants": "Účastníci",
     "numberofsubmissionsneedgrading": "Nutno ohodnotit",
     "numberofsubmittedassignments": "Odevzdáno",
     "numberofteams": "Skupiny",
     "numwords": "{{$a}} slov",
-    "outof": "{{$a.grade}} z možných {{$a.maxgrade}}",
-    "overdue": "Zpožděný",
+    "outof": "{{$a.current}} ze {{$a.total}}",
+    "overdue": "<font color=\"red\">Úkol má zpoždění: {{$a}}</font>",
     "savechanges": "Uložit změny",
-    "submission": "Odeslání",
+    "submission": "Odevzdané úkoly",
     "submissioneditable": "Student může upravit tento úkol",
     "submissionnoteditable": "Student nemůže upravit tento úkol",
     "submissionnotsupported": "Tento formát řešení úkolu není aplikací podporován a nemůže obsahovat  informace",
@@ -85,8 +85,8 @@
     "submitassignment_help": "Po odevzdání úkolu nebudete moci provádět žádné změny.",
     "submittedearly": "Úkoly byly odevzdány {{$a}} včas",
     "submittedlate": "Úkoly byly odevzdány {{$a}} po termínu",
-    "timemodified": "Čas poslední úpravy",
-    "timeremaining": "Zbývající čas",
+    "timemodified": "Naposledy změněno",
+    "timeremaining": "Zbývá",
     "ungroupedusers": "Nastavení \"Vyžadovat zařazení do skupiny\" je zapnuto a někteří uživatelé nejsou  zařazeni do skupiny, bude jim to bránit v odevzdání úkolu.",
     "unlimitedattempts": "Bez omezení",
     "userswhoneedtosubmit": "Uživatelé, kteří potřebují odevzdat úkol:  {{$a}}",
diff --git a/www/addons/mod/assign/lang/da.json b/www/addons/mod/assign/lang/da.json
index d079adeff83..b8900d9e6d4 100644
--- a/www/addons/mod/assign/lang/da.json
+++ b/www/addons/mod/assign/lang/da.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Denne opgave accepterer afleveringer fra <strong>{{$a}}</strong>",
     "applytoteam": "Anvend karakterer og feedback til hele gruppen",
     "assignmentisdue": "Afleveringsfristen er overskredet",
-    "attemptnumber": "Besvarelse",
+    "attemptnumber": "Antal forsøg på besvarelse",
     "attemptreopenmethod": "Besvarelser som er blevet genåbnet",
     "attemptreopenmethod_manual": "Manuelt",
     "attemptreopenmethod_untilpass": "Automatisk indtil bestået",
@@ -19,7 +19,7 @@
     "currentgrade": "Aktuelle karakter i karakterbogen",
     "cutoffdate": "Skæringsdato",
     "defaultteam": "Standardgruppe",
-    "duedate": "Udløbsdato",
+    "duedate": "Afleveringsdato",
     "duedateno": "Ingen afleveringsfrist",
     "duedatereached": "Afleveringsfristen er overskredet",
     "editingstatus": "Redigeringsstatus",
@@ -28,7 +28,7 @@
     "grade": "Karakter",
     "graded": "Bedømt",
     "gradedby": "Bedømt af",
-    "gradedon": "Bedømt: {{$a}}",
+    "gradedon": "Bedømt",
     "gradeoutof": "Bedømmelse af {{$a}}",
     "gradingstatus": "Vurderingsstatus",
     "groupsubmissionsettings": "Indstillinger for gruppeaflevering",
@@ -55,8 +55,8 @@
     "numberofsubmittedassignments": "Afleveret",
     "numberofteams": "Grupper",
     "numwords": "{{$a}} ord",
-    "outof": "{{$a.grade}} ud af {{$a.maxgrade}}",
-    "overdue": "For sent",
+    "outof": "{{$a.current}} ud af {{$a.total}}",
+    "overdue": "<font color=\"red\">Afleveringsdatoen er overskredet med {{$a}}</font>",
     "savechanges": "Gem ændringer",
     "submission": "Aflevering",
     "submissioneditable": "Den studerende kan redigere opgaven.",
@@ -75,8 +75,8 @@
     "submitassignment_help": "Når opgaven er afleveret kan du ikke længere foretage ændringer i den.",
     "submittedearly": "Opgaven blev afleveret {{$a}} for tidligt",
     "submittedlate": "Opgaven blev afleveret {{$a}} for sent",
-    "timemodified": "Ændret",
-    "timeremaining": "Tid tilbage",
+    "timemodified": "Seneste ændring",
+    "timeremaining": "Resterende tid",
     "ungroupedusers": "Indstillingen 'Kræv gruppeaflevering' er slået til, og nogle brugere er forhindret i at aflevere opgaver da de ikke er med i en gruppe eller er medlem af mere end en gruppe.",
     "unlimitedattempts": "Ubegrænset",
     "userswhoneedtosubmit": "Brugere, der skal aflevere: {{$a}}",
diff --git a/www/addons/mod/assign/lang/de.json b/www/addons/mod/assign/lang/de.json
index 454b93867e6..802d7887f82 100644
--- a/www/addons/mod/assign/lang/de.json
+++ b/www/addons/mod/assign/lang/de.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Abgabe möglich ab <strong>{{$a}}</strong>",
     "applytoteam": "Bewertungen und Feedback der gesamten Gruppe zuweisen.",
     "assignmentisdue": "Das Abgabeende ist vorbei",
-    "attemptnumber": "Versuch",
+    "attemptnumber": "Nummer des Versuchs",
     "attemptreopenmethod": "Versuche erneut bearbeitbar",
     "attemptreopenmethod_manual": "Manuell",
     "attemptreopenmethod_untilpass": "Automatisch bis zum Bestehen",
@@ -23,7 +23,7 @@
     "currentgrade": "Aktuelle Bewertung",
     "cutoffdate": "Letzte Abgabemöglichkeit",
     "defaultteam": "Standard-Gruppe",
-    "duedate": "Abgabedatum",
+    "duedate": "Fälligkeitsdatum",
     "duedateno": "Kein Fälligkeitsdatum",
     "duedatereached": "Das Fälligkeitsdatum für diese Aufgabe ist vorbei.",
     "editingstatus": "Bearbeitungsstatus",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "Die Abgabeinformationen können nicht angezeigt werden.",
     "extensionduedate": "Verlängerung des Fälligkeitsdatums",
     "feedbacknotsupported": "Dieses Feedback wird von der App nicht unterstützt und könnte möglicherweise Informationen unvollständig enthalten.",
-    "grade": "Bewertung",
+    "grade": "Relative Bewertung",
     "graded": "Bewertet",
     "gradedby": "Bewertet von",
-    "gradedon": "{{$a}} bewertet",
+    "gradedon": "Bewertet am",
     "gradenotsynced": "Bewertung nicht synchronisiert",
     "gradeoutof": "Bewertung (max. {{$a}})",
     "gradingstatus": "Bewertungsstatus",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Abgegeben",
     "numberofteams": "Gruppen",
     "numwords": "{{$a}} Wörter",
-    "outof": "{{$a.grade}} von {{$a.maxgrade}}",
-    "overdue": "Überfällig",
-    "savechanges": "Änderungen speichern",
-    "submission": "Leistungen",
+    "outof": "{{$a.current}} von {{$a.total}}",
+    "overdue": "<font color=\"red\">Abgabeende überschritten seit: {{$a}}</font>",
+    "savechanges": "Änderungen sichern",
+    "submission": "Abgabe",
     "submissioneditable": "Teilnehmer/innen können eingereichte Lösung bearbeiten",
     "submissionnoteditable": "Teilnehmer/innen können eingereichte Lösung nicht bearbeiten",
     "submissionnotsupported": "Diese Abgabe wird von der App nicht unterstützt und könnte möglicherweise Informationen unvollständig enthalten.",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Sobald diese Aufgabe abgegeben wird, sind keine weiteren Änderungen mehr möglich",
     "submittedearly": "Aufgabe wurde {{$a}} vor dem Abgabeende abgegeben",
     "submittedlate": "Aufgabe wurde {{$a}} verspätet abgegeben",
-    "timemodified": "Zeit geändert",
+    "timemodified": "Zuletzt geändert",
     "timeremaining": "Verbleibende Zeit",
     "ungroupedusers": "Die Option 'Gruppe notwendig, um etwas abgeben zu können' ist aktiviert. Es gibt Personen ohne Gruppe oder Personen mit mehreren Gruppen, die deshalb nichts abgeben können.",
     "unlimitedattempts": "Unbegrenzt",
diff --git a/www/addons/mod/assign/lang/el.json b/www/addons/mod/assign/lang/el.json
index 5bca12edf13..321937193aa 100644
--- a/www/addons/mod/assign/lang/el.json
+++ b/www/addons/mod/assign/lang/el.json
@@ -6,7 +6,7 @@
     "addsubmission": "Υποβολή",
     "allowsubmissionsfromdate": "Επέτρεψε υποβολές από",
     "assignmentisdue": "Η προθεσμία έχει λήξει",
-    "attemptnumber": "Προσπάθεια",
+    "attemptnumber": "Αριθμός προσπάθειας",
     "attemptreopenmethod": "Να ξανανοίξουν οι προσπάθειες",
     "attemptreopenmethod_manual": "Χειροκίνητα",
     "attemptsettings": "Ρυθμίσεις προσπάθειας",
@@ -17,7 +17,7 @@
     "currentattemptof": "Αυτή είναι η  {{$a.attemptnumber}} προσπάθεια  ( {{$a.maxattempts}} προσπάθειες επιτρέπονται).",
     "currentgrade": "Τωρινός βαθμός στο βαθμολόγιο",
     "defaultteam": "Προεπιλεγμένη ομάδα",
-    "duedate": "Ημερομηνία εκπνοής",
+    "duedate": "Καταληκτική ημερομηνία",
     "duedateno": "Χωρίς καταληκτική ημερομηνία",
     "editingstatus": "Επεξεργασία κατάστασης",
     "editsubmission": "Τροποποίηση της υποβολής μου",
@@ -26,7 +26,7 @@
     "grade": "Βαθμός",
     "graded": "Βαθμολογήθηκε",
     "gradedby": "Βαθμολογήθηκε από",
-    "gradedon": "Βαθμολογημένα: {{$a}}",
+    "gradedon": "Βαθμολογήθηκε στις",
     "gradingstatus": "Κατάσταση Βαθμολόγησης",
     "groupsubmissionsettings": "Ρυθμίσεις ομαδικής υποβολής",
     "latesubmissions": "Εκπρόθεσμες υποβολές",
@@ -41,9 +41,9 @@
     "numberofsubmittedassignments": "Υποβλήθηκε",
     "numberofteams": "Ομάδες",
     "numwords": "{{$a}} λέξεις",
-    "outof": "{{$a.grade}} από ένα μέγιστο {{$a.maxgrade}}",
-    "overdue": "Καθυστερημένο",
-    "savechanges": "Αποθήκευση Αλλαγών",
+    "outof": "Από τα {{$a}}",
+    "overdue": "<font color=\"red\">Η εργασία είναι εκπρόθεσμη για: {{$a}}</font>",
+    "savechanges": "Αποθήκευση αλλαγών",
     "submission": "Υποβολή",
     "submissionnoteditable": "Δε μπορεί να γίνει επεξεργασία της υποβολής",
     "submissionnotsupported": "Η υποβολή αυτή δεν υποστηρίζεται από την εφαρμογή και δεν μπορεί να περιέχει όλα τα στοιχεία που",
@@ -58,8 +58,8 @@
     "submitassignment": "Υποβολή εργασίας",
     "submittedearly": "Η εργασία υποβλήθηκε νωρίτερα κατά {{$a}}",
     "submittedlate": "Η εργασία υποβλήθηκε {{$a}} αργότερα",
-    "timemodified": "Ο χρόνος μεταβλήθηκε",
-    "timeremaining": "Υπολοιπόμενος χρόνος",
+    "timemodified": "Τελευταία Τροποποίηση",
+    "timeremaining": "Υπολειπόμενος χρόνος",
     "userwithid": "Ο χρήστης με id {{id}}",
     "viewsubmission": "Προβολή υποβολής",
     "warningsubmissiongrademodified": "Ο βαθμός υποβολής τροποποιήθηκε στο site.",
diff --git a/www/addons/mod/assign/lang/es-mx.json b/www/addons/mod/assign/lang/es-mx.json
index 8d1550acdf0..1e8f0405cf7 100644
--- a/www/addons/mod/assign/lang/es-mx.json
+++ b/www/addons/mod/assign/lang/es-mx.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Esta tarea aceptará entregas de <strong>{{$a}}</strong>",
     "applytoteam": "Aplicar calificaciones y retroalimentación a todo el equipo",
     "assignmentisdue": "La tarea ha vencido",
-    "attemptnumber": "Intento",
+    "attemptnumber": "Número de intento",
     "attemptreopenmethod": "Intentos reabiertos",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automáticamente hasta pasar",
@@ -23,7 +23,7 @@
     "currentgrade": "Calificación actual en el libro",
     "cutoffdate": "Fecha de corte",
     "defaultteam": "Grupo por defecto",
-    "duedate": "Fecha prometida/esperada",
+    "duedate": "Fecha de entrega",
     "duedateno": "No hay fecha de entrega",
     "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
     "editingstatus": "Estatus de edición",
@@ -35,7 +35,7 @@
     "grade": "Calificación",
     "graded": "Calificado",
     "gradedby": "Calificado por",
-    "gradedon": "Calificados {{$a}}",
+    "gradedon": "Calificado en",
     "gradenotsynced": "Calificación no sincronizada",
     "gradeoutof": "Calificación sobre {{$a}}",
     "gradingstatus": "Estatus de calificación",
@@ -57,17 +57,17 @@
     "nosubmission": "No se ha enviado nada en esta tarea",
     "notallparticipantsareshown": "Los participantes sin envíos no se muestran",
     "noteam": "No es miembro de ningún grupo",
-    "notgraded": "No calificada",
+    "notgraded": "No calificado",
     "numberofdraftsubmissions": "Borradores",
     "numberofparticipants": "Participantes",
     "numberofsubmissionsneedgrading": "Necesita calificarse",
     "numberofsubmittedassignments": "Enviados",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palabras",
-    "outof": "{{$a.grade}} de un total de {{$a.maxgrade}}",
-    "overdue": "Vencido",
+    "outof": "{{$a.current}} de un total de {{$a.total}}",
+    "overdue": "<font color=\"red\">La Tarea está retrasada por: {{$a}}</font>",
     "savechanges": "Guardar cambios",
-    "submission": "Envío",
+    "submission": "Entrega",
     "submissioneditable": "Los estudiantes pueden editar este envío",
     "submissionnoteditable": "Los estudiantes no pueden editar este envío",
     "submissionnotsupported": "Este envío no es soportado por la App y es posible que no contenga toda la información",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Una vez que esta tarea se haya enviado, usted no podrá hacerle más cambios",
     "submittedearly": "La tarea fue enviada {{$a}} antes",
     "submittedlate": "La tarea fue enviada {{$a}} después",
-    "timemodified": "Tiempo modificado",
+    "timemodified": "Última modificación",
     "timeremaining": "Tiempo restante",
     "ungroupedusers": "La configuración de 'Requerir grupo para hacer envío' está activada y algunos usuarios, o no son miembros de ningún grupo, o son miembros de más de un grupo, por lo que no pueden hacer envíos.",
     "unlimitedattempts": "Ilimitados",
diff --git a/www/addons/mod/assign/lang/es.json b/www/addons/mod/assign/lang/es.json
index b5a5cc2f359..35e141f70c9 100644
--- a/www/addons/mod/assign/lang/es.json
+++ b/www/addons/mod/assign/lang/es.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Esta tarea aceptará entregas desde el <strong>{{$a}}</strong>",
     "applytoteam": "Aplicar las mismas calificaciones y comentarios al grupo completo",
     "assignmentisdue": "La tarea ha vencido",
-    "attemptnumber": "Intento",
+    "attemptnumber": "Número del intento",
     "attemptreopenmethod": "Permitir reapertura",
     "attemptreopenmethod_manual": "Manual",
     "attemptreopenmethod_untilpass": "Automática hasta aprobar",
@@ -23,7 +23,7 @@
     "currentgrade": "Calificación actual en el libro de calificaciones",
     "cutoffdate": "Fecha límite",
     "defaultteam": "Grupo predeterminado",
-    "duedate": "Fecha límite",
+    "duedate": "Fecha de entrega",
     "duedateno": "No hay fecha de entrega",
     "duedatereached": "La fecha de vencimiento de esta tarea ya ha pasado",
     "editingstatus": "Edición de estado",
@@ -35,7 +35,7 @@
     "grade": "Calificación",
     "graded": "Calificado",
     "gradedby": "Calificado por",
-    "gradedon": "Calificados {{$a}}",
+    "gradedon": "Calificado sobre",
     "gradeoutof": "Calificación sobre {{$a}}",
     "gradingstatus": "Estado de la calificación",
     "groupsubmissionsettings": "Configuración de entrega por grupo",
@@ -63,8 +63,8 @@
     "numberofsubmittedassignments": "Enviados",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palabras",
-    "outof": "{{$a.grade}} de {{$a.maxgrade}}",
-    "overdue": "Vencido",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">La Tarea está retrasada por: {{$a}}</font>",
     "savechanges": "Guardar cambios",
     "submission": "Entrega",
     "submissioneditable": "El estudiante puede editar esta entrega",
@@ -84,7 +84,7 @@
     "submitassignment_help": "Una vez que esta tarea se haya enviado usted no podrá hacer más cambios.",
     "submittedearly": "La tarea fue enviada {{$a}} antes",
     "submittedlate": "La tarea fue enviada {{$a}} después",
-    "timemodified": "Tiempo modificado",
+    "timemodified": "Última modificación",
     "timeremaining": "Tiempo restante",
     "ungroupedusers": "Si se activa la configuración \"se requiere formar parte de un grupo para realizar la entrega\" se evitará que los usuarios no asignados a lo sgrupos realicen entregas.",
     "unlimitedattempts": "Ilimitado",
diff --git a/www/addons/mod/assign/lang/eu.json b/www/addons/mod/assign/lang/eu.json
index 71e04444336..1b62e71067f 100644
--- a/www/addons/mod/assign/lang/eu.json
+++ b/www/addons/mod/assign/lang/eu.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Zeregin honetan bidalketak onartuko dira <strong>{{$a}}</strong>-tik aurrera",
     "applytoteam": "Kalifikazioak eta feedbackak talde osoari aplikatu",
     "assignmentisdue": "Epea bukatu da",
-    "attemptnumber": "Saiakera",
+    "attemptnumber": "Saiakera-kopurua",
     "attemptreopenmethod": "Saiakerak berriro ireki dira",
     "attemptreopenmethod_manual": "Eskuz",
     "attemptreopenmethod_untilpass": "Automatikoki gainditu arte",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "Ezin dugu bidalketaren informazioa erakutsi",
     "extensionduedate": "Luzapenaren entregatze-data",
     "feedbacknotsupported": "Feedback hau ez da onartzen app-an eta baliteke informazio guztia jasota ez egotea.",
-    "grade": "Kalifikazioa",
+    "grade": "Nota",
     "graded": "Kalifikatua",
     "gradedby": "Nork kalifikatua",
-    "gradedon": "Kalifikatuta: {{$a}}",
+    "gradedon": "Noiz kalifikatua",
     "gradenotsynced": "Kalifikazioa ez da sinkronizatu",
     "gradeoutof": "Kalifikazioa ({{$a}}-(e)ra arte)",
     "gradingstatus": "Kalifikazioaren egoera",
@@ -64,8 +64,8 @@
     "numberofsubmittedassignments": "Bidalita",
     "numberofteams": "Taldeak",
     "numwords": "{{$a}} hitz",
-    "outof": "{{$a.grade}} eta gehienez {{$a.maxgrade}}",
-    "overdue": "Atzeratuta",
+    "outof": "{{$a.current}}.a {{$a.total}}-tik",
+    "overdue": "<font color=\"red\">Zeregina bidaltzeko epea amaitu da orain dela {{$a}}</font>",
     "savechanges": "Gorde aldaketak",
     "submission": "Bidalketa",
     "submissioneditable": "Ikasleak bere bidalketa edita dezake",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Behin zeregina bidalita, ezin izango duzu aldaketarik egin.",
     "submittedearly": "Bidalketagaraiz bidali zen: {{$a}}",
     "submittedlate": "Zeregina berandu bidali zen: {{$a}}",
-    "timemodified": "Denbora aldatuta",
+    "timemodified": "Azken aldaketa",
     "timeremaining": "Geratzen den denbora",
     "ungroupedusers": "'Taldeko kidea izatea behartu' ezarpena gaituta dago eta erabiltzaile batzuk ez dira inongo taldeko kide edo talde bat baino gehiagoko kideak dira, eta honek erabiltzaile horiek bidalketak egitea ekidingo du.",
     "unlimitedattempts": "Mugarik gabea",
diff --git a/www/addons/mod/assign/lang/fa.json b/www/addons/mod/assign/lang/fa.json
index ac0c3c3047a..11c00c0a8db 100644
--- a/www/addons/mod/assign/lang/fa.json
+++ b/www/addons/mod/assign/lang/fa.json
@@ -16,7 +16,7 @@
     "currentgrade": "نمرهٔ فعلی در دفتر نمره",
     "cutoffdate": "تاریخ عدم پذیرش",
     "defaultteam": "گروه پیش‌فرض",
-    "duedate": "مهلت",
+    "duedate": "مهلت تحویل",
     "duedateno": "بدون موعد",
     "editingstatus": "وضعیت ویرایش",
     "editsubmission": "ویرایش پاسخ",
@@ -24,7 +24,7 @@
     "grade": "نمره",
     "graded": "نمره داده شده است",
     "gradedby": "نمره دهنده",
-    "gradedon": "تاریخ نمره دادن: {{$a}}",
+    "gradedon": "تاریخ ثبت نمره",
     "gradeoutof": "نمره از {{$a}}",
     "gradingstatus": "وضعیت تصحیح",
     "groupsubmissionsettings": "تنظیمات تحویل گروهی",
@@ -38,16 +38,16 @@
     "markingworkflowstatereleased": "منتشر‌شده",
     "noattempt": "هیچ چیزی تحویل داده نشده است",
     "nosubmission": "هیچ چیزی برای این تکلیف تحویل داده نشده است",
-    "notgraded": "نمره داده نشده",
+    "notgraded": "نمره داده نشده است",
     "numberofdraftsubmissions": "پیش‌نویس‌ها",
     "numberofparticipants": "شرکت کنندگان",
     "numberofsubmissionsneedgrading": "نیازمند نمره‌دهی",
     "numberofsubmittedassignments": "تحویل داده شده",
     "numberofteams": "تعداد گروه‌ها",
     "numwords": "{{$a}} کلمه",
-    "outof": "{{$a.grade}} از {{$a.maxgrade}}",
-    "overdue": "تأخیر تحویل",
-    "savechanges": "ذخیرهٔ تغییرات",
+    "outof": "{{$a.current}} از {{$a.total}}",
+    "overdue": "<font color=\"red\">از موعد تحویل تکلیف {{$a}} گذشته است</font>",
+    "savechanges": "ذخیره تغییرات",
     "submission": "پاسخ ارسالی",
     "submissioneditable": "شاگرد می‌تواند این تکلیف تحویل داده شده را ویرایش کند",
     "submissionnoteditable": "شاگرد نمی‌تواند این تکلیف را ویرایش کند",
@@ -64,7 +64,7 @@
     "submitassignment_help": "بعد از اینکه این تکلیف تحویل داده شد دیگر قادر به تغییر دادن آن نخواهید بود",
     "submittedearly": "تکلیف {{$a}} زود تحویل داده شد",
     "submittedlate": "تکلیف {{$a}} با تأخیر تحویل داده شد",
-    "timemodified": "زمان آخرین تغییر",
+    "timemodified": "آخرین تغییر",
     "timeremaining": "زمان باقیمانده",
     "ungroupedusers": "تنظیم «نیازمند گروه برای تحویل‌دادن» فعال است و بعضی از کاربران یا عضو هیچ گروهی نیستند، یا عضو بیش از یک گروه هستند. در نتیجه نمی‌توانند تکلیف را تحویل دهند.",
     "unlimitedattempts": "نامحدود",
diff --git a/www/addons/mod/assign/lang/fr.json b/www/addons/mod/assign/lang/fr.json
index 9ab4467b50e..4dc3f9a1b2b 100644
--- a/www/addons/mod/assign/lang/fr.json
+++ b/www/addons/mod/assign/lang/fr.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Ce devoir acceptera la remise de documents dès le <strong>{{$a}}</strong>",
     "applytoteam": "Appliquer les notes et le feedback à tout le groupe",
     "assignmentisdue": "Devoir à effectuer",
-    "attemptnumber": "Tentative",
+    "attemptnumber": "Numéro de tentative",
     "attemptreopenmethod": "Réouverture des travaux remis",
     "attemptreopenmethod_manual": "Manuellement",
     "attemptreopenmethod_untilpass": "Automatiquement jusqu'à réussite",
@@ -23,7 +23,7 @@
     "currentgrade": "Note actuelle dans le carnet de notes",
     "cutoffdate": "Date limite",
     "defaultteam": "Groupe par défaut",
-    "duedate": "Délai d'achèvement",
+    "duedate": "Date de remise",
     "duedateno": "Pas de date de remise",
     "duedatereached": "La date de remise de ce devoir est passée",
     "editingstatus": "Statut d'édition",
@@ -35,7 +35,7 @@
     "grade": "Note",
     "graded": "Noté",
     "gradedby": "Évalué par",
-    "gradedon": "Évalué le {{$a}}",
+    "gradedon": "Évalué le",
     "gradenotsynced": "Note non synchronisée",
     "gradeoutof": "Note sur {{$a}}",
     "gradingstatus": "Statut de l'évaluation",
@@ -57,17 +57,17 @@
     "nosubmission": "Rien n'a été déposé pour ce devoir",
     "notallparticipantsareshown": "Les participants sans travail remis ne sont pas affichés",
     "noteam": "Membre d'aucun groupe",
-    "notgraded": "Non noté",
+    "notgraded": "Pas évalué",
     "numberofdraftsubmissions": "Brouillons",
     "numberofparticipants": "Participants",
     "numberofsubmissionsneedgrading": "Nécessitant évaluation",
     "numberofsubmittedassignments": "Remis",
     "numberofteams": "Groupes",
     "numwords": "{{$a}} mots",
-    "outof": "{{$a.grade}} sur {{$a.maxgrade}}",
-    "overdue": "En retard",
-    "savechanges": "Enregistrer les modifications",
-    "submission": "Remise",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<span class=\"flagged-tag\">Le devoir est en retard de {{$a}}</span>",
+    "savechanges": "Enregistrer",
+    "submission": "Devoir rendu",
     "submissioneditable": "L'étudiant peut modifier ce travail remis",
     "submissionnoteditable": "L'étudiant ne peut pas modifier ce travail remis",
     "submissionnotsupported": "Le dépôt n'est pas supporté par l'app et pourrait ne pas contenir la totalité des informations",
@@ -85,8 +85,8 @@
     "submitassignment_help": "Une fois ce devoir envoyé, vous ne pourrez plus y effectuer de modification.",
     "submittedearly": "Le travail a été remis en avance de {{$a}}",
     "submittedlate": "Le travail a été remis en retard de {{$a}}",
-    "timemodified": "Date modification",
-    "timeremaining": "Durée restante",
+    "timemodified": "Dernière modification",
+    "timeremaining": "Temps restant",
     "ungroupedusers": "Le réglage « Requiert un groupe pour remettre un devoir » est activé et certains utilisateurs ne sont membres d'aucun groupe ou membres de plusieurs groupes. Cette situation les empêchera de remettre un travail.",
     "unlimitedattempts": "Illimité",
     "userswhoneedtosubmit": "Utilisateurs devant valider l'envoi du devoir : {{$a}}",
diff --git a/www/addons/mod/assign/lang/he.json b/www/addons/mod/assign/lang/he.json
index 1c97d0e611a..634624ece1e 100644
--- a/www/addons/mod/assign/lang/he.json
+++ b/www/addons/mod/assign/lang/he.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "מטלה זו תאפשר הגשות החל מ- <strong>{{$a}}</strong>",
     "applytoteam": "החל ציונים ומשוב לכל הקבוצה",
     "assignmentisdue": "מועד ההגשה הסתיים",
-    "attemptnumber": "נסיון מענה",
+    "attemptnumber": "נסיון מספר",
     "attemptreopenmethod": "מנגנון הגשה חוזרת",
     "attemptreopenmethod_manual": "ידני",
     "attemptreopenmethod_untilpass": "אוטומטית עד ציון עובר",
@@ -25,10 +25,10 @@
     "editingstatus": "מצב עריכה",
     "editsubmission": "עריכת ההגשה",
     "extensionduedate": "הארכת מועד הגשה",
-    "grade": "ניקוד בפעילות",
+    "grade": "ציונים",
     "graded": "נבדק",
     "gradedby": "נבדק על-ידי",
-    "gradedon": "ניתן ציון: &a",
+    "gradedon": "הציון ניתן על",
     "gradeoutof": "ציון מתוך {{$a}}",
     "gradingstatus": "מצב מתן הציון",
     "groupsubmissionsettings": "הגדרות הגשה בקבוצות",
@@ -55,10 +55,10 @@
     "numberofsubmittedassignments": "הוגש",
     "numberofteams": "קבוצות",
     "numwords": "{{$a}} מילים",
-    "outof": "{{$a.grade}} מתוך ציון מירבי של {{$a.maxgrade}}",
-    "overdue": "איחר את המועד",
-    "savechanges": "שמירת עדכונים",
-    "submission": "הגשה.",
+    "outof": "{{$a.current}} מתוך ס\"ה {{$a.total}}",
+    "overdue": "<font color=\"red\">\nהמטלה באיחור של:\n{{$a}}</font>",
+    "savechanges": "שמירת שינויים",
+    "submission": "הגשה",
     "submissioneditable": "סטודנטים יכולים לערוך הגשה זו",
     "submissionnoteditable": "סטודנטים אינם יכולים לערוך הגשה זו",
     "submissionslocked": "מטלה זו אינה מאפשרת הגשות",
@@ -75,8 +75,8 @@
     "submitassignment_help": "ברגע שהמטלה תוגש, לא ניתן יהיה לערוך שינויים נוספים",
     "submittedearly": "המטלה הוגשה {{$a}} לפני תאריך ההגשה הסופי.",
     "submittedlate": "המטלה הוגשה באחור של {{$a}}",
-    "timemodified": "זמן עדכון",
-    "timeremaining": "הזמן שנשאר",
+    "timemodified": "עדכון אחרון",
+    "timeremaining": "זמן ההגשה (הראשוני)",
     "ungroupedusers": "ההגדרה \"יש להיות חבר בקבוצה בכדי להגיש\" פעילה אך כמה משתמשים לא מוקצים לקבוצות, הדבר ימנע מהם מלהגיש את המטלות.",
     "unlimitedattempts": "לא מוגבל",
     "userswhoneedtosubmit": "משתמשים שצריכים להגיש: {{$a}}",
diff --git a/www/addons/mod/assign/lang/hu.json b/www/addons/mod/assign/lang/hu.json
index 790108fd192..b7d94fa140c 100644
--- a/www/addons/mod/assign/lang/hu.json
+++ b/www/addons/mod/assign/lang/hu.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "A feladathoz <strong>{{$a}}</strong> időponttól lehet leadni munkát.",
     "applytoteam": "Osztályzatok és visszajelzés az egész csoportra kiterjesztve",
     "assignmentisdue": "A feladat teljesítendő",
-    "attemptnumber": "Próbálkozás",
+    "attemptnumber": "Próbálkozás száma",
     "attemptreopenmethod": "Újból megnyitott próbálkozások",
     "attemptreopenmethod_manual": "Kézileg",
     "attemptreopenmethod_untilpass": "Automatikusan a teljesítésig",
@@ -19,7 +19,7 @@
     "currentgrade": "Aktuális osztályzat az osztályozónaplóban",
     "cutoffdate": "Lezárás időpontja",
     "defaultteam": "Alapcsoport",
-    "duedate": "Esedékesség",
+    "duedate": "Határidő",
     "duedateno": "Nincs határidő",
     "duedatereached": "A feladat teljesítésének határideje lejárt.",
     "editingstatus": "Szerkesztés állapota",
@@ -28,7 +28,7 @@
     "grade": "Pont",
     "graded": "Pontozott",
     "gradedby": "Osztályozta",
-    "gradedon": "Pontozott {{$a}}",
+    "gradedon": "Osztályozás időpontja",
     "gradeoutof": "{{$a}} pontból",
     "gradingstatus": "Osztályozás állapota",
     "groupsubmissionsettings": "Csoportos leadás beállításai",
@@ -48,17 +48,17 @@
     "noonlinesubmissions": "Ehhez a feladathoz semmit nem kell neten keresztül leadnia.",
     "nosubmission": "A feladathoz nem érkezett leadott munka.",
     "noteam": "Ön egyik csoportnak sem tagja",
-    "notgraded": "Nincs lepontozva",
+    "notgraded": "Nincs osztályozva",
     "numberofdraftsubmissions": "Piszkozatok",
     "numberofparticipants": "Résztvevők",
     "numberofsubmissionsneedgrading": "Osztályozandó",
     "numberofsubmittedassignments": "Leadva",
     "numberofteams": "Csoportok",
     "numwords": "{{$a}} szó",
-    "outof": "{{$a.grade}} a maximum {{$a.maxgrade}} közül",
-    "overdue": "Lejárt",
+    "outof": "{{$a.current}} / {{$a.total}}",
+    "overdue": "<font color=\"red\">A feladat lejárt: {{$a}}</font>",
     "savechanges": "Módosítások mentése",
-    "submission": "Leadás",
+    "submission": "Leadott munka",
     "submissioneditable": "A tanuló a leadandót szerkesztheti.",
     "submissionnoteditable": "A tanuló a leadandót nem szerkesztheti.",
     "submissionslocked": "A feladathoz nem lehet munkát leadni.",
@@ -75,7 +75,7 @@
     "submitassignment_help": "A feladat leadás után nem módosítható.",
     "submittedearly": "Feladat {{$a}} idővel korábban leadva",
     "submittedlate": "Feladat {{$a}} idővel később leadva",
-    "timemodified": "Időpont módosult",
+    "timemodified": "Utolsó módosítás",
     "timeremaining": "Hátralévő idő",
     "ungroupedusers": "A Csoport számára leadás előírása be van kapcsolva és egyes felhasználók nincsenek csoporthoz - vagy több csoporthoz vannak - hozzárendelve, így nem adhatnak le munkát.",
     "unlimitedattempts": "Korlátlan",
diff --git a/www/addons/mod/assign/lang/it.json b/www/addons/mod/assign/lang/it.json
index 447c7bf5f7b..efc338d796b 100644
--- a/www/addons/mod/assign/lang/it.json
+++ b/www/addons/mod/assign/lang/it.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Questo compito accetta consegne a partire dal <strong>{{$a}}</strong>",
     "applytoteam": "Usa lo stesso feedback e la stessa valutazione per tutto il gruppo",
     "assignmentisdue": "Consegna compito",
-    "attemptnumber": "Tentativo",
+    "attemptnumber": "Numero tentativo",
     "attemptreopenmethod": "Riapertura tentativo",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente fino al superamento",
@@ -19,16 +19,16 @@
     "currentgrade": "Voto nel Registro delle valutazioni",
     "cutoffdate": "Data limite",
     "defaultteam": "Gruppo di default",
-    "duedate": "Data di scadenza",
+    "duedate": "Termine consegne",
     "duedateno": "Senza termine consegne",
     "duedatereached": "La data di scadenza del compito è già trascorsa",
     "editingstatus": "Possibilità di modifica",
     "editsubmission": "Modifica consegna",
     "extensionduedate": "Data scadenza proroga",
-    "grade": "Valutazione",
+    "grade": "Punteggio",
     "graded": "Valutata",
     "gradedby": "Valutatore",
-    "gradedon": "Valutato: {{$a}}",
+    "gradedon": "Data di valutazione",
     "gradeoutof": "Punteggio (su {{$a}})",
     "gradingstatus": "Stato valutazione",
     "groupsubmissionsettings": "Impostazioni consegna di gruppo",
@@ -56,10 +56,10 @@
     "numberofsubmittedassignments": "Consegne",
     "numberofteams": "Gruppi",
     "numwords": "{{$a}} parole",
-    "outof": "{{$a.grade}} su un massimo di {{$a.maxgrade}}",
-    "overdue": "In ritardo",
+    "outof": "{{$a.current}} su {{$a.total}}",
+    "overdue": "<font color=\"red\">Consegna in ritardo da: {{$a}}</font>",
     "savechanges": "Salva modifiche",
-    "submission": "Invii",
+    "submission": "Consegna",
     "submissioneditable": "Lo studente può modificare la consegna",
     "submissionnoteditable": "Gli studenti non possono modificare questa consegna",
     "submissionnotsupported": "Questa consegna non è supportata dalla app e può non contenere tutte le informazioni.",
@@ -77,8 +77,8 @@
     "submitassignment_help": "Dopo aver consegnato il compito non potrai più modificarlo",
     "submittedearly": "Il compito è stato consegnato {{$a}} in anticipo",
     "submittedlate": "Il compito è stato consegnato {{$a}} in ritardo",
-    "timemodified": "Data/ora modifica",
-    "timeremaining": "Tempo rimanente",
+    "timemodified": "Ultima modifica",
+    "timeremaining": "Tempo rimasto",
     "ungroupedusers": "L'impostazione 'Consegna di gruppo obbligatoria' è abilitata ma alcuni utenti non fanno parte di gruppi o fanno parte di più gruppi e pertanto non potranno effettuare consegne.",
     "unlimitedattempts": "Illimitati",
     "userswhoneedtosubmit": "Utenti che non hanno consegnato: {{$a}}",
diff --git a/www/addons/mod/assign/lang/ja.json b/www/addons/mod/assign/lang/ja.json
index 178125efdf8..d7f86ec249e 100644
--- a/www/addons/mod/assign/lang/ja.json
+++ b/www/addons/mod/assign/lang/ja.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "この課題は <strong>{{$a}}</strong> から提出を受け付けます。",
     "applytoteam": "グループ全体に評定およびフィードバックを提供する",
     "assignmentisdue": "課題の提出期限が到来しました。",
-    "attemptnumber": "受験",
+    "attemptnumber": "提出回数",
     "attemptreopenmethod": "提出再オープン",
     "attemptreopenmethod_manual": "手動",
     "attemptreopenmethod_untilpass": "合格するまで自動",
@@ -19,16 +19,16 @@
     "currentgrade": "評定表内の現在の評定",
     "cutoffdate": "遮断日時",
     "defaultteam": "デフォルトグループ",
-    "duedate": "期限",
+    "duedate": "終了日時",
     "duedateno": "提出期限なし",
     "duedatereached": "この課題の提出期限を過ぎました。",
     "editingstatus": "編集ステータス",
     "editsubmission": "提出を編集する",
     "extensionduedate": "延長提出期限",
-    "grade": "評定",
+    "grade": "評点",
     "graded": "評定済み",
     "gradedby": "評定者",
-    "gradedon": "評定日時: {{$a}}",
+    "gradedon": "評定日時",
     "gradeoutof": "{{$a}} 点中の評点",
     "gradingstatus": "評定ステータス",
     "groupsubmissionsettings": "グループ提出設定",
@@ -55,10 +55,10 @@
     "numberofsubmittedassignments": "提出",
     "numberofteams": "グループ",
     "numwords": "{{$a}} 語",
-    "outof": "{{$a.grade}} / {{$a.maxgrade}}",
-    "overdue": "期限切れ",
+    "outof": "{{$a.current}} / {{$a.total}}",
+    "overdue": "<font color=\"red\">課題は次の時間を超過しています: {{$a}}</font>",
     "savechanges": "変更を保存する",
-    "submission": "送信",
+    "submission": "提出課題",
     "submissioneditable": "学生はこの提出を編集できます。",
     "submissionnoteditable": "学生はこの提出を編集できません。",
     "submissionslocked": "この課題は提出を受け付けていません。",
@@ -75,7 +75,7 @@
     "submitassignment_help": "この課題を提出した時点であなたはこれ以上変更できないようになります。",
     "submittedearly": "課題は {{$a}} 早く提出されました。",
     "submittedlate": "課題は {{$a}} 遅く提出されました。",
-    "timemodified": "修正日時",
+    "timemodified": "最終更新日時",
     "timeremaining": "残り時間",
     "ungroupedusers": "設定「提出にグループを必要とする」が有効にされているため、そして何名かのユーザがグループのメンバーではないため、または2つ以上のグループメンバーであるため、提出することはできません。",
     "unlimitedattempts": "無制限",
diff --git a/www/addons/mod/assign/lang/lt.json b/www/addons/mod/assign/lang/lt.json
index 81ede31f120..981dfa5b68b 100644
--- a/www/addons/mod/assign/lang/lt.json
+++ b/www/addons/mod/assign/lang/lt.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Užduotis priims darbus nuo <strong>{{$a}}</strong>",
     "applytoteam": "Patvirtinti įvertinimus ir atsaką visai grupei",
     "assignmentisdue": "Užduoties atlikimo laikas baigės",
-    "attemptnumber": "Bandymas",
+    "attemptnumber": "Bandymo numeris",
     "attemptreopenmethod": "Pateikimų pakartotinis atidarymas",
     "attemptreopenmethod_manual": "Rankiniu būdu",
     "attemptreopenmethod_untilpass": "Automatiškai, kol negaunamas teigiamas įvertinimas",
@@ -23,7 +23,7 @@
     "currentgrade": "Dabartinis įvertis įverčių knygelėje",
     "cutoffdate": "Paskutinė diena pristatymui",
     "defaultteam": "Numatyta grupė",
-    "duedate": "Terminas",
+    "duedate": "Data pristatymui",
     "duedateno": "Nėra termino",
     "duedatereached": "Vėliausia įkėlimo data šiai užduočiai jau praėjo.",
     "editingstatus": "Darbo keitimo galimybė",
@@ -35,7 +35,7 @@
     "grade": "Įvertis",
     "graded": "Įvertinta",
     "gradedby": "Įvertino",
-    "gradedon": "Įvertinta: {{$a}}",
+    "gradedon": "Įvertinta",
     "gradeoutof": "Įvertinimas (iš galimų {{$a}})",
     "gradingstatus": "Vertinimo būsena",
     "groupsubmissionsettings": "Grupinio pateikimo nustatymai",
@@ -62,10 +62,10 @@
     "numberofsubmittedassignments": "Pateikta",
     "numberofteams": "Grupės",
     "numwords": "Žodžių: {{$a}}",
-    "outof": "{{$a.grade}} iš maks. {{$a.maxgrade}}",
-    "overdue": "Uždelstas",
+    "outof": "{{$a.current}} iš {{$a.total}}",
+    "overdue": "<font color=\"red\">Vėluojama  įkelti darbą: {{$a}}</font>",
     "savechanges": "Išsaugoti pakeitimus",
-    "submission": "Pateikimas",
+    "submission": "Įkeltas darbas",
     "submissioneditable": "Besimokantysis gali keisti savo darbą",
     "submissionnoteditable": "Besimokantysis negali keisti šio įkelto darbo",
     "submissionnotsupported": "Programėlė negali patvirtinti ir pateikti visos informacijos",
@@ -83,7 +83,7 @@
     "submitassignment_help": "Kai darbas bus pateiktas, Jūs negalėsite padaryti jokių pakeitimų.",
     "submittedearly": "Užduotis buvo įkelta {{$a}} anksčiau",
     "submittedlate": "Užduotis buvo įkelta vėluojant {{$a}}",
-    "timemodified": "Modifikavimo laikas",
+    "timemodified": "Paskutinį kartą keista",
     "timeremaining": "Liko laiko",
     "unlimitedattempts": "Neribotai",
     "userswhoneedtosubmit": "Naudotojai, kurie turi pateikti darbą: {{$a}}",
diff --git a/www/addons/mod/assign/lang/nl.json b/www/addons/mod/assign/lang/nl.json
index fffe821238a..cb58014537a 100644
--- a/www/addons/mod/assign/lang/nl.json
+++ b/www/addons/mod/assign/lang/nl.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Deze opdracht zal inzendingen ontvangen vanaf <strong>{{$a}}</strong>",
     "applytoteam": "Cijfers en feedback aan de hele groep geven",
     "assignmentisdue": "Opdracht tegen",
-    "attemptnumber": "Poging",
+    "attemptnumber": "Pogingnummer",
     "attemptreopenmethod": "Heropende pogingen",
     "attemptreopenmethod_manual": "Manueel",
     "attemptreopenmethod_untilpass": "Automatisch tot geslaagd",
@@ -23,7 +23,7 @@
     "currentgrade": "Huidig cijfer in de cijferlijst",
     "cutoffdate": "Afsluitdatum",
     "defaultteam": "Standaard groep",
-    "duedate": "Einddatum",
+    "duedate": "Uiterste inleverdatum",
     "duedateno": "Geen uiterste inleverdatum",
     "duedatereached": "De datum waarop deze opdracht moest afgegeven worden is nu voorbij.",
     "editingstatus": "Status bewerken",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "We kunnen de instuurinformatie niet tonen",
     "extensionduedate": "Extra tijd einddatum",
     "feedbacknotsupported": "Deze feedback wordt niet ondersteund door de app en het is mogelijk dat de informatie onvolledig is",
-    "grade": "Beoordeling",
+    "grade": "Cijfer",
     "graded": "Beoordeeld",
     "gradedby": "Beoordeeld door",
-    "gradedon": "Beoordeeld op {{$a}}",
+    "gradedon": "Beoordeeld op",
     "gradenotsynced": "Cijfer niet gesynchroniseerd",
     "gradeoutof": "Cijfer op {{$a}}",
     "gradingstatus": "Beoordelingsstatus",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Ingestuurd",
     "numberofteams": "Groepen",
     "numwords": "{{$a}} woorden",
-    "outof": "{{$a.grade}} op een maximum van {{$a.maxgrade}}",
-    "overdue": "Te laat",
-    "savechanges": "Bewaar wijzigingen",
-    "submission": "Inzending",
+    "outof": "{{$a.current}} van {{$a.total}}",
+    "overdue": "<font color=\"red\">Opdracht {{$a}} te laat ingestuurd</font>",
+    "savechanges": "Bewaar de wijzigingen",
+    "submission": "Ingestuurde opdracht",
     "submissioneditable": "Leerling kan zijn ingestuurde opdracht bewerken",
     "submissionnoteditable": "Leerling kan ingestuurde opdracht niet bewerken",
     "submissionnotsupported": "Deze ingestuurde opdracht wordt niet ondersteund door de app bevat mogelijk niet alle informatie",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Als je deze opdracht hebt ingestuurd, dan zul je geen wijzigingen meer kunnen aanbrengen.",
     "submittedearly": "Opdracht was {{$a}} te vroeg ingestuurd",
     "submittedlate": "Opdracht was {{$a}} te laat ingestuurd",
-    "timemodified": "Gewijzigd op",
+    "timemodified": "Laatst gewijzigd",
     "timeremaining": "Resterende tijd",
     "ungroupedusers": "De insteling \"Groeplidmaatschap vereist om een inzending te maken\" is ingeschakeld en sommige gebruikers zijn niet toegewezen aan een groep of zijn lid van meerdere groepen. Dit zal het hen onmogelijk maken om hun opdracht in te sturen.",
     "unlimitedattempts": "Onbeperkt",
diff --git a/www/addons/mod/assign/lang/pl.json b/www/addons/mod/assign/lang/pl.json
index 0e1c276e6bf..e86e6a78384 100644
--- a/www/addons/mod/assign/lang/pl.json
+++ b/www/addons/mod/assign/lang/pl.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Rozwiązania tego zadania będzie można przesyłać od <strong>{{$a}}</strong>",
     "applytoteam": "Zastosuj oceny i informacje zwrotne dla całej grupy",
     "assignmentisdue": "Zadanie jest zaległe",
-    "attemptnumber": "Próba",
+    "attemptnumber": "Numer próby",
     "attemptreopenmethod": "Ponowne otwieranie prób",
     "attemptreopenmethod_manual": "Ręcznie",
     "attemptreopenmethod_untilpass": "Automatycznie, aż przejdą",
@@ -19,7 +19,7 @@
     "currentgrade": "Bieżąca ocena w dzienniku ocen",
     "cutoffdate": "Ostateczny termin",
     "defaultteam": "Domyślna grupa",
-    "duedate": "Termin",
+    "duedate": "Termin oddania",
     "duedateno": "Brak terminu oddania",
     "duedatereached": "Minął termin oddania tego zadania",
     "editingstatus": "Edycja statusu",
@@ -28,7 +28,7 @@
     "grade": "Ocena",
     "graded": "Ocenione",
     "gradedby": "Ocenione przez",
-    "gradedon": "Ocenienione: {{$a}}",
+    "gradedon": "Ocenione dnia",
     "gradeoutof": "Ocena z max. {{$a}}",
     "gradingstatus": "Stan oceniania",
     "groupsubmissionsettings": "Ustawienia zadań grupowych",
@@ -48,17 +48,17 @@
     "noonlinesubmissions": "To zadanie nie wymaga wysyłania niczego online",
     "nosubmission": "Żadne rozwiązanie nie zostało przesłane do tego zadania",
     "noteam": "Nie jesteś członkiem żadnej grupy",
-    "notgraded": "Nie oceniono",
+    "notgraded": "Nie ocenione",
     "numberofdraftsubmissions": "Wersja robocza",
     "numberofparticipants": "Uczestnicy",
     "numberofsubmissionsneedgrading": "Wymaga oceny",
     "numberofsubmittedassignments": "Nadesłane",
     "numberofteams": "Grupy",
     "numwords": "{{$a}} słów",
-    "outof": "{{$a.grade}} z możliwych do uzyskania {{$a.maxgrade}}",
-    "overdue": "Zaległy",
+    "outof": "{{$a.current}} z {{$a.total}}",
+    "overdue": "<font color=\"red\">Opóźnienie w przesłaniu: {{$a}}</font>",
     "savechanges": "Zapisz zmiany",
-    "submission": "Praca",
+    "submission": "Oddane zadanie",
     "submissioneditable": "Student może edytować to zadanie",
     "submissionnoteditable": "Student nie może edytować tego zadania",
     "submissionslocked": "To zadanie nie akceptuje przesyłania rozwiązań",
@@ -75,7 +75,7 @@
     "submitassignment_help": "Po zgłoszeniu tego zadania, nie będzie można wprowadzić zmian.",
     "submittedearly": "Zadanie zostało złożone {{$a}} przed terminem",
     "submittedlate": "Zadanie zostało złożone {{$a}} po terminie",
-    "timemodified": "Zmodyfikowano czas",
+    "timemodified": "Ostatnio modyfikowane",
     "timeremaining": "Pozostały czas",
     "unlimitedattempts": "Nieograniczony",
     "userswhoneedtosubmit": "Użytkownicy, którzy muszą przesłać zadanie: {{$a}}",
diff --git a/www/addons/mod/assign/lang/pt-br.json b/www/addons/mod/assign/lang/pt-br.json
index 3b8acb9e600..1b62b585379 100644
--- a/www/addons/mod/assign/lang/pt-br.json
+++ b/www/addons/mod/assign/lang/pt-br.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Esta tarefa aceitará envios a partir de <strong>{{$a}}</strong>",
     "applytoteam": "Habilitar notas e feedback para todo grupo",
     "assignmentisdue": "Tarefa encerrada",
-    "attemptnumber": "Tentativa",
+    "attemptnumber": "Número da tentativa",
     "attemptreopenmethod": "Tentativas reabertas",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente até que passe",
@@ -23,7 +23,7 @@
     "currentgrade": "Nota atual no livro de notas",
     "cutoffdate": "Data limite",
     "defaultteam": "Grupo padrão",
-    "duedate": "Prazo",
+    "duedate": "Data de entrega",
     "duedateno": "Nenhuma data de entrega",
     "duedatereached": "A data de encerramento para essa tarefa já foi atingida",
     "editingstatus": "Editar estado",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "Nós não podemos exibir as informações do envio",
     "extensionduedate": "Extensão do prazo de entrega",
     "feedbacknotsupported": "Esse feedback não é suportado pelo aplicativo e pode não conter todas as informações",
-    "grade": "Nota",
+    "grade": "Avaliação",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
-    "gradedon": "Avaliado: {{$a}}",
+    "gradedon": "Avaliado em",
     "gradenotsynced": "Avaliação não sincronizada",
     "gradeoutof": "Nota até {{$a}}",
     "gradingstatus": "Status da avaliação",
@@ -57,17 +57,17 @@
     "nosubmission": "Nada foi enviado para esta tarefa",
     "notallparticipantsareshown": "Participantes sem permissão não são exibidos",
     "noteam": "Você não é membro de nenhum grupo.",
-    "notgraded": "Não avaliada",
+    "notgraded": "Não há notas",
     "numberofdraftsubmissions": "Rascunhos",
     "numberofparticipants": "Participantes",
     "numberofsubmissionsneedgrading": "Precisa de avaliação",
     "numberofsubmittedassignments": "Enviado",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palavras",
-    "outof": "{{$a.grade}} de um máximo de {{$a.maxgrade}}",
-    "overdue": "Expirado",
-    "savechanges": "Guardar mudanças",
-    "submission": "Envio",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">A tarefa está atrasada há: {{$a}}</font>",
+    "savechanges": "Salvar mudanças",
+    "submission": "Envio de tarefas",
     "submissioneditable": "Estudantes podem editar essa submissão",
     "submissionnoteditable": "Estudante não pode editar este envio",
     "submissionnotsupported": "Esse envio não é suportado pelo aplicativo e pode não conter todas as informações",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Uma vez que a tarefa for enviada você não poderá mais fazer alterações.",
     "submittedearly": "A tarefa foi enviada {{$a}} adiantado",
     "submittedlate": "A tarefa foi enviada {{$a}} atrasada",
-    "timemodified": "Tempo modificado",
+    "timemodified": "Última modificação",
     "timeremaining": "Tempo restante",
     "ungroupedusers": "A configuração \"Somente membros de grupo podem fazer envio\" está ligada e existem usuários não alocados em grupos. Isso impedira que estes usuários consigam enviar tarefas.",
     "unlimitedattempts": "Ilimitado",
diff --git a/www/addons/mod/assign/lang/pt.json b/www/addons/mod/assign/lang/pt.json
index 8717104b955..e2242d63f5e 100644
--- a/www/addons/mod/assign/lang/pt.json
+++ b/www/addons/mod/assign/lang/pt.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Pode submeter o trabalho a partir de <strong>{{$a}}</strong>",
     "applytoteam": "Atribuir notas e comentários a todo o grupo",
     "assignmentisdue": "Já terminou o prazo para submeter o trabalho",
-    "attemptnumber": "Tentativa",
+    "attemptnumber": "Número da tentativa",
     "attemptreopenmethod": "Tentativas reabertas",
     "attemptreopenmethod_manual": "Manualmente",
     "attemptreopenmethod_untilpass": "Automaticamente até obter aproveitamento",
@@ -23,7 +23,7 @@
     "currentgrade": "Nota atual na pauta",
     "cutoffdate": "Data de fecho",
     "defaultteam": "Grupo predefinido",
-    "duedate": "Data limite",
+    "duedate": "Data limite para submeter trabalhos",
     "duedateno": "Sem data limite",
     "duedatereached": "A data limite de submissão deste trabalho já foi ultrapassada.",
     "editingstatus": "Editar o estado",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "Não é possível mostrar a informação da submissão",
     "extensionduedate": "Prolongamento da data limite",
     "feedbacknotsupported": "Este feedback não é suportado pela aplicação e pode não conter toda a informação",
-    "grade": "Nota",
+    "grade": "Avaliação",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
-    "gradedon": "Avaliado: {{$a}}",
+    "gradedon": "Avaliado em",
     "gradenotsynced": "Nota não está sincronizada",
     "gradeoutof": "Nota (de 0 a {{$a}})",
     "gradingstatus": "Estado da avaliação",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Número de trabalhos submetidos",
     "numberofteams": "Grupos",
     "numwords": "{{$a}} palavra(s)",
-    "outof": "{{$a.grade}} num máximo de {{$a.maxgrade}}",
-    "overdue": "Fora de prazo",
+    "outof": "{{$a.current}} de {{$a.total}}",
+    "overdue": "<font color=\"red\">Trabalho entregue com atraso de {{$a}}</font>",
     "savechanges": "Gravar alterações",
-    "submission": "Submissão",
+    "submission": "Trabalho",
     "submissioneditable": "Os alunos podem editar esta submissão",
     "submissionnoteditable": "O aluno não pode editar esta submissão",
     "submissionnotsupported": "Esta submissão não é suportada pela aplicação e pode não conter toda a informação",
@@ -85,7 +85,7 @@
     "submitassignment_help": "Assim que este trabalho for submetido não poderá fazer mais alterações.",
     "submittedearly": "O trabalho foi submetido '{{$a}}' antes do fim do prazo",
     "submittedlate": "O trabalho foi submetido {{$a}} depois do prazo",
-    "timemodified": "Data da última edição",
+    "timemodified": "Última alteração",
     "timeremaining": "Tempo restante",
     "ungroupedusers": "A configuração 'Requer grupo para submeter trabalho' está ativa e existem utilizadores que não pertencem a nenhum grupo, ou que se encontram inscritos em mais do que um, o que fará com que estes fiquem impossibilitados de submeter os seus trabalhos.",
     "unlimitedattempts": "Ilimitado",
diff --git a/www/addons/mod/assign/lang/ro.json b/www/addons/mod/assign/lang/ro.json
index 1ed31a35e8f..00faa4cbbda 100644
--- a/www/addons/mod/assign/lang/ro.json
+++ b/www/addons/mod/assign/lang/ro.json
@@ -6,7 +6,7 @@
     "allowsubmissionsfromdatesummary": "Se acceptă lucrări de la <strong>{{$a}}</strong>",
     "applytoteam": "Aplică notele și feedback-ul întregului grup",
     "assignmentisdue": "Data predării",
-    "attemptnumber": "Încercare",
+    "attemptnumber": "Numărul încercării",
     "attemptreopenmethod": "Încercările sunt disponibile din nou",
     "attemptreopenmethod_manual": "Manual",
     "attemptsettings": "Setări încerecre",
@@ -20,10 +20,10 @@
     "editingstatus": "Se editează statusul",
     "editsubmission": "Editare temă trimisă",
     "extensionduedate": "Termen de predare extins",
-    "grade": "Notă",
+    "grade": "Notează",
     "graded": "Notat",
     "gradedby": "Notat de",
-    "gradedon": "Notat: {{$a}}",
+    "gradedon": "Notat în data de",
     "gradeoutof": "O notă din {{$a}}",
     "hiddenuser": "Participant",
     "latesubmissionsaccepted": "Permis până în {{$a}}",
@@ -44,7 +44,7 @@
     "numberofsubmittedassignments": "Trimis",
     "numberofteams": "Grupuri",
     "numwords": "{{$a}} cuvinte",
-    "outof": "{{$a.grade}} din maxim {{$a.maxgrade}} posibil",
+    "outof": "{{$a.current}} din {{$a.total}}",
     "savechanges": "Salvează modificări",
     "submission": "Temă trimisă",
     "submissioneditable": "Cursanții își pot edita lucrările trimise",
diff --git a/www/addons/mod/assign/lang/ru.json b/www/addons/mod/assign/lang/ru.json
index 45801638537..d2e1917e97a 100644
--- a/www/addons/mod/assign/lang/ru.json
+++ b/www/addons/mod/assign/lang/ru.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Это назначение будет приниматься с <strong>{{$a}}</strong>",
     "applytoteam": "Применить оценки и отзывы для всей группы.",
     "assignmentisdue": "Задание сдано",
-    "attemptnumber": "Попытка",
+    "attemptnumber": "Номер попытки",
     "attemptreopenmethod": "Разрешать новые попытки",
     "attemptreopenmethod_manual": "Вручную",
     "attemptreopenmethod_untilpass": "Автоматически (до проходной оценки)",
@@ -19,7 +19,7 @@
     "currentgrade": "Текущая оценка в журнале",
     "cutoffdate": "Запретить отправку с",
     "defaultteam": "Группа по умолчанию",
-    "duedate": "Срок выполнения",
+    "duedate": "Последний срок сдачи",
     "duedateno": "Срок сдачи не ограничен",
     "duedatereached": "Срок сдачи этого задания уже истек",
     "editingstatus": "Изменение статуса",
@@ -28,7 +28,7 @@
     "grade": "Оценка",
     "graded": "Оценено",
     "gradedby": "Оценено",
-    "gradedon": "Оценено: {{$a}}",
+    "gradedon": "Оценено в",
     "gradenotsynced": "Оценка не синхронизирована",
     "gradeoutof": "Оценка из {{$a}}",
     "gradingstatus": "Состояние оценивания",
@@ -49,17 +49,17 @@
     "noonlinesubmissions": "Ответ на задание должен быть представлен вне сайта",
     "nosubmission": "Ничего не было представлено",
     "noteam": "Не является членом какой-либо группы",
-    "notgraded": "Не оценен",
+    "notgraded": "Не оценено",
     "numberofdraftsubmissions": "Черновик",
     "numberofparticipants": "Участники",
     "numberofsubmissionsneedgrading": "Требуют оценки",
     "numberofsubmittedassignments": "Ответы",
     "numberofteams": "Группы",
     "numwords": "всего слов - {{$a}}",
-    "outof": "{{$a.grade}} из {{$a.maxgrade}}",
-    "overdue": "Срок закончился",
-    "savechanges": "Сохранить изменения",
-    "submission": "Представление",
+    "outof": "{{$a.current}} из {{$a.total}}",
+    "overdue": "<font color=\"red\">Задание просрочено на: {{$a}}</font>",
+    "savechanges": "Сохранить",
+    "submission": "Ответ",
     "submissioneditable": "Студент может править свой ответ",
     "submissionnoteditable": "Студент не может исправлять этот ответ",
     "submissionslocked": "Ответы на это задание не принимаются",
@@ -76,7 +76,7 @@
     "submitassignment_help": "Однажды представив ответ на это задание Вы больше не сможете  изменить его.",
     "submittedearly": "Задание представлено заранее - {{$a}}",
     "submittedlate": "Задание представлено с опозданием - {{$a}}",
-    "timemodified": "Время изменения",
+    "timemodified": "Последнее изменение",
     "timeremaining": "Оставшееся время",
     "ungroupedusers": "Включен параметр «Нужно быть в группе для отправки ответа». Некоторые пользователи не являются членами групп или являются членами нескольких групп, эти пользователи не смогут отправить ответы на задание.",
     "unlimitedattempts": "Неограничено",
diff --git a/www/addons/mod/assign/lang/sv.json b/www/addons/mod/assign/lang/sv.json
index 16b3a854b08..674db970084 100644
--- a/www/addons/mod/assign/lang/sv.json
+++ b/www/addons/mod/assign/lang/sv.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Denna inlämningsuppgift kommer att tillåta inlämning från <strong>{{$a}}</strong>",
     "applytoteam": "Tillämpa betyg och återkoppling för hela gruppen",
     "assignmentisdue": "Inlämningstiden har gått ut.",
-    "attemptnumber": "Försök",
+    "attemptnumber": "Försök nummer",
     "attemptreopenmethod": "Försök återupptas",
     "attemptreopenmethod_manual": "Manuellt",
     "attemptreopenmethod_untilpass": "Automatiskt tills passerat",
@@ -19,16 +19,16 @@
     "currentgrade": "Aktuellt betyg/omdöme i betygskatalogen",
     "cutoffdate": "Avstängningsdatum",
     "defaultteam": "Förvald grupp",
-    "duedate": "Sista datum",
+    "duedate": "Stoppdatum/tid",
     "duedateno": "Inget stoppdatum/tid",
     "duedatereached": "Stoppdatum för denna inlämningsuppgift har nu passerat",
     "editingstatus": "Redigerar status",
     "editsubmission": "Redigera min inskickade uppgiftslösning",
     "extensionduedate": "Förlängning av stoppdatum",
-    "grade": "Betyg",
+    "grade": "Betyg/omdöme",
     "graded": "Betygssatt",
     "gradedby": "Betygssatt av",
-    "gradedon": "Betygssatt {{$a}}",
+    "gradedon": "Betygssatt den",
     "gradeoutof": "Betyg ur {{$a}}",
     "gradingstatus": "Betygssättningsstatus",
     "groupsubmissionsettings": "Gruppinlämning inställningar",
@@ -48,16 +48,16 @@
     "noonlinesubmissions": "Denna inlämningsuppgift kräver inte att du lämnar in något online.",
     "nosubmission": "Inget har lämnats in för denna inlämningsuppgift",
     "noteam": "Inte medlem i någon grupp",
-    "notgraded": "Inte rättad",
+    "notgraded": "Ej betygssatt",
     "numberofdraftsubmissions": "Utkast",
     "numberofparticipants": "Deltagare",
     "numberofsubmissionsneedgrading": "Behöver betygssättas",
     "numberofsubmittedassignments": "Inlämnad",
     "numberofteams": "Grupper",
     "numwords": "{{$a}} ord",
-    "outof": "av ett maximum på",
-    "overdue": "förfallen",
-    "savechanges": "Spara ändringar",
+    "outof": "{{$a.current}} av totalt {{$a.total}}",
+    "overdue": "<font color=\"red\">Inlämningsuppgiften är försenad med: {{$a}}</font>",
+    "savechanges": "Spara ändringar.",
     "submission": "Inskickad uppgift",
     "submissioneditable": "Elev kan ändra denna inlämning",
     "submissionnoteditable": "Elev kan inte ändra denna inlämning",
@@ -75,7 +75,7 @@
     "submitassignment_help": "När du har lämnat in din uppgift kommer du inte längre att kunna göra ändringar i den.",
     "submittedearly": "Inlämningsuppgift lämnades in {{$a}} tidigt",
     "submittedlate": "Inlämningsuppgift lämnades in {{$a}} sent",
-    "timemodified": "Modifierad när",
+    "timemodified": "Senast ändrad",
     "timeremaining": "Återstående tid",
     "unlimitedattempts": "Obegränsad",
     "userswhoneedtosubmit": "Användare som behöver lämna in: {{$a}}",
diff --git a/www/addons/mod/assign/lang/tr.json b/www/addons/mod/assign/lang/tr.json
index 3852f07754c..72b0e0a2002 100644
--- a/www/addons/mod/assign/lang/tr.json
+++ b/www/addons/mod/assign/lang/tr.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "Ödev başvuruları <strong>{{$a}}</strong> adresinden kabul edilecek.",
     "applytoteam": "Notları onayla ve tüm gruba geri bildirimde bulun",
     "assignmentisdue": "Ödevin teslim süresi dolmuş",
-    "attemptnumber": "Uygulama",
+    "attemptnumber": "Deneme numarası",
     "attemptreopenmethod": "Denemeler tekrar açıldı",
     "attemptreopenmethod_manual": "El ile",
     "attemptreopenmethod_untilpass": "Geçene kadar otomatik",
@@ -19,15 +19,15 @@
     "currentgrade": "Notdefterindeki şuanki notu",
     "cutoffdate": "Kesilme tarihi",
     "defaultteam": "Varsayılan grup",
-    "duedate": "Bitiş tarihi",
+    "duedate": "Son teslim tarihi",
     "duedateno": "Süresiz",
     "duedatereached": "Bu ödevin teslim tarihi geçmiş",
     "editingstatus": "Durumu düzenleme",
     "editsubmission": "Gönderimi düzenle",
     "extensionduedate": "Ek sürenin bitiş tarihi",
-    "grade": "Başarı notu",
+    "grade": "Not",
     "graded": "Notlandırıldı",
-    "gradedon": "Notlandırıldı: {{$a}}",
+    "gradedon": "Not verildi",
     "gradeoutof": "{{$a}} Dışarıdan notu",
     "gradingstatus": "Puan durumu",
     "groupsubmissionsettings": "Grup gönderimleri ayarları",
@@ -54,8 +54,8 @@
     "numberofsubmittedassignments": "Gönderilen",
     "numberofteams": "Gruplar",
     "numwords": "{{$a}} kelime",
-    "outof": "{{$a.maxgrade}} üzerinden {{$a.grade}}",
-    "overdue": "Süresi dolmuş",
+    "outof": "{{$a.current}} dışında {{$a.total}}",
+    "overdue": "<font color=\"red\">Tarafından göderilen geç kalmış ödev{{$a}}</font>",
     "savechanges": "Değişiklikleri kaydet",
     "submission": "Gönderim",
     "submissioneditable": "Öğrenci bu gönderimi düzenleyebilir",
@@ -74,7 +74,7 @@
     "submitassignment_help": "Ödevinizi gönderdiğinizde,  üzerinde değişiklik yapmanız mümkün olmayacak.",
     "submittedearly": "Ödev {{$a}} erken teslim edildi",
     "submittedlate": "Ödev {{$a}} geç teslim edildi",
-    "timemodified": "Düzenleme zamanı",
+    "timemodified": "Son düzenleme",
     "timeremaining": "Kalan süre",
     "ungroupedusers": "'Gönderim yapmak için grup gerekli' ayarı etkindir ve bazı kullanıcılar herhangi bir gruba üye değildir veya birden fazla gruba üye olduğundan, gönderim yapamazlar.",
     "unlimitedattempts": "Sınırsız",
diff --git a/www/addons/mod/assign/lang/uk.json b/www/addons/mod/assign/lang/uk.json
index 81ec4685f73..2b97cdc9229 100644
--- a/www/addons/mod/assign/lang/uk.json
+++ b/www/addons/mod/assign/lang/uk.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "Прийом робіт з цього завдання буде відкрито з <strong>{{$a}}</strong>",
     "applytoteam": "Застосувати оцінки та відгуки для всієї групи",
     "assignmentisdue": "Прийом робіт закінчено",
-    "attemptnumber": "Спроба",
+    "attemptnumber": "Спроба номер",
     "attemptreopenmethod": "Можливість перездачі",
     "attemptreopenmethod_manual": "Вручну",
     "attemptreopenmethod_untilpass": "Автоматично до виконання",
@@ -23,7 +23,7 @@
     "currentgrade": "Поточна оцінка в журналі",
     "cutoffdate": "Термін неприйняття здачі",
     "defaultteam": "Типова група",
-    "duedate": "Термін завершення",
+    "duedate": "Кінцевий термін здачі",
     "duedateno": "Термін здачі не обмежено",
     "duedatereached": "Термін для здачі робіт цього завдання вже минув",
     "editingstatus": "Зміна статусу",
@@ -35,7 +35,7 @@
     "grade": "Оцінка",
     "graded": "Оцінено",
     "gradedby": "Оцінив",
-    "gradedon": "Оцінено: {{$a}}",
+    "gradedon": "Оцінено на",
     "gradenotsynced": "Оцінка не синхронізуються",
     "gradeoutof": "Оцінка (макс. {{$a}})",
     "gradingstatus": "Статус оцінення",
@@ -64,10 +64,10 @@
     "numberofsubmittedassignments": "Здано",
     "numberofteams": "Групи",
     "numwords": "{{$a}} слів",
-    "outof": "{{$a.grade}} з {{$a.maxgrade}} можливих",
-    "overdue": "Прострочено",
-    "savechanges": "Зберегти зміни",
-    "submission": "Подання",
+    "outof": "{{$a.current}} з {{$a.total}}",
+    "overdue": "<font color=\"red\">Термін здачі прострочено на: {{$a}}</font>",
+    "savechanges": "Зберегти",
+    "submission": "Прийнято відповідей",
     "submissioneditable": "Студент може редагувати свою роботу",
     "submissionnoteditable": "Студент не може редагувати свою роботу",
     "submissionnotsupported": "Це подання не підтримується програмою і не може містити всю інформацію",
@@ -85,8 +85,8 @@
     "submitassignment_help": "Як тільки ви відішлете роботу на оцінення, ви не зможете зробити в ній ніяких змін",
     "submittedearly": "Завдання здано раніше на {{$a}}",
     "submittedlate": "Завдання здано пізніше на {{$a}}",
-    "timemodified": "Час модифікації",
-    "timeremaining": "Залишилося",
+    "timemodified": "Востаннє змінено",
+    "timeremaining": "Залишилося часу",
     "ungroupedusers": "Включено параметр \"Необхідна група щоб здати роботу\" але деякі студенти не записані у жодну групу, це означає, що вони не зможуть здати роботу в цьому завданні.",
     "unlimitedattempts": "Необмежено",
     "userswhoneedtosubmit": "Користувачі, яким потрібно здати: {{$a}}",
diff --git a/www/addons/mod/assign/lang/zh-cn.json b/www/addons/mod/assign/lang/zh-cn.json
index fed6b1038ba..0b6a1d8aa94 100644
--- a/www/addons/mod/assign/lang/zh-cn.json
+++ b/www/addons/mod/assign/lang/zh-cn.json
@@ -8,7 +8,7 @@
     "allowsubmissionsfromdatesummary": "本作业将从<strong>{{$a}}</strong>起接受提交",
     "applytoteam": "将分数和反馈意见应用到整个组",
     "assignmentisdue": "作业截止",
-    "attemptnumber": "试卷",
+    "attemptnumber": "作业提交次数",
     "attemptreopenmethod": "重试开启",
     "attemptreopenmethod_manual": "手工开启",
     "attemptreopenmethod_untilpass": "自动开启直到通过",
@@ -19,7 +19,7 @@
     "currentgrade": "成绩单中的当前成绩",
     "cutoffdate": "提交截止时间",
     "defaultteam": "默认分组",
-    "duedate": "截止日",
+    "duedate": "截止时间",
     "duedateno": "无截止时间",
     "duedatereached": "此作业的截止日期已经过了",
     "editingstatus": "编辑状态",
@@ -28,7 +28,7 @@
     "grade": "成绩",
     "graded": "已评分",
     "gradedby": "评分人",
-    "gradedon": "评分：{{$a}}",
+    "gradedon": "评分时间",
     "gradeoutof": "成绩（满分 {{$a}} ）",
     "gradingstatus": "评分状态",
     "groupsubmissionsettings": "分组提交设置",
@@ -55,9 +55,9 @@
     "numberofsubmittedassignments": "提交",
     "numberofteams": "群组",
     "numwords": "{{$a}}单词",
-    "outof": "{{$a.grade}}/满分{{$a.maxgrade}}",
-    "overdue": "超时",
-    "savechanges": "保存更动",
+    "outof": "{{$a.current}}，共有{{$a.total}}",
+    "overdue": "<font color=\"red\">作业截止日期：{{$a}}</font>",
+    "savechanges": "保存更改",
     "submission": "提交的作业",
     "submissioneditable": "学生可以编辑提交的作业",
     "submissionnoteditable": "学生不能编辑提交的作业",
@@ -75,7 +75,7 @@
     "submitassignment_help": "提交作业后，您将不能再做任何修改。",
     "submittedearly": "提早{{$a}}提交作业",
     "submittedlate": "过期{{$a}}才提交作业",
-    "timemodified": "编辑时间",
+    "timemodified": "最后修改",
     "timeremaining": "剩余时间",
     "ungroupedusers": "“需要小组合作完成的作业”的设置已经启用，某些用户未分配小组或者加入多个小组，将不能完成作业。",
     "unlimitedattempts": "不限",
diff --git a/www/addons/mod/assign/lang/zh-tw.json b/www/addons/mod/assign/lang/zh-tw.json
index 6c776650bf4..94a6fc83415 100644
--- a/www/addons/mod/assign/lang/zh-tw.json
+++ b/www/addons/mod/assign/lang/zh-tw.json
@@ -9,7 +9,7 @@
     "allowsubmissionsfromdatesummary": "這個作業將從<strong> {{$a}} </ strong>開始可以繳交",
     "applytoteam": "將分數和回饋套用到整個群組",
     "assignmentisdue": "作業繳交已截止",
-    "attemptnumber": "作答數",
+    "attemptnumber": "作業提交次數",
     "attemptreopenmethod": "重新開啟作業提交",
     "attemptreopenmethod_manual": "手動的",
     "attemptreopenmethod_untilpass": "自動的，直到通過",
@@ -23,7 +23,7 @@
     "currentgrade": "目前成績單中的分數",
     "cutoffdate": "拒收作業時間",
     "defaultteam": "預設群組",
-    "duedate": "截止日期",
+    "duedate": "規定繳交時間",
     "duedateno": "沒有規定繳交時間",
     "duedatereached": "此作業的規定繳交時間已經過了",
     "editingstatus": "編修狀態",
@@ -32,10 +32,10 @@
     "errorshowinginformation": "我們無法顯示提交資訊",
     "extensionduedate": "展延到期日",
     "feedbacknotsupported": "該應用程式不支援此回饋, 並且可能不包含所有資訊",
-    "grade": "成績",
+    "grade": "分數",
     "graded": "已評分",
     "gradedby": "已評分由",
-    "gradedon": "分數：{{$a}}",
+    "gradedon": "評分標準",
     "gradeoutof": "得分(配分{{$a}})",
     "gradingstatus": "評分狀態",
     "groupsubmissionsettings": "群組繳交作業設定",
@@ -56,17 +56,17 @@
     "nosubmission": "這個作業還沒人繳交",
     "notallparticipantsareshown": "沒有提交的參與者不會被顯示出來",
     "noteam": "不屬於任何群組",
-    "notgraded": "沒被計分的",
+    "notgraded": "尚未評分",
     "numberofdraftsubmissions": "草稿",
     "numberofparticipants": "參與者",
     "numberofsubmissionsneedgrading": "需要評分",
     "numberofsubmittedassignments": "已繳交",
     "numberofteams": "群組",
     "numwords": "{{$a}}字數",
-    "outof": "{{$a.grade}}分（滿分為{{$a.maxgrade}}分）",
-    "overdue": "過期",
-    "savechanges": "儲存改變",
-    "submission": "提交作品",
+    "outof": "{{$a.current}}，共有{{$a.total}}",
+    "overdue": "<font color=\"red\">已經超過應繳交時間: {{$a}}</font>",
+    "savechanges": "儲存更改",
+    "submission": "繳交作業",
     "submissioneditable": "學生可以編編輯這一繳交的作業",
     "submissionnoteditable": "學生不能編輯這一繳交的作業",
     "submissionnotsupported": "該應用程式不支援此提交, 並且可能不包含所有資訊",
@@ -84,7 +84,7 @@
     "submitassignment_help": "當這項作業繳交後，您將不能再做任何修改。",
     "submittedearly": "提早{{$a}}就繳交作業",
     "submittedlate": "過期{{$a}}才繳交作業",
-    "timemodified": "修改的時間",
+    "timemodified": "最後修改",
     "timeremaining": "剩餘時間",
     "ungroupedusers": "\"需要以群組方式提交作業\"的設定已經被啟動，但是仍有某些用戶沒有被指派到群組中，或者同一個人屬於多個群組，因此無法提交作業。",
     "unlimitedattempts": "無限制的",
diff --git a/www/addons/mod/chat/lang/ar.json b/www/addons/mod/chat/lang/ar.json
index b90e9c616f3..578e593e60d 100644
--- a/www/addons/mod/chat/lang/ar.json
+++ b/www/addons/mod/chat/lang/ar.json
@@ -11,8 +11,8 @@
     "messagebeepsyou": "{{$a}}  أرسل نغمة لك!",
     "messageenter": "{{$a}}  دخل غرفة محادثة",
     "messageexit": "{{$a}}  خرج من غرفة محادثة",
-    "nomessages": "لا يوجد رساله/رسائل جديدة",
-    "send": "إرسال",
+    "nomessages": "لا توجد رسائل بعد",
+    "send": "إرسل",
     "sessionstart": "ي  {{$a.date}}, ({{$a.fromnow}} وسوف تبدأ جلسة  الدردشة القادمة في من الآن",
     "talk": "حديث"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/bg.json b/www/addons/mod/chat/lang/bg.json
index d8c52aa1652..dd7f6963fde 100644
--- a/www/addons/mod/chat/lang/bg.json
+++ b/www/addons/mod/chat/lang/bg.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}} току що Ви бибитна!",
     "messageenter": "{{$a}} току що влезе в този чат",
     "messageexit": "{{$a}} напусна този чат",
-    "nomessages": "Няма чакащи съобщения",
+    "nomessages": "Още няма съобщения",
     "send": "Изпращане",
     "sessionstart": "Следващата чат сесия ще започне след: {{$a}}",
     "talk": "Разговор"
diff --git a/www/addons/mod/chat/lang/ca.json b/www/addons/mod/chat/lang/ca.json
index 064a89121a4..40e71c22702 100644
--- a/www/addons/mod/chat/lang/ca.json
+++ b/www/addons/mod/chat/lang/ca.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} acaba d'entrar en aquest xat",
     "messageexit": "{{$a}} ha abandonat aquest xat",
     "mustbeonlinetosendmessages": "Heu d'estar connectat per poder enviar missatges",
-    "nomessages": "No teniu missatges pendents",
+    "nomessages": "No hi ha missatges encara",
     "send": "Envia",
     "sessionstart": "La propera sessió de xat començarà el: {{$a.date}}, (d'aquí a {{$a.fromnow}})",
     "talk": "Parla"
diff --git a/www/addons/mod/chat/lang/cs.json b/www/addons/mod/chat/lang/cs.json
index b48b27b1a0f..5a2dbd232b7 100644
--- a/www/addons/mod/chat/lang/cs.json
+++ b/www/addons/mod/chat/lang/cs.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} právě vstoupil(a) do tohoto chatu",
     "messageexit": "{{$a}} opustil(a) tento chat",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
-    "nomessages": "Žádné zprávy",
+    "nomessages": "Zatím žádné zprávy",
     "send": "Odeslat",
     "sessionstart": "Další chatování začne v {{$a}}, (za {{$a.fromnow}})",
     "talk": "Diskuse"
diff --git a/www/addons/mod/chat/lang/da.json b/www/addons/mod/chat/lang/da.json
index 2001d90c5de..904a47e2359 100644
--- a/www/addons/mod/chat/lang/da.json
+++ b/www/addons/mod/chat/lang/da.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} er lige kommet til",
     "messageexit": "{{$a}} har forladt chatten",
     "mustbeonlinetosendmessages": "Du skal være online for at sende beskeder",
-    "nomessages": "Ingen beskeder",
+    "nomessages": "Ingen beskeder endnu",
     "send": "Send",
     "sessionstart": "Næste chat starter {{$a.date}}, ({{$a.fromnow}} fra nu af)",
     "talk": "Tal"
diff --git a/www/addons/mod/chat/lang/el.json b/www/addons/mod/chat/lang/el.json
index 71ba80bb1de..eb3c0910806 100644
--- a/www/addons/mod/chat/lang/el.json
+++ b/www/addons/mod/chat/lang/el.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} έχει μπει σ' αυτή το συζήτηση",
     "messageexit": "{{$a}} έχει φύγει από αυτή το συζήτηση",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "nomessages": "Δεν υπάρχουν μηνύματα σε αναμονή",
+    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
     "send": "Αποστολή",
     "sessionstart": "Η επόμενη συνεδρία τσάτ θα αρχίσει στις {{$a.date}}, ({{$a.fromnow}} από τώρα)"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/es-mx.json b/www/addons/mod/chat/lang/es-mx.json
index f583b8e1a0c..8bef1491c16 100644
--- a/www/addons/mod/chat/lang/es-mx.json
+++ b/www/addons/mod/chat/lang/es-mx.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} entró a la sala",
     "messageexit": "{{$a}} salió de la sala",
     "mustbeonlinetosendmessages": "Usted debe de estar en-línea para enviar mensajes",
-    "nomessages": "No hay mensajes",
+    "nomessages": "Aún no hay mensajes",
     "send": "Enviar",
     "sessionstart": "La siguiente sesión de chat comenzará en {{$a.date}},  dentro de ({{$a.fromnow}} a partir de ahora)",
     "talk": "Charla"
diff --git a/www/addons/mod/chat/lang/es.json b/www/addons/mod/chat/lang/es.json
index d91ea9f9d16..5b44e523fb1 100644
--- a/www/addons/mod/chat/lang/es.json
+++ b/www/addons/mod/chat/lang/es.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} entró a la sala",
     "messageexit": "{{$a}} salió de la sala",
     "mustbeonlinetosendmessages": "Usted debe de estar conectado a Internet para enviar mensajes",
-    "nomessages": "No hay mensajes en espera",
+    "nomessages": "Aún no hay mensajes",
     "send": "Enviar",
     "sessionstart": "La próxima sesión de chat empezará el {{$a.date}}, (dentro de {{$a.fromnow}})",
     "talk": "Charla"
diff --git a/www/addons/mod/chat/lang/eu.json b/www/addons/mod/chat/lang/eu.json
index 3b484567484..f01f99a7374 100644
--- a/www/addons/mod/chat/lang/eu.json
+++ b/www/addons/mod/chat/lang/eu.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} oraintxe sartu da gelan",
     "messageexit": "{{$a}} irten egin da gelatik",
     "mustbeonlinetosendmessages": "On-line egon behar duzu mezuak bidaltzeko",
-    "nomessages": "Ez duzu mezurik",
+    "nomessages": "Ez dago mezurik oraindik",
     "send": "Bidali",
     "sessionstart": "Txat-saioa {{$a.date}}-(e)tan hasiko da, (hemendik {{$a.fromnow}}-(e)ra)",
     "talk": "Hitz egin"
diff --git a/www/addons/mod/chat/lang/fa.json b/www/addons/mod/chat/lang/fa.json
index 9e9f6cef96e..35925c4ea7b 100644
--- a/www/addons/mod/chat/lang/fa.json
+++ b/www/addons/mod/chat/lang/fa.json
@@ -5,7 +5,7 @@
     "messagebeepsyou": "{{$a}} برای شما بوق فرستاد!",
     "messageenter": "{{$a}} وارد اتاق گفتگو شد",
     "messageexit": "{{$a}} اتاق گفتگو را ترک کرد",
-    "nomessages": "هیچ پیغامی منتظر جواب نیست",
+    "nomessages": "هنوز پیامی گفته نشده است",
     "send": "ارسال",
     "sessionstart": "جلسهٔ بعدی گفتگو {{$a.date}} شروع خواهد شد ({{$a.fromnow}} دیگر)",
     "talk": "صحبت"
diff --git a/www/addons/mod/chat/lang/fr.json b/www/addons/mod/chat/lang/fr.json
index d3501f8dad4..dea0b044a91 100644
--- a/www/addons/mod/chat/lang/fr.json
+++ b/www/addons/mod/chat/lang/fr.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} vient d'entrer",
     "messageexit": "{{$a}} a quitté ce chat",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
-    "nomessages": "Aucun message",
+    "nomessages": "Pas encore de messages",
     "send": "Envoyer",
     "sessionstart": "La prochaine session de chat commencera le {{$a.date}}, (dans {{$a.fromnow}})",
     "talk": "Parler"
diff --git a/www/addons/mod/chat/lang/he.json b/www/addons/mod/chat/lang/he.json
index afae33d5501..8cd72c5f92d 100644
--- a/www/addons/mod/chat/lang/he.json
+++ b/www/addons/mod/chat/lang/he.json
@@ -8,8 +8,8 @@
     "messageenter": "{{$a}} נכנס/ה לרב-שיח זה",
     "messageexit": "{{$a}} עזב/ה רב-שיח זה",
     "mustbeonlinetosendmessages": "עליך להיות מחובר בכדי לשלוח הודעות.",
-    "nomessages": "אין מסרים ממתינים",
-    "send": "לשלוח",
+    "nomessages": "אין הודעות עדיין",
+    "send": "שליחה",
     "sessionstart": "מפגש הרב-שיח הבא יתחיל ב: {{$a}}",
     "talk": "דברו"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/hu.json b/www/addons/mod/chat/lang/hu.json
index ca994d8b90a..4200be1473f 100644
--- a/www/addons/mod/chat/lang/hu.json
+++ b/www/addons/mod/chat/lang/hu.json
@@ -7,8 +7,8 @@
     "messagebeepsyou": "{{$a}} most csöngetett Önnek!",
     "messageenter": "{{$a}} most lépett be a csevegésbe",
     "messageexit": "{{$a}} most lépett ki a csevegésből",
-    "nomessages": "Nincs üzenet.",
-    "send": "Küldés",
+    "nomessages": "Még nincs üzenet",
+    "send": "Elküld",
     "sessionstart": "A következő csevegés kezdete  {{$a.date}}, (mostantól {{$a.fromnow}})",
     "talk": "Beszéljen"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/it.json b/www/addons/mod/chat/lang/it.json
index 5af815637ed..e0543395d75 100644
--- a/www/addons/mod/chat/lang/it.json
+++ b/www/addons/mod/chat/lang/it.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} è entrato nella chat",
     "messageexit": "{{$a}} ha lasciato la chat",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
-    "nomessages": "Nessun messaggio",
+    "nomessages": "Non ci sono ancora messaggi",
     "send": "Invia",
     "sessionstart": "La prossima sessione di chat inizierà il {{$a}}, ({{$a.fromnow}} da adesso)",
     "talk": "Parla"
diff --git a/www/addons/mod/chat/lang/ja.json b/www/addons/mod/chat/lang/ja.json
index ed78dcd76dd..052232c43bf 100644
--- a/www/addons/mod/chat/lang/ja.json
+++ b/www/addons/mod/chat/lang/ja.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}} があなたにビープしました!",
     "messageenter": "このチャットに {{$a}} が入室しました。",
     "messageexit": "このチャットから {{$a}} が退室しました。",
-    "nomessages": "メッセージはありません。",
+    "nomessages": "メッセージがありません。",
     "send": "送信",
     "sessionstart": "次のチャットセッションは {{$a.date}} に開始されます (現在から {{$a.fromnow}} 後)。",
     "talk": "会話"
diff --git a/www/addons/mod/chat/lang/lt.json b/www/addons/mod/chat/lang/lt.json
index 8ed8ca0192c..0eb4caa16f1 100644
--- a/www/addons/mod/chat/lang/lt.json
+++ b/www/addons/mod/chat/lang/lt.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} ką tik prisijungė prie šio pokalbio",
     "messageexit": "{{$a}} ką tik paliko šį pokalbį",
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite būti prisijungęs.",
-    "nomessages": "Nėra žinučių",
+    "nomessages": "Žinučių dar nėra",
     "send": "Siųsti",
     "sessionstart": "Pokalbio seansas bus pradėtas po: {{$a}}",
     "talk": "Kalbėti"
diff --git a/www/addons/mod/chat/lang/nl.json b/www/addons/mod/chat/lang/nl.json
index 88fe821f3d9..ab169c31198 100644
--- a/www/addons/mod/chat/lang/nl.json
+++ b/www/addons/mod/chat/lang/nl.json
@@ -12,8 +12,8 @@
     "messageenter": "{{$a}} is net deze chat binnen gekomen",
     "messageexit": "{{$a}} heeft deze chat verlaten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
-    "nomessages": "Geen berichten",
-    "send": "Verstuur",
+    "nomessages": "Nog geen berichten",
+    "send": "Stuur",
     "sessionstart": "De volgende chatsessie zal beginnen op {{$a.date}}, ({{$a.fromnow}} vanaf nu)",
     "talk": "Spreek"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/pl.json b/www/addons/mod/chat/lang/pl.json
index 61d20ec2e3c..b1a54b073ef 100644
--- a/www/addons/mod/chat/lang/pl.json
+++ b/www/addons/mod/chat/lang/pl.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}} właśnie do Ciebie napisał",
     "messageenter": "{{$a}} właśnie wszedł na czat",
     "messageexit": "{{$a}} opuścił czat",
-    "nomessages": "Brak oczekujących wiadomości",
+    "nomessages": "Brak wiadomości",
     "send": "Wyślij",
     "sessionstart": "Sesja czatu rozpocznie się za:  {$ a}}",
     "talk": "Dyskusja"
diff --git a/www/addons/mod/chat/lang/pt-br.json b/www/addons/mod/chat/lang/pt-br.json
index b6571255d15..474fea465ec 100644
--- a/www/addons/mod/chat/lang/pt-br.json
+++ b/www/addons/mod/chat/lang/pt-br.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} entrou no chat",
     "messageexit": "{{$a}} abandonou este chat",
     "mustbeonlinetosendmessages": "Você deve estar online para enviar mensagens",
-    "nomessages": "Sem novas mensagens",
+    "nomessages": "Nenhuma mensagem ainda",
     "send": "Enviar",
     "sessionstart": "A próxima sessão de chat irá começar em {{$a}}",
     "talk": "Falar"
diff --git a/www/addons/mod/chat/lang/pt.json b/www/addons/mod/chat/lang/pt.json
index e9f93528b1e..73de434c71a 100644
--- a/www/addons/mod/chat/lang/pt.json
+++ b/www/addons/mod/chat/lang/pt.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} acabou de entrar neste chat",
     "messageexit": "{{$a}} acabou de sair deste chat",
     "mustbeonlinetosendmessages": "Tem de estar online para enviar mensagens",
-    "nomessages": "Sem mensagens",
+    "nomessages": "Ainda não há mensagens",
     "send": "Enviar",
     "sessionstart": "A próxima sessão de chat irá iniciar em {{$a.date}}, ({{$a.fromnow}} a partir de agora)",
     "talk": "Falar"
diff --git a/www/addons/mod/chat/lang/ro.json b/www/addons/mod/chat/lang/ro.json
index 8846f68b4f2..71520bed6f8 100644
--- a/www/addons/mod/chat/lang/ro.json
+++ b/www/addons/mod/chat/lang/ro.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} a intrat în această cameră de discuţii",
     "messageexit": "{{$a}} a ieşit din această cameră de discuţii",
     "mustbeonlinetosendmessages": "Trebuie să fiți conectat pentru a trimite mesaje",
-    "nomessages": "Nu există mesaje în aşteptare",
-    "send": "Trimite",
+    "nomessages": "Nu a fost trimis încă niciun mesaj",
+    "send": "Trimis",
     "sessionstart": "Următoarea sesiune de chat va începe în {{$a}}"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/ru.json b/www/addons/mod/chat/lang/ru.json
index 484c7031f15..9a36351090d 100644
--- a/www/addons/mod/chat/lang/ru.json
+++ b/www/addons/mod/chat/lang/ru.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} появился в чате",
     "messageexit": "{{$a}} ушел из чата",
     "mustbeonlinetosendmessages": "Вы должны быть онлайн, чтобы отправлять сообщения",
-    "nomessages": "Нет новых сообщений",
+    "nomessages": "Нет ни одного сообщения",
     "send": "Отправить",
     "sessionstart": "Следующий сеанс чата начнётся: {{$a.date}}, (через {{$a.fromnow}})",
     "talk": "Разговор"
diff --git a/www/addons/mod/chat/lang/sv.json b/www/addons/mod/chat/lang/sv.json
index 0d2c28e52e4..cc26779e559 100644
--- a/www/addons/mod/chat/lang/sv.json
+++ b/www/addons/mod/chat/lang/sv.json
@@ -12,7 +12,7 @@
     "messageenter": "{{$a}} har precis kommit in i detta direktsamtal",
     "messageexit": "{{$a}} har lämnat det här direktsamtalet",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
-    "nomessages": "Inga avvaktande meddelanden",
+    "nomessages": "Inga meddelanden än",
     "send": "Skicka",
     "sessionstart": "Sessionen för direktsamtal kommer att starta inom: {{$a}}",
     "talk": "Tala"
diff --git a/www/addons/mod/chat/lang/tr.json b/www/addons/mod/chat/lang/tr.json
index c4e26e72e39..f3deef5d519 100644
--- a/www/addons/mod/chat/lang/tr.json
+++ b/www/addons/mod/chat/lang/tr.json
@@ -6,7 +6,7 @@
     "messagebeepsyou": "{{$a}} size sesleniyor!",
     "messageenter": "{{$a}} odaya girdi",
     "messageexit": "{{$a}} odadan ayrıldı",
-    "nomessages": "Yeni ileti yok",
+    "nomessages": "Henüz mesaj yok",
     "send": "Gönder",
     "sessionstart": "Bir sonraki görüşme oturumu {{$a.date}}, ({{$a.fromnow}} şu andan itibaren)",
     "talk": "Sohbet et"
diff --git a/www/addons/mod/chat/lang/uk.json b/www/addons/mod/chat/lang/uk.json
index 31bf402d3ae..66503297072 100644
--- a/www/addons/mod/chat/lang/uk.json
+++ b/www/addons/mod/chat/lang/uk.json
@@ -12,8 +12,8 @@
     "messageenter": "{{$a}} з'явився в чаті",
     "messageexit": "{{$a}} пішов із чату",
     "mustbeonlinetosendmessages": "Ви повинні бути онлайн для відправки повідомлення",
-    "nomessages": "Немає нових повідомлень",
-    "send": "Надіслати",
+    "nomessages": "Ще немає повідомлень",
+    "send": "Відіслати",
     "sessionstart": "Чат-сесію буде розпочато: {{$a}}",
     "talk": "Розмова"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/zh-cn.json b/www/addons/mod/chat/lang/zh-cn.json
index 16055d4f6c9..4f3bd2feeea 100644
--- a/www/addons/mod/chat/lang/zh-cn.json
+++ b/www/addons/mod/chat/lang/zh-cn.json
@@ -7,7 +7,7 @@
     "messagebeepsyou": "{{$a}}刚刚呼叫您！",
     "messageenter": "{{$a}}刚刚进入聊天室",
     "messageexit": "{{$a}}已退出聊天室",
-    "nomessages": "没有新消息",
+    "nomessages": "无消息",
     "send": "发送",
     "sessionstart": "聊天会话开始时间：{{$a}}",
     "talk": "交谈"
diff --git a/www/addons/mod/chat/lang/zh-tw.json b/www/addons/mod/chat/lang/zh-tw.json
index ab137ab4cd0..193467d9f95 100644
--- a/www/addons/mod/chat/lang/zh-tw.json
+++ b/www/addons/mod/chat/lang/zh-tw.json
@@ -12,8 +12,8 @@
     "messageenter": "{{$a}} 剛加入這次聊天",
     "messageexit": "{{$a}} 已退出這次聊天",
     "mustbeonlinetosendmessages": "您必須上線才能傳送訊息",
-    "nomessages": "沒有待處理的簡訊",
-    "send": "送出",
+    "nomessages": "尚無訊息",
+    "send": "傳送",
     "sessionstart": "下一個聊天時段即將在{{$a.date}}開始，(離現在{{$a.fromnow}} )",
     "talk": "交談"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/ar.json b/www/addons/mod/choice/lang/ar.json
index 43d31e38305..60ff70d91f6 100644
--- a/www/addons/mod/choice/lang/ar.json
+++ b/www/addons/mod/choice/lang/ar.json
@@ -1,9 +1,9 @@
 {
     "choiceoptions": "خيارات الاختيار",
     "expired": "عذراً، تم إغلاق هذا النشاط في {{$a}} وهو غير متوفر الآن.",
-    "full": "كامل",
+    "full": "(كامل)",
     "noresultsviewable": "حالياً لا يمكن معاينة النتائج",
-    "notopenyet": "عذراً، هذا النشاط لن يتاح حتى {{$a}}",
+    "notopenyet": "عذرا، هذا النشاط سيكون متوفر في {{$a}}",
     "numberofuser": "عدد المستخدمين",
     "numberofuserinpercentage": "عدد المستخدمين كنسبة",
     "removemychoice": "استبعد خياري",
diff --git a/www/addons/mod/choice/lang/bg.json b/www/addons/mod/choice/lang/bg.json
index 2ff869c48ec..8d68c62563d 100644
--- a/www/addons/mod/choice/lang/bg.json
+++ b/www/addons/mod/choice/lang/bg.json
@@ -1,9 +1,9 @@
 {
     "choiceoptions": "Възможности за избиране",
-    "expired": "За съжаление тази дейност е затворена в {{$a}} и вече не е достъпна",
-    "full": "Разгънато",
+    "expired": "За съжаление тази дейност е затворена от {{$a}} и вече не е достъпна",
+    "full": "(Пълен)",
     "noresultsviewable": "В момента резултатите не са за показване.",
-    "notopenyet": "За съжаление тази дейност не е достъпна от {{$a}}",
+    "notopenyet": "За съжаление тази дейност не е достъпна до {{$a}}",
     "numberofuser": "Брой участници",
     "numberofuserinpercentage": "Процент потребители",
     "removemychoice": "Изтриване на моя избор",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index 1bf28cfcc60..c0a93b72130 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -2,8 +2,8 @@
     "cannotsubmit": "Hi ha hagut un problema en la tramesa de la vostra resposta. Torneu-ho a intentar.",
     "choiceoptions": "Opcions de la tria",
     "errorgetchoice": "S'ha produït un error en recuperar les dades de la consulta.",
-    "expired": "Aquesta activitat es va tancar el dia {{$a}} i ja no està disponible",
-    "full": "Completa",
+    "expired": "Aquesta activitat es va tancar el dia {{$a}} i ja no està disponible.",
+    "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
     "numberofuser": "Nombre de respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index a6f1b631b65..f9a22aaf32e 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Omlouváme se, nastal problém odesláním vaší odpovědi. Zkuste to prosím znovu.",
     "choiceoptions": "Možné odpovědi na anketu",
     "errorgetchoice": "Chyba při načítání  dat ankety.",
-    "expired": "Promiňte, ale tato činnost byla {{$a}} uzavřena a již není k dispozici",
-    "full": "Úplný",
+    "expired": "Je nám líto, tato činnost byla uzavřena {{$a}} a není nadále dostupná",
+    "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
-    "notopenyet": "Promiňte, ale tato činnost nebude dostupná až do {{$a}}",
+    "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
     "numberofuser": "Počet odpovědí",
     "numberofuserinpercentage": "Počet odpovědí v procentech",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
diff --git a/www/addons/mod/choice/lang/da.json b/www/addons/mod/choice/lang/da.json
index 6e20a13e8f1..e462afcd51a 100644
--- a/www/addons/mod/choice/lang/da.json
+++ b/www/addons/mod/choice/lang/da.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Der var desværre problemer med at indsende dit valg. Prøv igen.",
     "choiceoptions": "Valgmuligheder",
     "errorgetchoice": "Fejl ved hentning af valgte data",
-    "expired": "Beklager, denne aktivitet lukkede {{$a}} og er ikke længere tilgængelig",
-    "full": "Fuld",
+    "expired": "Beklager, denne aktivitet er lukket d. {{$a}} og er ikke længere tilgængelig",
+    "full": "(Fuld)",
     "noresultsviewable": "Resultaterne er ikke tilgængelige på nuværende tidspunkt.",
-    "notopenyet": "Beklager, denne aktivitet er ikke tilgængelig før {{$a}}",
+    "notopenyet": "Denne aktivitet er tilgængelig fra {{$a}}",
     "numberofuser": "Antal svar",
     "numberofuserinpercentage": "Antal svar i procent",
     "previewonly": "Dette er en forhåndsvisning af de tilgængelige valgmuligheder i denne afstemning. Du kan ikke indsende dine valg før {{$a}}.",
     "removemychoice": "Slet mit valg",
-    "responses": "Responser",
+    "responses": "Besvarelser",
     "responsesresultgraphdescription": "{{number}}% af brugerne vælger denne mulighed: {{test}}",
     "responsesresultgraphheader": "Grafisk visning",
     "savemychoice": "Gem",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index 593f90971a9..be13d38af77 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Ihre Auswahl konnte nicht gespeichert werden. Versuchen Sie es bitte noch einmal.",
     "choiceoptions": "Abstimmoptionen",
     "errorgetchoice": "Fehler beim Laden der Abstimmungsdaten",
-    "expired": "Entschuldigung, die Aktivität wurde am {{$a}} geschlossen und ist nicht länger verfügbar",
-    "full": "Vollständig",
+    "expired": "Diese Abstimmung ist seit {{$a}} beendet. Eine Auswahl ist nicht mehr möglich.",
+    "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
-    "notopenyet": "Entschuldigung, diese Aktivität ist nicht verfügbar bis {{$a}}",
+    "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
     "numberofuser": "Anzahl der Antworten",
     "numberofuserinpercentage": "Prozent der Antworten",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
-    "responses": "Eigene Eingaben",
+    "responses": "Stimmabgaben",
     "responsesresultgraphdescription": "{{number}}% der Teilnehmer/innen haben die Option gewählt: {{text}}.",
     "responsesresultgraphheader": "Grafische Darstellung",
     "resultsnotsynced": "Die letzte Antwort ist in den Ergebnissen noch nicht enthalten. Synchronisieren Sie die Daten.",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index e73943fa063..4b17c064e80 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -1,9 +1,9 @@
 {
     "errorgetchoice": "Σφάλμα κατά τη λήψη των επιλεγμένων δεδομένων.",
-    "expired": "Λυπάμαι, αλλά η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη",
-    "full": "Πλήρες",
+    "expired": "Η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη",
+    "full": "(Πλήρες)",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
-    "notopenyet": "Λυπάμαι, η δραστηριότητα αυτή δεν είναι διαθέσιμη πριν τις {{$a}}",
+    "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
     "numberofuser": "Αριθμός απαντήσεων",
     "numberofuserinpercentage": "Ποσοστό απαντήσεων",
     "removemychoice": "Διαγραφή της επιλογής μου",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index 9205a29eafa..ceddb82adc6 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Lo sentimos, hubo un problema al enviar su eleccción. Por favor, inténtelo de nuevo.",
     "choiceoptions": "Opciones de la elección",
     "errorgetchoice": "Error al obtener datos de elección.",
-    "expired": "Lo sentimos, esta actividad se cerró en {{$a}} y ya no está disponible",
-    "full": "Completo",
+    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
+    "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
-    "notopenyet": "Esta actividad no estará disponible hasta {{$a}}",
+    "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
     "numberofuser": "Número de respuestas",
     "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
-    "responses": "Respuestas del alumno",
+    "responses": "Respuestas",
     "responsesresultgraphdescription": "{{number}}% de los usuarios eligió la opción: {{text}}.",
     "responsesresultgraphheader": "Vista de Gráfica",
     "resultsnotsynced": "Los resultados no incluyen su última respuesta. Por favor, sincronícelos para actualizarlos.",
diff --git a/www/addons/mod/choice/lang/es.json b/www/addons/mod/choice/lang/es.json
index 39c93d4c220..74076baa791 100644
--- a/www/addons/mod/choice/lang/es.json
+++ b/www/addons/mod/choice/lang/es.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Lo lamentamos, se ha producido un error con el envío de su respuesta. Por favor inténtelo de nuevo.",
     "choiceoptions": "Opciones de la Consulta",
     "errorgetchoice": "Se ha producido un error recuperando los datos de la consulta.",
-    "expired": "Lo sentimos, esta actividad se cerró en {{$a}} y ya no está disponible",
-    "full": "Completo",
+    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
+    "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
-    "notopenyet": "Esta actividad no estará disponible hasta {{$a}}",
+    "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
     "numberofuser": "Número de respuestas",
     "numberofuserinpercentage": "Porcentaje de respuestas",
     "previewonly": "Esta es solamente una previsualización de las opciones disponibles para esta actividad. No podrá enviar su respuesta a la consulta hasta el {{$a}}.",
     "removemychoice": "Eliminar mi elección",
-    "responses": "Respuestas -",
+    "responses": "Respuestas",
     "responsesresultgraphdescription": "{{number}}% de los usuarios han escogido la opción: {{text}}.",
     "responsesresultgraphheader": "Vista de gráfica",
     "resultsnotsynced": "Los resultados no incluyen su última respuesta. Por favor, sincronícelos para actualizarlos.",
diff --git a/www/addons/mod/choice/lang/eu.json b/www/addons/mod/choice/lang/eu.json
index dc12193a130..62e0810b4c4 100644
--- a/www/addons/mod/choice/lang/eu.json
+++ b/www/addons/mod/choice/lang/eu.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Barkatu, arazoa gertatu da zure aukera bidaltzean. Mesedez, saiatu berriz.",
     "choiceoptions": "Kontsultaren aukerak",
     "errorgetchoice": "Errorea kontsultaren datuak eskuratzean.",
-    "expired": "Barkatu, jarduera {{$a}} -n itxi zen eta dagoeneko ez dago eskura",
-    "full": "Osoa",
+    "expired": "Barkatu, jarduera hau {{$a}}(e)an itxi zen eta dagoeneko ez dago eskuragarri.",
+    "full": "(Beteta)",
     "noresultsviewable": "Emaitzak ezin dira orain ikusi",
-    "notopenyet": "Barkatu, jarduera hau ez dago eskuragarri {{$a}} arte",
+    "notopenyet": "Barkatu, baina jarduera hau ez dago erabiltzeko moduan {{$a}} arte.",
     "numberofuser": "Erantzun-kopurua",
     "numberofuserinpercentage": "Erantzunen portzentajea",
     "previewonly": "Hau jarduera honetan eskuragarri dauden aukeren aurrebista besterik ez da. Ezingo duzu zure erantzuna bidali {{$a}}-(e)ra arte.",
     "removemychoice": "Ezabatu nire aukera",
-    "responses": "Ebazpenak",
+    "responses": "Erantzunak",
     "responsesresultgraphdescription": "Erabiltzaileen %{{number}}-ak aukera hau aukeratu zuten: {{text}}.",
     "responsesresultgraphheader": "Erakutsi grafikoa",
     "resultsnotsynced": "Emaitzek ez dute zure azken erantzunak barne hartzen. Mesedez, sinkronizatu datuak eguneratzeko.",
diff --git a/www/addons/mod/choice/lang/fa.json b/www/addons/mod/choice/lang/fa.json
index 4a99a7a125e..ccf5b036789 100644
--- a/www/addons/mod/choice/lang/fa.json
+++ b/www/addons/mod/choice/lang/fa.json
@@ -1,13 +1,13 @@
 {
     "choiceoptions": "گزینه‌های انتخابی",
-    "expired": "متأسفیم، این فعالیت در {{$a}} بسته شد و دیگر در دسترس نیست",
-    "full": "تفصیلی",
+    "expired": "با عرض پوزش، این فعالیت در {{$a}} بسته شد و دیگر در دسترس نیست",
+    "full": "(پر)",
     "noresultsviewable": "نتایج در این لحظه قابل دیدن نیستند.",
-    "notopenyet": "این فعالیت تا {{$a}} در دسترس نخواهد بود",
+    "notopenyet": "با عرض معذرت، این فعالیت تا قبل از {{$a}} در دسترس نیست",
     "numberofuser": "تعداد کاربران",
     "numberofuserinpercentage": "درصد پاسخ‌ها",
     "removemychoice": "حذف انتخاب من",
-    "responses": "پاسخ‌های ارائه شده",
+    "responses": "پاسخ‌ها",
     "responsesresultgraphheader": "نمایش نمودار",
     "savemychoice": "ذخیرهٔ انتخاب من",
     "userchoosethisoption": "کاربرانی که این گزینه را انتخاب کرده‌اند",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 06b219d340b..9ca0f50c2ea 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -3,14 +3,14 @@
     "choiceoptions": "Options du sondage",
     "errorgetchoice": "Erreur lors de l'obtention des données du choix.",
     "expired": "Désolé, cette activité s'est terminée le {{$a}} et n'est plus disponible",
-    "full": "Complet",
+    "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
-    "notopenyet": "Désolé, cette activité n'est pas disponible avant le {{$a}}",
+    "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
     "numberofuser": "Nombre de réponses",
     "numberofuserinpercentage": "Pourcentage de réponses",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
-    "responses": "Réponses du participant",
+    "responses": "Réponses",
     "responsesresultgraphdescription": "{{number}} % des participants ont choisi l'option : {{text}}.",
     "responsesresultgraphheader": "Affichage graphique",
     "resultsnotsynced": "Les résultats n'incluent pas votre dernière réponse. Veuillez synchroniser pour les mettre à jour.",
diff --git a/www/addons/mod/choice/lang/he.json b/www/addons/mod/choice/lang/he.json
index 7cce9b15709..42ad44693a5 100644
--- a/www/addons/mod/choice/lang/he.json
+++ b/www/addons/mod/choice/lang/he.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "קרתה תקלה בשליחת הבחירה שלך, ניתן לנסות שנית מאוחר יותר.",
     "choiceoptions": "אפשרויות שאלת־סקר",
     "errorgetchoice": "שגיאה בטעינת המידע של שאלת הבחירה.",
-    "expired": "פעילות זו הסתיימה ב- {{$a}} ואינה זמינה כעת.",
-    "full": "מלא",
+    "expired": "מצטערים, פעילות זו נסגרה על {{$a}} והיא איננה זמינה יותר",
+    "full": "(מלא)",
     "noresultsviewable": "כרגע לא ניתן לצפות בתוצאות.",
-    "notopenyet": "פעילות זאת איננה זמינה עד {{$a}}",
+    "notopenyet": "לצערנו, פעילות זו אינה זמינה עד {{$a}}",
     "numberofuser": "מספר המשתתפים",
     "numberofuserinpercentage": "מספר  המשתתפים באחוזים",
     "previewonly": "זוהי תצוגה מקדימה לאפשרויות הזמינות עבור פעילות זו. לא ניתן יהיה הגיש את הבחירה שלך עד {{$a}}.",
     "removemychoice": "הסרת בחירתי",
-    "responses": "תגובות",
+    "responses": "תשובות",
     "responsesresultgraphdescription": "{{number}}% מהמשתמשים בחרו באפשרות {{text}}.",
     "responsesresultgraphheader": "תצוגה גרפית",
     "savemychoice": "שמירת הבחירה שלי",
diff --git a/www/addons/mod/choice/lang/hu.json b/www/addons/mod/choice/lang/hu.json
index ad971a6a7ae..f9ba9f23440 100644
--- a/www/addons/mod/choice/lang/hu.json
+++ b/www/addons/mod/choice/lang/hu.json
@@ -1,15 +1,15 @@
 {
     "cannotsubmit": "Választásának leadásával gondok vannak. Próbálja meg később.",
     "choiceoptions": "Választási lehetőségek",
-    "expired": "Ez a tevékenység {{$a}} időpontban lezárult és már nem érhető el.",
-    "full": "Teljes",
+    "expired": "Ez a tevékenység {{$a}} időpontban lezárult és már nem érhető el",
+    "full": "(Betelt)",
     "noresultsviewable": "Az eredmények jelenleg nem tekinthetők meg.",
-    "notopenyet": "A tevékenység {{$a}} időpontig nem érhető el.",
+    "notopenyet": "Ez a tevékenység {{$a}} időpontig nem elérhető",
     "numberofuser": "Válaszok száma",
     "numberofuserinpercentage": "Válaszok száma százalékban",
     "previewonly": "Ez a tevékenység lehetőségeinek előnézete. A választását {{$a}} időpontig nem közölheti.",
     "removemychoice": "Válaszlehetőségem törlése",
-    "responses": "Tanuló válaszai",
+    "responses": "Tanuló által adott válaszok",
     "responsesresultgraphheader": "Gráfmegjelenítés",
     "savemychoice": "Válaszlehetőségem mentése",
     "userchoosethisoption": "Ezt választó felhasználók",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index 9e954f13897..01597a9058a 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -3,14 +3,14 @@
     "choiceoptions": "Opzioni scelta",
     "errorgetchoice": "Si è verificato un errore durante la ricezione di dati della scelta.",
     "expired": "Spiacente, questa attività è stata chiusa il {{$a}} e non è più disponibile",
-    "full": "Tutte le colonne",
+    "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
-    "notopenyet": "Spiacente, questa attività non è disponibile fino al {{$a}}",
+    "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
     "numberofuser": "Numero di risposte",
     "numberofuserinpercentage": "Percentuale delle risposte",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
-    "responses": "Risposte date",
+    "responses": "Scelte",
     "responsesresultgraphdescription": "Il {{number}}% ha scelto l'opzione {{text}}.",
     "responsesresultgraphheader": "Visualizzazione grafico",
     "savemychoice": "Salva la mia scelta",
diff --git a/www/addons/mod/choice/lang/ja.json b/www/addons/mod/choice/lang/ja.json
index 0b2245e0565..02afe740bcd 100644
--- a/www/addons/mod/choice/lang/ja.json
+++ b/www/addons/mod/choice/lang/ja.json
@@ -2,14 +2,14 @@
     "cannotsubmit": "申し訳ございません、あなたの投票送信時に問題が発生しました。再度お試しください。",
     "choiceoptions": "投票オプション",
     "expired": "申し訳ございません、この活動は {{$a}} に終了しているため、これ以上利用することはできません。",
-    "full": "フル",
+    "full": "(上限到達)",
     "noresultsviewable": "現在、投票結果は閲覧できません。",
     "notopenyet": "申し訳ございません、この活動は {{$a}} まで利用することができません。",
     "numberofuser": "投票者数",
     "numberofuserinpercentage": "投票者数 (%)",
     "previewonly": "これはこの活動で利用可能なオプションのプレビューです。あなたの投票は {{$a}} まで送信することができません。",
     "removemychoice": "私の投票を削除する",
-    "responses": "解答",
+    "responses": "投票結果",
     "responsesresultgraphheader": "グラフ表示",
     "savemychoice": "私の投票を保存する",
     "userchoosethisoption": "このオプションを選択したユーザ",
diff --git a/www/addons/mod/choice/lang/lt.json b/www/addons/mod/choice/lang/lt.json
index e0a7c351068..ee1bf2c25c3 100644
--- a/www/addons/mod/choice/lang/lt.json
+++ b/www/addons/mod/choice/lang/lt.json
@@ -2,8 +2,8 @@
     "cannotsubmit": "Atsiprašome, buvo problema pateikiant tavo pasirinkimą. Prašau, pabandykite dar kartą.",
     "choiceoptions": "Pasirinkimo parinktys",
     "errorgetchoice": "Klaida gaunant alternatyvius duomenis.",
-    "expired": "Apgailestaujame, ši veikla uždaryta {{$a}} ir nebegalima",
-    "full": "Visas",
+    "expired": "Atsiprašome, veikla uždaryta {{$a}} ir nebegalima",
+    "full": "(Visas)",
     "noresultsviewable": "Rezultatai dabar nematomi.",
     "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
     "numberofuser": "Atsakymų skaičius",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index 627dd4e28f4..d7e7f4cd7f3 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Er was een probleem bij het insturen van je keuze. Probeer opnieuw",
     "choiceoptions": "Keuze-opties",
     "errorgetchoice": "Fout bij het ophalen van de keuzegegevens.",
-    "expired": "Sorry, deze activiteit is op {{$a}} gesloten en is niet langer beschikbaar",
-    "full": "Volledig",
+    "expired": "Sorry, deze activiteit is afgesloten op {{$a}} en is niet meer beschikbaar",
+    "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
-    "notopenyet": "Sorry, deze activiteit is niet beschikbaar tot {{$a}}",
+    "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
     "numberofuser": "Aantal antwoorden",
     "numberofuserinpercentage": "Percentage antwoorden",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
-    "responses": "Eigen antwoorden",
+    "responses": "Antwoorden",
     "responsesresultgraphdescription": "{{number}}% van de gebruikers kozen optie: {{text}}.",
     "responsesresultgraphheader": "Grafiek tonen",
     "resultsnotsynced": "Jouw laatste reactie zit niet in de resultaten. Synchroniseer om deze te up to date te maken.",
diff --git a/www/addons/mod/choice/lang/pl.json b/www/addons/mod/choice/lang/pl.json
index 5c51ab0cc95..5a9baaa7221 100644
--- a/www/addons/mod/choice/lang/pl.json
+++ b/www/addons/mod/choice/lang/pl.json
@@ -1,14 +1,14 @@
 {
     "cannotsubmit": "Wystąpił problem podczas zatwierdzania twojego wyboru. Proszę spróbuj ponownie.",
     "choiceoptions": "Opcje wyboru odpowiedzi",
-    "expired": "Niestety, ta aktywność została zamknięta {{$a}} i nie jest już dostępna",
-    "full": "Pełny",
+    "expired": "Niestety ta aktywność została zamknięta {{$a}} i nie jest już dostępna.",
+    "full": "(pełne)",
     "noresultsviewable": "Nie ma wglądu w wyniki głosowania.",
-    "notopenyet": "Niestety, ta aktywność jest niedostępna do {{$a}}",
+    "notopenyet": "Moduł nieczynny do {{$a}}",
     "numberofuser": "Liczba użytkowników",
     "numberofuserinpercentage": "Ilość użytkowników w procentach",
     "removemychoice": "Usuń mój wybór",
-    "responses": "Udzielone odpowiedzi",
+    "responses": "Odpowiedzi",
     "responsesresultgraphheader": "Wyświetl wykres",
     "savemychoice": "Zapisz mój wybór",
     "userchoosethisoption": "Użytkownicy, którzy wybrali poszczególne opcje.",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index 5af252e3535..01fbb57c4c1 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Desculpe, houve um problema ao enviar sua escolha. Por favor, tente novamente.",
     "choiceoptions": "Opções de escolha",
     "errorgetchoice": "Erro ao obter dados do escolha.",
-    "expired": "Desculpe, este atividade fechada em {{$a}} e não está mais disponível",
-    "full": "Completo",
+    "expired": "Esta atividade está encerrada desde {{$a}}",
+    "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
-    "notopenyet": "Desculpe, esta atividade não está disponível até {{$a}}",
+    "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
     "numberofuser": "Número de usuários",
     "numberofuserinpercentage": "Percentual de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
diff --git a/www/addons/mod/choice/lang/pt.json b/www/addons/mod/choice/lang/pt.json
index 1f372a01470..68e628591c5 100644
--- a/www/addons/mod/choice/lang/pt.json
+++ b/www/addons/mod/choice/lang/pt.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Desculpe, surgiu um problema ao submeter a sua escolha. Por favor, tente novamente.",
     "choiceoptions": "Opções de resposta",
     "errorgetchoice": "Erro ao obter os dados da sondagem.",
-    "expired": "A atividade fechou em {{$a}} e já não se encontra disponível",
-    "full": "Completo",
+    "expired": "Esta atividade terminou em {{$a}} e já não está disponível",
+    "full": "Completa",
     "noresultsviewable": "Os resultados da sondagem ainda não estão disponíveis.",
-    "notopenyet": "Esta atividade não se encontra disponível até {{$a}}",
+    "notopenyet": "Lamentamos mas esta atividade só estará disponível em {{$a}}",
     "numberofuser": "Número de respostas",
     "numberofuserinpercentage": "Percentagem de respostas",
     "previewonly": "Esta é apenas uma pré-visualização das opções disponíveis para esta atividade. Não poderá submeter a sua escolha até {{$a}}.",
diff --git a/www/addons/mod/choice/lang/ro.json b/www/addons/mod/choice/lang/ro.json
index b700526a6d9..2133b57b951 100644
--- a/www/addons/mod/choice/lang/ro.json
+++ b/www/addons/mod/choice/lang/ro.json
@@ -1,9 +1,9 @@
 {
     "errorgetchoice": "Eroare în obținerea de date pentru alegere",
-    "expired": "Ne pare rău, această activitate închisă în {{$a}} nu mai este disponibilă",
-    "full": "Complet",
+    "expired": "Ne pare rău, această activitate s-a închis la {{$a}} şi nu mai este disponibilă",
+    "full": "(plin)",
     "noresultsviewable": "În acest moment rezultatele nu pot fi vizualizate.",
-    "notopenyet": "Ne pare rău, această activitate nu este disponibilă până în {{$a}}",
+    "notopenyet": "Ne pare rău, această activitate nu este disponibilă mai devreme de {{$a}}",
     "numberofuser": "Numărul de răspunsuri",
     "numberofuserinpercentage": "Procentajul răspunsurilor",
     "previewonly": "Acesta este doar o prezentare a opțiunilor existente pentru această activitate. Nu veți putea trimite opțiunea dvs. până la {{$a}}.",
diff --git a/www/addons/mod/choice/lang/ru.json b/www/addons/mod/choice/lang/ru.json
index 2a45162655a..a8b13940e57 100644
--- a/www/addons/mod/choice/lang/ru.json
+++ b/www/addons/mod/choice/lang/ru.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Извините, возникла проблема при отправке Вашего ответа на опрос. Пожалуйста, повторите снова.",
     "choiceoptions": "Варианты ответа",
     "errorgetchoice": "Ошибка при получении данных выбора",
-    "expired": "Извините, данный элемент курса закрыт в {{$a}} и уже не доступен",
-    "full": "Полный",
+    "expired": "Извините эта активность закрыта {{$a}} и более недоступна",
+    "full": "(Заполнено)",
     "noresultsviewable": "Вы не можете в данный момент просматривать результаты опроса.",
-    "notopenyet": "Извините, данный элемент курса не доступен до {{$a}}",
+    "notopenyet": "Извините, данное действие недоступно до {{$a}}",
     "numberofuser": "Количество ответов на опрос",
     "numberofuserinpercentage": "Доля ответивших на опрос",
     "previewonly": "Это только предварительный просмотр доступных вариантов для этого опроса. Вы не можете отправить свой ответ до {{$a}}.",
     "removemychoice": "Удалить мой выбор",
-    "responses": "Свои ответы",
+    "responses": "Ответы",
     "responsesresultgraphdescription": "{{number}}% пользователей выбрало вариант: {{text}}.",
     "responsesresultgraphheader": "Отображать график",
     "savemychoice": "Сохранить мой выбор",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index deac1e67ed0..8ef6af50622 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "Tyvärr fanns det ett problem att lämna ditt val . Var god försök igen.",
     "choiceoptions": "Alternativ för opinonsundersökning",
     "errorgetchoice": "Fel vid hämtning av opinionsdata",
-    "expired": "Den här aktiviteten är tyvärr avslutad den {{$a}} och den är inte längre tillgänglig",
-    "full": "Fullständig",
+    "expired": "Den här aktiviteten är stängd på {{$a}} och den är inte längre tillgänglig.",
+    "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
-    "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {$}}",
+    "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
     "numberofuser": "Antal användare",
     "numberofuserinpercentage": "Antalet användare i procent.",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
-    "responses": "Responser",
+    "responses": "Svar",
     "responsesresultgraphdescription": "{{number}}% Av användarna valde alternativet: {{text}}",
     "responsesresultgraphheader": "Visa en graf",
     "savemychoice": "Spara min opinionsundersökning",
diff --git a/www/addons/mod/choice/lang/tr.json b/www/addons/mod/choice/lang/tr.json
index 17549bb1abb..05535649a7a 100644
--- a/www/addons/mod/choice/lang/tr.json
+++ b/www/addons/mod/choice/lang/tr.json
@@ -1,15 +1,15 @@
 {
     "cannotsubmit": "Üzgünüz, seçiminizi gönderirken bir sorun oluştu. Lütfen tekrar deneyin.",
     "choiceoptions": "Seçim seçenekleri",
-    "expired": "Üzgünüz, bu etkinlik {{$a}} tarihinde kapatılmış ve artık erişilemez",
-    "full": "Tam",
+    "expired": "Üzgünüz, bu etkinlik {{$a}} tarihinde kapandı ve bu etkinliğe artık ulaşılamaz",
+    "full": "(Dolu)",
     "noresultsviewable": "Sonuçlar şu anda görüntülenmemektedir.",
-    "notopenyet": "Üzgünüz, bu etkinliğe {{$a}} tarihine kadar erişemezsiniz.",
+    "notopenyet": "Üzgünüz, bu etkinliğe {{$a}} tarihine kadar ulaşılamaz",
     "numberofuser": "Yanıt sayısı",
     "numberofuserinpercentage": "Yanıtların yüzdesi",
     "previewonly": "Bu, bu etkinlik için mevcut seçeneklerin bir önizlemesidir. {{$a}} tarihine kadar seçiminizi yapamazsınız.",
     "removemychoice": "Seçimimi sil",
-    "responses": "Verilen yanıtlar",
+    "responses": "Yanıtlar",
     "responsesresultgraphheader": "Grafik ekranı",
     "savemychoice": "Seçeneğimi kaydet",
     "userchoosethisoption": "Bu seçeneği seçen kullanıcılar",
diff --git a/www/addons/mod/choice/lang/uk.json b/www/addons/mod/choice/lang/uk.json
index 45d0a3a03d0..dc8d2e2f936 100644
--- a/www/addons/mod/choice/lang/uk.json
+++ b/www/addons/mod/choice/lang/uk.json
@@ -2,10 +2,10 @@
     "cannotsubmit": "Вибачте, але трапилася проблема під час збереження вашого вибору. Повторіть, будь ласка, ще раз.",
     "choiceoptions": "Параметри вибору",
     "errorgetchoice": "Помилка при отриманні даних вибору.",
-    "expired": "На жаль, ця діяльність закрита з {{$a}}  і більше недоступна",
-    "full": "Повністю",
+    "expired": "На жаль, ця діяльність закрита для {{$a}} та більше недоступна",
+    "full": "(Все)",
     "noresultsviewable": "В даний час результати не можна побачити.",
-    "notopenyet": "Вибачте, ця діяльність недоступна до {{$a}}",
+    "notopenyet": "Цей ресурс буде недоступний до {{$a}}",
     "numberofuser": "Кількість користувачів",
     "numberofuserinpercentage": "Кількість користувачів у відсотках",
     "previewonly": "Це лише попередній перегляд доступних варіантів для цієї діяльності. Ви не можете відправити відповідь до {{$a}}.",
diff --git a/www/addons/mod/choice/lang/zh-cn.json b/www/addons/mod/choice/lang/zh-cn.json
index e5727c24749..3204cfd0148 100644
--- a/www/addons/mod/choice/lang/zh-cn.json
+++ b/www/addons/mod/choice/lang/zh-cn.json
@@ -1,15 +1,15 @@
 {
     "cannotsubmit": "对不起，你的提交有误，请再试一次。",
     "choiceoptions": "投票选项",
-    "expired": "抱歉，本活动已于{{$a}}关闭，已不再可用。",
-    "full": "全屏",
+    "expired": "对不起，该活动已于 {{$a}} 关闭，不能再参加",
+    "full": "(已满)",
     "noresultsviewable": "结果目前不能查看。",
-    "notopenyet": "抱歉，这个活动直到{{$a}}才能进行",
+    "notopenyet": "对于起，此活动在 {{$a}} 之后才可用",
     "numberofuser": "用户数",
     "numberofuserinpercentage": "用户数百分比",
     "previewonly": "这只是该活动的可用选项的预览。你要等到{{$a}}才可以进行投票。",
     "removemychoice": "删除我的投票",
-    "responses": "作答",
+    "responses": "回复",
     "responsesresultgraphheader": "图示",
     "savemychoice": "保存我的选择",
     "userchoosethisoption": "选择此选项的用户",
diff --git a/www/addons/mod/choice/lang/zh-tw.json b/www/addons/mod/choice/lang/zh-tw.json
index cf166f787dd..c97305fd6fa 100644
--- a/www/addons/mod/choice/lang/zh-tw.json
+++ b/www/addons/mod/choice/lang/zh-tw.json
@@ -2,15 +2,15 @@
     "cannotsubmit": "抱歉，在提交你的投票時發生問題，請再試一次。",
     "choiceoptions": "票選的選項",
     "errorgetchoice": "取得選項資料時出錯",
-    "expired": "抱歉，這活動已經在{{$a}}關閉，已經無法使用",
-    "full": "全部",
+    "expired": "抱歉，此項活動已經在{{$a}}關閉，不再開放使用。",
+    "full": "(已滿)",
     "noresultsviewable": "目前無法檢視票選結果",
-    "notopenyet": "抱歉，這一活動要到{{$a}}才可以使用",
+    "notopenyet": "抱歉，這個活動在{{$a}}之前不能使用",
     "numberofuser": "回應的人數",
     "numberofuserinpercentage": "回應人數的百分比",
     "previewonly": "這只是這一活動的可用選項的預覽。你要等到{{$a}}才可以進行投票。",
     "removemychoice": "移除我的選擇",
-    "responses": "回答",
+    "responses": "答覆",
     "responsesresultgraphdescription": "{{number}}％的使用者選擇了選項: {{text}}.",
     "responsesresultgraphheader": "顯示圖表",
     "resultsnotsynced": "結果不包括您的上次回覆. 請同步更新.",
diff --git a/www/addons/mod/feedback/lang/ar.json b/www/addons/mod/feedback/lang/ar.json
index 76ad30ce026..ddcafaf0d1a 100644
--- a/www/addons/mod/feedback/lang/ar.json
+++ b/www/addons/mod/feedback/lang/ar.json
@@ -8,21 +8,21 @@
     "continue_the_form": "استمر من",
     "feedbackclose": "إغلاق الأفادة",
     "feedbackopen": "فتح الإفادة",
-    "mode": "وضع",
+    "mode": "نمط",
     "next_page": "الصفحة التالية",
     "non_anonymous": "سيتم تسجيل اسم المستخدم وعرضه مع الإجابات",
     "non_respondents_students": "غير مستجيبين",
     "not_selected": "لم يتم الاختيار",
     "not_started": "لم يتم البدء",
-    "overview": "عرض عام",
+    "overview": "نظرة عامة",
     "page_after_submit": "الصفحة بعد الإرسال",
     "preview": "معاينة",
     "previous_page": "صفحة سابقة",
-    "questions": "أسئله",
+    "questions": "أسئلة",
     "responses": "إجابات",
     "save_entries": "سلم إجاباتك",
     "show_entries": "عرض الردود",
     "show_nonrespondents": "معاينة غير المستجيبين",
-    "started": "بدأ",
+    "started": "بداء",
     "this_feedback_is_already_submitted": "لقد قمت مسبقاً بإكمال هذا النشاط."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/bg.json b/www/addons/mod/feedback/lang/bg.json
index 8cc9e80a539..335c218cf1c 100644
--- a/www/addons/mod/feedback/lang/bg.json
+++ b/www/addons/mod/feedback/lang/bg.json
@@ -17,7 +17,7 @@
     "non_respondents_students": "не отговорили студенти",
     "not_selected": "Няма избран",
     "not_started": "не започната",
-    "overview": "Обобщение",
+    "overview": "Представяне",
     "page_after_submit": "Съобщение след попълване",
     "preview": "Преглед",
     "previous_page": "Предишна страница",
@@ -27,6 +27,6 @@
     "save_entries": "Изпращане на отговорите",
     "show_entries": "Преглед на отговорите",
     "show_nonrespondents": "Показване на не отговорилите",
-    "started": "Започнато",
+    "started": "започната",
     "this_feedback_is_already_submitted": "Вие вече сте изпълнили тази дейност."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ca.json b/www/addons/mod/feedback/lang/ca.json
index 69f08255769..4d936b89e1c 100644
--- a/www/addons/mod/feedback/lang/ca.json
+++ b/www/addons/mod/feedback/lang/ca.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Permet les respostes a",
     "feedbackopen": "Permet les respostes de",
     "mapcourses": "Mapatge de retroacció a cursos.",
-    "mode": "Moda",
+    "mode": "Mode",
     "next_page": "Pàgina següent",
     "non_anonymous": "El nom de l'usuari es registrarà i es mostrarà amb les respostes",
     "non_anonymous_entries": "entrades no anònimes",
@@ -20,9 +20,9 @@
     "not_selected": "No s'ha seleccionat",
     "not_started": "No s'ha iniciat",
     "numberoutofrange": "Número fora de l'interval",
-    "overview": "Revisió",
+    "overview": "Descripció",
     "page_after_submit": "Missatge de compleció",
-    "preview": "Previsualització",
+    "preview": "Vista prèvia",
     "previous_page": "Pàgina anterior",
     "questions": "Preguntes",
     "response_nr": "Número de resposta",
@@ -30,6 +30,6 @@
     "save_entries": "Envia les respostes",
     "show_entries": "Mostra les respostes",
     "show_nonrespondents": "Mostra els que no han respost",
-    "started": "Iniciat",
+    "started": "s'ha iniciat",
     "this_feedback_is_already_submitted": "Heu completat aquesta activitat"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/cs.json b/www/addons/mod/feedback/lang/cs.json
index 2f720cf1708..50c98674c0f 100644
--- a/www/addons/mod/feedback/lang/cs.json
+++ b/www/addons/mod/feedback/lang/cs.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Povolit odpovědi",
     "feedbackopen": "Dostupné od",
     "mapcourses": "Mapování kurzů",
-    "mode": "Modus",
+    "mode": "Režim",
     "next_page": "Další stránka",
     "non_anonymous": "Jména respondentů budou zaznamenána a ukázána s odpověďmi",
     "non_anonymous_entries": "Neanonymní záznamy ({{$a}})",
@@ -24,12 +24,12 @@
     "page_after_submit": "Zpráva o dokončení",
     "preview": "Náhled",
     "previous_page": "Předchozí stránka",
-    "questions": "Úlohy",
+    "questions": "Otázky",
     "response_nr": "Číslo odpovědi",
     "responses": "Odpovědi",
     "save_entries": "Odevzdejte vaše odpovědi",
     "show_entries": "Ukázat odpovědi",
     "show_nonrespondents": "Ukázat uživatele, kteří neodpověděli",
-    "started": "Zahájeno",
+    "started": "Spuštěno",
     "this_feedback_is_already_submitted": "Tento dotazník jste již vyplnili."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/da.json b/www/addons/mod/feedback/lang/da.json
index d51de3114d7..55d1b3cd1ba 100644
--- a/www/addons/mod/feedback/lang/da.json
+++ b/www/addons/mod/feedback/lang/da.json
@@ -17,13 +17,13 @@
     "non_respondents_students": "Studerende der ikke har besvaret ({{$a}})",
     "not_selected": "Ikke valgt",
     "not_started": "Ikke startet",
-    "overview": "Oversigt",
+    "overview": "Overblik",
     "page_after_submit": "Fuldførelsesbesked",
-    "preview": "Prøvese",
+    "preview": "Forhåndsvisning",
     "previous_page": "Forrige side",
     "questions": "Spørgsmål",
     "response_nr": "Svar nummer",
-    "responses": "Responser",
+    "responses": "Svar",
     "save_entries": "Aflever dine svar",
     "show_entries": "Vis svar",
     "show_nonrespondents": "Vis ikke-respondenter",
diff --git a/www/addons/mod/feedback/lang/de.json b/www/addons/mod/feedback/lang/de.json
index ee1c71e5e31..7c665bbb337 100644
--- a/www/addons/mod/feedback/lang/de.json
+++ b/www/addons/mod/feedback/lang/de.json
@@ -2,7 +2,7 @@
     "analysis": "Auswertung",
     "anonymous": "Anonym",
     "anonymous_entries": "Anonyme Einträge ({{$a}})",
-    "average": "Durchschnitt",
+    "average": "Mittelwert",
     "captchaofflinewarning": "Ein Feedback mit Captcha kann offline nicht beendet werden. Captcha funktioniert nicht, wenn der Server nicht konfiguriert ist oder der Server nicht antwortet.",
     "complete_the_form": "Formular ausfüllen...",
     "completed_feedbacks": "Ausgefüllte Feedbacks",
@@ -20,13 +20,13 @@
     "not_selected": "Nicht ausgewählt",
     "not_started": "Nicht begonnen",
     "numberoutofrange": "Zahl außerhalb des Bereichs",
-    "overview": "Übersicht",
+    "overview": "Überblick",
     "page_after_submit": "Abschlussmitteilung",
     "preview": "Vorschau",
     "previous_page": "Vorherige Seite",
     "questions": "Fragen",
     "response_nr": "Antwort Nr.",
-    "responses": "Eigene Eingaben",
+    "responses": "Antworten",
     "save_entries": "Einträge speichern",
     "show_entries": "Einträge anzeigen",
     "show_nonrespondents": "Ohne Antwort",
diff --git a/www/addons/mod/feedback/lang/el.json b/www/addons/mod/feedback/lang/el.json
index 66db88eec02..7dd8e2abab8 100644
--- a/www/addons/mod/feedback/lang/el.json
+++ b/www/addons/mod/feedback/lang/el.json
@@ -10,12 +10,12 @@
     "feedbackclose": "Κλείσε το σχόλιο στις",
     "feedbackopen": "Άνοιξε το σχόλιο στις",
     "mapcourses": "Αντιστοίχηση σχόλιου σε μαθήματα",
-    "mode": "Φάση",
+    "mode": "Λειτουργία",
     "next_page": "Επόμενη σελίδα",
     "non_anonymous": "Το όνομα του χρήστη θα καταγραφεί και θα εμφανίζεται με τις απαντήσεις",
     "non_anonymous_entries": "χωρίς ανώνυμες καταχωρήσεις",
     "not_selected": "Δεν έχουν επιλεχθεί",
-    "overview": "Σύνοψη",
+    "overview": "Επισκόπηση",
     "page_after_submit": "Σελίδα μετά την υποβολή",
     "preview": "Προεπισκόπηση",
     "previous_page": "Προηγούμενη σελίδα",
diff --git a/www/addons/mod/feedback/lang/es-mx.json b/www/addons/mod/feedback/lang/es-mx.json
index 42aa7fe3332..6c9cfa558f6 100644
--- a/www/addons/mod/feedback/lang/es-mx.json
+++ b/www/addons/mod/feedback/lang/es-mx.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Permitir respuestas a",
     "feedbackopen": "Permitir respuestas de",
     "mapcourses": "Asignar retroalimentación a cursos",
-    "mode": "Moda",
+    "mode": "Modo",
     "next_page": "Siguiente página",
     "non_anonymous": "Los nombres de los usuarios se mostrarán y registrarán con las respuestas",
     "non_anonymous_entries": "Entradas no anónimas ({{$a}})",
@@ -20,16 +20,16 @@
     "not_selected": "No seleccionada",
     "not_started": "No comenzado",
     "numberoutofrange": "Número fuera del rango",
-    "overview": "Visión general",
+    "overview": "Vista general",
     "page_after_submit": "Página a mostrar tras la terminación del envío",
-    "preview": "Vista previa",
+    "preview": "Previsualizar",
     "previous_page": "Página anterior",
     "questions": "Preguntas",
     "response_nr": "Respuesta número",
-    "responses": "Respuestas del alumno",
+    "responses": "Respuestas",
     "save_entries": "Enviar sus respuestas",
     "show_entries": "Mostrar respuestas",
     "show_nonrespondents": "Mostrar no respondientes",
-    "started": "Iniciado/a",
+    "started": "Comenzado",
     "this_feedback_is_already_submitted": "Usted ya ha finalizado esta actividad."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/es.json b/www/addons/mod/feedback/lang/es.json
index 7cefdcb0f63..b0d70fa540b 100644
--- a/www/addons/mod/feedback/lang/es.json
+++ b/www/addons/mod/feedback/lang/es.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Permitir respuestas a",
     "feedbackopen": "Permitir respuestas de",
     "mapcourses": "Asignar encuesta a cursos",
-    "mode": "Moda",
+    "mode": "Modo",
     "next_page": "Siguiente página",
     "non_anonymous": "Los nombres de los usuarios se mostrarán y registrarán con las respuestas",
     "non_anonymous_entries": "entradas no anónimas",
@@ -18,16 +18,16 @@
     "not_selected": "No seleccionada",
     "not_started": "no comenzado",
     "numberoutofrange": "Número fuera de rango",
-    "overview": "Revisión",
+    "overview": "Vista general",
     "page_after_submit": "Página a mostrar tras el envío",
-    "preview": "Vista previa",
+    "preview": "Previsualizar",
     "previous_page": "Página anterior",
     "questions": "Preguntas",
     "response_nr": "Respuesta número",
-    "responses": "Respuestas -",
+    "responses": "Respuestas",
     "save_entries": "Enviar sus respuestas",
     "show_entries": "Mostrar respuestas",
     "show_nonrespondents": "Mostrar no respondientes",
-    "started": "Iniciado/a",
+    "started": "comenzado",
     "this_feedback_is_already_submitted": "Usted ya ha finalizado esta actividad."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/eu.json b/www/addons/mod/feedback/lang/eu.json
index 7035a7febcc..1f74e6b554e 100644
--- a/www/addons/mod/feedback/lang/eu.json
+++ b/www/addons/mod/feedback/lang/eu.json
@@ -20,16 +20,16 @@
     "not_selected": "Aukeratu gabea",
     "not_started": "hasi gabea",
     "numberoutofrange": "Tartetik kanpoko zenbakia",
-    "overview": "Laburpena",
+    "overview": "Ikuspegi orokorra",
     "page_after_submit": "Osaketa-mezua",
-    "preview": "Aurreikusi",
+    "preview": "Aurrebista",
     "previous_page": "Aurreko orria",
     "questions": "Galderak",
     "response_nr": "Erantzun-kopurua",
-    "responses": "Ebazpenak",
+    "responses": "Erantzunak",
     "save_entries": "Bidali zure erantzunak",
     "show_entries": "Erakutsi erantzunak",
     "show_nonrespondents": "Erakutsi erantzun gabeak",
-    "started": "Hasita",
+    "started": "hasita",
     "this_feedback_is_already_submitted": "Dagoeneko egina duzu jarduera hau."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/fa.json b/www/addons/mod/feedback/lang/fa.json
index d62c4b9a502..c51a518902b 100644
--- a/www/addons/mod/feedback/lang/fa.json
+++ b/www/addons/mod/feedback/lang/fa.json
@@ -10,23 +10,23 @@
     "feedbackclose": "بستن بازخورد در",
     "feedbackopen": "باز کردن بازخورد در",
     "mapcourses": "نسبت دادن بازخورد به درس‌ها",
-    "mode": "روش",
+    "mode": "حالت",
     "next_page": "صفحهٔ بعد",
     "non_anonymous": "نام کاربران ثبت و به همراه پاسخ‌ها نمایش داده خواهد شد",
     "non_anonymous_entries": "اطلاعا وارد شده به صورت غیر ناشناس",
     "non_respondents_students": "شاگردانی که پاسخ نداده‌اند",
     "not_selected": "انتخاب نشده",
     "not_started": "شروع نکرده است",
-    "overview": "مرور کلی",
+    "overview": "مرور اجمالی",
     "page_after_submit": "صفحهٔ بعد از پر کردن فرم",
     "preview": "پیش‌نمایش",
     "previous_page": "صفحهٔ قبل",
     "questions": "سوال‌ها",
     "response_nr": "پاسخ شمارهٔ",
-    "responses": "پاسخ‌های ارائه شده",
+    "responses": "پاسخ‌ها",
     "save_entries": "فرستادن پاسخ‌های شما",
     "show_entries": "نمایش پاسخ‌ها",
     "show_nonrespondents": "نمایش کسانی که پاسخ نداده‌اند",
-    "started": "شروع شد",
+    "started": "شروع کرده است",
     "this_feedback_is_already_submitted": "شما قبلا این فعالیت را کامل کرده‌اید."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/fr.json b/www/addons/mod/feedback/lang/fr.json
index 476111f5c18..e043077cb6a 100644
--- a/www/addons/mod/feedback/lang/fr.json
+++ b/www/addons/mod/feedback/lang/fr.json
@@ -24,7 +24,7 @@
     "previous_page": "Page précédente",
     "questions": "Questions",
     "response_nr": "Réponse No",
-    "responses": "Réponses du participant",
+    "responses": "Réponses",
     "save_entries": "Remettre vos réponses",
     "show_entries": "Afficher les réponses",
     "show_nonrespondents": "Afficher les utilisateurs sans réponse",
diff --git a/www/addons/mod/feedback/lang/he.json b/www/addons/mod/feedback/lang/he.json
index e596bb8c1b6..52e5c8f67b8 100644
--- a/www/addons/mod/feedback/lang/he.json
+++ b/www/addons/mod/feedback/lang/he.json
@@ -2,7 +2,7 @@
     "analysis": "ניתוח",
     "anonymous": "אנונימי",
     "anonymous_entries": "משובים אנונימיים",
-    "average": "ממוצע (בקורס)",
+    "average": "ממוצע",
     "complete_the_form": "מענה על השאלות...",
     "completed_feedbacks": "תשובות אשר הוגשו",
     "continue_the_form": "המשך השאלון",
@@ -17,7 +17,7 @@
     "non_respondents_students": "לא קיימות תגובות של סטודנטים",
     "not_selected": "לא נבחר",
     "not_started": "לא התחיל",
-    "overview": "סקירה כללית",
+    "overview": "סקירה",
     "page_after_submit": "הודעת השלמה",
     "preview": "תצוגה מקדימה",
     "previous_page": "העמוד הקודם",
diff --git a/www/addons/mod/feedback/lang/hu.json b/www/addons/mod/feedback/lang/hu.json
index b52ac3f2aec..4c096d23974 100644
--- a/www/addons/mod/feedback/lang/hu.json
+++ b/www/addons/mod/feedback/lang/hu.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Válaszok engedélyezése a címzettnek",
     "feedbackopen": "Válaszok engedélyezése a feladótól",
     "mapcourses": "A visszajelzés illesztése kurzusokhoz.",
-    "mode": "Leggyakoribb",
+    "mode": "Mód",
     "next_page": "Következő oldal",
     "non_anonymous": "A felhasználó nevét a rendszer naplózza és a válaszok mellett megjeleníti",
     "non_anonymous_entries": "Nem névtelen bejegyzések ({{$a}})",
@@ -20,7 +20,7 @@
     "numberoutofrange": "Tartományon kívül eső szám",
     "overview": "Áttekintés",
     "page_after_submit": "Teljesítéssel kapcsolatos üzenet",
-    "preview": "Előzetes megtekintés",
+    "preview": "Előkép",
     "previous_page": "Előző oldal",
     "questions": "Kérdések",
     "response_nr": "Válasz száma:",
diff --git a/www/addons/mod/feedback/lang/it.json b/www/addons/mod/feedback/lang/it.json
index d7adab94e62..d31469322d6 100644
--- a/www/addons/mod/feedback/lang/it.json
+++ b/www/addons/mod/feedback/lang/it.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Chiusura",
     "feedbackopen": "Apertura",
     "mapcourses": "Associa feedback ai corsi",
-    "mode": "Moda",
+    "mode": "Modalità",
     "next_page": "Pagina successiva",
     "non_anonymous": "Il nome del partecipante verrà registrato e visualizzato nelle risposte",
     "non_anonymous_entries": "Risposte non anonime ({{$a}})",
@@ -18,16 +18,16 @@
     "not_selected": "Nessuna scelta",
     "not_started": "Non iniziato",
     "numberoutofrange": "Il numero è fuori scala",
-    "overview": "Riepilogo",
+    "overview": "Panoramica",
     "page_after_submit": "Messaggio da visualizzare dopo la compilazione",
     "preview": "Anteprima",
     "previous_page": "Pagina precedente",
     "questions": "Domande",
     "response_nr": "Risposta numero",
-    "responses": "Risposte date",
+    "responses": "Risposte",
     "save_entries": "Invia le risposte",
     "show_entries": "Risposte",
     "show_nonrespondents": "Risposte mancanti",
-    "started": "Iniziato",
+    "started": "Aperto",
     "this_feedback_is_already_submitted": "Hai già completato questa attività."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ja.json b/www/addons/mod/feedback/lang/ja.json
index 2092085605f..63503d3cc28 100644
--- a/www/addons/mod/feedback/lang/ja.json
+++ b/www/addons/mod/feedback/lang/ja.json
@@ -10,7 +10,7 @@
     "feedbackclose": "フィードバック終了日時",
     "feedbackopen": "フィードバック開始日時",
     "mapcourses": "フィードバックをコースにマップする",
-    "mode": "最頻値",
+    "mode": "モード",
     "next_page": "次のページ",
     "non_anonymous": "ユーザ名を記録して回答と共に表示する",
     "non_anonymous_entries": "非匿名エントリ ({{$a}})",
@@ -22,12 +22,12 @@
     "page_after_submit": "完了メッセージ",
     "preview": "プレビュー",
     "previous_page": "前のページ",
-    "questions": "問題",
+    "questions": "質問",
     "response_nr": "回答No",
-    "responses": "解答",
+    "responses": "回答",
     "save_entries": "あなたの回答を送信する",
     "show_entries": "回答を表示する",
     "show_nonrespondents": "未回答者を表示する",
-    "started": "開始",
+    "started": "開始済み",
     "this_feedback_is_already_submitted": "あなたはすでにこの活動を完了しています。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/lt.json b/www/addons/mod/feedback/lang/lt.json
index 2e72078803c..dbe395c1dd6 100644
--- a/www/addons/mod/feedback/lang/lt.json
+++ b/www/addons/mod/feedback/lang/lt.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Uždaryti atsiliepimą",
     "feedbackopen": "Atidaryti atsiliepimą",
     "mapcourses": "Susieti atsiliepimą su kursais",
-    "mode": "Moda",
+    "mode": "Režimas",
     "next_page": "Kitas puslapis",
     "non_anonymous": "Naudotojo vardas bus užregistruotas ir rodomas su atsakymais",
     "non_anonymous_entries": "Neanoniminiai įrašai ({{$a}})",
@@ -28,6 +28,6 @@
     "save_entries": "Pateikite savo atsakymus",
     "show_entries": "Rodyti atsakymus",
     "show_nonrespondents": "Rodyti ne respondentus",
-    "started": "Pradėta",
+    "started": "Pradėjo",
     "this_feedback_is_already_submitted": "Jau užbaigėte šią veiklą."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/nl.json b/www/addons/mod/feedback/lang/nl.json
index dfca9892e77..92250c29608 100644
--- a/www/addons/mod/feedback/lang/nl.json
+++ b/www/addons/mod/feedback/lang/nl.json
@@ -22,11 +22,11 @@
     "numberoutofrange": "Aantal buiten bereik",
     "overview": "Overzicht",
     "page_after_submit": "Bericht na voltooien",
-    "preview": "Controleer test",
+    "preview": "Voorbeeld",
     "previous_page": "Vorige pagina",
     "questions": "Vragen",
     "response_nr": "Antwoordnummer",
-    "responses": "Eigen antwoorden",
+    "responses": "Antwoorden",
     "save_entries": "Verzend je antwoorden",
     "show_entries": "Toon antwoorden",
     "show_nonrespondents": "Niet geantwoord",
diff --git a/www/addons/mod/feedback/lang/pl.json b/www/addons/mod/feedback/lang/pl.json
index 56d639ec322..7c904cb371a 100644
--- a/www/addons/mod/feedback/lang/pl.json
+++ b/www/addons/mod/feedback/lang/pl.json
@@ -18,13 +18,13 @@
     "not_selected": "Nie wybrano",
     "not_started": "nie rozpoczęto",
     "numberoutofrange": "Liczba poza zakresem",
-    "overview": "Skrócony",
+    "overview": "Przegląd",
     "page_after_submit": "Wyświetl stronę po zatwierdzeniu",
     "preview": "Podgląd",
     "previous_page": "Poprzednia strona\n",
     "questions": "Pytania",
     "response_nr": "Liczba odpowiedzi",
-    "responses": "Udzielone odpowiedzi",
+    "responses": "Odpowiedzi",
     "save_entries": "Zatwierdź swoją odpowiedź",
     "show_entries": "Pokaż odpowiedzi",
     "show_nonrespondents": "Pokaż kto nie udzielił opinii*",
diff --git a/www/addons/mod/feedback/lang/pt-br.json b/www/addons/mod/feedback/lang/pt-br.json
index c5e5a29da40..98fb2ece613 100644
--- a/www/addons/mod/feedback/lang/pt-br.json
+++ b/www/addons/mod/feedback/lang/pt-br.json
@@ -10,7 +10,7 @@
     "feedbackclose": "Permitir respostas até",
     "feedbackopen": "Permitir respostas de",
     "mapcourses": "Mapear pesquisa para os cursos",
-    "mode": "Tendência",
+    "mode": "Modo",
     "next_page": "Próxima página",
     "non_anonymous": "O nome do usuário será registrado e mostrado com as respostas",
     "non_anonymous_entries": "entradas não anônimas",
@@ -19,7 +19,7 @@
     "not_started": "não iniciado",
     "overview": "Visão geral",
     "page_after_submit": "Mensagem de conclusão",
-    "preview": "Visualização prévia",
+    "preview": "Previsão",
     "previous_page": "Página anterior",
     "questions": "Questões",
     "response_nr": "Resposta numérica",
@@ -27,6 +27,6 @@
     "save_entries": "Submeter as suas respostas",
     "show_entries": "Mostrar respostas",
     "show_nonrespondents": "Mostrar não respondentes",
-    "started": "Iniciada",
+    "started": "iniciado",
     "this_feedback_is_already_submitted": "Você já terminou esta atividade."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/pt.json b/www/addons/mod/feedback/lang/pt.json
index f85fe6ee15b..a6ba4bcbd66 100644
--- a/www/addons/mod/feedback/lang/pt.json
+++ b/www/addons/mod/feedback/lang/pt.json
@@ -12,7 +12,7 @@
     "feedbackclose": "Permitir respostas até",
     "feedbackopen": "Permitir respostas a partir de",
     "mapcourses": "Associar o inquérito a disciplinas",
-    "mode": "Moda",
+    "mode": "Modo",
     "next_page": "Página seguinte",
     "non_anonymous": "O nome do utilizador será registado e apresentado com as respostas",
     "non_anonymous_entries": "Respostas não anónimas ({{$a}})",
@@ -20,16 +20,16 @@
     "not_selected": "Não respondido",
     "not_started": "Por iniciar",
     "numberoutofrange": "Valor fora do intervalo",
-    "overview": "Perspetiva global",
+    "overview": "Visão geral",
     "page_after_submit": "Mensagem de conclusão",
     "preview": "Pré-visualização",
     "previous_page": "Página anterior",
-    "questions": "Perguntas",
+    "questions": "Questões",
     "response_nr": "Número da resposta",
     "responses": "Respostas",
     "save_entries": "Submeter respostas",
     "show_entries": "Respostas",
     "show_nonrespondents": "Utilizadores que não responderam",
-    "started": "Iniciado",
+    "started": "iniciado",
     "this_feedback_is_already_submitted": "Já completou esta atividade"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ro.json b/www/addons/mod/feedback/lang/ro.json
index 3980cc35ea4..b7e3b467ea1 100644
--- a/www/addons/mod/feedback/lang/ro.json
+++ b/www/addons/mod/feedback/lang/ro.json
@@ -2,7 +2,7 @@
     "analysis": "Analiză",
     "anonymous": "Anonim",
     "anonymous_entries": "Postări anonime",
-    "average": "Media",
+    "average": "Medie",
     "complete_the_form": "Răspunde la întrebare",
     "completed_feedbacks": "Răspunsuri trimise",
     "feedback_is_not_open": "Feedback-ul nu este disponibil",
@@ -13,13 +13,13 @@
     "not_started": "neînceput",
     "numberoutofrange": "Număr în afara intervalului",
     "page_after_submit": "Pagina după trimitere",
-    "preview": "Afişare",
+    "preview": "Previzualizare",
     "previous_page": "Pagina precedentă",
     "questions": "Întrebări",
     "response_nr": "Numărul răspunsuluii",
     "responses": "Răspunsuri",
     "save_entries": "Trimiteți răspunsurile",
     "show_entries": "Afișează răspunsuri",
-    "started": "Început",
+    "started": "început",
     "this_feedback_is_already_submitted": "Ați completat deja această activitate."
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/ru.json b/www/addons/mod/feedback/lang/ru.json
index f0dff3e0b4d..e006d1ef678 100644
--- a/www/addons/mod/feedback/lang/ru.json
+++ b/www/addons/mod/feedback/lang/ru.json
@@ -2,7 +2,7 @@
     "analysis": "Анализ результатов",
     "anonymous": "Анонимный",
     "anonymous_entries": "Анонимные записи ({{$a}})",
-    "average": "Средняя оценка",
+    "average": "Средний",
     "complete_the_form": "Ответьте на вопросы ...",
     "completed_feedbacks": "Отправлено ответов",
     "continue_the_form": "Продолжить форму",
@@ -10,7 +10,7 @@
     "feedbackclose": "Разрешить отвечать до",
     "feedbackopen": "Разрешить отвечать с",
     "mapcourses": "Сопоставление Обратной связи с курсами",
-    "mode": "Мода",
+    "mode": "Режим",
     "next_page": "Следующая страница",
     "non_anonymous": "Имя пользователя будет записано и показано с его ответами",
     "non_anonymous_entries": "Не анонимные записи ({{$a}})",
@@ -18,16 +18,16 @@
     "not_selected": "Не выбрано",
     "not_started": "не началось",
     "numberoutofrange": "Значение вне диапазона",
-    "overview": "Обзор",
+    "overview": "Просмотр",
     "page_after_submit": "Сообщение о завершении",
-    "preview": "Просмотр",
+    "preview": "Предварительный просмотр",
     "previous_page": "Предыдущая страница",
-    "questions": "Вопросы",
+    "questions": "Вопросов",
     "response_nr": "Номер ответа",
-    "responses": "Свои ответы",
+    "responses": "Ответы",
     "save_entries": "Отправить свои ответы",
     "show_entries": "Показать ответивших",
     "show_nonrespondents": "Показать не ответивших",
-    "started": "Начало",
+    "started": "начало",
     "this_feedback_is_already_submitted": "Вы уже завершили этот учебный элемент"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/sv.json b/www/addons/mod/feedback/lang/sv.json
index 215da47b51f..c749faa8094 100644
--- a/www/addons/mod/feedback/lang/sv.json
+++ b/www/addons/mod/feedback/lang/sv.json
@@ -2,7 +2,7 @@
     "analysis": "Analys",
     "anonymous": "Anonym",
     "anonymous_entries": "Anonyma inlägg",
-    "average": "Medelvärde",
+    "average": "Medel",
     "complete_the_form": "Fyll i hela formuläret",
     "completed_feedbacks": "Fullgjorda Egna enkäter",
     "continue_the_form": "Fortsätt formuläret",
@@ -17,16 +17,16 @@
     "non_respondents_students": "Studenter/elever/deltagare/lärande som inte har lämnat några svar",
     "not_selected": "Inte vald",
     "not_started": "inte påbörjad",
-    "overview": "Överblick",
+    "overview": "Översikt",
     "page_after_submit": "Sida efter inskickning",
     "preview": "Förhandsgranska",
     "previous_page": "Föregående sida",
     "questions": "Frågor",
     "response_nr": "Antal svar",
-    "responses": "Responser",
+    "responses": "Svar",
     "save_entries": "Spara inlägg",
     "show_entries": "Visa inlägg",
     "show_nonrespondents": "Visa dem som inte har lämnat några svar",
-    "started": "Startad",
+    "started": "startad",
     "this_feedback_is_already_submitted": "Du har redan fullföljt den här Egen enkät"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/tr.json b/www/addons/mod/feedback/lang/tr.json
index e273019c18e..b1c57c37b04 100644
--- a/www/addons/mod/feedback/lang/tr.json
+++ b/www/addons/mod/feedback/lang/tr.json
@@ -18,13 +18,13 @@
     "not_selected": "Seçilmedi",
     "not_started": "Başlatılmadı",
     "numberoutofrange": "Aralık dışı numara",
-    "overview": "Gözden geçir",
+    "overview": "Gözat",
     "page_after_submit": "Geribildirim doldurulduktan sonraki sayfa",
     "preview": "Önizleme",
     "previous_page": "Önceki sayfa",
     "questions": "Sorular",
     "response_nr": "Yanıt No.",
-    "responses": "Verilen yanıtlar",
+    "responses": "Yanıtlar",
     "save_entries": "Cevaplarınızı gönderin",
     "show_entries": "Yanıtları göster",
     "show_nonrespondents": "Katılımcıları gösterme",
diff --git a/www/addons/mod/feedback/lang/uk.json b/www/addons/mod/feedback/lang/uk.json
index a95b1bab394..be08824dbbd 100644
--- a/www/addons/mod/feedback/lang/uk.json
+++ b/www/addons/mod/feedback/lang/uk.json
@@ -2,7 +2,7 @@
     "analysis": "Аналіз",
     "anonymous": "Анонімно",
     "anonymous_entries": "Анонімні записи",
-    "average": "Середня оцінка",
+    "average": "Середнє",
     "captchaofflinewarning": "Зворотній зв'язок із captcha не може бути завершений, якщо не налаштований, в автономному режимі або сервер не працює.",
     "complete_the_form": "Відповідь на питання..",
     "completed_feedbacks": "Надані відповіді",
@@ -12,7 +12,7 @@
     "feedbackclose": "Закрити зворотний зв’язок до",
     "feedbackopen": "Відкрити  зворотний зв’язок до",
     "mapcourses": "Прив’язка зворотного зв’язку до курсів",
-    "mode": "Мода",
+    "mode": "Режим",
     "next_page": "Наступна сторінка",
     "non_anonymous": "Ім'я користувача буде записане та показане з відповідями",
     "non_anonymous_entries": "немає анонімних відповідей",
@@ -20,7 +20,7 @@
     "not_selected": "Не вибрано",
     "not_started": "не почато",
     "numberoutofrange": "Значення поза діапазоном",
-    "overview": "Переглянути",
+    "overview": "Перегляд",
     "page_after_submit": "Сторінка після відсилання відповіді",
     "preview": "Перегляд",
     "previous_page": "Попередня сторінка",
@@ -30,6 +30,6 @@
     "save_entries": "Відправити ваші відповіді",
     "show_entries": "Показати відповіді",
     "show_nonrespondents": "Показати користувачів без відповіді",
-    "started": "Розпочато",
+    "started": "почато",
     "this_feedback_is_already_submitted": "Ви вже пройшли цю діяльність"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/zh-cn.json b/www/addons/mod/feedback/lang/zh-cn.json
index ab5b9c36dd0..5d53cc04b5d 100644
--- a/www/addons/mod/feedback/lang/zh-cn.json
+++ b/www/addons/mod/feedback/lang/zh-cn.json
@@ -2,7 +2,7 @@
     "analysis": "分析",
     "anonymous": "匿名",
     "anonymous_entries": "匿名条目",
-    "average": "平均值",
+    "average": "平均",
     "complete_the_form": "回答问题...",
     "completed_feedbacks": "已提交的答复",
     "continue_the_form": "继续填表",
@@ -17,16 +17,16 @@
     "non_respondents_students": "未答复的学生",
     "not_selected": "未选择",
     "not_started": "还未答题",
-    "overview": "概览",
+    "overview": "概述",
     "page_after_submit": "提交后页面",
     "preview": "预览",
     "previous_page": "前一页",
-    "questions": "题目",
+    "questions": "问题",
     "response_nr": "答复编号",
-    "responses": "作答",
+    "responses": "答复",
     "save_entries": "提交您的答复",
     "show_entries": "显示答复",
     "show_nonrespondents": "显示未答复者",
-    "started": "开始",
+    "started": "已经开始",
     "this_feedback_is_already_submitted": "您已经完成此活动。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/zh-tw.json b/www/addons/mod/feedback/lang/zh-tw.json
index 90f21437489..97aace4bc77 100644
--- a/www/addons/mod/feedback/lang/zh-tw.json
+++ b/www/addons/mod/feedback/lang/zh-tw.json
@@ -2,7 +2,7 @@
     "analysis": "分析",
     "anonymous": "匿名",
     "anonymous_entries": "匿名輸入({{$a}})",
-    "average": "平均",
+    "average": "平均數",
     "complete_the_form": "開始填寫回答...",
     "completed_feedbacks": "已回答",
     "continue_the_form": "繼續填表",
@@ -10,7 +10,7 @@
     "feedbackclose": "結束填答時間",
     "feedbackopen": "開始填答時間",
     "mapcourses": "對應回饋單到課程",
-    "mode": "眾數",
+    "mode": "模式",
     "next_page": "下一頁",
     "non_anonymous": "用戶名稱和回應將被記錄",
     "non_anonymous_entries": "具名輸入({{$a}})",
@@ -22,9 +22,9 @@
     "page_after_submit": "完成後的訊息",
     "preview": "預覽",
     "previous_page": "上一頁",
-    "questions": "試題",
+    "questions": "問題",
     "response_nr": "回應編號",
-    "responses": "回答",
+    "responses": "回應",
     "save_entries": "送出並結束",
     "show_entries": "顯示回應",
     "show_nonrespondents": "顯示沒有回應的學生",
diff --git a/www/addons/mod/forum/lang/ar.json b/www/addons/mod/forum/lang/ar.json
index e7a256d4938..ff95e890cbb 100644
--- a/www/addons/mod/forum/lang/ar.json
+++ b/www/addons/mod/forum/lang/ar.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "ليس لديك الصلاحيات لإضافة نقاش لكل المشتركين.",
     "couldnotadd": "تعذر إرسال مقالة نتيجة خطأ غير معروف",
     "discussion": "نقاش",
-    "edit": "تحرير",
+    "edit": "حرر",
     "group": "مجموعة",
     "message": "رسالة",
     "modeflatnewestfirst": "عرض الردود حسب الأحدث",
diff --git a/www/addons/mod/forum/lang/bg.json b/www/addons/mod/forum/lang/bg.json
index 0802018adb9..14f634ffe01 100644
--- a/www/addons/mod/forum/lang/bg.json
+++ b/www/addons/mod/forum/lang/bg.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Нямате разрешение да добавяте нова тема за всички участници.",
     "cannotcreatediscussion": "Не може да се създаде нова дискусия",
     "couldnotadd": "Вашето мнение не можа да се добави поради неизвестна грешка.",
-    "discussion": "Дискусия",
+    "discussion": "Обсъждане",
     "discussionpinned": "Забодена",
     "discussionsubscription": "Абониране за обсъждането",
     "edit": "Редактиране",
@@ -12,7 +12,7 @@
     "erroremptysubject": "Темата на мнението не може да бъде празна.",
     "forumnodiscussionsyet": "Няма теми за обсъждане в този форум",
     "group": "Група",
-    "message": "Съобщение",
+    "message": "Вашето мнение",
     "modeflatnewestfirst": "Плоско показване на отговорите. Най-новият е първи.",
     "modeflatoldestfirst": "Плоско показване на отговорите. Най-старият е първи.",
     "modenested": "Показване на отговорите във вложена форма.",
diff --git a/www/addons/mod/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index 425a6a7aca7..38dca8ad7f1 100644
--- a/www/addons/mod/forum/lang/da.json
+++ b/www/addons/mod/forum/lang/da.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Du har ikke tilladelse til at oprette en ny tråd for alle deltagere.",
     "cannotcreatediscussion": "Kunne ikke oprette en ny tråd.",
     "couldnotadd": "Kunne ikke tilføje dit indlæg pga. en ukendt fejl",
-    "discussion": "Diskussion",
+    "discussion": "Tråd",
     "discussionpinned": "Fastgjort",
     "discussionsubscription": "Abonnement på tråd",
     "edit": "Rediger",
@@ -14,7 +14,7 @@
     "errorgetgroups": "Fejl ved hentning af gruppeindstillinger.",
     "forumnodiscussionsyet": "Der er endnu ingen indlæg i dette forum.",
     "group": "Gruppe",
-    "message": "Besked",
+    "message": "Meddelelse",
     "modeflatnewestfirst": "Kronologisk visning med seneste indlæg først",
     "modeflatoldestfirst": "Kronologisk visning med første indlæg først",
     "modenested": "Trådet visning, udfoldet",
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index d86833af2aa..bee3c7cb0d4 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Sie dürfen kein neues Thema für alle Teilnehmer/innen hinzufügen.",
     "cannotcreatediscussion": "Das neue Thema wurde leider nicht gespeichert.",
     "couldnotadd": "Der Beitrag wurde wegen eines Fehlers nicht hinzugefügt.",
-    "discussion": "Diskussion",
+    "discussion": "Thema",
     "discussionlocked": "Dieses Thema wurde gesperrt, so dass Sie hier nicht weiter antworten können.",
     "discussionpinned": "Angepinnt",
     "discussionsubscription": "Themenabonnement",
diff --git a/www/addons/mod/forum/lang/es.json b/www/addons/mod/forum/lang/es.json
index 409b10efc54..2389777bf37 100644
--- a/www/addons/mod/forum/lang/es.json
+++ b/www/addons/mod/forum/lang/es.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "No tiene permiso para añadir un nuevo tema de discusión para todos los participantes.",
     "cannotcreatediscussion": "No se pudo crear un debate nuevo",
     "couldnotadd": "No se puede colocar su mensaje debido a un problema desconocido.",
-    "discussion": "Discusión",
+    "discussion": "Tema",
     "discussionlocked": "Este tema ha sido bloqueado así que no podrás responder en el.",
     "discussionpinned": "Fijado",
     "discussionsubscription": "Suscripción a la discusión",
diff --git a/www/addons/mod/forum/lang/fa.json b/www/addons/mod/forum/lang/fa.json
index 7fe418db42b..c2909c73988 100644
--- a/www/addons/mod/forum/lang/fa.json
+++ b/www/addons/mod/forum/lang/fa.json
@@ -13,7 +13,7 @@
     "erroremptysubject": "موضوع مطلب نمی‌تواند خالی باشد.",
     "forumnodiscussionsyet": "هنوز هیچ مباحثه ای در این تالار شروع نشده است.",
     "group": "گروه",
-    "message": "پیام",
+    "message": "متن",
     "modeflatnewestfirst": "نمایش مطالب به صورت مسطح (از جدید به قدیمی)",
     "modeflatoldestfirst": "نمایش مطالب به صورت مسطح (از قدیمی به جدید)",
     "modenested": "نمایش مطالب به صورت تو در تو",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index f30d204ed66..566c52681f0 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -15,7 +15,7 @@
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
     "group": "Groupe",
-    "message": "Message personnel",
+    "message": "Message",
     "modeflatnewestfirst": "Réponses en ligne, la plus récente en premier",
     "modeflatoldestfirst": "Réponses en ligne, la plus ancienne en premier",
     "modenested": "Réponses emboîtées",
diff --git a/www/addons/mod/forum/lang/he.json b/www/addons/mod/forum/lang/he.json
index f44515e44c7..665cc87e1b4 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -14,7 +14,7 @@
     "errorgetgroups": "שגיאה בטעינת הגדרות קבוצה.",
     "forumnodiscussionsyet": "עדיין לא קיימים נושאי דיונים בפורום זה.",
     "group": "קבוצה",
-    "message": "מסר",
+    "message": "הודעה",
     "modeflatnewestfirst": "הצגת תגובות בצורה שטוחה, החדשות ביותר ראשונות",
     "modeflatoldestfirst": "הצגת תגובות בצורה שטוחה, הישנות ביותר ראשונות",
     "modenested": "הצגת תגובות באופן מקונן",
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 5907bdba32b..93f37fba562 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Neturite teisės įtraukti naujos diskusijų temos, skirtos visiems dalyviams.",
     "cannotcreatediscussion": "Nepavyko sukurti naujos diskusijos",
     "couldnotadd": "Jūsų skelbimo nepavyko įtraukti dėl nežinomos klaidos",
-    "discussion": "Diskusija2",
+    "discussion": "Pavadinimas",
     "discussionlocked": "Ši diskusija buvo užrakinta, todėl jūs negalite pateikti atsakymus joje.",
     "discussionpinned": "Prisegta",
     "discussionsubscription": "Diskusijos prenumerata",
@@ -15,7 +15,7 @@
     "errorgetgroups": "Klaida gaunant grupės nustatymus.",
     "forumnodiscussionsyet": "Pokalbio temų forume dar nėra.",
     "group": "Grupė",
-    "message": "Žinutė",
+    "message": "Žinutės tekstas",
     "modeflatnewestfirst": "Rodyti atsakymus standartiškai, pirmiausia rodant naujausią",
     "modeflatoldestfirst": "Rodyti atsakymus standartiškai, pirmiausia rodant seniausią",
     "modenested": "Rodyti atsakymus įdėtuoju formatu",
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 611234840a2..8f7fe7dad45 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -8,7 +8,7 @@
     "discussionlocked": "Deze discussie is geblokkeerd, zodat u niet meer kan beantwoorden.",
     "discussionpinned": "Vastgepind",
     "discussionsubscription": "Inschrijving discussie",
-    "edit": "Bewerk",
+    "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
     "erroremptysubject": "Onderwerp kan niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
diff --git a/www/addons/mod/forum/lang/pl.json b/www/addons/mod/forum/lang/pl.json
index 253a38a5591..67a495dd1a6 100644
--- a/www/addons/mod/forum/lang/pl.json
+++ b/www/addons/mod/forum/lang/pl.json
@@ -4,11 +4,11 @@
     "cannotadddiscussionall": "Nie masz uprawnień, aby dodać nową dyskusję dla wszystkich uczestników.",
     "cannotcreatediscussion": "Nie można utworzyć nowego wątku",
     "couldnotadd": "Nie można dodać twojego wpisu z powodu nieznanego błędu",
-    "discussion": "Dyskusja",
+    "discussion": "Temat",
     "discussionlocked": "Dyskusja została zablokowana, więc nie możesz już odpowiedzieć.",
     "discussionpinned": "Przypięta",
     "discussionsubscription": "Subskrypcja dyskusja",
-    "edit": "Edytuj",
+    "edit": "Edycja",
     "erroremptymessage": "Wiadomość nie może być pusta",
     "erroremptysubject": "Tytuł wpisu nie może być pusty.",
     "forumnodiscussionsyet": "Brak tematów dyskusji na tym forum",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index 13e363575e6..aebbce61f21 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Você não tem permissão para abrir um novo tópico de discussão para todos os participantes.",
     "cannotcreatediscussion": "Não foi possível criar uma nova discussão",
     "couldnotadd": "Não foi possível publicar a sua mensagem. Infelizmente a causa do erro não foi identificada.",
-    "discussion": "Discussão",
+    "discussion": "Tópico",
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
diff --git a/www/addons/mod/forum/lang/pt.json b/www/addons/mod/forum/lang/pt.json
index 7051f5dc931..8700ce438bd 100644
--- a/www/addons/mod/forum/lang/pt.json
+++ b/www/addons/mod/forum/lang/pt.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Não tem permissão para criar um novo tópico disponível para todos os participantes",
     "cannotcreatediscussion": "Não foi possível criar o novo tópico de discussão",
     "couldnotadd": "Não foi possível inserir a mensagem que submeteu devido a um erro desconhecido",
-    "discussion": "Discussão",
+    "discussion": "Tópico",
     "discussionlocked": "Este tópico de discussão foi bloqueado, logo já não pode responder ao mesmo",
     "discussionpinned": "Destacado",
     "discussionsubscription": "Subscrição da discussão",
diff --git a/www/addons/mod/forum/lang/ro.json b/www/addons/mod/forum/lang/ro.json
index 543ac42e397..2dd31a2be41 100644
--- a/www/addons/mod/forum/lang/ro.json
+++ b/www/addons/mod/forum/lang/ro.json
@@ -4,8 +4,8 @@
     "cannotadddiscussionall": "Nu aveţi permisiunea de a adăuga o temă de discuţii pentru toţi participanţii.",
     "cannotcreatediscussion": "Nu se poate crea discuție nouă",
     "couldnotadd": "Intervenţia ta nu a fost publicată datorită unei erori necunoscute",
-    "discussion": "Discuţie",
-    "edit": "Editare",
+    "discussion": "Discuție",
+    "edit": "Modifică",
     "erroremptymessage": "Mesajul nu poate fi necompletat",
     "erroremptysubject": "Subiectul nu poate fi necompletat",
     "errorgetforum": "A apărut o eroare la obținerea datelor despre forum.",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index 07d7ef487d9..46a510d03d2 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "У вас нет привилегий для добавления новой темы обсуждения для всех участников.",
     "cannotcreatediscussion": "Невозможно создать новое обсуждение",
     "couldnotadd": "Сообщение не добавлено из-за неизвестной ошибки",
-    "discussion": "Дискуссия",
+    "discussion": "Обсуждение",
     "discussionlocked": "Обсуждение было заблокировано, поэтому на него нельзя больше отвечать.",
     "discussionpinned": "Закреплено",
     "discussionsubscription": "Подписаться на эту тему.",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 8cfb154fe52..5d9eb54b6ad 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "Du har inte tillstånd att lägga till ett nytt diskussionsämne för alla deltagare. ",
     "cannotcreatediscussion": "Det gick inte att skapa en ny diskussion",
     "couldnotadd": "Det gick inte att lägga till Ditt inlägg på grund av okänt fel.",
-    "discussion": "Diskussion",
+    "discussion": "Diskussionsämne",
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
diff --git a/www/addons/mod/forum/lang/tr.json b/www/addons/mod/forum/lang/tr.json
index 8e47e5207e9..6106581a1a4 100644
--- a/www/addons/mod/forum/lang/tr.json
+++ b/www/addons/mod/forum/lang/tr.json
@@ -8,7 +8,7 @@
     "discussionlocked": "Bu tartışma kilitli olduğundan artık yanıtlayamıyorsunuz.",
     "discussionpinned": "Sabitlenmiş",
     "discussionsubscription": "Tartışma aboneliği",
-    "edit": "Düzenle",
+    "edit": "Düzelt",
     "erroremptymessage": "Yazı mesajı boş olamaz",
     "erroremptysubject": "Gönderi konusu boş olamaz.",
     "forumnodiscussionsyet": "Bu forum da henuz hiç tartışma başlığı yok",
diff --git a/www/addons/mod/forum/lang/zh-cn.json b/www/addons/mod/forum/lang/zh-cn.json
index 9df1bc53422..922482dd98c 100644
--- a/www/addons/mod/forum/lang/zh-cn.json
+++ b/www/addons/mod/forum/lang/zh-cn.json
@@ -4,14 +4,14 @@
     "cannotadddiscussionall": "您没有向所有人添加新话题的权限",
     "cannotcreatediscussion": "不能建立新话题",
     "couldnotadd": "由于一个未知的错误，您的帖子无法发表",
-    "discussion": "讨论",
+    "discussion": "话题",
     "discussionsubscription": "话题订阅",
     "edit": "编辑",
     "erroremptymessage": "帖子正文不能为空",
     "erroremptysubject": "帖子标题不能为空。",
     "forumnodiscussionsyet": "此论坛中还没有讨论话题",
     "group": "小组",
-    "message": "消息",
+    "message": "正文",
     "modeflatnewestfirst": "列表显示回帖内容，新帖在前",
     "modeflatoldestfirst": "列表显示回帖内容，旧帖在前",
     "modenested": "嵌套显示回帖内容",
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index cec13a8393e..81db9790069 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -4,7 +4,7 @@
     "cannotadddiscussionall": "您沒有權限新增討論主題給所有參與者。",
     "cannotcreatediscussion": "不能建立新的議題",
     "couldnotadd": "由於不明錯誤， 無法新增您的貼文",
-    "discussion": "互動",
+    "discussion": "議題",
     "discussionlocked": "這一議題已經被封鎖，所以你無法回應它",
     "discussionpinned": "已經釘選",
     "discussionsubscription": "議題訂閱",
@@ -15,7 +15,7 @@
     "errorgetgroups": "讀取群組設定發生錯誤",
     "forumnodiscussionsyet": "這個討論區還沒有討論主題",
     "group": "分組",
-    "message": "簡訊",
+    "message": "訊息",
     "modeflatnewestfirst": "以平舖方式呈現回應的貼文，最晚貼出的在前",
     "modeflatoldestfirst": "以平舖方式呈現回應的貼文，最早貼出的在前",
     "modenested": "以縮排方式呈現回應的貼文",
diff --git a/www/addons/mod/glossary/lang/ar.json b/www/addons/mod/glossary/lang/ar.json
index 719582a5cf1..e92d720edeb 100644
--- a/www/addons/mod/glossary/lang/ar.json
+++ b/www/addons/mod/glossary/lang/ar.json
@@ -1,10 +1,10 @@
 {
-    "attachment": "ملف مرفق",
+    "attachment": "مرفقات",
     "browsemode": "النمط العرضي",
     "byauthor": "التجميع طبقا للمؤلف",
     "bynewestfirst": "الأحدث أولا",
     "byrecentlyupdated": "تم تحديثه مؤخرا",
     "bysearch": "بحث",
-    "casesensitive": "مطابقة حالة الأحرف",
-    "categories": "فئات"
+    "casesensitive": "استخدم التعابير المعتادة",
+    "categories": "تصنيفات المقررات الدراسية"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/bg.json b/www/addons/mod/glossary/lang/bg.json
index 593e987ab1a..dc6e44a0dcd 100644
--- a/www/addons/mod/glossary/lang/bg.json
+++ b/www/addons/mod/glossary/lang/bg.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Прикачен файл",
+    "attachment": "Прикрепване на значката към съобщението.",
     "browsemode": "Режим на преглеждане",
-    "casesensitive": "Чувствителност главни/малки букви",
-    "categories": "Категории"
+    "casesensitive": "Използване на регулярни изрази",
+    "categories": "Категории курсове"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/ca.json b/www/addons/mod/glossary/lang/ca.json
index a0af30fc35e..c9d1567bd0f 100644
--- a/www/addons/mod/glossary/lang/ca.json
+++ b/www/addons/mod/glossary/lang/ca.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Fitxer adjunt",
+    "attachment": "Adjunt",
     "browsemode": "Mode exploració",
     "byalphabet": "Alfabèticament",
     "byauthor": "Agrupat per autor",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Actualitzat recentment",
     "bysearch": "Cerca",
     "cannoteditentry": "No es pot editar l'entrada",
-    "casesensitive": "Distingeix majúscules",
-    "categories": "Categories",
+    "casesensitive": "Utilitzeu expressions regulars",
+    "categories": "Categories de cursos",
     "entriestobesynced": "Entrades per sincronitzar",
     "entrypendingapproval": "Aquesta entrada està pendent d'aprovació.",
     "errorloadingentries": "S'ha produït un error en carregar les entrades.",
diff --git a/www/addons/mod/glossary/lang/cs.json b/www/addons/mod/glossary/lang/cs.json
index db30da2ce2e..9b2ab4a6330 100644
--- a/www/addons/mod/glossary/lang/cs.json
+++ b/www/addons/mod/glossary/lang/cs.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Příloha",
+    "attachment": "Připojit odznak do zprávy",
     "browsemode": "Režim náhledu",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Posledně aktualizované",
     "bysearch": "Hledat",
     "cannoteditentry": "Záznam nelze upravit",
-    "casesensitive": "Rozlišovat malá/VELKÁ",
-    "categories": "Kategorie",
+    "casesensitive": "Používat regulární výrazy",
+    "categories": "Kategorie kurzů",
     "entriestobesynced": "Příspěvky, které mají být synchronizovány",
     "entrypendingapproval": "Tato položka čeká na schválení",
     "errorloadingentries": "Při načítání položek došlo k chybě",
diff --git a/www/addons/mod/glossary/lang/da.json b/www/addons/mod/glossary/lang/da.json
index 41338f8fc3e..bd0f0d93d2e 100644
--- a/www/addons/mod/glossary/lang/da.json
+++ b/www/addons/mod/glossary/lang/da.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Bilag",
+    "attachment": "Tilføj badge til besked",
     "browsemode": "Forhåndsvisning",
     "byalphabet": "Alfabetisk",
     "byauthor": "Grupper efter forfatter",
     "bynewestfirst": "Nyeste først",
     "byrecentlyupdated": "Senest opdateret",
     "bysearch": "Søg",
-    "casesensitive": "Store og små bogstaver",
-    "categories": "Kategorier",
+    "casesensitive": "Brug regulære udtryk",
+    "categories": "Kursuskategorier",
     "entrypendingapproval": "Dette opslag afventer godkendelse",
     "errorloadingentries": "Der opstod en fejl under indlæsning af opslag",
     "errorloadingentry": "Der opstod en fejl under indlæsning af opslaget",
diff --git a/www/addons/mod/glossary/lang/de.json b/www/addons/mod/glossary/lang/de.json
index c5afa42c3fc..c790832ef32 100644
--- a/www/addons/mod/glossary/lang/de.json
+++ b/www/addons/mod/glossary/lang/de.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Anhang",
+    "attachment": "Auszeichnung an Mitteilung anhängen",
     "browsemode": "Vorschaumodus",
     "byalphabet": "Alphabetisch",
     "byauthor": "Nach Autor/in",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Gerade aktualisiert",
     "bysearch": "Suchen",
     "cannoteditentry": "Eintrag nicht bearbeitbar",
-    "casesensitive": "Groß-/Kleinschreibung",
-    "categories": "Kategorien",
+    "casesensitive": "Reguläre Ausdrücke verwenden",
+    "categories": "Kursbereiche",
     "entriestobesynced": "Einträge zum Synchronisieren",
     "entrypendingapproval": "Dieser Eintrag wartet auf eine Freigabe.",
     "errorloadingentries": "Fehler beim Laden von Einträgen",
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index 226aa549be7..c991cf5879a 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Επισυναπτόμενο",
+    "attachment": "Συνημμένα",
     "browsemode": "Φάση Προεπισκόπισης",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bynewestfirst": "Νεότερα πρώτα",
     "byrecentlyupdated": "Ανανεώθηκαν πρόσφατα",
     "bysearch": "Αναζήτηση",
-    "casesensitive": "Διάκριση μικρών/κεφαλαίων",
-    "categories": "Κατηγορίες",
+    "casesensitive": "Χρήση κανονικών εκφράσεων",
+    "categories": "Κατηγορίες μαθημάτων",
     "entrypendingapproval": "Εκκρεμεί η έγκριση για αυτή την καταχώρηση.",
     "errorloadingentries": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των καταχωρήσεων.",
     "errorloadingentry": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της καταχώρησης.",
diff --git a/www/addons/mod/glossary/lang/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index 46307467a49..e661f36d342 100644
--- a/www/addons/mod/glossary/lang/es-mx.json
+++ b/www/addons/mod/glossary/lang/es-mx.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Archivo adjunto",
+    "attachment": "Adjunto",
     "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupar por autor",
@@ -8,7 +8,7 @@
     "byrecentlyupdated": "Recientemente actualizado",
     "bysearch": "Buscar",
     "cannoteditentry": "No puede editarse entrada",
-    "casesensitive": "Diferencia entre MAYÚSCULAS y minúsculas",
+    "casesensitive": "Usar expresiones regulares",
     "categories": "Categorías",
     "entriestobesynced": "Entradas para ser sincronizadas",
     "entrypendingapproval": "Esta entrada está pendiente de aprobación.",
diff --git a/www/addons/mod/glossary/lang/es.json b/www/addons/mod/glossary/lang/es.json
index 4c33c3904a5..8a50c2d764e 100644
--- a/www/addons/mod/glossary/lang/es.json
+++ b/www/addons/mod/glossary/lang/es.json
@@ -1,12 +1,12 @@
 {
-    "attachment": "Archivo adjunto",
+    "attachment": "Adjunto",
     "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupado por autor",
     "bynewestfirst": "El más reciente primero",
     "byrecentlyupdated": "Actualizado recientemente",
     "bysearch": "Busca",
-    "casesensitive": "Diferencia entre mayúsculas y minúsculas",
+    "casesensitive": "Usar expresiones regulares",
     "categories": "Categorías",
     "entrypendingapproval": "Esta entrada está pendiente de aprobación.",
     "errorloadingentries": "Ha ocurrido un error cargando las entradas.",
diff --git a/www/addons/mod/glossary/lang/eu.json b/www/addons/mod/glossary/lang/eu.json
index 96f4a794e08..963a7f8ce8c 100644
--- a/www/addons/mod/glossary/lang/eu.json
+++ b/www/addons/mod/glossary/lang/eu.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Eranskina",
+    "attachment": "Erantsi domina mezuari",
     "browsemode": "Aurrebista-modua",
     "byalphabet": "Alfabetikoki",
     "byauthor": "Taldekatu egilearen arabera",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Duela gutxi eguneratuak",
     "bysearch": "Bilatu",
     "cannoteditentry": "Ezin da sarrera editatu",
-    "casesensitive": "Letra larriak eta xeheak bereiziz",
-    "categories": "Kategoriak",
+    "casesensitive": "Erabil adierazpen erregularrak",
+    "categories": "Ikastaro-kategoriak",
     "entriestobesynced": "Sinkronizatu beharreko sarrerak",
     "entrypendingapproval": "Sarrera hau onarpenaren zain dago.",
     "errorloadingentries": "Errorea gertatu da sarrerak kargatzean.",
diff --git a/www/addons/mod/glossary/lang/fa.json b/www/addons/mod/glossary/lang/fa.json
index b20b9564ef8..637de884db4 100644
--- a/www/addons/mod/glossary/lang/fa.json
+++ b/www/addons/mod/glossary/lang/fa.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "فایل ضمیمه",
+    "attachment": "فایل پیوست",
     "browsemode": "حالت پیش‌نمایش",
-    "casesensitive": "حساس بودن به بزرگ و کوچکی حروف",
-    "categories": "طبقه‌ها"
+    "casesensitive": "استفاده از عبارت‌های منظم",
+    "categories": "طبقه‌های درسی"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/fr.json b/www/addons/mod/glossary/lang/fr.json
index 976057ed4e7..4d12ffcee4d 100644
--- a/www/addons/mod/glossary/lang/fr.json
+++ b/www/addons/mod/glossary/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Annexe",
+    "attachment": "Joindre le badge à un courriel",
     "browsemode": "Mode prévisualisation",
     "byalphabet": "Alphabétiquement",
     "byauthor": "Grouper par auteur",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Modifiés récemment",
     "bysearch": "Rechercher",
     "cannoteditentry": "Impossible de modifier l'article",
-    "casesensitive": "Casse des caractères",
-    "categories": "Catégories",
+    "casesensitive": "Utiliser les expressions régulières",
+    "categories": "Catégories de cours",
     "entriestobesynced": "Articles à synchroniser",
     "entrypendingapproval": "Cet article est en attente d'approbation",
     "errorloadingentries": "Une erreur est survenue lors du chargement des articles.",
diff --git a/www/addons/mod/glossary/lang/he.json b/www/addons/mod/glossary/lang/he.json
index 6a915efc20f..abad848638c 100644
--- a/www/addons/mod/glossary/lang/he.json
+++ b/www/addons/mod/glossary/lang/he.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "קובץ מצורף",
+    "attachment": "צירוף ההישג להודעה",
     "browsemode": "מצב תצוגה מקדימה",
-    "casesensitive": "תלוי אותיות רישיות",
-    "categories": "קטגוריות"
+    "casesensitive": "השתמש בביטויים רגולריים",
+    "categories": "קטגוריות קורסים"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/hu.json b/www/addons/mod/glossary/lang/hu.json
index 69210832605..acb16b009bd 100644
--- a/www/addons/mod/glossary/lang/hu.json
+++ b/www/addons/mod/glossary/lang/hu.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Csatolt állomány",
+    "attachment": "Csatolt állomány:",
     "browsemode": "Előzetes megtekintés üzemmódja",
-    "casesensitive": "Kis-/nagybetű különböző",
-    "categories": "Kategóriák"
+    "casesensitive": "Reguláris kifejezések használata",
+    "categories": "Kurzuskategóriák"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/it.json b/www/addons/mod/glossary/lang/it.json
index aa1cfe7fe09..581b16835e1 100644
--- a/www/addons/mod/glossary/lang/it.json
+++ b/www/addons/mod/glossary/lang/it.json
@@ -1,10 +1,10 @@
 {
-    "attachment": "Allegato",
+    "attachment": "Allega badge al messaggio",
     "browsemode": "Modalità anteprima",
     "byrecentlyupdated": "Aggiornati di recente",
     "bysearch": "Cerca",
-    "casesensitive": "Rilevanza maiuscolo/minuscolo",
-    "categories": "Categorie",
+    "casesensitive": "Utilizza regular expression",
+    "categories": "Categorie di corso",
     "entrypendingapproval": "Questa voce è in attesa di approvazione.",
     "errorloadingentries": "Si è verificato un errore durante il caricamento delle voci.",
     "errorloadingentry": "Si è verificato un errore durante il caricamento della voce.",
diff --git a/www/addons/mod/glossary/lang/ja.json b/www/addons/mod/glossary/lang/ja.json
index 399ef6cd3c9..b518d805074 100644
--- a/www/addons/mod/glossary/lang/ja.json
+++ b/www/addons/mod/glossary/lang/ja.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "添付ファイル",
+    "attachment": "添付",
     "browsemode": "プレビューモード",
-    "casesensitive": "大文字小文字の区別",
-    "categories": "カテゴリ"
+    "casesensitive": "正規表現を使用する",
+    "categories": "コースカテゴリ"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/lt.json b/www/addons/mod/glossary/lang/lt.json
index 23f3f7fe92b..bdc656dd518 100644
--- a/www/addons/mod/glossary/lang/lt.json
+++ b/www/addons/mod/glossary/lang/lt.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Priedas",
+    "attachment": "Prikabinti pasiekimą prie pranešimo",
     "browsemode": "Peržiūros režimas",
     "byalphabet": "Abėcėlės tvarka",
     "byauthor": "Pagal autorių",
     "bynewestfirst": "Naujausi",
     "byrecentlyupdated": "Neseniai atnaujinti",
     "bysearch": "Paieška",
-    "casesensitive": "Didžiųjų ir mažųjų raidžių skyrimas",
-    "categories": "Kategorijos",
+    "casesensitive": "Naudoti reguliariąsias išraiškas",
+    "categories": "Kursų kategorijos",
     "entrypendingapproval": "Patvirtinti įrašą.",
     "errorloadingentries": "Klaida keliant įrašus.",
     "errorloadingentry": "Klaida įkeliant įrašą.",
diff --git a/www/addons/mod/glossary/lang/nl.json b/www/addons/mod/glossary/lang/nl.json
index a7e834e6b2a..53c36a376e0 100644
--- a/www/addons/mod/glossary/lang/nl.json
+++ b/www/addons/mod/glossary/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Bijlage",
+    "attachment": "Badge als bijlage bij bericht",
     "browsemode": "Probeermodus",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Onlangs gewijzigd",
     "bysearch": "Zoek",
     "cannoteditentry": "Kan item niet bewerken",
-    "casesensitive": "Gevoeligheid voor hoofd/kleine letters",
-    "categories": "Categorieën",
+    "casesensitive": "Regular expressions gebruiken",
+    "categories": "Cursuscategorieën",
     "entriestobesynced": "Items niet gesynchroniseerd",
     "entrypendingapproval": "Dit item wacht op goedkeuring.",
     "errorloadingentries": "Fout bij het laden van de items.",
diff --git a/www/addons/mod/glossary/lang/pl.json b/www/addons/mod/glossary/lang/pl.json
index dc3225deb6a..7effb708160 100644
--- a/www/addons/mod/glossary/lang/pl.json
+++ b/www/addons/mod/glossary/lang/pl.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Załącznik",
+    "attachment": "Dołącz odznakę do wiadomości",
     "browsemode": "Tryb przeglądania",
-    "casesensitive": "Uwzględnianie wielkości liter",
-    "categories": "Kategorie"
+    "casesensitive": "Użyj wyrażeń regularnych",
+    "categories": "Kategorie kursów"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/pt-br.json b/www/addons/mod/glossary/lang/pt-br.json
index 37cf8ed2dab..32741499a8c 100644
--- a/www/addons/mod/glossary/lang/pt-br.json
+++ b/www/addons/mod/glossary/lang/pt-br.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Anexo",
+    "attachment": "Anexar emblema à mensagem",
     "browsemode": "Prévia",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Recentemente atualizados",
     "bysearch": "Pesquisa",
     "cannoteditentry": "Não é possível editar o item",
-    "casesensitive": "Considerar diferenças entre maiúsculas e minúsculas",
-    "categories": "Categorias",
+    "casesensitive": "Usar expressões regulares",
+    "categories": "Categorias de Cursos",
     "entriestobesynced": "Itens a serem sincronizados",
     "entrypendingapproval": "A entrada está pendente de aprovação.",
     "errorloadingentries": "Ocorreu um erro enquanto carregava entradas.",
diff --git a/www/addons/mod/glossary/lang/pt.json b/www/addons/mod/glossary/lang/pt.json
index c672ec0b9a3..8bc0fa7da3f 100644
--- a/www/addons/mod/glossary/lang/pt.json
+++ b/www/addons/mod/glossary/lang/pt.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Anexo",
+    "attachment": "Anexar Medalha à mensagem",
     "browsemode": "Modo de pré-visualização",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Recentemente atualizados",
     "bysearch": "Pesquisar",
     "cannoteditentry": "Não é possível editar a entrada",
-    "casesensitive": "Respeitar maiúsculas/minúsculas",
-    "categories": "Categorias",
+    "casesensitive": "Usar regular expressions",
+    "categories": "Categorias de disciplinas",
     "entriestobesynced": "Entradas a ser sincronizadas",
     "entrypendingapproval": "Este termo aguarda aprovação.",
     "errorloadingentries": "Ocorreu um erro ao carregar os termos.",
diff --git a/www/addons/mod/glossary/lang/ro.json b/www/addons/mod/glossary/lang/ro.json
index 18a7e73940c..f5e76676789 100644
--- a/www/addons/mod/glossary/lang/ro.json
+++ b/www/addons/mod/glossary/lang/ro.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Fişier ataşat",
+    "attachment": "Atașament",
     "browsemode": "Mod Căutare",
     "byalphabet": "Alfabetic",
     "byauthor": "Grupare după autor",
     "bynewestfirst": "Cele mai noi sunt dispuse primele",
     "byrecentlyupdated": "Actualizări recente",
     "bysearch": "Căutare",
-    "casesensitive": "Senzitivitate caractere",
-    "categories": "Categorii",
+    "casesensitive": "Foloseşte Regular Expressions",
+    "categories": "Categorii de cursuri",
     "entrypendingapproval": "Această",
     "errorloadingentries": "A apărut o eroare la încărcarea intrărilor.",
     "errorloadingentry": "A apărut o eroare la încărcarea intrărilor.",
diff --git a/www/addons/mod/glossary/lang/ru.json b/www/addons/mod/glossary/lang/ru.json
index e92982cb4cb..05189841b97 100644
--- a/www/addons/mod/glossary/lang/ru.json
+++ b/www/addons/mod/glossary/lang/ru.json
@@ -1,10 +1,10 @@
 {
-    "attachment": "Вложение",
+    "attachment": "Вложение:",
     "browsemode": "Режим предпросмотра",
     "byalphabet": "Алфавитно",
     "byauthor": "Группировать по автору",
     "bycategory": "Группировать по категориям",
     "bysearch": "Поиск",
-    "casesensitive": "Чувствительность ответа к регистру",
-    "categories": "Категории"
+    "casesensitive": "Использовать регулярные выражения",
+    "categories": "Категории курсов"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/sv.json b/www/addons/mod/glossary/lang/sv.json
index 3cfa169d56c..0c0a203775f 100644
--- a/www/addons/mod/glossary/lang/sv.json
+++ b/www/addons/mod/glossary/lang/sv.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Bilaga",
+    "attachment": "Bifoga märke med meddelande",
     "browsemode": "Läge för förhandsgranskning",
     "byalphabet": "Alfabetiskt",
     "byauthor": "Sortera efter författare",
     "bynewestfirst": "Nyaste först",
     "byrecentlyupdated": "Nyligen uppdaterade",
     "bysearch": "Sök",
-    "casesensitive": "Stor eller liten bokstav gör  skillnad",
-    "categories": "Kategorier",
+    "casesensitive": "Använd standarduttryck",
+    "categories": "Kurskategorier",
     "entrypendingapproval": "Detta inlägg väntar på godkännande",
     "errorloadingentries": "Ett fel uppstod vid inläsning av inläggen",
     "errorloadingentry": "Ett fel uppstod vid inläsning av inlägget",
diff --git a/www/addons/mod/glossary/lang/tr.json b/www/addons/mod/glossary/lang/tr.json
index 6acccdba883..ed836454608 100644
--- a/www/addons/mod/glossary/lang/tr.json
+++ b/www/addons/mod/glossary/lang/tr.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Dosya",
+    "attachment": "Rozete mesaj ekle",
     "browsemode": "Önizleme Modu",
-    "casesensitive": "Harf duyarlılığı",
-    "categories": "Kategoriler"
+    "casesensitive": "Düzenli İfadeleri Kullan",
+    "categories": "Ders Kategorileri"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/uk.json b/www/addons/mod/glossary/lang/uk.json
index 14b9d95ea51..3842bc175c1 100644
--- a/www/addons/mod/glossary/lang/uk.json
+++ b/www/addons/mod/glossary/lang/uk.json
@@ -1,5 +1,5 @@
 {
-    "attachment": "Вкладення",
+    "attachment": "Долучення",
     "browsemode": "Режим перегляду",
     "byalphabet": "По алфавіту",
     "byauthor": "Групувати за автором",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Недавно оновлені",
     "bysearch": "Пошук",
     "cannoteditentry": "Неможливо задагувати запис",
-    "casesensitive": "Чутливість відповіді до регістра",
-    "categories": "Категорії",
+    "casesensitive": "Використовувати регулярні вирази",
+    "categories": "Категорії курсів",
     "entriestobesynced": "Записи будуть синхронізовані",
     "entrypendingapproval": "Цей запис очікує схвалення.",
     "errorloadingentries": "Сталася помилка під час завантаження записів.",
diff --git a/www/addons/mod/glossary/lang/zh-cn.json b/www/addons/mod/glossary/lang/zh-cn.json
index 3af5cbb310e..761fdac404e 100644
--- a/www/addons/mod/glossary/lang/zh-cn.json
+++ b/www/addons/mod/glossary/lang/zh-cn.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "附件",
+    "attachment": "附件发送",
     "browsemode": "预览模式",
-    "casesensitive": "区分大小写字母",
-    "categories": "类别"
+    "casesensitive": "使用正则表达式",
+    "categories": "课程分类"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/zh-tw.json b/www/addons/mod/glossary/lang/zh-tw.json
index 3a604d7d573..e5a5e020fdb 100644
--- a/www/addons/mod/glossary/lang/zh-tw.json
+++ b/www/addons/mod/glossary/lang/zh-tw.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "附件",
+    "attachment": "在訊息上附加上獎章",
     "browsemode": "預覽模式",
     "byalphabet": "按字母順序排列",
     "byauthor": "以作者為分群",
     "bynewestfirst": "最新的優先",
     "byrecentlyupdated": "最近的更新",
     "bysearch": "搜尋",
-    "casesensitive": "區分字母的大小寫",
-    "categories": "題目分類",
+    "casesensitive": "區分大小寫",
+    "categories": "課程類別",
     "entrypendingapproval": "這個項目已被暫緩核可",
     "errorloadingentries": "載入項目時發生錯誤",
     "errorloadingentry": "載入項目時發生錯誤",
diff --git a/www/addons/mod/lesson/lang/ar.json b/www/addons/mod/lesson/lang/ar.json
index 78b0eb31ff1..e314397c4ae 100644
--- a/www/addons/mod/lesson/lang/ar.json
+++ b/www/addons/mod/lesson/lang/ar.json
@@ -1,5 +1,5 @@
 {
-    "answer": "إجابة",
+    "answer": "أجب",
     "averagescore": "متوسط الدرجة",
     "averagetime": "متوسط الوقت",
     "branchtable": "محتوى",
@@ -29,18 +29,18 @@
     "numberofpagesviewed": "عدد الصفحات التي تم مشاهدتها: {{$a}}",
     "or": "أو",
     "overview": "عرض عام",
-    "preview": "معاينة",
+    "preview": "معاينه",
     "question": "سؤال",
     "reports": "تقارير",
     "response": "إجابة",
     "review": "مراجعة",
     "reviewlesson": "مراجعة الدرس",
     "reviewquestionback": "نعم، أرغب في المحاولة ثانياً",
-    "submit": "سلم/قدم",
+    "submit": "سلم",
     "thatsthecorrectanswer": "هذه إجابة صحيحة",
     "thatsthewronganswer": "هذه إجابة خاطئة",
     "timeremaining": "الزمن المتبقى",
-    "timetaken": "الوقت المستغرق",
+    "timetaken": "الزمن المستنفذ",
     "welldone": "أحسنت!",
     "youranswer": "إجابتك",
     "youshouldview": "يجب أن تجب على الأقل: {{$a}}"
diff --git a/www/addons/mod/lesson/lang/bg.json b/www/addons/mod/lesson/lang/bg.json
index 957fca81b30..a1b9df04b2a 100644
--- a/www/addons/mod/lesson/lang/bg.json
+++ b/www/addons/mod/lesson/lang/bg.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "Грешка: не може да бъде намерен опит",
     "cannotfinduser": "Грешка: не може да се намерят потребители",
     "clusterjump": "Непоказван въпрос в група",
-    "completed": "Приключен",
+    "completed": "Завършена",
     "congratulations": "Поздравления - достигнахте до края на урока",
     "continue": "Продължаване",
     "continuetonextpage": "Продължи към следващата страница",
@@ -49,13 +49,13 @@
     "progresscompleted": "Вие сте изпълнили {{$a}}% от урока",
     "question": "Въпрос",
     "reports": "Отчети",
-    "response": "Отговор",
+    "response": "Забележка",
     "review": "Преглед",
     "reviewlesson": "Review Lesson",
     "reviewquestionback": "Да, искам да опитам отново",
     "reviewquestioncontinue": "Не, искам само да мина на следващия въпрос",
     "secondpluswrong": "Не е точно така.  Искате ли да опитате отново?",
-    "submit": "Изпращане",
+    "submit": "Продължаване",
     "teacherjumpwarning": "В този урок е използван преход \"{{$a.cluster}}\" или преход \"{{$a.unseen}}\".  Вместо това ще бъде използван преход \"Следваща страница\". Влезте като студент за да изпробвате тези преходи.",
     "teacherongoingwarning": "Получените точки се показват само на студент. Влезте като студент за да проверите как се начисляват точки.",
     "teachertimerwarning": "Timer only works for students.  Test the timer by loggin in as a student.",
diff --git a/www/addons/mod/lesson/lang/ca.json b/www/addons/mod/lesson/lang/ca.json
index e72865a476d..ad28463c750 100644
--- a/www/addons/mod/lesson/lang/ca.json
+++ b/www/addons/mod/lesson/lang/ca.json
@@ -26,7 +26,7 @@
     "finishretakeoffline": "Aquest intent s'ha finalitzat fora de línia.",
     "firstwrong": "La vostra resposta no és correcta. Voleu reintentar-ho? (Si ara responeu correctament, no s'incrementarà la puntuació final).",
     "gotoendoflesson": "Vés al final de la lliçó",
-    "grade": "Qualificació",
+    "grade": "Qualifica",
     "highscore": "Puntuació més alta",
     "hightime": "Temps màxim",
     "leftduringtimed": "Heu abandonat una lliçó cronometrada.<br />Feu clic a Continua per tornar-la a començar.",
@@ -56,11 +56,11 @@
     "question": "Pregunta",
     "rawgrade": "Qualificació bruta",
     "reports": "Informes",
-    "response": "Resposta",
+    "response": "Reacció",
     "retakefinishedinsync": "S'ha sincronitzat un intent fora de línia. Voleu revisar-lo?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Revisió",
+    "review": "Revisa",
     "reviewlesson": "Revisa la lliçó",
     "reviewquestionback": "Sí, vull tornar-ho a provar",
     "reviewquestioncontinue": "No, vull anar a la pregunta següent",
@@ -72,7 +72,7 @@
     "thatsthecorrectanswer": "Aquesta és la resposta correcta",
     "thatsthewronganswer": "Aquesta resposta és errònia",
     "timeremaining": "Temps restant",
-    "timetaken": "Temps emprat",
+    "timetaken": "Temps dedicat",
     "unseenpageinbranch": "Pregunta no vista en una pàgina de contingut",
     "warningretakefinished": "L'intent s'ha finalitzat al lloc web",
     "welldone": "Molt bé",
diff --git a/www/addons/mod/lesson/lang/cs.json b/www/addons/mod/lesson/lang/cs.json
index e2b8bcffef1..c6b5605a360 100644
--- a/www/addons/mod/lesson/lang/cs.json
+++ b/www/addons/mod/lesson/lang/cs.json
@@ -53,10 +53,10 @@
     "preview": "Náhled",
     "progressbarteacherwarning2": "Ukazatel průchodu se zobrazuje pouze studentům. Chcete-li si jej ověřit, přihlaste se jako student.",
     "progresscompleted": "Dokončili jste {{$a}} % přednášky",
-    "question": "Úloha",
+    "question": "Otázka",
     "rawgrade": "Hrubá známka",
     "reports": "Výsledky",
-    "response": "Odpověď",
+    "response": "Reakce",
     "retakefinishedinsync": "Offline pokus byl synchronizován. Chcete jej zobrazit?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
@@ -72,7 +72,7 @@
     "thatsthecorrectanswer": "Tato odpověď je správná.",
     "thatsthewronganswer": "Tato odpověď není správná.",
     "timeremaining": "Zbývající čas",
-    "timetaken": "Délka pokusu",
+    "timetaken": "Doba průchodu",
     "unseenpageinbranch": "Nezobrazená otázka v rámci stránky",
     "warningretakefinished": "Pokus byl dokončen na webu.",
     "welldone": "Výborně!",
diff --git a/www/addons/mod/lesson/lang/da.json b/www/addons/mod/lesson/lang/da.json
index e2d93d98db9..d00ff2ab04e 100644
--- a/www/addons/mod/lesson/lang/da.json
+++ b/www/addons/mod/lesson/lang/da.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Fejl: kunne ikke finde forsøget",
     "cannotfinduser": "Fejl: kunne ikke finde brugere",
     "clusterjump": "Usete spørgsmål i en klynge",
-    "completed": "Færdigt",
+    "completed": "Gennemført",
     "congratulations": "Tillykke - Denne lektion er slut.",
     "continue": "Fortsæt",
     "continuetonextpage": "Fortsæt til næste side.",
@@ -48,14 +48,14 @@
     "ongoingnormal": "Du har besvaret {{$a.correct}} spørgsmål rigtigt ud af  {{$a.viewed}} viste.",
     "or": "ELLER",
     "overview": "Oversigt",
-    "preview": "Prøvese",
+    "preview": "Forhåndsvisning",
     "progressbarteacherwarning2": "Du kan ikke se progressionslinjen da ud kan redigere lektionen",
     "progresscompleted": "Du har gennemført {{$a}}% af lektionen",
     "question": "Spørgsmål",
     "rawgrade": "Rå point",
     "reports": "Rapporter",
     "response": "Respons",
-    "review": "Gennemse",
+    "review": "Prøv igen",
     "reviewlesson": "Prøv en gang mere",
     "reviewquestionback": "Ja, jeg vil gerne prøve igen",
     "reviewquestioncontinue": "Nej, jeg vil bare videre til næste spørgsmål",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "Rigtigt svar!  :-)",
     "thatsthewronganswer": "Desværre, svaret er forkert.",
     "timeremaining": "Tid tilbage",
-    "timetaken": "Tidsforbrug",
+    "timetaken": "Varighed",
     "unseenpageinbranch": "Usete spørgsmål på en indholdsside",
     "welldone": "Fint!",
     "youhaveseen": "Du har allerede set mere end en side af denne lektion. <br />Ønsker du at starte på den sidste side du så?",
diff --git a/www/addons/mod/lesson/lang/de.json b/www/addons/mod/lesson/lang/de.json
index c5e6665135e..60f5cf0ae98 100644
--- a/www/addons/mod/lesson/lang/de.json
+++ b/www/addons/mod/lesson/lang/de.json
@@ -26,7 +26,7 @@
     "finishretakeoffline": "Dieser Versuch wurde offline beendet.",
     "firstwrong": "Ihre Antwort ist falsch. Wollen Sie noch einmal (ohne Bewertung) wiederholen?",
     "gotoendoflesson": "Zum Lektionende gehen",
-    "grade": "Bewertung",
+    "grade": "Relative Bewertung",
     "highscore": "Beste Bewertung",
     "hightime": "Beste Zeit",
     "leftduringtimed": "Sie haben die Lektion abgebrochen. Die Bearbeitung der Lektion ist zeitlich begrenzt. <br />Klicken Sie auf Fortsetzen, um die Lektion erneut zu beginnen.",
@@ -55,24 +55,24 @@
     "progresscompleted": "Sie haben {{$a}}% der Lektion erledigt",
     "question": "Frage",
     "rawgrade": "Absolute Bewertung",
-    "reports": "Berichte",
-    "response": "Eingabe TN",
+    "reports": "Ergebnisse",
+    "response": "Feedback",
     "retakefinishedinsync": "Ein Offline-Versuch wurde synchronisiert. Möchten Sie ihn überprüfen?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Bericht",
+    "review": "Rückschau",
     "reviewlesson": "Zur Lektion",
     "reviewquestionback": "Wiederholen",
     "reviewquestioncontinue": "Fortsetzen",
     "secondpluswrong": "Nicht ganz. Wollen Sie noch einmal wiederholen?",
-    "submit": "Abgabe",
+    "submit": "Einreichen",
     "teacherjumpwarning": "In der Lektion werden '{{$a.cluster}}'-Sprünge und/oder '{{$a.unseen}}'-Sprünge verwendet. Diese Sprünge werden durch 'Nächste Seite'-Sprünge ersetzt. Melden Sie sich als Teilnehmer/in an, um die Sprünge zu testen.",
     "teacherongoingwarning": "Die aktuelle Bewertung wird nur für Teilnehmer/innen angezeigt. Melden Sie sich als Teilnehmer/in an, um diese Funktion zu testen.",
     "teachertimerwarning": "Die Zeitbegrenzung funktioniert nur für Teilnehmer/innen. Melden Sie sich als Teilnehmer/in an, um diese Funktion zu testen.",
     "thatsthecorrectanswer": "Richtig",
     "thatsthewronganswer": "Falsch",
     "timeremaining": "Verbleibende Zeit",
-    "timetaken": "Verbrauchte Zeit",
+    "timetaken": "Aufgewendete Zeit",
     "unseenpageinbranch": "Noch nicht angezeigte Frage innerhalb des Zweiges",
     "warningretakefinished": "Der Versuch wurde auf der Website beendet.",
     "welldone": "In den Kurs gelangen Sie mit Klick auf \"Zurückkehren zu ...\"",
diff --git a/www/addons/mod/lesson/lang/el.json b/www/addons/mod/lesson/lang/el.json
index c4d412fb37a..d2c0aa91741 100644
--- a/www/addons/mod/lesson/lang/el.json
+++ b/www/addons/mod/lesson/lang/el.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "Σφάλμα: αποτυχία εύρεσης απάντησης",
     "cannotfinduser": "Σφάλμα: αποτυχία εύρεσης χρηστών",
     "clusterjump": "Ερώτηση μέσα σε συστοιχεία που δεν εμφανίστηκε",
-    "completed": "Ολοκληρωμένο",
+    "completed": "Ολοκληρώθηκε",
     "congratulations": "Συγχαρητήρια - τελειώσατε την ενότητα",
     "continue": "Συνέχεια",
     "defaultessayresponse": "Η έκθεσή σας θα βαθμολογηθεί από τον καθηγητή του μαθήματος.",
@@ -43,12 +43,12 @@
     "ongoingnormal": "Έχετε απαντήσει {{$a.correct}} σωστά από τις {{$a.viewed}} προσπάθειες.",
     "or": "Ή",
     "overview": "Σύνοψη",
-    "preview": "Προεπισκόπηση",
+    "preview": "Προεπισκόπιση",
     "progressbarteacherwarning2": "Δεν θα δείτε την μπάρα προόδου γιατί μπορείτε να επεξεργαστείτε αυτή την ενότητα",
     "question": "Ερώτηση",
     "rawgrade": "Βαθμός χωρίς επεξεργασία",
     "reports": "Αναφορές",
-    "response": "Απάντηση",
+    "response": "Ανταπόκριση",
     "review": "Αναθεώρηση",
     "reviewlesson": "Αναθεώρηση ενότητας",
     "reviewquestionback": "Ναι, θα ήθελα να δοκιμάσω πάλι",
diff --git a/www/addons/mod/lesson/lang/es-mx.json b/www/addons/mod/lesson/lang/es-mx.json
index 9141cdf0824..ead72ecbab5 100644
--- a/www/addons/mod/lesson/lang/es-mx.json
+++ b/www/addons/mod/lesson/lang/es-mx.json
@@ -50,13 +50,13 @@
     "ongoingnormal": "Usted ha respondido correctamente {{$a.correct}} pregunta(s) de un total de {{$a.viewed}} pregunta(s).",
     "or": "O",
     "overview": "Visión general",
-    "preview": "Vista previa",
+    "preview": "Previsualizar",
     "progressbarteacherwarning2": "Usted no verá la barra de progreso porque puede editar esta lección",
     "progresscompleted": "Usted ha completado  {{$a}}% de la lección",
     "question": "Pregunta",
     "rawgrade": "Calificación en bruto",
     "reports": "Reportes",
-    "response": "Respuesta",
+    "response": "Comentario",
     "retakefinishedinsync": "Un intento fuera-de-línea fue sincronizado.¿Quiere Usted revisarlo?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
diff --git a/www/addons/mod/lesson/lang/es.json b/www/addons/mod/lesson/lang/es.json
index aca4c83246d..1b960b84214 100644
--- a/www/addons/mod/lesson/lang/es.json
+++ b/www/addons/mod/lesson/lang/es.json
@@ -48,13 +48,13 @@
     "ongoingnormal": "Usted ha respondido correctamente {{$a.correct}} pregunta(s) de un total de {{$a.viewed}} pregunta(s).",
     "or": "O",
     "overview": "Revisión",
-    "preview": "Vista previa",
+    "preview": "Previsualizar",
     "progressbarteacherwarning2": "Usted no verá la barra de progreso porque puede editar esta lección",
     "progresscompleted": "Ha alcanzado el {{$a}}% de esta lección",
     "question": "Pregunta",
     "rawgrade": "Calificación en bruto",
     "reports": "Informes",
-    "response": "Respuesta",
+    "response": "Comentario",
     "review": "Revisión",
     "reviewlesson": "Revisar lección",
     "reviewquestionback": "Sí, me gustaría probar de nuevo",
diff --git a/www/addons/mod/lesson/lang/eu.json b/www/addons/mod/lesson/lang/eu.json
index 875747bed51..eb0cc12c6b0 100644
--- a/www/addons/mod/lesson/lang/eu.json
+++ b/www/addons/mod/lesson/lang/eu.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Errorea: ezin da saiakera aurkitu",
     "cannotfinduser": "Errorea: ezin dira erabiltzaileak aurkitu",
     "clusterjump": "Cluster batean ikusi gabeko galdera",
-    "completed": "Osatua",
+    "completed": "Osatuta",
     "congratulations": "Zorionak! Ikasgaiaren bukaerara iritsi zara",
     "continue": "Jarraitu",
     "continuetonextpage": "Jarraitu hurrengo orrira.",
@@ -60,7 +60,7 @@
     "retakefinishedinsync": "Lineaz kanpoko saiakera bat sinkronizatu da. Berrikusi nahi duzu?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Birpasatu",
+    "review": "Berrikuspena",
     "reviewlesson": "Ikasgaia berrikusi",
     "reviewquestionback": "Bai, berriz saiatu nahi nuke",
     "reviewquestioncontinue": "Ez, hurrengora pasa nahi dut",
@@ -72,7 +72,7 @@
     "thatsthecorrectanswer": "Hauxe da erantzun zuzena",
     "thatsthewronganswer": "Hauxe da erantzun okerra",
     "timeremaining": "Geratzen den denbora",
-    "timetaken": "Hartutako denbora",
+    "timetaken": "Erabilitako denbora",
     "unseenpageinbranch": "Eduki-orrian ikusi ez den galdera",
     "warningretakefinished": "Saiakera gunean bukatu da.",
     "welldone": "Ederki!",
diff --git a/www/addons/mod/lesson/lang/fa.json b/www/addons/mod/lesson/lang/fa.json
index 7292c45d401..79774430714 100644
--- a/www/addons/mod/lesson/lang/fa.json
+++ b/www/addons/mod/lesson/lang/fa.json
@@ -1,5 +1,5 @@
 {
-    "answer": "پاسخ",
+    "answer": "جواب",
     "attemptsremaining": "می‌توانید {{$a}} بار دیگر تلاش کنید",
     "averagescore": "نمرهٔ میانگین",
     "averagetime": "زمان میانگین",
@@ -7,7 +7,7 @@
     "cannotfindattempt": "خطا: پیدا کردن تلاش مقدور نبود",
     "cannotfinduser": "خطا: پیدا کردن کاربران مقدور نبود",
     "clusterjump": "سؤال دیده نشده از یک خوشه",
-    "completed": "کامل شده",
+    "completed": "تکمیل",
     "congratulations": "تبریک - به انتهای مبحث درسی رسیدید",
     "continue": "ادامه",
     "defaultessayresponse": "پاسخ تشریحی شما توسط استادتان تصحیح خواهد شد.",
@@ -49,13 +49,13 @@
     "question": "سؤال",
     "rawgrade": "نمرهٔ خام",
     "reports": "گزارش‌ها",
-    "response": "پاسخ",
+    "response": "واکنش به جواب",
     "review": "مرور",
     "reviewlesson": "مرور مبحث درسی",
     "reviewquestionback": "بله، می‌خواهم مجدداً تلاش کنم",
     "reviewquestioncontinue": "خیر، می‌خواهم به سؤال بعدی بروم",
     "secondpluswrong": "صحیح نیست. آیا مایلید مجدداً تلاش کنید؟",
-    "submit": "ارسال",
+    "submit": "ارائه",
     "teacherjumpwarning": "در این مبحث درسی از یک پرش به {{$a.cluster}} یا پرش به {{$a.unseen}} استفاده شده است. به جای آن‌ها از پرش به «صفحهٔ بعد» استفاده خواهد شد. برای آزمایش این پرش‌ها بعنوان شاگرد وارد شوید.",
     "teacherongoingwarning": "نمره در حال شرکت فقط به شاگردان نمایش داده می‌شود. برای آزمایش نمره در حال شرکت، در قالب یک شاگر وارد شوید.",
     "teachertimerwarning": "تایمر فقط برای شاگردان کار می‌کند. با ورود در قالب یک شاگرد، تایمر را آزمایش کنید.",
diff --git a/www/addons/mod/lesson/lang/fr.json b/www/addons/mod/lesson/lang/fr.json
index 70c5c7fe65b..2b8652437b9 100644
--- a/www/addons/mod/lesson/lang/fr.json
+++ b/www/addons/mod/lesson/lang/fr.json
@@ -51,10 +51,10 @@
     "preview": "Prévisualisation",
     "progressbarteacherwarning2": "La barre de progression ne sera pas affichée, car vous pouvez modifier cette leçon",
     "progresscompleted": "Vous avez terminé {{$a}} % de la leçon",
-    "question": "Libellé de la question",
+    "question": "Question",
     "rawgrade": "Note brute",
     "reports": "Rapports",
-    "response": "Réponse du participant",
+    "response": "Feedback",
     "review": "Relecture",
     "reviewlesson": "Revoir la leçon",
     "reviewquestionback": "Oui, j'aimerais essayer à nouveau",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "C'est une réponse correcte",
     "thatsthewronganswer": "C'est une mauvaise réponse",
     "timeremaining": "Durée restante",
-    "timetaken": "Temps mis",
+    "timetaken": "Durée utilisée",
     "unseenpageinbranch": "Question non vue au sein d'une page de contenu",
     "welldone": "Bien joué !",
     "youhaveseen": "Vous avez déjà vu au moins une page de cette leçon.<br />Voulez-vous commencer à la dernière page que vous avez vue ?",
diff --git a/www/addons/mod/lesson/lang/he.json b/www/addons/mod/lesson/lang/he.json
index b99bca39d0b..cc0a9600655 100644
--- a/www/addons/mod/lesson/lang/he.json
+++ b/www/addons/mod/lesson/lang/he.json
@@ -24,7 +24,7 @@
     "finish": "סיום",
     "firstwrong": "למרבה הצער, אינך יכול לזכות בנקודה זו מפני שהתשובה שלך היתה שגויה. האם תרצה להמשיך לנחש בשביל האושר שכרוך בלמידה (אבל ללא נקודות נוספות)?",
     "gotoendoflesson": "המשך לסוף השיעור",
-    "grade": "ניקוד בפעילות",
+    "grade": "ציון",
     "highscore": "תוצאה גבוהה",
     "hightime": "זמן גבוה",
     "leftduringtimed": "עזבת באמצע שיעור מתוזמן.<br />אנא הקליקו על 'המשך' בשביל להתחיל מחדש את השיעור.",
@@ -54,19 +54,19 @@
     "rawgrade": "ציון גולמי",
     "reports": "דוחות",
     "response": "תגובה",
-    "review": "עיון בתשובות",
+    "review": "סקירה",
     "reviewlesson": "סקירת השיעור",
     "reviewquestionback": "כן, הייתי רוצה לנסות בשנית",
     "reviewquestioncontinue": "לא, אני רוצה להמשיך לשאלה הבאה",
     "secondpluswrong": "לא בדיוק. תרצה לנסות שוב?",
-    "submit": "הגשה",
+    "submit": "הגש",
     "teacherjumpwarning": "שיעור זה משתמש באשכול־מעברים {{$a.cluster}} או במעברים {{$a.unseen}}. כחלופה, יעשה שימוש במעבר ל'עמוד הבא'. יש להתחבר כסטודנט על מנת לבחון את התנהגות מעבר העמודים לעיל.",
     "teacherongoingwarning": "תוצאה מצטברת מוצגת רק בפני הסטודנט. התחבר כסטודנט כדי לבחון את התוצאה המתמשכת.",
     "teachertimerwarning": "שעון העצר עובד רק לסטודנטים. התחבר כסטודנט כדי לבחון את שעון העצר.",
     "thatsthecorrectanswer": "זוהי התשובה הנכונה.",
     "thatsthewronganswer": "זוהי לא התשובה הנכונה.",
     "timeremaining": "הזמן שנשאר",
-    "timetaken": "הזמן שלקח",
+    "timetaken": "זמן שנלקח",
     "unseenpageinbranch": "שאלת אנסין בתוך ההסתעפות",
     "welldone": "כל הכבוד!",
     "youhaveseen": "כבר ראית יותר מעמוד אחד בשיעור זה.<br />האם תרצה להתחיל בעמוד האחרון שראית?",
diff --git a/www/addons/mod/lesson/lang/it.json b/www/addons/mod/lesson/lang/it.json
index ab792f9d489..de8299fe5af 100644
--- a/www/addons/mod/lesson/lang/it.json
+++ b/www/addons/mod/lesson/lang/it.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Errore: non è stato possibile trovare il tentativo",
     "cannotfinduser": "Errore: non è stato possibile trovare utenti",
     "clusterjump": "Domanda non visualizzata di un gruppo ",
-    "completed": "Completato",
+    "completed": "Completata",
     "congratulations": "Congratulazioni - hai raggiunto la fine della lezione",
     "continue": "Continua",
     "continuetonextpage": "Vai alla prossima pagina.",
@@ -24,7 +24,7 @@
     "finish": "Termina",
     "firstwrong": "la tua risposta non è corretta. Desideri provare a rispondere di nuovo? (L'eventuale risposta corretta non sarà comunque tenuta in considerazione per il calcolo del punteggio finale).",
     "gotoendoflesson": "Vai alla fine della lezione",
-    "grade": "Valutazione",
+    "grade": "Punteggio",
     "highscore": "Voto migliore",
     "hightime": "Tempo migliore",
     "leftduringtimed": "Hai abbandonato il tentativo durante una lezione a tempo.<br />Clicca su Continua per ricominciare la lezione.",
@@ -53,8 +53,8 @@
     "progresscompleted": "Hai completato il {{$a}}% della lezione",
     "question": "Domanda",
     "rawgrade": "Voto grezzo",
-    "reports": "Report",
-    "response": "Risposta data",
+    "reports": "Risultati",
+    "response": "Replica",
     "review": "Revisione",
     "reviewlesson": "Rivedi la lezione",
     "reviewquestionback": "Si, voglio provare ancora",
diff --git a/www/addons/mod/lesson/lang/ja.json b/www/addons/mod/lesson/lang/ja.json
index 833e1e0f12b..18e3ade173c 100644
--- a/www/addons/mod/lesson/lang/ja.json
+++ b/www/addons/mod/lesson/lang/ja.json
@@ -1,5 +1,5 @@
 {
-    "answer": "答え",
+    "answer": "答え/選択肢",
     "attemptheader": "受験",
     "attemptsremaining": "あなたには {{$a}} 回の受験回数が残っています。",
     "averagescore": "平均評点",
@@ -24,7 +24,7 @@
     "finish": "終了",
     "firstwrong": "あなたの解答は正しくありません。問題を再度受験しますか?  (今から問題に正しく解答した場合、あなたの最終評点には加算されません)",
     "gotoendoflesson": "レッスンの最後に移動する",
-    "grade": "評定",
+    "grade": "評点",
     "highscore": "最高評点",
     "hightime": "最長時間",
     "leftduringtimed": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンを再スタートするには「続ける」をクリックしてください。",
@@ -54,7 +54,7 @@
     "question": "問題",
     "rawgrade": "素点",
     "reports": "レポート",
-    "response": "解答",
+    "response": "返答",
     "review": "レビュー",
     "reviewlesson": "レッスンをレビューする",
     "reviewquestionback": "はい、もう一度受験します",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "正解です。",
     "thatsthewronganswer": "不正解です。",
     "timeremaining": "残り時間",
-    "timetaken": "所要時間",
+    "timetaken": "経過時間",
     "unseenpageinbranch": "コンテンツページ内の未閲覧の問題",
     "welldone": "よくできました!",
     "youhaveseen": "あなたはすでにこのレッスンを2ページ以上表示しました。<br />あなたが表示した最後のページから始めますか?",
diff --git a/www/addons/mod/lesson/lang/lt.json b/www/addons/mod/lesson/lang/lt.json
index bd1f65cd301..e088a565222 100644
--- a/www/addons/mod/lesson/lang/lt.json
+++ b/www/addons/mod/lesson/lang/lt.json
@@ -1,5 +1,5 @@
 {
-    "answer": "Atsakymas",
+    "answer": "Atsakyti",
     "attemptheader": "Bandymas",
     "attemptsremaining": "Turite likusių bandymų: {{$a}}",
     "averagescore": "Vidutinis balas",
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Klaida: nepavyko rasti bandymo",
     "cannotfinduser": "Klaida: nepavyko rasti naudotojų",
     "clusterjump": "Telkinyje nematomas klausimas",
-    "completed": "Užbaigta",
+    "completed": "Baigta",
     "congratulations": "Sveikiname. Pasiekta pamokos pabaiga.",
     "continue": "Tęsti",
     "continuetonextpage": "Toliau į sekantį puslapį.",
diff --git a/www/addons/mod/lesson/lang/nl.json b/www/addons/mod/lesson/lang/nl.json
index 80e3848afc4..e2620a8cabf 100644
--- a/www/addons/mod/lesson/lang/nl.json
+++ b/www/addons/mod/lesson/lang/nl.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Fout: kon poging niet vinden",
     "cannotfinduser": "Fout: kon geen gebruikers vinden",
     "clusterjump": "Ongeziene vraag binnen een cluster",
-    "completed": "Volledig",
+    "completed": "Voltooid",
     "congratulations": "Proficiat - je hebt het einde van de les bereikt",
     "continue": "Ga verder",
     "continuetonextpage": "Ga naar volgende pagina",
@@ -26,7 +26,7 @@
     "finishretakeoffline": "Deze poging is voltooid in offline modus",
     "firstwrong": "Je antwoord is fout.  Wil je de vraag opnieuw proberen te beantwoorden? Als je het antwoord weet, zul je er geen punten meer mee verdienen.",
     "gotoendoflesson": "Ga naar het einde van de les",
-    "grade": "Beoordeling",
+    "grade": "Cijfer",
     "highscore": "Hoogste score",
     "hightime": "Langste duur",
     "leftduringtimed": "Je bent weggegaan tijdens een getimede les. <br />Klik op ga verder om de les te hervatten.",
@@ -50,22 +50,22 @@
     "ongoingnormal": "Je hebt {{$a.correct}} vragen van de {{$a.viewed}} juist beantwoord.",
     "or": "OF",
     "overview": "Overzicht",
-    "preview": "Controleer test",
+    "preview": "Voorbeeld",
     "progressbarteacherwarning2": "Je zult de vorderingsbalk niet zien omdat je deze les kunt bewerken",
     "progresscompleted": "Je hebt {{$a}}% van de les beëindigd",
     "question": "Vraag",
     "rawgrade": "Ruwe score",
     "reports": "Rapporten",
-    "response": "Antwoord",
+    "response": "Respons",
     "retakefinishedinsync": "Er werd een offline poging gesynchroniseerd. Wil je ze bekijken?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Lees na",
+    "review": "Nalezen",
     "reviewlesson": "Les nalezen",
     "reviewquestionback": "Ja, ik wil nog eens proberen",
     "reviewquestioncontinue": "Nee, ik wil naar de volgende vraag gaan",
     "secondpluswrong": "Niet echt. Wil je nog eens proberen?",
-    "submit": "Afgeven",
+    "submit": "Insturen",
     "teacherjumpwarning": "Er wordt een {{$a.cluster}} sprong of een {{$a.unseen}} sprong gebruikt in deze les. De sprong naar de volgende pagina zal in de plaats gebruikt worden. Meld je aan als leerling om deze sprongen te testen.",
     "teacherongoingwarning": "De score tijdens de les wordt alleen aan leerlingen getoond. Meld je aan als leerling om deze optie te testen",
     "teachertimerwarning": "De timer werkt enkel voor leerlingen. Test de timer door je als leerling aan te melden.",
diff --git a/www/addons/mod/lesson/lang/pl.json b/www/addons/mod/lesson/lang/pl.json
index 538a7158415..c36b7ae91cf 100644
--- a/www/addons/mod/lesson/lang/pl.json
+++ b/www/addons/mod/lesson/lang/pl.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Błąd: nie znaleziono podejść",
     "cannotfinduser": "Błąd: nie znaleziono użytkowników",
     "clusterjump": "Nie widziane pytanie w obrębie klastra",
-    "completed": "Zakończone",
+    "completed": "Skończono",
     "congratulations": "Gratulacje - koniec lekcji",
     "continue": "Kontynuuj",
     "continuetonextpage": "Kontynuuj do następnej strony.",
@@ -54,20 +54,20 @@
     "question": "Pytanie",
     "rawgrade": "Surowa (nie przeliczona) ocena",
     "reports": "Raporty",
-    "response": "Odpowiedź",
+    "response": "Informacja zwrotna",
     "review": "Przegląd",
     "reviewlesson": "Przejrzyj ponownie lekcje",
     "reviewquestionback": "Tak, chcę spróbować ponownie",
     "reviewquestioncontinue": "Nie, chcę przejść do następnego pytania",
     "secondpluswrong": "Niezupełnie. Chcesz spróbować ponownie?",
-    "submit": "Zatwierdź",
+    "submit": "Prześlij",
     "teacherjumpwarning": "Skoki typu {{$a.cluster}} lub {{$a.unseen}} są używane w tej lekcji. Skok do następnej strony będzie używany zamiast tego. Zaloguj się jako student, żeby przetestować przejścia",
     "teacherongoingwarning": "Wynik jest pokazywany tylko studentowi. Zaloguj się jako student.",
     "teachertimerwarning": "Licznik czasu działa tylko dla studentów, Aby przetestować, zaloguj się jako student.",
     "thatsthecorrectanswer": "To jest poprawna odpowiedź",
     "thatsthewronganswer": "To jest błędna odpowiedź",
     "timeremaining": "Pozostały czas",
-    "timetaken": "Wykorzystany czas",
+    "timetaken": "Łączny czas",
     "unseenpageinbranch": "Nie wyświetlane dotąd pytanie w treści strony",
     "welldone": "Dobrze zrobione!",
     "youhaveseen": "Widziałeś już więcej niż jedną stronę tej lekcji. <br />Czy chciałbyś zacząć od ostatniej strony, którą przeglądałeś?",
diff --git a/www/addons/mod/lesson/lang/pt-br.json b/www/addons/mod/lesson/lang/pt-br.json
index 37c054de65b..a50382f3902 100644
--- a/www/addons/mod/lesson/lang/pt-br.json
+++ b/www/addons/mod/lesson/lang/pt-br.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Erro: não foi possível encontrar a tentativa",
     "cannotfinduser": "Erro: não foi possível encontrar os usuários",
     "clusterjump": "Questão não vista em um cluster",
-    "completed": "Concluído",
+    "completed": "Concluída",
     "congratulations": "Você chegou ao fim desta lição",
     "continue": "Continuar",
     "continuetonextpage": "Continuar para a próxima página.",
@@ -24,7 +24,7 @@
     "finish": "Finalizado",
     "firstwrong": "Infelizmente esta resposta não é correta e portanto não aumentará a sua pontuação. Você gostaria de continuar tentando para conhecer a resposta certa (mas sem direito à revisão da pontuação)?",
     "gotoendoflesson": "Ir para o final da lição",
-    "grade": "Nota",
+    "grade": "Avaliação",
     "highscore": "Pontuação alta",
     "hightime": "Tempo alto",
     "leftduringtimed": "Você interrompeu uma lição com tempo de duração definido.<br />Por favor clique em Continuar para recomeçar a lição.",
@@ -48,13 +48,13 @@
     "ongoingnormal": "Você respondeu corretamente {{$a.correct}} questões de um total de {{$a.viewed}} .",
     "or": "OU",
     "overview": "Visão geral",
-    "preview": "Visualização prévia",
+    "preview": "Visualizar",
     "progressbarteacherwarning2": "Você não verá a barra de progresso porque você pode editar esta lição.",
     "progresscompleted": "Você completou {{$a}}% da lição",
-    "question": "Pergunta",
+    "question": "Questão",
     "rawgrade": "Nota não ponderada",
     "reports": "Relatórios",
-    "response": "Resposta",
+    "response": "Retorno",
     "review": "Revisão",
     "reviewlesson": "Rever Lição",
     "reviewquestionback": "Sim, eu gostaria de tentar novamente",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "Esta é a resposta correta",
     "thatsthewronganswer": "Esta é a resposta errada",
     "timeremaining": "Tempo restante",
-    "timetaken": "Tempo empregado",
+    "timetaken": "Tempo utilizado",
     "unseenpageinbranch": "Questão não vista de uma seção",
     "welldone": "Muito bem!",
     "youhaveseen": "Você já visitou algumas páginas desta lição.<br />Você quer iniciar a partir da última página visitada?",
diff --git a/www/addons/mod/lesson/lang/pt.json b/www/addons/mod/lesson/lang/pt.json
index 06a95417e22..e236e65f35a 100644
--- a/www/addons/mod/lesson/lang/pt.json
+++ b/www/addons/mod/lesson/lang/pt.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Erro: não foi possível encontrar a tentativa",
     "cannotfinduser": "Erro: não foi possível encontrar utilizadores",
     "clusterjump": "Pergunta não vista dentro do grupo",
-    "completed": "Completo",
+    "completed": "Completou",
     "congratulations": "Parabéns - chegou ao fim da lição",
     "continue": "Continuar",
     "continuetonextpage": "Continuar para a página seguinte",
@@ -53,14 +53,14 @@
     "preview": "Pré-visualização",
     "progressbarteacherwarning2": "Não vê a barra de progresso porque pode editar esta lição",
     "progresscompleted": "Completou {{$a}}% da lição",
-    "question": "Pergunta",
+    "question": "Inserir página de pergunta",
     "rawgrade": "Nota bruta",
     "reports": "Relatórios",
-    "response": "Resposta",
+    "response": "Feedback",
     "retakefinishedinsync": "Uma tentativa offline foi sincronizada. Pretende rever a tentativa?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Rever",
+    "review": "Revisão",
     "reviewlesson": "Rever lição",
     "reviewquestionback": "Sim, quero tentar novamente",
     "reviewquestioncontinue": "Não, quero avançar para a pergunta seguinte",
@@ -72,7 +72,7 @@
     "thatsthecorrectanswer": "A sua resposta está correta.",
     "thatsthewronganswer": "A sua resposta <b>não<b> está correta.",
     "timeremaining": "Tempo restante",
-    "timetaken": "Tempo gasto",
+    "timetaken": "Tempo usado",
     "unseenpageinbranch": "Pergunta não vista da sequência",
     "warningretakefinished": "A tentativa foi terminada no site.",
     "welldone": "Muito bem!",
diff --git a/www/addons/mod/lesson/lang/ro.json b/www/addons/mod/lesson/lang/ro.json
index 44d9d09817b..e921358830b 100644
--- a/www/addons/mod/lesson/lang/ro.json
+++ b/www/addons/mod/lesson/lang/ro.json
@@ -37,7 +37,7 @@
     "numberofpagesviewednotice": "Aţi răspuns la {{$a.nquestions}} întrebări; (Trebuie să răspundeţi la cel puţin {{$a.minquestions}} întrebări)",
     "ongoingcustom": "Până în acest moment aţi obţinut {{$a.score}} point(s) puncte din {{$a.currenthigh}} point(s) posibile.",
     "or": "SAU",
-    "preview": "Afişare",
+    "preview": "Previzualizare",
     "progresscompleted": "Ați completat {{$a}}% din lecție",
     "question": "Întrebare",
     "reports": "Rapoarte",
@@ -51,7 +51,7 @@
     "thatsthecorrectanswer": "Răspuns corect",
     "thatsthewronganswer": "Răspuns incorect",
     "timeremaining": "Timp rămas",
-    "timetaken": "Timp luat",
+    "timetaken": "Timp necesar",
     "welldone": "Foarte bine!",
     "youhaveseen": "Aţi vizualizat deja mai mult de o pagină din această lecţie.<br />Doriţi să reveniţi la prima pagină pe care aţi văzut-o?",
     "youranswer": "Răspunsul dumneavoastră",
diff --git a/www/addons/mod/lesson/lang/ru.json b/www/addons/mod/lesson/lang/ru.json
index a7de74688e9..cdfe818e247 100644
--- a/www/addons/mod/lesson/lang/ru.json
+++ b/www/addons/mod/lesson/lang/ru.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Ошибка: попытка не найдена",
     "cannotfinduser": "Ошибка: не удалось найти пользователей",
     "clusterjump": "Непросмотренный вопрос в кластере",
-    "completed": "Завершено",
+    "completed": "Лекция завершена",
     "congratulations": "Поздравления - лекция завершена",
     "continue": "Продолжить",
     "continuetonextpage": "Перейти к следующей странице",
@@ -54,8 +54,8 @@
     "question": "Вопрос",
     "rawgrade": "Предварительная оценка",
     "reports": "Отчеты",
-    "response": "Ответ",
-    "review": "Просмотр",
+    "response": "Отзыв",
+    "review": "Пересмотр",
     "reviewlesson": "Пересмотр лекции",
     "reviewquestionback": "Да, мне хотелось бы попробовать еще раз",
     "reviewquestioncontinue": "Нет, я просто хочу перейти к следующему вопросу",
@@ -67,7 +67,7 @@
     "thatsthecorrectanswer": "Это правильный ответ",
     "thatsthewronganswer": "Это неправильный ответ",
     "timeremaining": "Оставшееся время",
-    "timetaken": "Прошло времени",
+    "timetaken": "Затраченное время",
     "unseenpageinbranch": "Страница непросмотренного вопроса из раздела",
     "welldone": "Отлично!",
     "youhaveseen": "Вы уже работали с этой лекцией.<br /> Хотите продолжить с того места, на котором Вы остановились?",
diff --git a/www/addons/mod/lesson/lang/sv.json b/www/addons/mod/lesson/lang/sv.json
index fc97510fb69..fe0a53b2702 100644
--- a/www/addons/mod/lesson/lang/sv.json
+++ b/www/addons/mod/lesson/lang/sv.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "Fel: det gick inte att hitta försök",
     "cannotfinduser": "Fel: det gick inte att hitta användare",
     "clusterjump": "Ej visad fråga inom ett kluster",
-    "completed": "Slutfört",
+    "completed": "Avslutad",
     "congratulations": "Gratulerar - lektionen är slut här",
     "continue": "Fortsätt",
     "continuetonextpage": "Fortsätt till nästa sida.",
@@ -23,7 +23,7 @@
     "finish": "Avsluta",
     "firstwrong": "Tyvärr har Du inte uppnått den här poängen eftersom Du inte svarade rätt. Vill Du fortsätta att gissa, för lärandets skull (men inte för någon poäng)?",
     "gotoendoflesson": "Gå till slutet av lektionen",
-    "grade": "Betyg",
+    "grade": "Betyg/omdöme",
     "highscore": "Högt resultat",
     "hightime": "Hög tid",
     "leftduringtimed": "Du har avbrutit under en tidsstyrd lektion.<br>Var snäll och välj \"Fortsätt\" för att starta om lektionen.",
@@ -51,20 +51,20 @@
     "question": "Fråga",
     "rawgrade": "Grovt antaget betyg/omdöme",
     "reports": "Rapporter",
-    "response": "Respons",
+    "response": "Återkoppling på svar",
     "review": "Granska",
     "reviewlesson": "Visa lektion igen",
     "reviewquestionback": "Ja, jag vill försöka igen",
     "reviewquestioncontinue": "Nej, jag vill gå vidare till nästa fråga",
     "secondpluswrong": "Inte helt. Vill Du försöka igen?",
-    "submit": "Skicka",
+    "submit": "Skicka in",
     "teacherjumpwarning": "Det finns ett {{$a.cluster}} hopp eller ett {{$a.unseen}} hopp med i den här lektionen. Hoppet \"Nästa sida\" kommer att användas istället. Logga in som en student/elev/deltagare/lärande för att testa dessa hopp.",
     "teacherongoingwarning": "Ett pågående resultat visas bara för studenter/elever/deltagare/lärande. Logga in som en sådan för att se pågående resultat.",
     "teachertimerwarning": "Tidtagaren fungerar bara för studenter/elever/deltagare/lärande. Logga in som en sådan för att testa tidtagaren.",
     "thatsthecorrectanswer": "Det är rätt svar",
     "thatsthewronganswer": "Det är ett felaktigt svar",
     "timeremaining": "Återstående tid",
-    "timetaken": "Tid för genomförande",
+    "timetaken": "Använd tid",
     "unseenpageinbranch": "Ej visad fråga inom en innehållssida",
     "welldone": "Bra gjort!",
     "youhaveseen": "Du har redan sett mer än en sida av den här lektionen.<br />Vill Du börja med den senaste sidan som Du såg?",
diff --git a/www/addons/mod/lesson/lang/tr.json b/www/addons/mod/lesson/lang/tr.json
index fec20555f48..99d0bd338e2 100644
--- a/www/addons/mod/lesson/lang/tr.json
+++ b/www/addons/mod/lesson/lang/tr.json
@@ -8,7 +8,7 @@
     "cannotfindattempt": "Hata: uygulama bulunamadı",
     "cannotfinduser": "Hata: kullanıcılar bulunamadı",
     "clusterjump": "Küme içindeki bakılmamış soru",
-    "completed": "Tamamlandı",
+    "completed": "Bitirmeli",
     "congratulations": "Tebrikler, dersin sonuna geldiniz",
     "continue": "Devam et",
     "continuetonextpage": "Sonraki sayfaya devam et.",
@@ -24,7 +24,7 @@
     "finish": "Bitiş",
     "firstwrong": "Cevabınız doğru olmadığı için maalesef bu puanı alamazsınız. Öğrenmenizi daha çok pekiştirmek için tahmin etmeye devam etmek ister misiniz (ama puan verilmez)?",
     "gotoendoflesson": "Dersin sonuna git",
-    "grade": "Başarı notu",
+    "grade": "Not",
     "highscore": "Yüksek not",
     "hightime": "Yüksek zaman",
     "leftduringtimed": "Zamanlı bir dersin süresini aştınız.<br />Dersi tekrar başlatmak için Devam Et butonuna tıklayın.",
@@ -54,8 +54,8 @@
     "question": "Soru",
     "rawgrade": "Ham not",
     "reports": "Raporlar",
-    "response": "Verilen yanıt",
-    "review": "Önizleme",
+    "response": "Yanıtına karşılık dönüt",
+    "review": "Gözden geçir",
     "reviewlesson": "Dersi tekrar gözden geçir",
     "reviewquestionback": "Evet, tekrar deneyeyim",
     "reviewquestioncontinue": "Hayır, sonraki soruya geçeyim",
diff --git a/www/addons/mod/lesson/lang/uk.json b/www/addons/mod/lesson/lang/uk.json
index 3c5260abead..e6a5762d90d 100644
--- a/www/addons/mod/lesson/lang/uk.json
+++ b/www/addons/mod/lesson/lang/uk.json
@@ -50,7 +50,7 @@
     "ongoingnormal": "Ви відповіли правильно на {{$a.correct}} запитань із {{$a.viewed}} переглянутих.",
     "or": "АБО",
     "overview": "Переглянути",
-    "preview": "Перегляд",
+    "preview": "Попередньо переглянути",
     "progressbarteacherwarning2": "Ви не зможете побачити показник виконання, тому що Ви редагуєте цей урок",
     "progresscompleted": "Ви вже пройшли {{$a}}% уроку",
     "question": "Питання",
@@ -60,19 +60,19 @@
     "retakefinishedinsync": "Офлайн спроба була синхронізована. Ви хочете розглянути її?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "review": "Огляд",
+    "review": "Переглянути",
     "reviewlesson": "Переглянути урок",
     "reviewquestionback": "Так, я хочу спробувати знов",
     "reviewquestioncontinue": "Ні, я просто хочу перейти до наступного питання",
     "secondpluswrong": "Недостатньо. Ви хочете спробувати знову?",
-    "submit": "Перевірити",
+    "submit": "Відправити",
     "teacherjumpwarning": "Перехід {{$a.cluster}} або перехід {{$a.unseen}} повинен використовуватися в цьому уроці. Натомість буде використаний перехід на наступну сторінку. Увійдіть під ім'ям якого-небудь студента, щоб протестувати ці переходи.",
     "teacherongoingwarning": "Поточна оцінка показується лише студенту. Зайдіть в систему як студент, щоб перевірити поточні оцінки",
     "teachertimerwarning": "Таймер працює лише для студентів. Перевірте таймер, зайшовши в систему як студент.",
     "thatsthecorrectanswer": "Це правильна відповідь",
     "thatsthewronganswer": "Це неправильна відповідь",
     "timeremaining": "Залишилося",
-    "timetaken": "Витрачено часу",
+    "timetaken": "Витрачений час",
     "unseenpageinbranch": "Не переглянута сторінка гілки",
     "warningretakefinished": "Спроба була закінчена на сайті.",
     "welldone": "Відмінно!",
diff --git a/www/addons/mod/lesson/lang/zh-cn.json b/www/addons/mod/lesson/lang/zh-cn.json
index d9174e6c9a5..3c06c89a713 100644
--- a/www/addons/mod/lesson/lang/zh-cn.json
+++ b/www/addons/mod/lesson/lang/zh-cn.json
@@ -7,7 +7,7 @@
     "cannotfindattempt": "错误：找不到试答",
     "cannotfinduser": "错误：找不到用户",
     "clusterjump": "在簇中的题目不可见",
-    "completed": "已完成",
+    "completed": "完成",
     "congratulations": "恭喜 － 已到达练习终点",
     "continue": "继续",
     "continuetonextpage": "继续到下一页。",
@@ -49,11 +49,11 @@
     "preview": "预览",
     "progressbarteacherwarning2": "因为您可以编辑此程序教学，所以您看不到进度条",
     "progresscompleted": "您已完成此程序教学的 {{$a}}%",
-    "question": "试题",
+    "question": "题目",
     "rawgrade": "原始分数",
     "reports": "报表",
-    "response": "回答",
-    "review": "回顾",
+    "response": "回应",
+    "review": "复习",
     "reviewlesson": "复习程序教学",
     "reviewquestionback": "再试一次",
     "reviewquestioncontinue": "不，我只想继续看下一题",
@@ -65,7 +65,7 @@
     "thatsthecorrectanswer": "此答案正确",
     "thatsthewronganswer": "此答案错误",
     "timeremaining": "剩余时间",
-    "timetaken": "耗时",
+    "timetaken": "开始时间",
     "unseenpageinbranch": "内容页面内未查看的题目",
     "welldone": "非常好!",
     "youhaveseen": "您已经浏览了本程序教学的多个页面。<br />想从上次结束的页面开始吗？",
diff --git a/www/addons/mod/lesson/lang/zh-tw.json b/www/addons/mod/lesson/lang/zh-tw.json
index 7ab451fd0e8..42b9529905a 100644
--- a/www/addons/mod/lesson/lang/zh-tw.json
+++ b/www/addons/mod/lesson/lang/zh-tw.json
@@ -24,7 +24,7 @@
     "finish": "完成",
     "firstwrong": "你答錯了，你想要再答一次嗎？(若你回答正確，也不會算入最後正式分數)？",
     "gotoendoflesson": "跳到這編序學習的結束",
-    "grade": "成績",
+    "grade": "分數",
     "highscore": "最高分",
     "hightime": "最長時間",
     "leftduringtimed": "您在一個有計時的編序教學中離開了。<br>請按\"繼續\"以重新開始這編序教學",
@@ -54,20 +54,20 @@
     "question": "試題",
     "rawgrade": "原始分數",
     "reports": "報表",
-    "response": "回答",
+    "response": "回覆",
     "review": "復習",
     "reviewlesson": "復習編序學習",
     "reviewquestionback": "是的，我想要再試",
     "reviewquestioncontinue": "不，我只想要繼續下一個問題",
     "secondpluswrong": "不離開嗎?您想要再試試?",
-    "submit": "送出",
+    "submit": "提交",
     "teacherjumpwarning": "此編序學習正使用群集{{$a.cluster}}跳躍，或{{$a.unseen}}隱藏跳躍。將使用下一頁的跳躍方式來取代。以學生身份登入來測試這些跳躍。",
     "teacherongoingwarning": "正進行中的分數只顯示給學生。以學生身份登入來測試這個進行中的分數。",
     "teachertimerwarning": "計時器只提供給學生。以學生身份登入來測試這個計時器。",
     "thatsthecorrectanswer": "這是正確的答案",
     "thatsthewronganswer": "這是錯誤的答案",
     "timeremaining": "剩餘時間",
-    "timetaken": "所用時間",
+    "timetaken": "使用時間",
     "unseenpageinbranch": "在內容頁面中未瀏覽的試題",
     "welldone": "做的好！",
     "youhaveseen": "您已經瀏覽了該課程的多個頁面。<br />想從最後瀏覽的頁面開始嗎?",
diff --git a/www/addons/mod/quiz/lang/ar.json b/www/addons/mod/quiz/lang/ar.json
index 28be917d4e9..1c73660d4bd 100644
--- a/www/addons/mod/quiz/lang/ar.json
+++ b/www/addons/mod/quiz/lang/ar.json
@@ -14,14 +14,14 @@
     "continuepreview": "استمر اخر معاينة",
     "errordownloading": "خطأ عن تنزيل البيانات المطلوبة",
     "errorgetquiz": "خطأ عند الحصول على بيانات الاختبار",
-    "feedback": "(تغذية راجعة (ملاحظات",
+    "feedback": "تعليق",
     "grade": "درجة",
     "gradeaverage": "متوسط الدرجة",
     "gradehighest": "أعلى درجة",
     "grademethod": "أسلوب التقييم",
     "hasdatatosync": "هذا الاختبار فيه بيانات يمكن الوصول إليها بدون اتصال بالانترنت وتحتاج للمزامنة",
-    "marks": "علامات",
-    "noquestions": "لم يتم العثور على الأسئلة لتصديرها. تأكد من أنك قمت بتحديد التصنيف الذي يحتوي على الأسئلة لتصديره.",
+    "marks": "الدرجات",
+    "noquestions": "لم يتم إضافة أية أسئلة بعد",
     "outof": "من {{$a}}",
     "overdue": "متأخر جدا",
     "preview": "معاينة",
@@ -37,7 +37,7 @@
     "startedon": "بداء في",
     "stateinprogress": "قيد التنفيذ",
     "stateoverdue": "مُتأخر",
-    "status": "السماح بدخول ضيف",
+    "status": "الحالة",
     "submitallandfinish": "سلم الجميع وانهي",
     "summaryofattempt": "ملخص المحاولة",
     "summaryofattempts": "ملخص محاولاتك السابقة",
diff --git a/www/addons/mod/quiz/lang/bg.json b/www/addons/mod/quiz/lang/bg.json
index 6da8ef7afae..d39754517d4 100644
--- a/www/addons/mod/quiz/lang/bg.json
+++ b/www/addons/mod/quiz/lang/bg.json
@@ -20,7 +20,7 @@
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "marks": "Точки",
     "mustbesubmittedby": "Това изпълнение трябва да бъде предадено до {{$a}}.",
-    "noquestions": "Не са намерени въпроси, които да могат да се експортират. Проверете дали сте избрали категория за експортиране, която съдържа въпроси.",
+    "noquestions": "Още не са добавени въпроси",
     "noreviewattempt": "Вие нямате право да прегледате този опит.",
     "notyetgraded": "Още не е оценен",
     "outof": "{{$a.grade}} от {{$a.maxgrade}}",
@@ -49,7 +49,7 @@
     "stateinprogress": "В процес",
     "stateoverdue": "Закъснял",
     "stateoverduedetails": "Трябва да се предаде до {{$a}}",
-    "status": "Позволяване достъп като гост",
+    "status": "Състояние",
     "submitallandfinish": "Предаване на всичко и приключване",
     "summaryofattempt": "Обобщение на опита",
     "summaryofattempts": "Обобщение на предишните Ви опити",
diff --git a/www/addons/mod/quiz/lang/ca.json b/www/addons/mod/quiz/lang/ca.json
index aab90187cf8..0996d785247 100644
--- a/www/addons/mod/quiz/lang/ca.json
+++ b/www/addons/mod/quiz/lang/ca.json
@@ -35,9 +35,9 @@
     "grademethod": "Mètode de qualificació",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Aquest qüestionari té dades fora de línia per sincronitzar.",
-    "marks": "Puntuacions",
+    "marks": "Punts",
     "mustbesubmittedby": "Aquest intent s'ha d'enviar abans de {{$a}}.",
-    "noquestions": "No s'han trobat preguntes que puguin ser exportades. Assegureu-vos que seleccioneu una categoria d'exportació que contingui preguntes.",
+    "noquestions": "Encara no s'han afegit preguntes",
     "noreviewattempt": "No teniu permís per revisar aquest intent.",
     "notyetgraded": "Encara no s'ha avaluat",
     "opentoc": "Obre la navegació per preguntes.",
@@ -67,7 +67,7 @@
     "stateinprogress": "En progrés",
     "stateoverdue": "Venciment",
     "stateoverduedetails": "Ha d'enviar-se en {{$a}}",
-    "status": "Permetre l'accés de visitants",
+    "status": "Estat",
     "submitallandfinish": "Envia i acaba",
     "summaryofattempt": "Resum de l'intent",
     "summaryofattempts": "Resum dels vostres intents anteriors",
diff --git a/www/addons/mod/quiz/lang/cs.json b/www/addons/mod/quiz/lang/cs.json
index 04e533bd0b2..7218ee18af2 100644
--- a/www/addons/mod/quiz/lang/cs.json
+++ b/www/addons/mod/quiz/lang/cs.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Při ukládání dat pokusu došlo k chybě.",
     "errorsyncquiz": "Při synchronizaci došlo k chybě. Zkuste to znovu, prosím.",
     "errorsyncquizblocked": "Tento test nelze synchronizovat z důvodu probíhajícího procesu. Prosím zkuste to znovu později. Pokud problém přetrvává, zkuste restartovat aplikaci.",
-    "feedback": "Reakce",
+    "feedback": "Komentář",
     "finishattemptdots": "Dokončení pokusu ...",
     "finishnotsynced": "Ukončeno bez synchronizace",
     "grade": "Známka",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Tento test má offline data, která mají být synchronizována.",
     "marks": "Body",
     "mustbesubmittedby": "Tento pokus musí být odeslán nejpozději {{$a}}.",
-    "noquestions": "Nenalezeny žádné úlohy k exportu. Vybrali jste správnou kategorii k exportu?",
+    "noquestions": "Dosud nebyly vloženy žádné úlohy.",
     "noreviewattempt": "Nemůžete revidovat tento pokus.",
     "notyetgraded": "Dosud nehodnoceno",
     "opentoc": "Otevřete navigaci.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Probíhá",
     "stateoverdue": "Překročen časový limit",
     "stateoverduedetails": "Musí být odesláno {{$a}}",
-    "status": "Povolit přístup pro hosty",
+    "status": "Stav",
     "submitallandfinish": "Odeslat vše a ukončit pokus",
     "summaryofattempt": "Souhrn pokusu",
     "summaryofattempts": "Souhrn vašich předchozích pokusů",
diff --git a/www/addons/mod/quiz/lang/da.json b/www/addons/mod/quiz/lang/da.json
index 5e91aea6688..0a636b82677 100644
--- a/www/addons/mod/quiz/lang/da.json
+++ b/www/addons/mod/quiz/lang/da.json
@@ -15,7 +15,7 @@
     "connectionerror": "Har mistet forbindelse til netværket. (Autosave slog fejl).\n\nNoter alle svar, der er skrevet på denne side i løbet af de sidste par minutter, og prøv så at genoprette forbindelsen.\n\nNår forbindelsen er genoprettet, skulle dine svar være gemt, og denne besked forsvinder.",
     "continueattemptquiz": "Fortsæt fra sidste forsøg",
     "continuepreview": "Fortsæt sidste gennemsyn",
-    "feedback": "Feedback",
+    "feedback": "Tilbagemelding",
     "finishattemptdots": "Afslut quizzen...",
     "finishnotsynced": "Afsluttet, men ikke synkroniseret",
     "grade": "Karakter",
@@ -26,7 +26,7 @@
     "hasdatatosync": "Quizzen har data offline der skal synkroniseres.",
     "marks": "Point",
     "mustbesubmittedby": "Svaret skal indsendes senest {{$a}}",
-    "noquestions": "Der var ingen spørgsmål, som kunne eksporteres. Sørg for at vælge en kategori til eksport, der indeholder spørgsmål.",
+    "noquestions": "Der er ikke tilføjet nogen spørgsmål  endnu",
     "noreviewattempt": "Du har ikke tilladelse til at gennemse denne besvarelse.",
     "notyetgraded": "Ikke vurderet endnu",
     "outof": "{{$a.grade}} ud af {{$a.maxgrade}}",
@@ -55,7 +55,7 @@
     "stateinprogress": "I gang",
     "stateoverdue": "Tiden er udløbet",
     "stateoverduedetails": "Skal afleveres senest {{$a}}",
-    "status": "Tillad gæsteadgang",
+    "status": "Status",
     "submitallandfinish": "--== Gem og aflever ==--",
     "summaryofattempt": "Oversigt over besvarelse",
     "summaryofattempts": "Oversigt over dine besvarelser",
diff --git a/www/addons/mod/quiz/lang/de.json b/www/addons/mod/quiz/lang/de.json
index f1b5f5dc5d8..5039eb5f17d 100644
--- a/www/addons/mod/quiz/lang/de.json
+++ b/www/addons/mod/quiz/lang/de.json
@@ -37,7 +37,7 @@
     "hasdatatosync": "Dieser Test enthält Offline-Daten, die synchonisiert werden müssen.",
     "marks": "Punkte",
     "mustbesubmittedby": "Dieser Versuch muss abgegeben werden vor {{$a}}.",
-    "noquestions": "Es wurden keine Fragen gefunden, die exportiert werden könnten. Stellen Sie sicher, dass Sie eine Kategorie ausgewählt haben, die auch Fragen enthält.",
+    "noquestions": "Es wurden noch keine Fragen eingetragen.",
     "noreviewattempt": "Sie dürfen diesen Versuch nicht prüfen.",
     "notyetgraded": "Bisher nicht bewertet",
     "opentoc": "Offenes Navigationsfeld",
@@ -67,7 +67,7 @@
     "stateinprogress": "In Bearbeitung",
     "stateoverdue": "Überfällig",
     "stateoverduedetails": "Muss abgegeben werden von {{$a}}",
-    "status": "Gastzugang erlauben",
+    "status": "Status",
     "submitallandfinish": "Abgabe",
     "summaryofattempt": "Zusammenfassung der Versuche",
     "summaryofattempts": "Zusammenfassung der vorherigen Versuche",
diff --git a/www/addons/mod/quiz/lang/el.json b/www/addons/mod/quiz/lang/el.json
index 8a79bcadbf7..2f0e390e7db 100644
--- a/www/addons/mod/quiz/lang/el.json
+++ b/www/addons/mod/quiz/lang/el.json
@@ -23,7 +23,7 @@
     "errorsaveattempt": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια αποθήκευσης των δεδομένων.",
     "errorsyncquiz": "Παρουσιάστηκε σφάλμα κατά το συγχρονισμό. Παρακαλώ προσπαθήστε ξανα.",
     "errorsyncquizblocked": "Αυτό το κουίζ δεν μπορεί να συγχρονιστεί τώρα εξαιτίας μιας εκτελούμενης διαδικασίας. Παρακαλώ δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, δοκιμάστε να επανεκκινήσετε την εφαρμογή.",
-    "feedback": "Ανατροφοδότηση",
+    "feedback": "Ανάδραση",
     "finishattemptdots": "Τελειώστε την προσπάθεια ...",
     "finishnotsynced": "Ολοκληρωμένο αλλά όχι συγχρονισμένο",
     "grade": "Βαθμός",
@@ -59,7 +59,7 @@
     "statefinished": "Ολοκληρωμένο",
     "statefinisheddetails": "Υποβλήθηκε {{$a}}",
     "stateoverduedetails": "Πρέπει να υποβληθεί μέχρι {{$a}}",
-    "status": "Επιτρέπεται η πρόσβαση στους επισκέπτες",
+    "status": "Κατάσταση",
     "submitallandfinish": "Υποβολή όλων και τέλος",
     "summaryofattempt": "Περίληψη προσπάθειας",
     "summaryofattempts": "Περίληψη προηγούμενων προσπαθειών",
diff --git a/www/addons/mod/quiz/lang/es-mx.json b/www/addons/mod/quiz/lang/es-mx.json
index bd49eed6816..c731842aa83 100644
--- a/www/addons/mod/quiz/lang/es-mx.json
+++ b/www/addons/mod/quiz/lang/es-mx.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Ocurrió un error al guardar los datos del intento.",
     "errorsyncquiz": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente.",
     "errorsyncquizblocked": "Este examen no puede sincronizarse ahorita mismo porque existe una operación en curso. Por favor inténtelo nuevamente después. Si el problema persiste, por favor reinicie la App.",
-    "feedback": "Retroalimentación",
+    "feedback": "Comentario de retroalimentación",
     "finishattemptdots": "Terminar intento ...",
     "finishnotsynced": "Terminado pero no sincronizado",
     "grade": "Calificación",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Este examen tiene datos fuera-de-línea para ser sincronizados.",
     "marks": "Puntos",
     "mustbesubmittedby": "Este intento debe ser enviado para {{$a}}.",
-    "noquestions": "No se encontraron preguntas que pudiesen ser exportadas. Asegúrese de que elija una categoría para exportar que si contenga preguntas.",
+    "noquestions": "Aún no se han agregado preguntas",
     "noreviewattempt": "Usted no tiene permiso para revisar este intento.",
     "notyetgraded": "Sin calificar aún",
     "opentoc": "Abrir ventanilla de navegación.",
@@ -67,7 +67,7 @@
     "stateinprogress": "En progreso",
     "stateoverdue": "Retrasado",
     "stateoverduedetails": "Debe ser enviado para {{$a}}",
-    "status": "Se permite el acceso de invitados",
+    "status": "Estatus",
     "submitallandfinish": "Enviar todo y terminar",
     "summaryofattempt": "Resumen del intento",
     "summaryofattempts": "Resumen de sus intentos previos",
diff --git a/www/addons/mod/quiz/lang/es.json b/www/addons/mod/quiz/lang/es.json
index bfc7906b0f8..7752e7926e8 100644
--- a/www/addons/mod/quiz/lang/es.json
+++ b/www/addons/mod/quiz/lang/es.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Ocurrió un error al guardar los datos del intento.",
     "errorsyncquiz": "Ocurrió un error al sincronizar. Por favor inténtelo nuevamente.",
     "errorsyncquizblocked": "Este cuestionario no puede sincronizarse ahora mismo porque existe una operación en curso. Por favor inténtelo nuevamente después. Si el problema persiste, por favor reinicie la app.",
-    "feedback": "Retroalimentación",
+    "feedback": "Comentario -",
     "finishattemptdots": "Terminar intento...",
     "finishnotsynced": "Finalizado pero no sincronizado.",
     "grade": "Calificación",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Este cuestionario tienen datos fuera de línea pendientes de ser sincronizados.",
     "marks": "Puntos",
     "mustbesubmittedby": "Este intento debe ser presentado por {{$a}}.",
-    "noquestions": "No se encontraron preguntas que pudiesen ser exportadas. Asegúrese de que ha seleccionado una categoría para exportar que contenga preguntas.",
+    "noquestions": "Aún no se han agregado preguntas",
     "noreviewattempt": "Usted no tiene permiso para revisar este intento.",
     "notyetgraded": "Sin calificar aún",
     "opentoc": "Abrir menú de navegación.",
@@ -67,7 +67,7 @@
     "stateinprogress": "En curso",
     "stateoverdue": "Atrasado",
     "stateoverduedetails": "Debe ser presentado por {{$a}}",
-    "status": "Se permite el acceso de invitados",
+    "status": "Estatus",
     "submitallandfinish": "Enviar todo y terminar",
     "summaryofattempt": "Resumen del intento",
     "summaryofattempts": "Resumen de sus intentos previos",
diff --git a/www/addons/mod/quiz/lang/eu.json b/www/addons/mod/quiz/lang/eu.json
index 600230508ed..a09d62d8049 100644
--- a/www/addons/mod/quiz/lang/eu.json
+++ b/www/addons/mod/quiz/lang/eu.json
@@ -29,15 +29,15 @@
     "feedback": "Feedbacka",
     "finishattemptdots": "Amaitu saiakera...",
     "finishnotsynced": "Bukatua baina sinkronizatu gabe.",
-    "grade": "Kalifikazioa",
+    "grade": "Nota",
     "gradeaverage": "Batez besteko kalifikazioa",
     "gradehighest": "Notarik altuena",
     "grademethod": "Kalifikazio-metodoa",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Galdetegi honek sinkronizatu beharreko lineaz kanpoko datuak ditu.",
-    "marks": "Puntuazioak",
+    "marks": "Puntuak",
     "mustbesubmittedby": "Saiakera hau {{$a}}-(e)k bidali behar du.",
-    "noquestions": "Ez da esporta daitekeen galderarik aurkitu. Ziurta ezazu aukeratu duzun kategoriak galderak badituela.",
+    "noquestions": "Ez da galderarik gehitu oraindik",
     "noreviewattempt": "Ez duzu saiakera hau berrikusteko baimenik.",
     "notyetgraded": "Ez da oraindik kalifikatu",
     "opentoc": "Ireki nabigazioa gainean.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Ari da",
     "stateoverdue": "Atzeratutakoak",
     "stateoverduedetails": "{{$a}}-(e)k bidali behar du.",
-    "status": "Bisitarien sarbidea baimendu",
+    "status": "Egoera",
     "submitallandfinish": "Bidali dena eta bukatu",
     "summaryofattempt": "Saiakeren laburpena",
     "summaryofattempts": "Orain arteko zure saiakeren laburpena",
diff --git a/www/addons/mod/quiz/lang/fa.json b/www/addons/mod/quiz/lang/fa.json
index deb11e1a177..32834035097 100644
--- a/www/addons/mod/quiz/lang/fa.json
+++ b/www/addons/mod/quiz/lang/fa.json
@@ -4,7 +4,7 @@
     "attemptnumber": "تلاش",
     "attemptquiznow": "شرکت در آزمون",
     "attemptstate": "وضعیت",
-    "comment": "دیدگاه",
+    "comment": "توضیح",
     "completedon": "پایان",
     "confirmclose": "شما در آستانهٔ اتمام شرکت خود در آزمون هستید. پس ا ز اتمام شرکت دیگر نمی‌توانید پاسخ‌های خود را تغییر دهید.",
     "confirmleavequizonerror": "در حین ذخیرهٔ پاسخ‌ها خطایی رخ داد. آیا مطمئن هستید که می‌خواهید از آزمون خارج شوید؟",
@@ -17,7 +17,7 @@
     "gradehighest": "بیشترین نمره",
     "grademethod": "روش نمره دادن",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} از {{$a.quizgrade}}.",
-    "marks": "نمره",
+    "marks": "جمع نمره",
     "mustbesubmittedby": "تا پیش از {{$a}} باید پاسخ‌های خود را ثبت کنید.",
     "noquestions": "هنوز سؤالی اضافه نشده است",
     "outof": "{{$a.grade}} از {{$a.maxgrade}}",
@@ -42,7 +42,7 @@
     "statefinisheddetails": "ثبت شده در: {{$a}}",
     "stateinprogress": "در جریان",
     "stateoverdue": "از موعد گذشته",
-    "status": "اجازهٔ ورود به عنوان مهمان",
+    "status": "وضعیت",
     "submitallandfinish": "ثبت همهٔ پاسخ‌ها و اتمام آزمون",
     "summaryofattempt": "وضعیت شرکت در آزمون",
     "summaryofattempts": "نتایج خلاصهٔ دفعه‌های قبلی شرکت شما در آزمون",
diff --git a/www/addons/mod/quiz/lang/fr.json b/www/addons/mod/quiz/lang/fr.json
index 0412f724288..5877d4c76d2 100644
--- a/www/addons/mod/quiz/lang/fr.json
+++ b/www/addons/mod/quiz/lang/fr.json
@@ -35,9 +35,9 @@
     "grademethod": "Méthode d'évaluation",
     "gradesofar": "{{$a.method}} : {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Ce test a des données à synchroniser.",
-    "marks": "Notes",
+    "marks": "Points",
     "mustbesubmittedby": "Cette tentative doit être envoyée avant {{$a}}.",
-    "noquestions": "Aucune question à exporter. Assurez-vous que vous avez sélectionné pour l'exportation une catégorie contenant des questions.",
+    "noquestions": "Aucune question n'a été encore ajoutée",
     "noreviewattempt": "Vous n'êtes pas autorisé à relire cette tentative.",
     "notyetgraded": "Pas encore évalué",
     "opentoc": "Ouvrir la navigation",
@@ -67,7 +67,7 @@
     "stateinprogress": "En cours",
     "stateoverdue": "En retard",
     "stateoverduedetails": "Doit être remis par {{$a}}",
-    "status": "Permettre l'accès anonyme",
+    "status": "État",
     "submitallandfinish": "Tout envoyer et terminer",
     "summaryofattempt": "Résumé de la tentative",
     "summaryofattempts": "Résumé de vos tentatives précédentes",
diff --git a/www/addons/mod/quiz/lang/he.json b/www/addons/mod/quiz/lang/he.json
index e45e53000cb..ca948e5453b 100644
--- a/www/addons/mod/quiz/lang/he.json
+++ b/www/addons/mod/quiz/lang/he.json
@@ -11,16 +11,16 @@
     "confirmstartheader": "בוחן מתוזמן",
     "continueattemptquiz": "המשך נסיון המענה האחרון שלך",
     "continuepreview": "המשך בצפיה המוקדמת האחרונה",
-    "feedback": "משוב לבחירה בתשובה זו",
+    "feedback": "משוב",
     "finishattemptdots": "סיום נסיון מענה...",
-    "grade": "ניקוד בפעילות",
+    "grade": "ציון",
     "gradeaverage": "ציון ממוצע",
     "gradehighest": "הציון הגבוה ביותר",
     "grademethod": "שיטת מתן ציונים",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "marks": "נקודות",
     "mustbesubmittedby": "יש צורך להגיש את נסיון מענה זה",
-    "noquestions": "לא נמצאו שאלות ליצוא. יש לוודא כי נבחרה הקטגוריה ובה תוכן השאלות לבחירה.",
+    "noquestions": "בשלב זה, יש להוסיף שאלות לבוחן על מנת שאפשר יהיה להציג אותו בפני התלמידים",
     "noreviewattempt": "אין הרשאה לצפות בנסיון מענה זה",
     "notyetgraded": "לא ניתן ציון עדיין",
     "outof": "{{$a.grade}} מתוך ציון מירבי של {{$a.maxgrade}}",
@@ -49,7 +49,7 @@
     "stateinprogress": "בתהליך",
     "stateoverdue": "באיחור",
     "stateoverduedetails": "מוכרח להיות מוגש עד {{$a}}",
-    "status": "הקורס זמין לאורחים",
+    "status": "מצב",
     "submitallandfinish": "הגשה סופית וסיום ניסיון המענה (בוחן)",
     "summaryofattempt": "סיכום הנסיון",
     "summaryofattempts": "סיכום ניסיונות המענה הקודמים שלך",
diff --git a/www/addons/mod/quiz/lang/hu.json b/www/addons/mod/quiz/lang/hu.json
index dc398af2717..7672fda34fe 100644
--- a/www/addons/mod/quiz/lang/hu.json
+++ b/www/addons/mod/quiz/lang/hu.json
@@ -19,9 +19,9 @@
     "gradehighest": "Legmagasabb pont",
     "grademethod": "Pontozási módszer",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Osztályzatok",
+    "marks": "Pontok",
     "mustbesubmittedby": "A próbálkozást {{$a}} időpontig le kell adni.",
-    "noquestions": "Nincs exportálható kérdés. Ellenőrizze, hogy az exportálandó kategória tartalmaz-e kérdéseket.",
+    "noquestions": "Nincs még hozzáadva kérdés",
     "noreviewattempt": "Ezt a próbálkozást nem ellenőrizheti.",
     "notyetgraded": "Még nincs lepontozva",
     "outof": "{{$a.grade}} a maximum {{$a.maxgrade}} közül",
@@ -50,7 +50,7 @@
     "stateinprogress": "Folyamatban",
     "stateoverdue": "Lejárt",
     "stateoverduedetails": "Leadanadó eddig: {{$a}}",
-    "status": "Vendégkénti belépés engedélyezése",
+    "status": "Állapot",
     "submitallandfinish": "Az összes leadása és befejezés",
     "summaryofattempt": "Próbálkozások összegzése",
     "summaryofattempts": "Korábbi próbálkozásainak összegzése",
diff --git a/www/addons/mod/quiz/lang/it.json b/www/addons/mod/quiz/lang/it.json
index c077b20d0a9..95eff85b569 100644
--- a/www/addons/mod/quiz/lang/it.json
+++ b/www/addons/mod/quiz/lang/it.json
@@ -29,7 +29,7 @@
     "hasdatatosync": "Il quiz ha dati offline da sincronizzare.",
     "marks": "Punteggio",
     "mustbesubmittedby": "Questo tentativo deve essere inviato entro {{$a}}.",
-    "noquestions": "Non sono state trovate domande da esportare. Accertati di aver selezionato per l'esportazione una categoria che contenga domande.",
+    "noquestions": "Ancora non sono state aggiunte domande",
     "noreviewattempt": "Non hai il privilegio di rivedere questo tentativo.",
     "notyetgraded": "Non ancora valutato",
     "outof": "{{$a.grade}} su un massimo di {{$a.maxgrade}}",
@@ -58,7 +58,7 @@
     "stateinprogress": "In svolgimento",
     "stateoverdue": "Fuori tempo massimo",
     "stateoverduedetails": "Deve essere inviato da {{$a}}",
-    "status": "Consenti l'accesso agli ospiti",
+    "status": "Stato",
     "submitallandfinish": "Invia tutto e termina",
     "summaryofattempt": "Riepilogo del tentativo",
     "summaryofattempts": "Riepilogo dei tuoi tentativi precedenti ",
diff --git a/www/addons/mod/quiz/lang/ja.json b/www/addons/mod/quiz/lang/ja.json
index 28d69ebaccf..f7b4d3d133f 100644
--- a/www/addons/mod/quiz/lang/ja.json
+++ b/www/addons/mod/quiz/lang/ja.json
@@ -14,14 +14,14 @@
     "continuepreview": "前回受験のプレビューを続ける",
     "feedback": "フィードバック",
     "finishattemptdots": "受験を終了する ...",
-    "grade": "評定",
+    "grade": "評点",
     "gradeaverage": "平均評点",
     "gradehighest": "最高評点",
     "grademethod": "評定方法",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
-    "marks": "評点",
+    "marks": "得点",
     "mustbesubmittedby": "この受験は {{$a}} までに送信される必要があります。",
-    "noquestions": "エクスポートできる問題が見つかりませんでした。あなたがエクスポートする問題が含まれるカテゴリを選択したか確認してください。",
+    "noquestions": "まだ問題が追加されていません。",
     "noreviewattempt": "あなたはこの受験のレビューを許可されていません。",
     "notyetgraded": "未評定",
     "outof": "{{$a.grade}} / {{$a.maxgrade}}",
@@ -50,7 +50,7 @@
     "stateinprogress": "進行中",
     "stateoverdue": "期限切れ",
     "stateoverduedetails": "送信期限: {{$a}}",
-    "status": "ゲストアクセスを許可する",
+    "status": "ステータス",
     "submitallandfinish": "すべてを送信して終了する",
     "summaryofattempt": "受験概要",
     "summaryofattempts": "あなたの前回の受験概要",
diff --git a/www/addons/mod/quiz/lang/lt.json b/www/addons/mod/quiz/lang/lt.json
index a9b84de258e..3d18000f600 100644
--- a/www/addons/mod/quiz/lang/lt.json
+++ b/www/addons/mod/quiz/lang/lt.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "Klaida saugant duomenis.",
     "errorsyncquiz": "Klaida sinchronizuojant. Pamėginkite vėliau.",
     "errorsyncquizblocked": "Testo negalima sinchronizuoti dėl vykstančių procesų. Mėginkite vėliau. Jei nepavyks, perkraukite programėlę.",
-    "feedback": "Grįžtamasis ryšys",
+    "feedback": "Atsiliepimas",
     "finishattemptdots": "Baigti bandymą...",
     "finishnotsynced": "Baigta, bet nesinchronizuota",
     "grade": "Įvertis",
@@ -37,7 +37,7 @@
     "hasdatatosync": "Neprijungti duomenys teste turi būti sinchronizuojami.",
     "marks": "Balai",
     "mustbesubmittedby": "Atsakymą turi pateikti {{$a}}.",
-    "noquestions": "Nerasta klausimų, kuriuos galima eksportuoti. Įsitikinkite, kad eksportavimui pasirinkote kategoriją turinčią klausimų.",
+    "noquestions": "Dar neįtraukta jokių klausimų",
     "noreviewattempt": "Jūs negalite peržiūrėti šio bandymo.",
     "notyetgraded": "Dar neįvertinta",
     "opentoc": "Atidaryti naršymo skirtuką.",
@@ -66,7 +66,7 @@
     "stateinprogress": "Nebaigta",
     "stateoverdue": "Pavėluotas",
     "stateoverduedetails": "Turi būti pateiktas {{$a}}",
-    "status": "Leisti svečio prieigą",
+    "status": "Būsena",
     "submitallandfinish": "Pateikti viską ir baigti",
     "summaryofattempt": "Bandymo suvestinė",
     "summaryofattempts": "Ankstesnių bandymų suvestinė",
diff --git a/www/addons/mod/quiz/lang/nl.json b/www/addons/mod/quiz/lang/nl.json
index da17aac110f..34e77ec88d4 100644
--- a/www/addons/mod/quiz/lang/nl.json
+++ b/www/addons/mod/quiz/lang/nl.json
@@ -5,7 +5,7 @@
     "attemptquiznow": "Start de test nu",
     "attemptstate": "Status",
     "cannotsubmitquizdueto": "De test can niet ingestuurd worden om volgende redenen:",
-    "comment": "Opmerking",
+    "comment": "Commentaar",
     "completedon": "Voltooid op",
     "confirmclose": "Je gaat deze poging afsluiten. Eens afgesloten kun je je antwoorden voor deze poging niet meer wijzigen.",
     "confirmcontinueoffline": "Deze poging is niet meer gesynchroniseerd sinds {{$a}}. Als je verder gewerkt hebt aan deze poging met een ander toestel na dit moment, dan kun je data verliezen.",
@@ -29,15 +29,15 @@
     "feedback": "Feedback",
     "finishattemptdots": "Beëindig poging...",
     "finishnotsynced": "Klaar maar niet gesynchroniseerd",
-    "grade": "Beoordeling",
+    "grade": "Cijfer",
     "gradeaverage": "Gemiddelde cijfer",
     "gradehighest": "Hoogste cijfer",
     "grademethod": "Beoordelingsmethode",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
     "hasdatatosync": "De test heeft offline data die gesynchroniseerd moet worden.",
-    "marks": "Cijfers",
+    "marks": "Punten",
     "mustbesubmittedby": "Deze poging moet ingestuurd worden door {{$a}}.",
-    "noquestions": "Er zijn geen vragen gevonden die geëxporteerd kunnen worden. Zorg ervoor dat en een categorie geselecteerd die vragen bevat om te exporteren.",
+    "noquestions": "Er zijn nog geen vragen toegevoegd",
     "noreviewattempt": "Je mag deze poging niet nakijken",
     "notyetgraded": "Nog niet beoordeeld",
     "opentoc": "Open navigatie.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Bezig",
     "stateoverdue": "Te laat",
     "stateoverduedetails": "Moet ingestuurd worden door {{$a}}",
-    "status": "Gasttoegang toestaan",
+    "status": "Status",
     "submitallandfinish": "Bewaar alles en beëindig test",
     "summaryofattempt": "Samenvatting van poging",
     "summaryofattempts": "Samenvatting van al je pogingen",
diff --git a/www/addons/mod/quiz/lang/pl.json b/www/addons/mod/quiz/lang/pl.json
index 8ca44ba3694..14072e4ed74 100644
--- a/www/addons/mod/quiz/lang/pl.json
+++ b/www/addons/mod/quiz/lang/pl.json
@@ -21,7 +21,7 @@
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
     "marks": "Punkty",
     "mustbesubmittedby": "Próba musi być wykonana przez {{$a}}.",
-    "noquestions": "Brak pytań do eksportowania. Upewnij się, że wybrano kategorię, który zawiera pytania.",
+    "noquestions": "Nie dodano jeszcze żadnego pytania",
     "noreviewattempt": "Nie masz uprawnień do dokonania przeglądu tej próby.",
     "notyetgraded": "Jeszcze nie ocenione",
     "outof": "{{$a.grade}} z możliwych do uzyskania {{$a.maxgrade}}",
@@ -49,7 +49,7 @@
     "stateinprogress": "W toku",
     "stateoverdue": "Zaległe",
     "stateoverduedetails": "Musi być przesłane przez {{$a}}",
-    "status": "Zezwól na dostęp gości",
+    "status": "Stan",
     "submitallandfinish": "Zatwierdź wszystkie i zakończ",
     "summaryofattempt": "Podsumowanie próby",
     "summaryofattempts": "Podsumowanie twoich poprzednich podejść",
diff --git a/www/addons/mod/quiz/lang/pt-br.json b/www/addons/mod/quiz/lang/pt-br.json
index 006a0a7827a..8f0d7f3ecb3 100644
--- a/www/addons/mod/quiz/lang/pt-br.json
+++ b/www/addons/mod/quiz/lang/pt-br.json
@@ -26,18 +26,18 @@
     "errorsaveattempt": "Aconteceu um erro ao salvar os dados da tentativa.",
     "errorsyncquiz": "Aconteceu um erro enquanto sincronizava. Por favor tente novamente.",
     "errorsyncquizblocked": "Esse questionário não pode ser sincronizado nesse exato momento por causa de um processo em andamento.Por favor tente mais tarde. Se o problema persistir, tente reiniciar o aplicativo.",
-    "feedback": "Feedback",
+    "feedback": "Comentários",
     "finishattemptdots": "Tentativas encerradas",
     "finishnotsynced": "Finalizado, mas não sincronizado",
-    "grade": "Nota",
+    "grade": "Avaliar",
     "gradeaverage": "Nota média",
     "gradehighest": "Nota mais alta",
     "grademethod": "Método de avaliação",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Esse questionário tem dados offline que precisam ser sincronizados.",
-    "marks": "Pontos",
+    "marks": "Notas",
     "mustbesubmittedby": "Esta tentativa precisa ser enviada até {{$a}}.",
-    "noquestions": "Nenhuma questão encontrada pode ser exportada. Certifique-se de que você selecionou uma categoria que contem questões para exportar.",
+    "noquestions": "Ainda não foi inserida nenhuma pergunta",
     "noreviewattempt": "Você não tem permissão para revisar esta tentativa.",
     "notyetgraded": "Ainda não avaliado",
     "opentoc": "Abrir dicas de navegação.",
@@ -67,7 +67,7 @@
     "stateinprogress": "Em progresso",
     "stateoverdue": "Vencidas",
     "stateoverduedetails": "Precisam ser enviadas até {{$a}}",
-    "status": "Permitir o acesso de visitantes",
+    "status": "Status",
     "submitallandfinish": "Enviar tudo e terminar",
     "summaryofattempt": "Resumo de tentativas",
     "summaryofattempts": "Resumo das suas tentativas anteriores",
diff --git a/www/addons/mod/quiz/lang/pt.json b/www/addons/mod/quiz/lang/pt.json
index 5a07d22677e..6c553803f34 100644
--- a/www/addons/mod/quiz/lang/pt.json
+++ b/www/addons/mod/quiz/lang/pt.json
@@ -37,7 +37,7 @@
     "hasdatatosync": "Este teste tem dados offline que precisam de ser sincronizados.",
     "marks": "Nota",
     "mustbesubmittedby": "Esta tentativa deve ser submetida até {{$a}}.",
-    "noquestions": "Não foram encontradas perguntas para exportação. Certifique-se que selecionou uma categoria com perguntas.",
+    "noquestions": "Ainda não foi adicionada nenhuma pergunta",
     "noreviewattempt": "Não pode rever esta tentativa",
     "notyetgraded": "Por avaliar",
     "opentoc": "Abrir navegação",
@@ -67,7 +67,7 @@
     "stateinprogress": "Em progresso",
     "stateoverdue": "Expiradas",
     "stateoverduedetails": "Deve ser submetido até {{$a}}",
-    "status": "Permitir o acesso de visitantes",
+    "status": "Estado",
     "submitallandfinish": "Submeter tudo e terminar",
     "summaryofattempt": "Síntese da tentativa",
     "summaryofattempts": "Síntese das tentativas anteriores",
diff --git a/www/addons/mod/quiz/lang/ro.json b/www/addons/mod/quiz/lang/ro.json
index 4217fceec67..d45b35aa390 100644
--- a/www/addons/mod/quiz/lang/ro.json
+++ b/www/addons/mod/quiz/lang/ro.json
@@ -9,13 +9,13 @@
     "continueattemptquiz": "Continuă ultima încercare",
     "continuepreview": "Continuă ultima vizualizare",
     "feedback": "Feedback",
-    "grade": "Notă",
+    "grade": "Notează",
     "gradeaverage": "Nota medie",
     "gradehighest": "Nota maximă",
     "grademethod": "Metoda de notare",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Note",
-    "noquestions": "Nu s-au găsit întrebări care ar putea fi exportate. Asigurați-vă că ați selectat o categorie pentru export  care conține întrebări.",
+    "marks": "Puncte",
+    "noquestions": "Nici o întrebare nu a fost adăugată încă",
     "outof": "{{$a.grade}} din maxim {{$a.maxgrade}} posibil",
     "outofpercent": "{{$a.grade}} din maxim {{$a.maxgrade}} ({{$a.percent}}%) posibil",
     "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
@@ -29,7 +29,7 @@
     "showall": "Afişează toate întrebările pe o singură pagină",
     "startedon": "Început la",
     "statefinished": "Terminat",
-    "status": "Permite accesul vizitatorilor",
+    "status": "Status",
     "submitallandfinish": "Trimite tot şi termină",
     "summaryofattempts": "Rezumatul încercărilor anterioare efectuate de dumneavoastră",
     "timeleft": "Timp rămas",
diff --git a/www/addons/mod/quiz/lang/ru.json b/www/addons/mod/quiz/lang/ru.json
index 9933d98f310..f6e5e3fee00 100644
--- a/www/addons/mod/quiz/lang/ru.json
+++ b/www/addons/mod/quiz/lang/ru.json
@@ -22,7 +22,7 @@
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "marks": "Баллы",
     "mustbesubmittedby": "Эта попытка должна быть отправлена до {{$a}}.",
-    "noquestions": "Не найдены вопросы, которые могут быть экспортированы. Убедитесь, что для экспорта Вы выбрали категорию, которая содержит вопросы.",
+    "noquestions": "Пока не добавлено ни одного вопроса",
     "noreviewattempt": "Вам не разрешен просмотр этой попытки.",
     "notyetgraded": "Еще не оценено",
     "outof": "{{$a.grade}} из {{$a.maxgrade}}",
@@ -51,7 +51,7 @@
     "stateinprogress": "В процессе",
     "stateoverdue": "Просроченные",
     "stateoverduedetails": "Должны быть представлены {{$a}}",
-    "status": "Разрешить гостевой доступ",
+    "status": "Состояние",
     "submitallandfinish": "Отправить всё и завершить тест",
     "summaryofattempt": "Результат попытки",
     "summaryofattempts": "Результаты ваших предыдущих попыток",
diff --git a/www/addons/mod/quiz/lang/sv.json b/www/addons/mod/quiz/lang/sv.json
index 5655a7b195d..cb771aab8be 100644
--- a/www/addons/mod/quiz/lang/sv.json
+++ b/www/addons/mod/quiz/lang/sv.json
@@ -12,14 +12,14 @@
     "continuepreview": "Fortsätt med den senaste förhandsgranskningen",
     "feedback": "Återkoppling",
     "finishattemptdots": "Avsluta försök",
-    "grade": "Betyg",
+    "grade": "Betyg/omdöme",
     "gradeaverage": "Medelbetyg",
     "gradehighest": "Högsta betyg",
     "grademethod": "Betygsättningsmetod",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Rätt",
+    "marks": "Poäng",
     "mustbesubmittedby": "Detta försöket måste skickas in av {{$a}}.",
-    "noquestions": "Inga frågor hittades som kunde exporteras. Se till att du har valt en kategori att exportera som innehåller frågor.",
+    "noquestions": "Inga frågor har ännu lagts till",
     "noreviewattempt": "Du har inte rätt att granska det här försöket. ",
     "notyetgraded": "Ännu inte betygssatta",
     "outof": "av ett maximum på",
@@ -48,7 +48,7 @@
     "stateinprogress": "Pågående",
     "stateoverdue": "Tiden har gått ut",
     "stateoverduedetails": "Måste skickas in av {{$a}}",
-    "status": "Tillåt gäster",
+    "status": "Status",
     "submitallandfinish": "Skicka in allt och avsluta",
     "summaryofattempt": "Sammanfattning av försök",
     "summaryofattempts": "Sammanfattning av dina tidigare försök",
diff --git a/www/addons/mod/quiz/lang/tr.json b/www/addons/mod/quiz/lang/tr.json
index 34957ae844a..1c158b34a63 100644
--- a/www/addons/mod/quiz/lang/tr.json
+++ b/www/addons/mod/quiz/lang/tr.json
@@ -14,14 +14,14 @@
     "continuepreview": "Son gözden geçirmeden itibaren devam et",
     "feedback": "Geribildirim",
     "finishattemptdots": "Uyuluma bitiyor...",
-    "grade": "Başarı notu",
+    "grade": "Not",
     "gradeaverage": "Not ortalaması",
     "gradehighest": "En yüksek not",
     "grademethod": "Notlandırma yöntemi",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "marks": "Notlar",
+    "marks": "Puanlar",
     "mustbesubmittedby": "Bu uygulama {{$a}} tarafından gönderilmelidir.",
-    "noquestions": "ihraç edilecek soru bulunamadı. ihraç etmek için bir kategori seçtiğinize ve kategorinizin sorular içerdiğine emin olun.",
+    "noquestions": "Henüz bir soru eklenmemiş",
     "noreviewattempt": "Bu uygulamayı gözden geçirmek için izniniz yok.",
     "notyetgraded": "Henüz puanlanmadı",
     "outof": "{{$a.maxgrade}} üzerinden {{$a.grade}}",
@@ -50,7 +50,7 @@
     "stateinprogress": "Devam etmekte",
     "stateoverdue": "Süresi dolmuş",
     "stateoverduedetails": "{{$a}} tarafından teslim edilmelidir",
-    "status": "Konuk erişimine izin ver",
+    "status": "Durum",
     "submitallandfinish": "Tümünü gönder ve bitir",
     "summaryofattempt": "Uygulama özeti",
     "summaryofattempts": "Önceki uygulamalarınızın özeti",
diff --git a/www/addons/mod/quiz/lang/uk.json b/www/addons/mod/quiz/lang/uk.json
index 52d19fb68a3..3c6c7b28f67 100644
--- a/www/addons/mod/quiz/lang/uk.json
+++ b/www/addons/mod/quiz/lang/uk.json
@@ -26,7 +26,7 @@
     "errorsaveattempt": "При збереженні даних спроби сталася помилка.",
     "errorsyncquiz": "Під час синхронізації сталася помилка. Будь ласка спробуйте ще раз.",
     "errorsyncquizblocked": "Цей тест не може бути синхронізований прямо зараз через триваючий процес. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
-    "feedback": "Коментар",
+    "feedback": "Відгук",
     "finishattemptdots": "Завершити спробу...",
     "finishnotsynced": "Готово, але не синхронізовано",
     "grade": "Оцінка",
@@ -35,9 +35,9 @@
     "grademethod": "Метод оцінювання",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Цей тест має автономні дані будуть синхронізовані.",
-    "marks": "Оцінки",
+    "marks": "Балів",
     "mustbesubmittedby": "Ця спроба має бути відправлена до {{$a}}.",
-    "noquestions": "Не знайдено жодного питання для експорту. Переконайтеся, що ви вибрали категорію для експорту, яка містить питання.",
+    "noquestions": "Жодного питання не було додано",
     "noreviewattempt": "Вам не дозволено переглядати цю спробу.",
     "notyetgraded": "Ще не оцінено",
     "opentoc": "Відкрити навігаційне повідомлення.",
@@ -67,7 +67,7 @@
     "stateinprogress": "В процесі",
     "stateoverdue": "Прострочено",
     "stateoverduedetails": "Повинно бути надіслано {{$a}}",
-    "status": "Дозволити доступ для гостя",
+    "status": "Статус",
     "submitallandfinish": "Відправити все та завершити",
     "summaryofattempt": "Результати спроби",
     "summaryofattempts": "Результати ваших попередніх спроб",
diff --git a/www/addons/mod/quiz/lang/zh-cn.json b/www/addons/mod/quiz/lang/zh-cn.json
index f990b53b9c5..1963fef5e87 100644
--- a/www/addons/mod/quiz/lang/zh-cn.json
+++ b/www/addons/mod/quiz/lang/zh-cn.json
@@ -4,7 +4,7 @@
     "attemptnumber": "试卷",
     "attemptquiznow": "现在参加测验",
     "attemptstate": "状态",
-    "comment": "评语",
+    "comment": "评论",
     "completedon": "完成于",
     "confirmclose": "一旦提交，您将不能再修改在这次答题的答案。",
     "confirmstart": "这一测验有 {{$a}} 的时间限制。时间将从你开始做测验时倒数计时，而你必须在时限到之前提交答案。你确定你现在就要开始作答？",
@@ -19,9 +19,9 @@
     "gradehighest": "最高分",
     "grademethod": "评分办法",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}",
-    "marks": "得分",
+    "marks": "分数",
     "mustbesubmittedby": "此试卷必须在 {{$a}} 以前提交。",
-    "noquestions": "未找到可导出的题。请确认您要导出的类别包含题目。",
+    "noquestions": "尚未添加试题",
     "noreviewattempt": "您无权回顾此试卷。",
     "notyetgraded": "仍未评分",
     "outof": "{{$a.grade}}/满分{{$a.maxgrade}}",
@@ -50,7 +50,7 @@
     "stateinprogress": "进行中",
     "stateoverdue": "逾期",
     "stateoverduedetails": "必须于 {{$a}} 前提交",
-    "status": "允许访客访问",
+    "status": "状态",
     "submitallandfinish": "提交所有答案并结束",
     "summaryofattempt": "答题情况报告",
     "summaryofattempts": "您上次答题的概要",
diff --git a/www/addons/mod/quiz/lang/zh-tw.json b/www/addons/mod/quiz/lang/zh-tw.json
index 1378a8f72bf..7447f9d66dd 100644
--- a/www/addons/mod/quiz/lang/zh-tw.json
+++ b/www/addons/mod/quiz/lang/zh-tw.json
@@ -29,15 +29,15 @@
     "feedback": "回饋",
     "finishattemptdots": "完成作答....",
     "finishnotsynced": "已完成但未同步",
-    "grade": "成績",
+    "grade": "分數",
     "gradeaverage": "平均分數",
     "gradehighest": "最高分數",
     "grademethod": "評分方式",
     "gradesofar": "{{$a.method}}：{{$a.mygrade}} / {{$a.quizgrade}}。",
     "hasdatatosync": "此測驗有離線資料要做同步",
-    "marks": "所有得分",
+    "marks": "得分",
     "mustbesubmittedby": "這作答應該由{{$a}}提交",
-    "noquestions": "沒有找到可以被匯出的試題。要確定你有選出一個有包含試題的類別來匯出。",
+    "noquestions": "尚未加入題目",
     "noreviewattempt": "你不被允許重新檢視作答結果",
     "notyetgraded": "還沒被計分過",
     "opentoc": "打開導航彈出視窗.",
@@ -67,7 +67,7 @@
     "stateinprogress": "進行中",
     "stateoverdue": "過期",
     "stateoverduedetails": "必須在{{$a}}之前提交",
-    "status": "允許訪客瀏覽",
+    "status": "狀態",
     "submitallandfinish": "全部送出並結束",
     "summaryofattempt": "作答紀錄摘要",
     "summaryofattempts": "你的先前作答記錄摘要",
diff --git a/www/addons/mod/scorm/lang/ar.json b/www/addons/mod/scorm/lang/ar.json
index 14448e4ae61..2c6c03156a5 100644
--- a/www/addons/mod/scorm/lang/ar.json
+++ b/www/addons/mod/scorm/lang/ar.json
@@ -11,17 +11,17 @@
     "errordownloadscorm": "خطأ عن تنزيل الحزمة التعليمية: \"{{name}}\"",
     "failed": "فشل",
     "firstattempt": "المحاولة الأولى",
-    "gradeaverage": "متوسط الدرجة",
+    "gradeaverage": "المتوسط",
     "gradeforattempt": "درجة للمحاولة",
-    "gradehighest": "أعلى درجة",
-    "grademethod": "أسلوب التقييم",
+    "gradehighest": "الدرجة العليا",
+    "grademethod": "طريقة رصد الدرجات",
     "gradereported": "الدرجة المعلنة",
     "gradescoes": "كائنات تعلّم",
     "gradesum": "الدرجة الاجمالية",
     "highestattempt": "أعلى محاولة",
     "incomplete": "غير مكتمل",
     "lastattempt": "المحاولاة الأخيرة",
-    "mode": "وضع",
+    "mode": "نمط",
     "newattempt": "ابداء محاولة جديدة",
     "noattemptsallowed": "عدد المحاولات المسموح بها",
     "noattemptsmade": "عدد المحاولات التي قمت بها",
@@ -30,5 +30,5 @@
     "organizations": "تنظيمات",
     "passed": "نجح",
     "reviewmode": "وضع المراجعة",
-    "suspended": "حساب معلّق"
+    "suspended": "معلّق"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ca.json b/www/addons/mod/scorm/lang/ca.json
index e62b9409f9c..196c9ad1c08 100644
--- a/www/addons/mod/scorm/lang/ca.json
+++ b/www/addons/mod/scorm/lang/ca.json
@@ -32,7 +32,7 @@
     "highestattempt": "Intent més alt",
     "incomplete": "Incomplet",
     "lastattempt": "Darrer intent completat",
-    "mode": "Moda",
+    "mode": "Mode",
     "newattempt": "Comença un nou intent",
     "noattemptsallowed": "Nombre d'intents permesos",
     "noattemptsmade": "Nombre d'intents realitzats",
@@ -45,7 +45,7 @@
     "reviewmode": "Mode de revisió",
     "scormstatusnotdownloaded": "Aquest SCORM no s'ha descarregat. Ho farà automàticament quan l'obriu.",
     "scormstatusoutdated": "Aquest SCORM s'ha modificat des de la darrera descàrrega. Es descarregarà automàticament quan l'obriu.",
-    "suspended": "Compte invalidat",
+    "suspended": "Suspès",
     "warningofflinedatadeleted": "Algunes dades fora de línia de l'intent {{number}} s'han eliminat perquè no poden crear-se al nou intent.",
     "warningsynconlineincomplete": "Alguns intents no poden sincronitzar-se amb el lloc perquè el darrer intent en línia no ha finalitzat. Acabeu l'intent primer."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/cs.json b/www/addons/mod/scorm/lang/cs.json
index 4856bdd1546..533ab1989ac 100644
--- a/www/addons/mod/scorm/lang/cs.json
+++ b/www/addons/mod/scorm/lang/cs.json
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Dosáhli jste nejvyššího možného počtu pokusů.",
     "failed": "Nedokončeno úspěšně",
     "firstattempt": "První pokus",
-    "gradeaverage": "Průměrná známka",
+    "gradeaverage": "Průměrný bodový zisk",
     "gradeforattempt": "Hodnocení pokusu",
-    "gradehighest": "Nejvyšší známka",
+    "gradehighest": "Nejvyšší bodový zisk",
     "grademethod": "Metoda známkování",
     "gradereported": "Zobrazené hodnocení",
     "gradescoes": "Učební objekty",
@@ -32,7 +32,7 @@
     "highestattempt": "Nejlepší pokus",
     "incomplete": "Nedokončeno",
     "lastattempt": "Poslední pokus",
-    "mode": "Modus",
+    "mode": "Režim",
     "newattempt": "Začít nový pokus",
     "noattemptsallowed": "Počet povolených pokusů",
     "noattemptsmade": "Počet pokusů, které jste vyčerpali",
@@ -45,7 +45,7 @@
     "reviewmode": "Režim opakovaného náhledu",
     "scormstatusnotdownloaded": "Tento SCORM není stažen. Bude automaticky stažen, když jej otevřete.",
     "scormstatusoutdated": "Tento SCORM byl od posledního stažení změněn. Bude automaticky stažen, když jej otevřete.",
-    "suspended": "Pozastavený účet",
+    "suspended": "Pozastaveno",
     "warningofflinedatadeleted": "Některá offline data pokusu {{number}} byla zrušena, protože by nebylo možné vytvořit na nový pokus",
     "warningsynconlineincomplete": "Některé pokusy nemohou být synchronizovány s webem, protože poslední online pokus není dokončen. Prosím, dokončete nejprve online pokus."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/da.json b/www/addons/mod/scorm/lang/da.json
index 880c09196ad..b87612d58d4 100644
--- a/www/addons/mod/scorm/lang/da.json
+++ b/www/addons/mod/scorm/lang/da.json
@@ -1,7 +1,7 @@
 {
     "asset": "Materiale",
     "assetlaunched": "Materiale - vist",
-    "attempts": "Besvarelser",
+    "attempts": "Forsøg",
     "averageattempt": "Gennemsnitlige forsøg",
     "browse": "Vis",
     "browsed": "Vist",
@@ -22,10 +22,10 @@
     "exceededmaxattempts": "Du har nået det maksimale antal forsøg.",
     "failed": "Dumpet",
     "firstattempt": "Første forsøg",
-    "gradeaverage": "Gennemsnitlig vurdering",
+    "gradeaverage": "Gennemsnitlig bedømmelse",
     "gradeforattempt": "Karakter for besvarelse",
-    "gradehighest": "Højeste vurdering",
-    "grademethod": "Vurdering ved gentagne forsøg",
+    "gradehighest": "Højeste bedømmelse",
+    "grademethod": "Bedømmelsesmetode",
     "gradereported": "Karakter rapporteret",
     "gradescoes": "Læringsobjekter",
     "gradesum": "Samlet bedømmelse",
@@ -45,7 +45,7 @@
     "reviewmode": "Gennemsynstilstand",
     "scormstatusnotdownloaded": "Denne SCORM er ikke downloadet. Den bliver automatisk downloadet når du åbner den.",
     "scormstatusoutdated": "Denne SCORM er ændret efter den sidste download. Den bliver automatisk downloadet når du åbner den.",
-    "suspended": "Suspenderet konto",
+    "suspended": "Suspenderet",
     "warningofflinedatadeleted": "Nogle af forsøgets offlinedata {{number}} er blevet slettet fordi de ikke kunne oprettes i et nyt forsøg.",
     "warningsynconlineincomplete": "Nogle forsøg kunne ikke synkroniseres med webstedet, fordi det sidste onlineforsøg ikke er afsluttet. Afslut først onlineforsøget."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/de.json b/www/addons/mod/scorm/lang/de.json
index 19bf126366a..85137c402e1 100644
--- a/www/addons/mod/scorm/lang/de.json
+++ b/www/addons/mod/scorm/lang/de.json
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Sie haben die Höchstzahl der Versuche erreicht.",
     "failed": "Fehlgeschlagen",
     "firstattempt": "Erster Versuch",
-    "gradeaverage": "Durchschnitt",
+    "gradeaverage": "Durchschnittsnote",
     "gradeforattempt": "Bewertung für Versuch",
-    "gradehighest": "Bester Versuch",
+    "gradehighest": "Höchstnote",
     "grademethod": "Bewertungsmethode",
     "gradereported": "Bewertung veröffentlicht",
     "gradescoes": "Zahl der Lernobjekte",
@@ -32,7 +32,7 @@
     "highestattempt": "Bester Versuch",
     "incomplete": "Unvollständig",
     "lastattempt": "Letzter vollständiger Versuch",
-    "mode": "Modus",
+    "mode": "Einstellung",
     "newattempt": "Neuen Versuch beginnen",
     "noattemptsallowed": "Zahl zulässiger Versuche",
     "noattemptsmade": "Zahl Ihrer Versuche",
@@ -45,7 +45,7 @@
     "reviewmode": "Rückblick-Modus",
     "scormstatusnotdownloaded": "Dieses Lernpaket ist noch nicht geladen. Es wird automatisch heruntergeladen, wenn Sie es öffnen.",
     "scormstatusoutdated": "Dieses Lernpaket wurde seit dem Herunterladen verändert. Es wird automatisch heruntergeladen, wenn Sie es öffnen.",
-    "suspended": "Gesperrtes Nutzerkonto",
+    "suspended": "Ausgeschlossen",
     "warningofflinedatadeleted": "Die Offline-Daten von Versuch {{number}} wurden gelöscht, weil sie nicht für einen neuen Versuch verwendet werden können.",
     "warningsynconlineincomplete": "Die Versuche konnten nicht synchronisiert werden, weil der letzte Online-Versuchnicht beendet wurde. Beenden Sie zuerst den Online-Versuch."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/el.json b/www/addons/mod/scorm/lang/el.json
index 1073bd9a33f..a819301fbee 100644
--- a/www/addons/mod/scorm/lang/el.json
+++ b/www/addons/mod/scorm/lang/el.json
@@ -24,7 +24,7 @@
     "firstattempt": "Πρώτη προσπάθεια",
     "gradeaverage": "Μέσος βαθμός",
     "gradeforattempt": "Βαθμός προσπάθειας",
-    "gradehighest": "Ο υψηλότερος βαθμός",
+    "gradehighest": "Υψηλότερος βαθμός",
     "grademethod": "Μέθοδος βαθμολόγησης",
     "gradereported": "Βαθμολογία",
     "gradescoes": "Μαθησιακά αντικείμενα",
@@ -45,6 +45,6 @@
     "reviewmode": "Φάση ανασκόπησης",
     "scormstatusnotdownloaded": "Αυτό το SCORM δεν έχει κατέβει. Θα κατέβει αυτόματα όταν το ανοίξετε.",
     "scormstatusoutdated": "Αυτό το SCORM έχει τροποποιηθεί από την τελευταία λήψη. Θα κατέβει αυτόματα όταν το ανοίξετε.",
-    "suspended": "Ανεσταλμένος λογαριασμός",
+    "suspended": "Αναστέλλεται",
     "warningsynconlineincomplete": "Κάποιες προσπάθειες δεν μπόρεσαν να συγχρονιστούν με το site διότι η τελευταία online προσπάθεια δεν έχει ολοκληρωθεί. Παρακαλώ τελειώστε την online προσπάθεια πρώτα."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/es-mx.json b/www/addons/mod/scorm/lang/es-mx.json
index 9fb465e35bf..2c72808a5b1 100644
--- a/www/addons/mod/scorm/lang/es-mx.json
+++ b/www/addons/mod/scorm/lang/es-mx.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Ha alcanzado el número máximo de intentos",
     "failed": "Error",
     "firstattempt": "Primer intento",
-    "gradeaverage": "Promedio de calificaciones",
+    "gradeaverage": "Calificación promedio",
     "gradeforattempt": "Calificación del intento",
     "gradehighest": "Calificación más alta",
     "grademethod": "Método de calificación",
@@ -45,7 +45,7 @@
     "reviewmode": "Modo Revisión",
     "scormstatusnotdownloaded": "Este SCORM no está descargado. Será descargado automáticamente cuando Usted lo abra.",
     "scormstatusoutdated": "Este SCORM ha sido modificado desde la última descarga. Será descargado automáticamente cuando Usted lo abra.",
-    "suspended": "Cuenta suspendida",
+    "suspended": "Suspendido",
     "warningofflinedatadeleted": "Algunos datos fuera-de-línea del intento {{number}} han sido eliminados porque no pudieron usarse para crear un nuevo intento.",
     "warningsynconlineincomplete": "Algunos intentos no pudieron ser sincronizados con el sitio debido a que el último intento en-línea no está terminado. Por favor, termine primeramente el intento en-línea."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/es.json b/www/addons/mod/scorm/lang/es.json
index 8d99978ae22..518b5cf6da7 100644
--- a/www/addons/mod/scorm/lang/es.json
+++ b/www/addons/mod/scorm/lang/es.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Ha alcanzado el número máximo de intentos",
     "failed": "Error",
     "firstattempt": "Primer intento",
-    "gradeaverage": "Promedio de calificaciones",
+    "gradeaverage": "Calificación promedio",
     "gradeforattempt": "Calificación del intento",
     "gradehighest": "Calificación más alta",
     "grademethod": "Método de calificación",
@@ -45,7 +45,7 @@
     "reviewmode": "Modo Revisión",
     "scormstatusnotdownloaded": "Este SCORM no se ha descargado. Lo hará automáticamente cuando lo abras.",
     "scormstatusoutdated": "Este SCORM se ha modificado desde la última descarga. Se descargará automáticamente cuando lo abras.",
-    "suspended": "Cuenta de usuario suspendida",
+    "suspended": "Suspendido",
     "warningofflinedatadeleted": "Algunos datos fuera de línea del intento {{number}} se han eliminado porque no pueden crearse en el nuevo intento.",
     "warningsynconlineincomplete": "Algunos intentos no pueden sincronizarse con el sitio porque el último intento en línea no ha finalizado. Por favor acabe primero el intento."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/eu.json b/www/addons/mod/scorm/lang/eu.json
index 9c1959e8a42..d6315ef6681 100644
--- a/www/addons/mod/scorm/lang/eu.json
+++ b/www/addons/mod/scorm/lang/eu.json
@@ -24,7 +24,7 @@
     "firstattempt": "Lehenengo saiakera",
     "gradeaverage": "Batez besteko kalifikazioa",
     "gradeforattempt": "Saikerarako kalifikazioa",
-    "gradehighest": "Notarik altuena",
+    "gradehighest": "Kalifikazio altuena",
     "grademethod": "Kalifikazio-metodoa",
     "gradereported": "Emandako kalifikazioa",
     "gradescoes": "Ikasteko objektuak",
@@ -45,7 +45,7 @@
     "reviewmode": "Berrikusketa-modua",
     "scormstatusnotdownloaded": "SCORM hau ez dago aurretik jaitsita. Automatikoki jaitsiko da irekitzen duzunean.",
     "scormstatusoutdated": "SCORM hau eguneratua izan da azkenekoz jaitsi zenuenetik. Automatikoki jaitsiko da irekitzen duzunean.",
-    "suspended": "Etendako kontua",
+    "suspended": "Bere horretan utzia",
     "warningofflinedatadeleted": "{{number}}. saiakeraren lineaz kanpoko datu batzuk ezabatu dira ezin izan direlako saiakera berri batean sortu.",
     "warningsynconlineincomplete": "Saiakera batzuk ezin izan dira Moodle gunearekin sinkronizatu azken online saiakera ez delako bukatu. Mesedez, bukatu online saiakera aurretik."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/fa.json b/www/addons/mod/scorm/lang/fa.json
index fd06c8f66fd..28c96dadd4e 100644
--- a/www/addons/mod/scorm/lang/fa.json
+++ b/www/addons/mod/scorm/lang/fa.json
@@ -1,7 +1,7 @@
 {
     "asset": "دارایی",
     "assetlaunched": "دارایی - دیده شده",
-    "attempts": "دفعات شرکت",
+    "attempts": "تلاش",
     "averageattempt": "متوسط تعداد دفعات تلاش",
     "browse": "پیش‌نمایش",
     "browsed": "به صورت پیش‌نمایش دیده شده",
@@ -16,15 +16,15 @@
     "firstattempt": "اولین تلاش",
     "gradeaverage": "نمرهٔ میانگین",
     "gradeforattempt": "نمرهٔ تلاش",
-    "gradehighest": "بیشترین نمره",
-    "grademethod": "روش نمره دادن",
+    "gradehighest": "بالاترین نمره",
+    "grademethod": "روش نمره‌دهی",
     "gradereported": "نمرهٔ گزارش شده",
     "gradescoes": "اهداف آموزشی",
     "gradesum": "جمع نمره",
     "highestattempt": "بالاترین تلاش",
     "incomplete": "ناتمام",
     "lastattempt": "آخرین تلاش",
-    "mode": "روش",
+    "mode": "حالت",
     "newattempt": "شروع یک تلاش جدید",
     "noattemptsallowed": "تعداد تلاش‌های مجاز",
     "noattemptsmade": "تعداد تلاش‌هایی که انجام داده‌اید",
@@ -33,5 +33,5 @@
     "organizations": "سازمان‌ها",
     "passed": "موفق",
     "reviewmode": "حالت مرور",
-    "suspended": "حساب کاربری تعلیق‌شده"
+    "suspended": "معلق"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/fr.json b/www/addons/mod/scorm/lang/fr.json
index 6ecd714e003..5798f9a67eb 100644
--- a/www/addons/mod/scorm/lang/fr.json
+++ b/www/addons/mod/scorm/lang/fr.json
@@ -1,7 +1,7 @@
 {
     "asset": "Élément",
     "assetlaunched": "Élément - affiché",
-    "attempts": "Tentatives",
+    "attempts": "tentatives",
     "averageattempt": "Moyenne des tentatives",
     "browse": "Prévisualiser",
     "browsed": "Consulté",
@@ -45,7 +45,7 @@
     "reviewmode": "Mode relecture",
     "scormstatusnotdownloaded": "Ce SCORM n'est pas téléchargé. Il sera téléchargé automatiquement dès que vous l'ouvrirez.",
     "scormstatusoutdated": "Ce SCORM a été modifié depuis son dernier téléchargement. Il sera téléchargé automatiquement dès que vous l'ouvrirez.",
-    "suspended": "Compte suspendu",
+    "suspended": "Suspendu",
     "warningofflinedatadeleted": "Des données hors ligne de la tentative {{number}} ont été supprimées, car elles n'ont pas pu être intégrées dans une nouvelle tentative.",
     "warningsynconlineincomplete": "Certaines tentatives n'ont pas pu être synchronisées avec la plateforme, car la dernière tentative en ligne n'est pas terminée. Veuillez d'abord finir votre tentative en ligne."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/he.json b/www/addons/mod/scorm/lang/he.json
index 50bd81a1489..9eaf549856b 100644
--- a/www/addons/mod/scorm/lang/he.json
+++ b/www/addons/mod/scorm/lang/he.json
@@ -1,7 +1,7 @@
 {
     "asset": "נכס",
     "assetlaunched": "משאב - נצפה",
-    "attempts": "נסיונות מענה",
+    "attempts": "ניסיונות",
     "averageattempt": "ממוצע ניסיונות",
     "browse": "תצוגה מקדימה",
     "browsed": "נצפה",
@@ -12,10 +12,10 @@
     "exceededmaxattempts": "הגעת למספר המירבי המותר של נסיונות.",
     "failed": "נכשל",
     "firstattempt": "ניסיון מענה ראשון",
-    "gradeaverage": "ציון ממוצע",
+    "gradeaverage": "ממוצע הניקוד בניסיונות המענה",
     "gradeforattempt": "הניקוד לנסיון",
-    "gradehighest": "הציון הגבוה ביותר",
-    "grademethod": "שיטת מתן ציונים",
+    "gradehighest": "הניקוד הגבוה ביותר",
+    "grademethod": "שיטת מתן ניקוד",
     "gradereported": "הניקוד הסופי",
     "gradescoes": "רכיבי למידה",
     "gradesum": "סיכום הניקוד בניסיונות המענה",
@@ -31,5 +31,5 @@
     "organizations": "רצפי־למידה",
     "passed": "עבר",
     "reviewmode": "מצב עיון בתשובות",
-    "suspended": "חשבון מושהה"
+    "suspended": "מושהה"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/hu.json b/www/addons/mod/scorm/lang/hu.json
index c1da70aab63..6d62c92cb3d 100644
--- a/www/addons/mod/scorm/lang/hu.json
+++ b/www/addons/mod/scorm/lang/hu.json
@@ -31,5 +31,5 @@
     "organizations": "Szervezetek",
     "passed": "Sikerült",
     "reviewmode": "Ellenőrző üzemmód",
-    "suspended": "Felfüggesztett fiók"
+    "suspended": "Felfüggesztve"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/it.json b/www/addons/mod/scorm/lang/it.json
index d858aa53da9..8556f3bf7ab 100644
--- a/www/addons/mod/scorm/lang/it.json
+++ b/www/addons/mod/scorm/lang/it.json
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Hai raggiunto il massimo numero di tentativi consentito.",
     "failed": "Fallito",
     "firstattempt": "Primo tentativo",
-    "gradeaverage": "Voto medio",
+    "gradeaverage": "Media dei voti",
     "gradeforattempt": "Valutazione del tentativo",
-    "gradehighest": "Voto più alto",
+    "gradehighest": "Voto migliore",
     "grademethod": "Metodo di valutazione",
     "gradereported": "Voto ottenuto",
     "gradescoes": "Learning object",
@@ -32,7 +32,7 @@
     "highestattempt": "Tentativo migliore",
     "incomplete": "Incompleto",
     "lastattempt": "Ultimo tentativo completato",
-    "mode": "Moda",
+    "mode": "Modalità",
     "newattempt": "Avvia un nuovo tentativo",
     "noattemptsallowed": "Numero di tentativi consentito",
     "noattemptsmade": "Numero di tentativi che hai effettuato",
@@ -45,7 +45,7 @@
     "reviewmode": "Modalità revisione",
     "scormstatusnotdownloaded": "Questo SCORM non è stato scaricato, lo sarà non appena lo aprirai.",
     "scormstatusoutdated": "Questo SCORM è stato modificato dall'ultimo scaricamento e sarà scaricato nuovamente non appena lo aprirai.",
-    "suspended": "Account sospeso",
+    "suspended": "Sospeso",
     "warningofflinedatadeleted": "Alcuni dati offline del tentativo {{number}}  sono stati eliminati perché non è stato possibile inserirli in un nuovo tentativo.",
     "warningsynconlineincomplete": "Alcuni tentativi non sono stati sincronizzati sul sito poiché è presente un tentativo svolto online che non è stato terminato. Per sincronizzare, devi prima terminare il tentativo online."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ja.json b/www/addons/mod/scorm/lang/ja.json
index ae46163251c..df57f44b198 100644
--- a/www/addons/mod/scorm/lang/ja.json
+++ b/www/addons/mod/scorm/lang/ja.json
@@ -22,7 +22,7 @@
     "highestattempt": "最高評点",
     "incomplete": "不完全",
     "lastattempt": "最新の完了済み受験",
-    "mode": "最頻値",
+    "mode": "モード",
     "newattempt": "新しい受験を開始する",
     "noattemptsallowed": "許可された受験回数",
     "noattemptsmade": "あなたの受験回数",
@@ -31,5 +31,5 @@
     "organizations": "組織",
     "passed": "合格",
     "reviewmode": "レビューモード",
-    "suspended": "利用停止アカウント"
+    "suspended": "一時停止"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/lt.json b/www/addons/mod/scorm/lang/lt.json
index e5fe5f75ff3..5ff4711bf91 100644
--- a/www/addons/mod/scorm/lang/lt.json
+++ b/www/addons/mod/scorm/lang/lt.json
@@ -32,7 +32,7 @@
     "highestattempt": "Aukščiausiai įvertintas bandymas",
     "incomplete": "Neužbaigta",
     "lastattempt": "Paskutinis bandymas",
-    "mode": "Moda",
+    "mode": "Režimas",
     "newattempt": "Pradėti naują bandymą",
     "noattemptsallowed": "Leidžiamų bandymų skaičius",
     "noattemptsmade": "Išnaudotų bandymų skaičius",
@@ -45,7 +45,7 @@
     "reviewmode": "Peržiūros režimas",
     "scormstatusnotdownloaded": "SCORM neatsiųsta. Programa automatiškai atsisiųs ją atidarius.",
     "scormstatusoutdated": "SCORM pakeista nuo paskutiniojo atsisiuntimo. Programa automatiškai atsisiųs ją atidarius.",
-    "suspended": "Sulaikyta paskyra",
+    "suspended": "Sulaikyta",
     "warningofflinedatadeleted": "Kai kurie neprijungti  bandymo {{number}} duomenys  buvo ištrinti, nes jie negalėjo būti perkelti į naują bandymą.",
     "warningsynconlineincomplete": "Kaikurie bandymai negali būti sinchronizuoti su svetaine dėl to, kad paskutiniai prisijungimo duomenys nebuvo pabaigti. Prašome pabaigti."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/nl.json b/www/addons/mod/scorm/lang/nl.json
index 2cee256d9f1..0a418c7071f 100644
--- a/www/addons/mod/scorm/lang/nl.json
+++ b/www/addons/mod/scorm/lang/nl.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Je hebt het maximale aantal pogingen bereikt.",
     "failed": "Mislukt",
     "firstattempt": "Eerste poging",
-    "gradeaverage": "Gemiddelde cijfer",
+    "gradeaverage": "Gemiddeld cijfer",
     "gradeforattempt": "Beoordeling van de poging",
     "gradehighest": "Hoogste cijfer",
     "grademethod": "Beoordelingsmethode",
@@ -45,7 +45,7 @@
     "reviewmode": "Nalezen",
     "scormstatusnotdownloaded": "Deze SCORM is niet gedownload. Het zal automatisch gedownload worden als je het opent.",
     "scormstatusoutdated": "Deze SCORM is gewijzigd sinds de laatste download. Het zal automatisch gedownload worden wanneer je het opent.",
-    "suspended": "Geschorste account",
+    "suspended": "Onderbroken",
     "warningofflinedatadeleted": "Sommige offline gegevens van poging {{number}} zijn verwijderd omdat ze niet in een nieuwe poging konden omgezet worden.",
     "warningsynconlineincomplete": "Sommige pogingen konden niet gesynchroniseerd worden met de site omdat de laatste online-poging niet beëindigd was. Beëindig eerst de online-poging."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/pl.json b/www/addons/mod/scorm/lang/pl.json
index f81ec35bb37..0d6fae34178 100644
--- a/www/addons/mod/scorm/lang/pl.json
+++ b/www/addons/mod/scorm/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "asset": "Zasób",
     "assetlaunched": "Zasób - obejrzany",
-    "attempts": "Podejścia",
+    "attempts": "Próby",
     "averageattempt": "Średnia prób",
     "browse": "Przeglądaj",
     "browsed": "Przeglądane",
@@ -31,5 +31,5 @@
     "organizations": "Organizacje",
     "passed": "Udane",
     "reviewmode": "Tryb przeglądu",
-    "suspended": "Zawieszone konto"
+    "suspended": "Zawieszone"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/pt-br.json b/www/addons/mod/scorm/lang/pt-br.json
index 85f8588915d..458dcebee2a 100644
--- a/www/addons/mod/scorm/lang/pt-br.json
+++ b/www/addons/mod/scorm/lang/pt-br.json
@@ -22,7 +22,7 @@
     "exceededmaxattempts": "Você atingiu a número máximo de tentativas.",
     "failed": "Falhou",
     "firstattempt": "Primeira tentativa",
-    "gradeaverage": "Nota média",
+    "gradeaverage": "Média das notas",
     "gradeforattempt": "Avaliação por tentativa",
     "gradehighest": "Nota mais alta",
     "grademethod": "Método de avaliação",
@@ -32,7 +32,7 @@
     "highestattempt": "Tentativa mais alta",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa",
-    "mode": "Tendência",
+    "mode": "Modalidade",
     "newattempt": "Começar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
     "noattemptsmade": "Número de tentativas feitas",
@@ -45,7 +45,7 @@
     "reviewmode": "Modalidade de revisão",
     "scormstatusnotdownloaded": "Este SCORM não é baixado. Ele será baixado automaticamente quando você abri-lo.",
     "scormstatusoutdated": "Este SCORM foi modificado desde o último download. Ele será baixado automaticamente quando você abri-lo.",
-    "suspended": "Conta suspensa",
+    "suspended": "Suspenso",
     "warningofflinedatadeleted": "Alguns dados off-line da tentativa {{number}} foram excluídas porque ele não pôde ser criado em uma nova tentativa.",
     "warningsynconlineincomplete": "Algumas tentativas não poderiam ser sincronizadas com o site porque a última tentativa não foi finalizada. Por favor termine a tentativa online primeiro."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/pt.json b/www/addons/mod/scorm/lang/pt.json
index 6f23389ff1b..b3539194c48 100644
--- a/www/addons/mod/scorm/lang/pt.json
+++ b/www/addons/mod/scorm/lang/pt.json
@@ -32,7 +32,7 @@
     "highestattempt": "Tentativa com melhor nota",
     "incomplete": "Incompleto",
     "lastattempt": "Última tentativa concluída",
-    "mode": "Moda",
+    "mode": "Modo",
     "newattempt": "Iniciar uma nova tentativa",
     "noattemptsallowed": "Número de tentativas permitidas",
     "noattemptsmade": "Número de tentativas realizadas",
@@ -45,7 +45,7 @@
     "reviewmode": "Modo de revisão",
     "scormstatusnotdownloaded": "Este SCORM não foi descarregado. Será descarregado assim que o abrir.",
     "scormstatusoutdated": "Este SCORM foi modificado desde a última vez que o descarregou. A versão mais recente do mesmo será descarregada automaticamente assim que o abrir.",
-    "suspended": "Conta suspensa",
+    "suspended": "Suspenso",
     "warningofflinedatadeleted": "Alguns dados offline da tentativa {{number}} foram excluídos porque não podem ser utilizados numa nova tentativa.",
     "warningsynconlineincomplete": "Algumas tentativas ainda não foram sincronizadas com o site porque a última tentativa não se encontra finalizada. Por favor, termine a tentativa online primeiro."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ro.json b/www/addons/mod/scorm/lang/ro.json
index 5b3b79bc149..24087ff80da 100644
--- a/www/addons/mod/scorm/lang/ro.json
+++ b/www/addons/mod/scorm/lang/ro.json
@@ -1,7 +1,7 @@
 {
     "asset": "Fişier curs",
     "assetlaunched": "Fişier - Afişat",
-    "attempts": "Încercări",
+    "attempts": "Încercări de parcurgere",
     "averageattempt": "Numărul mediu de încercări de parcurgere",
     "browse": "Caută",
     "browsed": "Căutat",
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "Ați atins numărul maxim de încercări",
     "failed": "Eşuat",
     "firstattempt": "Prima încercare parcurgere",
-    "gradeaverage": "Nota medie",
-    "gradehighest": "Nota maximă",
-    "grademethod": "Metoda de notare",
+    "gradeaverage": "Punctaj mediu",
+    "gradehighest": "Punctaj maxim",
+    "grademethod": "Metodă punctare",
     "gradescoes": "Modul de studiu",
     "gradesum": "Sumă punctaje",
     "highestattempt": "Cea mai completă încercare de parcurgere",
@@ -43,7 +43,7 @@
     "reviewmode": "Mod Verificare",
     "scormstatusnotdownloaded": "Acest SCORM nu a fost descărcat. Va fi descărcat automat când îl veți deschide.",
     "scormstatusoutdated": "Acest SCORM a fost modificat de la ultima descărcare. Va fi redescărcat automat când îl veți deschide.",
-    "suspended": "Cont suspendat",
+    "suspended": "Suspendat",
     "warningofflinedatadeleted": "Unele date ale încercării offline cu numărul {{number}} au fost șterse deoarece nu s-au putut constitui într-o nouă încercare.",
     "warningsynconlineincomplete": "Această încercare nu poate fi sincronizată cu siteul pentru că ultima încercare efectuată nu a fost finalizată. Vă rugăm să o finalizați."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/ru.json b/www/addons/mod/scorm/lang/ru.json
index e2469fa9abc..2cc8016e9c1 100644
--- a/www/addons/mod/scorm/lang/ru.json
+++ b/www/addons/mod/scorm/lang/ru.json
@@ -25,7 +25,7 @@
     "highestattempt": "Лучшая попытка",
     "incomplete": "Не завершено",
     "lastattempt": "Завершена последняя попытка",
-    "mode": "Мода",
+    "mode": "Режим",
     "newattempt": "Начать новую попытку",
     "noattemptsallowed": "Количество попыток",
     "noattemptsmade": "Выполнено попыток",
@@ -34,5 +34,5 @@
     "organizations": "Организаций",
     "passed": "Выполнено успешно",
     "reviewmode": "Режим просмотра",
-    "suspended": "Учетная запись заблокирована"
+    "suspended": "Приостановлено"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/sv.json b/www/addons/mod/scorm/lang/sv.json
index 3b30b9a2d63..6cbde1646b4 100644
--- a/www/addons/mod/scorm/lang/sv.json
+++ b/www/addons/mod/scorm/lang/sv.json
@@ -22,10 +22,10 @@
     "exceededmaxattempts": "Du har redan använt samtliga tillåtna försök.",
     "failed": "Det fungerade inte",
     "firstattempt": "Första försöket",
-    "gradeaverage": "Medelbetyg",
+    "gradeaverage": "Medelbetyg/omdöme",
     "gradeforattempt": "Betyg/omdöme för försök",
-    "gradehighest": "Högsta betyg",
-    "grademethod": "Betygsättningsmetod",
+    "gradehighest": "Högsta betyg/omdöme",
+    "grademethod": "Metod för betyg/omdömen",
     "gradereported": "Betyg rapporterat",
     "gradescoes": "Lärobjekt ",
     "gradesum": "Summera betyg/omdöme(n)",
@@ -45,7 +45,7 @@
     "reviewmode": "Läge för granskning",
     "scormstatusnotdownloaded": "Detta SCORM är inte nedladdat. Det kommer att laddas ner automatiskt när du öppnar den",
     "scormstatusoutdated": "Detta SCORM har modifierats sedan sista nedladdningen. Det kommer att laddas ner automatiskt när du öppnar den",
-    "suspended": "Avaktiverat konto",
+    "suspended": "Avstängd",
     "warningofflinedatadeleted": "Vissa offlinedata av försöket {{nummer}} har tagits bort eftersom den inte kunnat skapas in ett nytt försök .",
     "warningsynconlineincomplete": "Vissa försök kunde inte synkroniseras med sidan, eftersom senaste online försök inte är klar än . Vänligen avsluta online- försöket först ."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/tr.json b/www/addons/mod/scorm/lang/tr.json
index 31f5789cb82..244c50c5460 100644
--- a/www/addons/mod/scorm/lang/tr.json
+++ b/www/addons/mod/scorm/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "asset": "Öge",
     "assetlaunched": "Öge - Bakıldı",
-    "attempts": "Uygulamalar",
+    "attempts": "Uygulama (lar)",
     "averageattempt": "Uygulama ortalaması",
     "browse": "Önizleme",
     "browsed": "Gözatıldı",
@@ -12,10 +12,10 @@
     "exceededmaxattempts": "En fazla uygulama sayısına ulaştınız.",
     "failed": "Hata oluştu",
     "firstattempt": "İlk uygulama",
-    "gradeaverage": "Not ortalaması",
+    "gradeaverage": "Ortalama not",
     "gradeforattempt": "Uygulama notu",
     "gradehighest": "En yüksek not",
-    "grademethod": "Notlandırma yöntemi",
+    "grademethod": "Not verme yöntemi",
     "gradereported": "Not verme raporu",
     "gradescoes": "Öğrenme Nesneleri",
     "gradesum": "Notları topla",
@@ -31,5 +31,5 @@
     "organizations": "Düzenlemeler",
     "passed": "Geçti",
     "reviewmode": "Önizleme Modu",
-    "suspended": "Askıya alınmış hesap"
+    "suspended": "Durduruldu"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/uk.json b/www/addons/mod/scorm/lang/uk.json
index 94c375eb0ff..47edde51210 100644
--- a/www/addons/mod/scorm/lang/uk.json
+++ b/www/addons/mod/scorm/lang/uk.json
@@ -32,7 +32,7 @@
     "highestattempt": "Найкраща спроба",
     "incomplete": "Не завершено",
     "lastattempt": "Остання завершена спроба",
-    "mode": "Мода",
+    "mode": "Режим",
     "newattempt": "Почати нову спробу",
     "noattemptsallowed": "Кількість дозволених спроб",
     "noattemptsmade": "Кількість спроб, які ви повінні зробити",
@@ -45,7 +45,7 @@
     "reviewmode": "Режим перегляду",
     "scormstatusnotdownloaded": "Це SCORM не завантажується. Він буде автоматично завантажуватися при її відкритті.",
     "scormstatusoutdated": "Цей SCORM був змінений з моменту останнього завантаження. Він буде автоматично завантажуватися при її відкритті.",
-    "suspended": "Заблокований обліковий запис",
+    "suspended": "Заблокований",
     "warningofflinedatadeleted": "Деякі автономні дані про спробу № {{number}} були видалений, тому що він не може бути створений в новій спробі.",
     "warningsynconlineincomplete": "Деякі спроби не можуть бути синхронізовані з сайтом, тому що онлайн спроба не закінчена. Будь ласка закінчіть спробу онлайн спершу."
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/zh-cn.json b/www/addons/mod/scorm/lang/zh-cn.json
index 5ac6087eb45..994a7576861 100644
--- a/www/addons/mod/scorm/lang/zh-cn.json
+++ b/www/addons/mod/scorm/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "asset": "资产",
     "assetlaunched": "资产 - 已浏览",
-    "attempts": "试卷",
+    "attempts": "次",
     "averageattempt": "平均分",
     "browse": "预览",
     "browsed": "已浏览",
@@ -15,7 +15,7 @@
     "gradeaverage": "平均分",
     "gradeforattempt": "尝试的得分",
     "gradehighest": "最高分",
-    "grademethod": "评分办法",
+    "grademethod": "评分方法",
     "gradereported": "成绩报告",
     "gradescoes": "学习对象",
     "gradesum": "分数和",
@@ -31,5 +31,5 @@
     "organizations": "组织",
     "passed": "已通过",
     "reviewmode": "复习模式",
-    "suspended": "停用账号"
+    "suspended": "已暂停"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/zh-tw.json b/www/addons/mod/scorm/lang/zh-tw.json
index 30e8539dffa..ec476e126b9 100644
--- a/www/addons/mod/scorm/lang/zh-tw.json
+++ b/www/addons/mod/scorm/lang/zh-tw.json
@@ -1,7 +1,7 @@
 {
     "asset": "資源",
     "assetlaunched": "已閱讀的資源",
-    "attempts": "作答次數",
+    "attempts": "作答次",
     "averageattempt": "平均使用次數",
     "browse": "預覽",
     "browsed": "已瀏覽",
@@ -22,9 +22,9 @@
     "exceededmaxattempts": "你已經達到最大的作答次數",
     "failed": "失敗",
     "firstattempt": "第一次使用",
-    "gradeaverage": "平均分數",
+    "gradeaverage": "平均成績",
     "gradeforattempt": "作答次的分數",
-    "gradehighest": "最高分數",
+    "gradehighest": "最高成績",
     "grademethod": "評分方式",
     "gradereported": "成績報告",
     "gradescoes": "學習目標",
@@ -32,7 +32,7 @@
     "highestattempt": "最高使用次數",
     "incomplete": "不完整",
     "lastattempt": "最後完成的作答次",
-    "mode": "眾數",
+    "mode": "模式",
     "newattempt": "開始新的使用",
     "noattemptsallowed": "允許作答的次數",
     "noattemptsmade": "你已經作答的次數",
@@ -45,7 +45,7 @@
     "reviewmode": "複習模式",
     "scormstatusnotdownloaded": "此SCORM未下載. 它會在您打開時自動下載.",
     "scormstatusoutdated": "此SCORM自上次下載以來已被修改. 它會在您打開時自動下載.",
-    "suspended": "已被停用的帳號",
+    "suspended": "中止",
     "warningofflinedatadeleted": "嘗試{{number}}的某些離線資料已被刪除, 因為無法建立新的嘗試.",
     "warningsynconlineincomplete": "某些嘗試無法與網站同步, 因為上次上線嘗試未完成, 請先完成上線嘗試."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/de.json b/www/addons/mod/survey/lang/de.json
index 6a98bc5bd3e..28c0d5d47da 100644
--- a/www/addons/mod/survey/lang/de.json
+++ b/www/addons/mod/survey/lang/de.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Fehler beim Empfangen der Umfragedaten",
     "ifoundthat": "Dies findet statt:",
     "ipreferthat": "Ich bevorzuge es so:",
-    "responses": "Eigene Eingaben",
+    "responses": "Antworten",
     "results": "Ergebnisse",
     "surveycompletednograph": "Sie haben diese Umfrage abgeschlossen."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/es-mx.json b/www/addons/mod/survey/lang/es-mx.json
index 382d3383af7..1057c59be73 100644
--- a/www/addons/mod/survey/lang/es-mx.json
+++ b/www/addons/mod/survey/lang/es-mx.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Error al obtener datos de la encuesta.",
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
-    "responses": "Respuestas del alumno",
+    "responses": "Respuestas",
     "results": "Resultados",
     "surveycompletednograph": "Usted ha completado esta encuesta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/es.json b/www/addons/mod/survey/lang/es.json
index de6e4082611..e8ce6c8504e 100644
--- a/www/addons/mod/survey/lang/es.json
+++ b/www/addons/mod/survey/lang/es.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Se ha producido un error recuperando los datos de la encuesta.",
     "ifoundthat": "Encontrado:",
     "ipreferthat": "Prefiero esto",
-    "responses": "Respuestas -",
+    "responses": "Respuestas",
     "results": "Resultados",
     "surveycompletednograph": "Has completado esta encuesta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/eu.json b/www/addons/mod/survey/lang/eu.json
index 4510a258ef4..a1f8ef5c146 100644
--- a/www/addons/mod/survey/lang/eu.json
+++ b/www/addons/mod/survey/lang/eu.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Errorea hausnarketaren datuak eskuratzean.",
     "ifoundthat": "Hau aurkitu dut",
     "ipreferthat": "Nahiago dut",
-    "responses": "Ebazpenak",
+    "responses": "Erantzunak",
     "results": "Emaitzak",
     "surveycompletednograph": "Bete duzu hausnarketa hau"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/fa.json b/www/addons/mod/survey/lang/fa.json
index 7ecd2796c5b..eac2b9fbf74 100644
--- a/www/addons/mod/survey/lang/fa.json
+++ b/www/addons/mod/survey/lang/fa.json
@@ -2,6 +2,6 @@
     "cannotsubmitsurvey": "متاسفیم. مشکلی در ثبت نظرسنجی شما وجود داشت. لطفا دوباره تلاش کنید.",
     "ifoundthat": "متوجه شدم که:",
     "ipreferthat": "ترجیح می‌دهم که:",
-    "responses": "پاسخ‌های ارائه شده",
+    "responses": "پاسخ‌ها",
     "results": "نتایج"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/fr.json b/www/addons/mod/survey/lang/fr.json
index 30cc88b1de6..9cd6773b6fe 100644
--- a/www/addons/mod/survey/lang/fr.json
+++ b/www/addons/mod/survey/lang/fr.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Erreur lors de l'obtention des données de la consultation.",
     "ifoundthat": "J'ai trouvé que",
     "ipreferthat": "J'aime mieux quand",
-    "responses": "Réponses du participant",
+    "responses": "Réponses",
     "results": "Résultats",
     "surveycompletednograph": "Vous avez terminé ce sondage."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/hu.json b/www/addons/mod/survey/lang/hu.json
index 346243c9c2b..46363dbb602 100644
--- a/www/addons/mod/survey/lang/hu.json
+++ b/www/addons/mod/survey/lang/hu.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "Azt találtam",
     "ipreferthat": "Inkább ezt szeretném",
-    "responses": "Tanuló válaszai",
+    "responses": "Tanuló által adott válaszok",
     "results": "Eredmények",
     "surveycompletednograph": "A felmérést befejezte."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/it.json b/www/addons/mod/survey/lang/it.json
index f5090e6850e..cb9f71b951c 100644
--- a/www/addons/mod/survey/lang/it.json
+++ b/www/addons/mod/survey/lang/it.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Si è verificato un errore durante la ricezione di dati del sondaggio.",
     "ifoundthat": "Realmente",
     "ipreferthat": "Idealmente",
-    "responses": "Risposte date",
+    "responses": "Risposte",
     "results": "Risultati",
     "surveycompletednograph": "Hai completato il sondaggio."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/ja.json b/www/addons/mod/survey/lang/ja.json
index 4fd5be4f06c..9880b35045a 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "私は次のことを発見しました:",
     "ipreferthat": "私は次のことが好きです:",
-    "responses": "解答",
-    "results": "受験結果",
+    "responses": "回答",
+    "results": "結果",
     "surveycompletednograph": "あなたはこの調査を完了しました。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/nl.json b/www/addons/mod/survey/lang/nl.json
index 25f0ef3c02f..fbe668d10e9 100644
--- a/www/addons/mod/survey/lang/nl.json
+++ b/www/addons/mod/survey/lang/nl.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Fout bij het ophalen van onderzoeksdata.",
     "ifoundthat": "Ik vond dat",
     "ipreferthat": "Mijn voorkeur zou zijn",
-    "responses": "Eigen antwoorden",
+    "responses": "Antwoorden",
     "results": "Resultaten",
     "surveycompletednograph": "Je hebt dit onderzoek afgerond."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/pl.json b/www/addons/mod/survey/lang/pl.json
index d70fe505132..3b9a9921b72 100644
--- a/www/addons/mod/survey/lang/pl.json
+++ b/www/addons/mod/survey/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "Stwierdziłem, że",
     "ipreferthat": "Wolę to",
-    "responses": "Udzielone odpowiedzi",
-    "results": "Wyniki",
+    "responses": "Odpowiedzi",
+    "results": "Wynik",
     "surveycompletednograph": "Już wypełniłeś tą ankietę."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/ru.json b/www/addons/mod/survey/lang/ru.json
index 17aca4add06..9930cff9c3d 100644
--- a/www/addons/mod/survey/lang/ru.json
+++ b/www/addons/mod/survey/lang/ru.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "Ошибка при получении данных опроса",
     "ifoundthat": "Я узнал, что",
     "ipreferthat": "Я предпочитаю",
-    "responses": "Свои ответы",
+    "responses": "Ответы",
     "results": "Результаты",
     "surveycompletednograph": "Вы уже ответили на эту анкету."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/sv.json b/www/addons/mod/survey/lang/sv.json
index 579a3ddeb3e..6a82d257471 100644
--- a/www/addons/mod/survey/lang/sv.json
+++ b/www/addons/mod/survey/lang/sv.json
@@ -3,6 +3,6 @@
     "errorgetsurvey": "Fel vid hämtning av enkätdata",
     "ifoundthat": "Jag har funnit att",
     "ipreferthat": "Jag föredrar att",
-    "responses": "Responser",
+    "responses": "Svar",
     "results": "Resultat"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/tr.json b/www/addons/mod/survey/lang/tr.json
index 97aeda74561..f42edcb4d3f 100644
--- a/www/addons/mod/survey/lang/tr.json
+++ b/www/addons/mod/survey/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "ifoundthat": "Gerçekte olan",
     "ipreferthat": "İstediğim",
-    "responses": "Verilen yanıtlar",
-    "results": "Sonuçlar",
+    "responses": "Yanıtlar",
+    "results": "Sonuç",
     "surveycompletednograph": "Bu anketi tamamladınız."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/zh-cn.json b/www/addons/mod/survey/lang/zh-cn.json
index 160f7b82917..912d8caa96b 100644
--- a/www/addons/mod/survey/lang/zh-cn.json
+++ b/www/addons/mod/survey/lang/zh-cn.json
@@ -1,6 +1,6 @@
 {
     "ifoundthat": "我发现",
     "ipreferthat": "我希望的是",
-    "responses": "作答",
-    "results": "结果"
+    "responses": "回复",
+    "results": "投票结果"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/zh-tw.json b/www/addons/mod/survey/lang/zh-tw.json
index 7aaaa3b566b..924e0d4c800 100644
--- a/www/addons/mod/survey/lang/zh-tw.json
+++ b/www/addons/mod/survey/lang/zh-tw.json
@@ -3,7 +3,7 @@
     "errorgetsurvey": "取得調查資料時出錯",
     "ifoundthat": "我發現",
     "ipreferthat": "我希望的是",
-    "responses": "回答",
-    "results": "結果",
+    "responses": "回應",
+    "results": "票選結果",
     "surveycompletednograph": "你已經完成這一份問卷。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ar.json b/www/addons/mod/wiki/lang/ar.json
index 794020d3f62..1bff5b0f91c 100644
--- a/www/addons/mod/wiki/lang/ar.json
+++ b/www/addons/mod/wiki/lang/ar.json
@@ -6,7 +6,7 @@
     "newpagetitle": "عنواو صفحة جديد",
     "nocontent": "لا يوجد محتوى في هذه الصفحة",
     "notingroup": "لا ينتمي إلى مجموعة",
-    "page": "صفحة: {{$a}}",
+    "page": "صفحة",
     "pagename": "اسم الصفحة",
     "wrongversionlock": "قام مستخدم آخر بتحديث هذه الصفحة بينما كنت أنت تحررها، أصبحت تعديلاتك قديمة."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/bg.json b/www/addons/mod/wiki/lang/bg.json
index cfe93c0370e..dbe95df13e3 100644
--- a/www/addons/mod/wiki/lang/bg.json
+++ b/www/addons/mod/wiki/lang/bg.json
@@ -4,8 +4,8 @@
     "editingpage": "Редактиране на страница \"{{$a}}\"",
     "map": "Карта",
     "newpagetitle": "Заглавие на новата страница",
-    "notingroup": "За съжаление Вие трябва да се част от група за да виждате този форум.",
-    "page": "Страница: {{$a}}",
+    "notingroup": "Извинете, но трябва да сте част от групата за да видите тази дейност.",
+    "page": "Страница",
     "pagename": "Име на страница",
     "wrongversionlock": "Друг потребител редактира тази страница докато Вие редактирахте и Вашата редакция вече е остаряла."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ca.json b/www/addons/mod/wiki/lang/ca.json
index fb0c7bfab1e..b827bb47066 100644
--- a/www/addons/mod/wiki/lang/ca.json
+++ b/www/addons/mod/wiki/lang/ca.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Títol de la pàgina nova",
     "nocontent": "No hi ha contingut per a aquesta pàgina",
     "notingroup": "No en grup",
-    "page": "Pàgina: {{$a}}",
+    "page": "Pàgina",
     "pageexists": "Aquesta pàgina ja existeix.",
     "pagename": "Nom de la pàgina",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/cs.json b/www/addons/mod/wiki/lang/cs.json
index 052676bb598..89723ca1da7 100644
--- a/www/addons/mod/wiki/lang/cs.json
+++ b/www/addons/mod/wiki/lang/cs.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nový název stránky",
     "nocontent": "Pro tuto stránku není obsah",
     "notingroup": "Není ve skupině",
-    "page": "Stránka: {{$a}}",
+    "page": "Stránka",
     "pageexists": "Tato stránka již existuje.",
     "pagename": "Název stránky",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/da.json b/www/addons/mod/wiki/lang/da.json
index c888f404157..9b83d403406 100644
--- a/www/addons/mod/wiki/lang/da.json
+++ b/www/addons/mod/wiki/lang/da.json
@@ -8,7 +8,7 @@
     "newpagetitle": "Ny sidetitel",
     "nocontent": "Der er intet indhold til denne side",
     "notingroup": "Ikke i gruppe",
-    "page": "Side: {{$a}}",
+    "page": "Side",
     "pageexists": "Denne side findes allerede.",
     "pagename": "Sidenavn",
     "subwiki": "Underwiki",
diff --git a/www/addons/mod/wiki/lang/de.json b/www/addons/mod/wiki/lang/de.json
index 6fe1fc4dba9..7bb8187eaff 100644
--- a/www/addons/mod/wiki/lang/de.json
+++ b/www/addons/mod/wiki/lang/de.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titel für neue Seite\n",
     "nocontent": "Kein Inhalt auf dieser Seite",
     "notingroup": "Nicht in Gruppen",
-    "page": "Seite: {{$a}}",
+    "page": "Seite",
     "pageexists": "Diese Seite existiert bereits.",
     "pagename": "Seitenname",
     "subwiki": "Teilwiki",
diff --git a/www/addons/mod/wiki/lang/el.json b/www/addons/mod/wiki/lang/el.json
index 8eec41f7ee2..801399e1135 100644
--- a/www/addons/mod/wiki/lang/el.json
+++ b/www/addons/mod/wiki/lang/el.json
@@ -2,8 +2,8 @@
     "errorloadingpage": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της σελίδας.",
     "errornowikiavailable": "Αυτό το wiki δεν έχει ακόμα περιεχόμενο.",
     "gowikihome": "Go Wiki home",
-    "notingroup": "Συγγνώμη, αλλά πρέπει να είστε μέλος ομάδας για να δείτε αυτό την ομάδα συζητήσεων.",
-    "page": "Σελίδα: {{$a}}",
+    "notingroup": "Συγνώμη, αλλά θα πρέπει να είστε μέλος μιας ομάδας για να δείτε αυτήν τη δραστηριότητα",
+    "page": "Σελίδα",
     "subwiki": "Subwiki",
     "titleshouldnotbeempty": "Ο τίτλος δεν πρέπει να είναι κενός",
     "viewpage": "Δείτε τη σελίδα",
diff --git a/www/addons/mod/wiki/lang/es-mx.json b/www/addons/mod/wiki/lang/es-mx.json
index 5a53592ed79..cbd65b371f9 100644
--- a/www/addons/mod/wiki/lang/es-mx.json
+++ b/www/addons/mod/wiki/lang/es-mx.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Título nuevo de la página",
     "nocontent": "No hay contenido para esta página",
     "notingroup": "No está en un grupo",
-    "page": "Página: {{$a}}",
+    "page": "Página",
     "pageexists": "Esta página ya existe.",
     "pagename": "Nombre de página",
     "subwiki": "Sub-wiki",
diff --git a/www/addons/mod/wiki/lang/es.json b/www/addons/mod/wiki/lang/es.json
index 3bbe24f3157..b31f110029b 100644
--- a/www/addons/mod/wiki/lang/es.json
+++ b/www/addons/mod/wiki/lang/es.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Título nuevo de la página",
     "nocontent": "No hay contenido para esta página",
     "notingroup": "No está en un grupo",
-    "page": "Página: {{$a}}",
+    "page": "Página",
     "pageexists": "Esta página ya existe.",
     "pagename": "Nombre de la página",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/eu.json b/www/addons/mod/wiki/lang/eu.json
index f6b07f7639d..dee4d7b3f1e 100644
--- a/www/addons/mod/wiki/lang/eu.json
+++ b/www/addons/mod/wiki/lang/eu.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Orri berriaren izenburua",
     "nocontent": "Ez dago edukirik orri honetarako",
     "notingroup": "Ez dago taldean",
-    "page": "Orria: {{$a}}",
+    "page": "Orria",
     "pageexists": "Orri hau badago dagoeneko.",
     "pagename": "Orriaren izena",
     "subwiki": "Azpiwikia",
diff --git a/www/addons/mod/wiki/lang/fa.json b/www/addons/mod/wiki/lang/fa.json
index 645adbdab85..3ea0f81b588 100644
--- a/www/addons/mod/wiki/lang/fa.json
+++ b/www/addons/mod/wiki/lang/fa.json
@@ -5,7 +5,7 @@
     "newpagetitle": "عنوان صفحهٔ جدید",
     "nocontent": "محتوایی برای این صفحه وجود ندارد",
     "notingroup": "بدون گروه",
-    "page": "صفحهٔ {{$a}}",
+    "page": "صفحه",
     "pageexists": "این صفحه در حال حاضر وجود دارد. در حال تغییر مسیر به صفحهٔ موجود.",
     "viewpage": "مشاهدهٔ صفحه",
     "wrongversionlock": "هنگامی که شما در حال ویرایش این صفحه بودید، کاربر دیگری آن را ویرایش کرد و محتوایش را تغییر داد."
diff --git a/www/addons/mod/wiki/lang/fr.json b/www/addons/mod/wiki/lang/fr.json
index e18eeba1d13..3d4ff31273f 100644
--- a/www/addons/mod/wiki/lang/fr.json
+++ b/www/addons/mod/wiki/lang/fr.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titre de la nouvelle page",
     "nocontent": "Cette page n'a pas de contenu",
     "notingroup": "Pas dans le groupe",
-    "page": "Page : {{$a}}",
+    "page": "Page",
     "pageexists": "Cette page existe déjà.",
     "pagename": "Nom de page",
     "subwiki": "Sous-wiki",
diff --git a/www/addons/mod/wiki/lang/he.json b/www/addons/mod/wiki/lang/he.json
index 6d94870a86a..46bd85d687c 100644
--- a/www/addons/mod/wiki/lang/he.json
+++ b/www/addons/mod/wiki/lang/he.json
@@ -7,7 +7,7 @@
     "newpagetitle": "כותרת דף חדש",
     "nocontent": "אין תוכן לדף זה",
     "notingroup": "לא בקבוצה",
-    "page": "עמוד: {{$a}}",
+    "page": "עמוד",
     "pageexists": "הדף כבר קיים. הפנה אליו מחדש.",
     "pagename": "שם העמוד",
     "wrongversionlock": "משתמש אחר ערך את הדף הזה בזמן שאת/ה ערכת/ה. התוכן שלך לא ישמר."
diff --git a/www/addons/mod/wiki/lang/hu.json b/www/addons/mod/wiki/lang/hu.json
index 52eb1a43078..19b98951ec9 100644
--- a/www/addons/mod/wiki/lang/hu.json
+++ b/www/addons/mod/wiki/lang/hu.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Új oldalcím",
     "nocontent": "Az oldalhoz nincs tartalom",
     "notingroup": "Nem része a csoportnak",
-    "page": "Oldal: {{$a}}",
+    "page": "Oldal",
     "pageexists": "Az oldal már létezik. Átirányítás az oldalra.",
     "pagename": "Oldal neve",
     "wrongversionlock": "A szerkesztés közben egy másik felhasználó szerkesztette ezt az oldalt, így az Ön tartalma elavult."
diff --git a/www/addons/mod/wiki/lang/it.json b/www/addons/mod/wiki/lang/it.json
index 188539ca68d..5acbfeed47e 100644
--- a/www/addons/mod/wiki/lang/it.json
+++ b/www/addons/mod/wiki/lang/it.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Titolo nuova pagina",
     "nocontent": "Questa pagina non ha contenuti",
     "notingroup": "Non è in un gruppo",
-    "page": "Pagina: {{$a}}",
+    "page": "Pagina",
     "pageexists": "La pagina esiste già.",
     "pagename": "Nome pagina",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/ja.json b/www/addons/mod/wiki/lang/ja.json
index 411c7bf9444..fbfaad517e5 100644
--- a/www/addons/mod/wiki/lang/ja.json
+++ b/www/addons/mod/wiki/lang/ja.json
@@ -7,7 +7,7 @@
     "newpagetitle": "新しいページタイトル",
     "nocontent": "このページにはコンテンツがありません。",
     "notingroup": "グループ外",
-    "page": "ページ: {{$a}}",
+    "page": "ページ",
     "pageexists": "このページはすでに存在します。",
     "pagename": "ページ名",
     "wrongversionlock": "あなたが編集している間、別のユーザがこのページを編集しました。そのため、あなたのコンテンツは古くなりました。"
diff --git a/www/addons/mod/wiki/lang/lt.json b/www/addons/mod/wiki/lang/lt.json
index 7523e9211c2..52f7834015f 100644
--- a/www/addons/mod/wiki/lang/lt.json
+++ b/www/addons/mod/wiki/lang/lt.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Naujo puslapio pavadinimas",
     "nocontent": "Nėra šio puslapio turinio",
     "notingroup": "Nėra grupėje",
-    "page": "Puslapis: {{$a}}",
+    "page": "Puslapis",
     "pageexists": "Šis puslapis jau yra.",
     "pagename": "Puslapio pavadinimas",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/nl.json b/www/addons/mod/wiki/lang/nl.json
index de4427ee53d..2d4ec194f27 100644
--- a/www/addons/mod/wiki/lang/nl.json
+++ b/www/addons/mod/wiki/lang/nl.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Nieuwe paginatitel",
     "nocontent": "Er is geen inhoud voor deze pagina",
     "notingroup": "Niet in groep",
-    "page": "Pagina: {{$a}}",
+    "page": "Pagina",
     "pageexists": "Deze pagina bestaat al.",
     "pagename": "Paginanaam",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/pl.json b/www/addons/mod/wiki/lang/pl.json
index 391b0fbc350..8515710e26a 100644
--- a/www/addons/mod/wiki/lang/pl.json
+++ b/www/addons/mod/wiki/lang/pl.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Tytuł nowej strony",
     "nocontent": "Brak zawartości dla tej strony",
     "notingroup": "Nie w grupie",
-    "page": "Strona: {{$a}}",
+    "page": "Strona",
     "pageexists": "Ta strona już istnieje. Przekierowuje do niej.",
     "pagename": "Nazwa strony",
     "wrongversionlock": "Inny użytkownik edytował tę stronę w czasie, kiedy ty ją edytowałeś i twoja zawartość jest przestarzała."
diff --git a/www/addons/mod/wiki/lang/pt-br.json b/www/addons/mod/wiki/lang/pt-br.json
index 710e219e39c..6c2036aa656 100644
--- a/www/addons/mod/wiki/lang/pt-br.json
+++ b/www/addons/mod/wiki/lang/pt-br.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Novo título da página",
     "nocontent": "Não existe conteúdo para esta página",
     "notingroup": "Não existe no grupo",
-    "page": "Página: {{$a}}",
+    "page": "Página",
     "pageexists": "Esta página já existe. Redirecionado para ela.",
     "pagename": "Nome da página",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/pt.json b/www/addons/mod/wiki/lang/pt.json
index 21749d0a238..83154bc5718 100644
--- a/www/addons/mod/wiki/lang/pt.json
+++ b/www/addons/mod/wiki/lang/pt.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Novo título da página",
     "nocontent": "Não há nenhum conteúdo nesta página",
     "notingroup": "Não está em nenhum grupo",
-    "page": "Página: {{$a}}",
+    "page": "Página",
     "pageexists": "Esta página já existe.",
     "pagename": "Nome da página",
     "subwiki": "SubWiki",
diff --git a/www/addons/mod/wiki/lang/ro.json b/www/addons/mod/wiki/lang/ro.json
index 2b0c326bec6..79fdc396e4f 100644
--- a/www/addons/mod/wiki/lang/ro.json
+++ b/www/addons/mod/wiki/lang/ro.json
@@ -5,7 +5,7 @@
     "newpagehdr": "Pagină nouă",
     "newpagetitle": "Un nou titlu de pagină",
     "nocontent": "Nu există conținut pentru această pagină",
-    "notingroup": "Ne pare rău, pentru a putea vizualiza acest forum trebuie să fiţi membru al unui grup.",
-    "page": "Pagina {{$a}}",
+    "notingroup": "Ne pare rău, dar trebuie să faceţi parte dintr-un grup pentru a putea vizualiza această activitate.",
+    "page": "Pagină",
     "pagename": "Nume pagină"
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ru.json b/www/addons/mod/wiki/lang/ru.json
index efca795f742..d1aad170e59 100644
--- a/www/addons/mod/wiki/lang/ru.json
+++ b/www/addons/mod/wiki/lang/ru.json
@@ -9,7 +9,7 @@
     "newpagetitle": "Заголовок новой страницы",
     "nocontent": "Нет содержимого у этой страницы",
     "notingroup": "Не в группе",
-    "page": "Страница: {{$a}}",
+    "page": "Страница",
     "pageexists": "Такая страница уже существует.",
     "pagename": "Название страницы",
     "titleshouldnotbeempty": "Заголовок не должен быть пустым",
diff --git a/www/addons/mod/wiki/lang/sv.json b/www/addons/mod/wiki/lang/sv.json
index 43bd89b4601..f9ebf16c762 100644
--- a/www/addons/mod/wiki/lang/sv.json
+++ b/www/addons/mod/wiki/lang/sv.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Ny titel på sida",
     "nocontent": "Det finns inget innehåll för den här sidan",
     "notingroup": "Inte i grupp",
-    "page": "Sida:  {{$a}}",
+    "page": "Sida",
     "pageexists": "Den här sidan finns redan, länkning dit pågår",
     "pagename": "Namn på sida",
     "subwiki": "Subwiki",
diff --git a/www/addons/mod/wiki/lang/tr.json b/www/addons/mod/wiki/lang/tr.json
index f1167632e26..8ddfdfd95b3 100644
--- a/www/addons/mod/wiki/lang/tr.json
+++ b/www/addons/mod/wiki/lang/tr.json
@@ -7,7 +7,7 @@
     "newpagetitle": "Yeni sayfa başlığı",
     "nocontent": "Bu sayfa için içerik yok",
     "notingroup": "Grupta değil",
-    "page": "Sayfa: {{$a}}",
+    "page": "Sayfa",
     "pageexists": "Bu sayfa zaten var.",
     "pagename": "Sayfa adı",
     "wrongversionlock": "Başka bir kullanıcı sizin düzenlemeniz sırasında bu sayfayı düzenledi ve içeriğiniz geçersiz."
diff --git a/www/addons/mod/wiki/lang/uk.json b/www/addons/mod/wiki/lang/uk.json
index ed4f6c6208e..c19abe51cb9 100644
--- a/www/addons/mod/wiki/lang/uk.json
+++ b/www/addons/mod/wiki/lang/uk.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Заголовок нової сторінки",
     "nocontent": "Немає контенту для цієї сторінки",
     "notingroup": "Не в групі",
-    "page": "Сторінка: {{$a}}",
+    "page": "Сторінка",
     "pageexists": "Ця сторінка вже існує. Перенаправити до неї.",
     "pagename": "Назва сторінки",
     "subwiki": "Сабвікі",
diff --git a/www/addons/mod/wiki/lang/zh-cn.json b/www/addons/mod/wiki/lang/zh-cn.json
index 4c35a760a4e..1eb2563a117 100644
--- a/www/addons/mod/wiki/lang/zh-cn.json
+++ b/www/addons/mod/wiki/lang/zh-cn.json
@@ -7,7 +7,7 @@
     "newpagetitle": "新页面标题",
     "nocontent": "此页面无内容",
     "notingroup": "不在小组内",
-    "page": "页面：{{$a}}",
+    "page": "页",
     "pageexists": "页面已存在。重定向到它",
     "pagename": "页码",
     "wrongversionlock": "在您正编辑此页面时，另一个人已经做了编辑，所以您的修改已过时。"
diff --git a/www/addons/mod/wiki/lang/zh-tw.json b/www/addons/mod/wiki/lang/zh-tw.json
index 4b5e9affdde..30fd50ff0d8 100644
--- a/www/addons/mod/wiki/lang/zh-tw.json
+++ b/www/addons/mod/wiki/lang/zh-tw.json
@@ -10,7 +10,7 @@
     "newpagetitle": "新頁面標題",
     "nocontent": "在這一頁裡沒有內容",
     "notingroup": "不在群體",
-    "page": "頁面：{{$a}}",
+    "page": "頁",
     "pageexists": "這頁面已經存在。",
     "pagename": "頁面名稱",
     "subwiki": "Subwiki",
diff --git a/www/addons/notifications/lang/cs.json b/www/addons/notifications/lang/cs.json
index b6fcbaa749e..7e1d1531bb2 100644
--- a/www/addons/notifications/lang/cs.json
+++ b/www/addons/notifications/lang/cs.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Chyba při načítání oznámení.",
     "notificationpreferences": "Nastavení oznámení",
-    "notifications": "Oznámení",
+    "notifications": "Informace",
     "playsound": "Přehrát zvuk",
     "therearentnotificationsyet": "Nejsou žádná sdělení"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/da.json b/www/addons/notifications/lang/da.json
index 56219f0789c..2e190040f35 100644
--- a/www/addons/notifications/lang/da.json
+++ b/www/addons/notifications/lang/da.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fejl ved hentning af underretninger",
     "notificationpreferences": "Indstillinger for underretninger",
-    "notifications": "Underretninger",
+    "notifications": "Beskeder",
     "therearentnotificationsyet": "Der er ingen underretninger"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/de.json b/www/addons/notifications/lang/de.json
index 276f9265449..5ac4171f7f2 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
     "notificationpreferences": "Benachrichtigungen konfigurieren",
-    "notifications": "Benachrichtigungen",
+    "notifications": "Systemmitteilungen",
     "playsound": "Audio abspielen",
     "therearentnotificationsyet": "Keine Mitteilungen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es-mx.json b/www/addons/notifications/lang/es-mx.json
index 238d8cfaa15..1049b40c7a5 100644
--- a/www/addons/notifications/lang/es-mx.json
+++ b/www/addons/notifications/lang/es-mx.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
     "notificationpreferences": "Preferencias de notificación",
-    "notifications": "Notificaciones",
+    "notifications": "Avisos",
     "playsound": "Reproducir sonido",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es.json b/www/addons/notifications/lang/es.json
index dcd161eb585..85f60ad941b 100644
--- a/www/addons/notifications/lang/es.json
+++ b/www/addons/notifications/lang/es.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
     "notificationpreferences": "Preferencias de notificación",
-    "notifications": "Notificaciones",
+    "notifications": "Avisos",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/fa.json b/www/addons/notifications/lang/fa.json
index 4db075e4716..f641bf74805 100644
--- a/www/addons/notifications/lang/fa.json
+++ b/www/addons/notifications/lang/fa.json
@@ -1,5 +1,5 @@
 {
     "notificationpreferences": "ترجیحات اطلاعیه‌ها",
-    "notifications": "اطلاعیه‌ها",
+    "notifications": "تذکرات",
     "therearentnotificationsyet": "هیچ هشداری وجود ندارد"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/he.json b/www/addons/notifications/lang/he.json
index 465beb792a8..39e5a6ed7a5 100644
--- a/www/addons/notifications/lang/he.json
+++ b/www/addons/notifications/lang/he.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "שגיאה בטעינת התראות",
     "notificationpreferences": "העדפות הודעות",
-    "notifications": "הודעות",
+    "notifications": "עדכונים והודעות",
     "therearentnotificationsyet": "אין התראות"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/pt-br.json b/www/addons/notifications/lang/pt-br.json
index c7ff82adb19..46bf5f98e68 100644
--- a/www/addons/notifications/lang/pt-br.json
+++ b/www/addons/notifications/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Erro ao receber notificações",
     "notificationpreferences": "Preferências de notificação",
-    "notifications": "Notificações",
+    "notifications": "Avisos",
     "therearentnotificationsyet": "Não há notificações"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sv.json b/www/addons/notifications/lang/sv.json
index 024d0fef099..1a785f61e66 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,5 +1,5 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
-    "notifications": "Meddelande",
+    "notifications": "Administration",
     "therearentnotificationsyet": "Det finns inga meddelanden"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/zh-cn.json b/www/addons/notifications/lang/zh-cn.json
index 7d236d7f15d..3afb489f861 100644
--- a/www/addons/notifications/lang/zh-cn.json
+++ b/www/addons/notifications/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
-    "notifications": "通知",
+    "notifications": "通告",
     "therearentnotificationsyet": "没有通知"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ar.json b/www/addons/participants/lang/ar.json
index 6ba30232626..91db007489d 100644
--- a/www/addons/participants/lang/ar.json
+++ b/www/addons/participants/lang/ar.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "لم يتم العثور على مشاركين في هذا المقرر الدراسي",
-    "participants": "مشاركون"
+    "participants": "المشتركون"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ca.json b/www/addons/participants/lang/ca.json
index 1c214eda823..8fd771b0c76 100644
--- a/www/addons/participants/lang/ca.json
+++ b/www/addons/participants/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No s'han trobat participants.",
+    "noparticipants": "No s'ha trobat cap participant en aquest curs",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/cs.json b/www/addons/participants/lang/cs.json
index 4ae4dd88392..7e0a4430c6b 100644
--- a/www/addons/participants/lang/cs.json
+++ b/www/addons/participants/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nebyl nalezen žádný účastník",
-    "participants": "Přispěvatelé"
+    "noparticipants": "Pro tento kurz nenalezen žádný účastník",
+    "participants": "Účastníci"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/da.json b/www/addons/participants/lang/da.json
index 28829f714a6..69f209799f8 100644
--- a/www/addons/participants/lang/da.json
+++ b/www/addons/participants/lang/da.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Ingen deltagere fundet.",
+    "noparticipants": "Ingen deltagere fundet på dette kursus",
     "participants": "Deltagere"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/de.json b/www/addons/participants/lang/de.json
index 087591cfe5d..343c2a2709e 100644
--- a/www/addons/participants/lang/de.json
+++ b/www/addons/participants/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Keine Teilnehmer gefunden",
+    "noparticipants": "Keine Teilnehmer/innen für diesen Kurs gefunden",
     "participants": "Teilnehmer/innen"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es-mx.json b/www/addons/participants/lang/es-mx.json
index 5c6014bd522..62113ad2ef9 100644
--- a/www/addons/participants/lang/es-mx.json
+++ b/www/addons/participants/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se encontraron participantes.",
+    "noparticipants": "No se encontraron participantes en este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/eu.json b/www/addons/participants/lang/eu.json
index fbecb8a5f95..0a84454d0c0 100644
--- a/www/addons/participants/lang/eu.json
+++ b/www/addons/participants/lang/eu.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Ez da partaiderik aurkitu.",
+    "noparticipants": "Ez da partaiderik aurkitu ikastaro honetarako",
     "participants": "Partaideak"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/fa.json b/www/addons/participants/lang/fa.json
index 90d51eaa038..34112f687d7 100644
--- a/www/addons/participants/lang/fa.json
+++ b/www/addons/participants/lang/fa.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "هیچ شرکت‌کننده‌ای پیدا نشد.",
+    "noparticipants": "این درس شرکت‌کننده‌ای ندارد",
     "participants": "شرکت کنندگان"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/fr.json b/www/addons/participants/lang/fr.json
index 0a75ac6f8c8..fc97610a609 100644
--- a/www/addons/participants/lang/fr.json
+++ b/www/addons/participants/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Aucun participant trouvé",
+    "noparticipants": "Aucun participant trouvé dans ce cours",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/he.json b/www/addons/participants/lang/he.json
index 5c487a42ed3..669a9a80dfd 100644
--- a/www/addons/participants/lang/he.json
+++ b/www/addons/participants/lang/he.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "טרם צורפו משתתפים.",
+    "noparticipants": "לא נמצאו משתתפים עבור קורס זה",
     "participants": "משתתפים"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/hu.json b/www/addons/participants/lang/hu.json
index f1cb5cf7cf6..929c510a598 100644
--- a/www/addons/participants/lang/hu.json
+++ b/www/addons/participants/lang/hu.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nincs résztvevő.",
+    "noparticipants": "A kurzushoz nincsenek résztvevők!",
     "participants": "Résztvevők"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/it.json b/www/addons/participants/lang/it.json
index 21d39dce004..0d16202be57 100644
--- a/www/addons/participants/lang/it.json
+++ b/www/addons/participants/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Non sono stati trovati partecipanti.",
-    "participants": "Sono autorizzati ad inserire record"
+    "noparticipants": "In questo corso non sono stati trovati partecipanti",
+    "participants": "Partecipanti"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ja.json b/www/addons/participants/lang/ja.json
index ff5fe88970c..8fbbcbb3976 100644
--- a/www/addons/participants/lang/ja.json
+++ b/www/addons/participants/lang/ja.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "参加者は見つかりませんでした。",
+    "noparticipants": "このコースには参加者が登録されていません。",
     "participants": "参加者"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/nl.json b/www/addons/participants/lang/nl.json
index a7b39b547fc..33b07998414 100644
--- a/www/addons/participants/lang/nl.json
+++ b/www/addons/participants/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Geen deelnemers gevonden",
+    "noparticipants": "Geen gebruikers gevonden in deze cursus",
     "participants": "Deelnemers"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pl.json b/www/addons/participants/lang/pl.json
index adceacdf5a7..5025bf740ec 100644
--- a/www/addons/participants/lang/pl.json
+++ b/www/addons/participants/lang/pl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nie znaleziono uczestników.",
+    "noparticipants": "Nie znaleziono uczestników w tym kursie",
     "participants": "Uczestnicy"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt-br.json b/www/addons/participants/lang/pt-br.json
index a107a2f8ee1..e54b7e5dc2c 100644
--- a/www/addons/participants/lang/pt-br.json
+++ b/www/addons/participants/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nenhum participante encontrado.",
+    "noparticipants": "Nenhum participante encontrado para este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt.json b/www/addons/participants/lang/pt.json
index e10e9120f10..2f6d048e8df 100644
--- a/www/addons/participants/lang/pt.json
+++ b/www/addons/participants/lang/pt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Não foram encontrados participantes.",
-    "participants": "Utilizadores"
+    "noparticipants": "Não foram encontrados participantes para esta disciplina",
+    "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ru.json b/www/addons/participants/lang/ru.json
index bcfa292346e..590333bcb2f 100644
--- a/www/addons/participants/lang/ru.json
+++ b/www/addons/participants/lang/ru.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Участники не найдены.",
+    "noparticipants": "Не найдены участники для этого курса.",
     "participants": "Участники"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sv.json b/www/addons/participants/lang/sv.json
index 54221f5de3f..27833cf5412 100644
--- a/www/addons/participants/lang/sv.json
+++ b/www/addons/participants/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Inga deltagare funna.",
+    "noparticipants": "Inga deltagare hittades för denna kurs",
     "participants": "Deltagare"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/tr.json b/www/addons/participants/lang/tr.json
index 307ef1e120f..9532bf04f39 100644
--- a/www/addons/participants/lang/tr.json
+++ b/www/addons/participants/lang/tr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Hiçbir katılımcı bulunamadı.",
+    "noparticipants": "Bu ders için hiç katılımcı bulunamadı",
     "participants": "Katılımcılar"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/uk.json b/www/addons/participants/lang/uk.json
index 2899a99f372..9a3ebc4a3b3 100644
--- a/www/addons/participants/lang/uk.json
+++ b/www/addons/participants/lang/uk.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Жодного учасника не знайдено",
+    "noparticipants": "Не знайдені учасники для цього курсу",
     "participants": "Учасники"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-cn.json b/www/addons/participants/lang/zh-cn.json
index 4a9403ae5c7..8c621b3fa17 100644
--- a/www/addons/participants/lang/zh-cn.json
+++ b/www/addons/participants/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "未找到此项课程的参与者",
-    "participants": "参与者"
+    "participants": "成员"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-tw.json b/www/addons/participants/lang/zh-tw.json
index 0cd5f5275e4..69584ab153f 100644
--- a/www/addons/participants/lang/zh-tw.json
+++ b/www/addons/participants/lang/zh-tw.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "沒有發現參與者",
-    "participants": "參與者"
+    "noparticipants": "這一課程找不到參與者",
+    "participants": "成員"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ar.json b/www/core/components/course/lang/ar.json
index 09e2bceac89..47a7f04e4bb 100644
--- a/www/core/components/course/lang/ar.json
+++ b/www/core/components/course/lang/ar.json
@@ -4,5 +4,5 @@
     "couldnotloadsections": "لم يتم تحميل كل الأقسام، من فضلك حاول مرة أخرى لاحقاَ",
     "errordownloadingsection": "خطأ عن تنزيل الأقسام",
     "hiddenfromstudents": "مخفي عن الطلاب",
-    "showall": "أعرض جميع الأسئلة في صفحة واحدة"
+    "showall": "عرض الكل {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/bg.json b/www/core/components/course/lang/bg.json
index 5efc587d297..56a7382e3aa 100644
--- a/www/core/components/course/lang/bg.json
+++ b/www/core/components/course/lang/bg.json
@@ -5,5 +5,5 @@
     "couldnotloadsections": "Неуспех при зареждането на секциите, моля опитайте отново.",
     "hiddenfromstudents": "Скрит от ученици",
     "nocontentavailable": "В момента няма достъпно съдържание.",
-    "showall": "Показване на всички въпроси на една страница"
+    "showall": "Показване на всичките {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index 840bea85604..fb53f90a1eb 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
-    "showall": "Mostra totes les preguntes en una pàgina",
+    "showall": "Mostra'ls tots ({{$a}})",
     "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index c9c69290ccd..6de4fc23e30 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
-    "showall": "Zobrazit všechny úlohy na jedné stránce",
+    "showall": "Ukázat všechny {{$a}}",
     "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/da.json b/www/core/components/course/lang/da.json
index eb68ae4bf3e..2d70a448b4f 100644
--- a/www/core/components/course/lang/da.json
+++ b/www/core/components/course/lang/da.json
@@ -9,5 +9,5 @@
     "hiddenfromstudents": "Skjult for studerende",
     "nocontentavailable": "Intet indhold tilgængeligt lige nu.",
     "overriddennotice": "Din endelige karakter fra denne aktivitet blev justeret manuelt.",
-    "showall": "Vis alle spørgsmål på en side"
+    "showall": "Vis alle {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index 82fdbc2a7d5..ef581d50890 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
     "nocontentavailable": "Momentan sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
-    "showall": "Alle Fragen auf einer Seite anzeigen",
+    "showall": "Alle {{$a}} anzeigen",
     "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index ad864c0ff41..7c86c671cc8 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -16,5 +16,5 @@
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Εμφάνιση όλων των ερωτήσεων σε μία σελίδα"
+    "showall": "Προβολή όλων {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index 2bf6762b6e9..225893e56e3 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todas las preguntas en una página",
+    "showall": "Mostrar {{$a}}",
     "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es.json b/www/core/components/course/lang/es.json
index d1c3a6372c2..c8cdf68dff8 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -16,6 +16,6 @@
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "No hay contenido disponible en este momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todas las preguntas en una página",
+    "showall": "Mostrar {{$a}}",
     "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/eu.json b/www/core/components/course/lang/eu.json
index bbb17ee48ce..5c01bf83579 100644
--- a/www/core/components/course/lang/eu.json
+++ b/www/core/components/course/lang/eu.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Ezkutuan ikasleentzat",
     "nocontentavailable": "Ez dago edukirik eskuragarri momentu honetan.",
     "overriddennotice": "Jarduera honetako zure azken kalifikazioa eskuz egokitu da.",
-    "showall": "Galdera guztiak orri batean erakutsi",
+    "showall": "Erakutsi denak: {{$a}}",
     "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index 21ef443c8c8..5000e3146db 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -9,6 +9,6 @@
     "couldnotloadsectioncontent": "محتوای قسمت نتوانست بارگیری شود. لطفا بعدا دوباره تلاش کنید.",
     "couldnotloadsections": "قسمت‌ها نتوانستند بارگیری شوند. لطفا بعدا دوباره تلاش کنید.",
     "hiddenfromstudents": "پنهان از شاگردان",
-    "showall": "نمایش همهٔ سؤال‌ها در یک صفحه",
+    "showall": "نمایش همه {{$a}}",
     "useactivityonbrowser": "البته همچنان می‌توانید با استفاده از مرورگر دستگاه خود، از آن استفاده کنید."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index 511b6fcedf4..a0ac1336588 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
-    "showall": "Afficher toutes les questions sur une page",
+    "showall": "Afficher tous les {{$a}}",
     "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/he.json b/www/core/components/course/lang/he.json
index e33a09d232c..413e5343000 100644
--- a/www/core/components/course/lang/he.json
+++ b/www/core/components/course/lang/he.json
@@ -6,5 +6,5 @@
     "hiddenfromstudents": "מוסתר בפני סטודנטים",
     "nocontentavailable": "אין תוכן זמין כרגע.",
     "overriddennotice": "הציון הסופי שלך מפעילות זו הותאם ידנית.",
-    "showall": "הצגת כל השאלות בעמוד אחד"
+    "showall": "תצוגת כל ה-{{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/hu.json b/www/core/components/course/lang/hu.json
index 245cb9bc676..cfa53063abb 100644
--- a/www/core/components/course/lang/hu.json
+++ b/www/core/components/course/lang/hu.json
@@ -2,5 +2,5 @@
     "contents": "Tartalom",
     "hiddenfromstudents": "Tanulók elől rejtve",
     "overriddennotice": "A tevékenységgel kapcsolatos végső pontja kézzel módosítva lett.",
-    "showall": "Minden kérdés egy oldalon látsszon"
+    "showall": "Minden {{$a}} megjelenítése"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index 2b09768bc49..82112c25cdd 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -9,5 +9,5 @@
     "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutte le domande nella stessa pagina"
+    "showall": "Visualizza tutti i {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ja.json b/www/core/components/course/lang/ja.json
index 78b79ff1fdc..2e41ef36acc 100644
--- a/www/core/components/course/lang/ja.json
+++ b/www/core/components/course/lang/ja.json
@@ -3,5 +3,5 @@
     "contents": "コンテンツ",
     "hiddenfromstudents": "学生から非表示",
     "overriddennotice": "この活動に関するあなたの評点は手動で調整されました。",
-    "showall": "すべての問題を1ページに表示する"
+    "showall": "すべての {{$a}} を表示する"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/lt.json b/www/core/components/course/lang/lt.json
index 46edcd17afa..39c1c02b24e 100644
--- a/www/core/components/course/lang/lt.json
+++ b/www/core/components/course/lang/lt.json
@@ -16,6 +16,6 @@
     "hiddenfromstudents": "Paslėpta nuo besimokančiųjų",
     "nocontentavailable": "Turinys šiuo metu nepasiekiamas.",
     "overriddennotice": "Šios veiklos galutinis įvertis buvo koreguotas rankiniu būdu.",
-    "showall": "Rodyti visus klausimus viename puslapyje",
+    "showall": "Rodyti visus {{$a}}",
     "useactivityonbrowser": "Galite naudoti savo naršyklėje."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index 4386ada4fd0..3f619164387 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
-    "showall": "Toon alle vragen op één pagina",
+    "showall": "Laat alle {{$a}} zien",
     "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pl.json b/www/core/components/course/lang/pl.json
index 231bd7443da..713d5921b70 100644
--- a/www/core/components/course/lang/pl.json
+++ b/www/core/components/course/lang/pl.json
@@ -2,5 +2,5 @@
     "contents": "Zawartość",
     "hiddenfromstudents": "Ukryte przed studentami",
     "overriddennotice": "Twoja ocena końcowa z tej aktywności została ręcznie zmieniona",
-    "showall": "Pokaż wszystkie pytania na stronie"
+    "showall": "Pokaż wszystkie {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index 4823f129bed..8a77246be40 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
     "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente.",
-    "showall": "Mostrar todas as questões em uma página",
+    "showall": "Mostrar todos os {{$a}}",
     "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt.json b/www/core/components/course/lang/pt.json
index 8256b03f877..8ba4d0a7688 100644
--- a/www/core/components/course/lang/pt.json
+++ b/www/core/components/course/lang/pt.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Oculto para os alunos",
     "nocontentavailable": "Nenhum conteúdo disponível neste momento.",
     "overriddennotice": "A sua nota final nesta atividade foi alterada manualmente na pauta.",
-    "showall": "Mostrar todas as perguntas numa página",
+    "showall": "Mostrar tudo {{$a}}",
     "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ro.json b/www/core/components/course/lang/ro.json
index 4295324915a..8db8d4081f2 100644
--- a/www/core/components/course/lang/ro.json
+++ b/www/core/components/course/lang/ro.json
@@ -10,5 +10,5 @@
     "hiddenfromstudents": "Ascuns de cursanţi",
     "nocontentavailable": "Pentru moment nu există conținut.",
     "overriddennotice": "Nota finală obţinută de dumneavoastră pentru această activitate a fost ajustată manual.",
-    "showall": "Afişează toate întrebările pe o singură pagină"
+    "showall": "Afişează toate {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index f05042ab16d..0d6968e390e 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -6,5 +6,5 @@
     "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Отображать все вопросы на одной странице"
+    "showall": "Показать все {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index d4f3f97d71b..ecabe8e2fc5 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -10,5 +10,5 @@
     "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla frågor på en sida"
+    "showall": "Visa alla {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/tr.json b/www/core/components/course/lang/tr.json
index 8d09b5affd9..f3d9b003fd5 100644
--- a/www/core/components/course/lang/tr.json
+++ b/www/core/components/course/lang/tr.json
@@ -3,5 +3,5 @@
     "contents": "İçerik",
     "hiddenfromstudents": "Öğrencilerden gizli",
     "overriddennotice": "Bu etkinlikteki final notunuz, elle ayarlandı.",
-    "showall": "Bütün soruları tek sayfada göster"
+    "showall": "Tümünü göster: {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/uk.json b/www/core/components/course/lang/uk.json
index b142c43a2f0..11ad1a92dc2 100644
--- a/www/core/components/course/lang/uk.json
+++ b/www/core/components/course/lang/uk.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Сховане від студентів",
     "nocontentavailable": "Немає контенту, доступного в даний момент.",
     "overriddennotice": "Ваші фінальні бали з даної активності були відкореговані вручну.",
-    "showall": "Показати всі питання на одній сторінці",
+    "showall": "Показати всі {{$a}}",
     "useactivityonbrowser": "Ви все ще можете використовувати його за допомогою браузера пристрою."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-cn.json b/www/core/components/course/lang/zh-cn.json
index 85734e6d23c..5a50033ab9f 100644
--- a/www/core/components/course/lang/zh-cn.json
+++ b/www/core/components/course/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "contents": "内容",
     "hiddenfromstudents": "对学生隐藏",
     "overriddennotice": "您在该活动中的最终成绩将自动调整。",
-    "showall": "所有题目显示在一页"
+    "showall": "显示所有（{{$a}}）"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-tw.json b/www/core/components/course/lang/zh-tw.json
index dcdeaf4d160..10ecfebf0bf 100644
--- a/www/core/components/course/lang/zh-tw.json
+++ b/www/core/components/course/lang/zh-tw.json
@@ -16,6 +16,6 @@
     "hiddenfromstudents": "對學生隱藏",
     "nocontentavailable": "目前無內容可使用",
     "overriddennotice": "您在這活動的最後成績是手動調整的。",
-    "showall": "在一頁中顯示所有題目",
+    "showall": "顯示全部{{$a}}",
     "useactivityonbrowser": "你可以以瀏覽器一直使用"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/ar.json b/www/core/components/courses/lang/ar.json
index d78db76df94..f96af19297b 100644
--- a/www/core/components/courses/lang/ar.json
+++ b/www/core/components/courses/lang/ar.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "يسمح للمستخدمين الضيوف بالدخول إلى هذا المقرر الدراسي",
     "availablecourses": "المقررات الدراسية المتاحة",
-    "categories": "فئات",
+    "categories": "تصنيفات المقررات الدراسية",
     "courses": "تصنيف المقررات الدراسية",
     "enrolme": "سجلني",
     "frontpage": "الصفحة الرئيسية",
     "mycourses": "مقرراتي الدراسية",
-    "nocourses": "لا توجد مقررات دراسية بعد",
+    "nocourses": "لا يوجد معلومات لمقرر دراسي ليتم اظهرها",
     "nocoursesyet": "لا توجد مقررات دراسية لهذه الفئة",
-    "nosearchresults": "لا يوجد نتائج",
+    "nosearchresults": "لا توجد نتائج لهذا البحث",
     "notenroled": "أنت لست مسجلاً كطالب في هذا المقرر",
-    "password": "كلمة السر",
+    "password": "كلمة المرور",
     "search": "بحث",
-    "searchcourses": "البحث في المقررات الدراسية"
+    "searchcourses": "بحث مقررات دراسية"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/bg.json b/www/core/components/courses/lang/bg.json
index 185273896cc..704b295e74a 100644
--- a/www/core/components/courses/lang/bg.json
+++ b/www/core/components/courses/lang/bg.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "В този курс могат да влизат гости",
     "availablecourses": "Налични курсове",
-    "categories": "Категории",
+    "categories": "Категории курсове",
     "courses": "Курсове",
     "enrolme": "Запишете ме",
     "errorloadcourses": "Грешка при зареждането на курсовете.",
     "frontpage": "Заглавна страница",
     "mycourses": "Моите курсове",
-    "nocourses": "Все още няма курсове",
+    "nocourses": "Няма информация за курса, която да бъде показана.",
     "nocoursesyet": "Няма курсове в тази категория",
-    "nosearchresults": "Няма резултати",
-    "password": "Парола",
+    "nosearchresults": "Няма открити резултати за Вашето търсене",
+    "password": "Ключ за записване",
     "search": "Търсене",
     "searchcourses": "Търсене на курсове"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/ca.json b/www/core/components/courses/lang/ca.json
index 48a43540ee7..bca799e7d49 100644
--- a/www/core/components/courses/lang/ca.json
+++ b/www/core/components/courses/lang/ca.json
@@ -2,7 +2,7 @@
     "allowguests": "Aquest curs permet entrar als usuaris visitants",
     "availablecourses": "Cursos disponibles",
     "cannotretrievemorecategories": "No es poden recuperar categories més enllà del nivell {{$a}}.",
-    "categories": "Categories",
+    "categories": "Categories de cursos",
     "confirmselfenrol": "Segur que voleu autoinscriure-us en aquest curs?",
     "courses": "Cursos",
     "enrolme": "Inscriu-me",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filtrar els meus cursos",
     "frontpage": "Pàgina principal",
     "mycourses": "Els meus cursos",
-    "nocourses": "Encara no hi ha cursos",
+    "nocourses": "No hi ha informació de cursos per mostrar.",
     "nocoursesyet": "No hi ha cursos en aquesta categoria",
-    "nosearchresults": "Cap resultat",
+    "nosearchresults": "La cerca no ha obtingut resultats",
     "notenroled": "No us heu inscrit en aquest curs",
     "notenrollable": "No podeu autoinscriure-us en aquest curs.",
-    "password": "Contrasenya",
-    "search": "Cerca...",
+    "password": "Clau d'inscripció",
+    "search": "Cerca",
     "searchcourses": "Cerca cursos",
     "searchcoursesadvice": "Podeu fer servir el botó de cercar cursos per accedir als cursos com a convidat o autoinscriure-us en cursos que ho permetin.",
     "selfenrolment": "Autoinscripció",
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 2149d9de359..582d3de5166 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -2,7 +2,7 @@
     "allowguests": "Tento kurz je otevřen i pro hosty",
     "availablecourses": "Dostupné kurzy",
     "cannotretrievemorecategories": "Kategorie hlubší než úroveň {{$a}} nelze načíst.",
-    "categories": "Kategorie",
+    "categories": "Kategorie kurzů",
     "confirmselfenrol": "Jste si jisti, že chcete zapsat se do tohoto kurzu?",
     "courses": "Kurzy",
     "enrolme": "Zapsat se do kurzu",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
-    "nocourses": "Žádné kurzy",
+    "nocourses": "Žádné dostupné informace o kurzech",
     "nocoursesyet": "Žádný kurz v této kategorii",
-    "nosearchresults": "Žádné výsledky",
+    "nosearchresults": "Vaše vyhledávání nepřineslo žádný výsledek",
     "notenroled": "Nejste zapsáni v tomto kurzu",
     "notenrollable": "Do tohoto kurzu se nemůžete sami zapsat.",
-    "password": "Heslo",
-    "search": "Vyhledávání...",
+    "password": "Sdílené heslo",
+    "search": "Hledat",
     "searchcourses": "Vyhledat kurzy",
     "searchcoursesadvice": "Můžete použít tlačítko Vyhledat kurzy, pracovat jako host nebo se zapsat do kurzů, které to umožňují.",
     "selfenrolment": "Zápis sebe sama",
diff --git a/www/core/components/courses/lang/da.json b/www/core/components/courses/lang/da.json
index d54d7eaf1b1..f5f007f4d13 100644
--- a/www/core/components/courses/lang/da.json
+++ b/www/core/components/courses/lang/da.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Dette kursus tillader gæster",
     "availablecourses": "Tilgængelige kurser",
-    "categories": "Kategorier",
+    "categories": "Kursuskategorier",
     "confirmselfenrol": "Er du sikker på at du ønsker at tilmelde dig dette kursus?",
     "courses": "Alle kurser",
     "enrolme": "Tilmeld mig",
@@ -11,14 +11,14 @@
     "filtermycourses": "Filtrer mit kursus",
     "frontpage": "Forside",
     "mycourses": "Mine kurser",
-    "nocourses": "Der er endnu ingen kurser",
+    "nocourses": "Du er ikke tilmeldt nogen kurser.",
     "nocoursesyet": "Der er ingen kurser i denne kategori",
-    "nosearchresults": "Ingen resultater",
+    "nosearchresults": "Der var ingen beskeder der opfyldte søgekriteriet",
     "notenroled": "Du er ikke tilmeldt dette kursus",
     "notenrollable": "Du kan ikke selv tilmelde dig dette kursus.",
-    "password": "Adgangskode",
-    "search": "Søg...",
-    "searchcourses": "Søg kurser",
+    "password": "Delt hemmelig streng",
+    "search": "Søg",
+    "searchcourses": "Søg efter kurser",
     "searchcoursesadvice": "Du kan bruge knappen kursussøgning for at få adgang som gæst eller tilmelde dig kurser der tillader det.",
     "selfenrolment": "Selvtilmelding",
     "totalcoursesearchresults": "Kurser i alt: {{$a}}"
diff --git a/www/core/components/courses/lang/de.json b/www/core/components/courses/lang/de.json
index 44a6eb68eef..eb00eb53792 100644
--- a/www/core/components/courses/lang/de.json
+++ b/www/core/components/courses/lang/de.json
@@ -2,7 +2,7 @@
     "allowguests": "Der Kurs ist für Gäste zugänglich",
     "availablecourses": "Kursliste",
     "cannotretrievemorecategories": "Kursbereiche tiefer als Level {{$a}} können nicht abgerufen werden.",
-    "categories": "Kategorien",
+    "categories": "Kursbereiche",
     "confirmselfenrol": "Möchten Sie sich selbst in diesen Kurs einschreiben?",
     "courses": "Kurse",
     "enrolme": "Einschreiben",
@@ -13,13 +13,13 @@
     "filtermycourses": "Meine Kurse filtern",
     "frontpage": "Startseite",
     "mycourses": "Meine Kurse",
-    "nocourses": "Keine Kurse",
+    "nocourses": "Keine Kursinformationen",
     "nocoursesyet": "Keine Kurse in diesem Kursbereich",
-    "nosearchresults": "Keine Ergebnisse",
+    "nosearchresults": "Keine Suchergebnisse",
     "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben",
     "notenrollable": "Sie können sich nicht selbst in diesen Kurs einschreiben.",
-    "password": "Gastschlüssel",
-    "search": "Suchen...",
+    "password": "Kennwort",
+    "search": "Suchen",
     "searchcourses": "Kurse suchen",
     "searchcoursesadvice": "Sie können Kurse suchen, um als Gast teilzunehmen oder sich selbst einzuschreiben, falls dies erlaubt ist.",
     "selfenrolment": "Selbsteinschreibung",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index c229315e83e..50e1c5138ef 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Σε αυτό το μάθημα επιτρέπονται και οι επισκέπτες",
     "availablecourses": "Διαθέσιμα Μαθήματα",
-    "categories": "Κατηγορίες",
+    "categories": "Κατηγορίες μαθημάτων",
     "confirmselfenrol": "Είστε σίγουροι ότι θέλετε να εγγραφείτε σε αυτό το μάθημα;",
     "courses": "Μαθήματα",
     "enrolme": "Εγγραφή",
@@ -11,13 +11,13 @@
     "filtermycourses": "Φιλτράρισμα των μαθημάτων μου",
     "frontpage": "Αρχική σελίδα",
     "mycourses": "Τα μαθήματά μου",
-    "nocourses": "Δεν υπάρχουν μαθήματα ακόμα",
+    "nocourses": "Δεν υπάρχει πληροφορία του μαθήματος για προβολή.",
     "nocoursesyet": "Δεν υπάρχουν μαθήματα σε αυτήν την κατηγορία",
     "nosearchresults": "Δε βρέθηκαν αποτελέσματα για την αναζήτησή σας",
     "notenroled": "Δεν είσαι εγγεγραμμένος σε αυτό το μάθημα",
     "notenrollable": "Δεν μπορείτε να αυτο-εγγραφείτε σε αυτό το μάθημα.",
-    "password": "Κωδικός πρόσβασης",
-    "search": "Αναζήτηση...",
+    "password": "Κωδικός",
+    "search": "Αναζήτηση",
     "searchcourses": "Αναζήτηση μαθημάτων",
     "searchcoursesadvice": "Μπορείτε να χρησιμοποιήσετε το κουμπί Αναζήτηση μαθημάτων για πρόσβαση ως επισκέπτης ή για να αυτο-εγγραφείτε σε μαθήματα που το επιτρέπουν.",
     "selfenrolment": "Αυτο-εγγραφή",
diff --git a/www/core/components/courses/lang/es-mx.json b/www/core/components/courses/lang/es-mx.json
index 59e8d8d7f1e..b22f87dccd0 100644
--- a/www/core/components/courses/lang/es-mx.json
+++ b/www/core/components/courses/lang/es-mx.json
@@ -13,13 +13,13 @@
     "filtermycourses": "<<<filtrar mis cursos",
     "frontpage": "Portada",
     "mycourses": "Mis cursos",
-    "nocourses": "Ningun curso",
+    "nocourses": "No hay información del curso para mostrar.",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "Sin resultados",
+    "nosearchresults": "La búsqueda no produjo resultados",
     "notenroled": "Usted no está inscrito en este curso",
     "notenrollable": "Usted no puede inscribirse a Usted mismo en este curso.",
-    "password": "Contraseña",
-    "search": "Buscar...",
+    "password": "Secreto Compartido",
+    "search": "Buscar",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Usted puede usar el botón de 'buscar cursos' para acceder como invitado o para inscribirse Usted mismo en los cursos que lo permitan.",
     "selfenrolment": "Auto-inscripción",
diff --git a/www/core/components/courses/lang/es.json b/www/core/components/courses/lang/es.json
index fa83f38a1a7..db6bce4e3e7 100644
--- a/www/core/components/courses/lang/es.json
+++ b/www/core/components/courses/lang/es.json
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtrar mis cursos",
     "frontpage": "Página Principal",
     "mycourses": "Mis cursos",
-    "nocourses": "Sin cursos",
+    "nocourses": "No hay información del curso para mostrar.",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "Sin resultados",
+    "nosearchresults": "La búsqueda no produjo resultados",
     "notenroled": "Usted no está matriculado en este curso",
     "notenrollable": "No puede auto-matricularse en este curso.",
-    "password": "Contraseña",
-    "search": "Buscar...",
+    "password": "Clave de matriculación",
+    "search": "Buscar",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Puede utilizar el botón de buscar cursos para acceder como invitado o auto-matricularse en los cursos que lo permitan.",
     "selfenrolment": "Auto-matriculación",
diff --git a/www/core/components/courses/lang/eu.json b/www/core/components/courses/lang/eu.json
index 432752fcf75..93e356a6167 100644
--- a/www/core/components/courses/lang/eu.json
+++ b/www/core/components/courses/lang/eu.json
@@ -2,7 +2,7 @@
     "allowguests": "Ikastaro honetan bisitariak sar daitezke",
     "availablecourses": "Eskura dauden ikastaroak",
     "cannotretrievemorecategories": "{{$a}}. maila baino sakonagoko kategoriak ezin dira eskuratu.",
-    "categories": "Kategoriak",
+    "categories": "Ikastaro-kategoriak",
     "confirmselfenrol": "Ziur zaude ikastaro honetan izena eman nahi duzula?",
     "courses": "Ikastaroak",
     "enrolme": "Matrikula nazazu",
@@ -13,14 +13,14 @@
     "filtermycourses": "Nire ikastaroak iragazi",
     "frontpage": "Hasiera-orria",
     "mycourses": "Nire ikastaroak",
-    "nocourses": "Ez dago ikastarorik",
+    "nocourses": "Ez dago ikastaroei buruzko informaziorik",
     "nocoursesyet": "Ez dago ikastarorik kategoria honetan",
-    "nosearchresults": "Emaitzarik ez",
+    "nosearchresults": "Zure bilaketak du ezer topatu",
     "notenroled": "Ez zaude matrikulatuta ikastaro honetan",
     "notenrollable": "Ezin duzu zeure burua matrikulatu ikastaro honetan.",
-    "password": "Pasahitza",
-    "search": "Bilatu...",
-    "searchcourses": "Bilatu ikastaroak",
+    "password": "Partekatutako sekretua",
+    "search": "Bilatu",
+    "searchcourses": "Bilatu Ikastaroak",
     "searchcoursesadvice": "Bilatu botoia erabil dezakezu ikastaroak topatu eta bisitari gisa sartu edo bertan matrikulatzeko ikastaroak baimentzen badu.",
     "selfenrolment": "Matrikulazio automatikoa",
     "totalcoursesearchresults": "Ikastaroak guztira: {{$a}}"
diff --git a/www/core/components/courses/lang/fa.json b/www/core/components/courses/lang/fa.json
index 587cc3dd537..72a50f444ca 100644
--- a/www/core/components/courses/lang/fa.json
+++ b/www/core/components/courses/lang/fa.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "ورود کاربران مهمان به این درس مجاز است",
     "availablecourses": "درس‌های موجود",
-    "categories": "طبقه‌ها",
+    "categories": "طبقه‌های درسی",
     "confirmselfenrol": "آیا مطمئنید که می‌خواهید خود را در این درس ثبت‌نام کنید؟",
     "courses": "درس‌ها",
     "enrolme": "ثبت‌نام من",
@@ -9,11 +9,11 @@
     "filtermycourses": "پالایش درس‌های من",
     "frontpage": "صفحهٔ اول",
     "mycourses": "درس‌های من",
-    "nocourses": "درسی وجود ندارد",
+    "nocourses": "هیچ درسی برای نمایش وجود ندارد",
     "nocoursesyet": "درسی در این طبقه وجود ندارد",
-    "nosearchresults": "بدون نتیجه",
+    "nosearchresults": "نتایجی برای جستجوی شما وجود نداشت.",
     "notenroled": "شما در این درس ثبت‌نام نیستید",
-    "password": "رمز دسترسی",
-    "search": "جستجو...",
-    "searchcourses": "جستجوی درس‌ها"
+    "password": "رمز ورود",
+    "search": "جستجو",
+    "searchcourses": "جستجو بین درس‌ها"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/fr.json b/www/core/components/courses/lang/fr.json
index 6fa919a52d9..cb021a2112d 100644
--- a/www/core/components/courses/lang/fr.json
+++ b/www/core/components/courses/lang/fr.json
@@ -2,7 +2,7 @@
     "allowguests": "Les visiteurs anonymes sont autorisés dans ce cours",
     "availablecourses": "Cours disponibles",
     "cannotretrievemorecategories": "Les catégories de niveau plus grand que {{$a}} ne peuvent pas être chargées.",
-    "categories": "Catégories",
+    "categories": "Catégories de cours",
     "confirmselfenrol": "Voulez-vous vraiment vous inscrire vous-même dans ce cours ?",
     "courses": "Cours",
     "enrolme": "M'inscrire",
@@ -13,14 +13,14 @@
     "filtermycourses": "Filtrer mes cours",
     "frontpage": "Page d'accueil",
     "mycourses": "Mes cours",
-    "nocourses": "Pas de cours",
+    "nocourses": "Aucune information de cours à afficher.",
     "nocoursesyet": "Il n'y a pas encore de cours",
-    "nosearchresults": "Aucun résultat",
+    "nosearchresults": "Cette recherche n'a fourni aucun résultat",
     "notenroled": "Vous n'êtes pas inscrit à ce cours",
     "notenrollable": "Vous ne pouvez pas vous inscrire vous-même à ce cours.",
-    "password": "Mot de passe",
-    "search": "Recherche...",
-    "searchcourses": "Rechercher les cours",
+    "password": "Secret partagé",
+    "search": "Rechercher",
+    "searchcourses": "Rechercher des cours",
     "searchcoursesadvice": "Veuillez utiliser le bouton de recherche de cours pour accéder anonymement à des cours ou vous inscrire vous-même à des cours qui le permettent.",
     "selfenrolment": "Auto-inscription",
     "totalcoursesearchresults": "Nombre de cours : {{$a}}"
diff --git a/www/core/components/courses/lang/he.json b/www/core/components/courses/lang/he.json
index 6a11c6c797e..abb5cf53a41 100644
--- a/www/core/components/courses/lang/he.json
+++ b/www/core/components/courses/lang/he.json
@@ -1,17 +1,17 @@
 {
     "allowguests": "הקורס הזה מרשה למשתמשים אורחים להכנס",
     "availablecourses": "קורסים זמינים",
-    "categories": "קטגוריות",
+    "categories": "קטגוריות קורסים",
     "courses": "קורסים",
     "enrolme": "רשום אותי",
     "errorloadcourses": "התרחשה שגיאה בזמן טעינת הקורסים.",
     "frontpage": "עמוד ראשי",
     "mycourses": "הקורסים שלי",
-    "nocourses": "טרם נרשמתם לקורס כלשהו",
+    "nocourses": "אין מידע שניתן להציג על הקורס",
     "nocoursesyet": "אין קורסים בקטגוריה זו",
-    "nosearchresults": "אין תוצאות",
+    "nosearchresults": "לחיפוש שלך לא היו תוצאות",
     "notenroled": "אינך רשום לקורס זה",
-    "password": "סיסמה",
-    "search": "חיפוש...",
+    "password": "סיסמה (secret)",
+    "search": "חיפוש",
     "searchcourses": "חיפוש קורסים"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/hu.json b/www/core/components/courses/lang/hu.json
index fb7d3ac5d45..7348fc46578 100644
--- a/www/core/components/courses/lang/hu.json
+++ b/www/core/components/courses/lang/hu.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "Ez a kurzus megengedi vendégek belépését",
     "availablecourses": "Felvehető kurzusok",
-    "categories": "Kategóriák",
+    "categories": "Kurzuskategóriák",
     "courses": "Kurzusok",
     "enrolme": "Iratkoztasson be",
     "frontpage": "Kezdőoldal",
     "mycourses": "Kurzusaim",
-    "nocourses": "Nincs kurzus",
+    "nocourses": "Nincs megjelenítendő kurzusinformáció.",
     "nocoursesyet": "Ebben a kategóriában nincsenek kurzusok",
-    "nosearchresults": "Nincs eredmény",
+    "nosearchresults": "Keresése nem adott eredményt",
     "notenroled": "Ezt a kurzust nem vette föl",
-    "password": "Jelszó",
-    "search": "Keresés...",
-    "searchcourses": "Keresés a kurzusokban"
+    "password": "Megosztott titkos jel",
+    "search": "Keresés",
+    "searchcourses": "Kurzusok keresése"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/it.json b/www/core/components/courses/lang/it.json
index 78743b9a170..73c5debbe71 100644
--- a/www/core/components/courses/lang/it.json
+++ b/www/core/components/courses/lang/it.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Questo corso consente l'accesso ad utenti ospiti",
     "availablecourses": "Corsi disponibili",
-    "categories": "Categorie",
+    "categories": "Categorie di corso",
     "confirmselfenrol": "Desideri iscriverti al corso?",
     "courses": "Corsi",
     "enrolme": "Iscrivimi",
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtra i miei corsi",
     "frontpage": "Pagina home",
     "mycourses": "I miei corsi",
-    "nocourses": "Non ci sono corsi",
+    "nocourses": "Non sono presenti informazioni sui corsi.",
     "nocoursesyet": "Questa categoria non ha corsi",
-    "nosearchresults": "Nessun risultato",
+    "nosearchresults": "La tua ricerca non ha prodotto risultati",
     "notenroled": "Non sei iscritto in questo corso",
     "notenrollable": "Non puoi iscriverti al corso.",
-    "password": "Chiave",
-    "search": "Cerca...",
+    "password": "Password",
+    "search": "Cerca",
     "searchcourses": "Cerca corsi",
     "searchcoursesadvice": "Puoi utilizzare la ricerca corsi per accedere come ospite oppure iscriverti nei corsi che lo consentono.",
     "selfenrolment": "Iscrizione spontanea",
diff --git a/www/core/components/courses/lang/ja.json b/www/core/components/courses/lang/ja.json
index 5c4918df412..32d5b81c2c9 100644
--- a/www/core/components/courses/lang/ja.json
+++ b/www/core/components/courses/lang/ja.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "このコースにはゲストユーザも入ることができます。",
     "availablecourses": "コース一覧",
-    "categories": "カテゴリ",
+    "categories": "コースカテゴリ",
     "courses": "コース",
     "enrolme": "私を登録する",
     "frontpage": "フロントページ",
     "mycourses": "マイコース",
-    "nocourses": "コースなし",
+    "nocourses": "表示するコース情報はありません。",
     "nocoursesyet": "このカテゴリにコースはありません。",
-    "nosearchresults": "該当なし",
+    "nosearchresults": "あなたの検索の該当データは見つかりませんでした。",
     "notenroled": "あなたはこのコースに登録されていません。",
-    "password": "パスワード",
-    "search": "検索 ...",
+    "password": "共有秘密鍵",
+    "search": "検索",
     "searchcourses": "コースを検索する"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/lt.json b/www/core/components/courses/lang/lt.json
index c379bfd8495..62218f5192e 100644
--- a/www/core/components/courses/lang/lt.json
+++ b/www/core/components/courses/lang/lt.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Į šiuos kursus leidžiama įeiti svečiui",
     "availablecourses": "Kursai",
-    "categories": "Kategorijos",
+    "categories": "Kursų kategorijos",
     "confirmselfenrol": "Ar Jūs tikrai norite įsirašyti į šiuos mokymo kursus?",
     "courses": "Kursai",
     "enrolme": "Įregistruoti mane",
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtruoti mano kursus",
     "frontpage": "Titulinis lapas",
     "mycourses": "Mano kursai",
-    "nocourses": "Dar nėra kursų",
+    "nocourses": "Nėra rodytinos kursų informacijos",
     "nocoursesyet": "Nėra šios kategorijos kursų",
-    "nosearchresults": "Nėra rezultatų",
+    "nosearchresults": "Nėra jūsų paieškos rezultatų",
     "notenroled": "Nesate įsiregistravęs kaip šių kursų besimokantysis",
     "notenrollable": "Negalite įrašyti savęs į šį kursą.",
-    "password": "Slaptažodis",
-    "search": "Paieška...",
+    "password": "Bendra paslaptis",
+    "search": "Ieškoti",
     "searchcourses": "Ieškoti kursų",
     "searchcoursesadvice": "Jūs galite naudoti kursų paieškos mygtuką ieškant kursų su svečio prieiga arba įrašyti save į kursus, kurie yra prieinami.",
     "selfenrolment": "Savarankiška registracija",
diff --git a/www/core/components/courses/lang/nl.json b/www/core/components/courses/lang/nl.json
index 3ccabdad311..f85d8754ed0 100644
--- a/www/core/components/courses/lang/nl.json
+++ b/www/core/components/courses/lang/nl.json
@@ -2,7 +2,7 @@
     "allowguests": "In deze cursus zijn gasten toegestaan",
     "availablecourses": "Beschikbare cursussen",
     "cannotretrievemorecategories": "Categorieën dieper dan niveau {{$a}} kunnen niet opgehaald worden.",
-    "categories": "Categorieën",
+    "categories": "Cursuscategorieën",
     "confirmselfenrol": "Weet je zeker dat je je wil aanmelden in deze cursus?",
     "courses": "Cursussen",
     "enrolme": "Laat me in de cursus",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filter mijn cursussen",
     "frontpage": "Startpagina",
     "mycourses": "Mijn cursussen",
-    "nocourses": "Geen cursussen",
+    "nocourses": "Geen cursusinformatie",
     "nocoursesyet": "Er zijn geen cursussen in deze categorie",
-    "nosearchresults": "Geen resultaten",
+    "nosearchresults": "Je zoekopdracht gaf geen resultaten",
     "notenroled": "Je bent niet aangemeld in deze cursus",
     "notenrollable": "Je kunt jezelf niet aanmelden in deze cursus.",
-    "password": "Wachtwoord",
-    "search": "Zoeken...",
+    "password": "Gedeeld geheim",
+    "search": "Zoek",
     "searchcourses": "Zoek cursussen",
     "searchcoursesadvice": "Je kunt via de cursus zoekknop toegang krijgen als gast of jezelf aanmelden in cursussen die dit toestaan.",
     "selfenrolment": "Zelf aanmelden",
diff --git a/www/core/components/courses/lang/pl.json b/www/core/components/courses/lang/pl.json
index 8f026d344b2..9831e317b6a 100644
--- a/www/core/components/courses/lang/pl.json
+++ b/www/core/components/courses/lang/pl.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "W tym kursie mogą uczestniczyć również goście",
     "availablecourses": "Dostępne kursy",
-    "categories": "Kategorie",
+    "categories": "Kategorie kursów",
     "courses": "Kursy",
     "enrolme": "Zapisz mnie",
     "frontpage": "Strona startowa",
     "mycourses": "Moje kursy",
-    "nocourses": "Nie ma jeszcze żadnych kursów",
+    "nocourses": "Nie ma informacji do pokazania",
     "nocoursesyet": "Brak kursów w tej kategorii",
-    "nosearchresults": "Brak wyników",
+    "nosearchresults": "Brak rezultatów wyszukiwania",
     "notenroled": "Nie jesteś zapisany w tym kursie",
-    "password": "Hasło",
-    "search": "Szukaj...",
-    "searchcourses": "Szukaj kursów"
+    "password": "Wspólne tajne hasło",
+    "search": "Wyszukaj",
+    "searchcourses": "Przeszukaj kursy"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index c321354487f..4576df30040 100644
--- a/www/core/components/courses/lang/pt-br.json
+++ b/www/core/components/courses/lang/pt-br.json
@@ -2,7 +2,7 @@
     "allowguests": "Visitantes podem entrar neste curso",
     "availablecourses": "Cursos disponíveis",
     "cannotretrievemorecategories": "Categorias mais profundas que o nível {{$a}} não podem ser recuperadas.",
-    "categories": "Categorias",
+    "categories": "Categorias de Cursos",
     "confirmselfenrol": "Tem certeza de que deseja inscrever-se neste curso?",
     "courses": "Cursos",
     "enrolme": "Inscreva-me",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filtrar meus cursos",
     "frontpage": "Primeira página",
     "mycourses": "Meus cursos",
-    "nocourses": "Ainda não existem cursos",
+    "nocourses": "Nenhuma informação disponível sobre o curso.",
     "nocoursesyet": "Nenhum curso nesta categoria",
-    "nosearchresults": "Nenhum resultado",
+    "nosearchresults": "Nenhum resultado corresponde aos termos da  busca",
     "notenroled": "Você não está inscrito como estudante neste curso",
     "notenrollable": "Você não pode inscrever-se neste curso.",
-    "password": "Senha",
-    "search": "Procurar...",
+    "password": "Segredo compartilhado",
+    "search": "Buscar",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Você pode usar o botão de busca para acessar os cursos como convidado ou matricular-se em cursos que permitem que ele.",
     "selfenrolment": "Auto-inscrição",
diff --git a/www/core/components/courses/lang/pt.json b/www/core/components/courses/lang/pt.json
index 13e43a79c56..32dfab533ee 100644
--- a/www/core/components/courses/lang/pt.json
+++ b/www/core/components/courses/lang/pt.json
@@ -2,7 +2,7 @@
     "allowguests": "Esta disciplina permite o acesso a visitantes",
     "availablecourses": "Disciplinas disponíveis",
     "cannotretrievemorecategories": "Categorias abaixo do nível {{$a}} não podem ser recuperadas.",
-    "categories": "Categorias",
+    "categories": "Categorias de disciplinas",
     "confirmselfenrol": "Tem certeza de que deseja inscrever-se nesta disciplina?",
     "courses": "Disciplinas",
     "enrolme": "Inscrever-me",
@@ -13,13 +13,13 @@
     "filtermycourses": "Filtrar as minhas disciplinas",
     "frontpage": "Página principal do site",
     "mycourses": "As minhas disciplinas",
-    "nocourses": "Não há disciplinas para mostrar",
+    "nocourses": "Sem informação das suas disciplinas para mostrar.",
     "nocoursesyet": "Nenhuma disciplina nesta categoria",
-    "nosearchresults": "Sem resultados",
+    "nosearchresults": "Não houve resultados da sua procura",
     "notenroled": "Não está inscrito como aluno nesta disciplina",
     "notenrollable": "Não se pode inscrever nesta disciplina.",
-    "password": "Senha",
-    "search": "Pesquisa...",
+    "password": "Senha partilhada",
+    "search": "Procurar",
     "searchcourses": "Procurar disciplinas",
     "searchcoursesadvice": "Pode usar o botão de pesquisa de disciplinas para aceder às mesmas como visitante ou autoinscrever-se caso o permitam.",
     "selfenrolment": "Autoinscrição",
diff --git a/www/core/components/courses/lang/ro.json b/www/core/components/courses/lang/ro.json
index 0fefab6b5b3..ac89eba0216 100644
--- a/www/core/components/courses/lang/ro.json
+++ b/www/core/components/courses/lang/ro.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Acest curs permite accesul vizitatorilor",
     "availablecourses": "Cursuri disponibile",
-    "categories": "Categorii",
+    "categories": "Categorii de cursuri",
     "confirmselfenrol": "Sunteți sigur/ă că doriți să vă înregistrați la acest curs?",
     "courses": "Cursuri",
     "enrolme": "Înscrie-mă",
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtrează cursurile",
     "frontpage": "Prima pagină",
     "mycourses": "Cursurile mele",
-    "nocourses": "Nu există cursuri",
+    "nocourses": "Nicio informație legată de cursuri este disponibilă",
     "nocoursesyet": "Nu s-au găsit cursuri în această categorie",
-    "nosearchresults": "Nu există rezultate",
+    "nosearchresults": "Căutarea iniţiată de dumneavoastră nu a generat niciun rezultat",
     "notenroled": "Nu sunteți înregistrat în  acest curs",
     "notenrollable": "Nu vă puteți auto-înregistra la acest curs.",
-    "password": "Parolă",
-    "search": "Căutare",
+    "password": "Cheie înscriere",
+    "search": "Caută",
     "searchcourses": "Caută cursuri",
     "searchcoursesadvice": "Puteți folosi butonul pentru căutarea cursurilor pentru a cauta și accesa ca vizitator sau pentru a vă auto-înregistra la acele cursuri care permit aceste opțiuni.",
     "selfenrolment": "Auto înscriere",
diff --git a/www/core/components/courses/lang/ru.json b/www/core/components/courses/lang/ru.json
index 7ce2d395bab..60a255745fb 100644
--- a/www/core/components/courses/lang/ru.json
+++ b/www/core/components/courses/lang/ru.json
@@ -1,17 +1,17 @@
 {
     "allowguests": "Курс доступен гостю",
     "availablecourses": "Доступные курсы",
-    "categories": "Категории",
+    "categories": "Категории курсов",
     "courses": "Курсы",
     "enrolme": "Записаться на курс",
     "errorloadcourses": "При загрузке курсов произошла ошибка.",
     "frontpage": "Главная страница",
     "mycourses": "Мои курсы",
-    "nocourses": "Пока еще нет ни одного курса",
+    "nocourses": "Нет информации для отображения.",
     "nocoursesyet": "В этой категории нет курсов",
-    "nosearchresults": "Нет результатов",
+    "nosearchresults": "Поиск не дал результатов",
     "notenroled": "Вы не записаны на этот курс",
-    "password": "Пароль",
-    "search": "Искать...",
-    "searchcourses": "Поиск курсов"
+    "password": "Общий секретный ключ",
+    "search": "Найти",
+    "searchcourses": "Поиск курса"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index 2852a04f2d5..20d2ea5faf3 100644
--- a/www/core/components/courses/lang/sv.json
+++ b/www/core/components/courses/lang/sv.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "Denna kurs tillåter gäster.",
     "availablecourses": "Tillgängliga kurser",
-    "categories": "Kategorier",
+    "categories": "Kurskategorier",
     "confirmselfenrol": "Är du säker att du vill registrera dig i den här kursen ?",
     "courses": "Kurser",
     "enrolme": "Koppla mig",
@@ -11,13 +11,13 @@
     "filtermycourses": "Filtrera mina kurser",
     "frontpage": "Ingångssidan",
     "mycourses": "Mina kurser",
-    "nocourses": "Det finns inga kurser ännu",
+    "nocourses": "Det finns ingen kursinformation att visa.",
     "nocoursesyet": "Inga kurser i denna kategori",
-    "nosearchresults": "Inga resultat",
+    "nosearchresults": "Din sökning gav inga träffar",
     "notenroled": "Du är inte registrerad i den här kursen",
     "notenrollable": "Du kan inte självregistrera dig i kursen",
-    "password": "Gästlösenord",
-    "search": "Sök...",
+    "password": "Lösenord",
+    "search": "Sök",
     "searchcourses": "Sök kurser",
     "searchcoursesadvice": "Du kan använda knappen \"Sök kurser\" för att få tillgång som gäst eller registrera dig på kurser som tillåter det .",
     "selfenrolment": "Kursnyckel (Student)",
diff --git a/www/core/components/courses/lang/tr.json b/www/core/components/courses/lang/tr.json
index 5a7c4345301..59192e73b8d 100644
--- a/www/core/components/courses/lang/tr.json
+++ b/www/core/components/courses/lang/tr.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "Bu derse konuk olarak girilebilir",
     "availablecourses": "Mevcut dersler",
-    "categories": "Kategoriler",
+    "categories": "Ders Kategorileri",
     "courses": "Dersler",
     "enrolme": "Beni kaydet",
     "frontpage": "Ön sayfa",
     "mycourses": "Derslerim",
-    "nocourses": "Henüz ders yok",
+    "nocourses": "Gösterilecek ders bilgisi yok",
     "nocoursesyet": "Bu kategoride ders yok",
-    "nosearchresults": "Sonuç yok",
+    "nosearchresults": "Aramanızla ilgili sonuç yok",
     "notenroled": "Bu derse kayıtlı değilsiniz",
-    "password": "Parola",
-    "search": "Arama...",
-    "searchcourses": "Kursları ara"
+    "password": "Şifre",
+    "search": "Ara",
+    "searchcourses": "Dersleri ara"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/uk.json b/www/core/components/courses/lang/uk.json
index d73443b49fe..41fd3cdbc27 100644
--- a/www/core/components/courses/lang/uk.json
+++ b/www/core/components/courses/lang/uk.json
@@ -2,7 +2,7 @@
     "allowguests": "Дозволено гостьовий доступ до курсу",
     "availablecourses": "Доступні курси",
     "cannotretrievemorecategories": "Категорії глибші, ніж рівень {{$a}} не можуть бути відновлені.",
-    "categories": "Категорії",
+    "categories": "Категорії курсів",
     "confirmselfenrol": "Ви впевнені, що хочете зареєструвати себе в цьому курсі?",
     "courses": "Курси",
     "enrolme": "Зареєструвати мене",
@@ -13,13 +13,13 @@
     "filtermycourses": "Відфільтрувати мої курси",
     "frontpage": "Титульна сторінка",
     "mycourses": "Мої курси",
-    "nocourses": "Ще немає курсів",
+    "nocourses": "Немає інформації курсу для показу.",
     "nocoursesyet": "У цій категорії немає курсів",
-    "nosearchresults": "Немає результатів",
+    "nosearchresults": "Пошук не дав результатів",
     "notenroled": "Ви не зареєстровані як студент цього курсу",
     "notenrollable": "Ви не можете зареєструвати себе в цьому курсі.",
-    "password": "Пароль",
-    "search": "Пошук...",
+    "password": "Відкритий ключ",
+    "search": "Знайти",
     "searchcourses": "Пошук курсів",
     "searchcoursesadvice": "Ви можете використовувати кнопку пошуку курсів, щоб отримати доступ в якості гостя або зареєструвати себе в курсах, які дозволяють їй.",
     "selfenrolment": "Самостійна реєстрація",
diff --git a/www/core/components/courses/lang/zh-cn.json b/www/core/components/courses/lang/zh-cn.json
index dec1800a0b1..8428ade7a27 100644
--- a/www/core/components/courses/lang/zh-cn.json
+++ b/www/core/components/courses/lang/zh-cn.json
@@ -1,16 +1,16 @@
 {
     "allowguests": "该课程允许访客进入",
     "availablecourses": "现有课程",
-    "categories": "类别",
+    "categories": "课程分类",
     "courses": "课程",
     "enrolme": "将我加入",
     "frontpage": "首页",
     "mycourses": "我的课程",
-    "nocourses": "目前没有课程",
+    "nocourses": "没有可显示的课程信息。",
     "nocoursesyet": "此类中无课程",
-    "nosearchresults": "无结果",
+    "nosearchresults": "您的搜索没有结果",
     "notenroled": "您没有加入此课程",
-    "password": "密码",
+    "password": "设置密码",
     "search": "搜索",
     "searchcourses": "搜索课程"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/zh-tw.json b/www/core/components/courses/lang/zh-tw.json
index e0298818b30..7bf189df333 100644
--- a/www/core/components/courses/lang/zh-tw.json
+++ b/www/core/components/courses/lang/zh-tw.json
@@ -1,7 +1,7 @@
 {
     "allowguests": "本課程允許無帳號者進入",
     "availablecourses": "可使用的課程",
-    "categories": "題目分類",
+    "categories": "課程類別",
     "confirmselfenrol": "您確定要註冊本課程嗎?",
     "courses": "課程",
     "enrolme": "將我加入",
@@ -11,13 +11,13 @@
     "filtermycourses": "過濾我的課程",
     "frontpage": "首頁",
     "mycourses": "我的課程",
-    "nocourses": "沒有課程",
+    "nocourses": "沒有課程資訊可以顯示",
     "nocoursesyet": "此類別中無課程",
-    "nosearchresults": "沒有結果",
+    "nosearchresults": "您的搜尋沒有結果",
     "notenroled": "您沒有加入此課程",
     "notenrollable": "您無法註冊本課程.",
-    "password": "密碼",
-    "search": "搜尋中...",
+    "password": "共用密碼",
+    "search": "搜尋",
     "searchcourses": "搜尋課程",
     "searchcoursesadvice": "您可以使用搜尋課程按鈕以訪客身份登入, 或在允許它的課程中註冊",
     "selfenrolment": "自行註冊",
diff --git a/www/core/components/fileuploader/lang/ar.json b/www/core/components/fileuploader/lang/ar.json
index 3b0ca9cc7ab..68a20669859 100644
--- a/www/core/components/fileuploader/lang/ar.json
+++ b/www/core/components/fileuploader/lang/ar.json
@@ -6,7 +6,7 @@
     "errorcapturingvideo": "خطأ في التقاط الفيديو",
     "errormustbeonlinetoupload": "لابد أن تكون متصل بالأنترنت لكي يتم رفع الملفات",
     "errorreadingfile": "خطاء في قراءة ملف \"{{$a}}\"",
-    "file": "ملفات التغذية الراجعة (الملاحظات)",
+    "file": "ملف",
     "fileuploaded": "الملف الذي تم رفعه",
     "maxbytesfile": "حجم الملف {{$a.file}} كبير جداً . الحد الأقصى الذي تستطيع رفعه هو {{$a.size}}.",
     "readingfile": "يتم قراءة الملف",
diff --git a/www/core/components/fileuploader/lang/bg.json b/www/core/components/fileuploader/lang/bg.json
index 19e73e3040d..573cef3b216 100644
--- a/www/core/components/fileuploader/lang/bg.json
+++ b/www/core/components/fileuploader/lang/bg.json
@@ -10,7 +10,7 @@
     "errornoapp": "Нямате инсталирано приложение, което да извърши това действие.",
     "errorreadingfile": "Грешка при четенето на файла.",
     "errorwhileuploading": "Възникна грешка при качването на файла.",
-    "file": "Файлове с обратна връзка",
+    "file": "Файл",
     "fileuploaded": "Файлът е качен",
     "photoalbums": "Фотоалбуми",
     "readingfile": "Четене на файл",
diff --git a/www/core/components/fileuploader/lang/ca.json b/www/core/components/fileuploader/lang/ca.json
index 68323beba4b..260d49f2008 100644
--- a/www/core/components/fileuploader/lang/ca.json
+++ b/www/core/components/fileuploader/lang/ca.json
@@ -12,7 +12,7 @@
     "errornoapp": "No teniu instal·lada una app per realitzar aquesta acció.",
     "errorreadingfile": "S'ha produït un error en llegir el fitxer \"{{$a}}\"",
     "errorwhileuploading": "S'ha produït un error penjant el fitxer.",
-    "file": "Fitxers de la retroacció",
+    "file": "Fitxer",
     "fileuploaded": "S'ha penjat el fitxer",
     "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima que podeu pujar és de {{$a.size}}.",
     "photoalbums": "Àlbums de fotos",
diff --git a/www/core/components/fileuploader/lang/cs.json b/www/core/components/fileuploader/lang/cs.json
index 66897f21800..d8c07250a14 100644
--- a/www/core/components/fileuploader/lang/cs.json
+++ b/www/core/components/fileuploader/lang/cs.json
@@ -12,7 +12,7 @@
     "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
     "errorreadingfile": "Chyba při čtení souboru \"{{$a}}\"",
     "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
-    "file": "Soubory se zpětnou vazbou",
+    "file": "Soubor",
     "fileuploaded": "Soubor nahrán",
     "maxbytesfile": "Soubor {{$a.file}} je příliš velký. Maximální velikost, kterou můžete nahrát, je  {{$a.size}}.",
     "photoalbums": "Fotoalba",
diff --git a/www/core/components/fileuploader/lang/da.json b/www/core/components/fileuploader/lang/da.json
index 356985505e1..7b7c0c77636 100644
--- a/www/core/components/fileuploader/lang/da.json
+++ b/www/core/components/fileuploader/lang/da.json
@@ -11,7 +11,7 @@
     "errornoapp": "Du har ikke installeret en app som kan udføre denne handling.",
     "errorreadingfile": "Fejl under læsning af filen \"{{$a}}\"",
     "errorwhileuploading": "En fejl opstod under upload af filen.",
-    "file": "Feedback-filer",
+    "file": "Fil",
     "fileuploaded": "Filen er uploadet.",
     "maxbytesfile": "Filen {{$a.file}} er for stor. Maksimal upload-størrelse er {{$a.size}}.",
     "photoalbums": "Fotoalbum",
diff --git a/www/core/components/fileuploader/lang/de.json b/www/core/components/fileuploader/lang/de.json
index 72384b4829e..82da9ba6b9f 100644
--- a/www/core/components/fileuploader/lang/de.json
+++ b/www/core/components/fileuploader/lang/de.json
@@ -12,7 +12,7 @@
     "errornoapp": "Keine App zum Ausführen dieser Aktion gefunden",
     "errorreadingfile": "Fehler beim Lesen der Datei \"{{$a}}\"",
     "errorwhileuploading": "Fehler beim Hochladen der Datei",
-    "file": "Feedbackdateien",
+    "file": "Datei",
     "fileuploaded": "Datei hochgeladen",
     "maxbytesfile": "Die Datei {{$a.file}} ist zu groß. Die maximale Größe zum Hochladen ist {{$a.size}}.",
     "photoalbums": "Fotoalbum",
diff --git a/www/core/components/fileuploader/lang/el.json b/www/core/components/fileuploader/lang/el.json
index 26043910c12..32ef85ac7f5 100644
--- a/www/core/components/fileuploader/lang/el.json
+++ b/www/core/components/fileuploader/lang/el.json
@@ -12,7 +12,7 @@
     "errornoapp": "Δεν έχετε εγκατεστημένη εφαρμογή για να εκτελέσετε αυτή την ενέργεια.",
     "errorreadingfile": "Σφάλμα στην ανάγνωση του αρχείου \"{{$a}}\"",
     "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου.",
-    "file": "Αρχεία ανατροφοδότησης",
+    "file": "Αρχείο",
     "fileuploaded": "Το αρχείο ανέβηκε επιτυχώς.",
     "maxbytesfile": "Το αρχείο {{$a.file}} είναι πολύ μεγάλο. Το μέγιστο μέγεθος που μπορείτε να ανεβάσετε είναι {{$a.size}}.",
     "photoalbums": "Άλμπουμ φωτογραφιών",
diff --git a/www/core/components/fileuploader/lang/es-mx.json b/www/core/components/fileuploader/lang/es-mx.json
index ec27c0f9ba3..9df3e3feee0 100644
--- a/www/core/components/fileuploader/lang/es-mx.json
+++ b/www/core/components/fileuploader/lang/es-mx.json
@@ -12,7 +12,7 @@
     "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
     "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
     "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
-    "file": "Archivos de retroalimentación",
+    "file": "Archivo",
     "fileuploaded": "El archivo fue subido exitosamente.",
     "maxbytesfile": "El archivo {{$a.file}} es demasiado grande. El tamaño máximo que Usted puede subir es de {{$a.size}}.",
     "photoalbums": "Foto álbumes",
diff --git a/www/core/components/fileuploader/lang/es.json b/www/core/components/fileuploader/lang/es.json
index 12823701a59..a76008a356f 100644
--- a/www/core/components/fileuploader/lang/es.json
+++ b/www/core/components/fileuploader/lang/es.json
@@ -12,7 +12,7 @@
     "errornoapp": "Usted no tiene una app instalada para realizar esta acción.",
     "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
     "errorwhileuploading": "Ocurrió un error al subir un archivo.",
-    "file": "Archivos de retroalimentación",
+    "file": "Archivo",
     "fileuploaded": "Archivo subido",
     "maxbytesfile": "El archivo {{$a.file}} es demasido grande. El tamaño máximo que puede subir es {{$a.size}}.",
     "photoalbums": "Álbumes de fotos",
diff --git a/www/core/components/fileuploader/lang/eu.json b/www/core/components/fileuploader/lang/eu.json
index b3ad98481b1..3a12490d312 100644
--- a/www/core/components/fileuploader/lang/eu.json
+++ b/www/core/components/fileuploader/lang/eu.json
@@ -12,7 +12,7 @@
     "errornoapp": "Ez daukazu ekintza hau burutzeko app-ik instalatuta.",
     "errorreadingfile": "Errorea \"{{$a}}\" fitxategia irakurtzean",
     "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
-    "file": "Feedback-fitxategiak",
+    "file": "Fitxategia",
     "fileuploaded": "Fitxategia ondo igo da.",
     "maxbytesfile": "{{$a.file}} fitxategia oso handia da. Igo ditzakezun fitxategien gehienezko tamaina {{$a.size}} da.",
     "photoalbums": "Argazki-bildumak",
diff --git a/www/core/components/fileuploader/lang/fa.json b/www/core/components/fileuploader/lang/fa.json
index 79f201bcc61..02f6d7c8b77 100644
--- a/www/core/components/fileuploader/lang/fa.json
+++ b/www/core/components/fileuploader/lang/fa.json
@@ -4,7 +4,7 @@
     "errorcapturingaudio": "خطا در ضبط صدا",
     "errorcapturingvideo": "خطا در ضبط ویدئو",
     "errorreadingfile": "خطا در خواندن فایل «{{$a}}»",
-    "file": "بازخورد فایلی",
+    "file": "فایل",
     "fileuploaded": "فایل آپلود شده",
     "maxbytesfile": "فایل {{$a.file}} بسیار بزرگ است. بیشترین اندازه‌ای که می‌توانید ارسال کنید {{$a.size}} است.",
     "uploadafile": "قرار دادن یک فایل در سایت",
diff --git a/www/core/components/fileuploader/lang/fr.json b/www/core/components/fileuploader/lang/fr.json
index 78d6ece3168..885ca1c15d7 100644
--- a/www/core/components/fileuploader/lang/fr.json
+++ b/www/core/components/fileuploader/lang/fr.json
@@ -12,7 +12,7 @@
     "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
     "errorreadingfile": "Erreur lors de la lecture du fichier « {{$a}} »",
     "errorwhileuploading": "Une erreur est survenue lors du dépôt du fichier.",
-    "file": "Fichiers de feedback",
+    "file": "Fichier",
     "fileuploaded": "Le fichier a été déposé.",
     "maxbytesfile": "La taille du fichier {{$a.file}} est trop grande. La taille maximale d'un fichier à déposer est de {{$a.size}}.",
     "photoalbums": "Albums de photos",
diff --git a/www/core/components/fileuploader/lang/he.json b/www/core/components/fileuploader/lang/he.json
index 79dd59daec1..62479a48162 100644
--- a/www/core/components/fileuploader/lang/he.json
+++ b/www/core/components/fileuploader/lang/he.json
@@ -11,7 +11,7 @@
     "errornoapp": "לא נמצא יישומון זמין לביצוע פעולה הזו.",
     "errorreadingfile": "שגיאה בקריאת קובץ \"{{$a}}\"",
     "errorwhileuploading": "התרחשה שגיאה בזמן הניסיון להעלות את הקובץ.",
-    "file": "משובים בקבצים",
+    "file": "קובץ",
     "fileuploaded": "הקובץ הועלה בהצלחה.",
     "photoalbums": "אלבומי תמונות",
     "readingfile": "קורא קובץ",
diff --git a/www/core/components/fileuploader/lang/hu.json b/www/core/components/fileuploader/lang/hu.json
index 0f3e524740a..cf59fdef06f 100644
--- a/www/core/components/fileuploader/lang/hu.json
+++ b/www/core/components/fileuploader/lang/hu.json
@@ -3,7 +3,7 @@
     "errorcapturingaudio": "Hiba a hang rögzítélse közben.",
     "errorcapturingvideo": "Nem sikerült videofelvételt készíteni.",
     "errorreadingfile": "Hiba a(z) \"{{$a}}\" állomány olvasása közben",
-    "file": "Visszajelzési állományok",
+    "file": "Állomány",
     "fileuploaded": "Fájl feltöltve",
     "maxbytesfile": "A(z)  {{$a.file}} állomány túl nagy. A feltölthető maximális méret  {{$a.size}}.",
     "uploadafile": "Egy állomány feltöltése",
diff --git a/www/core/components/fileuploader/lang/it.json b/www/core/components/fileuploader/lang/it.json
index 5f5fb84e300..de29e782b9a 100644
--- a/www/core/components/fileuploader/lang/it.json
+++ b/www/core/components/fileuploader/lang/it.json
@@ -12,7 +12,7 @@
     "errornoapp": "Non hai un'app per svolgere questa azione.",
     "errorreadingfile": "Si è verificato un errore leggendo il file \"{{$a}}\"",
     "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
-    "file": "File di commento",
+    "file": "File",
     "fileuploaded": "File caricato correttamente",
     "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima che è possibile caricare è pari a {{$a.size}}.",
     "photoalbums": "Album fotografico",
diff --git a/www/core/components/fileuploader/lang/ja.json b/www/core/components/fileuploader/lang/ja.json
index 355fead3e63..afec789151e 100644
--- a/www/core/components/fileuploader/lang/ja.json
+++ b/www/core/components/fileuploader/lang/ja.json
@@ -4,7 +4,7 @@
     "errorcapturingaudio": "音声キャプチャーのエラー",
     "errorcapturingvideo": "ビデオキャプチャーのエラー",
     "errorreadingfile": "ファイル「 {{$a}} 」の読み取り中にエラーが発生しました。",
-    "file": "フィードバックファイル",
+    "file": "ファイル",
     "fileuploaded": "アップロードしたファイル",
     "maxbytesfile": "ファイル {{$a.file}} は大きすぎます。あなたがアップロードできる最大サイズは {{$a.size}} です。",
     "readingfile": "ファイル読み取り",
diff --git a/www/core/components/fileuploader/lang/lt.json b/www/core/components/fileuploader/lang/lt.json
index 3278dc303c4..18054f3611c 100644
--- a/www/core/components/fileuploader/lang/lt.json
+++ b/www/core/components/fileuploader/lang/lt.json
@@ -12,7 +12,7 @@
     "errornoapp": "Jūs neturite programėlės šiam veiksmui atlikti.",
     "errorreadingfile": "Įvyko klaida skaitant failą {{$a}}",
     "errorwhileuploading": "Klaida įkeliant failą.",
-    "file": "Grįžtamojo ryšio failai",
+    "file": "Failas",
     "fileuploaded": "Failas sėkmingai įkeltas.",
     "maxbytesfile": "Failas {{$a.file}} ) per didelis. Galite įkelti failus iki {{$a.size}}.",
     "photoalbums": "Nuotraukų albumai",
diff --git a/www/core/components/fileuploader/lang/nl.json b/www/core/components/fileuploader/lang/nl.json
index a9642735d2d..22b1139de3f 100644
--- a/www/core/components/fileuploader/lang/nl.json
+++ b/www/core/components/fileuploader/lang/nl.json
@@ -12,7 +12,7 @@
     "errornoapp": "Je hebt geen app geïnstalleerd om dit te kunnen doen.",
     "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
     "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
-    "file": "Feedbackbestanden",
+    "file": "Bestand",
     "fileuploaded": "Het uploaden van het bestand is gelukt.",
     "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale grootte die je kunt uploaden is {{$a.size}}.",
     "photoalbums": "Foto-albums",
diff --git a/www/core/components/fileuploader/lang/pl.json b/www/core/components/fileuploader/lang/pl.json
index 7d11c66277c..1f23867319a 100644
--- a/www/core/components/fileuploader/lang/pl.json
+++ b/www/core/components/fileuploader/lang/pl.json
@@ -4,7 +4,7 @@
     "errorcapturingaudio": "Błąd poczas nagrywania dźwięku",
     "errorcapturingvideo": "Błąd podczas przechwytywania wideo",
     "errorreadingfile": "Błąd podczas odczytu z pliku \"{{$a}}\"",
-    "file": "Pliki komentarzy",
+    "file": "Plik",
     "fileuploaded": "Plik wysłany",
     "maxbytesfile": "Plik {{$a.file}} jest za duży Maksymalny rozmiar pliku, który możesz przesłać, może wynosić {{$a.size}}.",
     "readingfile": "Odczytywanie pliku",
diff --git a/www/core/components/fileuploader/lang/pt-br.json b/www/core/components/fileuploader/lang/pt-br.json
index 550047884c5..9f1d13d3546 100644
--- a/www/core/components/fileuploader/lang/pt-br.json
+++ b/www/core/components/fileuploader/lang/pt-br.json
@@ -12,7 +12,7 @@
     "errornoapp": "Você não tem um aplicativo instalado para fazer essa ação.",
     "errorreadingfile": "Erro na leitura do arquivo \"{{$a}}\"",
     "errorwhileuploading": "Houve um erro durante o envio do arquivo.",
-    "file": "Arquivos de feedback",
+    "file": "Arquivo",
     "fileuploaded": "Arquivo enviado",
     "maxbytesfile": "O arquivo {{$a.file}} é muito grande. O tamanho máximo que você pode enviar é {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
diff --git a/www/core/components/fileuploader/lang/pt.json b/www/core/components/fileuploader/lang/pt.json
index bb8f5e65b1d..a5c59630b58 100644
--- a/www/core/components/fileuploader/lang/pt.json
+++ b/www/core/components/fileuploader/lang/pt.json
@@ -12,7 +12,7 @@
     "errornoapp": "Não possui a aplicação móvel necessária para executar esta ação.",
     "errorreadingfile": "Erro na leitura do ficheiro \"{{$a}}\"",
     "errorwhileuploading": "Ocorreu um erro durante o carregamento do ficheiro.",
-    "file": "Ficheiros de feedback",
+    "file": "Ficheiro",
     "fileuploaded": "Ficheiro carregado com sucesso",
     "maxbytesfile": "O ficheiro {{$a.file}} é muito grande. Apenas pode carregar ficheiros com um tamanho máximo de {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
diff --git a/www/core/components/fileuploader/lang/ro.json b/www/core/components/fileuploader/lang/ro.json
index 66ec060fa0f..74a44c21314 100644
--- a/www/core/components/fileuploader/lang/ro.json
+++ b/www/core/components/fileuploader/lang/ro.json
@@ -11,7 +11,7 @@
     "errornoapp": "Nu aveți instalată o aplicație dedicată realizării acestei operațiuni.",
     "errorreadingfile": "Eroare la citirea fişierului {{$a}}",
     "errorwhileuploading": "A apărut o eroare în timpul încărcării fișierului.",
-    "file": "Fişiere de feedback",
+    "file": "Fişier",
     "fileuploaded": "Fișierul a fost încărcat cu succes.",
     "maxbytesfile": "Fișierul {{$a.file}} este prea mare. Dimensiunea maximă pe care o puteți încărca este {{$a.size}}.",
     "photoalbums": "Albume foto",
diff --git a/www/core/components/fileuploader/lang/ru.json b/www/core/components/fileuploader/lang/ru.json
index f903ba3a582..cc03f2bd598 100644
--- a/www/core/components/fileuploader/lang/ru.json
+++ b/www/core/components/fileuploader/lang/ru.json
@@ -11,7 +11,7 @@
     "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
     "errorreadingfile": "Ошибка чтения файла «{{$a}}»",
     "errorwhileuploading": "Произошла ошибка во время загрузки файла",
-    "file": "Отзыв в виде файла",
+    "file": "Файл",
     "fileuploaded": "Файл загружен",
     "maxbytesfile": "Файл «{{$a.file}}» слишком большой. Максимальный размер файла, который Вы можете загрузить: {{$a.size}}.",
     "photoalbums": "Фотоальбомы",
diff --git a/www/core/components/fileuploader/lang/sv.json b/www/core/components/fileuploader/lang/sv.json
index a6f69716ad7..a5532128642 100644
--- a/www/core/components/fileuploader/lang/sv.json
+++ b/www/core/components/fileuploader/lang/sv.json
@@ -10,7 +10,7 @@
     "errornoapp": "Du behöver att ha en app installerat för att utföra den här åtgärden.",
     "errorreadingfile": "Fel i samband med läsningen av filen  \"{{$a}}\"",
     "errorwhileuploading": "Ett fel uppstod under filöverföringen.",
-    "file": "Återkopplingsfiler",
+    "file": "Fil",
     "fileuploaded": "Fil laddades upp",
     "photoalbums": "Fotoalbum",
     "readingfile": "Läsa fil",
diff --git a/www/core/components/fileuploader/lang/tr.json b/www/core/components/fileuploader/lang/tr.json
index 3af13fbd546..021853f3c59 100644
--- a/www/core/components/fileuploader/lang/tr.json
+++ b/www/core/components/fileuploader/lang/tr.json
@@ -3,7 +3,7 @@
     "errorcapturingaudio": "Ses kayıt hatası",
     "errorcapturingvideo": "Video kayıt hatası",
     "errorreadingfile": "\"{{$a}}\" dosyasını okurken hata oluştu",
-    "file": "Geribildirim dosyaları",
+    "file": "Dosya",
     "fileuploaded": "Dosya başarıyla yüklendi",
     "maxbytesfile": "Dosya {{$a.file}} çok büyük. Yüklediğiniz maksimum boyutu {{$a.size}} olduğunu.",
     "uploadafile": "Bir dosya yükle",
diff --git a/www/core/components/fileuploader/lang/uk.json b/www/core/components/fileuploader/lang/uk.json
index 724d4219bd7..80a1847ebb0 100644
--- a/www/core/components/fileuploader/lang/uk.json
+++ b/www/core/components/fileuploader/lang/uk.json
@@ -12,7 +12,7 @@
     "errornoapp": "У вас немає програми, встановленої для виконання цієї дії.",
     "errorreadingfile": "Помилка при читанні файлу \"{{$a}}\"",
     "errorwhileuploading": "Помилка при завантаженні файлу.",
-    "file": "Відгук - файлом",
+    "file": "Файл",
     "fileuploaded": "Файл був успішно завантажений.",
     "maxbytesfile": "Файл {{$a.file}} занадто великий. Максимальний розмір, який ви можете завантажити - {{$a.size}}.",
     "photoalbums": "Фото альбом.",
diff --git a/www/core/components/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index 75ac82bace1..b6a4a0631e0 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -4,7 +4,7 @@
     "errorcapturingaudio": "捕捉音频时出错。",
     "errorcapturingvideo": "捕捉视频时出错。",
     "errorreadingfile": "在读取文件“{{$a}}”时发生错误",
-    "file": "反馈文件",
+    "file": "文件",
     "fileuploaded": "文件已成功上传。",
     "maxbytesfile": "这个文件 {{$a.file}} 太大了。你可以上传的文件最大容量是 {{$a.size}}。",
     "readingfile": "Odczytywanie pliku",
diff --git a/www/core/components/fileuploader/lang/zh-tw.json b/www/core/components/fileuploader/lang/zh-tw.json
index 38292441417..8b8426718a0 100644
--- a/www/core/components/fileuploader/lang/zh-tw.json
+++ b/www/core/components/fileuploader/lang/zh-tw.json
@@ -12,7 +12,7 @@
     "errornoapp": "您沒有安裝應用程式來執行此動作.",
     "errorreadingfile": "讀取檔案 \"{{$a}}\" 時發生錯誤",
     "errorwhileuploading": "檔案上傳時發生錯誤.",
-    "file": "回饋檔案",
+    "file": "檔案",
     "fileuploaded": "檔案已上傳",
     "maxbytesfile": "這檔案 {{$a.file}} 太大了。你可以上傳的檔案最大容量是 {{$a.size}}。",
     "photoalbums": "相簿",
diff --git a/www/core/components/grades/lang/ar.json b/www/core/components/grades/lang/ar.json
index 2966f73720e..006afcb0ff9 100644
--- a/www/core/components/grades/lang/ar.json
+++ b/www/core/components/grades/lang/ar.json
@@ -1,6 +1,6 @@
 {
     "average": "متوسط",
-    "feedback": "(تغذية راجعة (ملاحظات",
+    "feedback": "تقرير",
     "grade": "درجة",
     "grades": "درجات",
     "itemname": "اسم البند",
diff --git a/www/core/components/grades/lang/bg.json b/www/core/components/grades/lang/bg.json
index 43ebadbfebc..ad342e2276c 100644
--- a/www/core/components/grades/lang/bg.json
+++ b/www/core/components/grades/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "average": "Средно",
     "contributiontocoursetotal": "Дял в общата оценка",
-    "feedback": "Забележка",
+    "feedback": "Обратна връзка",
     "grade": "Оценка",
     "grades": "Оценки",
     "itemname": "Име на единица",
diff --git a/www/core/components/grades/lang/ca.json b/www/core/components/grades/lang/ca.json
index 7848c0d6909..d83a599cc60 100644
--- a/www/core/components/grades/lang/ca.json
+++ b/www/core/components/grades/lang/ca.json
@@ -3,13 +3,13 @@
     "badgrade": "La qualificació proporcionada no és vàlida",
     "contributiontocoursetotal": "Contribució al total del curs",
     "feedback": "Retroacció",
-    "grade": "Qualificació",
+    "grade": "Qualifica",
     "grades": "Qualificacions",
     "itemname": "Nom de l'element",
     "lettergrade": "Qualificació per lletres",
     "nooutcome": "Sense competències",
     "percentage": "Percentatge",
     "range": "Gamma",
-    "rank": "Posició",
+    "rank": "Rang",
     "weight": "Ponderació"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/cs.json b/www/core/components/grades/lang/cs.json
index fcd0762a591..cd3f92e83b2 100644
--- a/www/core/components/grades/lang/cs.json
+++ b/www/core/components/grades/lang/cs.json
@@ -2,7 +2,7 @@
     "average": "Průměr",
     "badgrade": "Poskytnutá známka není platná",
     "contributiontocoursetotal": "Podíl z celkové známky",
-    "feedback": "Reakce",
+    "feedback": "Komentář",
     "grade": "Známka",
     "grades": "Známky",
     "itemname": "Název položky",
@@ -10,6 +10,6 @@
     "nooutcome": "Bez očekávaných výstupů",
     "percentage": "Procentuální hodnota",
     "range": "Rozsah",
-    "rank": "Umístění",
+    "rank": "Pořadí",
     "weight": "Váha"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/da.json b/www/core/components/grades/lang/da.json
index 517d42331d7..ce5cab367fe 100644
--- a/www/core/components/grades/lang/da.json
+++ b/www/core/components/grades/lang/da.json
@@ -2,7 +2,7 @@
     "average": "Gennemsnit",
     "badgrade": "Karakteren er ugyldig",
     "contributiontocoursetotal": "Bidrag til kursets total",
-    "feedback": "Feedback",
+    "feedback": "Tilbagemelding",
     "grade": "Karakter",
     "grades": "Karakterer",
     "itemname": "Elementnavn",
@@ -10,6 +10,6 @@
     "nooutcome": "Intet slutresultat",
     "percentage": "Procentdel",
     "range": "Opstilling",
-    "rank": "Opstil",
+    "rank": "Rank",
     "weight": "Vægt"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/de.json b/www/core/components/grades/lang/de.json
index 49bc672f741..1f965bf6662 100644
--- a/www/core/components/grades/lang/de.json
+++ b/www/core/components/grades/lang/de.json
@@ -1,9 +1,9 @@
 {
-    "average": "Durchschnitt",
+    "average": "Mittelwert",
     "badgrade": "Ungültige Bewertung",
     "contributiontocoursetotal": "Beiträge zum Kurs insgesamt",
-    "feedback": "Feedback",
-    "grade": "Bewertung",
+    "feedback": "Rückmeldung",
+    "grade": "Relative Bewertung",
     "grades": "Bewertungen",
     "itemname": "Name des Aspekts",
     "lettergrade": "Notenstufenbewertung",
diff --git a/www/core/components/grades/lang/el.json b/www/core/components/grades/lang/el.json
index 375dafd2b9d..8192b0ab2e2 100644
--- a/www/core/components/grades/lang/el.json
+++ b/www/core/components/grades/lang/el.json
@@ -2,7 +2,7 @@
     "average": "Μέσος όρος",
     "badgrade": "Ο βαθμός που δόθηκε δεν είναι έγκυρος",
     "contributiontocoursetotal": "Συνεισφορά στον τελικό βαθμό",
-    "feedback": "Ανατροφοδότηση",
+    "feedback": "Ανάδραση",
     "grade": "Βαθμός",
     "grades": "Βαθμοί",
     "itemname": "Όνομα στοιχείου",
diff --git a/www/core/components/grades/lang/es-mx.json b/www/core/components/grades/lang/es-mx.json
index ca04dc39133..34e8b41f166 100644
--- a/www/core/components/grades/lang/es-mx.json
+++ b/www/core/components/grades/lang/es-mx.json
@@ -2,7 +2,7 @@
     "average": "Promedio",
     "badgrade": "La calificación suministrada no es válida",
     "contributiontocoursetotal": "Contribución al total del curso",
-    "feedback": "Retroalimentación",
+    "feedback": "Comentario de retroalimentación",
     "grade": "Calificación",
     "grades": "Calificaciones",
     "itemname": "Nombre del ítem",
diff --git a/www/core/components/grades/lang/es.json b/www/core/components/grades/lang/es.json
index 63344ded652..164f2dd4f66 100644
--- a/www/core/components/grades/lang/es.json
+++ b/www/core/components/grades/lang/es.json
@@ -2,7 +2,7 @@
     "average": "Promedio",
     "badgrade": "La calificación suministrada no es válida",
     "contributiontocoursetotal": "Aporta al total del curso",
-    "feedback": "Retroalimentación",
+    "feedback": "Comentario",
     "grade": "Calificación",
     "grades": "Calificaciones",
     "itemname": "Nombre del ítem",
diff --git a/www/core/components/grades/lang/eu.json b/www/core/components/grades/lang/eu.json
index 1037527dadf..f71b3afe9f7 100644
--- a/www/core/components/grades/lang/eu.json
+++ b/www/core/components/grades/lang/eu.json
@@ -3,13 +3,13 @@
     "badgrade": "Emandako kalifikazioak ez du balio",
     "contributiontocoursetotal": "Ikastaroaren denerako ekarpena",
     "feedback": "Feedbacka",
-    "grade": "Kalifikazioa",
+    "grade": "Nota",
     "grades": "Kalifikazioak",
     "itemname": "Elementuaren izena",
     "lettergrade": "Letren bidezko kalifikazioa",
     "nooutcome": "Ez dago ikas-emaitzarik",
     "percentage": "Portzentajea",
     "range": "Ibiltartea",
-    "rank": "Sailkapena",
+    "rank": "Bitartea",
     "weight": "Pisua"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/he.json b/www/core/components/grades/lang/he.json
index 4ae5cce2534..f71923977d3 100644
--- a/www/core/components/grades/lang/he.json
+++ b/www/core/components/grades/lang/he.json
@@ -1,15 +1,15 @@
 {
-    "average": "ממוצע (בקורס)",
+    "average": "ממוצע",
     "badgrade": "הציון שנמסר איננו נאות",
     "contributiontocoursetotal": "ניקוד משוקלל, כתרומה לציון הסופי",
-    "feedback": "משוב לבחירה בתשובה זו",
-    "grade": "ניקוד בפעילות",
+    "feedback": "תגובות",
+    "grade": "ציונים",
     "grades": "ציונים",
     "itemname": "שם הפריט",
     "lettergrade": "ציון אות",
     "nooutcome": "לא קיים מדד־הערכה",
     "percentage": "הניקוד כאחוז מהציון המירבי בפעילות",
     "range": "טווח",
-    "rank": "דרוג יחסי",
+    "rank": "דרגה",
     "weight": "משקל"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/it.json b/www/core/components/grades/lang/it.json
index dc227165d43..8991bf5655c 100644
--- a/www/core/components/grades/lang/it.json
+++ b/www/core/components/grades/lang/it.json
@@ -2,8 +2,8 @@
     "average": "Media",
     "badgrade": "Il voto inserito non è valido",
     "contributiontocoursetotal": "Quota di contribuzione sul totale del corso",
-    "feedback": "Feedback",
-    "grade": "Valutazione",
+    "feedback": "Commento",
+    "grade": "Punteggio",
     "grades": "Valutazioni",
     "itemname": "Nome elemento",
     "lettergrade": "Graduatoria letterale",
diff --git a/www/core/components/grades/lang/ja.json b/www/core/components/grades/lang/ja.json
index bfa3698fe22..2bed54f329a 100644
--- a/www/core/components/grades/lang/ja.json
+++ b/www/core/components/grades/lang/ja.json
@@ -3,7 +3,7 @@
     "badgrade": "提供された評定は有効ではありません。",
     "contributiontocoursetotal": "コース合計への貢献",
     "feedback": "フィードバック",
-    "grade": "評定",
+    "grade": "評点",
     "grades": "評定",
     "itemname": "項目名",
     "lettergrade": "評定文字",
diff --git a/www/core/components/grades/lang/lt.json b/www/core/components/grades/lang/lt.json
index 686daab9d80..80eb71c8e0b 100644
--- a/www/core/components/grades/lang/lt.json
+++ b/www/core/components/grades/lang/lt.json
@@ -2,7 +2,7 @@
     "average": "Vidurkis",
     "badgrade": "Pateiktas netinkamas įvertis",
     "contributiontocoursetotal": "Indėlis į kurso bendrą",
-    "feedback": "Grįžtamasis ryšys",
+    "feedback": "Atsiliepimas",
     "grade": "Įvertis",
     "grades": "Įverčiai",
     "itemname": "Elemento pavadinimas",
diff --git a/www/core/components/grades/lang/nl.json b/www/core/components/grades/lang/nl.json
index a4266d2d6f4..4a3ec60edd4 100644
--- a/www/core/components/grades/lang/nl.json
+++ b/www/core/components/grades/lang/nl.json
@@ -3,13 +3,13 @@
     "badgrade": "Beoordeling ongeldig",
     "contributiontocoursetotal": "Aandeel in cursustotaal",
     "feedback": "Feedback",
-    "grade": "Beoordeling",
+    "grade": "Cijfer",
     "grades": "Cijfers",
     "itemname": "Itemnaam",
     "lettergrade": "Letterbeoordeling",
     "nooutcome": "Geen competentie",
     "percentage": "Percentage",
     "range": "Marge",
-    "rank": "Ranglijst",
+    "rank": "Rangschikking",
     "weight": "Weging"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/pl.json b/www/core/components/grades/lang/pl.json
index 44e378ae1b1..e0e72a5b70e 100644
--- a/www/core/components/grades/lang/pl.json
+++ b/www/core/components/grades/lang/pl.json
@@ -4,12 +4,12 @@
     "contributiontocoursetotal": "Udział w całym kursie",
     "feedback": "Informacja zwrotna",
     "grade": "Ocena",
-    "grades": "Stopnie",
+    "grades": "Oceny",
     "itemname": "Nazwa pozycji",
     "lettergrade": "Nazwy ocen",
     "nooutcome": "Brak efektu kształcenia",
     "percentage": "Procentowo",
     "range": "Zakres",
-    "rank": "Pozycja na tle grupy",
+    "rank": "Pozycja",
     "weight": "Waga"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/pt-br.json b/www/core/components/grades/lang/pt-br.json
index d489ce5db62..22749a08522 100644
--- a/www/core/components/grades/lang/pt-br.json
+++ b/www/core/components/grades/lang/pt-br.json
@@ -2,8 +2,8 @@
     "average": "Média",
     "badgrade": "Nota fornecida é inválida",
     "contributiontocoursetotal": "Contribuição para o total do curso",
-    "feedback": "Feedback",
-    "grade": "Nota",
+    "feedback": "Comentários",
+    "grade": "Avaliação",
     "grades": "Notas",
     "itemname": "Nome do Item",
     "lettergrade": "Notas por letras",
diff --git a/www/core/components/grades/lang/pt.json b/www/core/components/grades/lang/pt.json
index e0d486df8e3..3dc103cd4b6 100644
--- a/www/core/components/grades/lang/pt.json
+++ b/www/core/components/grades/lang/pt.json
@@ -2,14 +2,14 @@
     "average": "Média",
     "badgrade": "A nota fornecida é inválida",
     "contributiontocoursetotal": "Contribuição para o total da disciplina",
-    "feedback": "Feedback",
-    "grade": "Nota",
-    "grades": "Notas",
+    "feedback": "Comentários",
+    "grade": "Avaliação",
+    "grades": "Pauta",
     "itemname": "Nome do item",
     "lettergrade": "Nota Alfabética",
     "nooutcome": "Nenhum resultado da aprendizagem",
     "percentage": "Percentagem",
     "range": "Intervalo",
-    "rank": "Posição relativa",
+    "rank": "Posição",
     "weight": "Peso"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/ro.json b/www/core/components/grades/lang/ro.json
index f0ab52efac5..03c1080cff7 100644
--- a/www/core/components/grades/lang/ro.json
+++ b/www/core/components/grades/lang/ro.json
@@ -1,9 +1,9 @@
 {
-    "average": "Media",
+    "average": "Medie",
     "badgrade": "Nota furnizată nu este corectă",
     "contributiontocoursetotal": "Contribuția la totalul cursului",
     "feedback": "Feedback",
-    "grade": "Notă",
+    "grade": "Notează",
     "grades": "Note",
     "itemname": "Nume element",
     "lettergrade": "Notă sub formă de literă",
diff --git a/www/core/components/grades/lang/ru.json b/www/core/components/grades/lang/ru.json
index 05c8c10d084..f1f6126713c 100644
--- a/www/core/components/grades/lang/ru.json
+++ b/www/core/components/grades/lang/ru.json
@@ -1,5 +1,5 @@
 {
-    "average": "Средняя оценка",
+    "average": "Средний",
     "badgrade": "Указана некорректная оценка",
     "contributiontocoursetotal": "Вклад в итог курса",
     "feedback": "Отзыв",
@@ -10,6 +10,6 @@
     "nooutcome": "Нет показателя",
     "percentage": "Проценты",
     "range": "Диапазон",
-    "rank": "Место",
+    "rank": "Ранг",
     "weight": "Вес"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/sv.json b/www/core/components/grades/lang/sv.json
index 7593dadca0f..45d3e21b56d 100644
--- a/www/core/components/grades/lang/sv.json
+++ b/www/core/components/grades/lang/sv.json
@@ -1,15 +1,15 @@
 {
-    "average": "Medelvärde",
+    "average": "Medel",
     "badgrade": "Det betyg som har avgivits är ogiltigt",
     "contributiontocoursetotal": "Bidrag till totalen för kursen",
     "feedback": "Återkoppling",
-    "grade": "Betyg",
-    "grades": "Betyg/omdömen",
+    "grade": "Betyg/omdöme",
+    "grades": "Betyg",
     "itemname": "Namn på komponent",
     "lettergrade": "Bokstavsbetyg/omdöme",
     "nooutcome": "Inget resultat",
     "percentage": "Procenttal",
     "range": "Omfång",
-    "rank": "Ranking",
+    "rank": "Rangordna",
     "weight": "vikt"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/tr.json b/www/core/components/grades/lang/tr.json
index a604f01f390..b50d05f02ad 100644
--- a/www/core/components/grades/lang/tr.json
+++ b/www/core/components/grades/lang/tr.json
@@ -2,14 +2,14 @@
     "average": "Ortalama",
     "badgrade": "Sağlanan not geçersiz",
     "contributiontocoursetotal": "Ders toplamına katkısı",
-    "feedback": "Geribildirim",
-    "grade": "Başarı notu",
-    "grades": "Başarı notları",
+    "feedback": "Geri bildirim",
+    "grade": "Not",
+    "grades": "Notlar",
     "itemname": "Öge adı",
     "lettergrade": "Harf notu",
     "nooutcome": "Hedef yok",
     "percentage": "Yüzde",
     "range": "Fark",
-    "rank": "sıra",
+    "rank": "Sıra",
     "weight": "Ağırlık"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/uk.json b/www/core/components/grades/lang/uk.json
index ae349f2a21c..90a3c3ea978 100644
--- a/www/core/components/grades/lang/uk.json
+++ b/www/core/components/grades/lang/uk.json
@@ -1,15 +1,15 @@
 {
-    "average": "Середня оцінка",
+    "average": "Середнє",
     "badgrade": "Проставлена оцінка - недопустима",
     "contributiontocoursetotal": "Внесок у підсумок курсу",
-    "feedback": "Коментар",
+    "feedback": "Відгук",
     "grade": "Оцінка",
-    "grades": "Оцінки",
+    "grades": "Журнал оцінок",
     "itemname": "Назва елементу",
     "lettergrade": "Буквена оцінка",
     "nooutcome": "Без результату",
     "percentage": "Відсоток",
     "range": "Інтервал",
-    "rank": "Порядок",
+    "rank": "Розташувати в порядку",
     "weight": "значимість"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/zh-cn.json b/www/core/components/grades/lang/zh-cn.json
index acd9a162913..9a3d42259f1 100644
--- a/www/core/components/grades/lang/zh-cn.json
+++ b/www/core/components/grades/lang/zh-cn.json
@@ -1,5 +1,5 @@
 {
-    "average": "平均值",
+    "average": "平均",
     "badgrade": "提供的成绩不可用",
     "contributiontocoursetotal": "对课程的总贡献",
     "feedback": "反馈",
@@ -10,6 +10,6 @@
     "nooutcome": "无成果",
     "percentage": "百分比",
     "range": "范围",
-    "rank": "排名",
+    "rank": "等级",
     "weight": "权重"
 }
\ No newline at end of file
diff --git a/www/core/components/grades/lang/zh-tw.json b/www/core/components/grades/lang/zh-tw.json
index e108db854ad..ad4dc4b8ff6 100644
--- a/www/core/components/grades/lang/zh-tw.json
+++ b/www/core/components/grades/lang/zh-tw.json
@@ -1,9 +1,9 @@
 {
-    "average": "平均",
+    "average": "平均數",
     "badgrade": "提供的成績是無效的",
     "contributiontocoursetotal": "貢獻到課程總分",
     "feedback": "回饋",
-    "grade": "成績",
+    "grade": "分數",
     "grades": "成績",
     "itemname": "項目名稱",
     "lettergrade": "文字等第",
diff --git a/www/core/components/login/lang/ar.json b/www/core/components/login/lang/ar.json
index a781f7c3589..e58f7ef0a9d 100644
--- a/www/core/components/login/lang/ar.json
+++ b/www/core/components/login/lang/ar.json
@@ -1,6 +1,6 @@
 {
     "authenticating": "مصادقة",
-    "cancel": "ألغي",
+    "cancel": "إلغاء",
     "connect": "دخول",
     "connecttomoodle": "بيانات الدخول",
     "createaccount": "إنشاء حساب مشترك الجديد",
@@ -17,7 +17,7 @@
     "invalidemail": "عنوان البريد الإلكتروني غير صحيح",
     "invalidmoodleversion": "نسخة موودل غير صالحة. الحد الأدنى للنسخة المطلوبة هو:",
     "invalidsite": "رابط عنوان الموقع غير صالح.",
-    "invalidurl": "عنوان الأنترنت المدخل غير صحيح",
+    "invalidurl": "عنوان الإنترنت غير صحيح",
     "login": "دخول",
     "loginbutton": "دخول",
     "loginsteps": "مرحبا بك! يمكنك إنشاء حساب مشترك جديد في هذا الموقع خلال لحظات والاتصال الكامل بالمقررات الدراسية وذلك بتتبع الخطوات التالية:\n\n   <ol>\n   <li>املأ نموذج <a href=\"{{$a}}\">حساب جديد</a>.</li>\n   <li>على الفور تصلك رسالة على عنوانك البريدي.</li>\n   <li>قم بقراءة البريد واضغط على الرابطة الموجودة به.</li>\n   <li>سيتم تأكيد اشتراكك ويسمح لك بالدخول.</li>\n   <li>والآن قم باختيار المقرر الدراسي الذي ترغب المشاركة فيه.</li>\n   <li>من الآن فصاعدا يمكنك الدخول عن طريق إدخال اسم المستخدم وكلمة المرور (في النموذج المقابل بهذه الصفحة) ، وتستطيع الاتصال الكامل المقرر الدراسي ، وتصل إلى أي مقرر دراسي تريد التسجيل به.</li>\n   <li>إذا طلب منك  ''مفتاح التسجيل'' - استخدم المفتاح الذي أعطاه لك المدرس. هذا سيجعلك ''تشارك'' في المقرر الدراسي.   </li>\n   <li> لا حظ أن كل مقرر دراسي قد يكون له أيضا \"مفتاح تسجيل\" ستحتاج إليه لاحقا.</li>\n   </ol>",
@@ -26,7 +26,7 @@
     "missinglastname": "الاسم الأخير  لم يتم تحدده",
     "newaccount": "حساب مشترك جديد",
     "newsitedescription": "من فضلك أدخل رابط موقع نظام التعلم الإلكتروني مودل الخاص بك. لاحظ انه من الممكن أن يكون لم يتم إعداده للعمل مع هذا التطبيق.",
-    "password": "كلمة السر",
+    "password": "كلمة المرور",
     "passwordrequired": "كلمة المرور مطلوبة",
     "policyaccept": "لقد فهمت وأوافق",
     "policyagree": "يجب الموافقة على هذه الشروط للإستمرار في إستخدام الموقع. هل أنت موافق؟",
diff --git a/www/core/components/login/lang/bg.json b/www/core/components/login/lang/bg.json
index aba3a7656a7..756d4f907f2 100644
--- a/www/core/components/login/lang/bg.json
+++ b/www/core/components/login/lang/bg.json
@@ -17,7 +17,7 @@
     "invalidmoodleversion": "Невалидна версия на Moodle. Най-старата изискване версия е 2.4.",
     "invalidsite": "Интернет адресът на сайта е невалиден.",
     "invalidurl": "URL-ът, който току що въведохте не е валиден",
-    "login": "Влизане във Вашия профил",
+    "login": "Вход",
     "loginbutton": "Вход!",
     "logininsiterequired": "Трябва да влезете в сайта през прозорец на браузър.",
     "loginsteps": "За пълен достъп до този сайт трябва първо да си създадете профил.",
@@ -27,7 +27,7 @@
     "mobileservicesnotenabled": "Услугите от Moodle не са активирани на Вашия сайт. Моля, свържете се с администратор на Moodle, ако мислите, че мобилния достъп трябва да бъде разрешен.",
     "newaccount": "Нова потребителска регистрация",
     "notloggedin": "Трябва са сте влезли в сайта.",
-    "password": "Парола",
+    "password": "Ключ за записване",
     "passwordrequired": "Паролата е задължителна",
     "policyaccept": "Разбирам и съм съгласен",
     "policyagree": "Трябва да се съгласите с тези условия за ползване, за да продължите да ползвате сайта. Съгласен/на ли сте?",
diff --git a/www/core/components/login/lang/ca.json b/www/core/components/login/lang/ca.json
index 4012c0912f7..d14a659e218 100644
--- a/www/core/components/login/lang/ca.json
+++ b/www/core/components/login/lang/ca.json
@@ -28,7 +28,7 @@
     "invalidmoodleversion": "La versió de Moodle no és vàlida. Cal com a mínim la versió 2.4.",
     "invalidsite": "L'URL del lloc no és vàlid.",
     "invalidtime": "L'hora no és vàlida",
-    "invalidurl": "S'ha especificat un URL no vàlid",
+    "invalidurl": "L'URL no és vàlid",
     "invalidvaluemax": "El valor màxim és {{$a}}",
     "invalidvaluemin": "El valor mínim és {{$a}}",
     "localmobileunexpectedresponse": "Les característiques addicionals de Moodle Mobile han tornat una resposta inesperada, us heu d'autenticar fent servir el servei estàndard de Mobile.",
@@ -44,7 +44,7 @@
     "newaccount": "Nou compte",
     "newsitedescription": "Introduïu l'URL del vostre lloc Moodle. Tingueu en compte que podria no estar configurat per treballar amb aquesta aplicació.",
     "notloggedin": "Heu d'entrar al lloc.",
-    "password": "Contrasenya",
+    "password": "Clau d'inscripció",
     "passwordrequired": "Contrasenya obligatòria",
     "policyaccept": "Entès i conforme",
     "policyagree": "Heu d'acceptar la normativa abans d'entrar en aquest lloc. Hi esteu d'acord?",
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index 49d4981eac9..858326db16a 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -1,7 +1,7 @@
 {
     "auth_email": "Registrace na základě e-mailu",
     "authenticating": "Autentizace",
-    "cancel": "Zrušit",
+    "cancel": "Přerušit",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
     "connect": "Spojit",
@@ -19,7 +19,7 @@
     "errorupdatesite": "Došlo k chybě při aktualizaci tokenu webu.",
     "firsttime": "Jste tady poprvé?",
     "getanothercaptcha": "Získat jiné CAPTCHA",
-    "help": "Pomoc",
+    "help": "Nápověda",
     "helpmelogin": "<p> Existuje mnoho tisíc webů Moodle po celém světě. Tato aplikace může připojit pouze ke stránkám Moodle, které povolily, mobilní přístup k aplikaci. </p> <p> Pokud se nemůžete k Moodle připojit, pak je třeba kontaktovat správce web Moodle, kam se chcete připojit a požádat, aby přečetl <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\"> http://docs.moodle.org/en/Mobile_app </a> </p> <p> Chcete-li otestovat aplikaci na Moodle demo webu jako <i> učitel </i> nebo <i> student </i>  na pole <i> Adresa stránky  </i> a klikněte na tlačítko <b> Připojit </b>. </p>",
     "instructions": "Pokyny",
     "invalidaccount": "Zkontrolujte si prosím své přihlašovací údaje nebo se obraťte na správce webu, aby zkontroloval nastavení.",
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Neplatná verze Moodle. Minimální potřebná verze je:",
     "invalidsite": "Adresa URL stránky je chybná",
     "invalidtime": "Neplatný čas",
-    "invalidurl": "Chybná specifikace URL",
+    "invalidurl": "Neplatná URL",
     "invalidvaluemax": "Maximální hodnota je {{$a}}",
     "invalidvaluemin": "Minimální hodnota je {{$a}}",
     "localmobileunexpectedresponse": "Kontrola rozšířených vlastností Moodle Mobile vrátil neočekávanou odezvu, budete ověřen pomocí standardních služeb mobilu .",
     "loggedoutssodescription": "Musíte se znovu autentizovat. Musíte se přihlásit na stránky v okně prohlížeče.",
-    "login": "Přihlásit ke svému účtu",
+    "login": "Přihlásit se",
     "loginbutton": "Přihlásit se",
     "logininsiterequired": "Váš Moodlu vás nutí k přihlášení pomocí prohlížeče. Nová instance prohlížeče otevře přesměrování na vaše stránky Moodle.",
     "loginsteps": "K plnému přístupu na tyto stránky, musíte nejprve vytvořit účet.",
@@ -44,7 +44,7 @@
     "newaccount": "Nový účet",
     "newsitedescription": "Zadejte prosím adresu URL vašeho webu Moodle. Všimněte si, že nemusí být nakonfigurován pro práci s touto aplikací.",
     "notloggedin": "Musíte být přihlášeni.",
-    "password": "Heslo",
+    "password": "Sdílené heslo",
     "passwordrequired": "Je požadováno heslo",
     "policyaccept": "Rozumím a souhlasím",
     "policyagree": "Před dalším používáním těchto stránek musíte souhlasit s těmito pravidly. Souhlasíte s nimi?",
diff --git a/www/core/components/login/lang/da.json b/www/core/components/login/lang/da.json
index 1c8dc5d0c48..71bccdcbe1d 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -21,9 +21,9 @@
     "invalidemail": "Ugyldig e-mailadresse",
     "invalidmoodleversion": "Ugyldig Moodle version. Der kræves minimum 2.4.",
     "invalidsite": "Denne webadresse er ugyldig.",
-    "invalidurl": "Ugyldig URL specificeret",
+    "invalidurl": "Ugyldig URL",
     "localmobileunexpectedresponse": "Du har fået en uventet reaktion fra Moodle Mobile Additional Features, så du vil blive godkendt ved hjælp af standard Mobile service.",
-    "login": "Log ind på din konto",
+    "login": "Log ind",
     "loginbutton": "Login",
     "logininsiterequired": "Du skal logge på websiden via en browser",
     "loginsteps": "For at få fuld adgang til dette site, skal du oprette en brugerkonto.",
@@ -34,7 +34,7 @@
     "newaccount": "Ny konto",
     "newsitedescription": "Skriv din Moodles webadresse. Bemærk at Moodle kan være konfigureret, så den ikke virker med denne app.",
     "notloggedin": "Du skal være logget på.",
-    "password": "Adgangskode",
+    "password": "Delt hemmelig streng",
     "passwordrequired": "Adgangskode kræves",
     "policyaccept": "Jeg forstår og er enig",
     "policyagree": "Du må acceptere disse retningslinjer for at benytte dette site.\nAccepterer du?",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index 10cc82ae64b..c55337459f5 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Falsche Version. Mindestens Moodle 2.4 ist notwendig.",
     "invalidsite": "Die URL der Website ist ungültig.",
     "invalidtime": "Ungültige Zeitangabe",
-    "invalidurl": "Ungültige URL angegeben",
+    "invalidurl": "Ungültige URL",
     "invalidvaluemax": "Der Maximalwert ist {{$a}}.",
     "invalidvaluemin": "Der Minimalwert ist {{$a}}.",
     "localmobileunexpectedresponse": "Die Verbindung zum Plugin 'Moodle Mobile - Zusatzfeatures' ist fehlgeschlagen. Sie werden über den standardmäßigen mobilen Webservice authentifiziert.",
     "loggedoutssodescription": "Sie müssen sich erneut authentifizieren. Melden Sie sich dafür im Browser auf der Website im Browser an..",
-    "login": "Mit Ihrem Nutzerkonto anmelden",
+    "login": "Login",
     "loginbutton": "Anmelden",
     "logininsiterequired": "Sie müssen sich für diese Website im Browser anmelden.",
     "loginsteps": "Für den vollen Zugriff auf diese Website benötigen Sie ein Nutzerkonto.",
@@ -44,7 +44,7 @@
     "newaccount": "Neuer Zugang",
     "newsitedescription": "Geben Sie die URL zu Ihrer Website ein. Eventuell ist Ihre Website nicht für diese App freigegeben.",
     "notloggedin": "Sie müssen eingeloggt sein.",
-    "password": "Gastschlüssel",
+    "password": "Kennwort",
     "passwordrequired": "Kennwort fehlt",
     "policyaccept": "Ich verstehe den Text und stimme ihm zu",
     "policyagree": "Lesen Sie diese Zustimmungserklärung sorgfältig. Sie müssen erst zustimmen, um diese Website weiter nutzen zu können. Stimmen Sie zu?",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index 44ccc1d8784..eadd71ec584 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -1,7 +1,7 @@
 {
     "auth_email": "Email-based αυτο-εγγραφή",
     "authenticating": "Έλεγχος ταυτότητας",
-    "cancel": "Ακύρωση",
+    "cancel": "Άκυρο",
     "checksiteversion": "Ελέγξτε ποια έκδοση Moodle χρησιμοποιεί το site, Moodle 2.4 ή μετέπειτα έκδοση.",
     "confirmdeletesite": "Είστε σίγουροι ότι θέλετε να διαγράψετε το site {{sitename}};",
     "connect": "Σύνδεση!",
@@ -21,14 +21,14 @@
     "help": "Βοήθεια",
     "instructions": "Οδηγίες",
     "invalidemail": "Εσφαλμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
-    "invalidurl": "Μη έγκυρο URL",
+    "invalidurl": "Το URL που εισαγάγατε δεν είναι έγκυρο",
     "login": "Είσοδος",
     "loginsteps": "Γεια σας,\n\nΓια να έχετε πλήρη πρόσβαση σε κάποια μαθήματα θα χρειαστεί να δημιουργήσετε ένα νέο λογαριασμό, ακολουθώντας τα παρακάτω βήματα:\n<OL size=2>\n   <li>Συμπληρώστε τη φόρμα <A HREF={{$a}}>Νέου λογαριασμού</A> με τα δεδομένα σας.\n   <li>Ένα μήνυμα ηλεκτρονικού ταχυδρομείου θα αποσταλεί στη διεύθυνσή σας.\n   <li>Διαβάστε το μήνυμα και επιλέξτε τη διεύθυνση που περιέχει.\n   <li>Μετά την επιβεβαίωση του λογαριασμού σας, θα μπορείτε να συνδεθείτε στην ηλεκτρονική τάξη.\n   <li>Αφού έχετε συνδεθεί, μπορείτε να επιλέξτε το μάθημα στο οποίο θέλετε να εγγραφείτε. Αν σας ζητηθεί ένα \"κλειδί εγγραφής\" - χρησιμοποιήστε αυτό που σας έδωσε ο διδάσκοντάς σας.\n   <li>Από εδώ και στο εξής θα έχετε τη δυνατότητα να χρησιμοποιήσετε όλες τις δραστηριότητες και τις πηγές πληροφοριών του μαθήματος.\n   </ol>",
     "missingemail": "Λείπει η διεύθυνση ηλεκτρονικού ταχυδρομείου",
     "missingfirstname": "Λείπει το όνομα",
     "missinglastname": "Λείπει το επώνυμο",
     "newaccount": "Νέος λογαριασμός",
-    "password": "Κωδικός πρόσβασης",
+    "password": "Κωδικός",
     "policyaccept": "Καταλαβαίνω και συμφωνώ",
     "policyagree": "Πρέπει να συμφωνήσετε σε αυτήν την πολιτική για να συνεχίσετε στο ιστοχώρο. Συμφωνείτε;",
     "policyagreement": "Άδεια χρήσης του ιστοχώρου",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index 0d0c4738c6c..672aaa06cb7 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Versión de Moodle inválida. La versión mínima requerida es 2.4",
     "invalidsite": "La URL del sitio es inválida.",
     "invalidtime": "Hora inválida",
-    "invalidurl": "Se ha especificado una URL no válida",
+    "invalidurl": "URL no válida",
     "invalidvaluemax": "El valor máximo es {{$a}}",
     "invalidvaluemin": "El valor mínimo es {{$a}}",
     "localmobileunexpectedresponse": "La revisión de las características Adicionales de Moodle Mobile regresó una respuesta inesperada; Usted será autenticado usando el servicio Mobile estándar.",
     "loggedoutssodescription": "Usted tiene que autenticarse nuevamente. Usted necesita ingresar al sitio en una ventana del navegador.",
-    "login": "Ingresar a su cuenta",
+    "login": "Ingresar",
     "loginbutton": "Ingreso",
     "logininsiterequired": "Usted necesita ingresar al sitio con una ventana del navegador.",
     "loginsteps": "Para acceso completo a este sitio, Usted necesita primeramente crear una cuenta.",
@@ -44,7 +44,7 @@
     "newaccount": "Nueva cuenta",
     "newsitedescription": "Por favor escriba la uRL de su sitio Moodle. Tome nota de que este podría no estar configurado para trabajar con esta app.",
     "notloggedin": "Usted necesita estar ingresado.",
-    "password": "Contraseña",
+    "password": "Secreto Compartido",
     "passwordrequired": "Contraseña obligatoria",
     "policyaccept": "Entiendo y estoy de acuerdo",
     "policyagree": "Usted deberá estar de acuerdo con estas condiciones antes de seguir usando este sitio. ¿Está de acuerdo?",
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index 1e8b3fe4e7e..742809c5a29 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -28,11 +28,11 @@
     "invalidmoodleversion": "Versión de Moodle inválida. La versión mínima requerida es:",
     "invalidsite": "La URL del sitio es inválida.",
     "invalidtime": "Hora incorrecta",
-    "invalidurl": "Se ha especificado una URL no válida",
+    "invalidurl": "URL no válida",
     "invalidvaluemax": "El valor máximo es {{$a}}",
     "invalidvaluemin": "El valor mínimo es {{$a}}",
     "localmobileunexpectedresponse": "Las características adicionales de Moodle Mobile han devuelto una respuesta inesperada, debe autenticarse utilizando el servicio estándar de Mobile.",
-    "login": "Acceder con su cuenta",
+    "login": "Acceder",
     "loginbutton": "Acceder",
     "logininsiterequired": "Para autentificarse en el sitio se ha de abrir una ventana de navegador.",
     "loginsteps": "Hola. Para acceder al sistema tómese un minuto para\ncrear una cuenta.\nCada curso puede disponer de una \"clave de acceso\"\nque sólo tendrá que usar la primera vez.\nEstos son los pasos:\n<ol>\n<li>Rellene el <a href=\"{{$a}}\">Formulario de Registro</a> con sus datos.</li>\n<li>El sistema le enviará un correo para verificar que su dirección sea correcta.</li>\n<li>Lea el correo y confirme su matrícula.</li>\n<li>Su registro será confirmado y usted podrá acceder al curso.</li>\n<li>Seleccione el curso en el que desea participar.</li>\n<li>Si algún curso en particular le solicita una \"contraseña de acceso\"\nutilice la que le facilitaron cuando se matriculó.\nAsí quedará matriculado.</li>\n<li>A partir de ese momento no necesitará utilizar más que su nombre de usuario y contraseña\nen el formulario de la página\npara entrar a cualquier curso en el que esté matriculado.</li>\n</ol>",
@@ -43,7 +43,7 @@
     "newaccount": "Nueva cuenta",
     "newsitedescription": "Introduzca la URL de su sitio Moodle. Tenga en cuenta que podría no estar configurado para trabajar con esta aplicación.",
     "notloggedin": "Ha de entrar al sitio.",
-    "password": "Contraseña",
+    "password": "Clave de matriculación",
     "passwordrequired": "Contraseña obligatoria",
     "policyaccept": "Entiendo y estoy de acuerdo",
     "policyagree": "Usted deberá estar de acuerdo con estas condiciones antes de seguir usando este sitio. ¿Está de acuerdo?",
diff --git a/www/core/components/login/lang/eu.json b/www/core/components/login/lang/eu.json
index 94685db8f7f..f58e93e3469 100644
--- a/www/core/components/login/lang/eu.json
+++ b/www/core/components/login/lang/eu.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Moodle bertsio baliogabea. Gutxieneko bertsioa hurrengoa da:",
     "invalidsite": "Guneko URLa ez da zuzena",
     "invalidtime": "Ordu baliogabea",
-    "invalidurl": "Balio ez duen URLa ezarri da",
+    "invalidurl": "URL baliogabea",
     "invalidvaluemax": "Gehieneko balioa {{$a}} da.",
     "invalidvaluemin": "Gutxieneko balioa {{$a}} da.",
     "localmobileunexpectedresponse": "Moodle Mobile-ko Funtzio Aurreratuen kontrolak ezusteko erantzuna eman du, Mobile zerbitzu estandarra erabilita autentifikatuko zaitugu.",
     "loggedoutssodescription": "Berriz autentifikatu behar duzua. Gunean nabigatzaile leiho baten bitartez hasi behar duzu saioa.",
-    "login": "Sartu zure kontuan",
+    "login": "Sartu",
     "loginbutton": "Hasi saioa",
     "logininsiterequired": "Gunean web-nabigatzaile baten bidez sartu behar zara.",
     "loginsteps": "Gune honetara sarbide osoa izateko, lehenik eta behin kontua sortu behar duzu. in ikastarotara sartzeko web-gune honetako erabiltzaile izan behar duzu\neta horretarako kontu bat sortu behar duzu.\n\nNola sortu kontu berria:\n<ol>\n<li>Sakatu lotura honetan <a href=\"{{$a}}\">KONTU BERRIA</a> eta formularioa bete zure datuekin.</li>\n<li>E-posta mezu bat bidaliko dugu berehala zure e-posta helbidera.</li>\n<li>Mezua irakurri eta agertzen den loturan klik egin.</li>\n<li>Zure kontua berretsi eta barruan izango zara.</li>\n<li>Orduan, nahi duzun ikastaroa aukeratu.</li>\n<li>\"Partaide-giltza\" bat eskatzen badizu, erabili matrikulatutakoan eman zizutena</li>\n<li>Kontu berria sortutakoan, eta zenbait kasutan matrikula egindakoan, ikastarorako sarbidea izango duzu.</li>\n<li>Hemendik aurrera zure erabiltzaile-izena eta pasahitza besterik ez dituzu sartu beharko hasiera orrian zeure ikastaroan parte hartzeko.</li>\n</ol>",
@@ -44,7 +44,7 @@
     "newaccount": "Kontu berria",
     "newsitedescription": "Sartu mesedez zure Moodle guneko URLa. Kontuan hartu app honekin funtzionatzeko gunea aurretik konfiguraturik egon behar dela.",
     "notloggedin": "Autentifikaturik egon behar duzu.",
-    "password": "Pasahitza",
+    "password": "Partekatutako sekretua",
     "passwordrequired": "Pasahitza behar da",
     "policyaccept": "Ulertu dut eta ados nago",
     "policyagree": "Web gune honetan jarraitu aurretik baldintzekin ados egon behar duzu. Ados al zaude?",
diff --git a/www/core/components/login/lang/fa.json b/www/core/components/login/lang/fa.json
index 60b9312b038..742e9639285 100644
--- a/www/core/components/login/lang/fa.json
+++ b/www/core/components/login/lang/fa.json
@@ -17,7 +17,7 @@
     "invalidemail": "آدرس پست الکترونیک نامعتبر",
     "invalidmoodleversion": "این نسخه از برنامه سایت قابلیت اتصال به موبایل ندارد",
     "invalidsite": "نشانی سایت معتبر نیست",
-    "invalidurl": "آدرسی که وارد کرده‌اید معتبر نیست",
+    "invalidurl": "آدرس نامعتبر",
     "login": "ورود به سایت",
     "logininsiterequired": "لازم است به سایت از طریق مرورگر متصل گردید",
     "loginsteps": "برای داشتن دسترسی کامل به این سایت، پیش از هر چیز باید یک حساب کاربری بسازید.",
@@ -26,7 +26,7 @@
     "missinglastname": "نام خانوادگی را وارد کنید",
     "mobileservicesnotenabled": "سرویس دسترسی موبایل در سایت شما فعال نیست",
     "newaccount": "حساب کاربری جدید",
-    "password": "رمز دسترسی",
+    "password": "رمز ورود",
     "passwordrequired": "گذرواژه مورد نیاز است",
     "policyaccept": "موافقم و می‌پذیرم",
     "policyagree": "برای ادامهٔ استفاده از این سایت باید موافقت خود را با خط مشی آن اعلام کنید. آیا موافقید؟",
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index 375dc7590c2..2fed4a1d8f6 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Version de Moodle non valide. La version minimale requise est :",
     "invalidsite": "Cette URL n'est pas valide.",
     "invalidtime": "Temps non valide",
-    "invalidurl": "URL spécifié non valide",
+    "invalidurl": "URL non valide",
     "invalidvaluemax": "La valeur maximale est {{$a}}",
     "invalidvaluemin": "La valeur minimale est {{$a}}",
     "localmobileunexpectedresponse": "La vérification des fonctionnalités additionnelles de Moodle Mobile a envoyé une réponse inattendue. Vous allez être connecté au moyen du service mobile standard.",
     "loggedoutssodescription": "Veuillez vous ré-authentifier en vous connectant au site au moyen d'un navigateur web.",
-    "login": "Connexion à votre compte",
+    "login": "Connexion",
     "loginbutton": "Se connecter",
     "logininsiterequired": "Vous devez vous connecter au moyen d'un navigateur.",
     "loginsteps": "Pour un accès complet à ce site, veuillez créer un compte utilisateur.",
@@ -44,7 +44,7 @@
     "newaccount": "Nouveau compte",
     "newsitedescription": "Veuillez saisir l'URL de votre plateforme Moodle.",
     "notloggedin": "Vous devez être connecté.",
-    "password": "Mot de passe",
+    "password": "Secret partagé",
     "passwordrequired": "Mot de passe requis",
     "policyaccept": "Je comprends et je me déclare d'accord",
     "policyagree": "Vous devez accepter de vous conformer à ce règlement pour continuer à utiliser ce site. Acceptez-vous le règlement ?",
diff --git a/www/core/components/login/lang/he.json b/www/core/components/login/lang/he.json
index b420c10f9f5..08820ee166c 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -20,8 +20,8 @@
     "invalidemail": "כתובת דואר אלקטרוני לא תקפה",
     "invalidmoodleversion": "גרסת מוודל לא תקינה. נדרשת גרסה 2.4 ומעלה.",
     "invalidsite": "כתובת האתר אינה תקינה.",
-    "invalidurl": "הוגדר קישור לא תקין",
-    "login": "התחברות לחשבונך",
+    "invalidurl": "URL לא חוקי",
+    "login": "התחברות",
     "loginbutton": "כניסה!",
     "logininsiterequired": "עליך להתחבר לאתר בחלון דפדפן.",
     "loginsteps": "שלום לך! לקבלת גישה מלאה לקורסים עליך להקדיש דקה לפתיחת חשבון חדש באתר זה.\nלכל אחד מהקורסים הבודדים יכול להיות גם \"מפתח רישום\" שתצטרך רק מאוחר יותר. להלן שלבי פתיחת החשבון:\n<ol>\n<li>מלא את הטופס <a href=\"{{$a}}\">חשבון חדש</a> בפרטים שלך</li>\n<li>דואר אלקטרוני יישלח מיידית לכתובת הדואר האלקטרוני שסיפקת (אם לא נמצא, נא לחפש גם בדואר הזבל או הספאם). </li>\n<li>קרא את הדואר אלקטרוני שלך ולחץ על קישור האינטרנט שהוא מכיל.</li>\n<li>החשבון שלך יאושר ואתה תהיה מחובר.</li>\n<li>עכשיו בחר את הקורס בו תרצה להשתתף.</li>\n<li>אם מבקשים ממך \"מפתח רישום\" השתמש בזה שנתן לך המורה שלך. זה \"ירשום\" אותך לקורס.</li>\n<li>עכשיו יש בידך גישה לכל הקורס. מעתה והלאה כל שתצטרך בכדי להתחבר ולהיכנס לכל קורס שנרשמת אליו הוא שם המשתמש שלך והסיסמה (בטופס המופיע בדף זה).</li>\n</ol>",
@@ -32,7 +32,7 @@
     "newaccount": "חשבון חדש",
     "newsitedescription": "יש להזין את כתובת אתר המוודל שלך. יש לשים לב כי יתכן והאתר אינו מוגדר לעבוד עם יישומון זו.",
     "notloggedin": "עליך להיות מחובר/ת",
-    "password": "סיסמה",
+    "password": "סיסמה (secret)",
     "passwordrequired": "דרושה סיסמה",
     "policyaccept": "אני מבין ומסכים",
     "policyagree": "הינך חייב לאשר את מדיניות זו על מנת להמשיך להשתמש באתר זה. האם אתה מסכים?",
diff --git a/www/core/components/login/lang/hu.json b/www/core/components/login/lang/hu.json
index b8471f2c4ca..c5c7c062990 100644
--- a/www/core/components/login/lang/hu.json
+++ b/www/core/components/login/lang/hu.json
@@ -1,6 +1,6 @@
 {
     "authenticating": "Hitelesítés",
-    "cancel": "Törlés",
+    "cancel": "Mégse",
     "connect": "Kapcsolódás",
     "createaccount": "Új felhasználói azonosítóm létrehozása",
     "createuserandpass": "Új felhasználónév és jelszó megadása",
@@ -15,8 +15,8 @@
     "invalidemail": "Érvénytelen e-mail cím",
     "invalidmoodleversion": "Érvénytelen Moodle-verzió. A minimális verziószám a 2.4.",
     "invalidsite": "A portál-URL nem érvényes.",
-    "invalidurl": "Érvénytelen URL-t adott meg",
-    "login": "Lépjen be fiókjába",
+    "invalidurl": "Érvénytelen URL",
+    "login": "Belépés",
     "logininsiterequired": "A portálra böngészőablakban kell bejelentkeznie.",
     "loginsteps": "Ahhoz, hogy teljesen hozzáférjen a portálhoz, először új fiókot kell létrehoznia.",
     "missingemail": "Hiányzó e-mail cím",
@@ -24,7 +24,7 @@
     "missinglastname": "Hiányzó vezetéknév",
     "mobileservicesnotenabled": "Portálján a mobil szolgáltatások nincsenek engedélyezve. A mobil elérhetőség bekapcsolásához forduljon a rendszergazdához.",
     "newaccount": "Új fiók",
-    "password": "Jelszó",
+    "password": "Megosztott titkos jel",
     "passwordrequired": "Jelszó szükséges",
     "policyaccept": "Megértettem és elfogadom",
     "policyagree": "A portál használatához el kell fogadnia a feltételeket. Elfogadja őket?",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index 23251dd157e..470c0717f7a 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -21,7 +21,7 @@
     "invalidemail": "Indirizzo email non valido",
     "invalidmoodleversion": "Versione di Moodle non valida. La versione minima richiesta:",
     "invalidsite": "L'URL del sito non è valida",
-    "invalidurl": "La URL specificata non è valida",
+    "invalidurl": "L'URL non è valido",
     "localmobileunexpectedresponse": "Il controllo delle Moodle Mobile Additional Feature ha restituito una risposta inattesa, sarai autenticato tramite i servizi Mobile standard.",
     "login": "Login",
     "loginbutton": "Login!",
@@ -34,7 +34,7 @@
     "newaccount": "Nuovo account",
     "newsitedescription": "Inserisci l'URL del sito Moodle al quale vuoi collegarti. Da notare che il sito deve essere configurato per funzionare con questa app.",
     "notloggedin": "Devi essere autenticato",
-    "password": "Chiave",
+    "password": "Password",
     "passwordrequired": "Password necessaria",
     "policyaccept": "Ho letto le condizioni e le accetto",
     "policyagree": "Per continuare ad usare questo sito, è necessario accettare le condizioni riportate.",
diff --git a/www/core/components/login/lang/ja.json b/www/core/components/login/lang/ja.json
index e38671c8c23..6b0b86428d5 100644
--- a/www/core/components/login/lang/ja.json
+++ b/www/core/components/login/lang/ja.json
@@ -15,8 +15,8 @@
     "invalidemail": "無効なメールアドレスです。",
     "invalidmoodleversion": "Moodleのバージョンが古すぎます。少なくともこれより新しいMoodleである必要があります：",
     "invalidsite": "サイトURLが正しくありません。",
-    "invalidurl": "無効なURLが指定されました。",
-    "login": "あなたのアカウントにログインする:",
+    "invalidurl": "無効なURLです。",
+    "login": "ログイン",
     "logininsiterequired": "ブラウザウインドウからサイトにログインする必要があります。",
     "loginsteps": "このサイトにフルアクセスするため、あなたは最初にアカウントを作成する必要があります。",
     "missingemail": "メールアドレスが入力されていません。",
@@ -24,7 +24,7 @@
     "missinglastname": "姓が入力されていません。",
     "mobileservicesnotenabled": "あなたのサイトではモバイルサービスが有効になっていません。モバイルアクセスが必要と思うなら、あなたのMoodleサイト管理者にその相談をしてください。",
     "newaccount": "新しいアカウント",
-    "password": "パスワード",
+    "password": "共有秘密鍵",
     "passwordrequired": "パスワードがありません",
     "policyaccept": "私は内容を理解および同意します。",
     "policyagree": "このサイトを継続して利用するにはあなたは使用許諾に同意する必要があります。同意しますか?",
diff --git a/www/core/components/login/lang/lt.json b/www/core/components/login/lang/lt.json
index 07ebd4979b4..a6d485ab57f 100644
--- a/www/core/components/login/lang/lt.json
+++ b/www/core/components/login/lang/lt.json
@@ -19,7 +19,7 @@
     "errorupdatesite": "Klaida atnaujinant svetainės kodą.",
     "firsttime": "Ar jūs čia pirmą kartą?",
     "getanothercaptcha": "Gauti kitą CAPTCHA",
-    "help": "Pagalba",
+    "help": "Žinynas",
     "helpmelogin": "<p>Visame pasaulyje Moodle svetainių yra labai daug. Ši programėlė gali prisijungti prie Moodle svetainių, turinčių specialią Moodle programėlių prieigą.</p><p>Jeigu negalite prisijungti, praneškite apie tai Moodle administratoriui ir paprašykite perskaityti <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>Norėdami išbandyti programėlės demo versiją surinkite <i>teacher (dėstytojui)</i> ar <i>student (besimokančiajam)</i> <i>Svetainės adreso </i> lauke ir paspauskite <b>Prisijungti mygtuką<b>.</p>",
     "instructions": "Instrukcijos",
     "invalidaccount": "Prašome patikrinti prisijungimo duomenis arba paprašyti administratoriaus patikrinti svetainės nustatymus.",
@@ -28,7 +28,7 @@
     "invalidmoodleversion": "Negaliojanti Moodle versija. Turi būt ne senesnė nei 2.4.",
     "invalidsite": "URL adresas netinkamas.",
     "invalidtime": "Netinkamas laikas",
-    "invalidurl": "Nurodytas negaliojantis URL",
+    "invalidurl": "Klaidingas URL",
     "invalidvaluemax": "Didžiausia vertė {{$a}}",
     "invalidvaluemin": "Mažiausia vertė {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobilių Papildomų Funkcijų patikra gavo netikėtą atsakymą, būsite autentifikuojamas naudojant standartines mobilias paslaugas.",
@@ -43,7 +43,7 @@
     "newaccount": "Nauja paskyra",
     "newsitedescription": "Įveskite Moodle svetainės URL adresą. Atkreipkite dėmesį, kad gali būti nesukonfigūruotas dirbti su šia programėle.",
     "notloggedin": "Turite prisijungti",
-    "password": "Slaptažodis",
+    "password": "Bendra paslaptis",
     "passwordrequired": "Reikalingas slaptažodis",
     "policyaccept": "Suprantu ir sutinku",
     "policyagree": "Norėdami toliau naudotis šia svetaine, turite sutikti su šia strategija. Ar sutinkate?",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index bc5e768a4fd..ea44187b169 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Ongeldige Moodleversie. De vereiste minimumversie is:",
     "invalidsite": "Deze site-URL is niet geldig.",
     "invalidtime": "Ongeldige tijd",
-    "invalidurl": "Ongeldige URL opgegeven",
+    "invalidurl": "Ongeldige url",
     "invalidvaluemax": "De maximum waarde is {{$a}}",
     "invalidvaluemin": "De minimum waard eis {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobile Additional Features Check gaf een onverwacht antwoord. Je zult aanmelden via de standaard Mobile service.",
     "loggedoutssodescription": "Je moet opnieuw aanmelden. Je moet aanmelden met een browservenster.",
-    "login": "Login met je account",
+    "login": "Login",
     "loginbutton": "Inloggen",
     "logininsiterequired": "Je dient via een browser in te loggen op je Moodle site",
     "loginsteps": "Om volledige toegang tot deze site te krijgen, moet je een account maken.",
@@ -44,7 +44,7 @@
     "newaccount": "Nieuwe account",
     "newsitedescription": "Geef de URL van je Moodle site. Merk op dat die misschien niet geconfigureerd is om met deze app te werken.",
     "notloggedin": "Je moet ingelogd zijn.",
-    "password": "Wachtwoord",
+    "password": "Gedeeld geheim",
     "passwordrequired": "Wachtwoord vereist",
     "policyaccept": "Ik begrijp het en ga akkoord",
     "policyagree": "Je moet akkoord gaan met deze overeenkomst voor je verder kunt gaan met het gebruiken van deze site. Ga je akkoord?",
diff --git a/www/core/components/login/lang/pl.json b/www/core/components/login/lang/pl.json
index bd6b20f4095..b4472737bff 100644
--- a/www/core/components/login/lang/pl.json
+++ b/www/core/components/login/lang/pl.json
@@ -15,7 +15,7 @@
     "invalidemail": "Niewłaściwy adres e-mail",
     "invalidmoodleversion": "Nieprawidłowa wersja Moodle. Minimalna wymagana wersja to: ",
     "invalidsite": "Adres strony jest nieprawidłowy.",
-    "invalidurl": "Określono niepoprawny URL",
+    "invalidurl": "Niepoprawny URL",
     "login": "Zaloguj się",
     "logininsiterequired": "Musisz się zalogować do strony w oknie przeglądarki.",
     "loginsteps": "Aby otrzymać pełny dostęp do kursów w tym serwisie, musisz najpierw utworzyć konto.",
@@ -24,7 +24,7 @@
     "missinglastname": "Pominięto nazwisko",
     "mobileservicesnotenabled": "Usługi mobile nie są włączone na twojej stronie.Skontaktuj się z administratorem strony Moodle jeżeli uważasz, że dostęp mobilny powinien być włączony.",
     "newaccount": "Nowe konto",
-    "password": "Hasło",
+    "password": "Wspólne tajne hasło",
     "passwordrequired": "Hasło wymagane",
     "policyaccept": "Rozumiem i zgadzam się",
     "policyagree": "Musisz zaakceptować te zasady, żeby używać strony. Czy zgadzasz się?",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index b63d1fe4266..03aec6bb0d8 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Versão do Moodle inválida. A versão mínima requerida é:",
     "invalidsite": "A URL do siteé inválida.",
     "invalidtime": "Tempo inválido",
-    "invalidurl": "URL inválida especificada",
+    "invalidurl": "Url inválida",
     "invalidvaluemax": "O valor máximo é {{$a}}",
     "invalidvaluemin": "O valor minimo é{{$a}}",
     "localmobileunexpectedresponse": "Verificação do Moodle Mobile Additional Features retornou uma resposta inesperada, você ira se autenticar usando o serviço Mobile padrão",
     "loggedoutssodescription": "Você tem que autenticar novamente. Você precisa fazer login no site em uma janela do navegador.",
-    "login": "Login em sua conta",
+    "login": "Acessar",
     "loginbutton": "Entrar",
     "logininsiterequired": "É preciso logar no site num navegador.",
     "loginsteps": "Para ter acesso completo a este site, você primeiro precisa criar uma conta.",
@@ -44,7 +44,7 @@
     "newaccount": "Cadastramento de novo usuário",
     "newsitedescription": "Por favor, digite a URL do seu site Moodle. Note que, pode ser que ele não esteja configurado para trabalhar com este app.",
     "notloggedin": "Você precisa estar logado.",
-    "password": "Senha",
+    "password": "Segredo compartilhado",
     "passwordrequired": "Senha necessária",
     "policyaccept": "Eu compreendo e concordo",
     "policyagree": "Para utilizar este site você precisa aceitar o acordo sobre a política de uso do site. Você aceita os termos deste acordo?",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index 960d9784abe..e8fd6b1e64a 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "A versão do Moodle é inválida. É necessária a versão 2.4 ou superior.",
     "invalidsite": "O URL do site é inválido.",
     "invalidtime": "Hora inválida",
-    "invalidurl": "O URL é inválido",
+    "invalidurl": "URL inválido",
     "invalidvaluemax": "O valor máximo é {{$a}}",
     "invalidvaluemin": "O valor mínimo é {{$a}}",
     "localmobileunexpectedresponse": "A verificação do Moodle Mobile Additional Features teve um erro inesperado, a ligação será feita através do serviço Mobile padrão.",
     "loggedoutssodescription": "Tem de autenticar-se novamente. A autenticação no site tem de ser numa janela do navegador.",
-    "login": "Autentique-se com seus dados de acesso",
+    "login": "Entrar",
     "loginbutton": "Iniciar sessão",
     "logininsiterequired": "Precisa de entrar no site através de uma janela de navegador.",
     "loginsteps": "Para ter acesso completo a este site, primeiro precisa de criar uma nova conta de utilizador.",
@@ -44,7 +44,7 @@
     "newaccount": "Nova conta",
     "newsitedescription": "Por favor, digite o URL do seu site Moodle. Note que o mesmo poderá não estar configurado para funcionar nesta aplicação.",
     "notloggedin": "Precisa de estar autenticado.",
-    "password": "Senha",
+    "password": "Senha partilhada",
     "passwordrequired": "Senha necessária",
     "policyaccept": "Compreendo e concordo",
     "policyagree": "Deverá aceitar este regulamento para poder proceder a utilizar este site. Aceita o regulamento?",
@@ -69,7 +69,7 @@
     "startsignup": "Criar nova conta",
     "stillcantconnect": "Continua com problemas na ligação?",
     "supplyinfo": "Insira alguma informação sobre si",
-    "username": "Utilizador",
+    "username": "Nome de utilizador",
     "usernamerequired": "É necessário o nome de utilizador",
     "usernotaddederror": "Utilizador não adicionado - erro.",
     "visitchangepassword": "Pretende visitar o site para alterar a senha?",
diff --git a/www/core/components/login/lang/ro.json b/www/core/components/login/lang/ro.json
index 605fd410170..950a4a91993 100644
--- a/www/core/components/login/lang/ro.json
+++ b/www/core/components/login/lang/ro.json
@@ -21,7 +21,7 @@
     "invalidemail": "Adresă de email incorectă",
     "invalidmoodleversion": "Versiunea Moodle este invalidă. Versiunea minimă este 2.4",
     "invalidsite": "Adresa URL este invalidă.",
-    "invalidurl": "URL specificat nevalid",
+    "invalidurl": "URL incorect",
     "localmobileunexpectedresponse": "Verificarea Moodle Mobile Additional Features a returnat un răspuns neașteptat. veți fi autentificat folosind serviciul standard.",
     "login": "Autentificare",
     "loginbutton": "Logat!",
@@ -34,7 +34,7 @@
     "newaccount": "Cont nou",
     "newsitedescription": "Introduceți adresa URL a siteului dumneavoastră, dar există posibilitatea ca acesta să nu fie configurat pentru a funcționa cu această aplicație.",
     "notloggedin": "Trebuie să fiți logat.",
-    "password": "Parolă",
+    "password": "Cheie înscriere",
     "passwordrequired": "Este necesară introducerea parolei",
     "policyaccept": "Înţeleg şi sunt de acord",
     "policyagree": "Pentru a continua să folosiţi acest site, trebuie să fiţi de acord cu termenii de utilizare specificaţi. Sunteţi de acord?",
@@ -52,7 +52,7 @@
     "siteurlrequired": "Este necesară adresa URL a siteului, de exemplu <i>http://www.yourmoodlesite.abc sau https://www.yourmoodlesite.efg</i>",
     "startsignup": "Creează cont",
     "supplyinfo": "Detalii suplimentare",
-    "username": "Nume de utilizator",
+    "username": "Utilizator",
     "usernamerequired": "Este necesar numele de utilizator",
     "usernotaddederror": "Utilizatorul nu a fost adăugat - eroare",
     "webservicesnotenabled": "Serviciul Web nu este activat pe siteul dumneavoastră. Va rugăm să contactați administratorul siteului dumneavoastră dacă considerați ca ar trebui activat accesul pentru mobil."
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index 5cfebad7e60..e9f3b446b6d 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -1,6 +1,6 @@
 {
     "authenticating": "Аутентификация",
-    "cancel": "Отменить",
+    "cancel": "Отмена",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
     "connect": "Подключить",
     "connecttomoodle": "Подключение к Moodle",
@@ -14,14 +14,14 @@
     "errorupdatesite": "При обновлении ключа сайта произошла ошибка.",
     "firsttime": "Вы в первый раз на нашем сайте?",
     "getanothercaptcha": "Получить другой CAPTCHA (тест для различения людей и компьютеров)",
-    "help": "Помощь",
+    "help": "Справка",
     "helpmelogin": "<p> Во всем мире есть тысячи сайтов Moodle. Это приложение может подключаться только к тем сайтам Moodle, на которых разрешен доступ конкретному виду мобильного приложения. </p><p> Если Вы не можете подключиться к сайту Moodle, то необходимо связаться с администратором сайта, к которому Вы хотите подключиться,  и попросить его прочитать <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a> </p><p> Чтобы проверить приложение на  демо-сайте Moodle, выберите <i>учитель</i> или <i>студент</i>,введите <i>URL-адрес сайта</i>  в соответствующее поле и нажмите <b>кнопку «Добавить».</b> </p>",
     "instructions": "Инструкции",
     "invalidaccount": "Пожалуйста, проверьте свои регистрационные данные или обратитесь к администратору сайта, чтобы он проверил настройки сайта.",
     "invalidemail": "Некорректный формат адреса электронной почты",
     "invalidmoodleversion": "Неверная версия Moodle. Минимальная требуемая версия - 2.4.",
     "invalidsite": "URL-адрес сайта недействителен.",
-    "invalidurl": "Указан неправильный URL-адрес.",
+    "invalidurl": "Некорректный URL",
     "login": "Вход",
     "loginbutton": "Вход!",
     "logininsiterequired": "Вы должны войти на сайт в окне браузера.",
@@ -33,7 +33,7 @@
     "newaccount": "Новая учетная запись",
     "newsitedescription": "Пожалуйста, введите URL-адрес своего сайта Moodle. Учтите, что он может быть не настроен для работы с этим приложением.",
     "notloggedin": "Вы должны быть идентифицированы.",
-    "password": "Пароль",
+    "password": "Общий секретный ключ",
     "passwordrequired": "Требуется пароль",
     "policyaccept": "Я понял(а) и согласен(на)",
     "policyagree": "Чтобы продолжить работу с этим сайтом, Вы должны принять Пользовательское соглашение. Вы согласны?",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index 106de07ced2..5dddf79a343 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -20,9 +20,9 @@
     "invalidemail": "Ogiltig e-postadress",
     "invalidmoodleversion": "Ogiltig Moodle version. Lägsta version som krävs är",
     "invalidsite": "Den webbadress är ogiltig.",
-    "invalidurl": "Ogiltig URL angiven",
+    "invalidurl": "Ogiltig url",
     "localmobileunexpectedresponse": "Kontrollen för Moodle mobila funktioner returnerade  ett oväntat svar. Du kommer att autentiseras med mobila standard tjänsten.",
-    "login": "Inloggning",
+    "login": "Logga in",
     "loginbutton": "Logga In!",
     "logininsiterequired": "Du måste logga in på webbplatsen via en webbläsare",
     "loginsteps": "Hej!\n<br />\nDu måste bl.a. skapa ett nytt användarkonto på denna webbplats för att få tillgång till de kurser som Du vill delta i. Varje individuell kurs kan också ha en engångsnyckel \"kursnyckel\". Den behöver Du dock inte  förrän senare.\n   Så här skapar Du Ditt konto:\n   <ol size=\"2\">\n   <li>Fyll i formuläret på sidan <a href={{$a}}>\nNytt konto</a> med de efterfrågade\nuppgifterna om Dig själv.</li>\n   <li>Ett e-postmeddelande kommer därefter\nomedelbart att sändas till\nDin e-postadress.</li>\n   <li>Läs din e-post, och klicka på webblänken som den innehåller.</li>\n   <li>Ditt konto kommer därmed att bekräftas\noch Du kommer att loggas in.</li>\n   <li>Nu kan Du välja vilken kurs Du\nvill delta i.</li>\n   <li>Om Du måste ange en \"kursnyckel\" - så\nfår Du använda den som Din lärare  har\ngivit Dig. Med den kan Du registrera\nDig på en sådan kurs som kräver det.</li>\n   <li>Nu kan Du använda hela kursen.\nFrån och med nu behöver Du bara skriva\nin Ditt användarnamn och lösenord\n(i formuläret till vänster på denna sida)\nför att logga in och för att nå de kurser\nsom Du är registrerad på.</li>\n   </ol>\nOBS! Genom att Du bekräftar kontot så samtycker\nDu till databehandling enligt Personuppgiftslagen.\nOm Du är osäker på vad det innebär så kan Du hitta\nmer information här: 'http://www.datainspektionen.se/lagar-och-regler/personuppgiftslagen/\n'\n\nLycka till!",
@@ -33,7 +33,7 @@
     "newaccount": "Nytt konto",
     "newsitedescription": "Ange webbadressen till din Moodle webbplats. Observera att den kan vara konfigurerad så att den inte fungerar med appen",
     "notloggedin": "Du måste vara inloggad.",
-    "password": "Gästlösenord",
+    "password": "Lösenord",
     "passwordrequired": "Lösenord krävs",
     "policyaccept": "Jag förstår och accepterar",
     "policyagree": "Du måste acceptera denna policy för få fortsätta att använda denna webbplats. Accepterar Du denna policy?",
diff --git a/www/core/components/login/lang/tr.json b/www/core/components/login/lang/tr.json
index 0d240fefe28..46bf85328fd 100644
--- a/www/core/components/login/lang/tr.json
+++ b/www/core/components/login/lang/tr.json
@@ -17,8 +17,8 @@
     "invalidemail": "Geçersiz e-posta adresi",
     "invalidmoodleversion": "Geçersiz Moodle sürümü. Sitenizin Sürümünün şundan aşağı olmaması gerekir:",
     "invalidsite": "Bu site adresi geçersizdir.",
-    "invalidurl": "Geçersiz URL belirtildi",
-    "login": "Giriş",
+    "invalidurl": "Geçersiz URL",
+    "login": "Giriş yap",
     "logininsiterequired": "Bir tarayıcı penceresinde siteye giriş yapmanız gerekiyor.",
     "loginsteps": "Bu siteye tam erişim için önce bir hesap oluşturmalısınız.",
     "missingemail": "E-posta adresi eksik",
@@ -26,7 +26,7 @@
     "missinglastname": "Soyadı eksik",
     "mobileservicesnotenabled": "Mobil Hizmetler sitenizde etkin değildir. Mobil erişimin etkin olduğunu düşünüyorsanız,  Lütfen Moodle site yöneticinize başvurun.",
     "newaccount": "Yeni hesap",
-    "password": "Parola",
+    "password": "Şifre",
     "passwordrequired": "Şifre zorunludur",
     "policyaccept": "Anladım ve kabul ediyorum",
     "policyagree": "Bu siteyi kullanmaya devam etmek için bu sözleşmeyi kabul etmelisiniz. Kabul ediyor musunuz?",
diff --git a/www/core/components/login/lang/uk.json b/www/core/components/login/lang/uk.json
index 2811146c30d..a087e64b69e 100644
--- a/www/core/components/login/lang/uk.json
+++ b/www/core/components/login/lang/uk.json
@@ -28,7 +28,7 @@
     "invalidmoodleversion": "Невірна версія Moodle. Мінімальна версія 2.4 потрібно.",
     "invalidsite": "URL сайту недійсний.",
     "invalidtime": "Невірний час",
-    "invalidurl": "Вказано неправильну URL адресу",
+    "invalidurl": "Неправильний URL",
     "invalidvaluemax": "Максимальне значення {{$a}}",
     "invalidvaluemin": "Мінімальне значення {{$a}}",
     "localmobileunexpectedresponse": "Moodle Mobile Additional Features при  перевірці повернуло несподівану відповідь, ви будете проходити перевірку автентичності з використанням стандартного мобільного сервісу.",
@@ -44,7 +44,7 @@
     "newaccount": "Новий обліковий запис",
     "newsitedescription": "Будь ласка, введіть адресу вашого сайту Moodle. Зверніть увагу, що це не може бути налаштоване для роботи з цим додатком.",
     "notloggedin": "Ви повинні увійти в систему.",
-    "password": "Пароль",
+    "password": "Відкритий ключ",
     "passwordrequired": "Пароль необхідний",
     "policyaccept": "Я розумію та погоджуюся",
     "policyagree": "Ви повинні погодитися з цими правилами для використання цього сайту. Ви згодні?",
@@ -69,7 +69,7 @@
     "startsignup": "Створити новий обліковий запис",
     "stillcantconnect": "До сих пір не можу підключитися?",
     "supplyinfo": "Більше інформації",
-    "username": "Псевдо",
+    "username": "Ім’я входу",
     "usernamerequired": "Ім'я користувача необхідне",
     "usernotaddederror": "Користувач не доданий - помилка",
     "visitchangepassword": "Ви хочете відвідати сайт, щоб змінити пароль?",
diff --git a/www/core/components/login/lang/zh-cn.json b/www/core/components/login/lang/zh-cn.json
index 6fc2ac70c17..64f858f8e48 100644
--- a/www/core/components/login/lang/zh-cn.json
+++ b/www/core/components/login/lang/zh-cn.json
@@ -15,8 +15,8 @@
     "invalidemail": "Email地址无效",
     "invalidmoodleversion": "无效的Moodle版本。最低版本要求是：",
     "invalidsite": "网站URL是无效的。",
-    "invalidurl": "无效的 URL",
-    "login": "登录您的账号",
+    "invalidurl": "无效的 网页地址",
+    "login": "登录",
     "logininsiterequired": "您需要在浏览器窗口中登录该站点。",
     "loginsteps": "为了能完全访问此网站，您首先需要创建一个帐户。",
     "missingemail": "Email地址没填",
@@ -24,7 +24,7 @@
     "missinglastname": "姓没填",
     "mobileservicesnotenabled": "您的站点没有启用移动服务，如果您觉得有必要开启移动接入功能，请与站点管理员联系。",
     "newaccount": "新帐号",
-    "password": "密码",
+    "password": "设置密码",
     "passwordrequired": "需要密码",
     "policyaccept": "我了解和同意了",
     "policyagree": "如要继续使用此站，您必须同意此协议。您同意么?",
diff --git a/www/core/components/login/lang/zh-tw.json b/www/core/components/login/lang/zh-tw.json
index ea04066c5c8..ec3a074bb16 100644
--- a/www/core/components/login/lang/zh-tw.json
+++ b/www/core/components/login/lang/zh-tw.json
@@ -19,7 +19,7 @@
     "errorupdatesite": "更新網站權杖時出錯.",
     "firsttime": "您第一次來訪嗎？",
     "getanothercaptcha": "換一個字詞",
-    "help": "幫助",
+    "help": "輔助說明",
     "helpmelogin": "<p>要登入前請確認:</p>1. Moodle 入口網站版本要是2.4或更高<br />2. Moodle 入口網站管理員有啟用手機存取.<br /><br /><p>想測試Moodle示範入口網站型態須輸入<i>teacher</i> 或<i>student</i> 於<i>Username</i> 欄位並點選<b>Add button</b>.</p><p><a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">Moodle文件網站有更詳細的資料及協助</a></p>",
     "instructions": "使用說明",
     "invalidaccount": "請檢查您的登人資料或請您的網站管理員檢查網站設定。",
@@ -28,11 +28,11 @@
     "invalidmoodleversion": "無效的Moodle版本。至少需要的版本為2.4",
     "invalidsite": "這網站網址無效.",
     "invalidtime": "無效的時間",
-    "invalidurl": "無效的網址",
+    "invalidurl": "無效的URL網址",
     "invalidvaluemax": "最大值為 {{$a}}",
     "invalidvaluemin": "最小值為 {{$a}}",
     "localmobileunexpectedresponse": "Moodle行動其他功能檢查返回了無預期的回應, 您將使用標準行動服務進行身份驗證.",
-    "login": "登入您的帳號",
+    "login": "登入",
     "loginbutton": "登入",
     "logininsiterequired": "您的Moodle網站強制您以系統瀏覽器開啟. 將開啟新瀏覽器, 並重新導向這Moodle網站.",
     "loginsteps": "您好！如果您尚未申請帳號，為了能完整使用本網站課程，您需要先花一兩分鐘時間申請一個新帳號。此外，部分課程在初次選課時，還需要輸入開課教師所設定的選課密碼。\n<p>申請帳號請依下列步驟進行：</p>\n<ol>\n<li>請於 <a href=\"{{$a}}\">申請新帳號</a> 表單中輸入個人相關資料。</li>\n<li>一封電子郵件會立刻寄送到您的信箱中。</li>\n<li>讀取您的電子郵件，點按信件中的網址連結。</li>\n<li>您的帳號將得到確認，並且立刻登入本網站。</li>\n<li>然後，請選擇您想要參加的課程。</li>\n<li>如果系統提示要選課密鑰，請輸入教師提供給您的選課密碼，這樣才能註冊到該課程中。</li>\n<li>從此，您只要輸入個人的帳號與密碼〈在左邊的表單中〉，就可以進入任何一個您已選修的課程中。</li>\n</ol>",
@@ -43,7 +43,7 @@
     "newaccount": "新帳號",
     "newsitedescription": "請輸入您的Moodle平台網址. 注意平台需要先設定好才能使用這個應用程式.",
     "notloggedin": "你必須先登入",
-    "password": "密碼",
+    "password": "共用密碼",
     "passwordrequired": "需要密碼",
     "policyaccept": "我了解並且同意",
     "policyagree": "您必須同意這協議才能繼續使用這個網站。您同意嗎?",
@@ -67,7 +67,7 @@
     "startsignup": "申請一個新帳號",
     "stillcantconnect": "一直無法連線嗎?",
     "supplyinfo": "更多細節",
-    "username": "用戶名稱",
+    "username": "帳號",
     "usernamerequired": "需要帳號",
     "usernotaddederror": "無法新增用戶- 未知的錯誤",
     "visitchangepassword": "您需要去拜訪這個網站變更密碼嗎?",
diff --git a/www/core/components/question/lang/ar.json b/www/core/components/question/lang/ar.json
index e913cf9b03d..b9b6af53575 100644
--- a/www/core/components/question/lang/ar.json
+++ b/www/core/components/question/lang/ar.json
@@ -1,14 +1,14 @@
 {
-    "answer": "إجابة",
+    "answer": "أجب",
     "answersaved": "تم حفظ الإجابة",
-    "complete": "تم/كامل",
-    "correct": "صحيح/صح",
-    "feedback": "(تغذية راجعة (ملاحظات",
-    "incorrect": "خطأ",
+    "complete": "كامل",
+    "correct": "صح",
+    "feedback": "تقرير",
+    "incorrect": "خطاء",
     "information": "معلومات",
     "invalidanswer": "إجابة غير مكتملة",
-    "notanswered": "لم يتم الاجابة عليه",
-    "notyetanswered": "لم يتم الاجابة عليه بعد",
+    "notanswered": "لم تتم الأجابة بعد",
+    "notyetanswered": "لم يتم الاجابة بعد",
     "partiallycorrect": "إجابة جزئية",
     "questionno": "سؤال {{$a}}",
     "requiresgrading": "يتطلب التصحيح",
diff --git a/www/core/components/question/lang/bg.json b/www/core/components/question/lang/bg.json
index b1cd26b52b0..f375fb3b363 100644
--- a/www/core/components/question/lang/bg.json
+++ b/www/core/components/question/lang/bg.json
@@ -1,15 +1,15 @@
 {
     "answer": "Отговор",
     "answersaved": "Отговорът съхранен",
-    "complete": "Отговорен",
-    "correct": "Правилно",
-    "feedback": "Забележка",
+    "complete": "Завършен",
+    "correct": "Вярно",
+    "feedback": "Обратна връзка",
     "incorrect": "Неправилно",
     "information": "Информация",
     "invalidanswer": "Непълен отговор",
-    "notanswered": "Не е отговорен",
-    "notyetanswered": "Все още не е даден отговор",
-    "partiallycorrect": "Отчасти верен",
+    "notanswered": "Още няма отговори",
+    "notyetanswered": "Още без отговор",
+    "partiallycorrect": "Частично верен",
     "questionno": "Въпрос {{$a}}",
     "requiresgrading": "Изисква оценяване",
     "unknown": "Неизвестно"
diff --git a/www/core/components/question/lang/ca.json b/www/core/components/question/lang/ca.json
index aece96d8870..e1a03ea46a2 100644
--- a/www/core/components/question/lang/ca.json
+++ b/www/core/components/question/lang/ca.json
@@ -1,18 +1,18 @@
 {
     "answer": "Resposta",
     "answersaved": "Resposta desada",
-    "complete": "Completa",
-    "correct": "Correcte",
+    "complete": "Complet",
+    "correct": "Correcta",
     "errorattachmentsnotsupported": "L'aplicació encara no admet l'adjunció de fitxers.",
     "errorinlinefilesnotsupported": "L'aplicació encara no és compatible amb l'edició de fitxers en línia.",
     "errorquestionnotsupported": "L'aplicació no accepta aquest tipus de pregunta: {{$a}}.",
     "feedback": "Retroacció",
     "howtodraganddrop": "Feu un toc per seleccionar i feu un toc de nou per deixar anar.",
-    "incorrect": "Incorrecte",
+    "incorrect": "Incorrecta",
     "information": "Informació",
     "invalidanswer": "Resposta no vàlida o incompleta",
-    "notanswered": "No s'ha respost",
-    "notyetanswered": "No s'ha respost encara",
+    "notanswered": "No contestada encara",
+    "notyetanswered": "Encara no s'ha contestat",
     "partiallycorrect": "Parcialment correcte",
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
diff --git a/www/core/components/question/lang/cs.json b/www/core/components/question/lang/cs.json
index ed2f90af4f1..9ea18cca89c 100644
--- a/www/core/components/question/lang/cs.json
+++ b/www/core/components/question/lang/cs.json
@@ -1,19 +1,19 @@
 {
     "answer": "Odpověď",
     "answersaved": "Odpověď uložena",
-    "complete": "Hotovo",
-    "correct": "Správně",
+    "complete": "Splněno",
+    "correct": "Správná odpověď",
     "errorattachmentsnotsupported": "Aplikace ještě nepodporuje připojování souborů k odpovědím.",
     "errorinlinefilesnotsupported": "Aplikace ještě nepodporuje úpravy vložených souborů.",
     "errorquestionnotsupported": "Tento typ úlohy není aplikací podporován: {{$a}}.",
-    "feedback": "Reakce",
+    "feedback": "Komentář",
     "howtodraganddrop": "Klepnutím vyberte potom klepněte na místo umístění.",
-    "incorrect": "Nesprávně",
+    "incorrect": "Nesprávná odpověď",
     "information": "Informace",
     "invalidanswer": "Neúplná odpověď",
-    "notanswered": "Nezodpovězeno",
+    "notanswered": "Dosud nezodpovězeno",
     "notyetanswered": "Dosud nezodpovězeno",
-    "partiallycorrect": "Částečně správně",
+    "partiallycorrect": "Částečně správná odpověď",
     "questionmessage": "Úloha {{$a}}: {{$b}}",
     "questionno": "Úloha {{$a}}",
     "requiresgrading": "Vyžaduje hodnocení",
diff --git a/www/core/components/question/lang/da.json b/www/core/components/question/lang/da.json
index d2bbaa071f2..843f20d8b39 100644
--- a/www/core/components/question/lang/da.json
+++ b/www/core/components/question/lang/da.json
@@ -1,15 +1,15 @@
 {
     "answer": "Svar",
     "answersaved": "Besvaret",
-    "complete": "Gennemført",
+    "complete": "Færdiggør",
     "correct": "Rigtigt",
-    "feedback": "Feedback",
+    "feedback": "Tilbagemelding",
     "incorrect": "Forkert",
     "information": "Information",
     "invalidanswer": "Ufuldstændigt svar",
-    "notanswered": "Ikke besvaret",
-    "notyetanswered": "Ikke besvaret",
-    "partiallycorrect": "Delvis rigtigt",
+    "notanswered": "Ikke besvaret endnu",
+    "notyetanswered": "Endnu ikke besvaret",
+    "partiallycorrect": "Delvist rigtigt",
     "questionno": "Spørgsmål {{$a}}",
     "requiresgrading": "Kræver bedømmelse",
     "unknown": "Ukendt"
diff --git a/www/core/components/question/lang/de.json b/www/core/components/question/lang/de.json
index a248f6250e5..d9fdecb1c77 100644
--- a/www/core/components/question/lang/de.json
+++ b/www/core/components/question/lang/de.json
@@ -1,18 +1,18 @@
 {
     "answer": "Antwort",
     "answersaved": "Antwort gespeichert",
-    "complete": "Vollständig",
+    "complete": "Fertig",
     "correct": "Richtig",
     "errorattachmentsnotsupported": "Die App erlaubt keine Antworten mit Dateianhängen.",
     "errorinlinefilesnotsupported": "Die App unterstützt keine Bearbeitung von integrierten Dateien.",
     "errorquestionnotsupported": "Die App unterstützt diesen Fragetyp nicht: {{$a}}.",
-    "feedback": "Feedback",
+    "feedback": "Rückmeldung",
     "howtodraganddrop": "Tippen Sie zum Auswählen und tippen Sie noch einmal zum Ablegen.",
     "incorrect": "Falsch",
     "information": "Information",
     "invalidanswer": "Unvollständige Antwort",
-    "notanswered": "Nicht beantwortet",
-    "notyetanswered": "Bisher nicht beantwortet",
+    "notanswered": "Nicht abgestimmt",
+    "notyetanswered": "unbeantwortet",
     "partiallycorrect": "Teilweise richtig",
     "questionmessage": "Frage {{$a}}: {{$b}}",
     "questionno": "Frage {{$a}}",
diff --git a/www/core/components/question/lang/el.json b/www/core/components/question/lang/el.json
index d9a8cb6e7d1..04bb3effa9e 100644
--- a/www/core/components/question/lang/el.json
+++ b/www/core/components/question/lang/el.json
@@ -3,10 +3,10 @@
     "answersaved": "Η απάντηση αποθηκεύτηκε",
     "complete": "Ολοκλήρωση",
     "correct": "Σωστό",
-    "feedback": "Ανατροφοδότηση",
+    "feedback": "Ανάδραση",
     "incorrect": "Λάθος",
     "invalidanswer": "Ημιτελής απάντηση",
-    "notanswered": "Δεν απαντήθηκε",
+    "notanswered": "Δεν απαντήθηκε ακόμα",
     "notyetanswered": "Δεν έχει απαντηθεί ακόμα",
     "partiallycorrect": "Μερικώς σωστή",
     "questionno": "Ερώτηση {{$a}}",
diff --git a/www/core/components/question/lang/es-mx.json b/www/core/components/question/lang/es-mx.json
index f304a7602ec..b22d4a1edc0 100644
--- a/www/core/components/question/lang/es-mx.json
+++ b/www/core/components/question/lang/es-mx.json
@@ -1,19 +1,19 @@
 {
     "answer": "Respuesta",
     "answersaved": "Respuesta guardada",
-    "complete": "Completada",
-    "correct": "Correcta",
+    "complete": "Completado",
+    "correct": "Correcto",
     "errorattachmentsnotsupported": "La aplicación todavía no soporta anexarle archivos a las respuestas.",
     "errorinlinefilesnotsupported": "La aplicación aun no soporta el editar archivos en-línea.",
     "errorquestionnotsupported": "Este tipo de pregunta no está soportada por la App: {{$a}}.",
-    "feedback": "Retroalimentación",
+    "feedback": "Comentario de retroalimentación",
     "howtodraganddrop": "Tocar para seleccionar y tocar para soltar",
     "incorrect": "Incorrecta",
     "information": "Información",
     "invalidanswer": "Respuesta incompleta",
-    "notanswered": "Sin contestar",
-    "notyetanswered": "Sin responder aún",
-    "partiallycorrect": "Parcialmente correcta",
+    "notanswered": "Sin contestar aún",
+    "notyetanswered": "Aún no se ha dado respuesta",
+    "partiallycorrect": "Parcialmente correcto",
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere re-calificar",
diff --git a/www/core/components/question/lang/es.json b/www/core/components/question/lang/es.json
index eca0b6c7e61..0449551dad0 100644
--- a/www/core/components/question/lang/es.json
+++ b/www/core/components/question/lang/es.json
@@ -1,19 +1,19 @@
 {
     "answer": "Respuesta",
     "answersaved": "Respuesta guardada",
-    "complete": "Finalizado",
-    "correct": "Correcta",
+    "complete": "Completado",
+    "correct": "Correcto",
     "errorattachmentsnotsupported": "La aplicación no soporta adjuntar archivos a respuestas todavía.",
     "errorinlinefilesnotsupported": "La aplicación aun no soporta el editar archivos en-línea.",
     "errorquestionnotsupported": "Este tipo de pregunta no está soportada por la aplicación: {{$a}}.",
-    "feedback": "Retroalimentación",
+    "feedback": "Comentario",
     "howtodraganddrop": "Tocar para seleccionar y tocar para soltar.",
     "incorrect": "Incorrecta",
     "information": "Información",
     "invalidanswer": "Respuesta incompleta",
-    "notanswered": "Sin contestar",
-    "notyetanswered": "Sin responder aún",
-    "partiallycorrect": "Parcialmente correcta",
+    "notanswered": "Sin contestar aún",
+    "notyetanswered": "Aún no se ha dado respuesta",
+    "partiallycorrect": "Parcialmente correcto",
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere calificación",
diff --git a/www/core/components/question/lang/eu.json b/www/core/components/question/lang/eu.json
index 01be6f02930..c34ee004508 100644
--- a/www/core/components/question/lang/eu.json
+++ b/www/core/components/question/lang/eu.json
@@ -1,17 +1,17 @@
 {
-    "answer": "Erantzuna",
+    "answer": "Erantzun",
     "answersaved": "Erantzuna gorde da",
-    "complete": "Osatu",
+    "complete": "Osoa",
     "correct": "Zuzena",
     "errorattachmentsnotsupported": "App-ak oraindik ez du erantzunei fitxategiak eranstea onartzen.",
     "errorinlinefilesnotsupported": "App-ak oraindik ez du fitxategien lerro-arteko edizioa onartzen.",
     "errorquestionnotsupported": "Galdera mota hau ez dago app-an onartuta: {{$a}}",
     "feedback": "Feedbacka",
     "howtodraganddrop": "Sakatu aukeratzeko eta ondoren sakatu ezabatzeko.",
-    "incorrect": "Okerra",
+    "incorrect": "Ez zuzena",
     "information": "Informazioa",
     "invalidanswer": "Erantzuna ez dago osorik",
-    "notanswered": "Erantzun gabea",
+    "notanswered": "Oraindik erantzun gabe",
     "notyetanswered": "Erantzun gabea",
     "partiallycorrect": "Zuzena zati batean",
     "questionmessage": "{{$a}} galdera: {{$b}}",
diff --git a/www/core/components/question/lang/fa.json b/www/core/components/question/lang/fa.json
index 64e56570cf2..bf1d5eba5a2 100644
--- a/www/core/components/question/lang/fa.json
+++ b/www/core/components/question/lang/fa.json
@@ -1,15 +1,15 @@
 {
-    "answer": "پاسخ",
+    "answer": "جواب",
     "answersaved": "پاسخ ذخیره شده",
     "complete": "کامل",
-    "correct": "درست",
+    "correct": "صحیح",
     "feedback": "بازخورد",
     "incorrect": "نادرست",
     "information": "توضیح",
     "invalidanswer": "پاسخ ناقص",
-    "notanswered": "پاسخ داده نشده",
+    "notanswered": "هنوز پاسخ نداده‌اند",
     "notyetanswered": "هنوز پاسخ داده نشده است",
-    "partiallycorrect": "پاسخ نیمه درست",
+    "partiallycorrect": "نیمه درست",
     "questionno": "سؤال {{$a}}",
     "requiresgrading": "نمره‌دهی لازم است",
     "unknown": "نامعلوم"
diff --git a/www/core/components/question/lang/fr.json b/www/core/components/question/lang/fr.json
index 82dddeba70a..5ae8c00f527 100644
--- a/www/core/components/question/lang/fr.json
+++ b/www/core/components/question/lang/fr.json
@@ -1,7 +1,7 @@
 {
     "answer": "Réponse",
     "answersaved": "Réponse enregistrée",
-    "complete": "Terminer",
+    "complete": "Complet",
     "correct": "Correct",
     "errorattachmentsnotsupported": "L'application ne permet pas encore d'annexer des fichiers aux réponses.",
     "errorinlinefilesnotsupported": "L'app ne permet pas encore la modification de fichiers en ligne.",
@@ -11,7 +11,7 @@
     "incorrect": "Incorrect",
     "information": "Description",
     "invalidanswer": "Réponse incomplète",
-    "notanswered": "Non répondue",
+    "notanswered": "Pas encore répondu",
     "notyetanswered": "Pas encore répondu",
     "partiallycorrect": "Partiellement correct",
     "questionmessage": "Question {{$a}} : {{$b}}",
diff --git a/www/core/components/question/lang/he.json b/www/core/components/question/lang/he.json
index c9f601ea592..1761f82c521 100644
--- a/www/core/components/question/lang/he.json
+++ b/www/core/components/question/lang/he.json
@@ -2,14 +2,14 @@
     "answer": "תשובה",
     "answersaved": "תשובה נשמרה",
     "complete": "הושלם",
-    "correct": "תקין",
-    "feedback": "משוב לבחירה בתשובה זו",
-    "incorrect": "שגוי",
+    "correct": "נכון",
+    "feedback": "תגובות",
+    "incorrect": "לא נכון",
     "information": "מידע",
     "invalidanswer": "תשובה שלא הושלמה",
-    "notanswered": "לא נענה",
-    "notyetanswered": "שאלה זו טרם נענתה",
-    "partiallycorrect": "נכון באופן חלקי",
+    "notanswered": "שאלה זו טרם נענתה",
+    "notyetanswered": "עדין לא ענו",
+    "partiallycorrect": "תשובה נכונה חלקית",
     "questionno": "שאלה {{$a}}",
     "requiresgrading": "נדרש מתן ציון",
     "unknown": "לא ידוע"
diff --git a/www/core/components/question/lang/hu.json b/www/core/components/question/lang/hu.json
index 04328cffde1..649b1988ef4 100644
--- a/www/core/components/question/lang/hu.json
+++ b/www/core/components/question/lang/hu.json
@@ -1,14 +1,14 @@
 {
     "answer": "Válasz",
     "answersaved": "A válasz elmentve",
-    "complete": "Kész",
+    "complete": "Teljes",
     "correct": "Helyes",
     "feedback": "Visszajelzés",
     "incorrect": "Hibás",
     "information": "Információ",
     "invalidanswer": "Hiányos válasz",
-    "notanswered": "Nincs rá válasz",
-    "notyetanswered": "Még nincs rá válasz",
+    "notanswered": "Még nincs válasz",
+    "notyetanswered": "Megválaszolatlan",
     "partiallycorrect": "Részben helyes",
     "questionno": "{{$a}}. kérdés",
     "requiresgrading": "Pontozandó",
diff --git a/www/core/components/question/lang/it.json b/www/core/components/question/lang/it.json
index 23bcbb55847..528a77907a4 100644
--- a/www/core/components/question/lang/it.json
+++ b/www/core/components/question/lang/it.json
@@ -2,14 +2,14 @@
     "answer": "Risposta",
     "answersaved": "Risposta salvata",
     "complete": "Completo",
-    "correct": "Risposta corretta",
-    "feedback": "Feedback",
-    "incorrect": "Risposta errata",
+    "correct": "Giusto",
+    "feedback": "Commento",
+    "incorrect": "Sbagliato",
     "information": "Informazione",
     "invalidanswer": "Risposta incompleta",
-    "notanswered": "Risposta non data",
-    "notyetanswered": "Risposta non ancora data",
-    "partiallycorrect": "Parzialmente corretta",
+    "notanswered": "Senza scelta",
+    "notyetanswered": "Senza risposta",
+    "partiallycorrect": "Parzialmente corretto",
     "questionmessage": "Domanda {{$a}}: {{$b}}",
     "questionno": "Domanda {{$a}}",
     "requiresgrading": "Richiede valutazione",
diff --git a/www/core/components/question/lang/ja.json b/www/core/components/question/lang/ja.json
index 83e300c2604..ecce8b3b1e0 100644
--- a/www/core/components/question/lang/ja.json
+++ b/www/core/components/question/lang/ja.json
@@ -1,15 +1,15 @@
 {
-    "answer": "答え",
+    "answer": "回答",
     "answersaved": "解答保存",
-    "complete": "完了",
+    "complete": "詳細",
     "correct": "正解",
     "feedback": "フィードバック",
     "howtodraganddrop": "選んだものをタッチして、あてはまる所にタッチして入れましょう。",
     "incorrect": "不正解",
     "information": "情報",
     "invalidanswer": "不完全な答え",
-    "notanswered": "未解答",
-    "notyetanswered": "未解答",
+    "notanswered": "未投票",
+    "notyetanswered": "未回答",
     "partiallycorrect": "部分的に正解",
     "questionmessage": "問題 {{$a}}: {{$b}}",
     "questionno": "問題 {{$a}}",
diff --git a/www/core/components/question/lang/lt.json b/www/core/components/question/lang/lt.json
index fc31749789f..0bb22bfebaf 100644
--- a/www/core/components/question/lang/lt.json
+++ b/www/core/components/question/lang/lt.json
@@ -1,18 +1,18 @@
 {
-    "answer": "Atsakymas",
+    "answer": "Atsakyti",
     "answersaved": "Atsakymas išsaugotas",
-    "complete": "Baigta",
-    "correct": "Teisinga",
+    "complete": "Užbaigti",
+    "correct": "Teisingas",
     "errorattachmentsnotsupported": "Programėlė nepalaiko pridėtų failų.",
     "errorinlinefilesnotsupported": "Programėlė nepalaiko redaguojamų failų",
     "errorquestionnotsupported": "Šis klausimo tipas programėlėje nepalaikomas: {{$a}}.",
-    "feedback": "Grįžtamasis ryšys",
+    "feedback": "Atsiliepimas",
     "howtodraganddrop": "Paspauskite pasirinkimui, tada perneškite.",
-    "incorrect": "Neteisinga",
+    "incorrect": "Klaidinga",
     "information": "Informacija",
     "invalidanswer": "Nepilnas atsakymas",
-    "notanswered": "Neatsakyta",
-    "notyetanswered": "Neatsakyta",
+    "notanswered": "Dar neatsakyta",
+    "notyetanswered": "Dar neatsakyta",
     "partiallycorrect": "Iš dalies teisingas",
     "questionmessage": "Klausimas {{$a}}: {{$b}}",
     "questionno": "Klausimas {{$a}}",
diff --git a/www/core/components/question/lang/nl.json b/www/core/components/question/lang/nl.json
index 48faa456e67..098aa4c11ae 100644
--- a/www/core/components/question/lang/nl.json
+++ b/www/core/components/question/lang/nl.json
@@ -1,17 +1,17 @@
 {
     "answer": "Antwoord",
     "answersaved": "Antwoord bewaard",
-    "complete": "Volledig",
+    "complete": "Voltooid",
     "correct": "Juist",
     "errorattachmentsnotsupported": "De applicatie ondersteunt nog geen blijlagen bij antwoorden.",
     "errorinlinefilesnotsupported": "Deze applicatie ondersteunt het inline bewerken van bestanden nog niet.",
     "errorquestionnotsupported": "Dit vraagtype wordt nog niet ondersteund door de app: {{$a}}.",
     "feedback": "Feedback",
     "howtodraganddrop": "Tik om te selecteren en tik om neer te zetten.",
-    "incorrect": "Fout",
+    "incorrect": "Niet juist",
     "information": "Informatie",
     "invalidanswer": "Onvolledig antwoord",
-    "notanswered": "Niet beantwoord",
+    "notanswered": "Nog niet beantwoord",
     "notyetanswered": "Nog niet beantwoord",
     "partiallycorrect": "Gedeeltelijk juist",
     "questionmessage": "Vraag  {{$a}}: {{$b}}",
diff --git a/www/core/components/question/lang/pl.json b/www/core/components/question/lang/pl.json
index 1371ba6c9df..6e060784dd2 100644
--- a/www/core/components/question/lang/pl.json
+++ b/www/core/components/question/lang/pl.json
@@ -1,14 +1,14 @@
 {
-    "answer": "Odpowiedź",
+    "answer": "Odpowiedz",
     "answersaved": "Odpowiedź zapisana",
-    "complete": "Zakończone",
+    "complete": "Pełna wersja",
     "correct": "Poprawnie",
     "feedback": "Informacja zwrotna",
-    "incorrect": "Niepoprawny(a)",
+    "incorrect": "Niepoprawnie",
     "information": "Informacja",
     "invalidanswer": "Niekompletna odpowiedź",
-    "notanswered": "Nie udzielono odpowiedzi",
-    "notyetanswered": "Nie udzielono odpowiedzi",
+    "notanswered": "Jeszcze nie udzielono odpowiedzi",
+    "notyetanswered": "Brak odpowiedzi",
     "partiallycorrect": "Częściowo poprawnie",
     "questionno": "Pytanie {{$a}}",
     "requiresgrading": "Wymaga oceny",
diff --git a/www/core/components/question/lang/pt-br.json b/www/core/components/question/lang/pt-br.json
index f5b6766c1a6..281e4738904 100644
--- a/www/core/components/question/lang/pt-br.json
+++ b/www/core/components/question/lang/pt-br.json
@@ -1,19 +1,19 @@
 {
     "answer": "Resposta",
     "answersaved": "Resposta salva",
-    "complete": "Completo",
+    "complete": "Concluído",
     "correct": "Correto",
     "errorattachmentsnotsupported": "O aplicativo ainda não suporta anexar arquivos à resposta.",
     "errorinlinefilesnotsupported": "O aplicativo ainda não suporta a edição direta de arquivos.",
     "errorquestionnotsupported": "Esse tipo de questão não é suportada pelo aplicativo: {{$a}}.",
-    "feedback": "Feedback",
+    "feedback": "Comentários",
     "howtodraganddrop": "Toque para selecionar e então toque para soltar.",
-    "incorrect": "Incorreto",
+    "incorrect": "Errado",
     "information": "Informação",
     "invalidanswer": "Resposta incompleta",
-    "notanswered": "Não respondido",
-    "notyetanswered": "Ainda não respondida",
-    "partiallycorrect": "Parcialmente correto",
+    "notanswered": "Nenhuma resposta",
+    "notyetanswered": "Ainda não respondeu",
+    "partiallycorrect": "Parcialmente correta",
     "questionmessage": "Questão {{$a}}: {{$b}}",
     "questionno": "Questão {{$a}}",
     "requiresgrading": "Requer avaliação",
diff --git a/www/core/components/question/lang/pt.json b/www/core/components/question/lang/pt.json
index f0f684b92dd..3b03d04306b 100644
--- a/www/core/components/question/lang/pt.json
+++ b/www/core/components/question/lang/pt.json
@@ -1,17 +1,17 @@
 {
     "answer": "Resposta",
     "answersaved": "Resposta guardada",
-    "complete": "Respondida",
+    "complete": "Completo",
     "correct": "Correto",
     "errorattachmentsnotsupported": "A aplicação ainda não suporta anexar ficheiros a respostas.",
     "errorinlinefilesnotsupported": "A aplicação ainda não suporta a edição de ficheiros online.",
     "errorquestionnotsupported": "Este tipo de pergunta não é suportado pela aplicação: {{$a}}.",
-    "feedback": "Feedback",
+    "feedback": "Comentários",
     "howtodraganddrop": "Toque para selecionar e depois toque para largar.",
     "incorrect": "Incorreto",
     "information": "Informação",
     "invalidanswer": "Resposta incompleta",
-    "notanswered": "Não respondida",
+    "notanswered": "Ainda não respondeu",
     "notyetanswered": "Por responder",
     "partiallycorrect": "Parcialmente correto",
     "questionmessage": "Pergunta {{$a}}: {{$b}}",
diff --git a/www/core/components/question/lang/ro.json b/www/core/components/question/lang/ro.json
index f840f76f587..a1bb7b725d9 100644
--- a/www/core/components/question/lang/ro.json
+++ b/www/core/components/question/lang/ro.json
@@ -1,15 +1,15 @@
 {
-    "answer": "Răspuns",
+    "answer": "Răspunde",
     "answersaved": "Răspuns salvat",
-    "complete": "Complet",
+    "complete": "Finalizează",
     "correct": "Corect",
     "feedback": "Feedback",
     "incorrect": "Incorect",
     "information": "Informații",
     "invalidanswer": "Răspuns incomplet",
-    "notanswered": "Nu a primit răspuns",
-    "notyetanswered": "Nu a primit răspuns încă",
-    "partiallycorrect": "Parțial corect",
+    "notanswered": "Nu a fost rezolvat încă",
+    "notyetanswered": "Incă nu s-a răspuns",
+    "partiallycorrect": "Parţial corect",
     "questionno": "Întrebare {{$a}}",
     "requiresgrading": "Trebuie să fie notată",
     "unknown": "Necunoscut"
diff --git a/www/core/components/question/lang/ru.json b/www/core/components/question/lang/ru.json
index fc2cd8ee320..68d3259d734 100644
--- a/www/core/components/question/lang/ru.json
+++ b/www/core/components/question/lang/ru.json
@@ -1,15 +1,15 @@
 {
     "answer": "Ответ",
     "answersaved": "Ответ сохранен",
-    "complete": "Выполнен",
+    "complete": "Завершено",
     "correct": "Верно",
     "feedback": "Отзыв",
     "incorrect": "Неверно",
     "information": "Информация",
     "invalidanswer": "Неполный ответ",
-    "notanswered": "Нет ответа",
+    "notanswered": "Еще не ответили",
     "notyetanswered": "Пока нет ответа",
-    "partiallycorrect": "Частично правильный",
+    "partiallycorrect": "Частично верно",
     "questionno": "Вопрос {{$a}}",
     "requiresgrading": "Требуется оценивание",
     "unknown": "неизвестно"
diff --git a/www/core/components/question/lang/sv.json b/www/core/components/question/lang/sv.json
index 9ef56c4f049..c5026909e1f 100644
--- a/www/core/components/question/lang/sv.json
+++ b/www/core/components/question/lang/sv.json
@@ -4,11 +4,11 @@
     "complete": "Komplett",
     "correct": "Rätt",
     "feedback": "Återkoppling",
-    "incorrect": "Felaktig",
+    "incorrect": "Felaktigt",
     "information": "Information",
     "invalidanswer": "Ofullständigt svar",
-    "notanswered": "Ej besvarad",
-    "notyetanswered": "Inte besvarad än",
+    "notanswered": "Inte ännu besvarad",
+    "notyetanswered": "Ännu inte besvarad",
     "partiallycorrect": "Delvis korrekt",
     "questionno": "Fråga {{$a}}",
     "requiresgrading": "Kräver rättning",
diff --git a/www/core/components/question/lang/tr.json b/www/core/components/question/lang/tr.json
index 08d1222bac0..6de0e3edb23 100644
--- a/www/core/components/question/lang/tr.json
+++ b/www/core/components/question/lang/tr.json
@@ -1,14 +1,14 @@
 {
-    "answer": "Cevap",
+    "answer": "Yanıt",
     "answersaved": "Cevap kaydedildi",
-    "complete": "Tamamlandı",
+    "complete": "Tamamlanmış",
     "correct": "Doğru",
-    "feedback": "Geribildirim",
+    "feedback": "Geri bildirim",
     "incorrect": "Yanlış",
     "information": "Bilgi",
     "invalidanswer": "Tamamlanmamış cevap",
-    "notanswered": "Cevaplanmadı",
-    "notyetanswered": "Henüz cevaplanmadı",
+    "notanswered": "Henüz yanıtlanmadı",
+    "notyetanswered": "Henüz yanıtlanmamış",
     "partiallycorrect": "Kısmen doğru",
     "questionno": "Soru {{$a}}",
     "requiresgrading": "Notlandırma gerekir",
diff --git a/www/core/components/question/lang/uk.json b/www/core/components/question/lang/uk.json
index 1acd3ac851e..b15e6e8672b 100644
--- a/www/core/components/question/lang/uk.json
+++ b/www/core/components/question/lang/uk.json
@@ -6,12 +6,12 @@
     "errorattachmentsnotsupported": "Додаток не підтримує прикріплення файлів відповідей",
     "errorinlinefilesnotsupported": "Додаток ще не підтримує редагування вбудованих файлів.",
     "errorquestionnotsupported": "Цей тип питання не підтримує додатком: {{$a}}.",
-    "feedback": "Коментар",
+    "feedback": "Відгук",
     "howtodraganddrop": "Натисніть, щоб вибрати і перемістить.",
     "incorrect": "Неправильно",
     "information": "Інформація",
     "invalidanswer": "Неповна відповідь",
-    "notanswered": "Відповіді не було",
+    "notanswered": "Відповіді ще не було",
     "notyetanswered": "Відповіді ще не було",
     "partiallycorrect": "Частково правильно",
     "questionmessage": "Питання {{$a}}: {{$b}}",
diff --git a/www/core/components/question/lang/zh-cn.json b/www/core/components/question/lang/zh-cn.json
index 5f50a21a566..b0c02c82632 100644
--- a/www/core/components/question/lang/zh-cn.json
+++ b/www/core/components/question/lang/zh-cn.json
@@ -1,14 +1,14 @@
 {
-    "answer": "答案",
+    "answer": "回答",
     "answersaved": "答案已保存",
-    "complete": "完成",
+    "complete": "完全",
     "correct": "正确",
     "feedback": "反馈",
-    "incorrect": "不正确",
+    "incorrect": "错误",
     "information": "说明",
     "invalidanswer": "答案不完成",
-    "notanswered": "未回答",
-    "notyetanswered": "还未回答",
+    "notanswered": "未答",
+    "notyetanswered": "仍未作答",
     "partiallycorrect": "部分正确",
     "questionno": "题目{{$a}}",
     "requiresgrading": "需要评分",
diff --git a/www/core/components/question/lang/zh-tw.json b/www/core/components/question/lang/zh-tw.json
index 98bad903e59..97eee458966 100644
--- a/www/core/components/question/lang/zh-tw.json
+++ b/www/core/components/question/lang/zh-tw.json
@@ -1,19 +1,19 @@
 {
-    "answer": "答案",
+    "answer": "回答",
     "answersaved": "答案已儲存",
-    "complete": "完成",
-    "correct": "答對",
+    "complete": "完全",
+    "correct": "正確",
     "errorattachmentsnotsupported": "本應用程序尚不支援將檔案附加到答案.",
     "errorinlinefilesnotsupported": "該應用程序尚不支援線上檔案的編輯.",
     "errorquestionnotsupported": "該應用程式不支援此問題類型: {{$ a}}.",
     "feedback": "回饋",
     "howtodraganddrop": "點一下選擇, 然後再點一下刪除.",
-    "incorrect": "答錯",
+    "incorrect": "不正確",
     "information": "資訊",
     "invalidanswer": "不完整的答案",
-    "notanswered": "沒被回答",
-    "notyetanswered": "尚未回答",
-    "partiallycorrect": "部分答對",
+    "notanswered": "尚未回答",
+    "notyetanswered": "還沒被填答",
+    "partiallycorrect": "部分正確",
     "questionmessage": "問題 {{$a}}: {{$b}}",
     "questionno": "試題{{$a}}",
     "requiresgrading": "需要計分",
diff --git a/www/core/components/settings/lang/ar.json b/www/core/components/settings/lang/ar.json
index 0f8555c7b08..fae7dd88622 100644
--- a/www/core/components/settings/lang/ar.json
+++ b/www/core/components/settings/lang/ar.json
@@ -6,25 +6,25 @@
     "deviceinfo": "معلومات الجهاز",
     "deviceos": "نظام تشغيل الجهاز",
     "disableall": "تعطيل الإعلامات بشكل مؤقت",
-    "disabled": "معطل",
+    "disabled": "مُعطِّل",
     "enabledebugging": "تمكين التصحيح",
     "enabledownloadsection": "تفعيل تنزيل الأقسام",
     "enabledownloadsectiondescription": "عطل هذا الخيار لكي تسرع تحميل أقسام المنهج",
     "estimatedfreespace": "تقدير المساحة الحرة",
-    "general": "بيانات عامة",
+    "general": "عام",
     "language": "اللغة",
     "license": "رخصة",
     "localnotifavailable": "إشعارات محلية موجودة",
     "loggedin": "متواجد",
     "loggedoff": "غير موجود",
-    "settings": "الإعدادات",
+    "settings": "إعدادات",
     "sites": "المواقع",
     "spaceusage": "المساحة المستخدمة",
     "synchronization": "تزامن",
     "synchronizenow": "زامن الأن",
     "synchronizing": "يتم التزامن",
     "syncsettings": "إعدادات المزامنة",
-    "total": "المجموع",
+    "total": "مجموع",
     "versioncode": "رمز الإصدار",
     "versionname": "اسم الإصدار"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/bg.json b/www/core/components/settings/lang/bg.json
index 1543ea58c4a..9ac4a91d33b 100644
--- a/www/core/components/settings/lang/bg.json
+++ b/www/core/components/settings/lang/bg.json
@@ -4,17 +4,17 @@
     "currentlanguage": "Текущ език",
     "deletesitefiles": "Сигурни ли сте, че искате да изтриете изтеглените от този сайт файлове?",
     "disableall": "Временно отменяне на съобщенията",
-    "disabled": "Отменено",
+    "disabled": "Блокирано",
     "enabledebugging": "Позволяване на диагностициране",
     "errordeletesitefiles": "Грешка при изтриването на файловете на сайта.",
     "errorsyncsite": "Грешка при синхронизацията на данните от сайта. Моля проверете Вашата връзка към Интернет и опитайте пак.",
     "estimatedfreespace": "Пресметнато свободно пространство",
-    "general": "General",
+    "general": "Общо",
     "language": "Език",
     "license": "Лиценз",
     "loggedin": "Онлайн",
     "loggedoff": "Офлайн",
-    "settings": "Настройки",
+    "settings": "Настройки на заданието",
     "spaceusage": "Използване на пространство",
     "synchronization": "Синхронизиране",
     "synchronizing": "Синхронизиране",
diff --git a/www/core/components/settings/lang/ca.json b/www/core/components/settings/lang/ca.json
index 9a46eb62910..66977c70db9 100644
--- a/www/core/components/settings/lang/ca.json
+++ b/www/core/components/settings/lang/ca.json
@@ -18,7 +18,7 @@
     "deviceos": "OS del dispositiu",
     "devicewebworkers": "És compatible amb Device Web Workers",
     "disableall": "Inhabilita les notificacions temporalment",
-    "disabled": "Desactivada",
+    "disabled": "Inhabilitat",
     "displayformat": "Format de visualització",
     "enabledebugging": "Habilita la depuració",
     "enabledownloadsection": "Habilita la descàrrega de seccions",
@@ -30,7 +30,7 @@
     "errorsyncsite": "S'ha produït un error sincronitzant les dades del lloc, comproveu la vostra connexió a internet i torneu-ho provar.",
     "estimatedfreespace": "Espai lliure estimat",
     "filesystemroot": "Arrel del fitxer de sistema",
-    "general": "Dades generals",
+    "general": "General",
     "language": "Idioma",
     "license": "Llicència",
     "localnotifavailable": "Notificacions locals disponibles",
@@ -42,7 +42,7 @@
     "networkstatus": "Estat de la connexió a Internet",
     "privacypolicy": "Política de privadesa",
     "reportinbackground": "Informa dels errors automàticament",
-    "settings": "Paràmetres",
+    "settings": "Configuració",
     "sites": "Llocs",
     "spaceusage": "Utilització de l'espai",
     "storagetype": "Tipus d'emmagatzematge",
diff --git a/www/core/components/settings/lang/cs.json b/www/core/components/settings/lang/cs.json
index ada1f9bcc0d..b9c0291c9ee 100644
--- a/www/core/components/settings/lang/cs.json
+++ b/www/core/components/settings/lang/cs.json
@@ -18,7 +18,7 @@
     "deviceos": "OS zařízení",
     "devicewebworkers": "Podporovaný Web Workers zařízení",
     "disableall": "Zakázat upozornění",
-    "disabled": "Zakázáno",
+    "disabled": "Vypnuto",
     "displayformat": "Formát zobrazení",
     "enabledebugging": "Povolit ladící informace",
     "enabledownloadsection": "Povolit stahování sekcí",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Chyba synchronizace dat stránek, zkontrolujte své připojení k internetu a zkuste to znovu.",
     "estimatedfreespace": "Odhadované volné místo",
     "filesystemroot": "Kořen souborového systému",
-    "general": "Obecná data",
+    "general": "Obecná nastavení",
     "language": "Jazyk",
     "license": "Licence",
     "localnotifavailable": "Je dostupné lokání oznámení",
@@ -43,7 +43,7 @@
     "privacypolicy": "Zásady ochrany osobních údajů",
     "processorsettings": "Nastavení procesoru",
     "reportinbackground": "Zobrazovat chyby automaticky",
-    "settings": "Nastavení",
+    "settings": "Nastavení úkolu",
     "sites": "Stránky",
     "spaceusage": "Použitý prostor",
     "storagetype": "Typ paměti",
diff --git a/www/core/components/settings/lang/da.json b/www/core/components/settings/lang/da.json
index 2b0cd357ebd..d2ec20f3074 100644
--- a/www/core/components/settings/lang/da.json
+++ b/www/core/components/settings/lang/da.json
@@ -14,7 +14,7 @@
     "deviceinfo": "Enhedsinfo",
     "deviceos": "Enheds operativsystem",
     "disableall": "Deaktiver notifikationer",
-    "disabled": "Deaktiveret",
+    "disabled": "Beskedsystemet er deaktiveret",
     "displayformat": "Vis format",
     "enabledebugging": "Aktiver fejlsøgning",
     "enablesyncwifi": "Tillad kun synkronisering når tilsluttet Wi-Fi",
@@ -22,7 +22,7 @@
     "errorsyncsite": "Fejl ved synkronisering. Kontroller din Internettilslutning og prøv igen.",
     "estimatedfreespace": "Beregnet ledig plads",
     "filesystemroot": "Filsystemets rod",
-    "general": "Generelle data",
+    "general": "Generelt",
     "language": "Sprog",
     "license": "Licens",
     "localnotifavailable": "Lokale meddelelser tilgængelige",
@@ -33,7 +33,7 @@
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Status for internetforbindelse",
     "reportinbackground": "Anmeld fejl automatisk",
-    "settings": "Indstillinger",
+    "settings": "Opgaveindstillinger",
     "sites": "Websteder",
     "spaceusage": "Pladsforbrug",
     "storagetype": "Lagertype",
@@ -42,7 +42,7 @@
     "synchronizing": "Synkroniserer",
     "syncsettings": "Indstilling for synkronisering",
     "syncsitesuccess": "Websidens data er synkroniseret og alle mellemlagre tømt",
-    "total": "Totalt",
+    "total": "Total",
     "versioncode": "Versionsnummer",
     "versionname": "Versionsnavn",
     "wificonnection": "WiFi-forbindelse"
diff --git a/www/core/components/settings/lang/de.json b/www/core/components/settings/lang/de.json
index a1041070545..dc12fbcf598 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -18,7 +18,7 @@
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
     "disableall": "Benachrichtungen ausschalten",
-    "disabled": "deaktiviert",
+    "disabled": "Deaktiviert",
     "displayformat": "Bildschirmformat",
     "enabledebugging": "Debugging aktivieren",
     "enabledownloadsection": "Herunterladen von Abschnitten aktivieren",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Fehler beim Synchronisieren der Website. Prüfen Sie die Verbindung und versuchen Sie es noch einmal.",
     "estimatedfreespace": "Noch verfügbarer Speicherplatz",
     "filesystemroot": "Dateisystem (root)",
-    "general": "Grunddaten",
+    "general": "Grundeinträge",
     "language": "Sprache",
     "license": "Lizenz",
     "localnotifavailable": "Lokale Mitteilungen verfügbar",
@@ -52,7 +52,7 @@
     "synchronizing": "Synchronisieren ...",
     "syncsettings": "Synchronisieren",
     "syncsitesuccess": "Die Daten wurden synchronisiert.",
-    "total": "Gesamt",
+    "total": "Insgesamt",
     "versioncode": "Versionscode",
     "versionname": "Versionsname",
     "wificonnection": "WLAN-Verbindung"
diff --git a/www/core/components/settings/lang/el.json b/www/core/components/settings/lang/el.json
index 1e844c1e619..ded142e065b 100644
--- a/www/core/components/settings/lang/el.json
+++ b/www/core/components/settings/lang/el.json
@@ -1,13 +1,13 @@
 {
     "currentlanguage": "Επιλεγμένη γλώσσα",
     "disableall": "Προσωρινή απενεργοποίηση ειδοποιήσεων",
-    "disabled": "Απενεργοποιημένο",
-    "general": "Γενικά δεδομένα",
+    "disabled": "Ανενεργό",
+    "general": "Γενικά",
     "language": "Γλώσσα",
     "license": "Άδεια GPL",
     "loggedin": "Συνδεδεμένος",
     "loggedoff": "Μη συνδεδεμένος",
     "settings": "Ρυθμίσεις",
     "sites": "Δικτυακοί τόποι",
-    "total": "Συνολικό"
+    "total": "Συνολικά"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/es-mx.json b/www/core/components/settings/lang/es-mx.json
index 31514e7c140..970bc7fb067 100644
--- a/www/core/components/settings/lang/es-mx.json
+++ b/www/core/components/settings/lang/es-mx.json
@@ -18,7 +18,7 @@
     "deviceos": "Sistema Operativo del dispositivo",
     "devicewebworkers": "Trabajadores Web del Dispositivo soportados",
     "disableall": "Deshabilitar notificaciones",
-    "disabled": "Desactivado",
+    "disabled": "Deshabilitado",
     "displayformat": "Mostrar formato",
     "enabledebugging": "Activar modo depuración (debug)",
     "enabledownloadsection": "Habilitar descargar secciones",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Error al sincronizarlos datos del sitio; por favor revise su conexión de Internet e inténtelo de nuevo.",
     "estimatedfreespace": "Espacio libre estimado",
     "filesystemroot": "Raíz del sistema-de-archivos",
-    "general": "Datos generales",
+    "general": "General",
     "language": "Idioma",
     "license": "Licencia",
     "localnotifavailable": "Notificaciones locales disponibles",
@@ -43,7 +43,7 @@
     "privacypolicy": "Política de privacidad",
     "processorsettings": "Configuraciones de procesador",
     "reportinbackground": "Reportar errores automáticamente",
-    "settings": "Ajustes",
+    "settings": "Configuración",
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
diff --git a/www/core/components/settings/lang/es.json b/www/core/components/settings/lang/es.json
index de92393bcae..f26bc88eda5 100644
--- a/www/core/components/settings/lang/es.json
+++ b/www/core/components/settings/lang/es.json
@@ -18,7 +18,7 @@
     "deviceos": "OS del dispositivo",
     "devicewebworkers": "Soporta Device Web Workers",
     "disableall": "Desactivar temporalmente las notificaciones",
-    "disabled": "Desactivado",
+    "disabled": "Deshabilitado",
     "displayformat": "Formato de visualización",
     "enabledebugging": "Activar modo debug",
     "enabledownloadsection": "Habilitar la descarga de secciones",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Se ha producido un error sincronizando los datos del sitio, por favor compruebe su conexión a internet y pruebe de nuevo.",
     "estimatedfreespace": "Espacio libre (estimado)",
     "filesystemroot": "Raíz del sistema de archivos",
-    "general": "Datos generales",
+    "general": "General",
     "language": "Idioma",
     "license": "Licencia",
     "localnotifavailable": "Notificaciones locales disponibles",
@@ -42,7 +42,7 @@
     "networkstatus": "Estado de la conexión a internet",
     "processorsettings": "Ajustes de procesador",
     "reportinbackground": "Informar de los errores automáticamente",
-    "settings": "Ajustes",
+    "settings": "Configuración",
     "sites": "Sitios",
     "spaceusage": "Espacio",
     "storagetype": "Tipo de almacenamiento",
diff --git a/www/core/components/settings/lang/eu.json b/www/core/components/settings/lang/eu.json
index 1a1d6b5f47c..15413f586dc 100644
--- a/www/core/components/settings/lang/eu.json
+++ b/www/core/components/settings/lang/eu.json
@@ -18,7 +18,7 @@
     "deviceos": "Gailuaren SEa",
     "devicewebworkers": "Device Web Workers onartuak",
     "disableall": "Desgaitu jakinarazpenak",
-    "disabled": "Desgaituta",
+    "disabled": "Mezularitza desgaituta dago gune honetan",
     "displayformat": "Erakusteko modua",
     "enabledebugging": "Gaitu arazketa",
     "enabledownloadsection": "Gaitu gaien deskarga",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Errorea guneko datuak sinkronizatzean, mesedez egiaztatu zure interneterako konexioa eta saiatu berriz.",
     "estimatedfreespace": "Estimatutako leku librea",
     "filesystemroot": "Fitxategi-sistemaren jatorria",
-    "general": "Datu orokorrak",
+    "general": "Orokorra",
     "language": "Hizkuntza",
     "license": "Lizentzia",
     "localnotifavailable": "Jakinarazpen lokalak eskuragarri",
@@ -43,7 +43,7 @@
     "privacypolicy": "Pribatutasun politika.",
     "processorsettings": "Prozesadorearen ezarpenak",
     "reportinbackground": "Erroreak automatikoki jakinarazi",
-    "settings": "Ezarpenak",
+    "settings": "Zereginaren ezarpenak",
     "sites": "Guneak",
     "spaceusage": "Lekuaren erabilera",
     "storagetype": "Biltegi mota",
diff --git a/www/core/components/settings/lang/fa.json b/www/core/components/settings/lang/fa.json
index 4890c372d09..b0048cdfb24 100644
--- a/www/core/components/settings/lang/fa.json
+++ b/www/core/components/settings/lang/fa.json
@@ -9,14 +9,14 @@
     "deviceinfo": "اطلاعات دستگاه",
     "deviceos": "سیستم‌عامل دستگاه",
     "disableall": "غیرفعال‌کردن اطلاعیه‌ها",
-    "disabled": "غیرفعال",
+    "disabled": "غیر فعال",
     "enabledebugging": "فعالسازی اشکالزدایی",
     "enabledownloadsection": "فعال‌کردن دریافت قسمت‌ها",
     "enabledownloadsectiondescription": "برای سریع‌تر شدن بارگیری قسمت‌های درس این گزینه را غیرفعال کنید.",
     "enablerichtexteditor": "فعال‌کردن ویرایشگر متنی پیشرفته",
     "enablerichtexteditordescription": "اگر فعال باشد، در جاهایی که ممکن باشد یک ویرایشگر متنی پیشرفته نمایش داده خواهد شد.",
     "estimatedfreespace": "فضای آزاد تخمینی",
-    "general": "داده‌های کلی",
+    "general": "عمومی",
     "language": "زبان",
     "license": "اجازه‌نامه",
     "loggedin": "هنگام بودن در سایت",
@@ -24,7 +24,7 @@
     "privacypolicy": "خط مشی حفظ حریم خصوصی",
     "processorsettings": "تنظیمات پردازشگر",
     "reportinbackground": "گزارش خطاها به‌صورت خودکار",
-    "settings": "تنظیمات",
+    "settings": "تنظیمات تکلیف",
     "sites": "سایت‌ها",
     "spaceusage": "فضای مورد استفاده",
     "synchronization": "هماهنگسازی",
diff --git a/www/core/components/settings/lang/fr.json b/www/core/components/settings/lang/fr.json
index b0a98969616..5346109b332 100644
--- a/www/core/components/settings/lang/fr.json
+++ b/www/core/components/settings/lang/fr.json
@@ -18,7 +18,7 @@
     "deviceos": "Système d'exploitation de l'appareil",
     "devicewebworkers": "Web workers supportés",
     "disableall": "Désactiver les notifications",
-    "disabled": "Désactivé",
+    "disabled": "Désactivée",
     "displayformat": "Format d'affichage",
     "enabledebugging": "Activer débogage",
     "enabledownloadsection": "Activer le téléchargement des sections",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Erreur de synchronisation des données. Veuillez vérifier votre connexion internet et essayer plus tard.",
     "estimatedfreespace": "Espace libre estimé",
     "filesystemroot": "Racine du système de fichiers",
-    "general": "Généralités",
+    "general": "Général",
     "language": "Langue",
     "license": "Licence",
     "localnotifavailable": "Notifications locales disponibles",
@@ -43,7 +43,7 @@
     "privacypolicy": "Politique de confidentialité",
     "processorsettings": "Réglage du processus d'envoi de messages",
     "reportinbackground": "Annoncer les erreurs automatiquement",
-    "settings": "Réglages",
+    "settings": "Paramètres",
     "sites": "Sites",
     "spaceusage": "Espace utilisé",
     "storagetype": "Type de stockage",
diff --git a/www/core/components/settings/lang/he.json b/www/core/components/settings/lang/he.json
index 4b431f585e1..85b2267e3b5 100644
--- a/www/core/components/settings/lang/he.json
+++ b/www/core/components/settings/lang/he.json
@@ -8,28 +8,28 @@
     "deviceinfo": "מידע אודות המכשיר",
     "deviceos": "מערכת הפעלה של המכשיר",
     "disableall": "הודעות־מערכת כבויות זמנית",
-    "disabled": "כבוי",
+    "disabled": "לא זמין",
     "displayformat": "תבנית תצוגה",
     "enabledebugging": "הפעל ניפוי שגיאות",
     "errordeletesitefiles": "שגיאה במחיקת קבצי האתר.",
     "errorsyncsite": "שגיאה בסנכרון מידע האתר, אנא בדוק את החיבור לרשת האינטרנט ונסה שוב.",
     "estimatedfreespace": "אומדן מקום פנוי",
-    "general": "נתונים כללים",
+    "general": "כללי",
     "language": "שפת ממשק",
-    "license": "רישיון:",
+    "license": "רשיון",
     "localnotifavailable": "התראות מקומיות זמינות",
     "loggedin": "מקוון",
     "loggedoff": "לא מקוון",
     "networkstatus": "מצב חיבור לרשת האינטרנט",
     "reportinbackground": "דיווח על שגיאות באופן אוטומטי",
-    "settings": "הגדרות",
+    "settings": "הגדרות המטלה",
     "sites": "אתרים",
     "spaceusage": "זיכרון בשימוש",
     "synchronization": "סינכרון",
     "synchronizenow": "סינכרון עכשיו",
     "synchronizing": "מסנכרן",
     "syncsitesuccess": "מידע האתר סונכרן וכל זיכרון המטמון אופס.",
-    "total": "כולל",
+    "total": "סך הכל",
     "versioncode": "קוד גרסה",
     "versionname": "שם גרסה",
     "wificonnection": "חיבור אלחוטי"
diff --git a/www/core/components/settings/lang/hu.json b/www/core/components/settings/lang/hu.json
index dabf3467e9f..3def7a650fc 100644
--- a/www/core/components/settings/lang/hu.json
+++ b/www/core/components/settings/lang/hu.json
@@ -4,16 +4,16 @@
     "currentlanguage": "Aktuális nyelv",
     "deletesitefiles": "Biztosan törli a portálról a letöltött fájlokat?",
     "disableall": "Értesítésekkikapcsolása",
-    "disabled": "Kikapcsolva",
+    "disabled": "Ezen a portálon az üzenetküldés ki van kapcsolva",
     "enabledebugging": "Hibakeresés bekapcsolása",
     "estimatedfreespace": "Becsült szabad tárhely",
-    "general": "Általános adatok",
+    "general": "Általános",
     "language": "Nyelv",
-    "license": "Engedély:",
+    "license": "Licenc",
     "loggedin": "Bejelentkezve:",
     "loggedoff": "Kijelentkezve",
     "processorsettings": "Feldolgozó beállításai",
-    "settings": "Beállítások",
+    "settings": "Feladat beállításai",
     "sites": "Portálok",
     "spaceusage": "Tárhelyhasználat",
     "synchronization": "Szinkronizálás",
diff --git a/www/core/components/settings/lang/it.json b/www/core/components/settings/lang/it.json
index e659bf2f70e..72440991f47 100644
--- a/www/core/components/settings/lang/it.json
+++ b/www/core/components/settings/lang/it.json
@@ -15,7 +15,7 @@
     "deviceos": "SO del dispositivo",
     "devicewebworkers": "Dispositivi Web Worker supportati",
     "disableall": "Disabilita le notifiche",
-    "disabled": "Disabilitato",
+    "disabled": "In questo sito il messaging è disabilitato",
     "displayformat": "Formato di visualizzazione",
     "enabledebugging": "Abilita debugging",
     "enabledownloadsection": "Abilita scaricamento sezioni",
@@ -24,7 +24,7 @@
     "errorsyncsite": "Si è verificato un errore durante la sincronizzazione dei dati dal sito. Per favore verifica la connessione internet e riprova.",
     "estimatedfreespace": "Spazio libero stimato",
     "filesystemroot": "Root del filesystem",
-    "general": "Dati generali",
+    "general": "Generale",
     "language": "Lingua",
     "license": "Licenza",
     "localnotifavailable": "Notifiche locali disponibili",
@@ -36,7 +36,7 @@
     "networkstatus": "Stato della connessione internet",
     "processorsettings": "Impostazioni gestore",
     "reportinbackground": "Invia errori automaticamente",
-    "settings": "Impostazioni",
+    "settings": "Impostazioni compito",
     "sites": "Siti",
     "spaceusage": "Spazio utilizzato",
     "storagetype": "Tipo di storage",
diff --git a/www/core/components/settings/lang/ja.json b/www/core/components/settings/lang/ja.json
index c59c0bb69cf..b410de256b4 100644
--- a/www/core/components/settings/lang/ja.json
+++ b/www/core/components/settings/lang/ja.json
@@ -4,16 +4,16 @@
     "currentlanguage": "現在の言語",
     "deletesitefiles": "本当にこのサイトからダウンロードしたファイルを消去しますか？",
     "disableall": "通知を無効にする",
-    "disabled": "利用不可",
+    "disabled": "無効",
     "enabledebugging": "デバッグを有効にする",
     "estimatedfreespace": "概算の空き容量",
-    "general": "一般データ",
+    "general": "一般",
     "language": "言語設定",
     "license": "ライセンス",
     "loggedin": "オンライン",
     "loggedoff": "オフライン",
     "processorsettings": "プロセッサ設定",
-    "settings": "設定",
+    "settings": "課題設定",
     "sites": "サイト",
     "spaceusage": "保存領域使用量",
     "synchronization": "同期",
diff --git a/www/core/components/settings/lang/lt.json b/www/core/components/settings/lang/lt.json
index 79f4bc7a512..d2474dd8a26 100644
--- a/www/core/components/settings/lang/lt.json
+++ b/www/core/components/settings/lang/lt.json
@@ -18,7 +18,7 @@
     "deviceos": "Įrenginio OS",
     "devicewebworkers": "Įrenginio palaikymas",
     "disableall": "Išjungti pranešimus",
-    "disabled": "Išjungta",
+    "disabled": "Išjungtas",
     "displayformat": "Rodyti formatą",
     "enabledebugging": "Leisti derinti",
     "enabledownloadsection": "Įgalinti sekciją parsiuntimą",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Klaida sinchronizuojant svetainės duomenis, prašome patikrinti interneto ryšį ir pabandyti dar kartą.",
     "estimatedfreespace": "Laisva vieta",
     "filesystemroot": "Failų sistema pradžia",
-    "general": "Bendrieji duomenys",
+    "general": "Bendra",
     "language": "Kalba",
     "license": "Licencija",
     "localnotifavailable": "Prieinami vietos pranešimai",
@@ -42,7 +42,7 @@
     "networkstatus": "Interneto ryšio būsena",
     "processorsettings": "Procesoriaus nustatymai",
     "reportinbackground": "Automatiškai pranešti apie klaidas",
-    "settings": "Parametrai",
+    "settings": "Užduoties nuostatos",
     "sites": "Svetainės",
     "spaceusage": "Vietos naudojimas",
     "storagetype": "Atminties tipas",
diff --git a/www/core/components/settings/lang/nl.json b/www/core/components/settings/lang/nl.json
index 19bfb28d023..622189c6fe3 100644
--- a/www/core/components/settings/lang/nl.json
+++ b/www/core/components/settings/lang/nl.json
@@ -18,7 +18,7 @@
     "deviceos": "Toestel OS",
     "devicewebworkers": "Ondersteunde Device Web Workers",
     "disableall": "Berichten uitschakelen",
-    "disabled": "Uitgeschakeld",
+    "disabled": "De berichtenservice is uitgeschakeld op deze site",
     "displayformat": "Schermformaat",
     "enabledebugging": "Foutopsporing inschakelen",
     "enabledownloadsection": "Downloadsecties inschakelen",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Fout bij het synchroniseren van sitegegevens. Controleer je internetverbinding en probeer opnieuw.",
     "estimatedfreespace": "Geschatte vrije ruimte",
     "filesystemroot": "Root bestandssysteem",
-    "general": "Algemene gegevens",
+    "general": "Algemeen",
     "language": "Taal",
     "license": "Licentie",
     "localnotifavailable": "Lokale meldingen beschikbaar",
@@ -43,7 +43,7 @@
     "privacypolicy": "Privacy-beleid",
     "processorsettings": "Processor instellingen",
     "reportinbackground": "Fouten automatisch rapporteren",
-    "settings": "Instellingen",
+    "settings": "Opdracht instellingen",
     "sites": "Sites",
     "spaceusage": "Gebruikte ruimte",
     "storagetype": "Opslagtype",
diff --git a/www/core/components/settings/lang/pl.json b/www/core/components/settings/lang/pl.json
index 0433565a1a6..3fcc31d278d 100644
--- a/www/core/components/settings/lang/pl.json
+++ b/www/core/components/settings/lang/pl.json
@@ -4,16 +4,16 @@
     "currentlanguage": "Aktualny język",
     "deletesitefiles": "Czy na pewno chcesz usunąć pliki pobrane z tej strony?",
     "disableall": "Tymczasowo wyłącz powiadomienia",
-    "disabled": "Wyłączone",
+    "disabled": "Wyłączony",
     "enabledebugging": "Włącz debugowanie",
     "estimatedfreespace": "Szacowana wolna przestrzeń",
-    "general": "Dane ogólne",
+    "general": "Ogólne",
     "language": "Język",
     "license": "Licencja",
     "loggedin": "On-line",
     "loggedoff": "Nie zalogowany",
-    "settings": "Ustawienia",
+    "settings": "Ustawienia zadania",
     "sites": "Serwisy",
     "spaceusage": "Użyta przestrzeń",
-    "total": "Ogólnie"
+    "total": "Razem"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/pt-br.json b/www/core/components/settings/lang/pt-br.json
index f0a410d15db..adf77cf5dfd 100644
--- a/www/core/components/settings/lang/pt-br.json
+++ b/www/core/components/settings/lang/pt-br.json
@@ -18,7 +18,7 @@
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
     "disableall": "Desabilitar notificações",
-    "disabled": "Desativado",
+    "disabled": "Desativar",
     "displayformat": "Formato de exibição",
     "enabledebugging": "Ativar a depuração",
     "enabledownloadsection": "Ativar seções de download",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Erro ao sincronizar os dados do site, por favor verifique sua conexão de internet e tente novamente.",
     "estimatedfreespace": "Espaço livre estimado",
     "filesystemroot": "Raiz do sistema de arquivos",
-    "general": "Dados Gerais",
+    "general": "Geral",
     "language": "Idioma",
     "license": "Licença",
     "localnotifavailable": "Notificações locais disponíveis",
@@ -42,7 +42,7 @@
     "networkstatus": "O status da conexão Internet",
     "privacypolicy": "Política de privacidade",
     "reportinbackground": "Relatar erros automaticamente",
-    "settings": "Configurações",
+    "settings": "Configurações da tarefa",
     "sites": "Sites",
     "spaceusage": "Uso do espaço",
     "storagetype": "Tipo de armazenamento",
diff --git a/www/core/components/settings/lang/pt.json b/www/core/components/settings/lang/pt.json
index d188b0239d1..c9a0b3b0f7f 100644
--- a/www/core/components/settings/lang/pt.json
+++ b/www/core/components/settings/lang/pt.json
@@ -18,7 +18,7 @@
     "deviceos": "Dispositivo OS",
     "devicewebworkers": "Device Web Workers suportados",
     "disableall": "Desativar notificações",
-    "disabled": "Desativado",
+    "disabled": "Desativar",
     "displayformat": "Formato de visualização",
     "enabledebugging": "Ativar a depuração",
     "enabledownloadsection": "Ativar secções de transferência",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Erro ao sincronizar os dados do site, por favor verifique a sua ligação à internet e tente novamente.",
     "estimatedfreespace": "Espaço livre estimado",
     "filesystemroot": "Raíz do sistema de ficheiros",
-    "general": "Dados gerais",
+    "general": "Geral",
     "language": "Idioma",
     "license": "Licença",
     "localnotifavailable": "Notificações locais disponíveis",
@@ -43,7 +43,7 @@
     "privacypolicy": "Politica de privacidade",
     "processorsettings": "Configurações do processador",
     "reportinbackground": "Reportar erros automaticamente",
-    "settings": "Definições",
+    "settings": "Configurações",
     "sites": "Sites",
     "spaceusage": "Utilização do espaço",
     "storagetype": "Tipo de armazenamento",
diff --git a/www/core/components/settings/lang/ro.json b/www/core/components/settings/lang/ro.json
index c241401f584..fb34938dfd3 100644
--- a/www/core/components/settings/lang/ro.json
+++ b/www/core/components/settings/lang/ro.json
@@ -15,7 +15,7 @@
     "deviceos": "Sistemul de operare al dispozitivului",
     "devicewebworkers": "Web Workers este suportat pe dispozitiv",
     "disableall": "Dezactivați temporar notificările",
-    "disabled": "Dezactivat",
+    "disabled": "Schimbul de mesaje este dezactivat pe acest site",
     "displayformat": "Dimensiunea ecranului",
     "enabledebugging": "Activați modulul de depanare",
     "enabledownloadsection": "Activați secțiunile pentru descărcare",
@@ -25,9 +25,9 @@
     "errorsyncsite": "A apărut o eroare la sincronizarea datelor de pe site, verificați conexiunea la internet și încercați din nou.",
     "estimatedfreespace": "Spațiu liber estimat",
     "filesystemroot": "Rădăcina sistemului de fișiere",
-    "general": "Informaţii generale",
+    "general": "General",
     "language": "Limba",
-    "license": "Licență",
+    "license": "Licenţă",
     "localnotifavailable": "Notificările locale sunt disponibile",
     "locationhref": "URL",
     "loggedin": "On-line",
@@ -36,7 +36,7 @@
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Starea conexiunii la Internet",
     "reportinbackground": "Erorile se raportează automat",
-    "settings": "Setări",
+    "settings": "Setările sarcinii de lucru",
     "sites": "Site-uri",
     "spaceusage": "Spațiu utilizat",
     "storagetype": "Tipul stocării",
diff --git a/www/core/components/settings/lang/ru.json b/www/core/components/settings/lang/ru.json
index 1d4cd0d9c7a..28769d7118a 100644
--- a/www/core/components/settings/lang/ru.json
+++ b/www/core/components/settings/lang/ru.json
@@ -7,7 +7,7 @@
     "deletesitefiles": "Вы уверены, что хотите удалить файлы, скачанные с сайта «{{sitename}}»?",
     "deletesitefilestitle": "Удалить файлы сайта",
     "disableall": "Временно отключить уведомления",
-    "disabled": "Отключено",
+    "disabled": "Выключить",
     "enabledebugging": "Включить отладку",
     "enabledownloadsection": "Показать материалы, доступные для скачивания",
     "enablerichtexteditor": "Включить текстовый редактор",
@@ -16,18 +16,18 @@
     "errordeletesitefiles": "Ошибка при удалении файлов сайта",
     "errorsyncsite": "Ошибка синхронизации данных сайта. Проверьте интернет-соединение и повторите попытку.",
     "estimatedfreespace": "Ориентировочное свободное место",
-    "general": "Основные данные",
+    "general": "Основные",
     "language": "Язык",
-    "license": "Лицензия:",
+    "license": "Лицензия",
     "loggedin": "На сайте",
     "loggedoff": "Вне сайта",
     "reportinbackground": "Автоматически оповещать об ошибках",
-    "settings": "Настройки",
+    "settings": "Параметры задания",
     "sites": "Сайты",
     "spaceusage": "Используемое пространство",
     "synchronization": "Синхронизация",
     "synchronizing": "Синхронизация",
     "syncsettings": "Настройки синхронизации",
     "syncsitesuccess": "Данные синхронизации сайта и все кэши недействительны.",
-    "total": "Итого"
+    "total": "Итог"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/sv.json b/www/core/components/settings/lang/sv.json
index ecc3e7b2c21..6e667ace444 100644
--- a/www/core/components/settings/lang/sv.json
+++ b/www/core/components/settings/lang/sv.json
@@ -15,7 +15,7 @@
     "deviceos": "Mobil enhet operativsystem",
     "devicewebworkers": "Enheten stödjer Web Workers",
     "disableall": "Tillfälligt inaktivera meddelanden",
-    "disabled": "Avaktiverad",
+    "disabled": "Avaktiverat",
     "displayformat": "Visningsformat",
     "enabledebugging": "Aktivera felsökning",
     "enabledownloadsection": "Aktivera hämtning sektioner",
@@ -25,7 +25,7 @@
     "errorsyncsite": "Fel vid synkronisering. Kontrollera din Internetanslutning och försök igen",
     "estimatedfreespace": "Beräknad ledigt utrymme",
     "filesystemroot": "Filsystem root",
-    "general": "Allmänna data",
+    "general": "Allmänt",
     "language": "Språk",
     "license": "Licens",
     "localnotifavailable": "Lokala meddelanden tillgängliga",
@@ -36,7 +36,7 @@
     "navigatoruseragent": "",
     "networkstatus": "Status för Internetanslutning",
     "reportinbackground": "Rapportera fel per automatik",
-    "settings": "Inställningar",
+    "settings": "Inställningar för inlämningsuppgift",
     "sites": "Webbplatser",
     "spaceusage": "Utrymmesanvändning",
     "storagetype": "Lagringstyp",
@@ -45,7 +45,7 @@
     "synchronizing": "Synkronisera",
     "syncsettings": "Synkronisation inställningar",
     "syncsitesuccess": "Webbsidedata synkroniserades och alla cachar ogiltigförklarades",
-    "total": "Summa",
+    "total": "Totalt",
     "versioncode": "Version kod",
     "versionname": "Version namn",
     "wificonnection": "WiFi-anslutning"
diff --git a/www/core/components/settings/lang/tr.json b/www/core/components/settings/lang/tr.json
index 88f41f68bad..c6f1ea3ec9b 100644
--- a/www/core/components/settings/lang/tr.json
+++ b/www/core/components/settings/lang/tr.json
@@ -4,16 +4,16 @@
     "currentlanguage": "Geçerli dil",
     "deletesitefiles": "Bu siteden indirdiğiniz dosyaları silmek istediğinizden eminmisiniz?",
     "disableall": "Bildirimleri devre dışı bırak",
-    "disabled": "Etkin değil",
+    "disabled": "Devre dışı bırakıldı",
     "enabledebugging": "Hata ayıklamayı etkinleştir",
     "estimatedfreespace": "Tahmini boş alan",
-    "general": "Genel veri",
+    "general": "Genel",
     "language": "Dil",
     "license": "Lisans",
     "loggedin": "Çevrimiçi",
     "loggedoff": "Çevrim içi değil",
     "processorsettings": "İşlemci ayarları",
-    "settings": "Ayarlar",
+    "settings": "Ödev ayarları",
     "sites": "Siteler",
     "spaceusage": "Kullanılan alan",
     "synchronization": "Eşitleme",
diff --git a/www/core/components/settings/lang/uk.json b/www/core/components/settings/lang/uk.json
index 00c05658b93..b918ac439dc 100644
--- a/www/core/components/settings/lang/uk.json
+++ b/www/core/components/settings/lang/uk.json
@@ -18,7 +18,7 @@
     "deviceos": "ОС пристрою",
     "devicewebworkers": "Device Web Workers підтримується",
     "disableall": "Тимчасово заборонити повідомлення",
-    "disabled": "Відключено",
+    "disabled": "Повідомлення заборонені на цьому сайті",
     "displayformat": "Формат відображення",
     "enabledebugging": "Включити відладку",
     "enabledownloadsection": "Увімкнути секцію завантаження",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Помилка синхронізації даних сайту, будь ласка, перевірте підключення до Інтернету і спробуйте ще раз.",
     "estimatedfreespace": "Розрахунковий вільний простір",
     "filesystemroot": "Коренева файлова система",
-    "general": "Головні дані",
+    "general": "Основне",
     "language": "Мова інтерфейсу",
     "license": "Ліцензія",
     "localnotifavailable": "Локальні сповіщення доступні",
@@ -42,7 +42,7 @@
     "networkstatus": "Статут інтернет з'єднання",
     "privacypolicy": "Політика конфіденційності",
     "reportinbackground": "Відправляти помилки автоматично",
-    "settings": "Налаштування",
+    "settings": "Параметри завдання",
     "sites": "Сайти",
     "spaceusage": "Використане місце",
     "storagetype": "Тип сховища",
@@ -51,7 +51,7 @@
     "synchronizing": "Синхронізація",
     "syncsettings": "Налаштування синхронізації",
     "syncsitesuccess": "Дані сайту синхронізовані і всі кеші визнані недійсними.",
-    "total": "Всього",
+    "total": "Підсумок",
     "versioncode": "Версія коду",
     "versionname": "Ім'я версії",
     "wificonnection": "WiFi з'єднання"
diff --git a/www/core/components/settings/lang/zh-cn.json b/www/core/components/settings/lang/zh-cn.json
index 791a7c769b0..0ae3d4ba30e 100644
--- a/www/core/components/settings/lang/zh-cn.json
+++ b/www/core/components/settings/lang/zh-cn.json
@@ -4,17 +4,17 @@
     "currentlanguage": "当前语言",
     "deletesitefiles": "您确定要删除从本站下载的文件？",
     "disableall": "临时禁用通知",
-    "disabled": "停用",
+    "disabled": "禁用",
     "enabledebugging": "启用调试功能",
     "estimatedfreespace": "估计的可用空间",
-    "general": "通用数据",
+    "general": "常规项",
     "language": "语言",
-    "license": "证书",
+    "license": "许可证",
     "loggedin": "在线",
     "loggedoff": "离线",
-    "settings": "设置",
+    "settings": "作业设置",
     "sites": "网站",
     "spaceusage": "空间使用情况",
     "synchronization": "同步",
-    "total": "总分"
+    "total": "总计"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/zh-tw.json b/www/core/components/settings/lang/zh-tw.json
index a2e67603c02..d63c5c6e165 100644
--- a/www/core/components/settings/lang/zh-tw.json
+++ b/www/core/components/settings/lang/zh-tw.json
@@ -18,7 +18,7 @@
     "deviceos": "裝置作業系統",
     "devicewebworkers": "裝置網路工作站已支援",
     "disableall": "暫時關閉通知",
-    "disabled": "關閉",
+    "disabled": "已關閉",
     "displayformat": "顯示格式",
     "enabledebugging": "啟用除錯",
     "enabledownloadsection": "啟用下載區塊",
@@ -30,9 +30,9 @@
     "errorsyncsite": "同步網站資料時出錯, 請檢查您的網際網路連線, 然後重試.",
     "estimatedfreespace": "估計剩餘空間",
     "filesystemroot": "檔案系統根目錄",
-    "general": "一般資料",
+    "general": "一般",
     "language": "語言",
-    "license": "授權方式",
+    "license": "授權條款",
     "localnotifavailable": "提供本端通知",
     "locationhref": "Webview網址",
     "loggedin": "線上",
@@ -42,7 +42,7 @@
     "networkstatus": "網際網路連線狀況",
     "processorsettings": "處理器的各項設定",
     "reportinbackground": "報表錯誤自動回報",
-    "settings": "設定",
+    "settings": "作業設定",
     "sites": "網站",
     "spaceusage": "使用空間",
     "storagetype": "儲存類型",
@@ -51,7 +51,7 @@
     "synchronizing": "同步中",
     "syncsettings": "同步設定",
     "syncsitesuccess": "網站資料同步與快取都無效",
-    "total": "總分",
+    "total": "總共",
     "versioncode": "版本碼",
     "versionname": "版本名稱",
     "wificonnection": "WiFi連線"
diff --git a/www/core/components/sharedfiles/lang/ar.json b/www/core/components/sharedfiles/lang/ar.json
index e56fb17f780..9f9e759ba0b 100644
--- a/www/core/components/sharedfiles/lang/ar.json
+++ b/www/core/components/sharedfiles/lang/ar.json
@@ -1,4 +1,4 @@
 {
-    "rename": "إعادة تسمية",
+    "rename": "تغيير الاسم",
     "replace": "استبدال"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/it.json b/www/core/components/sharedfiles/lang/it.json
index 81869805f8b..875611dd996 100644
--- a/www/core/components/sharedfiles/lang/it.json
+++ b/www/core/components/sharedfiles/lang/it.json
@@ -1,5 +1,5 @@
 {
-    "rename": "Cambia il nome",
+    "rename": "Rinomina",
     "replace": "Sostituisci",
     "sharedfiles": "File condivisi"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/sv.json b/www/core/components/sharedfiles/lang/sv.json
index aa1e826c0b2..117af22281c 100644
--- a/www/core/components/sharedfiles/lang/sv.json
+++ b/www/core/components/sharedfiles/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "rename": "Ändra namn",
+    "rename": "Döp om",
     "replace": "Byt ut"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/tr.json b/www/core/components/sharedfiles/lang/tr.json
index 76c25af6f7c..94ea98f2214 100644
--- a/www/core/components/sharedfiles/lang/tr.json
+++ b/www/core/components/sharedfiles/lang/tr.json
@@ -1,5 +1,5 @@
 {
-    "rename": "Ad değiştir",
+    "rename": "Yeniden adlandır",
     "replace": "Değiştir",
     "sharedfiles": "Paylaşılan dosyalar"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ca.json b/www/core/components/sidemenu/lang/ca.json
index 1f492266956..d2e61d92b7b 100644
--- a/www/core/components/sidemenu/lang/ca.json
+++ b/www/core/components/sidemenu/lang/ca.json
@@ -2,7 +2,7 @@
     "appsettings": "Paràmetres de l'aplicació",
     "changesite": "Canvia de lloc",
     "help": "Ajuda",
-    "logout": "Tanca la sessió",
+    "logout": "Surt",
     "mycourses": "Els meus cursos",
     "togglemenu": "Canvia menú",
     "website": "Lloc web"
diff --git a/www/core/components/sidemenu/lang/cs.json b/www/core/components/sidemenu/lang/cs.json
index 68c7fe8de79..f93a604f4a4 100644
--- a/www/core/components/sidemenu/lang/cs.json
+++ b/www/core/components/sidemenu/lang/cs.json
@@ -1,7 +1,7 @@
 {
     "appsettings": "Nastavení aplikace",
     "changesite": "Změnit stránky",
-    "help": "Pomoc",
+    "help": "Nápověda",
     "logout": "Odhlásit se",
     "mycourses": "Moje kurzy",
     "togglemenu": "Přepnout nabídku",
diff --git a/www/core/components/sidemenu/lang/de.json b/www/core/components/sidemenu/lang/de.json
index 0ed4e3b6221..e700f3ddc90 100644
--- a/www/core/components/sidemenu/lang/de.json
+++ b/www/core/components/sidemenu/lang/de.json
@@ -2,7 +2,7 @@
     "appsettings": "Einstellungen",
     "changesite": "Website wechseln",
     "help": "Hilfe",
-    "logout": "Abmelden",
+    "logout": "Logout",
     "mycourses": "Meine Kurse",
     "togglemenu": "Menü umschalten",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/eu.json b/www/core/components/sidemenu/lang/eu.json
index c5757719d6e..d6c4be2b4ea 100644
--- a/www/core/components/sidemenu/lang/eu.json
+++ b/www/core/components/sidemenu/lang/eu.json
@@ -2,7 +2,7 @@
     "appsettings": "App-aren ezarpenak",
     "changesite": "Aldatu gunea",
     "help": "Laguntza",
-    "logout": "Saioa amaitu",
+    "logout": "Irten",
     "mycourses": "Nire ikastaroak",
     "togglemenu": "Aldatu menua",
     "website": "Webgunea"
diff --git a/www/core/components/sidemenu/lang/he.json b/www/core/components/sidemenu/lang/he.json
index df2620a0194..defec49d009 100644
--- a/www/core/components/sidemenu/lang/he.json
+++ b/www/core/components/sidemenu/lang/he.json
@@ -2,7 +2,7 @@
     "appsettings": "הגדרות יישומון",
     "changesite": "התנתק",
     "help": "עזרה",
-    "logout": "התנתקות",
+    "logout": "התנתק",
     "mycourses": "הקורסים שלי",
     "togglemenu": "החלפת מצב תפריט",
     "website": "אתר אינטרנט"
diff --git a/www/core/components/sidemenu/lang/it.json b/www/core/components/sidemenu/lang/it.json
index b86c1c18949..9e368b1ef6f 100644
--- a/www/core/components/sidemenu/lang/it.json
+++ b/www/core/components/sidemenu/lang/it.json
@@ -2,7 +2,7 @@
     "appsettings": "Impostazioni app",
     "changesite": "Cambia sito",
     "help": "Aiuto",
-    "logout": "Logout",
+    "logout": "Esci",
     "mycourses": "I miei corsi",
     "togglemenu": "Attiva/disattiva menu",
     "website": "Sito web"
diff --git a/www/core/components/sidemenu/lang/lt.json b/www/core/components/sidemenu/lang/lt.json
index c48f439f478..4f3f66ea9f3 100644
--- a/www/core/components/sidemenu/lang/lt.json
+++ b/www/core/components/sidemenu/lang/lt.json
@@ -1,7 +1,7 @@
 {
     "appsettings": "Programėlės nustatymai",
     "changesite": "Pakeisti svetainę",
-    "help": "Pagalba",
+    "help": "Žinynas",
     "logout": "Atsijungti",
     "mycourses": "Mano kursai",
     "togglemenu": "Perjungti",
diff --git a/www/core/components/sidemenu/lang/nl.json b/www/core/components/sidemenu/lang/nl.json
index 7caa7f9041a..8a50f17cc30 100644
--- a/www/core/components/sidemenu/lang/nl.json
+++ b/www/core/components/sidemenu/lang/nl.json
@@ -2,7 +2,7 @@
     "appsettings": "App instellingen",
     "changesite": "Naar andere site",
     "help": "Help",
-    "logout": "Uitloggen",
+    "logout": "Log uit",
     "mycourses": "Mijn cursussen",
     "togglemenu": "Menu schakelen",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/pl.json b/www/core/components/sidemenu/lang/pl.json
index dc57d0910b1..db5b40a15cd 100644
--- a/www/core/components/sidemenu/lang/pl.json
+++ b/www/core/components/sidemenu/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "changesite": "Wyloguj",
     "help": "Pomoc",
-    "logout": "Wyloguj się",
+    "logout": "Wyloguj",
     "mycourses": "Moje kursy",
     "website": "Witryna"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ro.json b/www/core/components/sidemenu/lang/ro.json
index da61b14058d..1c5f17d9e01 100644
--- a/www/core/components/sidemenu/lang/ro.json
+++ b/www/core/components/sidemenu/lang/ro.json
@@ -2,7 +2,7 @@
     "appsettings": "Setările aplicației",
     "changesite": "Schimbați siteul",
     "help": "Ajutor",
-    "logout": "Ieșire",
+    "logout": "Ieşire",
     "mycourses": "Cursurile mele",
     "togglemenu": "Meniul pentru comutare",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/ru.json b/www/core/components/sidemenu/lang/ru.json
index 668c559c737..541a10d3285 100644
--- a/www/core/components/sidemenu/lang/ru.json
+++ b/www/core/components/sidemenu/lang/ru.json
@@ -1,7 +1,7 @@
 {
     "appsettings": "Настройки приложения",
     "changesite": "Выход",
-    "help": "Помощь",
+    "help": "Справка",
     "logout": "Выход",
     "mycourses": "Мои курсы",
     "website": "Сайт"
diff --git a/www/core/components/sidemenu/lang/tr.json b/www/core/components/sidemenu/lang/tr.json
index 57800da7afa..ace500a4db3 100644
--- a/www/core/components/sidemenu/lang/tr.json
+++ b/www/core/components/sidemenu/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "changesite": "Çıkış",
     "help": "Yardım",
-    "logout": "Çıkış",
+    "logout": "Çıkış yap",
     "mycourses": "Derslerim",
     "website": "Websitesi"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/zh-cn.json b/www/core/components/sidemenu/lang/zh-cn.json
index ce1e1892a81..045f90c1630 100644
--- a/www/core/components/sidemenu/lang/zh-cn.json
+++ b/www/core/components/sidemenu/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "changesite": "注销",
     "help": "帮助",
-    "logout": "登出",
+    "logout": "退出",
     "mycourses": "我的课程",
     "website": "网站"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/zh-tw.json b/www/core/components/sidemenu/lang/zh-tw.json
index ae2600bd818..e157aab2b0e 100644
--- a/www/core/components/sidemenu/lang/zh-tw.json
+++ b/www/core/components/sidemenu/lang/zh-tw.json
@@ -1,7 +1,7 @@
 {
     "appsettings": "應用程式設定",
     "changesite": "更換網站",
-    "help": "幫助",
+    "help": "輔助說明",
     "logout": "登出",
     "mycourses": "我的課程",
     "togglemenu": "切換功能選單",
diff --git a/www/core/components/user/lang/ar.json b/www/core/components/user/lang/ar.json
index de04c688c6f..ee88dd1fe2f 100644
--- a/www/core/components/user/lang/ar.json
+++ b/www/core/components/user/lang/ar.json
@@ -3,10 +3,10 @@
     "city": "المدينة/البلدة",
     "contact": "جهة اتصال",
     "country": "الدولة",
-    "description": "وصف",
+    "description": "الوصف",
     "details": "تفاصيل متابعة اسكو",
     "editingteacher": "معلم",
-    "email": "بريد الإلكتروني",
+    "email": "عنوان البريد الإلكتروني",
     "emailagain": "إعادة إدخال البريد الإلكتروني للتأكيد ",
     "firstname": "الاسم الأول",
     "interests": "اهتمامات",
diff --git a/www/core/components/user/lang/bg.json b/www/core/components/user/lang/bg.json
index 022f6afb2b1..70d1e6ca5f5 100644
--- a/www/core/components/user/lang/bg.json
+++ b/www/core/components/user/lang/bg.json
@@ -3,11 +3,11 @@
     "city": "Град/село",
     "contact": "Контакт",
     "country": "Държава",
-    "description": "Описание",
+    "description": "Въвеждащ текст",
     "details": "Подробности",
     "detailsnotavailable": "Детайлите за този потребител не са достъпни за Вас.",
     "editingteacher": "Учител",
-    "email": "Имейл",
+    "email": "Имейл адрес",
     "emailagain": "Имейл адрес (отново)",
     "firstname": "Име",
     "interests": "Интереси",
diff --git a/www/core/components/user/lang/ca.json b/www/core/components/user/lang/ca.json
index a556ba985d1..bd8812b1d47 100644
--- a/www/core/components/user/lang/ca.json
+++ b/www/core/components/user/lang/ca.json
@@ -7,7 +7,7 @@
     "details": "Detalls de seguiment",
     "detailsnotavailable": "No tens accés als detalls d'aquest usuari.",
     "editingteacher": "Professor",
-    "email": "Correu electrònic",
+    "email": "Adreça electrònica",
     "emailagain": "Correu electrònic (una altra vegada)",
     "firstname": "Nom",
     "interests": "Interessos",
diff --git a/www/core/components/user/lang/cs.json b/www/core/components/user/lang/cs.json
index 5533c565060..4b3ef8e2de8 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -3,11 +3,11 @@
     "city": "Město/obec",
     "contact": "Kontakt",
     "country": "Země",
-    "description": "Popis",
+    "description": "Úvodní text",
     "details": "Podrobnosti o průchodu",
     "detailsnotavailable": "Podrobnosti o tomto uživateli nejsou k dispozici.",
     "editingteacher": "Učitel",
-    "email": "Poslat e-mailem",
+    "email": "E-mailová adresa",
     "emailagain": "E-mail (znovu)",
     "firstname": "Křestní jméno",
     "interests": "Zájmy",
diff --git a/www/core/components/user/lang/da.json b/www/core/components/user/lang/da.json
index d93cd682bd8..b55d48a20e1 100644
--- a/www/core/components/user/lang/da.json
+++ b/www/core/components/user/lang/da.json
@@ -3,11 +3,11 @@
     "city": "By",
     "contact": "Kontakt",
     "country": "Land",
-    "description": "Beskrivelse",
+    "description": "Introduktionstekst",
     "details": "Følg detaljer",
     "detailsnotavailable": "Denne brugers data er ikke tilgængelige for dig.",
     "editingteacher": "Lærer",
-    "email": "E-mail",
+    "email": "E-mailadresse",
     "emailagain": "E-mail (igen)",
     "firstname": "Fornavn",
     "interests": "Interesser",
diff --git a/www/core/components/user/lang/de.json b/www/core/components/user/lang/de.json
index 9d95a7c6312..61b5c8461a3 100644
--- a/www/core/components/user/lang/de.json
+++ b/www/core/components/user/lang/de.json
@@ -7,7 +7,7 @@
     "details": "Trackingdetails",
     "detailsnotavailable": "Die Nutzerdetails zu dieser Person sind für Sie nicht verfügbar.",
     "editingteacher": "Trainer/in",
-    "email": "E-Mail",
+    "email": "E-Mail-Adresse",
     "emailagain": "E-Mail (wiederholen)",
     "firstname": "Vorname",
     "interests": "Persönliche Interessen",
diff --git a/www/core/components/user/lang/el.json b/www/core/components/user/lang/el.json
index db5d645b8d7..f041ebc81a0 100644
--- a/www/core/components/user/lang/el.json
+++ b/www/core/components/user/lang/el.json
@@ -2,9 +2,9 @@
     "address": "Διεύθυνση",
     "city": "Πόλη/χωριό",
     "country": "Χώρα",
-    "description": "Περιγραφή",
+    "description": "Κείμενο εισαγωγής",
     "details": "Παρακολούθηση λεπτομερειών",
-    "email": "Ηλεκτρονικό Ταχυδρομείο",
+    "email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
     "emailagain": "Email (ξανά)",
     "firstname": "Όνομα",
     "interests": "Ενδιαφέροντα",
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index dabd4a46d5b..fd683749142 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -3,11 +3,11 @@
     "city": "Ciudad",
     "contact": "Contacto",
     "country": "País",
-    "description": "Descripción",
+    "description": "Descripción -",
     "details": "Detalles del seguimiento",
     "detailsnotavailable": "Los detalles de este usuario no están disponibles para Usted.",
     "editingteacher": "Profesor",
-    "email": "Email",
+    "email": "Dirección Email",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
diff --git a/www/core/components/user/lang/es.json b/www/core/components/user/lang/es.json
index 74417c8296b..cad461766a5 100644
--- a/www/core/components/user/lang/es.json
+++ b/www/core/components/user/lang/es.json
@@ -7,7 +7,7 @@
     "details": "Detalles del rastreo SCO",
     "detailsnotavailable": "No tiene acceso a los detalles de este usuario.",
     "editingteacher": "Profesor",
-    "email": "Email",
+    "email": "Dirección de correo",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
diff --git a/www/core/components/user/lang/eu.json b/www/core/components/user/lang/eu.json
index 035cbdedc80..fdd67c44d0c 100644
--- a/www/core/components/user/lang/eu.json
+++ b/www/core/components/user/lang/eu.json
@@ -7,7 +7,7 @@
     "details": "Pistaren zehaztasunak",
     "detailsnotavailable": "Erabiltzaile honen xehetasunak ez daude zuretzat eskuragarri",
     "editingteacher": "Irakaslea",
-    "email": "E-posta",
+    "email": "E-posta helbidea",
     "emailagain": "E-posta (berriro)",
     "firstname": "Izena",
     "interests": "Interesguneak",
diff --git a/www/core/components/user/lang/fa.json b/www/core/components/user/lang/fa.json
index 9980ecf4e7f..01b490f7522 100644
--- a/www/core/components/user/lang/fa.json
+++ b/www/core/components/user/lang/fa.json
@@ -3,9 +3,9 @@
     "city": "شهر/شهرک",
     "contact": "تماس",
     "country": "کشور",
-    "description": "توصیف",
+    "description": "توضیح تکلیف",
     "details": "دنبال کردن جزئیات",
-    "email": "پست الکترونیک",
+    "email": "آدرس پست الکترونیک",
     "emailagain": "پست الکترونیک (دوباره)",
     "firstname": "نام",
     "interests": "علایق",
diff --git a/www/core/components/user/lang/fr.json b/www/core/components/user/lang/fr.json
index 06e5d47b78d..02e9c95bc9f 100644
--- a/www/core/components/user/lang/fr.json
+++ b/www/core/components/user/lang/fr.json
@@ -7,7 +7,7 @@
     "details": "Détails du parcours",
     "detailsnotavailable": "Vous n'avez pas accès aux informations de cet utilisateur.",
     "editingteacher": "Enseignant",
-    "email": "Courriel",
+    "email": "Adresse de courriel",
     "emailagain": "Courriel (confirmation)",
     "firstname": "Prénom",
     "interests": "Centres d'intérêt",
diff --git a/www/core/components/user/lang/he.json b/www/core/components/user/lang/he.json
index 41bc9822a7b..a4891acf920 100644
--- a/www/core/components/user/lang/he.json
+++ b/www/core/components/user/lang/he.json
@@ -3,11 +3,11 @@
     "city": "ישוב",
     "contact": "ליצירת קשר",
     "country": "ארץ",
-    "description": "תאור",
+    "description": "תיאור",
     "details": "דוח המעקב מפורט",
     "detailsnotavailable": "פרטי משתמש זה אינם זמינים לך.",
     "editingteacher": "מרצה",
-    "email": "דוא\"ל",
+    "email": "כתובת דואר אלקטרוני",
     "emailagain": "דואר אלקטרוני (שוב)",
     "firstname": "שם פרטי",
     "interests": "תחומי עניין",
diff --git a/www/core/components/user/lang/hu.json b/www/core/components/user/lang/hu.json
index ea3235ea2d0..de2880aacb9 100644
--- a/www/core/components/user/lang/hu.json
+++ b/www/core/components/user/lang/hu.json
@@ -3,9 +3,9 @@
     "city": "Helység",
     "contact": "Kapcsolat",
     "country": "Ország",
-    "description": "Leírás",
+    "description": "Bevezető szöveg",
     "details": "SCO nyomon követésének részletei",
-    "email": "E-mail",
+    "email": "E-mail cím",
     "emailagain": "E-mail (ismét)",
     "firstname": "Keresztnév",
     "interests": "Érdeklődési kör",
diff --git a/www/core/components/user/lang/it.json b/www/core/components/user/lang/it.json
index 9aa43cad4d0..d580362d257 100644
--- a/www/core/components/user/lang/it.json
+++ b/www/core/components/user/lang/it.json
@@ -3,11 +3,11 @@
     "city": "Città /Località",
     "contact": "Contatto",
     "country": "Nazione",
-    "description": "Descrizione",
+    "description": "Commento",
     "details": "Dettagli tracciamento",
     "detailsnotavailable": "Non puoi visualizzare i dettagli di questo utente.",
     "editingteacher": "Docente",
-    "email": "Email",
+    "email": "Indirizzo email",
     "emailagain": "Indirizzo email (ripeti)",
     "firstname": "Nome",
     "interests": "Interessi",
diff --git a/www/core/components/user/lang/ja.json b/www/core/components/user/lang/ja.json
index a07f54c15b6..ed89cc07550 100644
--- a/www/core/components/user/lang/ja.json
+++ b/www/core/components/user/lang/ja.json
@@ -5,7 +5,7 @@
     "country": "国",
     "description": "説明",
     "details": "トラック詳細",
-    "email": "メール",
+    "email": "メールアドレス",
     "emailagain": "メールアドレス (もう一度)",
     "firstname": "名",
     "interests": "興味のあること",
diff --git a/www/core/components/user/lang/lt.json b/www/core/components/user/lang/lt.json
index 2728c689594..0e625c59317 100644
--- a/www/core/components/user/lang/lt.json
+++ b/www/core/components/user/lang/lt.json
@@ -3,11 +3,11 @@
     "city": "Miestas / miestelis",
     "contact": "Kontaktas",
     "country": "Šalis",
-    "description": "Aprašymas",
+    "description": "Aprašas",
     "details": "Sekimo išsami informacija",
     "detailsnotavailable": "Šio vartotojo duomenys jums nepasiekiami.",
     "editingteacher": "Dėstytojas",
-    "email": "El. laiškas",
+    "email": "El. pašto adresas",
     "emailagain": "El. paštas (dar kartą)",
     "firstname": "Vardas",
     "interests": "Pomėgiai",
diff --git a/www/core/components/user/lang/nl.json b/www/core/components/user/lang/nl.json
index 040c2592de8..243c341d715 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -3,11 +3,11 @@
     "city": "Plaats",
     "contact": "Contact",
     "country": "Land",
-    "description": "Beschrijving",
+    "description": "Inleidende tekst",
     "details": "SCO opvolgdetails",
     "detailsnotavailable": "Je kunt de details voor deze gebruiker niet bekijken.",
     "editingteacher": "Leraar",
-    "email": "E-mail",
+    "email": "E-mailadres",
     "emailagain": "E-mail (nogmaals)",
     "firstname": "Voornaam",
     "interests": "Interesses",
diff --git a/www/core/components/user/lang/pl.json b/www/core/components/user/lang/pl.json
index e81808a5344..36dbf206198 100644
--- a/www/core/components/user/lang/pl.json
+++ b/www/core/components/user/lang/pl.json
@@ -3,9 +3,9 @@
     "city": "Miasto",
     "contact": "Połącz",
     "country": "Kraj",
-    "description": "Opis",
+    "description": "Wstęp",
     "details": "Szczegóły ścieżki",
-    "email": "e-mail",
+    "email": "E-mail",
     "emailagain": "E-mail (jeszcze raz)",
     "firstname": "Imię",
     "interests": "Zainteresowania",
diff --git a/www/core/components/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index e212093a063..60e6f639acc 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -3,11 +3,11 @@
     "city": "Cidade/Município",
     "contact": "Contato",
     "country": "País",
-    "description": "Descrição",
+    "description": "Texto do link",
     "details": "Detalhes do registro",
     "detailsnotavailable": "Os detalhes desse usuário não estão disponíveis para você.",
     "editingteacher": "Professor",
-    "email": "Email",
+    "email": "Endereço de email",
     "emailagain": "Confirmar endereço de e-mail",
     "firstname": "Nome",
     "interests": "Interesses",
diff --git a/www/core/components/user/lang/pt.json b/www/core/components/user/lang/pt.json
index 7b0f3e6910f..15d388181e8 100644
--- a/www/core/components/user/lang/pt.json
+++ b/www/core/components/user/lang/pt.json
@@ -7,7 +7,7 @@
     "details": "Detalhe do percurso",
     "detailsnotavailable": "Não tem acesso aos detalhes deste utilizador.",
     "editingteacher": "Professor",
-    "email": "E-mail",
+    "email": "Endereço de e-mail",
     "emailagain": "E-mail (novamente)",
     "firstname": "Nome",
     "interests": "Interesses",
diff --git a/www/core/components/user/lang/ro.json b/www/core/components/user/lang/ro.json
index b6929b4f310..540dd4306bd 100644
--- a/www/core/components/user/lang/ro.json
+++ b/www/core/components/user/lang/ro.json
@@ -3,11 +3,11 @@
     "city": "Oraş/localitate",
     "contact": "Contact",
     "country": "Ţara",
-    "description": "Descriere",
+    "description": "Text introductiv",
     "details": "Detalii înregistrare activitate",
     "detailsnotavailable": "Detaliile acestui utilizator nu vă sunt disponibile.",
     "editingteacher": "Profesor",
-    "email": "Email",
+    "email": "Adresă email",
     "emailagain": "Email (reintroduceţi)",
     "firstname": "Prenume",
     "interests": "Interese",
diff --git a/www/core/components/user/lang/ru.json b/www/core/components/user/lang/ru.json
index eec8fc8030f..ad86bd38324 100644
--- a/www/core/components/user/lang/ru.json
+++ b/www/core/components/user/lang/ru.json
@@ -3,11 +3,11 @@
     "city": "Город",
     "contact": "Контакты",
     "country": "Страна",
-    "description": "Описание",
+    "description": "Вступление",
     "details": "Подробный отчет",
     "detailsnotavailable": "Вам не доступны подробности этого пользователя",
     "editingteacher": "Учитель",
-    "email": "Email",
+    "email": "Адрес электронной почты",
     "emailagain": "Адрес электронной почты (еще раз)",
     "firstname": "Имя",
     "interests": "Интересы",
diff --git a/www/core/components/user/lang/sv.json b/www/core/components/user/lang/sv.json
index 94ca7299b23..466d0309625 100644
--- a/www/core/components/user/lang/sv.json
+++ b/www/core/components/user/lang/sv.json
@@ -3,11 +3,11 @@
     "city": "Stad/ort",
     "contact": "Kontakt",
     "country": "Land",
-    "description": "Beskrivning",
+    "description": "Introduktion",
     "details": "Detaljerad SCO spårning",
     "detailsnotavailable": "Detaljerna till denna användare är inte tillgängliga för dig.",
     "editingteacher": "Lärare",
-    "email": "E-post",
+    "email": "E-postadress",
     "emailagain": "E-post (igen)",
     "firstname": "Förnamn",
     "interests": "Intressen",
diff --git a/www/core/components/user/lang/tr.json b/www/core/components/user/lang/tr.json
index 0415b166cdc..389fb99d0de 100644
--- a/www/core/components/user/lang/tr.json
+++ b/www/core/components/user/lang/tr.json
@@ -3,10 +3,10 @@
     "city": "Şehir",
     "contact": "İletişim",
     "country": "Ülke",
-    "description": "Açıklama",
+    "description": "Tanıtım metni",
     "details": "İzleme ayrıntıları",
     "editingteacher": "Öğretmen",
-    "email": "E-posta",
+    "email": "E-posta adresi",
     "emailagain": "E-posta (tekrar)",
     "firstname": "Adı",
     "interests": "İlgi alanları",
diff --git a/www/core/components/user/lang/uk.json b/www/core/components/user/lang/uk.json
index 94b6b0bd9ad..9cfc5311ef1 100644
--- a/www/core/components/user/lang/uk.json
+++ b/www/core/components/user/lang/uk.json
@@ -3,11 +3,11 @@
     "city": "Місто",
     "contact": "Контакт",
     "country": "Країна",
-    "description": "Опис",
+    "description": "Текст вступу",
     "details": "Деталі запису",
     "detailsnotavailable": "Деталі цього користувача вам не доступні",
     "editingteacher": "Вчитель",
-    "email": "Ел.пошта",
+    "email": "Електронна пошта",
     "emailagain": "Електронна пошта (повторно)",
     "firstname": "Ім'я",
     "interests": "Інтереси",
diff --git a/www/core/components/user/lang/zh-cn.json b/www/core/components/user/lang/zh-cn.json
index f1e99807e98..5e224eca7d5 100644
--- a/www/core/components/user/lang/zh-cn.json
+++ b/www/core/components/user/lang/zh-cn.json
@@ -3,9 +3,9 @@
     "city": "市/县",
     "contact": "联系",
     "country": "国家和地区",
-    "description": "描述",
+    "description": "简要描述",
     "details": "查看详情",
-    "email": "Email",
+    "email": "Email地址",
     "emailagain": "Email (重复)",
     "firstname": "名",
     "interests": "兴趣",
diff --git a/www/core/components/user/lang/zh-tw.json b/www/core/components/user/lang/zh-tw.json
index bb119de2d5b..dff84e77a2e 100644
--- a/www/core/components/user/lang/zh-tw.json
+++ b/www/core/components/user/lang/zh-tw.json
@@ -3,11 +3,11 @@
     "city": "縣/市",
     "contact": "聯絡",
     "country": "國家",
-    "description": "說明",
+    "description": "簡介文字",
     "details": "SCO 追蹤細節",
     "detailsnotavailable": "這個使用者的詳細資料無法提供給您",
     "editingteacher": "教師",
-    "email": "電子郵件",
+    "email": "電子郵件信箱",
     "emailagain": "電子郵件(再次確認)",
     "firstname": "名字",
     "interests": "興趣",
diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index 6930c3aed5e..a16f56062b9 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "كل المشاركين",
     "areyousure": "هل انت متأكد؟",
-    "back": "العودة لمعاينة السؤال",
-    "cancel": "ألغي",
+    "back": "العودة",
+    "cancel": "إلغاء",
     "cannotconnect": "لا يمكن الاتصال: تحقق من أنك كتبت عنوان URL بشكل صحيح وأنك تستخدم موقع موودل 2.4 أو أحدث.",
-    "category": "فئة",
+    "category": "التصنيف",
     "choose": "اختر",
     "choosedots": "اختر...",
     "clicktohideshow": "انقر للطي أو التوسيع",
-    "close": "أغلاق النافذه",
-    "comments": "تعليقات",
+    "close": "أغلق",
+    "comments": "تعليقاتك",
     "commentscount": "التعليقات ({{$a}})",
     "completion-alt-auto-fail": "مكتمل (لم تحقق درحة النجاح)",
     "completion-alt-auto-n": "غير مكتمل",
@@ -27,12 +27,12 @@
     "decsep": ".",
     "delete": "حذف",
     "deleting": "حذف",
-    "description": "وصف",
+    "description": "الوصف",
     "done": "تم",
-    "download": "تنزيل",
+    "download": "تحميل",
     "downloading": "يتم التنزيل",
-    "edit": "تحرير",
-    "error": "حصل خطاء",
+    "edit": "حرر",
+    "error": "خطاء",
     "errordownloading": "خطأ عن تنزيل الملف",
     "filename": "اسم الملف",
     "folder": "مجلد",
@@ -52,7 +52,7 @@
     "loading": "يتم التحميل",
     "lostconnection": "فقدنا الاتصال تحتاج إلى إعادة الاتصال. المميز الخاص بك هو الآن غير صالح",
     "maxsizeandattachments": "الحجم الأقصى للملفات الجديدة: {{$a.size}}, أقصى عدد للمرفقات: {{$a.attachments}}",
-    "min": "الأدنى",
+    "min": "الحد الأدنى",
     "mins": "دقائق",
     "mod_assign": "مهمة",
     "mod_assignment": "مهمة",
@@ -77,14 +77,14 @@
     "mod_workshop": "ورشة عمل",
     "moduleintro": "وصف",
     "mygroups": "مجموعاتي",
-    "name": "اسم",
+    "name": "الاسم",
     "networkerrormsg": "لم يتم تمكين الشبكة أو أنها لا تعمل.",
     "never": "مطلقاً",
-    "next": "استمر",
+    "next": "التالي",
     "no": "لا",
     "nocomments": "لا يوجد تعليقات",
     "nograde": "لا توجد درجة",
-    "none": "لا شئ",
+    "none": "لا يوجد",
     "nopasswordchangeforced": "لا يمكنك الاستمرار دون تغيير كلمة مرورك، لكن يبدو أنه لا يوجد صفحة متوفرة لتغييرها. رجاءً قم بالاتصال بمدير مودل.",
     "nopermissions": "عذراً ولكنك لا تملك حالياً الصلاحيات لتقوم بهذا ({{$a}})",
     "noresults": "لا توجد نتائج",
@@ -97,31 +97,31 @@
     "pagea": "صفحة {{$a}}",
     "phone": "هاتف",
     "pictureof": "صورة {{$a}}",
-    "previous": "الوضع السابق",
+    "previous": "السابق",
     "pulltorefresh": "اسحب للأسفل ليتم التحديث",
-    "refresh": "تنشيط",
-    "required": "مطلوب",
+    "refresh": "تحديث",
+    "required": "مفروض",
     "save": "حفظ",
     "search": "بحث",
-    "searching": "البحث في",
+    "searching": "بحث في",
     "searchresults": "نتائج البحث",
     "sec": "ثانية",
     "secs": "ثواني",
     "seemoredetail": "اضغط هنا لترى تفاصيل أكثر",
-    "send": "إرسال",
+    "send": "إرسل",
     "sending": "يتم الإرسال",
     "serverconnection": "خطأ في الاتصال بالخادم",
-    "show": "عرض",
+    "show": "اظهر",
     "site": "الموقع",
     "sizeb": "بايتز",
     "sizegb": "غيغابايت",
     "sizekb": "كيلو بايت",
     "sizemb": "ميغا بايب",
     "start": "إبداء",
-    "submit": "سلم/قدم",
+    "submit": "سلم",
     "success": "نجاح",
     "teachers": "معلمون",
-    "time": "الوقت",
+    "time": "وقت",
     "timesup": "انتهى الوقت!",
     "today": "اليوم",
     "unexpectederror": "خطأ غير متوقع. الرجاء الإغلاق وإعادة فتح التطبيق للمحاولة مرة أخرى",
@@ -131,7 +131,7 @@
     "userdeleted": "تم حذف اشتراك هذا المستخدم",
     "userdetails": "تفاصيل المستخدم",
     "users": "المستخدمون",
-    "view": "استعراض",
+    "view": "معاينه",
     "viewprofile": "عرض الحساب",
     "year": "سنة",
     "years": "سنوات",
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index 726d0d85ddc..1365af87752 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Всички участници",
     "areyousure": "Сигурни ли сте?",
-    "back": "Обратно към преглед на въпрос",
+    "back": "Обратно",
     "cancel": "Отказване",
     "cannotconnect": "Не става свързване: Проверете дали написахте правилно адреса и дали сайтът използва Moodle версия 2.4 или по-нова.",
     "category": "Категория",
@@ -9,8 +9,8 @@
     "choosedots": "Изберете...",
     "clearsearch": "Изчисти търсенето",
     "clicktohideshow": "Кликнете за да разгънете или свиете ",
-    "close": "Затваряне на прозореца",
-    "comments": "Коментари",
+    "close": "Затваряне",
+    "comments": "Ваши коментари",
     "commentscount": "Коментари ({{$a}})",
     "completion-alt-manual-n": "Не е завършена дейността: {{$a}}. Изберете я за да я отбележите за завършена.",
     "completion-alt-manual-y": "Завършена е дейността: {{$a}}. Изберете я за да я отбележите за незавършена.",
@@ -21,16 +21,16 @@
     "coursedetails": "Информация за курсове",
     "date": "Дата",
     "day": "ден",
-    "days": "Дена",
+    "days": "дни",
     "decsep": ",",
     "delete": "Изтриване",
     "deleting": "Изтриване",
-    "description": "Описание",
+    "description": "Въвеждащ текст",
     "done": "Извършено",
-    "download": "Щракнете за да изтеглите експортирания файл с категории",
+    "download": "Изтегляне",
     "downloading": "Изтегляне",
     "edit": "Редактиране",
-    "error": "Възникна непозната грешка!",
+    "error": "Грешка",
     "errordownloading": "Грешка при теглене на файл",
     "filename": "Име на файл",
     "folder": "Папка",
@@ -49,7 +49,7 @@
     "loading": "Зареждане",
     "lostconnection": "Изгубихме връзка и трябва да се свържете отново. Вашият ключ сега е невалиден.",
     "maxsizeandattachments": "Максимален размер за нови файлове: {{$a.size}}, максимален брой файлове: {{$a.attachments}}",
-    "min": "Най-ниска",
+    "min": "мин",
     "mins": "мин.",
     "mod_assign": "Задание",
     "mod_assignment": "Задание",
@@ -80,11 +80,11 @@
     "name": "Име",
     "networkerrormsg": "Мрежата не е разрешена или не работи",
     "never": "Никога",
-    "next": "Продължаване",
+    "next": "Още",
     "no": "Не",
     "nocomments": "Няма коментари",
-    "nograde": "Няма оценка.",
-    "none": "Без",
+    "nograde": "Без оценка",
+    "none": "Нищо",
     "nopasswordchangeforced": "Не можете да продължите без да се променили паролата, обаче няма налична страница за промяната и. Моля, свържете се с Вашия Moodle администратор.",
     "nopermissions": "За съжаление Вие нямате право да правите това  ({{$a}})",
     "noresults": "Няма резултати",
@@ -92,24 +92,24 @@
     "notice": "Съобщене",
     "now": "сега",
     "numwords": "{{$a}} думи",
-    "offline": "Офлайн",
+    "offline": "Не се изисква предаване онлайн",
     "online": "Онлайн",
     "phone": "Телефон",
     "pictureof": "Снимка на {{$a}}",
-    "previous": "Предишно състояние",
+    "previous": "Обратно",
     "pulltorefresh": "",
     "refresh": "Опресняване",
-    "required": "Задължителен",
-    "save": "Запис",
+    "required": "Задължително",
+    "save": "Запазване",
     "search": "Търсене",
-    "searching": "Търсене в ...",
+    "searching": "Търсене в",
     "searchresults": "Резултати от търсенето",
     "sec": "сек.",
     "secs": "сек.",
     "seemoredetail": "Щракнете тук за повече подробности",
-    "send": "Изпращане",
+    "send": "изпращане",
     "sending": "Изпраща се",
-    "show": "Показване",
+    "show": "Да се вижда",
     "site": "Сайт",
     "sizeb": "байта",
     "sizegb": "GB",
@@ -117,7 +117,7 @@
     "sizemb": "MB",
     "sizetb": "ТБ",
     "start": "Започване",
-    "submit": "Изпращане",
+    "submit": "Изпълняване",
     "success": "Успешно",
     "time": "Време",
     "timesup": "Времето изтече!",
@@ -128,7 +128,7 @@
     "userdeleted": "Тази потребителска регистрация е изтрита",
     "userdetails": "Информация за потребителя",
     "users": "Потребители",
-    "view": "Изглед",
+    "view": "Преглед",
     "viewprofile": "Разглеждане на профила",
     "whoops": "Опс!",
     "years": "години",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index afc3322e39b..3d186eee90f 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -3,7 +3,7 @@
     "allparticipants": "Tots els participants",
     "android": "Android",
     "areyousure": "Segur que voleu tirar endavant aquesta acció?",
-    "back": "Torna a la previsualització de la pregunta",
+    "back": "Enrere",
     "cancel": "Cancel·la",
     "cannotconnect": "No s'ha pogut connectar: Comproveu que l'URL és correcte i que el lloc Moodle utilitza la versió 2.4 o posterior.",
     "cannotdownloadfiles": "La descàrrega d'arxius està deshabilitada al vostre servei Mobile. Contacteu amb l'administrador.",
@@ -13,9 +13,9 @@
     "clearsearch": "Neteja la cerca",
     "clicktohideshow": "Feu clic per ampliar o reduir",
     "clicktoseefull": "Cliqueu per veure el contingut complet.",
-    "close": "Tanca finestra",
+    "close": "Tanca",
     "comments": "Comentaris",
-    "commentscount": "Comentaris  ({{$a}})",
+    "commentscount": "Comentaris ({{$a}})",
     "commentsnotworking": "No s'han pogut recuperar els comentaris",
     "completion-alt-auto-fail": "Completat: {{$a}} (no han aconseguit assolir la qualificació)",
     "completion-alt-auto-n": "Incomplet: {{$a}}",
@@ -36,8 +36,8 @@
     "currentdevice": "Dispositiu actual",
     "datastoredoffline": "S'han desat les dades al dispositiu perquè no s'han pogut enviar. S'enviaran de manera automàtica més tard.",
     "date": "Data",
-    "day": "Dia (dies)",
-    "days": "Dies",
+    "day": "dia",
+    "days": "dies",
     "decsep": ",",
     "delete": "Suprimeix",
     "deleting": "S'està suprimint",
@@ -51,11 +51,11 @@
     "discard": "Descarta",
     "dismiss": "Ignora",
     "done": "Fet",
-    "download": "Feu clic per baixar el fitxer de categoria exportat",
+    "download": "Baixa",
     "downloading": "S'està descarregant",
     "edit": "Edita",
     "emptysplit": "Aquesta pàgina estarà buida si el panell esquerre està buit o s'està carregant.",
-    "error": "Ha succeït un error desconegut!",
+    "error": "Error",
     "errorchangecompletion": "S'ha produït un error en carregar l'estat de la compleció. Si us plau torneu a intentar-ho.",
     "errordeletefile": "S'ha produït un error en eliminar el fitxer. Torneu-ho a provar més tard.",
     "errordownloading": "S'ha produït un error en baixar el fitxer.",
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imatge",
     "imageviewer": "Visor d'imatges",
-    "info": "Informació",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Darrera modificació",
@@ -96,7 +96,7 @@
     "loadmore": "Carrega'n més",
     "lostconnection": "S'ha perdut la connexió. Necessita tornar a connectar. El testimoni ja no és vàlid.",
     "maxsizeandattachments": "Mida màxima per als nous fitxers, {{$a.size}}, adjunts màxims: {{$a.attachments}}",
-    "min": "La més baixa",
+    "min": "minut",
     "mins": "minuts",
     "mod_assign": "Tasca",
     "mod_assignment": "Tasca",
@@ -126,13 +126,13 @@
     "mod_workshop": "Taller",
     "moduleintro": "Descripció",
     "mygroups": "Els meus grups",
-    "name": "Títol",
+    "name": "Nom",
     "networkerrormsg": "La connexió a la xarxa no està habilitada o no funciona.",
     "never": "Mai",
-    "next": "Continua",
+    "next": "Següent",
     "no": "No",
-    "nocomments": "No hi ha comentaris",
-    "nograde": "No hi ha qualificació.",
+    "nocomments": "Sense comentaris",
+    "nograde": "Sense qualificació",
     "none": "Cap",
     "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya, però no està disponible cap pàgina on pugueu canviar-la. Contacteu amb l'administració del vostre Moodle.",
     "nopermissions": "Actualment no teniu permisos per a fer això ({{$a}})",
@@ -142,7 +142,7 @@
     "notsent": "No enviat",
     "now": "ara",
     "numwords": "{{$a}} paraules",
-    "offline": "Fora de línia",
+    "offline": "No es requereix cap tramesa en línia",
     "online": "En línia",
     "openfullimage": "Feu clic per veure la imatge a tamany complert",
     "openinbrowser": "Obre-ho al navegador",
@@ -151,24 +151,24 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telèfon",
     "pictureof": "Imatge {{$a}}",
-    "previous": "Estat anterior",
+    "previous": "Anterior",
     "pulltorefresh": "Estira per actualitzar",
     "redirectingtosite": "Sereu redireccionats al lloc web.",
     "refresh": "Refresca",
-    "required": "Requerit",
+    "required": "Necessari",
     "requireduserdatamissing": "En aquest perfil d'usuari hi manquen dades requerides. Si us plau ompliu aquestes dades i torneu a intentar-ho.<br>{{$a}}",
     "retry": "Reintenta",
     "save": "Desa",
-    "search": "Cerca...",
-    "searching": "S'està cercant en...",
+    "search": "Cerca",
+    "searching": "Cerca a",
     "searchresults": "Resultats de la cerca",
     "sec": "segon",
     "secs": "segons",
     "seemoredetail": "Feu clic aquí per veure més detalls",
-    "send": "Envia",
+    "send": "envia",
     "sending": "S'està enviant",
     "serverconnection": "S'ha produït un error de connexió amb el servidor",
-    "show": "Mostra",
+    "show": "Mostrar",
     "showmore": "Mostra'n més...",
     "site": "Lloc",
     "sitemaintenance": "S'estan executant tasques de manteniment i el lloc no està disponible",
@@ -179,12 +179,12 @@
     "sizetb": "TB",
     "sorry": "Ho sentim...",
     "start": "Inicia",
-    "submit": "Envia",
+    "submit": "Tramet",
     "success": "Èxit",
     "tablet": "Tablet",
     "teachers": "Professors",
     "thereisdatatosync": "Hi ha {{$a}} fora de línia per sincronitzar.",
-    "time": "Temps",
+    "time": "Hora",
     "timesup": "Temps esgotat",
     "today": "Avui",
     "tryagain": "Torna-ho a provar",
@@ -200,14 +200,14 @@
     "userdeleted": "S'ha suprimit aquest compte d'usuari",
     "userdetails": "Més detall",
     "users": "Usuaris",
-    "view": "Mostra",
+    "view": "Visualització",
     "viewprofile": "Mostra el perfil",
     "warningofflinedatadeleted": "Les dades fora de línia de {{component}} «{{name}}» s'han eliminat. {{error}}",
     "whoops": "Ui!",
     "whyisthishappening": "I això per què passa?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La funció de webservice no està disponible.",
-    "year": "Any(s)",
+    "year": "any",
     "years": "anys",
     "yes": "Sí"
 }
\ No newline at end of file
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index 84139b952b3..d30a5c8340f 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -3,8 +3,8 @@
     "allparticipants": "Všichni účastníci",
     "android": "Android",
     "areyousure": "Opravdu?",
-    "back": "Zpět k náhledu úlohy",
-    "cancel": "Zrušit",
+    "back": "Zpět",
+    "cancel": "Přerušit",
     "cannotconnect": "Nelze se připojit: Ověřte, zda je zadali správně adresu URL a že používáte Moodle 2.4 nebo novější.",
     "cannotdownloadfiles": "Stahování souborů je vypnuto v Mobilních službách webu. Prosím, obraťte se na správce webu.",
     "category": "Kategorie",
@@ -13,8 +13,8 @@
     "clearsearch": "Vymazat vyhledávání",
     "clicktohideshow": "Klikněte pro rozbalení nebo sbalení",
     "clicktoseefull": "Kliknutím zobrazit celý obsah.",
-    "close": "Zavřít okno",
-    "comments": "Komentáře",
+    "close": "Zavřít",
+    "comments": "Váš komentář",
     "commentscount": "Komentáře ({{$a}})",
     "commentsnotworking": "Komentáře nemohou být obnoveny",
     "completion-alt-auto-fail": "Splněno: {{$a}} (nebylo dosaženo požadované známky)",
@@ -36,13 +36,13 @@
     "currentdevice": "Aktuální zařízení",
     "datastoredoffline": "Data byla uložena na zařízení, protože nemohla být odeslána. Budou odeslána automaticky později.",
     "date": "Datum",
-    "day": "Dnů",
-    "days": "Dnů",
+    "day": "den",
+    "days": "dnů",
     "decsep": ",",
     "defaultvalue": "Výchozí  ({{$a}})",
     "delete": "Odstranit",
     "deleting": "Odstraňování",
-    "description": "Popis",
+    "description": "Úvodní text",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
@@ -52,11 +52,11 @@
     "discard": "Odstranit",
     "dismiss": "Odmítnout",
     "done": "Hotovo",
-    "download": "Klikněte pro stažení exportovaného souboru",
+    "download": "Stáhnout",
     "downloading": "Stahování",
     "edit": "Upravit",
     "emptysplit": "Pokud je levý panel prázdný nebo se nahrává, zobrazí se tato stránka prázdná.",
-    "error": "Došlo k neznámé chybě!",
+    "error": "Chyba",
     "errorchangecompletion": "Při změně stavu dokončení došlo k chybě. Prosím zkuste to znovu.",
     "errordeletefile": "Chyba při odstraňování souboru. Prosím zkuste to znovu.",
     "errordownloading": "Chyba při stahování souboru",
@@ -80,24 +80,24 @@
     "groupsseparate": "Oddělené skupiny",
     "groupsvisible": "Viditelné skupiny",
     "hasdatatosync": "{{$a}} má offline data, která mají být synchronizována.",
-    "help": "Pomoc",
+    "help": "Nápověda",
     "hide": "Skrýt",
     "hour": "hodina",
     "hours": "hodin",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Obrázek",
     "imageviewer": "Prohlížeč obrázků",
-    "info": "Info",
+    "info": "Informace",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Naposledy změněno",
     "lastsync": "Poslední synchronizace",
     "listsep": ";",
-    "loading": "Nahrávám...",
+    "loading": "Nahrávání",
     "loadmore": "Načíst další",
     "lostconnection": "Ztratili jsme spojení,  potřebujete se znovu připojit. Váš token je nyní neplatný",
     "maxsizeandattachments": "Maximální velikost nových souborů: {{$a.size}}, maximální přílohy: {{$a.attachments}}",
-    "min": "Nejhorší",
+    "min": "min.",
     "mins": "min.",
     "mod_assign": "Úkol",
     "mod_assignment": "Úkol",
@@ -127,23 +127,23 @@
     "mod_workshop": "Workshop",
     "moduleintro": "Popis",
     "mygroups": "Moje skupiny",
-    "name": "Jméno",
+    "name": "Název",
     "networkerrormsg": "Síť není povolena nebo nefunguje.",
     "never": "Nikdy",
-    "next": "Pokračovat",
+    "next": "Další",
     "no": "Ne",
-    "nocomments": "Nejsou žádné komentáře",
-    "nograde": "Žádné hodnocení.",
-    "none": "Žádné",
+    "nocomments": "Bez komentářů",
+    "nograde": "Bez známky",
+    "none": "Žádný",
     "nopasswordchangeforced": "Nemůžete pokračovat dál bez změny hesla, ale stránka pro jeho změnu není k dispozici. Kontaktujte správce Vašeho eLearningu Moodle.",
     "nopermissions": "Je mi líto, ale momentálně nemáte oprávnění vykonat tuto operaci ({{$a}})",
-    "noresults": "Žádné výsledky",
+    "noresults": "Bez výsledků",
     "notapplicable": "n/a",
     "notice": "Poznámka",
     "notsent": "Neodesláno",
     "now": "nyní",
     "numwords": "{{$a}} slov",
-    "offline": "Offline",
+    "offline": "Nejsou požadovány odpovědi online",
     "online": "Online",
     "openfullimage": "Zde klikněte pro zobrazení obrázku v plné velikosti",
     "openinbrowser": "Otevřít v prohlížeči",
@@ -152,24 +152,24 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Obrázek: {{$a}}",
-    "previous": "O krok zpět",
+    "previous": "Předchozí",
     "pulltorefresh": "Stáhněte pro obnovu",
     "redirectingtosite": "Budete přesměrováni na web.",
     "refresh": "Obnovit",
-    "required": "Povinné",
+    "required": "Vyžadováno",
     "requireduserdatamissing": "Tento uživatel nemá některá požadovaná data v profilu. Prosím, vyplňte tato data v systému Moodle a zkuste to znovu. <br> {{$a}}",
     "retry": "Opakovat",
     "save": "Uložit",
-    "search": "Vyhledávání...",
-    "searching": "Vyhledávám v ...",
+    "search": "Hledat",
+    "searching": "Hledat v",
     "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
-    "send": "Odeslat",
+    "send": "odeslat",
     "sending": "Odesílání",
     "serverconnection": "Chyba spojení se serverem",
-    "show": "Ukázat",
+    "show": "Zobrazit",
     "showmore": "Zobrazit více...",
     "site": "Stránky",
     "sitemaintenance": "Na webu probíhá údržba a aktuálně není k dispozici",
@@ -202,14 +202,14 @@
     "userdetails": "Detaily uživatele",
     "usernotfullysetup": "Uživatel není plně nastaven",
     "users": "Uživatelé",
-    "view": "Zobrazení",
+    "view": "Zobrazit",
     "viewprofile": "Zobrazit profil",
     "warningofflinedatadeleted": "Offline data z {{component}} \"{{name}}\" byla odstraněna. {{error}}",
     "whoops": "Herdekfilek!",
     "whyisthishappening": "Proč se to děje?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Funkce webových služeb není k dispozici.",
-    "year": "Rok(y)",
+    "year": "rok",
     "years": "roky",
     "yes": "Ano"
 }
\ No newline at end of file
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index e1d7fef3543..847a8e2b5f1 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -3,7 +3,7 @@
     "allparticipants": "Alle deltagere",
     "android": "Android",
     "areyousure": "Er du sikker?",
-    "back": "Tilbage til spørgsmålet",
+    "back": "Tilbage",
     "cancel": "Annuller",
     "cannotconnect": "Kan ikke tilslutte: kontroller at webadressen er rigtig og at dit websted bruger Moodle 2.4 eller nyere.",
     "cannotdownloadfiles": "Download af filer er deaktiveret i din mobilservice. Kontakt dit websteds administrator.",
@@ -14,7 +14,7 @@
     "clicktohideshow": "Klik for at udvide eller folde sammen",
     "clicktoseefull": "Klik for at se alt indhold.",
     "close": "Luk",
-    "comments": "Kommentarer",
+    "comments": "Dine kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
     "completion-alt-auto-fail": "Gennemført: {{$a}} (opnåede ikke beståelseskarakter)",
     "completion-alt-auto-n": "Ikke gennemført: {{$a}}",
@@ -31,17 +31,17 @@
     "coursedetails": "Kursusdetaljer",
     "datastoredoffline": "Der blev gemt data på enheden da det ikke kunne sendes. Det vil blive sendt senere.",
     "date": "Dato",
-    "day": "Dag(e)",
-    "days": "Dage",
+    "day": "dag",
+    "days": "dage",
     "decsep": ",",
     "delete": "Slet",
     "deleting": "Sletter",
-    "description": "Beskrivelse",
+    "description": "Introduktionstekst",
     "done": "Færdig",
-    "download": "Klik for at downloade den eksporterede kategorifil",
+    "download": "Download",
     "downloading": "Downloader",
     "edit": "Rediger",
-    "error": "Der opstod en ukendt fejl!",
+    "error": "Fejl",
     "errorchangecompletion": "En fejl opstod under ændring af gennemførelsesstatus. Prøv igen.",
     "errordownloading": "Fejl ved download af fil.",
     "errordownloadingsomefiles": "Fejl ved download af modulfiler. Nogle filer mangler måske.",
@@ -62,16 +62,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Billede",
     "imageviewer": "Billedfremviser",
-    "info": "Introduktion",
+    "info": "Information",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Senest ændret",
+    "lastmodified": "Sidst ændret",
     "lastsync": "Sidste sunkronisering",
     "listsep": ";",
-    "loading": "Indlæser...",
+    "loading": "Indlæser",
     "lostconnection": "Din godkendelse er ugyldig eller udløbet, så du skal genoprette forbindelsen til webstedet.",
     "maxsizeandattachments": "Maksimal størrelse på nye filer: {{$a.size}}, højeste antal bilag: {{$a.attachments}}",
-    "min": "Laveste",
+    "min": "min.",
     "mins": "min.",
     "mod_assign": "Opgave",
     "mod_assignment": "Opgave",
@@ -103,10 +103,10 @@
     "name": "Navn",
     "networkerrormsg": "Netværk ikke aktiveret eller virker ikke.",
     "never": "Aldrig",
-    "next": "Fortsæt",
+    "next": "Næste",
     "no": "Nej",
-    "nocomments": "Der er ingen kommentarer",
-    "nograde": "Ingen bedømmelse.",
+    "nocomments": "Ingen kommentarer",
+    "nograde": "Ingen karakter",
     "none": "Ingen",
     "nopasswordchangeforced": "Du kan ikke fortsætte uden at ændre din adgangskode, men der er ingen tilgængelig side at ændre den på. Kontakt venligst din Moodleadministrator.",
     "nopermissions": "Beklager, men dette ({{$a}}) har du ikke tilladelse til.",
@@ -115,7 +115,7 @@
     "notice": "Bemærk",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Offline",
+    "offline": "Der kræves ikke online-aflevering",
     "online": "Online",
     "openfullimage": "Klik her for at vise billedet i fuld størrelse.",
     "openinbrowser": "Åben i browser",
@@ -123,19 +123,19 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Billede af {{$a}}",
-    "previous": "Forrige tilstand",
+    "previous": "Forrige",
     "pulltorefresh": "Træk for at opdatere",
     "refresh": "Genindlæs",
-    "required": "Krævet",
+    "required": "Påkrævet",
     "requireduserdatamissing": "Denne bruger mangler nogle krævede profildata. Udfyld venligst de manglende data i din Moodle og prøv igen.<br>{{$a}}",
     "save": "Gem",
-    "search": "Søg...",
-    "searching": "Søger i...",
+    "search": "Søg",
+    "searching": "Søg i",
     "searchresults": "Søgeresultater",
     "sec": "sekunder",
     "secs": "sekunder",
     "seemoredetail": "Klik her for detaljer",
-    "send": "Send",
+    "send": "send",
     "sending": "Sender",
     "serverconnection": "Fejl ved forbindelse til server",
     "show": "Vis",
@@ -146,11 +146,11 @@
     "sizemb": "Mb",
     "sizetb": "TB",
     "start": "Start",
-    "submit": "Aflever",
+    "submit": "Gem",
     "success": "Succes",
     "tablet": "Tablet",
     "teachers": "Undervisere",
-    "time": "Tid",
+    "time": "Tidspunkt",
     "timesup": "Tiden er gået!",
     "today": "I dag",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -167,7 +167,7 @@
     "whoops": "Hovsa",
     "windowsphone": "Windowstelefon",
     "wsfunctionnotavailable": "Denne webservicefunktion er ikke tilgængelig.",
-    "year": "År",
+    "year": "år",
     "years": "år",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 42451063cb8..74997868d55 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -3,18 +3,18 @@
     "allparticipants": "Alle Teilnehmer/innen",
     "android": "Android",
     "areyousure": "Sind Sie sicher?",
-    "back": "Zurück zur vorherigen Antwort",
+    "back": "Zurück",
     "cancel": "Abbrechen",
     "cannotconnect": "Die Verbindung ist nicht möglich. Prüfen Sie, ob die URL richtig ist und dass mindestens Moodle 2.4 verwendet wird.",
     "cannotdownloadfiles": "Das Herunterladen von Dateien ist im mobilen Webservice deaktiviert. Wenden Sie sich an den Administrator der Website.",
-    "category": "Kursbereich",
+    "category": "Kategorie",
     "choose": "Auswahl",
     "choosedots": "Auswählen...",
     "clearsearch": "Suche löschen",
     "clicktohideshow": "Zum Erweitern oder Zusammenfassen klicken",
     "clicktoseefull": "Tippen zum Anzeigen aller Inhalte",
-    "close": "Fenster schließen",
-    "comments": "Kommentare",
+    "close": "Schließen",
+    "comments": "Ihr Feedback",
     "commentscount": "Kommentare ({{$a}})",
     "commentsnotworking": "Kommentare können nicht mehr abgerufen werden",
     "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (ohne Erfolg)",
@@ -29,14 +29,14 @@
     "confirmopeninbrowser": "Möchten Sie dies im Browser öffnen?",
     "content": "Inhalt",
     "contenteditingsynced": "Der Inhalt, den Sie bearbeiten, wurde synchronisiert.",
-    "continue": "Fortsetzen",
+    "continue": "Weiter",
     "copiedtoclipboard": "Text in die Zwischenablage kopiert",
     "course": "Kurs",
     "coursedetails": "Kursdetails",
     "currentdevice": "Aktuelles Gerät",
     "datastoredoffline": "Daten wurden im Gerät gespeichert, da sie nicht gesendet werden konnten. Sie werden automatisch später gesendet.",
     "date": "Datum",
-    "day": "Tag(e)",
+    "day": "Tag",
     "days": "Tage",
     "decsep": ",",
     "defaultvalue": "Standard ({{$a}})",
@@ -52,11 +52,11 @@
     "discard": "Verwerfen",
     "dismiss": "Abbrechen",
     "done": "Erledigt",
-    "download": "Klick zum Download der exportierten Kategorien",
+    "download": "Herunterladen",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
     "emptysplit": "Diese Seite ist leer, wenn das linke Panel leer ist oder noch geladen wird.",
-    "error": "Fehler aufgetreten!",
+    "error": "Fehler",
     "errorchangecompletion": "Fehler beim Ändern des Abschlussstatus. Versuchen Sie es noch einmal.",
     "errordeletefile": "Fehler beim Löschen der Datei. Versuchen Sie es noch einmal.",
     "errordownloading": "Fehler beim Laden der Datei",
@@ -87,17 +87,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Bild",
     "imageviewer": "Bildanzeige",
-    "info": "Info",
+    "info": "Informationen",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Zuletzt geändert",
     "lastsync": "Letztes Synchronisieren",
     "listsep": ";",
-    "loading": "Laden...",
+    "loading": "Wird geladen",
     "loadmore": "Mehr laden",
     "lostconnection": "Die Authentifizierung ist abgelaufen oder ungültig. Sie müssen sich neu verbinden.",
     "maxsizeandattachments": "Maximale Größe für neue Dateien: {{$a.size}}, Maximale Zahl von Anhängen: {{$a.attachments}}",
-    "min": "Niedrigste",
+    "min": "Minute",
     "mins": "Minuten",
     "mod_assign": "Aufgabe",
     "mod_assignment": "Aufgabe",
@@ -132,9 +132,9 @@
     "never": "Nie",
     "next": "Weiter",
     "no": "Nein",
-    "nocomments": "Keine Kommentare",
-    "nograde": "Keine Bewertung.",
-    "none": "--",
+    "nocomments": "Noch keine Kommentare",
+    "nograde": "Keine Bewertung",
+    "none": "Keine",
     "nopasswordchangeforced": "Ohne die Änderung des Kennworts können Sie nicht weitermachen. Falls die Seite zur Änderung des Kennworts nicht verfügbar ist, wenden Sie sich an den Administrator der Website.",
     "nopermissions": "Sie besitzen derzeit keine Rechte, dies zu tun ({{$a}}).",
     "noresults": "Keine Ergebnisse",
@@ -143,7 +143,7 @@
     "notsent": "Nicht gesendet",
     "now": "jetzt",
     "numwords": "{{$a}} Wörter",
-    "offline": "Offline",
+    "offline": "Keine Online-Abgabe notwendig",
     "online": "Online",
     "openfullimage": "Tippen Sie hier, um das Bild in voller Größe anzuzeigen",
     "openinbrowser": "Im Browser öffnen",
@@ -152,16 +152,16 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Nutzerbild {{$a}}",
-    "previous": "Letzter Zustand",
+    "previous": "Zurück",
     "pulltorefresh": "Zum Aktualisieren runterziehen",
     "redirectingtosite": "Sie werden zur Website weitergeleitet.",
-    "refresh": "Neu laden",
-    "required": "Notwendig",
+    "refresh": "Aktualisieren",
+    "required": "Erforderlich",
     "requireduserdatamissing": "In diesem Nutzerprofil fehlen notwendige Daten. Füllen Sie die Daten in der Website aus und versuchen Sie es noch einmal.<br> {{$a}}",
     "retry": "Neu versuchen",
-    "save": "Sichern",
-    "search": "Suchen...",
-    "searching": "Suche in ...",
+    "save": "Speichern",
+    "search": "Suchen",
+    "searching": "Suche in",
     "searchresults": "Suchergebnisse",
     "sec": "Sekunde",
     "secs": "Sekunden",
@@ -169,7 +169,7 @@
     "send": "Senden",
     "sending": "wird gesendet",
     "serverconnection": "Fehler beim Aufbau der Verbindung zum Server",
-    "show": "Zeigen",
+    "show": "Anzeigen",
     "showmore": "Mehr anzeigen ...",
     "site": "Website",
     "sitemaintenance": "Wartungsmodus: Die Website ist im Moment nicht erreichbar!",
@@ -180,7 +180,7 @@
     "sizetb": "TB",
     "sorry": "Sorry ...",
     "start": "Start",
-    "submit": "Abgabe",
+    "submit": "Speichern",
     "success": "erfolgreich",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
@@ -202,14 +202,14 @@
     "userdetails": "Mehr Details",
     "usernotfullysetup": "Nutzerkonto unvollständig",
     "users": "Nutzer/innen",
-    "view": "Anzeigen",
+    "view": "Zum Kurs",
     "viewprofile": "Profil anzeigen",
     "warningofflinedatadeleted": "Die Offline-Daten von {{component}} '{{name}}' wurden gelöscht. {{error}}",
     "whoops": "Uuups!",
     "whyisthishappening": "Warum geschieht dies?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Die Webservice-Funktion ist nicht verfügbar.",
-    "year": "Jahr(e)",
+    "year": "Jahr",
     "years": "Jahre",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index 9f12ddb37a5..ed684b755a5 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -3,18 +3,18 @@
     "allparticipants": "Όλοι οι συμμετέχοντες",
     "android": "Android",
     "areyousure": "Είστε σίγουρος ;",
-    "back": "Επιστροφή στην προηγούμενη ερώτηση",
-    "cancel": "Ακύρωση",
+    "back": "Πίσω",
+    "cancel": "Άκυρο",
     "cannotconnect": "Δεν είναι δυνατή η σύνδεση: Βεβαιωθείτε ότι έχετε πληκτρολογήσει σωστά τη διεύθυνση URL και ότι το site σας χρησιμοποιεί το Moodle 2.4 ή νεότερη έκδοση.",
     "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
-    "category": "Κατηγορία",
+    "category": "Τμήμα",
     "choose": "Επιλέξτε",
     "choosedots": "Επιλέξτε...",
     "clearsearch": "Καθαρισμός αναζήτησης",
     "clicktohideshow": "Πατήστε για επέκταση ή κατάρρευση",
     "clicktoseefull": "Κάντε κλικ για να δείτε το πλήρες περιεχόμενο.",
-    "close": "Κλείσιμο παραθύρου",
-    "comments": "Σχόλια",
+    "close": "Κλείσιμο",
+    "comments": "Τα σχόλιά σας",
     "commentscount": "Σχόλια ({{$a}})",
     "commentsnotworking": "Τα σχόλια δεν μπορούν να ανακτηθούν",
     "completion-alt-auto-fail": "Ολοκληρωμένο (με βαθμό κάτω της βάσης)",
@@ -35,11 +35,11 @@
     "datastoredoffline": "Τα δεδομένα αποθηκεύονται στη συσκευή, διότι δεν μπορούν να σταλούν. Θα αποσταλούν αυτόματα αργότερα.",
     "date": "Ημερομηνία",
     "day": "ημέρα",
-    "days": "Ημέρες",
+    "days": "ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
     "deleting": "Διαγραφή",
-    "description": "Περιγραφή",
+    "description": "Κείμενο εισαγωγής",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -48,10 +48,10 @@
     "discard": "Απόρριψη",
     "dismiss": "Απόρριψη",
     "done": "Ολοκληρώθηκε",
-    "download": "Κάντε κλικ για να κατεβάσετε το εξαγόμενο αρχείο κατηγορίας",
+    "download": "Μεταφόρτωση",
     "downloading": "Κατέβασμα",
-    "edit": "Επεξεργασία",
-    "error": "Συνέβη ένα άγνωστο σφάλμα!",
+    "edit": "Edit",
+    "error": "Σφάλμα",
     "errorchangecompletion": "Παρουσιάστηκε σφάλμα κατά την αλλαγή της κατάστασης ολοκλήρωσης. Παρακαλώ προσπαθήστε ξανά.",
     "errordeletefile": "Σφάλμα κατά τη διαγραφή του αρχείου. Παρακαλώ προσπαθήστε ξανά.",
     "errordownloading": "Σφάλμα στο κατέβασμα του αρχείου.",
@@ -86,10 +86,10 @@
     "lastmodified": "Τελευταία τροποποίηση",
     "lastsync": "Τελευταίος συγχρονισμός",
     "listsep": ";",
-    "loading": "Φορτώνει....",
+    "loading": "Φορτώνει",
     "lostconnection": "Η σύνδεσή σας είναι άκυρη ή έχει λήξει. Πρέπει να ξανασυνδεθείτε στο site.",
     "maxsizeandattachments": "Μέγιστο μέγεθος για νέα αρχεία: {{$a.size}}, μέγιστος αριθμός συνημμένων: {{$a.attachments}}",
-    "min": "Ελάχιστο",
+    "min": "λεπτό",
     "mins": "λεπτά",
     "mod_assign": "Εργασία",
     "mod_assignment": "Εργασία",
@@ -122,11 +122,11 @@
     "name": "Όνομα",
     "networkerrormsg": "Το δίκτυο δεν είναι ενεργοποιημένο ή δεν δουλεύει.",
     "never": "Ποτέ",
-    "next": "Συνέχεια",
+    "next": "Επόμενο",
     "no": "Όχι",
-    "nocomments": "Δεν υπάρχουν σχόλια",
-    "nograde": "Κανένα βαθμό.",
-    "none": "Κανένα",
+    "nocomments": "Χωρίς Σχόλια",
+    "nograde": "Δεν υπάρχει βαθμός",
+    "none": "Κανένας",
     "nopasswordchangeforced": "You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.",
     "nopermissions": "Συγνώμη, αλλά επί του τρεχόντως δεν έχετε το δικαίωμα να το κάνετε αυτό ({{$a}})",
     "noresults": "Κανένα αποτέλεσμα",
@@ -135,7 +135,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Αποσυνδεδεμένος",
+    "offline": "Δεν απαιτείται διαδικτυακή υποβολή",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -144,7 +144,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Τηλέφωνο",
     "pictureof": "Φωτογραφία {{$a}}",
-    "previous": "Προηγούμενη κατάσταση",
+    "previous": "Προηγούμενο",
     "pulltorefresh": "Τραβήξτε προς τα κάτω για ανανέωση",
     "redirectingtosite": "Θα μεταφερθείτε στο site.",
     "refresh": "Ανανέωση",
@@ -152,15 +152,15 @@
     "requireduserdatamissing": "Αυτός ο χρήστης δεν έχει συμπληρωμένα κάποια απαιτούμενα στοιχεία του προφίλ του. Συμπληρώστε τα δεδομένα στο Moodle σας και προσπαθήστε ξανά.<br>{{$a}}",
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
-    "search": "Αναζήτηση...",
-    "searching": "Γίνεται έρευνα στο...",
-    "searchresults": "Αναζήτηση στα αποτελέσματα",
+    "search": "Αναζήτηση",
+    "searching": "Αναζήτηση σε",
+    "searchresults": "Αποτελέσματα αναζήτησης",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
     "sending": "Αποστέλλεται",
-    "show": "Δείξε",
+    "show": "Προβολή",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
     "sitemaintenance": "Η ιστοσελίδα είναι υπό συντήρηση και δεν είναι άμεσα διαθέσιμη",
@@ -176,7 +176,7 @@
     "tablet": "Tablet",
     "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
-    "time": "Χρόνος",
+    "time": "Ώρα",
     "timesup": "Έληξε ο χρόνος!",
     "today": "Σήμερα",
     "tryagain": "Προσπαθήστε ξανά.",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index 68918a5acbb..907091ece1d 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos los participantes",
     "android": "Android",
     "areyousure": "¿Está Usted seguro?",
-    "back": "Volver a la vista previa de la pregunta",
+    "back": "Atrás",
     "cancel": "Cancelar",
     "cannotconnect": "No se puede conectar: Verifique que Usted escribió la URL correcta y que su sitio usa Moodle 2.4 o más reciente.",
     "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile. Por favor contacte a su administrador del sitio.",
@@ -13,8 +13,8 @@
     "clearsearch": "Limpiar búsqueda",
     "clicktohideshow": "Clic para expandir o colapsar",
     "clicktoseefull": "Hacer click para ver los contenidos completos.",
-    "close": "Cerrar vista previa",
-    "comments": "Comentarios",
+    "close": "Cerrar",
+    "comments": "Sus comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
     "completion-alt-auto-fail": "Finalizado {{$a}} (no obtuvo calificación de aprobado)",
@@ -36,13 +36,13 @@
     "currentdevice": "Dispositivo actual",
     "datastoredoffline": "Los datos se almacenaron en el dispositivo debido a que no se pudieron enviar. Serán enviados automáticamente más tarde.",
     "date": "Fecha",
-    "day": "Día(s)",
-    "days": "Días",
+    "day": "día",
+    "days": "días",
     "decsep": ".",
     "defaultvalue": "Valor por defecto ({{$a}})",
     "delete": "Eliminar",
     "deleting": "Eliminando",
-    "description": "Descripción",
+    "description": "Descripción -",
     "dfdaymonthyear": "MM-DD-AAAA",
     "dfdayweekmonth": "ddd, D MMM",
     "dffulldate": "dddd, D MMMM AAAA h[:]mm A",
@@ -52,11 +52,11 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Haga clic para descargar el archivo de categorías exportadas",
+    "download": "Descargar",
     "downloading": "Descargando",
-    "edit": "Editar",
+    "edit": "Edición",
     "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
-    "error": "Ha ocurrido un error desconocido.",
+    "error": "Error",
     "errorchangecompletion": "Ocurrió un error al cambiar el estatus de finalización. Por favor inténtelo nuevamente.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo nuevamente.",
     "errordownloading": "Error al descargar archivo",
@@ -87,17 +87,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagen",
     "imageviewer": "Visor de imágenes",
-    "info": "Información",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Última modicficación",
+    "lastmodified": "Última modificación",
     "lastsync": "Última sincronzación",
     "listsep": ";",
-    "loading": "Cargando...",
+    "loading": "Cargando",
     "loadmore": "Cargar más",
     "lostconnection": "Hemos perdido la conexión, necesita reconectar. Su ficha (token) ya no es válido",
     "maxsizeandattachments": "Tamaño máximo para archivos nuevos: {{$a.size}}, anexos máximos: {{$a.attachments}}",
-    "min": "Más baja",
+    "min": "minutos",
     "mins": "minutos",
     "mod_assign": "Tarea",
     "mod_assignment": "Tarea",
@@ -130,20 +130,20 @@
     "name": "Nombre",
     "networkerrormsg": "Red no disponible o no funcionando.",
     "never": "Nunca",
-    "next": "Continuar",
+    "next": "Siguiente",
     "no": "No",
     "nocomments": "No hay comentarios",
-    "nograde": "Sin calificación.",
-    "none": "Ninguno(a)",
+    "nograde": "No hay calificación",
+    "none": "Ninguno/a",
     "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
-    "noresults": "Sin resultados",
+    "noresults": "No hay resultados",
     "notapplicable": "no disp.",
     "notice": "Aviso",
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "Fuera de línea",
+    "offline": "No se requieren entregas online",
     "online": "En línea",
     "openfullimage": "Hacer click aquí para mostrar la imagen a tamaño completo",
     "openinbrowser": "Abrir en navegador",
@@ -152,21 +152,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Teléfono",
     "pictureof": "Imagen de {{$a}}",
-    "previous": "Estado previo",
+    "previous": "Anterior",
     "pulltorefresh": "''Pull'' para refrescar",
     "redirectingtosite": "Usted será redireccionado al sitio.",
     "refresh": "Refrescar",
-    "required": "Requerido",
+    "required": "Obligatorio",
     "requireduserdatamissing": "A este usuario le faltan algunos datos requeridos del perfil. Por favor, llene estos datos en su Moodle e inténtelo nuevamente.<br>{{$a}}",
     "retry": "Reintentar",
     "save": "Guardar",
-    "search": "Buscar...",
-    "searching": "Buscando en ...",
-    "searchresults": "Resultado",
+    "search": "Buscar",
+    "searching": "Buscar en",
+    "searchresults": "Resultados de la búsqueda",
     "sec": "segundos",
     "secs": "segundos",
     "seemoredetail": "Haga clic aquí para ver más detalles",
-    "send": "Enviar",
+    "send": "enviar",
     "sending": "Enviando",
     "serverconnection": "Error al conectarse al servidor",
     "show": "Mostrar",
@@ -185,7 +185,7 @@
     "tablet": "Tableta",
     "teachers": "Profesores",
     "thereisdatatosync": "Existen {{$a}} fuera-de-línea para ser sincronizados/as.",
-    "time": "Tiempo",
+    "time": "Hora",
     "timesup": "¡Se ha pasado el tiempo!",
     "today": "Hoy",
     "tryagain": "Intentar nuevamente",
@@ -202,14 +202,14 @@
     "userdetails": "Detalles de usuario",
     "usernotfullysetup": "Usuario no cnfigurado completamente",
     "users": "Usuarios",
-    "view": "Ver",
+    "view": "Vista",
     "viewprofile": "Ver perfil",
     "warningofflinedatadeleted": "Los datos fuera-de-línea de {{component}} '{{name}}' han sido borrados. {{error}}",
     "whoops": "¡Órale!",
     "whyisthishappening": "¿Porqué está pasando esto?",
     "windowsphone": "Teléfono Windows",
     "wsfunctionnotavailable": "La función webservice no está disponible.",
-    "year": "Año(s)",
+    "year": "año",
     "years": "años",
     "yes": "Sí"
 }
\ No newline at end of file
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index b5230226a5b..f42a455440f 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos los participantes",
     "android": "Android",
     "areyousure": "¿Està seguro?",
-    "back": "Volver a la vista previa de la pregunta",
+    "back": "Atrás",
     "cancel": "Cancelar",
     "cannotconnect": "No se puede conectar: Verifique que la URL es correcta y que el sitio Moodle usa la versión 2.4 o posterior.",
     "cannotdownloadfiles": "La descarga de archivos está deshabilitada en su servicio Mobile. Por favor contacte al administrador de su sitio.",
@@ -13,8 +13,8 @@
     "clearsearch": "Limpiar búsqueda",
     "clicktohideshow": "Clic para expandir o colapsar",
     "clicktoseefull": "Clic para ver el contenido al completo",
-    "close": "Cerrar vista previa",
-    "comments": "Comentarios",
+    "close": "Cerrar",
+    "comments": "Sus comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
     "completion-alt-auto-fail": "Finalizado {{$a}} (no ha alcanzado la calificación de aprobado)",
@@ -34,10 +34,10 @@
     "currentdevice": "Dispositivo actual",
     "datastoredoffline": "Los datos se almacenaron en el dispositivo debido a que no se pudieron enviar. Serán enviados automáticamente más tarde.",
     "date": "Fecha",
-    "day": "Día(s)",
-    "days": "Días",
+    "day": "día",
+    "days": "días",
     "decsep": ",",
-    "delete": "Borrar",
+    "delete": "Eliminar",
     "deleting": "Eliminando",
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-YYYY",
@@ -48,10 +48,10 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Haga clic para descargar el archivo de categorías exportadas",
+    "download": "Descargar",
     "downloading": "Descargando...",
-    "edit": "Editar",
-    "error": "Ha ocurrido un error desconocido.",
+    "edit": "Edición",
+    "error": "Error",
     "errorchangecompletion": "Ha ocurrido un error cargando el grado de realización. Por favor inténtalo de nuevo.",
     "errordeletefile": "Error al eliminar el archivo. Por favor inténtelo de nuevo.",
     "errordownloading": "Ocurrió un error descargando el archivo",
@@ -81,16 +81,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagen",
     "imageviewer": "Visor de imágenes",
-    "info": "Información",
+    "info": "Info",
     "ios": "iOs",
     "labelsep": ":",
     "lastmodified": "Última modificación",
     "lastsync": "Última sincronización",
     "listsep": ";",
-    "loading": "Cargando...",
+    "loading": "Cargando",
     "lostconnection": "Hemos perdido la conexión, necesita reconectar. Su token ya no es válido",
     "maxsizeandattachments": "Tamaño máximo para nuevos archivos: {{$a.size}}, número máximo de archivos adjuntos: {{$a.attachments}}",
-    "min": "Más baja",
+    "min": "minutos",
     "mins": "minutos",
     "mod_assign": "Tarea",
     "mod_assignment": "Tarea",
@@ -123,20 +123,20 @@
     "name": "Nombre",
     "networkerrormsg": "Conexión no disponible o sin funcionar.",
     "never": "Nunca",
-    "next": "Continuar",
+    "next": "Siguiente",
     "no": "No",
     "nocomments": "No hay comentarios",
-    "nograde": "Sin calificación",
-    "none": "Ninguno",
+    "nograde": "No hay calificación",
+    "none": "Ninguna",
     "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
-    "noresults": "Sin resultados",
+    "noresults": "No hay resultados",
     "notapplicable": "n/a",
     "notice": "Noticia",
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "Fuera de línea",
+    "offline": "No se requieren entregas online",
     "online": "En línea",
     "openfullimage": "Haga clic aquí para ver la imagen a tamaño completo",
     "openinbrowser": "Abrir en el navegador",
@@ -145,21 +145,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Teléfono",
     "pictureof": "Imagen de {{$a}}",
-    "previous": "Estado previo",
+    "previous": "Anterior",
     "pulltorefresh": "Tirar para recargar",
     "redirectingtosite": "Será redirigido al sitio.",
-    "refresh": "Refrescar",
+    "refresh": "Recargar",
     "required": "Obligatorio",
     "requireduserdatamissing": "En este perfil de usuario faltan datos requeridos. Por favor, rellene estos datos e inténtelo otra vez.<br>{{$a}}",
     "retry": "Reintentar",
     "save": "Guardar",
-    "search": "Buscar...",
-    "searching": "Buscando en...",
-    "searchresults": "Resultado",
+    "search": "Buscar",
+    "searching": "Buscar en",
+    "searchresults": "Resultados de la búsqueda",
     "sec": "segundos",
     "secs": "segundos",
     "seemoredetail": "Haga clic aquí para ver más detalles",
-    "send": "Enviar",
+    "send": "enviar",
     "sending": "Enviando",
     "serverconnection": "Error al conectarse al servidor",
     "show": "Mostrar",
@@ -178,7 +178,7 @@
     "tablet": "Tablet",
     "teachers": "Profesores",
     "thereisdatatosync": "Hay {{$a}} fuera de línea pendiente de ser sincronizado.",
-    "time": "Tiempo",
+    "time": "Hora",
     "timesup": "¡Se ha pasado el tiempo!",
     "today": "Hoy",
     "tryagain": "Intentar de nuevo",
@@ -192,14 +192,14 @@
     "userdeleted": "Esta cuenta se ha cancelado",
     "userdetails": "Detalles de usuario",
     "users": "Usuarios",
-    "view": "Ver",
+    "view": "Vista",
     "viewprofile": "Ver perfil",
     "warningofflinedatadeleted": "Los datos fuera de línea de {{component}} '{{name}}' han sido borrados. {{error}}",
     "whoops": "Oops!",
     "whyisthishappening": "¿Porqué está pasando esto?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La función de webservice no está disponible.",
-    "year": "Año(s)",
+    "year": "año",
     "years": "años",
     "yes": "Sí"
 }
\ No newline at end of file
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index 3dcf03486fe..a3b5191472f 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -3,7 +3,7 @@
     "allparticipants": "Partaide guztiak",
     "android": "Android",
     "areyousure": "Ziur al zaude?",
-    "back": "Itzuli aurreko galderara",
+    "back": "Atzera",
     "cancel": "Utzi",
     "cannotconnect": "Ezin izan da konektatu: URLa ondo idatzi duzula eta zure Moodle-ak 2.4 edo goragoko bertsioa erabiltzen duela egiaztatu ezazu.",
     "cannotdownloadfiles": "Fitxategiak jaistea ezgaituta dago zure Mobile zerbitzuan. Mesedez zure gune kudeatzailean harremanetan jarri zaitez.",
@@ -13,9 +13,9 @@
     "clearsearch": "Bilaketa garbia",
     "clicktohideshow": "Sakatu zabaltzeko edo tolesteko",
     "clicktoseefull": "Klik egin eduki guztiak ikusteko.",
-    "close": "Leihoa itxi",
-    "comments": "Iruzkinak",
-    "commentscount": "({{$a}}) iruzkinak",
+    "close": "Itxi",
+    "comments": "Zure iruzkinak",
+    "commentscount": "Iruzkinak: ({{$a}})",
     "commentsnotworking": "Iruzkinak ezin izan dira atzitu",
     "completion-alt-auto-fail": "Osatuta: {{$a}} (ez dute gutxieneko kalifikazioa lortu)",
     "completion-alt-auto-n": "Osatu gabea: {{$a}}",
@@ -36,8 +36,8 @@
     "currentdevice": "Oraingo gailua",
     "datastoredoffline": "Gailu honetan gordetako informazioa ezin izan da bidali. Beranduago automatikoki bidaliko da.",
     "date": "Data",
-    "day": "Egun",
-    "days": "Egun",
+    "day": "egun(a)",
+    "days": "egun",
     "decsep": ",",
     "delete": "Ezabatu",
     "deleting": "Ezabatzen",
@@ -51,11 +51,11 @@
     "discard": "Baztertu",
     "dismiss": "Baztertu",
     "done": "Eginda",
-    "download": "Klikatu esportatutako kategoria-fitxategia deskargatzeko",
+    "download": "Jaitsi",
     "downloading": "Jaisten",
     "edit": "Editatu",
     "emptysplit": "Orri hau hutsik agertuko da ezkerreko panela hutsik badago edo kargatzen ari bada.",
-    "error": "Errore ezezagun bat gertatu da!",
+    "error": "Errorea",
     "errorchangecompletion": "Errorea gertatu da osaketa-egoera aldatzean. Mesedez saiatu berriz.",
     "errordeletefile": "Errorea fitxategia ezabatzean. Mesedez, saiatu berriz.",
     "errordownloading": "Errorea fitxategia jaistean.",
@@ -92,11 +92,11 @@
     "lastmodified": "Azken aldaketa",
     "lastsync": "Azken sinkronizazioa",
     "listsep": ";",
-    "loading": "Igotzen...",
+    "loading": "Kargatzen",
     "loadmore": "Kargatu gehiago",
     "lostconnection": "Zure token-a orain ez da baliozkoa edo iraungitu da, gunera berriz konektatu beharko zara.",
     "maxsizeandattachments": "Gehienezko tamaina fitxategi berrietarako: {{$a.size}}, gehienezko eranskin-kopurua: {{$a.attachments}}",
-    "min": "Baxuena",
+    "min": "minutu",
     "mins": "minutu",
     "mod_assign": "Zeregina",
     "mod_assignment": "Zeregina",
@@ -129,10 +129,10 @@
     "name": "Izena",
     "networkerrormsg": "Sarea ezgaituta dago edo ez dabil.",
     "never": "Inoiz ez",
-    "next": "Jarraitu",
+    "next": "Hurrengoa",
     "no": "Ez",
-    "nocomments": "Ez dago iruzkinik",
-    "nograde": "Kalifikaziorik ez.",
+    "nocomments": "Iruzkinik ez",
+    "nograde": "Kalifikaziorik ez",
     "none": "Bat ere ez",
     "nopasswordchangeforced": "Ezin duzu aurrera egin pasahitza aldatu gabe, baina ez dago aldatzeko inongo orririk. Mesedez, jarri harremanetan zure Moodle Kudeatzailearekin.",
     "nopermissions": "Sentitzen dugu, baina oraingoz ez duzu hori egiteko baimenik ({{$a}})",
@@ -142,7 +142,7 @@
     "notsent": "Bidali gabea",
     "now": "orain",
     "numwords": "{{$a}} hitz",
-    "offline": "Lineaz kanpo",
+    "offline": "Ez du online bidalketarik eskatzen",
     "online": "Online",
     "openfullimage": "Klik egin hemen irudia jatorrizko tamainan ikusteko",
     "openinbrowser": "Ireki nabigatzailean",
@@ -151,21 +151,21 @@
     "percentagenumber": "%{{$a}}",
     "phone": "Telefonoa",
     "pictureof": "{{$a}}-ren irudia",
-    "previous": "Aurreko egoera",
+    "previous": "Aurrekoa",
     "pulltorefresh": "Sakatu freskatzeko",
     "redirectingtosite": "Gunera berbideratua izango zara.",
     "refresh": "Freskatu",
-    "required": "Beharrekoa",
+    "required": "Beharrezkoa",
     "requireduserdatamissing": "Erabiltzaile honek beharrezkoak diren profileko datuak bete gabe ditu. Mesedez, bete itzazu datu hauek zure Moodle gunean eta saiatu berriz.<br>{{$a}}",
     "retry": "Berriz saiatu",
     "save": "Gorde",
-    "search": "Bilatu...",
-    "searching": "Bilatzen hemen:",
+    "search": "Bilatu",
+    "searching": "Bilatu hemen",
     "searchresults": "Bilaketaren emaitzak",
     "sec": "seg",
     "secs": "segundu",
     "seemoredetail": "Klik egin hemen xehetasun gehiago ikusteko",
-    "send": "Bidali",
+    "send": "bidali",
     "sending": "Bidaltzen",
     "serverconnection": "Errorea zerbitzariarekin konektatzean",
     "show": "Erakutsi",
@@ -184,7 +184,7 @@
     "tablet": "Tablet-a",
     "teachers": "Irakasleak",
     "thereisdatatosync": "Lineaz-kanpoko {{$a}} daude sinkronizatzeko .",
-    "time": "Denbora",
+    "time": "Ordua",
     "timesup": "Denbora amaitu egin da!",
     "today": "Gaur",
     "tryagain": "Saiatu berriz",
@@ -207,7 +207,7 @@
     "whyisthishappening": "Zergatik ari da hau gertatzen?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Web-zerbitzu funtzioa ez dago eskuragarri.",
-    "year": "Urte",
+    "year": "urtea",
     "years": "urte",
     "yes": "Bai"
 }
\ No newline at end of file
diff --git a/www/core/lang/fa.json b/www/core/lang/fa.json
index 35c3c437a9b..0d4d923b0cc 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "همهٔ اعضاء",
     "areyousure": "آیا مطمئن هستید؟",
-    "back": "بازگشت به پیش‌نمایش سؤال",
+    "back": "بازگشت",
     "cancel": "انصراف",
     "cannotconnect": "اتصال به سایت ممکن نبود. بررسی کنید که نشانی سایت را درست وارد کرده باشید و اینکه سایت شما از مودل ۲٫۴ یا جدیدتر استفاده کند.",
-    "category": "دسته",
+    "category": "طبقه",
     "choose": "انتخاب کنید",
     "choosedots": "انتخاب کنید...",
     "clicktohideshow": "برای باز یا بسته شدن کلیک کنید",
     "close": "بستن پنجره",
-    "comments": "دیدگاه‌ها",
+    "comments": "نظرات",
     "commentscount": "نظرات ({{$a}})",
     "completion-alt-auto-fail": "تکمیل شده است (بدون اکتساب نمرهٔ قبولی)",
     "completion-alt-auto-n": "تکمیل نشده است",
@@ -32,11 +32,11 @@
     "decsep": ".",
     "delete": "حذف",
     "deleting": "در حال حذف",
-    "description": "توصیف",
+    "description": "توضیح تکلیف",
     "done": "پر کرده است",
-    "download": "برای دریافت فایل صادر شدهٔ طبقه کلیک کنید",
+    "download": "دریافت",
     "edit": "ویرایش",
-    "error": "خطا رخ داد",
+    "error": "خطا",
     "errordownloading": "خطا در دانلود فایل",
     "folder": "پوشه",
     "forcepasswordchangenotice": "برای پیش‌روی باید رمز ورود خود را تغییر دهید.",
@@ -48,14 +48,14 @@
     "hour": "ساعت",
     "hours": "ساعت",
     "imageviewer": "نمایشگر تصویر",
-    "info": "اطلاعات",
+    "info": "توضیحات",
     "labelsep": ":&nbsp;",
     "lastmodified": "آخرین تغییر",
     "listsep": ",",
-    "loading": "در حال بارگیری...",
+    "loading": "در حال بارگیری",
     "lostconnection": "اطلاعات توکن شناسایی شما معتبر نیست یا منقضی شده است. باید دوباره به سایت متصل شوید.",
     "maxsizeandattachments": "حداکثر اندازه برای فایل‌های جدید: {{$a.size}}، حداکثر تعداد فایل‌های پیوست: {{$a.attachments}}",
-    "min": "کف",
+    "min": "دقیقه",
     "mins": "دقیقه",
     "mod_assign": "تکلیف",
     "mod_chat": "اتاق گفتگو",
@@ -75,7 +75,7 @@
     "never": "هیچ‌وقت",
     "next": "ادامه",
     "no": "خیر",
-    "nocomments": "نظری ارائه نشده است",
+    "nocomments": "بدون دیدگاه",
     "nograde": "بدون نمره",
     "none": "هیچ",
     "nopasswordchangeforced": "شما نمی‌توانید بدون تغییر رمز عبور ادامه دهید اما هیچ صفحه‌ای برای عوض کردن آن وجود ندارد. لطفا با مدیریت سایت تماس بگیرید.",
@@ -90,18 +90,18 @@
     "pagea": "صفحه {{$a}}",
     "phone": "تلفن",
     "pictureof": "عکس {{$a}}",
-    "previous": "حالت قبلی",
+    "previous": "قبلی",
     "pulltorefresh": "برای تازه‌سازی بکشید",
     "refresh": "تازه‌سازی",
-    "required": "اجباری",
+    "required": "لازم است",
     "save": "ذخیره",
-    "search": "جستجو...",
+    "search": "جستجو",
     "searching": "در حال جستجو در ...",
-    "searchresults": "نتایج جستجو",
+    "searchresults": "نتیجهٔ جستجو",
     "sec": "ثانیه",
     "secs": "ثانیه",
     "seemoredetail": "برای دیدن جزئیات بیشتر اینجا را کلیک کنید",
-    "send": "ارسال",
+    "send": "فرستادن",
     "sending": "در حال ارسال",
     "serverconnection": "خطا در اتصال به کارگزار",
     "show": "نمایش",
@@ -113,7 +113,7 @@
     "sizemb": "مگابایت",
     "sorry": "متاسفیم...",
     "start": "آغاز",
-    "submit": "ارسال",
+    "submit": "ارائه",
     "success": "موفق",
     "teachers": "استاد",
     "time": "زمان",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index c1cdd4a8af7..27c57b9a5af 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -3,7 +3,7 @@
     "allparticipants": "Tous les participants",
     "android": "Android",
     "areyousure": "En êtes-vous bien sûr ?",
-    "back": "Retour à la question précédente",
+    "back": "Retour",
     "cancel": "Annuler",
     "cannotconnect": "Connexion impossible : vérifiez que l'URL a été saisie correctement et que votre site utilise Moodle 2.4 ou ultérieur.",
     "cannotdownloadfiles": "Le téléchargement de fichiers est désactivé dans le service mobile de votre plateforme. Veuillez contacter l'administrateur de la plateforme.",
@@ -13,8 +13,8 @@
     "clearsearch": "Effacer la recherche",
     "clicktohideshow": "Cliquer pour déplier ou replier",
     "clicktoseefull": "Cliquer pour voir tout le contenu.",
-    "close": "Fermer la prévisualisation",
-    "comments": "Commentaires",
+    "close": "Fermer",
+    "comments": "Vos commentaires",
     "commentscount": "Commentaires ({{$a}})",
     "commentsnotworking": "Les commentaires ne peuvent pas être récupérés",
     "completion-alt-auto-fail": "Terminé : {{$a}} (n'a pas atteint la note pour passer)",
@@ -36,8 +36,8 @@
     "currentdevice": "Appareil actuel",
     "datastoredoffline": "Données stockées sur l'appareil, car elles n'ont pas pu être envoyées. Elles seront automatiquement envoyées ultérieurement.",
     "date": "Date",
-    "day": "Jour(s)",
-    "days": "Jours",
+    "day": "jour",
+    "days": "jours",
     "decsep": ",",
     "defaultvalue": "Défaut ({{$a}})",
     "delete": "Supprimer",
@@ -51,10 +51,10 @@
     "discard": "Ignorer",
     "dismiss": "Rejeter",
     "done": "Terminé",
-    "download": "Cliquer pour télécharger le fichier exporté",
+    "download": "Télécharger",
     "downloading": "Téléchargement en cours",
     "edit": "Modifier",
-    "error": "Une erreur inconnue est survenue !",
+    "error": "Erreur",
     "errorchangecompletion": "Une erreur est survenue lors du changement de l'état d'achèvement. Veuillez essayer à nouveau.",
     "errordeletefile": "Erreur lors de la suppression du fichier. Veuillez essayer à nouveau.",
     "errordownloading": "Erreur lors du téléchargement du fichier.",
@@ -85,16 +85,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Image",
     "imageviewer": "Lecteur d'images",
-    "info": "Info",
+    "info": "Information",
     "ios": "iOS",
     "labelsep": "&nbsp;",
-    "lastmodified": "Dernière modification",
+    "lastmodified": "Modifié le",
     "lastsync": "Dernière synchronisation",
     "listsep": ";",
-    "loading": "Chargement...",
+    "loading": "Chargement",
     "lostconnection": "Connexion perdue. Vous devez vous reconnecter. Votre jeton n'est plus valide",
     "maxsizeandattachments": "Taille maximale des nouveaux fichiers : {{$a.size}}. Nombre maximal d'annexes : {{$a.attachments}}",
-    "min": "Minimum",
+    "min": "min",
     "mins": "min",
     "mod_assign": "Devoir",
     "mod_assignment": "Devoir",
@@ -127,20 +127,20 @@
     "name": "Nom",
     "networkerrormsg": "Réseau désactivé ou en panne.",
     "never": "Jamais",
-    "next": "Continuer",
+    "next": "Suivant",
     "no": "Non",
     "nocomments": "Aucun commentaire",
-    "nograde": "Aucune note.",
+    "nograde": "Pas de note",
     "none": "Aucun",
     "nopasswordchangeforced": "Vous ne pouvez pas continuer sans modifier votre mot de passe. Cependant, il n'y a aucun moyen disponible de le modifier. Veuillez contacter l'administrateur de votre Moodle.",
     "nopermissions": "Désolé, vous n'avez actuellement pas les droits d'accès requis pour effectuer ceci ({{$a}})",
-    "noresults": "Pas de résultat",
+    "noresults": "Aucun résultat",
     "notapplicable": "n/a",
     "notice": "Remarque",
     "notsent": "Pas envoyé",
     "now": "maintenant",
     "numwords": "{{$a}} mots",
-    "offline": "Déconnecté",
+    "offline": "Aucun travail à remettre requis",
     "online": "En ligne",
     "openfullimage": "Cliquer ici pour afficher l'image en pleine grandeur",
     "openinbrowser": "Ouvrir dans le navigateur",
@@ -149,7 +149,7 @@
     "percentagenumber": "{{$a}} %",
     "phone": "Téléphone",
     "pictureof": "Avatar {{$a}}",
-    "previous": "État précédent",
+    "previous": "Précédent",
     "pulltorefresh": "Tirer pour actualiser",
     "redirectingtosite": "Vous allez être redirigé vers le site.",
     "refresh": "Actualiser",
@@ -157,8 +157,8 @@
     "requireduserdatamissing": "Il manque certaines données au profil de cet utilisateur. Veuillez compléter ces données dans votre plateforme Moodle et essayer à nouveau.<br />{{$a}}",
     "retry": "Essayer à nouveau",
     "save": "Enregistrer",
-    "search": "Recherche...",
-    "searching": "Recherche dans...",
+    "search": "Rechercher",
+    "searching": "Rechercher dans",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
@@ -182,7 +182,7 @@
     "tablet": "Tablette",
     "teachers": "Enseignants",
     "thereisdatatosync": "Il y a des {{$a}} locales à synchroniser",
-    "time": "Temps",
+    "time": "Heure",
     "timesup": "Le chrono est enclenché !",
     "today": "Aujourd'hui",
     "tryagain": "Essayer encore",
@@ -199,14 +199,14 @@
     "userdetails": "Informations détaillées",
     "usernotfullysetup": "Utilisateur pas complètement défini",
     "users": "Utilisateurs",
-    "view": "Afficher",
+    "view": "Affichage",
     "viewprofile": "Consulter le profil",
     "warningofflinedatadeleted": "Des données locales de {{component}} « {{name}} » ont été supprimées. {{error}}",
     "whoops": "Oups !",
     "whyisthishappening": "Que se passe-t-il ?",
     "windowsphone": "Windows phone",
     "wsfunctionnotavailable": "La fonction webservice n'est pas disponible",
-    "year": "Année(s)",
+    "year": "année",
     "years": "années",
     "yes": "Oui"
 }
\ No newline at end of file
diff --git a/www/core/lang/he.json b/www/core/lang/he.json
index aa240eedc8c..d0306063c87 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -2,7 +2,7 @@
     "allparticipants": "כל המשתתפים",
     "android": "אנדרואיד",
     "areyousure": "האם את/ה בטוח/ה?",
-    "back": "חזרה לתצוגה המקדימה של השאלה.",
+    "back": "חזרה",
     "cancel": "ביטול",
     "cannotconnect": "אין אפשרות להתחבר: אנא ודא כי הזנת נכון את כתובת האתר ושהאתר הוא בגרסה 2.4 ומעלה.",
     "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת במכשירים ניידים. יש לפנות למנהל/ת האתר להפעלת אפשרות זו.",
@@ -11,9 +11,9 @@
     "choosedots": "בחירה...",
     "clearsearch": "איפוס חיפוש",
     "clicktohideshow": "הקש להרחבה או לצמצום",
-    "close": "סגירת חלון",
-    "comments": "הערות",
-    "commentscount": "(הערות {{$a}})",
+    "close": "סגירה",
+    "comments": "ההערות שלך",
+    "commentscount": "({{$a}}) הערות",
     "completion-alt-auto-fail": "הושלם: {{$a}} (לא השיג ציון עובר)",
     "completion-alt-auto-n": "לא הושלם: {{$a}}",
     "completion-alt-auto-pass": "הושלם: {{$a}} (השיג ציון עובר)",
@@ -26,20 +26,20 @@
     "course": "קורס",
     "coursedetails": "פרטי הקורס",
     "date": "תאריך",
-    "day": "ימים",
+    "day": "יום",
     "days": "ימים",
     "decsep": ".",
     "delete": "מחיקה",
     "deleting": "מוחק",
-    "description": "תאור",
+    "description": "תיאור",
     "dfdayweekmonth": "dddd, D  MMMM",
     "dflastweekdate": "dddd",
     "dftimedate": "hh[:]mm",
     "done": "גמור",
-    "download": "יש להקליק להורדת קובץ הקטגוריות שיוצא",
+    "download": "הורדה",
     "downloading": "מוריד",
     "edit": "עריכה",
-    "error": "התרחשה שגיאה לא ידוע!",
+    "error": "טעות",
     "errordownloading": "שגיאה בהורדת קובץ",
     "errordownloadingsomefiles": "שגיאה בהורדת קבצי המודול. יתכן וחלק מהקבצים חסרים.",
     "filename": "שם הקובץ",
@@ -56,12 +56,12 @@
     "imageviewer": "מציג תמונות",
     "info": "מידע",
     "labelsep": ":",
-    "lastmodified": "עדכון אחרון",
+    "lastmodified": "שינוי אחרון",
     "listsep": ",",
-    "loading": "מתבצעה...",
+    "loading": "טוען...",
     "lostconnection": "לקוד הזיהוי המאובטח שלך פג התוקף, ולכן החיבור נותק. עליך להתחבר שוב.",
     "maxsizeandattachments": "נפח קבצים מירבי: {{$a.size}}, מספר קבצים מצורפים מירבי: {{$a.attachments}}",
-    "min": "נמוך ביותר",
+    "min": "דקה",
     "mins": "דקות",
     "mod_assign": "מטלה",
     "mod_assignment": "מטלה",
@@ -90,51 +90,51 @@
     "mod_wiki": "ויקי (תוצר משותף)",
     "mod_workshop": "הערכת־עמיתים",
     "moduleintro": "הנחיה לפעילות",
-    "name": "שם",
+    "name": "שם:",
     "networkerrormsg": "הרשת לא מופעלת או לא עובדת.",
-    "never": "אף פעם",
-    "next": "המשך",
+    "never": "אף פעם לא",
+    "next": "הבא",
     "no": "לא",
-    "nocomments": "אין הערות",
+    "nocomments": "ללא הערות",
     "nograde": "אין ציון",
-    "none": "ללא",
+    "none": "אין",
     "nopasswordchangeforced": "אינך יכול להמשיך ללא שינוי הסיסמה שלך. אך נכון לעכשיו אין דף זמין בו ניתן לשנותה. אנא צור קשר עם מנהל המוודל שלך.",
     "nopermissions": "למשתמש שלכם אין את ההרשאה לבצע את הפעולה \"{{$a}}\".\n<br/>\nיש לפנות למנהל(ת) המערכת שלכם לקבלת ההרשאות המתאימות.",
-    "noresults": "לא נמצאו תוצאות",
+    "noresults": "אין תוצאות",
     "notapplicable": "לא זמין",
     "notice": "לתשומת לב",
     "now": "עכשיו",
     "numwords": "{{$a}} מילים",
-    "offline": "לא מקוון",
+    "offline": "לא נדרשות הגשות מקוונות",
     "online": "מקוון",
     "openfullimage": "יש להקליק כאן להצגת התמונה בגודל מלא",
     "openinbrowser": "תצוגה בדפדפן",
     "pagea": "עמוד {{$a}}",
     "phone": "טלפון",
     "pictureof": "תמונה של {{$a}}",
-    "previous": "מצב קודם",
+    "previous": "קודם",
     "pulltorefresh": "משיכה לרענון",
     "refresh": "רענון",
-    "required": "נדרש",
+    "required": "דרוש",
     "requireduserdatamissing": "למשתמש זה חסרים שדות נדרשים בפרופיל המשתמש. יש להשלים מידע זה באתר המוודל שלך ולנסות שוב.<br>{{$a}}",
     "save": "שמירה",
-    "search": "חיפוש...",
-    "searching": "מחפש ב...",
-    "searchresults": "תוצאות החיפוש",
+    "search": "חיפוש",
+    "searching": "חיפוש ב-",
+    "searchresults": "תוצאות חיפוש",
     "sec": "שניה",
     "secs": "שניות",
     "seemoredetail": "הקליקו כאן כדי לראות פרטים נוספים",
-    "send": "לשלוח",
+    "send": "שליחה",
     "sending": "שולחים",
     "serverconnection": "שגיאה בהתחברות לשרת",
-    "show": "תצוגה",
+    "show": "הצגה",
     "site": "מערכת",
     "sizeb": "בתים",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
     "start": "התחלה",
-    "submit": "הגשה",
+    "submit": "שמירה",
     "success": "הצלחה",
     "tablet": "טאבלט",
     "teachers": "מורים",
@@ -148,10 +148,10 @@
     "userdeleted": "חשבון משתמש זה נמחק",
     "userdetails": "מאפייניי המשתמש",
     "users": "משתמשים",
-    "view": "צפיה",
+    "view": "תצוגה",
     "viewprofile": "תצוגת מאפיינים",
     "whoops": "אוווווופס!",
-    "year": "שנים",
+    "year": "שנה",
     "years": "שנים",
     "yes": "כן"
 }
\ No newline at end of file
diff --git a/www/core/lang/hu.json b/www/core/lang/hu.json
index 24eaed06fef..6376ed158d7 100644
--- a/www/core/lang/hu.json
+++ b/www/core/lang/hu.json
@@ -1,16 +1,16 @@
 {
     "allparticipants": "Összes résztvevő",
     "areyousure": "Biztos?",
-    "back": "Vissza a kérdés előzetes megtekintéséhez",
-    "cancel": "Törlés",
+    "back": "Vissza",
+    "cancel": "Mégse",
     "cannotconnect": "Sikertelen kapcsolódás: ellenőrizze, jó-e az URL és a portál legalább 2.4-es Moodle-t használ-e.",
     "category": "Kategória",
     "choose": "Választás",
     "choosedots": "Választás...",
     "clicktohideshow": "Kattintson a kibontáshoz vagy a becsukáshoz.",
-    "close": "Ablak bezárása",
-    "comments": "Megjegyzések",
-    "commentscount": "Megjegyzések ({{$a}})",
+    "close": "Bezárás",
+    "comments": "Megjegyzései",
+    "commentscount": "Megjegyzések  ({{$a}})",
     "completion-alt-auto-fail": "Teljesítve: {{$a}}  (a teljesítési pontszámot nem érte el)",
     "completion-alt-auto-n": "Nincs teljesítve:  {{$a}}",
     "completion-alt-auto-pass": "Teljesítve: {{$a}} (a teljesítési pontszámot elérte)",
@@ -19,22 +19,22 @@
     "completion-alt-manual-y": "Teljesítve:  {{$a}}, teljesítetlenként való megjelöléséhez válassza ki.",
     "confirmdeletefile": "Biztosan törli ezt az állományt?",
     "content": "Tartalom",
-    "continue": "Tovább",
+    "continue": "Folytatás",
     "course": "Kurzus",
     "coursedetails": "Kurzusadatok",
     "date": "Dátum",
     "day": "nap",
-    "days": "Nap",
+    "days": "nap",
     "decsep": ",",
     "defaultvalue": "Alapeset ({{$a}})",
     "delete": "Törlés",
     "deleting": "Törlés",
-    "description": "Leírás",
+    "description": "Bevezető szöveg",
     "done": "Kész",
-    "download": "Az exportált kategóriafájl letöltéséhez kattintson",
+    "download": "Letöltés",
     "downloading": "Letöltés...",
     "edit": "Szerkesztés",
-    "error": "Ismeretlen hiba történt!",
+    "error": "Hiba",
     "errordownloading": "Nem sikerült letölteni az állományt.",
     "filename": "Állománynév",
     "folder": "Mappa",
@@ -46,14 +46,14 @@
     "hide": "Elrejtés",
     "hour": "óra",
     "hours": "óra",
-    "info": "Infó",
+    "info": "Információ",
     "labelsep": ":",
-    "lastmodified": "Utolsó módosítás dátuma:",
+    "lastmodified": "Utolsó módosítás",
     "listsep": ";",
-    "loading": "Betöltés...",
+    "loading": "Betöltés",
     "lostconnection": "A kapcsolat megszakadt, kacsolódjon újból. Jele érvénytelen.",
     "maxsizeandattachments": "Új állományok maximális mérete: {{$a.size}}, maximális csatolt állomány: {{$a.attachments}}",
-    "min": "Legalacsonyabb",
+    "min": "p",
     "mins": "perc",
     "mod_assign": "Feladat",
     "mod_chat": "Csevegés",
@@ -68,39 +68,39 @@
     "mod_survey": "Felmérés",
     "mod_wiki": "Wiki",
     "moduleintro": "Leírás",
-    "name": "Név",
+    "name": "Név:",
     "networkerrormsg": "A hálózat nincs bekapcsolva vagy nem működik.",
     "never": "Soha",
-    "next": "Tovább",
+    "next": "Következő",
     "no": "Nem",
-    "nocomments": "Nincs megjegyzés",
-    "nograde": "Nincs osztályzat",
-    "none": "Egy sem",
+    "nocomments": "Nincs megjegyzés.",
+    "nograde": "Nincs pont",
+    "none": "Nincs",
     "nopasswordchangeforced": "A továbblépéshez először módosítania kell a jelszavát, ehhez azonban nem áll rendelkezésre megfelelő oldal. Forduljon a Moodle rendszergazdájához.",
     "nopermissions": "Ehhez ({{$a}}) jelenleg nincs engedélye",
     "noresults": "Nincs eredmény",
     "notice": "Tájékoztatás",
     "now": "most",
     "numwords": "{{$a}} szó",
-    "offline": "Offline",
+    "offline": "Nincs szükség neten keresztüli leadásra",
     "online": "Online",
     "pagea": "{{$a}} oldal",
     "phone": "Telefon",
     "pictureof": "Kép",
-    "previous": "Előző állapot",
+    "previous": "Előző",
     "refresh": "Frissítés",
     "required": "Kitöltendő",
     "save": "Mentés",
-    "search": "Keresés...",
-    "searching": "Keresés helye ...",
+    "search": "Keresés",
+    "searching": "Hol keres?",
     "searchresults": "Keresési eredmények",
     "sec": "mp",
     "secs": "mp",
     "seemoredetail": "A részletekért kattintson ide",
-    "send": "Küldés",
+    "send": "Elküld",
     "sending": "Küldés",
     "serverconnection": "Hiba a szerverhez csatlakozás közben",
-    "show": "Mutat",
+    "show": "Megjelenítés",
     "site": "Portál",
     "sizeb": "bájt",
     "sizegb": "GB",
@@ -121,9 +121,9 @@
     "userdetails": "Felhasználó adatai",
     "usernotfullysetup": "A felhasználó beállítása még nincs kész",
     "users": "Felhasználó",
-    "view": "Megtekintés",
+    "view": "Nézet",
     "viewprofile": "Profil megtekintése",
-    "year": "Év",
+    "year": "év",
     "years": "év",
     "yes": "Igen"
 }
\ No newline at end of file
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index 81fe258864b..d117184e686 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -2,7 +2,7 @@
     "allparticipants": "Tutti i partecipanti",
     "android": "Android",
     "areyousure": "Sei sicuro?",
-    "back": "Torna all'anteprima della domanda",
+    "back": "Indietro",
     "cancel": "Annulla",
     "cannotconnect": "Impossibile connettersi: verificare che l'URL sia corretto e che il sito usi Moodle 2.4 o versioni successive.",
     "cannotdownloadfiles": "Nel servizio Mobile Lo scaricamento di file è disabilitato. Per favore contatta l'amministratore del sito.",
@@ -12,9 +12,9 @@
     "clearsearch": "Pulisci la ricerca",
     "clicktohideshow": "Click per aprire e chiudere",
     "clicktoseefull": "Click per visualizzare il contenuto completo.",
-    "close": "Chiudi finestra",
-    "comments": "Commenti",
-    "commentscount": "Commenti ({{$a}})",
+    "close": "Chiudi",
+    "comments": "I tuoi commenti",
+    "commentscount": "Commenti: ({{$a}})",
     "commentsnotworking": "Non è possibile scaricare i commenti",
     "completion-alt-auto-fail": "Completato: {{$a}} (senza raggiungere la sufficienza)",
     "completion-alt-auto-n": "Non completata: {{$a}}",
@@ -30,22 +30,22 @@
     "course": "Corso",
     "coursedetails": "Dettagli corso",
     "date": "Data",
-    "day": "Giorni",
-    "days": "Giorni",
+    "day": "giorno",
+    "days": "giorni",
     "decsep": ",",
     "defaultvalue": "Default ({{$a}})",
     "delete": "Elimina",
     "deleting": "Eliminazione",
-    "description": "Descrizione",
+    "description": "Commento",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
     "done": "Fatto",
-    "download": "Click per il download del file della categoria esportata",
+    "download": "Download",
     "downloading": "Scaricamento in corso",
     "edit": "Modifica",
-    "error": "Si è verificato un errore sconosciuto!",
+    "error": "Errore",
     "errorchangecompletion": "Si è verificato un errore durante la modifica dello stato di completamento. Per favore riprova.",
     "errordeletefile": "Si è verificato un errore durante l'eliminazione del file. Per favore riprova.",
     "errordownloading": "Si è verificato un errore durante lo scaricamento del file.",
@@ -70,16 +70,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Immagine",
     "imageviewer": "Visualizzatore di immagini",
-    "info": "Info",
+    "info": "Informazioni",
     "ios": "iOS",
     "labelsep": ": ",
-    "lastmodified": "Ultima modifica",
+    "lastmodified": "Ultime modifiche",
     "lastsync": "Ultima sincronizzazione",
     "listsep": ";",
-    "loading": "Caricamento in corso...",
+    "loading": "Caricamento in corso",
     "lostconnection": "La connessione è stata perduta. Il tuo token non è più valido.",
     "maxsizeandattachments": "Dimensione massima per i file nuovi: {{$a.size}}, numero massimo di allegati: {{$a.attachments}}",
-    "min": "Minimo",
+    "min": "min.",
     "mins": "min.",
     "mod_assign": "Compito",
     "mod_assignment": "Compito",
@@ -109,13 +109,13 @@
     "mod_workshop": "Workshop",
     "moduleintro": "Descrizione",
     "mygroups": "I miei gruppi",
-    "name": "Nome",
+    "name": "Titolo",
     "networkerrormsg": "La rete non è abilitata o non funziona.",
     "never": "Mai",
-    "next": "Continua",
+    "next": "Successivo",
     "no": "No",
     "nocomments": "Non ci sono commenti",
-    "nograde": "Nessuna valutazione.",
+    "nograde": "Senza valutazione",
     "none": "Nessuno",
     "nopasswordchangeforced": "Non puoi proseguire senza modificare la tua password, ma non c'è una pagina per cambiarla. Contatta il tuo amministratore Moodle.",
     "nopermissions": "Spiacente, ma attualmente non avete il permesso per fare questo ({{$a}})",
@@ -124,7 +124,7 @@
     "notice": "Nota",
     "now": "adesso",
     "numwords": "{{$a}} parole",
-    "offline": "Offline",
+    "offline": "Questo compito non richiede consegne online",
     "online": "Online",
     "openfullimage": "Click per visualizare l'immagine a dimensioni reali",
     "openinbrowser": "Apri nel browser",
@@ -133,20 +133,20 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefono",
     "pictureof": "Immagine {{$a}}",
-    "previous": "Stato precedente",
+    "previous": "Precedente",
     "pulltorefresh": "Trascina per aggiornare",
     "refresh": "Aggiorna",
-    "required": "Obbligatorio",
+    "required": "La risposta è obbligatoria",
     "requireduserdatamissing": "Nel profilo di questo utente mancano alcuni dati. Per favore compila i dati mancanti in Moodle e riprova.<br>{{$a}}",
     "retry": "Riprova",
     "save": "Salva",
-    "search": "Cerca...",
-    "searching": "Ricerca in ...",
-    "searchresults": "Risultati delle ricerche",
+    "search": "Cerca",
+    "searching": "Cerca in",
+    "searchresults": "Risultati della ricerca",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
-    "send": "Invia",
+    "send": "invia",
     "sending": "Invio in corso",
     "serverconnection": "Si è verificato un errore durante la connessione al server",
     "show": "Visualizza",
@@ -161,7 +161,7 @@
     "success": "Operazione eseguita con successo",
     "tablet": "Tablet",
     "teachers": "Docenti",
-    "time": "Ora",
+    "time": "Data/Ora",
     "timesup": "Tempo scaduto!",
     "today": "Oggi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -179,7 +179,7 @@
     "whoops": "Oops!",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La funzione webservice non è disponibile.",
-    "year": "Anni",
+    "year": "anno",
     "years": "anni",
-    "yes": "Si"
+    "yes": "Sì"
 }
\ No newline at end of file
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 61a73bc6dea..72124e5922a 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "すべての参加者",
     "areyousure": "本当によろしいですか?",
-    "back": "問題のプレビューに戻る",
+    "back": "戻る",
     "cancel": "キャンセル",
     "cannotconnect": "接続できません：正しいURLを入力しているか、サイトのMoodleが2.4以降であることを確認してください。",
     "category": "カテゴリ",
     "choose": "選択",
     "choosedots": "選択 ...",
     "clicktohideshow": "展開または折りたたむにはここをクリックしてください。",
-    "close": "ウィンドウを閉じる",
-    "comments": "コメント",
+    "close": "閉じる",
+    "comments": "あなたのコメント",
     "commentscount": "コメント ({{$a}})",
     "completion-alt-auto-fail": "完了: {{$a}} (合格点未到達)",
     "completion-alt-auto-n": "未完了: {{$a}}",
@@ -31,10 +31,10 @@
     "deleting": "削除中",
     "description": "説明",
     "done": "完了",
-    "download": "エクスポートしたカテゴリファイルをダウンロードする",
+    "download": "ダウンロード",
     "downloading": "ダウンロード中 ...",
     "edit": "編集",
-    "error": "不明なエラーが発生しました!",
+    "error": "エラー",
     "errordownloading": "ファイルのダウンロードのエラー",
     "filename": "ファイル名",
     "folder": "フォルダ",
@@ -46,14 +46,14 @@
     "hide": "非表示",
     "hour": "時間",
     "hours": "時間",
-    "info": "インフォメーション",
+    "info": "情報",
     "labelsep": ":",
     "lastmodified": "最終更新日時",
     "listsep": ",",
-    "loading": "読み込み中 ...",
+    "loading": "読み込み",
     "lostconnection": "あなたのトークンが無効になったため、再接続に必要な情報がサーバにはありません。",
     "maxsizeandattachments": "新しいファイルの最大サイズ: {{$a.size}} / 最大添付: {{$a.attachments}}",
-    "min": "最低",
+    "min": "分",
     "mins": "分",
     "mod_assign": "課題",
     "mod_chat": "チャット",
@@ -71,9 +71,9 @@
     "name": "名称",
     "networkerrormsg": "ネットワークが無効もしくは機能していません",
     "never": "なし",
-    "next": "続ける",
+    "next": "次へ",
     "no": "No",
-    "nocomments": "コメントはありません。",
+    "nocomments": "コメントなし",
     "nograde": "評点なし",
     "none": "なし",
     "nopasswordchangeforced": "あなたはパスワードを変更せずに次へ進むことはできません。しかし、パスワードを変更するため利用できるページがありません。あなたのMoodle管理者にご連絡ください。",
@@ -82,17 +82,17 @@
     "notice": "警告",
     "now": "現在",
     "numwords": "{{$a}} 語",
-    "offline": "オフライン",
+    "offline": "オンライン提出不要",
     "online": "オンライン",
     "pagea": "ページ {{$a}}",
     "phone": "電話",
     "pictureof": "画像 {{$a}}",
-    "previous": "前の状態に戻す",
+    "previous": "前へ",
     "refresh": "リフレッシュ",
     "required": "必須",
     "save": "保存",
-    "search": "検索 ...",
-    "searching": "検索 ...",
+    "search": "検索",
+    "searching": "検索:",
     "searchresults": "検索結果",
     "sec": "秒",
     "secs": "秒",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 9f682afb1e9..515a14f6bdc 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -3,18 +3,18 @@
     "allparticipants": "Visi dalyviai",
     "android": "Android",
     "areyousure": "Ar Jūs tikras?",
-    "back": "Grįžti į klausimo peržiūrą",
+    "back": "Grįžti",
     "cancel": "Atšaukti",
     "cannotconnect": "Negalima prisijungti: patikrinkite, ar teisingai įvedėte URL adresą, ar Jūsų svetainė naudoja Moodle 2.4. ar vėlesnę versiją.",
     "cannotdownloadfiles": "Jūsų mobiliuoju ryšiu negalima atsisiųsti failo. Prašome susisiekti su svetainės administratoriumi.",
-    "category": "Kategorija",
+    "category": "Kursų kategorija",
     "choose": "Pasirinkite",
     "choosedots": "Pasirinkite...",
     "clearsearch": "Išvalyti peiškos laukelį",
     "clicktohideshow": "Spustelėkite, kad išplėstumėte ar sutrauktumėte",
     "clicktoseefull": "Paspauskite norėdami pamatyti visą turinį.",
-    "close": "Uždaryti langą",
-    "comments": "Komentarai",
+    "close": "Uždaryti",
+    "comments": "Jūsų komentarai",
     "commentscount": "Komentarai ({{$a}})",
     "commentsnotworking": "Komentarų negalima ištaisyti",
     "completion-alt-auto-fail": "Užbaigta: {{$a}} (negautas išlaikymo įvertis)",
@@ -34,12 +34,12 @@
     "currentdevice": "Dabartinis prietaisas",
     "datastoredoffline": "Duomenys saugomi įrenginyje, nes šiuo metu negalima išsiųsti. Bus vėlaiu išsiųsti automatiškai.",
     "date": "Data",
-    "day": "Diena(-os)",
-    "days": "Dienos",
+    "day": "diena",
+    "days": "dienos",
     "decsep": ".",
-    "delete": "Pašalinti",
+    "delete": "Naikinti",
     "deleting": "Naikinama",
-    "description": "Aprašymas",
+    "description": "Aprašas",
     "dfdaymonthyear": "MM-DD-MMMM",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -48,10 +48,10 @@
     "discard": "Atmesti",
     "dismiss": "Praleisti",
     "done": "Atlikta",
-    "download": "Spustelėkite, kad atsisiųstumėte eksportuotą kategorijos failą",
+    "download": "Atsisiųsti",
     "downloading": "Siunčiama",
     "edit": "Redaguoti",
-    "error": "Įvyko nežinoma klaida!",
+    "error": "Klaida",
     "errorchangecompletion": "Klaida keičiant baigimo būseną. Pabandykite dar kartą.",
     "errordeletefile": "Klaida trinant failą. Pabandykite dar kartą.",
     "errordownloading": "Klaida siunčiant failą.",
@@ -74,7 +74,7 @@
     "groupsseparate": "Atskiros grupės",
     "groupsvisible": "Matomos grupės",
     "hasdatatosync": "{{$a}} turi duomenis, kuriuos reikia sinchronizuoti.",
-    "help": "Pagalba",
+    "help": "Žinynas",
     "hide": "Slėpti",
     "hour": "valanda",
     "hours": "valandos",
@@ -84,13 +84,13 @@
     "info": "Informacija",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Paskutinį kartą keista",
+    "lastmodified": "Paskutinį kartą modifikuota",
     "lastsync": "Paskutinis sinchronizavimas",
     "listsep": ";",
-    "loading": "Kraunasi...",
+    "loading": "Įkeliama...",
     "lostconnection": "Jūsų atpažinimo kodas neteisingas arba negalioja, turėsite vėl prisijungti prie svetainės.",
     "maxsizeandattachments": "Maksimalus naujo failo dydis: {{$a.size}}, maksimalus priedų skaičius: {{$a.attachments}}",
-    "min": "Žemiausias",
+    "min": "min.",
     "mins": "min.",
     "mod_assign": "Užduotis",
     "mod_assignment": "Užduotis",
@@ -120,14 +120,14 @@
     "mod_workshop": "Darbas grupėje",
     "moduleintro": "Aprašas",
     "mygroups": "Mano grupės",
-    "name": "Pavadinimas",
+    "name": "Vardas",
     "networkerrormsg": "Tinklas nepasiekiamas arba neveikia.",
     "never": "Niekada",
-    "next": "Tęsti",
+    "next": "Pirmyn",
     "no": "Ne",
-    "nocomments": "Nėra komentarų",
-    "nograde": "Nėra įvertinimų.",
-    "none": "Nėra",
+    "nocomments": "Jokių komentarų",
+    "nograde": "Nėra įverčio",
+    "none": "Nei vienas",
     "nopasswordchangeforced": "Negalite tęsti nepakeitę slaptažodžio, tačiau nėra slaptažodžio keitimo puslapio. Susisiekite su „Moodle“ administratoriumi.",
     "nopermissions": "Atsiprašome, tačiau šiuo metu jūs neturite teisės atlikti šio veiksmo",
     "noresults": "Nėra rezultatų",
@@ -136,7 +136,7 @@
     "notsent": "Neišsiųsta",
     "now": "dabar",
     "numwords": "Žodžių: {{$a}}",
-    "offline": "Neprisijungęs",
+    "offline": "Nereikia įkelti darbų į svetainę",
     "online": "Prisijungęs",
     "openfullimage": "Paspauskite, norėdami matyti visą vaizdą",
     "openinbrowser": "Atidaryti naršyklėje",
@@ -145,21 +145,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefonas",
     "pictureof": "{{$a}} paveikslėlis",
-    "previous": "Ankstesnė būsena",
+    "previous": "Ankstesnis",
     "pulltorefresh": "Atnaujinti",
     "redirectingtosite": "Būsite nukreiptas į svetainę.",
     "refresh": "Atnaujinti",
-    "required": "Privalomas",
+    "required": "Būtina",
     "requireduserdatamissing": "Trūkta vartotojo duomenų.  Prašome užpildyti duomenis Moodle ir pabandyti dar kartą.<br>{{$a}}",
     "retry": "Bandykite dar kartą",
-    "save": "Išsaugoti",
-    "search": "Paieška...",
-    "searching": "Ieškoma...",
+    "save": "Įrašyti",
+    "search": "Ieškoti",
+    "searching": "Ieškoti",
     "searchresults": "Ieškos rezultatai",
     "sec": "sek.",
     "secs": "sek.",
     "seemoredetail": "Spustelėkite čia, kad pamatytumėte daugiau informacijos",
-    "send": "Siųsti",
+    "send": "siųsti",
     "sending": "Siunčiama",
     "serverconnection": "Klaida jungiantis į serverį",
     "show": "Rodyti",
@@ -199,7 +199,7 @@
     "whyisthishappening": "Kodėl tai nutiko?",
     "windowsphone": "Windows telefonas",
     "wsfunctionnotavailable": "Interneto paslaugų funkcija nepasiekiama.",
-    "year": "Metai (-ų)",
+    "year": "metai",
     "years": "metai",
     "yes": "Taip"
 }
\ No newline at end of file
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index 7018500b84e..961e7632554 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -3,7 +3,7 @@
     "allparticipants": "Alle deelnemers",
     "android": "Android",
     "areyousure": "Weet je het zeker?",
-    "back": "Terug naar controleer vraag",
+    "back": "Terug",
     "cancel": "Annuleer",
     "cannotconnect": "Kan niet verbinden: controleer of je de URL juist hebt ingegeven en dat je site Moodle 2.4 of recenter gebruikt.",
     "cannotdownloadfiles": "Bestanden downloaden is uitgeschakeld voor jouw mobiele service. Neem contact op met je systeembeheerder.",
@@ -13,8 +13,8 @@
     "clearsearch": "Zoekresultaten leegmaken",
     "clicktohideshow": "Klik om te vergroten of te verkleinen",
     "clicktoseefull": "Klik hier om de volledige inhoud te zien",
-    "close": "Sluit weergave test",
-    "comments": "Opmerkingen",
+    "close": "Sluit",
+    "comments": "Notities",
     "commentscount": "Opmerkingen ({{$a}})",
     "commentsnotworking": "Opmerkingen konden niet opgehaald worden",
     "completion-alt-auto-fail": "Voltooid:  {{$a}}  (bereikte het cijfer voor geslaagd niet)",
@@ -29,20 +29,20 @@
     "confirmopeninbrowser": "Wil je het openen in je browser?",
     "content": "Inhoud",
     "contenteditingsynced": "De inhoud die je aan het bewerken bent, is gesynchroniseerd.",
-    "continue": "Ga verder",
+    "continue": "Ga door",
     "copiedtoclipboard": "Tekst gekopieerd naar klembord",
     "course": "Cursus",
     "coursedetails": "Cursusdetails",
     "currentdevice": "Huidig apparaat",
     "datastoredoffline": "Gegevens die bewaard werden op het toestel konden niet verstuurd worden. Ze zullen later automatisch verzonden worden.",
     "date": "Datum",
-    "day": "Dag(en)",
-    "days": "Dagen",
+    "day": "dag",
+    "days": "dagen",
     "decsep": ",",
     "defaultvalue": "Standaard ({{$a}})",
     "delete": "Verwijder",
     "deleting": "Verwijderen",
-    "description": "Beschrijving",
+    "description": "Inleidende tekst",
     "dfdaymonthyear": "MM-DD-JJJJ",
     "dfdayweekmonth": "ddd, D, MMM",
     "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
@@ -52,11 +52,11 @@
     "discard": "Verwerpen",
     "dismiss": "Verwijderen",
     "done": "Voltooid",
-    "download": "Klik om het bestand met de geëxporteerde categorie te downloaden",
+    "download": "Download",
     "downloading": "Downloaden",
-    "edit": "Bewerk",
+    "edit": "Wijzig",
     "emptysplit": "Deze pagina zal leeg verschijnen als het linker paneel leeg of aan het laden is.",
-    "error": "Onbekende fout!",
+    "error": "Fout",
     "errorchangecompletion": "Er is een fout opgetreden tijdens het wijzigen van de voltooiingsstatus. Probeer opnieuw.",
     "errordeletefile": "Fout tijdens het verwijderen van het bestand. Probeer opnieuw.",
     "errordownloading": "Fout bij downloaden bestand",
@@ -87,17 +87,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Afbeelding",
     "imageviewer": "Afbeeldingsviewer",
-    "info": "Info",
+    "info": "Informatie",
     "ios": "iOS",
     "labelsep": ": ",
-    "lastmodified": "Laatst gewijzigd",
+    "lastmodified": "Laatste wijziging",
     "lastsync": "Laatste synchronisatie",
     "listsep": ";",
-    "loading": "Aan het laden...",
+    "loading": "Aan het laden",
     "loadmore": "Meer laden",
     "lostconnection": "We zijn de verbinding kwijt en moeten opnieuw verbinden. Je token is nu ongeldig.",
     "maxsizeandattachments": "Maximale grootte voor nieuwe bestanden: {{$a.size}}, maximum aantal bijlagen: {{$a.attachments}}",
-    "min": "Laagste",
+    "min": "minuut",
     "mins": "minuten",
     "mod_assign": "Opdracht",
     "mod_assignment": "Opdracht",
@@ -130,20 +130,20 @@
     "name": "Naam",
     "networkerrormsg": "Netwerk niet ingeschakeld of werkt niet.",
     "never": "Nooit",
-    "next": "Volgende",
+    "next": "VolgendeAdm",
     "no": "Nee",
-    "nocomments": "Er zijn geen opmerkingen",
-    "nograde": "Geen cijfer.",
+    "nocomments": "Geen commentaren",
+    "nograde": "Nog geen cijfer",
     "none": "Geen",
     "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te wijzigen, hoewel er geen pagina voorzien is om dat te doen. Neem contact op met je Moodlebeheerder",
     "nopermissions": "Sorry, maar je hebt nu niet het recht om dat te doen ({{$a}}).",
-    "noresults": "Geen resultaat",
+    "noresults": "Geen resultaten",
     "notapplicable": "n/a",
     "notice": "Opmerking",
     "notsent": "Niet verstuurd",
     "now": "Nu",
     "numwords": "{{$a}} woorden",
-    "offline": "Offline",
+    "offline": "Je hoeft niets online in te sturen",
     "online": "Online",
     "openfullimage": "Klik hier om de afbeelding op volledige grootte weer te geven",
     "openinbrowser": "Open in browser",
@@ -152,24 +152,24 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefoon",
     "pictureof": "Foto van {{$a}}",
-    "previous": "Vorige status",
+    "previous": "Vorige",
     "pulltorefresh": "Slepen om te verversen",
     "redirectingtosite": "Je wordt doorgestuurd naar de site.",
     "refresh": "Vernieuw",
-    "required": "Vereist",
+    "required": "Verplicht",
     "requireduserdatamissing": "Er ontbreken vereiste gegevens in het profiel van deze gebruiker. Vul deze gegevens in op je Moodle site en probeer opnieuw.<br>{{$a}}",
     "retry": "Probeer opnieuw",
     "save": "Bewaar",
-    "search": "Zoeken...",
-    "searching": "Zoeken in ...",
+    "search": "Zoek",
+    "searching": "Zoek in",
     "searchresults": "Zoekresultaten",
     "sec": "seconde",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
-    "send": "Verstuur",
+    "send": "Stuur",
     "sending": "Versturen",
     "serverconnection": "Fout bij het verbinden met de server",
-    "show": "Laat zien",
+    "show": "Toon",
     "showmore": "Toon meer...",
     "site": "Site",
     "sitemaintenance": "De site is in onderhoud en is op dit ogenblik niet beschikbaar.",
@@ -180,7 +180,7 @@
     "sizetb": "TB",
     "sorry": "Sorry...",
     "start": "Start",
-    "submit": "Afgeven",
+    "submit": "Insturen",
     "success": "Succes",
     "tablet": "Tablet",
     "teachers": "leraren",
@@ -202,7 +202,7 @@
     "userdetails": "Gebruikersdetails",
     "usernotfullysetup": "Gebruiker niet volledig ingesteld",
     "users": "Gebruikers",
-    "view": "Bekijk",
+    "view": "Bekijken",
     "viewprofile": "Bekijk profiel",
     "warningofflinedatadeleted": "Offline data van {{component}} '{{name}}' is verwijderd. {{error}}",
     "whoops": "Oei!",
diff --git a/www/core/lang/pl.json b/www/core/lang/pl.json
index af444002641..d01910cc16c 100644
--- a/www/core/lang/pl.json
+++ b/www/core/lang/pl.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "Wszyscy uczestnicy",
     "areyousure": "Jesteś pewien?",
-    "back": "Powrót do podglądu pytania",
+    "back": "Wstecz",
     "cancel": "Anuluj",
     "cannotconnect": "Nie można się połączyć: Sprawdź, czy wpisałeś poprawyny adres URL i twoja strona używa Moodle 2.4 lub nowsze.",
     "category": "Kategoria",
     "choose": "Wybierz",
     "choosedots": "Wybierz ...",
     "clicktohideshow": "Kliknij, aby rozwinąć lub zwinąć",
-    "close": "Zamknij okno",
-    "comments": "Komentarze",
+    "close": "Zamknij",
+    "comments": "Twój komentarz",
     "commentscount": "Komentarze ({{$a}})",
     "completion-alt-auto-fail": "Ukończone: {{$a}} (bez pozytywnej oceny)",
     "completion-alt-auto-n": "Nie ukończone: {{$a}}",
@@ -22,18 +22,18 @@
     "continue": "Kontynuuj",
     "course": "Kurs",
     "coursedetails": "Szczegóły kursu",
-    "date": "data",
-    "day": "Dzień/dni",
-    "days": "Dni",
+    "date": "Data",
+    "day": "dzień",
+    "days": "dni",
     "decsep": ",",
     "delete": "Usuń",
     "deleting": "Usuwanie",
-    "description": "Opis",
+    "description": "Wstęp",
     "done": "Wykonane",
-    "download": "Pobierz plik z kategoriami",
+    "download": "Pobierz",
     "downloading": "Pobieranie ...",
-    "edit": "Edytuj",
-    "error": "Wystąpił nieznany błąd!",
+    "edit": "Modyfikuj",
+    "error": "Błąd",
     "filename": "Nazwa pliku",
     "folder": "Folder",
     "forcepasswordchangenotice": "W celu kontynuacji musisz zmienić swoje hasło",
@@ -46,12 +46,12 @@
     "hours": "godz.",
     "info": "Informacja",
     "labelsep": ":&nbsp;",
-    "lastmodified": "Ostatnia modyfikacja:",
+    "lastmodified": "Ostatnia modyfikacja",
     "listsep": ";",
-    "loading": "Ładowanie...",
+    "loading": "Ładowanie",
     "lostconnection": "Straciliśmy połączenie i musisz się połączyć ponowne. Twój token jest teraz nieważny",
     "maxsizeandattachments": "Maksymalny rozmiar dla nowych plików: {{$a.size}}, maksimum załączników: {{$a.attachments}}",
-    "min": "Najniższy",
+    "min": "min",
     "mins": "min.",
     "mod_assign": "Zadanie",
     "mod_chat": "Czat",
@@ -66,13 +66,13 @@
     "mod_survey": "Ankieta",
     "mod_wiki": "Wiki",
     "moduleintro": "Opis",
-    "name": "Nazwa",
+    "name": "Nazwa:",
     "networkerrormsg": "Sieć jest wyłączona lub nie działa.",
     "never": "Nigdy",
-    "next": "Kontynuuj",
+    "next": "Dalej",
     "no": "Nie",
     "nocomments": "Brak komentarzy",
-    "nograde": "Brak oceny.",
+    "nograde": "Brak oceny",
     "none": "Żaden",
     "nopasswordchangeforced": "Nie możesz kontynuować bez zmiany hasła, jakkolwiek nie ma dostępnej strony do tej zmiany. Proszę skontaktować się z Administratorem Moodla.",
     "nopermissions": "Brak odpowiednich uprawnień do wykonania ({{$a}})",
@@ -80,22 +80,22 @@
     "notice": "Powiadomienie",
     "now": "teraz",
     "numwords": "{{$a}} słów",
-    "offline": "Offline",
+    "offline": "Wysyłanie online nie jest wymagane",
     "online": "Online",
     "pagea": "Strona {{$a}}",
     "phone": "Telefon",
     "pictureof": "Obraz {{$a}}",
-    "previous": "Poprzedni stan",
-    "refresh": "Odswież",
+    "previous": "Poprzedni",
+    "refresh": "Odśwież",
     "required": "Wymagane",
     "save": "Zapisz",
-    "search": "Szukaj...",
-    "searching": "Wyszukiwanie w ...",
-    "searchresults": "Szukaj w rezultatach",
+    "search": "Wyszukaj",
+    "searching": "Szukaj w",
+    "searchresults": "Wyniki wyszukiwania",
     "sec": "sek",
     "secs": "sek.",
     "seemoredetail": "Kliknij aby zobaczyć więcej szczegółów",
-    "send": "Wyślij",
+    "send": "wyślij",
     "sending": "Wysyłanie",
     "serverconnection": "Błąd podczas łączenia się z serwerem",
     "show": "Pokaż",
@@ -105,7 +105,7 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "start": "Rozpocznij",
-    "submit": "Zatwierdź",
+    "submit": "Prześlij",
     "success": "Gotowe",
     "teachers": "Prowadzący",
     "time": "Czas",
@@ -118,9 +118,9 @@
     "userdeleted": "To konto użytkownika zostało usunięte",
     "userdetails": "Szczegóły użytkownika",
     "users": "Użytkownicy",
-    "view": "Przegląd",
+    "view": "Wejście",
     "viewprofile": "Zobacz profil",
-    "year": "Rok/lata",
+    "year": "rok",
     "years": "lata",
     "yes": "Tak"
 }
\ No newline at end of file
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 0cf22e1b2e0..a3e76230e41 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos os participantes",
     "android": "Android",
     "areyousure": "Você tem certeza?",
-    "back": "Voltar à visualização prévia da questão",
+    "back": "Voltar",
     "cancel": "Cancelar",
     "cannotconnect": "Não é possível conectar-se: Verifique se digitou a URL corretamente e se seu site usa o Moodle 2.4 ou posterior.",
     "cannotdownloadfiles": "Download de arquivos está desabilitado no seu serviço Mobile. Por favor, contate o administrador do site.",
@@ -13,8 +13,8 @@
     "clearsearch": "Limpar busca",
     "clicktohideshow": "Clique para expandir ou contrair",
     "clicktoseefull": "Clique para ver o conteúdo completo.",
-    "close": "Fechar janela",
-    "comments": "Comentários",
+    "close": "Fechar",
+    "comments": "Seus comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Os comentários não podem ser recuperados",
     "completion-alt-auto-fail": "Concluído: {{$a}} (não obteve nota para aprovação)",
@@ -36,12 +36,12 @@
     "currentdevice": "Dispositivo atual",
     "datastoredoffline": "Os dados foram guardados no dispositivo porque não foi possível enviar agora. Os dados serão automaticamente enviados mais tarde.",
     "date": "Data",
-    "day": "Dia(s)",
-    "days": "Dias",
+    "day": "dia",
+    "days": "dias",
     "decsep": ",",
-    "delete": "Excluir",
+    "delete": "Cancelar",
     "deleting": "Excluindo",
-    "description": "Descrição",
+    "description": "Texto do link",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -50,10 +50,10 @@
     "discard": "Descartar",
     "dismiss": "Dispersar",
     "done": "Feito",
-    "download": "Clique para baixar o arquivo de categoria exportado",
+    "download": "Download",
     "downloading": "Baixando",
     "edit": "Editar",
-    "error": "Ocorreu um erro desconhecido!",
+    "error": "Erro",
     "errorchangecompletion": "Ocorreu um erro ao alterar o status de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao excluir o arquivo. Por favor tente novamente.",
     "errordownloading": "Erro ao baixar o arquivo",
@@ -84,16 +84,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagem",
     "imageviewer": "Visualizador de imagens",
-    "info": "Informações",
+    "info": "Informação",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
-    "lastmodified": "Última modificação",
+    "lastmodified": "Última atualização",
     "lastsync": "Última sincronização",
     "listsep": ";",
-    "loading": "Carregando...",
+    "loading": "Carregando",
     "lostconnection": "Perdemos conexão. Você precisa se reconectar. Seu token agora está inválido.",
     "maxsizeandattachments": "Tamanho máximo para novos arquivos: {{$a.size}}, máximo de anexos: {{$a.attachments}}",
-    "min": "Pior",
+    "min": "minuto",
     "mins": "minutos",
     "mod_assign": "Tarefa",
     "mod_assignment": "Tarefa",
@@ -126,10 +126,10 @@
     "name": "Nome",
     "networkerrormsg": "Rede não habilitada ou não está funcionado",
     "never": "Nunca",
-    "next": "Próxima",
+    "next": "Próximo",
     "no": "Não",
-    "nocomments": "Não existem comentários",
-    "nograde": "Não há nota",
+    "nocomments": "Nenhum comentário",
+    "nograde": "Nenhuma nota",
     "none": "Nenhum",
     "nopasswordchangeforced": "Você não pode continuar sem mudar sua senha. Mas infelizmente não existe uma página para esse propósito.\nPor favor contate o Administrador Moodle.",
     "nopermissions": "Você não tem permissão para {{$a}}",
@@ -139,7 +139,7 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavras",
-    "offline": "Desconectado",
+    "offline": "Não há envios online solicitados",
     "online": "Conectado",
     "openfullimage": "Clique aqui para exibir a imagem no tamanho completo",
     "openinbrowser": "Abrir no navegador",
@@ -148,24 +148,24 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Fone",
     "pictureof": "Imagem de {{$a}}",
-    "previous": "Estado anterior",
+    "previous": "Anterior",
     "pulltorefresh": "Puxe para atualizar",
     "redirectingtosite": "Você será redirecionado para o site.",
     "refresh": "Atualizar",
-    "required": "Obrigatório",
+    "required": "Necessários",
     "requireduserdatamissing": "Este usuário não possui alguns dados de perfil exigidos. Por favor, preencha estes dados em seu Moodle e tente novamente. <br> {{$a}}",
     "retry": "Tentar novamente",
-    "save": "Salvar",
-    "search": "Procurar...",
-    "searching": "Pesquisando em....",
+    "save": "Gravar",
+    "search": "Buscar",
+    "searching": "Buscar em",
     "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para mais detalhes",
-    "send": "Enviar",
+    "send": "enviar",
     "sending": "Enviando",
     "serverconnection": "Erro ao conectar ao servidor",
-    "show": "Visualizar",
+    "show": "Mostrar",
     "showmore": "Exibir mais...",
     "site": "Site",
     "sitemaintenance": "Os site está em manutenção e atualmente não está disponível",
@@ -181,7 +181,7 @@
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
-    "time": "Tempo",
+    "time": "Hora",
     "timesup": "Acabou o tempo de duração!",
     "today": "Hoje",
     "tryagain": "Tente de novo",
@@ -197,14 +197,14 @@
     "userdeleted": "Esta conta de usuário foi cancelada",
     "userdetails": "Detalhes do usuário",
     "users": "Usuários",
-    "view": "Visualizar",
+    "view": "Ver",
     "viewprofile": "Ver perfil",
     "warningofflinedatadeleted": "Dados offline de {{component}} '{{name}}' foram excluídos. {{error}}",
     "whoops": "Oops!",
     "whyisthishappening": "Por que isso está acontecendo?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "A função do webservice não está disponível.",
-    "year": "Ano(s)",
+    "year": "ano",
     "years": "anos",
     "yes": "Sim"
 }
\ No newline at end of file
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index ce3895ea1c0..eeeab5b3b52 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -3,7 +3,7 @@
     "allparticipants": "Todos",
     "android": "Android",
     "areyousure": "Tem a certeza?",
-    "back": "Voltar à pré-visualização da pergunta",
+    "back": "Voltar",
     "cancel": "Cancelar",
     "cannotconnect": "Não é possível estabelecer a ligação: Verifique se digitou o URL corretamente e se o seu site Moodle possui a versão 2.4 ou superior.",
     "cannotdownloadfiles": "O seu serviço Moodle não permite descarregar ficheiros. Por favor, contacte o administrador do site.",
@@ -13,8 +13,8 @@
     "clearsearch": "Limpar pesquisa",
     "clicktohideshow": "Clique para expandir ou contrair",
     "clicktoseefull": "Clique para ver todos os conteúdos.",
-    "close": "Fechar janela",
-    "comments": "Comentários",
+    "close": "Fechar",
+    "comments": "Os seus comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Não foi possível recuperar os comentários",
     "completion-alt-auto-fail": "Concluída (não atingiu nota de aprovação)",
@@ -36,8 +36,8 @@
     "currentdevice": "Dispositivo atual",
     "datastoredoffline": "Dados armazenados no dispositivo por não ter sido possível enviar. Serão automaticamente enviados mais tarde.",
     "date": "Data",
-    "day": "Dia(s)",
-    "days": "Dias",
+    "day": "dia",
+    "days": "dias",
     "decsep": ",",
     "delete": "Apagar",
     "deleting": "A apagar",
@@ -51,11 +51,11 @@
     "discard": "Descartar",
     "dismiss": "Dispensar",
     "done": "Concluído",
-    "download": "Clique para descarregar o ficheiro de categorias exportado",
+    "download": "Descarregar",
     "downloading": "A descarregar",
     "edit": "Editar",
     "emptysplit": "Esta página aparecerá em branco se o painel esquerdo estiver vazio ou enquanto estiver a ser carregado.",
-    "error": "Ocorreu um erro desconhecido!",
+    "error": "Erro",
     "errorchangecompletion": "Ocorreu um erro ao alterar o estado de conclusão. Por favor, tente novamente.",
     "errordeletefile": "Erro ao apagar o ficheiro. Por favor, tente novamente.",
     "errordownloading": "Erro ao descarregar ficheiro.",
@@ -86,17 +86,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagem",
     "imageviewer": "Visualizador de imagens",
-    "info": "Informação",
+    "info": "Informação de sistema",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
-    "lastmodified": "Modificado pela última vez:",
+    "lastmodified": "Última alteração",
     "lastsync": "Última sincronização",
     "listsep": ";",
-    "loading": "A carregar...",
+    "loading": "A carregar",
     "loadmore": "Ver mais",
     "lostconnection": "O seu token é inválido ou expirou, terá de se autenticar novamente no site.",
     "maxsizeandattachments": "Tamanho máximo para novos ficheiros: {{$a.size}}, número máximo de anexos: {{$a.attachments}}",
-    "min": "Mais baixa",
+    "min": "minuto",
     "mins": "minutos",
     "mod_assign": "Trabalho",
     "mod_assignment": "Trabalho",
@@ -126,14 +126,14 @@
     "mod_workshop": "Workshop",
     "moduleintro": "Descrição",
     "mygroups": "Meus grupos",
-    "name": "Nome",
+    "name": "Designação",
     "networkerrormsg": "A rede está desativada ou não está a funcionar corretamente.",
     "never": "Nunca",
-    "next": "Continuar",
+    "next": "Seguinte",
     "no": "Não",
-    "nocomments": "Não existem comentários",
-    "nograde": "Sem avaliação",
-    "none": "Nenhuma",
+    "nocomments": "Sem comentários",
+    "nograde": "Nenhuma nota",
+    "none": "Nenhum",
     "nopasswordchangeforced": "Não consegue prosseguir sem modificar a senha, entretanto não existe nenhuma página disponível para a mudar. Por favor contate o Administrador do site Moodle.",
     "nopermissions": "Atualmente, não tem permissões para realizar a operação <b>{{$a}}</b>",
     "noresults": "Sem resultados",
@@ -142,7 +142,7 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavra(s)",
-    "offline": "Inativo",
+    "offline": "Não é necessário submeter nada online",
     "online": "Inativo",
     "openfullimage": "Clique aqui para exibir a imagem em tamanho real",
     "openinbrowser": "Abrir no navegador",
@@ -151,17 +151,17 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefone",
     "pictureof": "Fotografia de {{$a}}",
-    "previous": "Estado anterior",
+    "previous": "Anterior",
     "pulltorefresh": "Puxe para atualizar",
     "redirectingtosite": "Irá ser redirecionado para o site.",
     "refresh": "Atualizar",
-    "required": "Obrigatório",
+    "required": "Resposta obrigatória",
     "requireduserdatamissing": "Este utilizador não possui todos os dados de perfil obrigatórios. Por favor, preencha estes dados no seu Moodle e tente novamente. <br> {{$a}}",
     "retry": "Tentar novamente",
-    "save": "Guardar",
-    "search": "Pesquisa...",
-    "searching": "A procurar em...",
-    "searchresults": "Resultados da procura",
+    "save": "Gravar",
+    "search": "Procurar",
+    "searching": "Pesquisar em",
+    "searchresults": "Procurar resultados",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para ver mais detalhes",
@@ -179,12 +179,12 @@
     "sizetb": "TB",
     "sorry": "Desculpe...",
     "start": "Iniciar",
-    "submit": "Submeter",
+    "submit": "Enviar",
     "success": "Operação realizada com sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline que têm de ser sincronizados.",
-    "time": "Horas",
+    "time": "Hora",
     "timesup": "O tempo terminou!",
     "today": "Hoje",
     "tryagain": "Tente novamente",
@@ -208,7 +208,7 @@
     "whyisthishappening": "Por que é que isto está a acontecer?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "A função do webservice não está disponível.",
-    "year": "Ano(s)",
+    "year": "ano",
     "years": "anos",
     "yes": "Sim"
 }
\ No newline at end of file
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index 6972936646e..9672eebabe7 100644
--- a/www/core/lang/ro.json
+++ b/www/core/lang/ro.json
@@ -2,7 +2,7 @@
     "allparticipants": "Toţi participanţii",
     "android": "Adroid",
     "areyousure": "Ești sigur?",
-    "back": "Înapoi la vizualizare întrebare",
+    "back": "Înapoi",
     "cancel": "Anulează",
     "cannotconnect": "A apărut o eroare conectare: verificați dacă ați scris corect adresa URL căutată și dacă siteul folosește cel puțin versiune de Moodle 2.4",
     "cannotdownloadfiles": "Descărcarea de fișiere este dezactivată pentru serviciul mobil. Contactați administratorul siteului.",
@@ -12,8 +12,8 @@
     "clearsearch": "Curățați căutările",
     "clicktohideshow": "Click pentru maximizare sau minimizare",
     "clicktoseefull": "Apăsați pentru a vedea întregul conținut",
-    "close": "Închide fereastra",
-    "comments": "Comentarii",
+    "close": "Închide",
+    "comments": "Comentariile dumneavoastră",
     "commentscount": "Comentarii ({{$a}})",
     "completion-alt-auto-fail": "Finalizat: {{$a}} (nu a obținut notă de trecere)",
     "completion-alt-auto-n": "Nu s-a finalizat: {{$a}}",
@@ -24,25 +24,25 @@
     "confirmdeletefile": "Sunteți sigur că doriți să ștergeți acest fișier?",
     "confirmopeninbrowser": "Doriți să deschideți într-un browser?",
     "content": "Conţinut",
-    "continue": "Mai departe",
+    "continue": "Continuă",
     "course": "Curs",
     "coursedetails": "Detalii curs",
-    "date": "Data",
-    "day": "Zi(Zile)",
-    "days": "Zile",
+    "date": "Dată",
+    "day": "zi",
+    "days": "zile",
     "decsep": ",",
-    "delete": "Ștergeți",
+    "delete": "Şterge",
     "deleting": "În curs de ştergere",
-    "description": "Descriere",
+    "description": "Text introductiv",
     "dfdayweekmonth": "zzz, Z LLL",
     "dflastweekdate": "zzz",
     "dfmediumdate": "LLL",
     "dftimedate": "o[:]mm A",
     "done": "Terminat",
-    "download": "Executaţi clic pentru a descărca fişierul cu categorii exportate",
+    "download": "Descarcă",
     "downloading": "Se descarcă",
-    "edit": "Editare",
-    "error": "A apărut o eroare necunoscută!",
+    "edit": "Editează",
+    "error": "Eroare",
     "errorchangecompletion": "A apărut o eroare în timpul schimbării nivelului de completare a cursului. Încercați din nou!",
     "errordownloading": "A apărut o eroare la descărcarea fișierului.",
     "errordownloadingsomefiles": "A apărut o eroare la descărcarea fișierelor modulului. Unele fișiere pot lipsi.",
@@ -63,16 +63,16 @@
     "humanreadablesize": "{{mărime}} {{unitate}}",
     "image": "Imagine",
     "imageviewer": "Vizualizator pentru imagini",
-    "info": "Info",
+    "info": "Informaţii",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Modificat ultima dată",
+    "lastmodified": "Ultima modificare",
     "lastsync": "Ultima sincronizare",
     "listsep": ";",
-    "loading": "Se încarcă...",
+    "loading": "Se încarcă",
     "lostconnection": "Tokenul pentru autentificare este invalid sau a expirat; trebuie să va reconectați!",
     "maxsizeandattachments": "Dimensiunea maximă pentru fișierele noi: {{$a.size}}, atașamente maxime: {{$a.attachments}}",
-    "min": "Cel mai mic",
+    "min": "min",
     "mins": "min",
     "mod_assign": "Temă",
     "mod_assignment": "Temă",
@@ -104,19 +104,19 @@
     "name": "Nume",
     "networkerrormsg": "Rețea de date inexistentă sau nefuncțională",
     "never": "Niciodată",
-    "next": "Continuare",
+    "next": "Următorul",
     "no": "Nu",
-    "nocomments": "Nu există comentarii",
-    "nograde": "Fără notă.",
-    "none": "Niciunul",
+    "nocomments": "Nu sunt comentarii",
+    "nograde": "Nicio notă",
+    "none": "nici unul",
     "nopasswordchangeforced": "Nu puteţi trece mai departe fără să vă schimbaţi parola, însă nu există nicio pagină în care să realizaţi această operaţiune. Vă rugăm contactaţi un administrator Moodle.",
     "nopermissions": "Ne pare rău, dar în acest moment nu aveţi permisiunea să realizaţi această operaţiune ({{$a}})",
-    "noresults": "Nu sunt rezultate",
+    "noresults": "Niciun rezultat",
     "notapplicable": "n/a",
     "notice": "Notificare",
     "now": "acum",
     "numwords": "{{$a}} cuvinte",
-    "offline": "Offline",
+    "offline": "Nu se solicită răspunsuri online",
     "online": "Online",
     "openfullimage": "Apăsați aici pentru a vizualiza imaginea la dimensiunea întreagă",
     "openinbrowser": "Deschideți în browser",
@@ -124,22 +124,22 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Imaginea {{$a}}",
-    "previous": "Status anterior",
+    "previous": "Precedent",
     "pulltorefresh": "Trageți în jos pentru actualizare",
-    "refresh": "Actualizați",
-    "required": "Necesar",
+    "refresh": "Reîncarcă",
+    "required": "Obligatoriu",
     "requireduserdatamissing": "Acest utilizator are unele date de profil obligatorii necompletate. Completați aceste date în contul din Moodle și încercați din nou.<br>{{$a}}",
-    "save": "Salvează",
-    "search": "Căutare",
-    "searching": "Caut în ...",
-    "searchresults": "Rezultatele căutării",
+    "save": "Salvare",
+    "search": "Caută",
+    "searching": "Căutare în",
+    "searchresults": "Rezultate căutare",
     "sec": "sec",
     "secs": "secs",
     "seemoredetail": "Apasă aici pentru mai multe detalii",
-    "send": "Trimite",
+    "send": "Trimis",
     "sending": "Se trimite",
     "serverconnection": "Eroare la conectarea la server",
-    "show": "Afișează",
+    "show": "Afişare",
     "site": "Site",
     "sizeb": "bytes",
     "sizegb": "GB",
@@ -151,7 +151,7 @@
     "success": "Succes",
     "tablet": "Tabletă",
     "teachers": "Profesori",
-    "time": "timp",
+    "time": "Ora",
     "timesup": "Timpul a expirat!",
     "today": "Azi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -168,7 +168,7 @@
     "whoops": "Ops!",
     "windowsphone": "Telefon cu sistem de operare Windows",
     "wsfunctionnotavailable": "Această funcție Web nu este disponibilă.",
-    "year": "An (Ani)",
+    "year": "an",
     "years": "ani",
     "yes": "Da"
 }
\ No newline at end of file
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index 0a7e3196954..e9f8b22367f 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -2,8 +2,8 @@
     "allparticipants": "Все участники",
     "android": "Android",
     "areyousure": "Вы уверены?",
-    "back": "Вернуться к просмотру вопроса",
-    "cancel": "Отменить",
+    "back": "Назад",
+    "cancel": "Отмена",
     "cannotconnect": "Не удается подключиться: убедитесь, что Вы ввели правильный URL-адрес и что сайт использует Moodle 2.4 или более поздней версии.",
     "cannotdownloadfiles": "Скачивание файла отключено для мобильных служб. Пожалуйста, свяжитесь с администратором сайта.",
     "category": "Категория",
@@ -11,8 +11,8 @@
     "choosedots": "Выберите...",
     "clearsearch": "Очистить поиск",
     "clicktohideshow": "Нажмите, чтобы раскрыть или скрыть",
-    "close": "Закрыть окно",
-    "comments": "Комментарии",
+    "close": "Закрыть",
+    "comments": "Ваши комментарии",
     "commentscount": "Комментарии ({{$a}})",
     "completion-alt-auto-fail": "Выполнено: {{$a}} (оценка ниже проходного балла)",
     "completion-alt-auto-n": "Не выполнено: {{$a}}",
@@ -27,18 +27,18 @@
     "course": "Курс",
     "coursedetails": "Информация о курсе",
     "date": "Дата",
-    "day": "дн.",
-    "days": "Дней",
+    "day": "день",
+    "days": "дн.",
     "decsep": ",",
     "defaultvalue": "Значение по умолчанию ({{$a}})",
     "delete": "Удалить",
     "deleting": "Удаление",
-    "description": "Описание",
+    "description": "Вступление",
     "done": "Завершено",
-    "download": "Нажмите «Продолжить», чтобы загрузить файл экспортируемой категории.",
+    "download": "Скачать",
     "downloading": "Загрузка",
     "edit": "Редактировать",
-    "error": "Произошла неизвестная ошибка!",
+    "error": "Ошибка",
     "errordownloading": "Ошибка загрузки файла",
     "filename": "Имя файла",
     "folder": "Папка",
@@ -46,19 +46,19 @@
     "fulllistofcourses": "Все курсы",
     "groupsseparate": "Изолированные группы",
     "groupsvisible": "Видимые группы",
-    "help": "Помощь",
+    "help": "Справка",
     "hide": "Скрыть",
     "hour": "ч.",
     "hours": "час.",
     "humanreadablesize": "{{size}} {{unit}}",
-    "info": "Вступление",
+    "info": "Информация",
     "labelsep": ":",
-    "lastmodified": "Последние изменения:",
+    "lastmodified": "Последнее изменение",
     "listsep": ";",
-    "loading": "Загрузка...",
+    "loading": "Загрузка",
     "lostconnection": "Ваш ключ аутентификации недействителен или просрочен. Вам придется повторно подключиться к сайту.",
     "maxsizeandattachments": "Максимальный размер новых файлов: {{$a.size}}, максимальное количество прикрепленных файлов: {{$a.attachments}}",
-    "min": "Наименьшая оценка",
+    "min": "мин.",
     "mins": "мин.",
     "mod_assign": "Задание",
     "mod_assignment": "Задание",
@@ -87,14 +87,14 @@
     "mod_wiki": "Вики",
     "mod_workshop": "Семинар",
     "moduleintro": "Описание",
-    "name": "Название",
+    "name": "Название:",
     "networkerrormsg": "Сеть не работает или работа в ней не разрешена.",
     "never": "Никогда",
-    "next": "Продолжить",
+    "next": "Далее",
     "no": "Нет",
     "nocomments": "Нет комментариев",
-    "nograde": "Нет оценки.",
-    "none": "Нет",
+    "nograde": "Без оценки",
+    "none": "Пусто",
     "nopasswordchangeforced": "Вы не можете продолжать работу без смены пароля, однако страница для его изменения не доступна. Пожалуйста, свяжитесь с администратором сайта.",
     "nopermissions": "Извините, но у Вас нет прав сделать это ({{$a}})",
     "noresults": "Нет результатов",
@@ -102,19 +102,19 @@
     "notice": "Уведомление",
     "now": "сейчас",
     "numwords": "всего слов - {{$a}}",
-    "offline": "Вне сайта",
+    "offline": "Ответ вне сайта",
     "online": "На сайте",
     "openinbrowser": "Открыть в браузере",
     "pagea": "Страница {{$a}}",
     "phone": "Телефон",
     "pictureof": "Изображение пользователя {{$a}}",
-    "previous": "Предыдущее состояние",
+    "previous": "Назад",
     "pulltorefresh": "Потяните, чтобы обновить",
     "refresh": "Обновить",
-    "required": "Обязательно",
+    "required": "Необходимо заполнить",
     "save": "Сохранить",
-    "search": "Искать...",
-    "searching": "Поиск в...",
+    "search": "Найти",
+    "searching": "Искать в",
     "searchresults": "Результаты поиска",
     "sec": "сек.",
     "secs": "сек.",
@@ -147,7 +147,7 @@
     "view": "Просмотр",
     "viewprofile": "Просмотр профиля",
     "whoops": "Ой!",
-    "year": "Год(ы)",
+    "year": "г.",
     "years": "г.",
     "yes": "Да"
 }
\ No newline at end of file
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index af99d470510..c6935da60d3 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -2,7 +2,7 @@
     "allparticipants": "Alla deltagare",
     "android": "Android",
     "areyousure": "Är du säker?",
-    "back": "Tillbaka till förhandsgranskning av fråga",
+    "back": "Tillbaka",
     "cancel": "Avbryt",
     "cannotconnect": "Kan inte ansluta: Kontrollera att webbadressen är korrekt och att din webbplats använder Moodle 2.4 eller senare",
     "cannotdownloadfiles": "Nedladdning av filer är inaktiverad. Vänligen kontakta webbsidans administratör.",
@@ -12,8 +12,8 @@
     "clearsearch": "Rensa sökning",
     "clicktohideshow": "Klicka för att expandera eller fälla ihop",
     "clicktoseefull": "Klicka för att se hela innehållet",
-    "close": "Stäng fönster",
-    "comments": "Kommentarer",
+    "close": "Stäng",
+    "comments": "Dina kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
     "completion-alt-auto-fail": "Fullföljd (uppnådde inte godkänt resultat)",
     "completion-alt-auto-n": "Inte avslutad: {{$a}}",
@@ -28,21 +28,21 @@
     "course": "Kurs",
     "coursedetails": "Kursinformation",
     "date": "Datum",
-    "day": "Dag(ar)",
-    "days": "Dagar",
+    "day": "dag",
+    "days": "dagar",
     "decsep": ",",
     "delete": "Ta bort",
     "deleting": "Tar bort",
-    "description": "Beskrivning",
+    "description": "Introduktion",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
     "dfmediumdate": "",
     "dftimedate": "h[:]mm A",
     "done": "Färdig",
-    "download": "Klicka för att ladda ner den exporterade filen för kategorier",
+    "download": "Ladda ner",
     "downloading": "Laddar ner",
     "edit": "Redigera",
-    "error": "Det inträffade ett okänt fel!",
+    "error": "Fel",
     "errorchangecompletion": "Ett fel uppstod när du ändrade status för fullföljande. Var god försök igen.",
     "errordownloading": "Fel vid nedladdning av fil",
     "errordownloadingsomefiles": "Fel vid hämtning av modulens filer. Vissa filer kanske saknas .",
@@ -63,16 +63,16 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Bild",
     "imageviewer": "Bildvisare",
-    "info": "Info",
+    "info": "Information",
     "ios": "IOS",
     "labelsep": ":",
     "lastmodified": "Senast modifierad",
     "lastsync": "Senaste synkronisering",
     "listsep": ";",
-    "loading": "Laddar....",
+    "loading": "Laddar...",
     "lostconnection": "Vi förlorade anslutningen. Du måste  ansluta igen. Din token är nu ogiltigt.",
     "maxsizeandattachments": "Maximal storlek för nya filer: {{$a.size}}, max bilagor: {{$a.attachments}}",
-    "min": "Lägsta",
+    "min": "minut",
     "mins": "minuter",
     "mod_assign": "Uppgift",
     "mod_assignment": "Uppgift",
@@ -105,10 +105,10 @@
     "name": "Namn",
     "networkerrormsg": "Nätverket är inte aktiverat eller fungerar inte",
     "never": "Aldrig",
-    "next": "Fortsätt",
-    "no": "Ingen",
-    "nocomments": "Det finns inga kommentarer",
-    "nograde": "Inget betyg.",
+    "next": "Nästa",
+    "no": "Nej",
+    "nocomments": "Inga kommentarer",
+    "nograde": "Inget betyg",
     "none": "Ingen",
     "nopasswordchangeforced": "Du kan inte gå vidare utan att ändra Ditt lösenord, men det finns inte någon sida tillgänglig för att ändra det. Var snäll och kontakta Din administratör för Moodle.",
     "nopermissions": "Du har tyvärr f.n. inte tillstånd att göra detta ({{$a}})",
@@ -117,7 +117,7 @@
     "notice": "Meddelande",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Frånkopplat läge",
+    "offline": "Ingen inlämning online krävs",
     "online": "Uppkopplad",
     "openfullimage": "Klick här för att visa bilden i full storlek",
     "openinbrowser": "Öppna i webbläsare",
@@ -126,19 +126,19 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Bild av {{$a}}",
-    "previous": "Föregående status",
+    "previous": "Tidigare",
     "pulltorefresh": "Dra för att uppdatera",
-    "refresh": "Återställ",
+    "refresh": "Uppdatera",
     "required": "Obligatorisk",
     "requireduserdatamissing": "Den här användaren saknar vissa nödvändiga profildata. Vänligen fyll i uppgifterna i din Moodle och försök igen. <br>{{$a}}",
     "save": "Spara",
-    "search": "Sök...",
-    "searching": "Söker i...",
+    "search": "Sök",
+    "searching": "Sök i ",
     "searchresults": "Sökresultat",
     "sec": "Sekund",
     "secs": "Sekunder",
     "seemoredetail": "Klicka här för att se fler detaljer",
-    "send": "Skicka",
+    "send": "skicka",
     "sending": "Skickar",
     "serverconnection": "Fel vid anslutning till servern",
     "show": "Visa",
@@ -149,7 +149,7 @@
     "sizemb": "Mb",
     "sizetb": "Tb",
     "start": "Starta",
-    "submit": "Skicka",
+    "submit": "Skicka in",
     "success": "Framgång",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
@@ -170,7 +170,7 @@
     "whoops": "Hoppsan!",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Webbtjänstfunktion är inte tillgänglig.",
-    "year": "År",
+    "year": "år",
     "years": "år",
     "yes": "Ja"
 }
\ No newline at end of file
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index efec2826202..ebf7b52804f 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -3,7 +3,7 @@
     "allparticipants": "Bütün katılımcılar",
     "android": "Android",
     "areyousure": "Emin misiniz?",
-    "back": "Soruyu önizlemeye geri dön",
+    "back": "Geri",
     "cancel": "İptal",
     "cannotconnect": "Bağlantı kurulamıyor: Doğru adres girdiğinizden ve sitenizin Moodle 2.4 ve sonrası sürüme sahip olduğundan emin olun.",
     "category": "Kategori",
@@ -11,8 +11,8 @@
     "choosedots": "Seçiniz...",
     "clearsearch": "Aramayı temizle",
     "clicktohideshow": "Genişlet/Daralt",
-    "close": "Pencereyi kapat",
-    "comments": "Yorumlar",
+    "close": "Kapat",
+    "comments": "Yorumlarınız",
     "commentscount": "Yorumlar ({{$a}})",
     "completion-alt-auto-fail": "Tamamlandı (geçer not almayı başaramadı)",
     "completion-alt-auto-n": "Tamamlanmadı",
@@ -23,21 +23,21 @@
     "confirmdeletefile": "Bu dosyayı silmek istediğinize emin misiniz?",
     "confirmopeninbrowser": "Tarayıcıda açmak istediğine emin misin?",
     "content": "İçerik",
-    "continue": "Devam et",
+    "continue": "Devam",
     "course": "Ders",
     "coursedetails": "Ders ayrıntıları",
     "date": "Tarih",
-    "day": "Gün",
-    "days": "Gün",
+    "day": "gün",
+    "days": "gün",
     "decsep": ",",
     "delete": "Sil",
     "deleting": "Siliniyor",
-    "description": "Açıklama",
+    "description": "Tanıtım metni",
     "done": "Tamamlandı",
-    "download": "Verilen kategori dosyasını indirin",
+    "download": "İndir",
     "downloading": "İndiriliyor...",
-    "edit": "Düzenle",
-    "error": "Bilinmeyen bir hata oluştu!",
+    "edit": "Düzelt",
+    "error": "Hata",
     "errordownloading": "Dosya indirmede  hata",
     "filename": "Dosya adı",
     "folder": "Klasör",
@@ -53,13 +53,13 @@
     "info": "Bilgi",
     "ios": "İOS",
     "labelsep": ":",
-    "lastmodified": "Son değiştirme",
+    "lastmodified": "En son değiştirme",
     "lastsync": "Son senkronizasyon",
     "listsep": ";",
-    "loading": "Yükleniyor",
+    "loading": "Yükleniyor...",
     "lostconnection": "Bağlantınızı kaybettik, yeniden bağlanmanız gerekiyor. Verileriniz artık geçerli değil.",
     "maxsizeandattachments": "Yeni dosyalar için en büyük boyut: {{$a.size}}, en fazla ek: {{$a.attachments}}",
-    "min": "En düşük",
+    "min": "dk",
     "mins": "dk",
     "mod_assign": "Ödev",
     "mod_book": "Kitap",
@@ -88,33 +88,33 @@
     "mod_workshop": "Çalıştay",
     "moduleintro": "Açıklama",
     "mygroups": "Gruplarım",
-    "name": "Adı",
+    "name": "Ad",
     "networkerrormsg": "Ağ etkin değil ya da çalışmıyor.",
-    "never": "Asla",
-    "next": "Devam et",
+    "never": "Hiçbir zaman",
+    "next": "Sonraki",
     "no": "Hayır",
-    "nocomments": "Hiç yorum yok",
-    "nograde": "Not yok.",
-    "none": "Hiçbiri",
+    "nocomments": "Yorum yok",
+    "nograde": "Not yok",
+    "none": "Yok",
     "nopasswordchangeforced": "Şifrenizi değiştirmeden ilerleyemezsiniz, ancak şifrenizi değiştirmek için bir sayfa yok. Lütfen Moodle Yöneticinizle iletişime geçin.",
     "nopermissions": "Üzgünüz, şu anda bunu yapmaya yetkiniz yok: {{$a}}",
     "noresults": "Sonuç yok",
     "notice": "Uyarı",
     "now": "şimdi",
     "numwords": "{{$a}} kelime",
-    "offline": "Çevrimdışı",
+    "offline": "Online gönderim gerekli değil",
     "online": "Çevrimiçi",
     "openinbrowser": "Tarayıcıda aç",
     "othergroups": "Diğer gruplar",
     "pagea": "Sayfa {{$a}}",
     "phone": "Telefon",
     "pictureof": "{{$a}} 'ın resmi",
-    "previous": "Önceki durum",
+    "previous": "Önceki",
     "refresh": "Yenile",
     "required": "Gerekli",
     "save": "Kaydet",
-    "search": "Arama...",
-    "searching": "Aranıyor...",
+    "search": "Ara",
+    "searching": "Aranan",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
@@ -135,7 +135,7 @@
     "success": "Başarı",
     "tablet": "Tablet",
     "teachers": "Eğitimciler",
-    "time": "Süre",
+    "time": "Zaman",
     "timesup": "Süre doldu!",
     "today": "Bugün",
     "unexpectederror": "Beklenmeyen hata. Lütfen uygulamanızı yeniden açın ve tekrar deneyin",
@@ -146,9 +146,9 @@
     "userdetails": "Kullanıcı ayrıntıları",
     "usernotfullysetup": "Kullanıcı tam kurulum yapmadı",
     "users": "Kullanıcılar",
-    "view": "Görünüm",
+    "view": "Görüntüle",
     "viewprofile": "Profili görüntüle",
-    "year": "Yıl",
+    "year": "yıl",
     "years": "yıl",
     "yes": "Evet"
 }
\ No newline at end of file
diff --git a/www/core/lang/uk.json b/www/core/lang/uk.json
index 4263ac20093..1722b8778a6 100644
--- a/www/core/lang/uk.json
+++ b/www/core/lang/uk.json
@@ -3,7 +3,7 @@
     "allparticipants": "Усі учасники",
     "android": "Android",
     "areyousure": "Ви впевнені?",
-    "back": "Повернутися до перегляду запитання",
+    "back": "Назад",
     "cancel": "Скасувати",
     "cannotconnect": "Неможливо з'єднатися: Переконайтеся, що ви ввели правильно URL і що сайт використовує Moodle 2.4 або більш пізньої версії.",
     "cannotdownloadfiles": "Завантаження файлів відключена у вашій мобільній службі. Будь ласка, зверніться до адміністратора сайту.",
@@ -13,8 +13,8 @@
     "clearsearch": "Очистити пошук",
     "clicktohideshow": "Натисніть, щоб розгорнути або згорнути",
     "clicktoseefull": "Натисніть, щоб побачити весь вміст.",
-    "close": "Закрити вікно",
-    "comments": "Коментарі",
+    "close": "Закрити",
+    "comments": "Ваші коментарі",
     "commentscount": "Коментарі ({{$a}})",
     "commentsnotworking": "Коментар не може бути відновлений",
     "completion-alt-auto-fail": "Виконано: {{$a}}  (не вдалося досягти прохідного балу)",
@@ -36,12 +36,12 @@
     "currentdevice": "Поточний пристрій",
     "datastoredoffline": "Дані зберігаються в пристрої, оскільки не можуть бути надіслані. Вони будуть автоматично відправлені пізніше.",
     "date": "Дата",
-    "day": "День(ів)",
-    "days": "Днів",
+    "day": "день",
+    "days": "днів",
     "decsep": ",",
-    "delete": "Вилучити",
+    "delete": "Видалити",
     "deleting": "Видалення",
-    "description": "Опис",
+    "description": "Текст вступу",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
@@ -51,11 +51,11 @@
     "discard": "Скинути",
     "dismiss": "Відхилити",
     "done": "Зроблено",
-    "download": "Натисніть для збереження файлу експорту на своєму комп'ютері.",
+    "download": "Завантажити",
     "downloading": "Завантаження",
     "edit": "Редагувати",
     "emptysplit": "Ця сторінка буде виглядати порожньою, якщо ліва панель порожня або завантажується.",
-    "error": "Виникла невідома помилка!",
+    "error": "Помилка",
     "errorchangecompletion": "При зміні стану завершення сталася помилка. Будь ласка спробуйте ще раз.",
     "errordeletefile": "Помилка видалення файлу. Будь ласка спробуйте ще раз.",
     "errordownloading": "Помилка завантаження файлу.",
@@ -89,14 +89,14 @@
     "info": "Інформація",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Востаннє змінено",
+    "lastmodified": "Остання зміна",
     "lastsync": "Остання синхронізація",
     "listsep": ";",
     "loading": "Завантаження...",
     "loadmore": "Завнтажити більше",
     "lostconnection": "Ваш маркер аутентифікації недійсний або закінчився, вам доведеться підключитися до сайту.",
     "maxsizeandattachments": "Макс. обсяг для нових файлів: {{$a.size}}, макс. кількість прикріплених файлів: {{$a.attachments}}",
-    "min": "Мінімальна",
+    "min": "хв",
     "mins": "хв",
     "mod_assign": "Завдання",
     "mod_chat": "Чат",
@@ -112,23 +112,23 @@
     "mod_wiki": "Вікі",
     "moduleintro": "Опис",
     "mygroups": "Мої групи",
-    "name": "Назва",
+    "name": "Ім'я",
     "networkerrormsg": "Мережа не включена або не працює.",
     "never": "Ніколи",
-    "next": "Продовжити",
+    "next": "Далі",
     "no": "Ні",
-    "nocomments": "Коментарів немає",
-    "nograde": "Немає оцінки.",
-    "none": "немає",
+    "nocomments": "Немає коментарів",
+    "nograde": "Без оцінки",
+    "none": "Не вибрано",
     "nopasswordchangeforced": "Ви не можете перейти не змінивши ваш пароль, але не вказано ніякої сторінки для цього процесу. Будь ласка, зверніться до вашого Адміністратора.",
     "nopermissions": "Вибачте, але ваші поточні права не дозволяють вам цього робити ({{$a}})",
-    "noresults": "Результат відсутній",
+    "noresults": "Без результатів",
     "notapplicable": "n/a",
     "notice": "Помітити",
     "notsent": "Не відправлено",
     "now": "зараз",
     "numwords": "{{$a}} слів",
-    "offline": "Поза мережею",
+    "offline": "Не потрібно здавати в онлайні",
     "online": "В мережі",
     "openfullimage": "Натисніть тут, щоб побачити зображення в повному розмірі",
     "openinbrowser": "Відкрити у браузері",
@@ -137,21 +137,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Телефон",
     "pictureof": "Фото {{$a}}",
-    "previous": "Попередній стан",
+    "previous": "Назад",
     "pulltorefresh": "Потягніть щоб оновити",
     "redirectingtosite": "Ви будете перенаправлені на сайт.",
     "refresh": "Оновити",
-    "required": "Обов’язкове",
+    "required": "Необхідні",
     "requireduserdatamissing": "Цей користувач не має деяких необхідних даних в профілі. Заповніть, будь ласка, ці дані у вашому профілі Moodle і спробуйте ще раз.<br>{{$a}}",
     "retry": "Повторити",
     "save": "Зберегти",
-    "search": "Пошук...",
-    "searching": "Пошук в ...",
+    "search": "Знайти",
+    "searching": "Шукати в",
     "searchresults": "Результати пошуку",
     "sec": "сек",
     "secs": "сек",
     "seemoredetail": "Деталі...",
-    "send": "Надіслати",
+    "send": "Відіслати",
     "sending": "Відсилання",
     "serverconnection": "Помилка з’єднання з сервером",
     "show": "Показати",
@@ -165,7 +165,7 @@
     "sizetb": "TB",
     "sorry": "Вибачте...",
     "start": "Початок",
-    "submit": "Перевірити",
+    "submit": "Прийняти",
     "success": "Успішно",
     "tablet": "пЛАНШЕТ",
     "teachers": "Викладачі",
@@ -193,7 +193,7 @@
     "whyisthishappening": "Чому це відбувається?",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "Функція веб-сервіс не доступна.",
-    "year": "Роки",
+    "year": "рік",
     "years": "роки",
     "yes": "Так"
 }
\ No newline at end of file
diff --git a/www/core/lang/zh-cn.json b/www/core/lang/zh-cn.json
index 3d984a928c7..61789cfd747 100644
--- a/www/core/lang/zh-cn.json
+++ b/www/core/lang/zh-cn.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "所有成员",
     "areyousure": "你确定吗？",
-    "back": "返回预览试题",
+    "back": "返回",
     "cancel": "取消",
     "cannotconnect": "无法连接：请确认您已经正确输入网址，并且您的网站使用了Moodle 2.4或更高版本。",
-    "category": "类别",
+    "category": "课程分类",
     "choose": "选择",
     "choosedots": "选择...",
     "clicktohideshow": "点击来展开或折叠",
-    "close": "关闭窗口",
-    "comments": "评论",
+    "close": "关闭",
+    "comments": "您的评价",
     "commentscount": "评论({{$a}})",
     "completion-alt-auto-fail": "已完成：{{$a}}（未及格）",
     "completion-alt-auto-n": "未完成：{{$a}}",
@@ -24,15 +24,15 @@
     "coursedetails": "课程详情",
     "date": "日期",
     "day": "天",
-    "days": "天数",
+    "days": "天",
     "decsep": ".",
     "delete": "删除",
     "deleting": "删除中",
-    "description": "描述",
+    "description": "简要描述",
     "done": "完成",
-    "download": "点击下载已导出的分类文件",
+    "download": "下载",
     "edit": "编辑",
-    "error": "发生未知错误！",
+    "error": "错误",
     "errordownloading": "下载文件时出错",
     "filename": "文件名",
     "folder": "文件夹",
@@ -46,12 +46,12 @@
     "hours": "小时",
     "info": "信息",
     "labelsep": "：",
-    "lastmodified": "最近修改",
+    "lastmodified": "最后修改",
     "listsep": "，",
-    "loading": "载入中……",
+    "loading": "载入中",
     "lostconnection": "我们失去了连接，因此您需要重新连接。您现在的令牌是无效的。",
     "maxsizeandattachments": "新文件的最大尺寸： {{$a.size}} ，最多附件：{{$a.attachments}}",
-    "min": "最低",
+    "min": "分钟",
     "mins": "分钟",
     "mod_assign": "作业",
     "mod_chat": "聊天",
@@ -66,31 +66,31 @@
     "mod_survey": "问卷调查",
     "mod_wiki": "Wiki协作",
     "moduleintro": "描述",
-    "name": "名称",
+    "name": "名字",
     "networkerrormsg": "网络未启用或不工作。",
-    "never": "从不",
-    "next": "继续",
+    "never": "从未",
+    "next": "向后",
     "no": "否",
-    "nocomments": "没有评论",
-    "nograde": "没有成绩。",
-    "none": "没有",
+    "nocomments": "无评论",
+    "nograde": "没有分数",
+    "none": "无",
     "nopasswordchangeforced": "在您更改密码前不能继续操作，但系统找不到用来更改密码的页面，请与管理员联系。",
     "nopermissions": "很抱歉，您没有相应权限（{{$a}}）",
     "noresults": "没有结果",
     "notice": "注意",
     "now": "现在",
     "numwords": "{{$a}}单词",
-    "offline": "离线",
+    "offline": "不需要在线提交",
     "online": "在线",
     "pagea": "页码 {{$a}}",
     "phone": "电话",
     "pictureof": "{{$a}}的头像",
-    "previous": "以前状态",
+    "previous": "向前",
     "refresh": "刷新",
-    "required": "必须回答",
+    "required": "必需的",
     "save": "保存",
     "search": "搜索",
-    "searching": "搜索中……",
+    "searching": "搜索",
     "searchresults": "搜索结果",
     "sec": "秒",
     "secs": "秒",
@@ -108,7 +108,7 @@
     "submit": "提交",
     "success": "成功",
     "teachers": "教师",
-    "time": "时间",
+    "time": "用时",
     "timesup": "时间到！",
     "today": "今天",
     "unexpectederror": "意外出错。请关闭并重新打开APP再试一次",
@@ -118,7 +118,7 @@
     "userdeleted": "该用户帐号已被删除",
     "userdetails": "用户细节",
     "users": "用户",
-    "view": "查看",
+    "view": "浏览",
     "viewprofile": "查看个人资料",
     "year": "年",
     "years": "年",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index d0aec1e213c..48a87bc3a31 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -3,19 +3,19 @@
     "allparticipants": "所有參與者",
     "android": "安卓",
     "areyousure": "你確定嗎？",
-    "back": "返回預覽試題",
+    "back": "返回",
     "cancel": "取消",
     "cannotconnect": "無法連接：請確認您輸入之網址正確，且您的位置使用的是Moodle2.4版或更新版本。",
     "cannotdownloadfiles": "在您的行動服務中禁用檔案下載. 請與您的網站管理員聯繫.",
-    "category": "類目",
+    "category": "類別",
     "choose": "選擇",
     "choosedots": "選擇...",
     "clearsearch": "清除搜尋",
     "clicktohideshow": "點按展開或縮合",
     "clicktoseefull": "點擊以看到詳細內容",
-    "close": "關閉視窗",
-    "comments": "評語",
-    "commentscount": "評論（{{$a}}）",
+    "close": "關閉",
+    "comments": "評論",
+    "commentscount": "評論數({{$a}})",
     "commentsnotworking": "無法取得評論資料",
     "completion-alt-auto-fail": "已完成：{{$a}} (不及格)",
     "completion-alt-auto-n": "尚未完成：{{$a}}",
@@ -35,12 +35,12 @@
     "datastoredoffline": "儲存在設備中的資料，因為它之前無法發送.  它稍後將自動發送.",
     "date": "日期",
     "day": "日",
-    "days": "天數",
+    "days": "日",
     "decsep": ".",
     "defaultvalue": "預設 ({{$a}})",
     "delete": "刪除",
     "deleting": "刪除中",
-    "description": "說明",
+    "description": "簡介文字",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -49,10 +49,10 @@
     "discard": "捨棄",
     "dismiss": "除去",
     "done": "完成",
-    "download": "點選可下載匯出的類別檔案",
+    "download": "下載",
     "downloading": "下載中",
-    "edit": "編輯",
-    "error": "發生一個未知的錯誤!",
+    "edit": "編修",
+    "error": "錯誤",
     "errorchangecompletion": "更改完成狀態時發生錯誤. 請再試一次.",
     "errordeletefile": "刪除檔案時出錯. 請再試一次.",
     "errordownloading": "下載檔案時發生錯誤",
@@ -75,23 +75,23 @@
     "groupsseparate": "分隔群組",
     "groupsvisible": "可視群組",
     "hasdatatosync": "此{{$ a}}有離線資料要同步.",
-    "help": "幫助",
+    "help": "輔助說明",
     "hide": "隱藏",
     "hour": "小時",
     "hours": "小時",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "圖片",
     "imageviewer": "影像檢視器",
-    "info": "說明",
+    "info": "資訊",
     "ios": "iOS",
     "labelsep": "：",
     "lastmodified": "最後修改",
     "lastsync": "最後同步",
     "listsep": "，",
-    "loading": "裝載中...",
+    "loading": "裝載中",
     "lostconnection": "我們已斷了線，您需重新連線。您的口令目前是無效的。",
     "maxsizeandattachments": "新檔案的最大容量： {{$a.size}} ，最多附件：{{$a.attachments}}",
-    "min": "最低分",
+    "min": "分鐘",
     "mins": "分鐘",
     "mod_assign": "分配",
     "mod_assignment": "分配",
@@ -123,12 +123,12 @@
     "mygroups": "我的群組",
     "name": "名稱",
     "networkerrormsg": "網路未啟用或未運作。",
-    "never": "從未",
-    "next": "繼續",
+    "never": "從不",
+    "next": "往後",
     "no": "否",
     "nocomments": "沒有評論",
-    "nograde": "沒有成績。",
-    "none": "沒有",
+    "nograde": "沒有成績",
+    "none": "無",
     "nopasswordchangeforced": "沒有修改密碼前您無法處理，這裡沒有提供可以變更的頁面，請聯絡您的Moodle管理員。",
     "nopermissions": "抱歉，但是您目前沒有權限執行({{$a}})",
     "noresults": "沒有結果",
@@ -137,7 +137,7 @@
     "notsent": "沒有傳送",
     "now": "現在",
     "numwords": "{{$a}}字數",
-    "offline": "離線",
+    "offline": "不需要線上繳交",
     "online": "在線上",
     "openfullimage": "點擊這裡以圖像原尺寸顯示",
     "openinbrowser": "以瀏覽器開啟",
@@ -146,21 +146,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "電話",
     "pictureof": "{{$a}}的相片",
-    "previous": "先前的狀態",
+    "previous": "向前",
     "pulltorefresh": "拖曳更新",
     "redirectingtosite": "您將被重定向到網站.",
-    "refresh": "重新整理",
-    "required": "必要的",
+    "refresh": "更新",
+    "required": "必須的",
     "requireduserdatamissing": "此使用者缺少一些必需的配置資料. 請在您的Moodle中填寫此數據, 然後重試.<br> {{$ a}}",
     "retry": "重試",
     "save": "儲存",
-    "search": "搜尋中...",
-    "searching": "搜尋中...",
+    "search": "搜尋",
+    "searching": "搜尋",
     "searchresults": "搜尋結果",
     "sec": "秒",
     "secs": "秒",
     "seemoredetail": "按此以觀看更多細節",
-    "send": "送出",
+    "send": "傳送",
     "sending": "正在傳送",
     "serverconnection": "連結到伺服器時發生錯誤",
     "show": "顯示",
@@ -174,7 +174,7 @@
     "sizetb": "TB",
     "sorry": "抱歉...",
     "start": "開始",
-    "submit": "送出",
+    "submit": "提交",
     "success": "成功",
     "tablet": "平板",
     "teachers": "教師",
@@ -194,7 +194,7 @@
     "userdetails": "用戶的詳細資料",
     "usernotfullysetup": "用戶沒有完全設定好",
     "users": "用戶",
-    "view": "檢視",
+    "view": "瀏覽",
     "viewprofile": "瀏覽個人資料",
     "warningofflinedatadeleted": "離線資料 {{component}} '{{name}}' 已被刪除. {{error}}",
     "whoops": "糟糕!",

From c2c3e52e6c2e63b1625b9d281ed10ad9bac558e9 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 26 May 2017 11:49:26 +0200
Subject: [PATCH 216/218] MOBILE-2103 release: Sync translation from AMOS

---
 www/addons/calendar/lang/cs.json              |  4 +--
 www/addons/calendar/lang/de.json              |  4 +--
 www/addons/calendar/lang/es-mx.json           |  4 +--
 www/addons/calendar/lang/es.json              |  4 +--
 www/addons/calendar/lang/fa.json              |  4 +--
 www/addons/calendar/lang/fr.json              |  2 +-
 www/addons/calendar/lang/it.json              |  2 +-
 www/addons/calendar/lang/nl.json              |  2 +-
 www/addons/calendar/lang/pt-br.json           |  2 +-
 www/addons/calendar/lang/sv.json              |  2 +-
 www/addons/calendar/lang/uk.json              |  2 +-
 www/addons/calendar/lang/zh-cn.json           |  2 +-
 www/addons/calendar/lang/zh-tw.json           |  2 +-
 www/addons/competency/lang/ca.json            |  2 +-
 www/addons/competency/lang/cs.json            |  2 +-
 www/addons/competency/lang/de.json            |  2 +-
 www/addons/competency/lang/es-mx.json         |  2 +-
 www/addons/competency/lang/es.json            |  2 +-
 www/addons/competency/lang/eu.json            |  2 +-
 www/addons/competency/lang/fr.json            |  2 +-
 www/addons/competency/lang/it.json            |  2 +-
 www/addons/competency/lang/lt.json            |  2 +-
 www/addons/competency/lang/nl.json            |  2 +-
 www/addons/competency/lang/pt-br.json         |  2 +-
 www/addons/competency/lang/pt.json            |  2 +-
 www/addons/competency/lang/uk.json            |  2 +-
 www/addons/competency/lang/zh-tw.json         |  2 +-
 www/addons/coursecompletion/lang/ca.json      |  6 ++--
 www/addons/coursecompletion/lang/cs.json      | 18 ++++++------
 www/addons/coursecompletion/lang/de.json      | 20 ++++++-------
 www/addons/coursecompletion/lang/el.json      | 10 +++----
 www/addons/coursecompletion/lang/es-mx.json   | 20 ++++++-------
 www/addons/coursecompletion/lang/es.json      |  2 +-
 www/addons/coursecompletion/lang/fa.json      |  2 +-
 www/addons/coursecompletion/lang/fr.json      |  8 +++---
 www/addons/coursecompletion/lang/it.json      | 14 +++++-----
 www/addons/coursecompletion/lang/lt.json      | 16 +++++------
 www/addons/coursecompletion/lang/nl.json      | 14 +++++-----
 www/addons/coursecompletion/lang/pt-br.json   | 22 +++++++--------
 www/addons/coursecompletion/lang/pt.json      | 12 ++++----
 www/addons/coursecompletion/lang/ro.json      | 26 ++++++++---------
 www/addons/coursecompletion/lang/ru.json      | 24 ++++++++--------
 www/addons/coursecompletion/lang/sv.json      | 18 ++++++------
 www/addons/coursecompletion/lang/uk.json      | 24 ++++++++--------
 www/addons/coursecompletion/lang/zh-tw.json   | 22 +++++++--------
 www/addons/files/lang/ca.json                 |  4 +--
 www/addons/files/lang/cs.json                 |  4 +--
 www/addons/files/lang/de.json                 |  4 +--
 www/addons/files/lang/el.json                 |  2 +-
 www/addons/files/lang/es-mx.json              |  4 +--
 www/addons/files/lang/es.json                 |  2 +-
 www/addons/files/lang/eu.json                 |  4 +--
 www/addons/files/lang/fr.json                 |  4 +--
 www/addons/files/lang/it.json                 |  4 +--
 www/addons/files/lang/lt.json                 |  4 +--
 www/addons/files/lang/nl.json                 |  4 +--
 www/addons/files/lang/pt-br.json              |  4 +--
 www/addons/files/lang/pt.json                 |  4 +--
 www/addons/files/lang/ro.json                 |  2 +-
 www/addons/files/lang/ru.json                 |  2 +-
 www/addons/files/lang/uk.json                 |  4 +--
 www/addons/files/lang/zh-tw.json              |  4 +--
 www/addons/messages/lang/bg.json              |  2 +-
 www/addons/messages/lang/ca.json              |  4 +--
 www/addons/messages/lang/cs.json              |  6 ++--
 www/addons/messages/lang/de.json              |  4 +--
 www/addons/messages/lang/el.json              |  6 ++--
 www/addons/messages/lang/es-mx.json           |  6 ++--
 www/addons/messages/lang/es.json              |  4 +--
 www/addons/messages/lang/eu.json              |  4 +--
 www/addons/messages/lang/fr.json              |  6 ++--
 www/addons/messages/lang/it.json              |  6 ++--
 www/addons/messages/lang/lt.json              |  6 ++--
 www/addons/messages/lang/nl.json              |  4 +--
 www/addons/messages/lang/pt-br.json           |  4 +--
 www/addons/messages/lang/pt.json              |  4 +--
 www/addons/messages/lang/ro.json              |  4 +--
 www/addons/messages/lang/ru.json              |  4 +--
 www/addons/messages/lang/sv.json              |  6 ++--
 www/addons/messages/lang/tr.json              |  2 +-
 www/addons/messages/lang/uk.json              |  2 +-
 www/addons/messages/lang/zh-tw.json           |  6 ++--
 www/addons/mod/choice/lang/ca.json            |  4 +--
 www/addons/mod/choice/lang/cs.json            |  4 +--
 www/addons/mod/choice/lang/de.json            |  4 +--
 www/addons/mod/choice/lang/el.json            |  4 +--
 www/addons/mod/choice/lang/es-mx.json         |  4 +--
 www/addons/mod/choice/lang/es.json            |  4 +--
 www/addons/mod/choice/lang/eu.json            |  4 +--
 www/addons/mod/choice/lang/fr.json            |  4 +--
 www/addons/mod/choice/lang/it.json            |  4 +--
 www/addons/mod/choice/lang/lt.json            |  4 +--
 www/addons/mod/choice/lang/nl.json            |  4 +--
 www/addons/mod/choice/lang/pt-br.json         |  4 +--
 www/addons/mod/choice/lang/pt.json            |  4 +--
 www/addons/mod/choice/lang/ro.json            |  4 +--
 www/addons/mod/choice/lang/sv.json            |  4 +--
 www/addons/mod/choice/lang/uk.json            |  4 +--
 www/addons/mod/choice/lang/zh-tw.json         |  4 +--
 www/addons/mod/folder/lang/ca.json            |  2 +-
 www/addons/mod/folder/lang/cs.json            |  2 +-
 www/addons/mod/folder/lang/de.json            |  2 +-
 www/addons/mod/folder/lang/es-mx.json         |  2 +-
 www/addons/mod/folder/lang/eu.json            |  2 +-
 www/addons/mod/folder/lang/fr.json            |  2 +-
 www/addons/mod/folder/lang/it.json            |  2 +-
 www/addons/mod/folder/lang/lt.json            |  2 +-
 www/addons/mod/folder/lang/nl.json            |  2 +-
 www/addons/mod/folder/lang/pt-br.json         |  2 +-
 www/addons/mod/folder/lang/pt.json            |  2 +-
 www/addons/mod/folder/lang/ro.json            |  2 +-
 www/addons/mod/folder/lang/uk.json            |  2 +-
 www/addons/mod/folder/lang/zh-tw.json         |  2 +-
 www/addons/mod/forum/lang/de.json             |  2 +-
 www/addons/mod/forum/lang/es-mx.json          |  2 +-
 www/addons/mod/forum/lang/fr.json             |  2 +-
 www/addons/mod/forum/lang/it.json             |  2 +-
 www/addons/mod/forum/lang/lt.json             |  2 +-
 www/addons/mod/forum/lang/nl.json             |  2 +-
 www/addons/mod/forum/lang/pt-br.json          |  2 +-
 www/addons/mod/forum/lang/ro.json             |  2 +-
 www/addons/mod/forum/lang/ru.json             |  2 +-
 www/addons/mod/forum/lang/sv.json             |  2 +-
 www/addons/mod/forum/lang/uk.json             |  2 +-
 www/addons/mod/forum/lang/zh-tw.json          |  4 +--
 www/addons/mod/glossary/lang/ca.json          |  2 +-
 www/addons/mod/glossary/lang/cs.json          |  2 +-
 www/addons/mod/glossary/lang/de.json          |  2 +-
 www/addons/mod/glossary/lang/el.json          |  2 +-
 www/addons/mod/glossary/lang/es-mx.json       |  2 +-
 www/addons/mod/glossary/lang/es.json          |  2 +-
 www/addons/mod/glossary/lang/eu.json          |  2 +-
 www/addons/mod/glossary/lang/fr.json          |  2 +-
 www/addons/mod/glossary/lang/lt.json          |  2 +-
 www/addons/mod/glossary/lang/nl.json          |  2 +-
 www/addons/mod/glossary/lang/pt-br.json       |  2 +-
 www/addons/mod/glossary/lang/pt.json          |  2 +-
 www/addons/mod/glossary/lang/ro.json          |  2 +-
 www/addons/mod/glossary/lang/sv.json          |  2 +-
 www/addons/mod/glossary/lang/uk.json          |  2 +-
 www/addons/mod/glossary/lang/zh-tw.json       |  2 +-
 www/addons/mod/label/lang/lt.json             |  2 +-
 www/addons/mod/label/lang/uk.json             |  2 +-
 www/addons/mod/survey/lang/zh-tw.json         |  2 +-
 www/addons/mod/wiki/lang/zh-tw.json           |  2 +-
 www/addons/notes/lang/bg.json                 |  2 +-
 www/addons/notes/lang/ca.json                 |  2 +-
 www/addons/notes/lang/cs.json                 |  2 +-
 www/addons/notes/lang/de.json                 |  2 +-
 www/addons/notes/lang/el.json                 |  2 +-
 www/addons/notes/lang/es-mx.json              |  2 +-
 www/addons/notes/lang/eu.json                 |  2 +-
 www/addons/notes/lang/fr.json                 |  2 +-
 www/addons/notes/lang/it.json                 |  2 +-
 www/addons/notes/lang/lt.json                 |  2 +-
 www/addons/notes/lang/nl.json                 |  2 +-
 www/addons/notes/lang/pt-br.json              |  2 +-
 www/addons/notes/lang/pt.json                 |  2 +-
 www/addons/notes/lang/ro.json                 |  2 +-
 www/addons/notes/lang/ru.json                 |  2 +-
 www/addons/notes/lang/sv.json                 |  2 +-
 www/addons/notes/lang/uk.json                 |  2 +-
 www/addons/notes/lang/zh-tw.json              |  2 +-
 www/addons/notifications/lang/cs.json         |  2 +-
 www/addons/notifications/lang/de.json         |  2 +-
 www/addons/notifications/lang/es-mx.json      |  2 +-
 www/addons/notifications/lang/es.json         |  4 +--
 www/addons/notifications/lang/eu.json         |  2 +-
 www/addons/notifications/lang/fa.json         |  2 +-
 www/addons/notifications/lang/lt.json         |  2 +-
 www/addons/notifications/lang/nl.json         |  2 +-
 www/addons/notifications/lang/pt-br.json      |  4 +--
 www/addons/notifications/lang/sv.json         |  2 +-
 www/addons/notifications/lang/uk.json         |  2 +-
 www/addons/notifications/lang/zh-cn.json      |  2 +-
 www/addons/notifications/lang/zh-tw.json      |  2 +-
 www/addons/participants/lang/ca.json          |  2 +-
 www/addons/participants/lang/cs.json          |  2 +-
 www/addons/participants/lang/de.json          |  4 +--
 www/addons/participants/lang/el.json          |  2 +-
 www/addons/participants/lang/es-mx.json       |  2 +-
 www/addons/participants/lang/es.json          |  2 +-
 www/addons/participants/lang/eu.json          |  2 +-
 www/addons/participants/lang/lt.json          |  2 +-
 www/addons/participants/lang/nl.json          |  2 +-
 www/addons/participants/lang/pt-br.json       |  2 +-
 www/addons/participants/lang/pt.json          |  2 +-
 www/addons/participants/lang/ro.json          |  4 +--
 www/addons/participants/lang/sv.json          |  2 +-
 www/addons/participants/lang/tr.json          |  2 +-
 www/addons/participants/lang/uk.json          |  2 +-
 www/addons/participants/lang/zh-cn.json       |  2 +-
 www/addons/participants/lang/zh-tw.json       |  4 +--
 www/core/components/course/lang/bg.json       |  2 +-
 www/core/components/course/lang/ca.json       |  2 +-
 www/core/components/course/lang/cs.json       |  2 +-
 www/core/components/course/lang/de.json       |  2 +-
 www/core/components/course/lang/el.json       |  2 +-
 www/core/components/course/lang/es-mx.json    |  4 +--
 www/core/components/course/lang/es.json       |  4 +--
 www/core/components/course/lang/eu.json       |  2 +-
 www/core/components/course/lang/fa.json       |  4 +--
 www/core/components/course/lang/fr.json       |  2 +-
 www/core/components/course/lang/it.json       |  2 +-
 www/core/components/course/lang/lt.json       |  4 +--
 www/core/components/course/lang/nl.json       |  2 +-
 www/core/components/course/lang/pt-br.json    |  4 +--
 www/core/components/course/lang/pt.json       |  2 +-
 www/core/components/course/lang/ro.json       |  4 +--
 www/core/components/course/lang/ru.json       |  2 +-
 www/core/components/course/lang/sv.json       |  2 +-
 www/core/components/course/lang/tr.json       |  4 +--
 www/core/components/course/lang/uk.json       |  4 +--
 www/core/components/course/lang/zh-cn.json    |  2 +-
 www/core/components/course/lang/zh-tw.json    |  4 +--
 www/core/components/courses/lang/ca.json      |  6 ++--
 www/core/components/courses/lang/cs.json      | 10 +++----
 www/core/components/courses/lang/de.json      |  8 +++---
 www/core/components/courses/lang/el.json      |  8 +++---
 www/core/components/courses/lang/es-mx.json   |  6 ++--
 www/core/components/courses/lang/es.json      |  6 ++--
 www/core/components/courses/lang/eu.json      |  8 +++---
 www/core/components/courses/lang/fr.json      |  6 ++--
 www/core/components/courses/lang/it.json      |  6 ++--
 www/core/components/courses/lang/lt.json      | 10 +++----
 www/core/components/courses/lang/nl.json      |  8 +++---
 www/core/components/courses/lang/pt-br.json   |  8 +++---
 www/core/components/courses/lang/pt.json      | 10 +++----
 www/core/components/courses/lang/ro.json      | 10 +++----
 www/core/components/courses/lang/sv.json      | 10 +++----
 www/core/components/courses/lang/uk.json      | 10 +++----
 www/core/components/courses/lang/zh-tw.json   | 10 +++----
 www/core/components/fileuploader/lang/bg.json |  2 +-
 www/core/components/fileuploader/lang/ca.json |  8 +++---
 www/core/components/fileuploader/lang/cs.json |  8 +++---
 www/core/components/fileuploader/lang/de.json |  4 +--
 www/core/components/fileuploader/lang/el.json |  6 ++--
 .../components/fileuploader/lang/es-mx.json   |  6 ++--
 www/core/components/fileuploader/lang/es.json |  4 +--
 www/core/components/fileuploader/lang/eu.json |  6 ++--
 www/core/components/fileuploader/lang/fr.json |  8 +++---
 www/core/components/fileuploader/lang/it.json |  8 +++---
 www/core/components/fileuploader/lang/lt.json |  6 ++--
 www/core/components/fileuploader/lang/nl.json | 10 +++----
 .../components/fileuploader/lang/pt-br.json   |  6 ++--
 www/core/components/fileuploader/lang/pt.json |  8 +++---
 www/core/components/fileuploader/lang/ro.json |  8 +++---
 www/core/components/fileuploader/lang/ru.json |  6 ++--
 www/core/components/fileuploader/lang/sv.json |  4 +--
 www/core/components/fileuploader/lang/tr.json |  2 +-
 www/core/components/fileuploader/lang/uk.json |  6 ++--
 .../components/fileuploader/lang/zh-cn.json   |  2 +-
 .../components/fileuploader/lang/zh-tw.json   |  8 +++---
 www/core/components/login/lang/bg.json        |  2 +-
 www/core/components/login/lang/cs.json        |  4 +--
 www/core/components/login/lang/de.json        |  2 +-
 www/core/components/login/lang/el.json        |  2 +-
 www/core/components/login/lang/es-mx.json     |  4 +--
 www/core/components/login/lang/es.json        |  2 +-
 www/core/components/login/lang/eu.json        |  4 +--
 www/core/components/login/lang/fr.json        |  4 +--
 www/core/components/login/lang/it.json        |  2 +-
 www/core/components/login/lang/lt.json        |  4 +--
 www/core/components/login/lang/nl.json        |  4 +--
 www/core/components/login/lang/pt-br.json     |  4 +--
 www/core/components/login/lang/pt.json        |  4 +--
 www/core/components/login/lang/ro.json        |  2 +-
 www/core/components/login/lang/ru.json        |  2 +-
 www/core/components/login/lang/sv.json        |  2 +-
 www/core/components/login/lang/uk.json        |  4 +--
 www/core/components/login/lang/zh-tw.json     |  4 +--
 www/core/components/question/lang/ca.json     |  2 +-
 www/core/components/question/lang/cs.json     |  2 +-
 www/core/components/question/lang/de.json     |  2 +-
 www/core/components/question/lang/es-mx.json  |  2 +-
 www/core/components/question/lang/es.json     |  2 +-
 www/core/components/question/lang/eu.json     |  2 +-
 www/core/components/question/lang/fr.json     |  2 +-
 www/core/components/question/lang/it.json     |  2 +-
 www/core/components/question/lang/lt.json     |  2 +-
 www/core/components/question/lang/nl.json     |  2 +-
 www/core/components/question/lang/pt-br.json  |  2 +-
 www/core/components/question/lang/pt.json     |  2 +-
 www/core/components/question/lang/uk.json     |  2 +-
 www/core/components/question/lang/zh-tw.json  |  2 +-
 www/core/components/sharedfiles/lang/ca.json  |  2 +-
 www/core/components/sharedfiles/lang/cs.json  |  2 +-
 www/core/components/sharedfiles/lang/de.json  |  2 +-
 .../components/sharedfiles/lang/es-mx.json    |  2 +-
 www/core/components/sharedfiles/lang/eu.json  |  2 +-
 www/core/components/sharedfiles/lang/lt.json  |  4 +--
 www/core/components/sharedfiles/lang/pt.json  |  2 +-
 www/core/components/sharedfiles/lang/uk.json  |  2 +-
 .../components/sharedfiles/lang/zh-tw.json    |  4 +--
 www/core/components/sidemenu/lang/ca.json     |  2 +-
 www/core/components/sidemenu/lang/cs.json     |  2 +-
 www/core/components/sidemenu/lang/de.json     |  2 +-
 www/core/components/sidemenu/lang/es-mx.json  |  2 +-
 www/core/components/sidemenu/lang/fa.json     |  4 +--
 www/core/components/sidemenu/lang/it.json     |  2 +-
 www/core/components/sidemenu/lang/lt.json     |  6 ++--
 www/core/components/sidemenu/lang/nl.json     |  2 +-
 www/core/components/sidemenu/lang/pt.json     |  2 +-
 www/core/components/sidemenu/lang/ro.json     |  2 +-
 www/core/components/sidemenu/lang/ru.json     |  2 +-
 www/core/components/sidemenu/lang/tr.json     |  2 +-
 www/core/components/sidemenu/lang/uk.json     |  2 +-
 www/core/components/sidemenu/lang/zh-cn.json  |  2 +-
 www/core/components/sidemenu/lang/zh-tw.json  |  4 +--
 www/core/components/user/lang/bg.json         |  6 ++--
 www/core/components/user/lang/ca.json         |  4 +--
 www/core/components/user/lang/cs.json         |  6 ++--
 www/core/components/user/lang/de.json         |  6 ++--
 www/core/components/user/lang/es-mx.json      |  6 ++--
 www/core/components/user/lang/es.json         |  4 +--
 www/core/components/user/lang/eu.json         |  6 ++--
 www/core/components/user/lang/fa.json         |  6 ++--
 www/core/components/user/lang/fr.json         |  8 +++---
 www/core/components/user/lang/it.json         |  6 ++--
 www/core/components/user/lang/lt.json         |  8 +++---
 www/core/components/user/lang/nl.json         |  4 +--
 www/core/components/user/lang/pt-br.json      |  6 ++--
 www/core/components/user/lang/pt.json         |  2 +-
 www/core/components/user/lang/ro.json         |  6 ++--
 www/core/components/user/lang/ru.json         |  6 ++--
 www/core/components/user/lang/sv.json         |  8 +++---
 www/core/components/user/lang/tr.json         |  8 +++---
 www/core/components/user/lang/uk.json         |  6 ++--
 www/core/components/user/lang/zh-cn.json      |  4 +--
 www/core/components/user/lang/zh-tw.json      |  8 +++---
 www/core/lang/ca.json                         |  8 +++---
 www/core/lang/cs.json                         | 14 +++++-----
 www/core/lang/de.json                         | 22 +++++++--------
 www/core/lang/el.json                         | 24 ++++++++--------
 www/core/lang/es-mx.json                      | 24 ++++++++--------
 www/core/lang/es.json                         | 10 +++----
 www/core/lang/eu.json                         |  8 +++---
 www/core/lang/fr.json                         | 12 ++++----
 www/core/lang/it.json                         | 22 +++++++--------
 www/core/lang/lt.json                         | 22 +++++++--------
 www/core/lang/nl.json                         | 22 +++++++--------
 www/core/lang/pt-br.json                      | 22 +++++++--------
 www/core/lang/pt.json                         | 26 ++++++++---------
 www/core/lang/ro.json                         | 22 +++++++--------
 www/core/lang/sv.json                         | 22 +++++++--------
 www/core/lang/tr.json                         |  4 +--
 www/core/lang/uk.json                         | 28 +++++++++----------
 www/core/lang/zh-tw.json                      | 28 +++++++++----------
 348 files changed, 848 insertions(+), 848 deletions(-)

diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index 5dca11fb0e2..93d27c11dce 100644
--- a/www/addons/calendar/lang/cs.json
+++ b/www/addons/calendar/lang/cs.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Výchozí čas oznámení",
     "errorloadevent": "Chyba při načítání události.",
     "errorloadevents": "Chyba při načítání událostí.",
-    "noevents": "Žádné nadcházející činnosti",
-    "notifications": "Informace"
+    "noevents": "Nejsou žádné události",
+    "notifications": "Upozornění"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/de.json b/www/addons/calendar/lang/de.json
index e38e81f16cd..ee64dc04300 100644
--- a/www/addons/calendar/lang/de.json
+++ b/www/addons/calendar/lang/de.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standardmäßige Benachrichtigungszeit",
     "errorloadevent": "Fehler beim Laden des Kalendereintrags",
     "errorloadevents": "Fehler beim Laden der Kalendereinträge",
-    "noevents": "Keine anstehenden Aktivitäten fällig",
-    "notifications": "Systemmitteilungen"
+    "noevents": "Keine Kalendereinträge",
+    "notifications": "Benachrichtigung"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es-mx.json b/www/addons/calendar/lang/es-mx.json
index d4be495ef94..872b31813b4 100644
--- a/www/addons/calendar/lang/es-mx.json
+++ b/www/addons/calendar/lang/es-mx.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificación por defecto",
     "errorloadevent": "Error al cargar evento.",
     "errorloadevents": "Error al cargar eventos.",
-    "noevents": "No hay actividades próximas pendientes",
-    "notifications": "Avisos"
+    "noevents": "No hay eventos",
+    "notifications": "Notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/es.json b/www/addons/calendar/lang/es.json
index 9b7fc329f8e..39bf009cfb6 100644
--- a/www/addons/calendar/lang/es.json
+++ b/www/addons/calendar/lang/es.json
@@ -2,6 +2,6 @@
     "calendarevents": "Eventos de calendario",
     "errorloadevent": "Error cargando el evento.",
     "errorloadevents": "Error cargando los eventos.",
-    "noevents": "No hay actividades próximas pendientes",
-    "notifications": "Avisos"
+    "noevents": "No hay eventos",
+    "notifications": "Notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 76813733c1d..109ac4e7ec6 100644
--- a/www/addons/calendar/lang/fa.json
+++ b/www/addons/calendar/lang/fa.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "زمان پیش‌فرض اطلاع‌رسانی",
     "errorloadevent": "خطا در بارگیری رویداد.",
     "errorloadevents": "خطا در بارگیری رویدادها.",
-    "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
-    "notifications": "تذکرات"
+    "noevents": "هیچ رویدادی نیست",
+    "notifications": "هشدارها"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fr.json b/www/addons/calendar/lang/fr.json
index 9281fbdabb5..79e2b2edcac 100644
--- a/www/addons/calendar/lang/fr.json
+++ b/www/addons/calendar/lang/fr.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Heure de notification par défaut",
     "errorloadevent": "Erreur de chargement de l'événement",
     "errorloadevents": "Erreur de chargement des événements",
-    "noevents": "Aucune activité",
+    "noevents": "Il n'y a pas d'événement",
     "notifications": "Notifications"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/it.json b/www/addons/calendar/lang/it.json
index bd05740cedc..7dda0726c1e 100644
--- a/www/addons/calendar/lang/it.json
+++ b/www/addons/calendar/lang/it.json
@@ -2,6 +2,6 @@
     "calendarevents": "Eventi nel calendario",
     "errorloadevent": "Si è verificato un errore durante il caricamento degli eventi.",
     "errorloadevents": "Si è verificato un errore durante il caricamento degli eventi.",
-    "noevents": "Non ci sono attività da svolgere",
+    "noevents": "Non ci sono eventi",
     "notifications": "Notifiche"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/nl.json b/www/addons/calendar/lang/nl.json
index 16546e8a4ee..5c7174a3165 100644
--- a/www/addons/calendar/lang/nl.json
+++ b/www/addons/calendar/lang/nl.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Standaard notificatietijd",
     "errorloadevent": "Fout bij het laden van de gebeurtenis.",
     "errorloadevents": "Fout bij het laden van de gebeurtenissen.",
-    "noevents": "Er zijn geen verwachte activiteiten",
+    "noevents": "Er zijn geen gebeurtenissen",
     "notifications": "Meldingen"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index dab7f4360aa..b348e89bed4 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
     "noevents": "Sem eventos",
-    "notifications": "Avisos"
+    "notifications": "Notificação"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sv.json b/www/addons/calendar/lang/sv.json
index 12cef7ef2eb..d5ac5c127d0 100644
--- a/www/addons/calendar/lang/sv.json
+++ b/www/addons/calendar/lang/sv.json
@@ -3,5 +3,5 @@
     "errorloadevent": "Fel vid inläsning av händelse.",
     "errorloadevents": "Fel vid inläsning av händelser",
     "noevents": "Det finns inga händelser",
-    "notifications": "Administration"
+    "notifications": "Notifikationer"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/uk.json b/www/addons/calendar/lang/uk.json
index 2a2f34438be..2e0930c7034 100644
--- a/www/addons/calendar/lang/uk.json
+++ b/www/addons/calendar/lang/uk.json
@@ -4,5 +4,5 @@
     "errorloadevent": "Помилка завантаження події.",
     "errorloadevents": "Помилка завантаження подій.",
     "noevents": "Немає подій",
-    "notifications": "Повідомлення"
+    "notifications": "Сповіщення"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/zh-cn.json b/www/addons/calendar/lang/zh-cn.json
index 2d363916b74..5fc1088f46f 100644
--- a/www/addons/calendar/lang/zh-cn.json
+++ b/www/addons/calendar/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noevents": "没有事件",
-    "notifications": "通告"
+    "notifications": "通知"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/zh-tw.json b/www/addons/calendar/lang/zh-tw.json
index a6d35c00472..f880be3d54c 100644
--- a/www/addons/calendar/lang/zh-tw.json
+++ b/www/addons/calendar/lang/zh-tw.json
@@ -2,6 +2,6 @@
     "calendarevents": "行事曆",
     "errorloadevent": "載入事件時出現錯誤",
     "errorloadevents": "載入事件時出現錯誤",
-    "noevents": "沒有即將到期的活動",
+    "noevents": "沒有事件",
     "notifications": "通知"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/ca.json b/www/addons/competency/lang/ca.json
index f0dbfd1e860..70962efd930 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -10,7 +10,7 @@
     "learningplans": "Plans d'aprenentatge",
     "myplans": "Els meus plans d'aprenentatge",
     "noactivities": "Cap activitat",
-    "nocompetencies": "No s'han creat competències en aquest marc.",
+    "nocompetencies": "Cap competència",
     "nocrossreferencedcompetencies": "No hi ha competències amb referències a aquesta.",
     "noevidence": "Cap evidència",
     "noplanswerecreated": "No s'ha creat cap pla d'aprenentatge.",
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index c9580755936..95324b05ccc 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -12,7 +12,7 @@
     "learningplans": "Studijní plány",
     "myplans": "Mé studijní plány",
     "noactivities": "Žádné činnosti",
-    "nocompetencies": "V tomto rámci nebyly vytvořeny žádné kompetence.",
+    "nocompetencies": "Žádné kompetence",
     "nocrossreferencedcompetencies": "K této kompetenci nebyly spojeny další průřezové kompetence.",
     "noevidence": "Bez záznamu",
     "noplanswerecreated": "Nebyly vytvořeny žádné studijní plány.",
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index 1b3ec35457c..2c43a7fb415 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -12,7 +12,7 @@
     "learningplans": "Lernpläne",
     "myplans": "Meine Lernpläne",
     "noactivities": "Keine Aktivitäten",
-    "nocompetencies": "Für diesen Kompetenzrahmen wurden keine Kompetenzen angelegt.",
+    "nocompetencies": "Keine Kompetenzen",
     "nocrossreferencedcompetencies": "Keine anderen Kompetenzen wurden zu dieser Kompetenz referiert.",
     "noevidence": "Keine Belege",
     "noplanswerecreated": "Bisher sind keine Lernpläne angelegt.",
diff --git a/www/addons/competency/lang/es-mx.json b/www/addons/competency/lang/es-mx.json
index 0b59da87bc5..276f784e4f3 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -12,7 +12,7 @@
     "learningplans": "Planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
-    "nocompetencies": "No se han creado competencias en esta estructura.",
+    "nocompetencies": "Sin competencias",
     "nocrossreferencedcompetencies": "No se han referenciado cruzadamente otras competencias con esta competencia.",
     "noevidence": "Sin evidencia",
     "noplanswerecreated": "No se crearon planes de aprendizaje.",
diff --git a/www/addons/competency/lang/es.json b/www/addons/competency/lang/es.json
index 21b8ae5fe9f..b87c3dda451 100644
--- a/www/addons/competency/lang/es.json
+++ b/www/addons/competency/lang/es.json
@@ -12,7 +12,7 @@
     "learningplans": "Planes de aprendizaje",
     "myplans": "Mis planes de aprendizaje",
     "noactivities": "Sin actividades",
-    "nocompetencies": "No se han creado competencias para este marco.",
+    "nocompetencies": "Sin competencias",
     "nocrossreferencedcompetencies": "No se han referenciado otras competencias a esta competencia.",
     "noevidence": "Sin evidencias",
     "path": "Ruta",
diff --git a/www/addons/competency/lang/eu.json b/www/addons/competency/lang/eu.json
index 8382f8a4223..3b4e8511411 100644
--- a/www/addons/competency/lang/eu.json
+++ b/www/addons/competency/lang/eu.json
@@ -9,7 +9,7 @@
     "learningplans": "Ikasketa-planak",
     "myplans": "Nire ikasketa-planak",
     "noactivities": "Ez dago jarduerarik",
-    "nocompetencies": "Ezin izan gaitasunik sortu marko honetan.",
+    "nocompetencies": "Gaitasunik ez",
     "noevidence": "Ez dago ebidentziarik",
     "noplanswerecreated": "Ez da ikasketa-planik sortu.",
     "path": "Bidea",
diff --git a/www/addons/competency/lang/fr.json b/www/addons/competency/lang/fr.json
index a38300a90d2..54703a62fc1 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -12,7 +12,7 @@
     "learningplans": "Plans de formation",
     "myplans": "Mes plans de formation",
     "noactivities": "Aucune activité",
-    "nocompetencies": "Aucune compétence n'a été créée dans ce référentiel.",
+    "nocompetencies": "Aucune compétence",
     "nocrossreferencedcompetencies": "Aucune autre compétence n'est transversale pour cette compétence.",
     "noevidence": "Aucune preuve d'acquis",
     "noplanswerecreated": "Aucun plan de formation n'a été créé.",
diff --git a/www/addons/competency/lang/it.json b/www/addons/competency/lang/it.json
index 4284b4b1ebe..9c5d5159c01 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -12,7 +12,7 @@
     "learningplans": "Piani di formazione",
     "myplans": "I miei piani di formazione",
     "noactivities": "Nessuna attività.",
-    "nocompetencies": "Questo quadro non ha competenze",
+    "nocompetencies": "Non sono presenti competenze",
     "nocrossreferencedcompetencies": "Non ci sono competenze con riferimenti incrociati a questa competenza",
     "noevidence": "Non sono presenti attestazioni.",
     "noplanswerecreated": "Non sono stati creati piani di formazione",
diff --git a/www/addons/competency/lang/lt.json b/www/addons/competency/lang/lt.json
index 6e177d8c323..bfd76f8a42c 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -9,7 +9,7 @@
     "learningplans": "Mokymosi planai",
     "myplans": "Mano mokymosi planai",
     "noactivities": "Nėra veiklų",
-    "nocompetencies": "Šioje sistemoje nebuvo sukurta kompetencijų.",
+    "nocompetencies": "Nėra kompetencijų",
     "noplanswerecreated": "Nebuvo sukurta mokymosi planų.",
     "path": "Kelias",
     "progress": "Besimokančiojo pažanga",
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index b6aa4c90671..5dff19cfe87 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -12,7 +12,7 @@
     "learningplans": "Studieplannen",
     "myplans": "Mijn studieplannen",
     "noactivities": "Geen activiteiten",
-    "nocompetencies": "Er zijn nog geen competenties gemaakt in dit framework",
+    "nocompetencies": "Geen competenties",
     "nocrossreferencedcompetencies": "Er zijn geen andere competenties met een kruisverwijzing naar deze competentie.",
     "noevidence": "Geen bewijs",
     "noplanswerecreated": "Er zijn nog geen studieplannen gemaakt",
diff --git a/www/addons/competency/lang/pt-br.json b/www/addons/competency/lang/pt-br.json
index 4afd49ee616..268860975f8 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -12,7 +12,7 @@
     "learningplans": "Planos de aprendizagem",
     "myplans": "Meus planos de aprendizagem",
     "noactivities": "Sem atividades",
-    "nocompetencies": "Nenhuma competência foi criada para esta estrutura.",
+    "nocompetencies": "Nenhuma competência",
     "nocrossreferencedcompetencies": "Nenhuma outra competência foi referenciada a esta competência.",
     "noevidence": "Nenhuma evidência",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
diff --git a/www/addons/competency/lang/pt.json b/www/addons/competency/lang/pt.json
index 09243e3fe6c..9acc0bd20d8 100644
--- a/www/addons/competency/lang/pt.json
+++ b/www/addons/competency/lang/pt.json
@@ -12,7 +12,7 @@
     "learningplans": "Planos de aprendizagem",
     "myplans": "Os meus planos de aprendizagem",
     "noactivities": "Nenhuma atividade associada",
-    "nocompetencies": "Ainda não foram criadas competências neste quadro.",
+    "nocompetencies": "Sem competências",
     "nocrossreferencedcompetencies": "Nenhuma competência foi referenciada a esta competência.",
     "noevidence": "Não foi adicionado nenhum comprovativo",
     "noplanswerecreated": "Nenhum plano de aprendizagem foi criado.",
diff --git a/www/addons/competency/lang/uk.json b/www/addons/competency/lang/uk.json
index a84995bc5b8..d764c9bda7c 100644
--- a/www/addons/competency/lang/uk.json
+++ b/www/addons/competency/lang/uk.json
@@ -12,7 +12,7 @@
     "learningplans": "Навчальний план",
     "myplans": "Мої навчальні плани",
     "noactivities": "Жодної діяльності",
-    "nocompetencies": "Жодної компетентності не створено у цьому репозиторії",
+    "nocompetencies": "Немає компетенції",
     "nocrossreferencedcompetencies": "Жодна інша компетентність не пов'язана з даною",
     "noevidence": "Жодного підтвердження",
     "noplanswerecreated": "Жодного навчального плану не було створено",
diff --git a/www/addons/competency/lang/zh-tw.json b/www/addons/competency/lang/zh-tw.json
index be50bdc5edf..fe0b027bb70 100644
--- a/www/addons/competency/lang/zh-tw.json
+++ b/www/addons/competency/lang/zh-tw.json
@@ -12,7 +12,7 @@
     "learningplans": "學習計畫",
     "myplans": "我的學習計畫",
     "noactivities": "沒有活動",
-    "nocompetencies": "在這一架構中沒有核心能力被建立",
+    "nocompetencies": "沒有功能",
     "nocrossreferencedcompetencies": "沒有其他核心能力被交互參照這一核心能力",
     "noevidence": "沒有證據",
     "noplanswerecreated": "沒有學習計畫被建立",
diff --git a/www/addons/coursecompletion/lang/ca.json b/www/addons/coursecompletion/lang/ca.json
index 1c81e04c587..c8c2a11d5e0 100644
--- a/www/addons/coursecompletion/lang/ca.json
+++ b/www/addons/coursecompletion/lang/ca.json
@@ -1,14 +1,14 @@
 {
     "complete": "Complet",
     "completecourse": "Curs complet",
-    "completed": "completat",
+    "completed": "Completat",
     "completiondate": "Data de compleció",
     "couldnotloadreport": "No es pot carregar l'informe de compleció del curs, torneu a intentar-ho més tard.",
     "coursecompletion": "Compleció del curs",
     "criteria": "Criteris",
     "criteriagroup": "Grup de criteris",
-    "criteriarequiredall": "Cal que es compleixin tots els criteris que es mostren a continuació",
-    "criteriarequiredany": "Cal que es compleixi algun dels criteris que es mostren a continuació",
+    "criteriarequiredall": "Calen tots els criteris del dessota",
+    "criteriarequiredany": "Cal qualsevol dels criteris del dessota",
     "inprogress": "En curs",
     "manualselfcompletion": "Auto-compleció manual",
     "notyetstarted": "No s'ha començat encara",
diff --git a/www/addons/coursecompletion/lang/cs.json b/www/addons/coursecompletion/lang/cs.json
index d236a17e7ec..f54632d92c0 100644
--- a/www/addons/coursecompletion/lang/cs.json
+++ b/www/addons/coursecompletion/lang/cs.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Splněno",
+    "complete": "Absolvováno",
     "completecourse": "Absolvovaný kurz",
     "completed": "Splněno",
     "completiondate": "Datum ukončení",
     "couldnotloadreport": "Nelze načíst zprávu o absolvování kurzu, zkuste to prosím později.",
     "coursecompletion": "Absolvování kurzu",
-    "criteria": "Podmínky",
+    "criteria": "Kritéria",
     "criteriagroup": "Skupina podmínek",
-    "criteriarequiredall": "Všechny podmínky musí být splněny",
-    "criteriarequiredany": "Jakákoli z podmínek musí být splněna",
+    "criteriarequiredall": "Jsou požadovány všechny podmínky",
+    "criteriarequiredany": "Je požadována libovolná podmínka",
     "inprogress": "Probíhá",
-    "manualselfcompletion": "Označení absolvování kurzu samotným studentem",
+    "manualselfcompletion": "Ručně nastavené absolvování kurzu samotným studentem",
     "notyetstarted": "Zatím nezačalo",
     "pending": "Čeká",
-    "required": "Vyžadováno",
-    "requiredcriteria": "Vyžadované podmínky",
+    "required": "Požadováno",
+    "requiredcriteria": "Požadovaná kriteria",
     "requirement": "Požadavek",
-    "status": "Stav",
-    "viewcoursereport": "Zobrazit přehled kurzu"
+    "status": "Status",
+    "viewcoursereport": "Zobrazit sestavu kurzu"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/de.json b/www/addons/coursecompletion/lang/de.json
index b3c079e25ce..7125646d332 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,5 +1,5 @@
 {
-    "complete": "Fertig",
+    "complete": "Abschließen",
     "completecourse": "Kurs abschließen",
     "completed": "Abgeschlossen",
     "completiondate": "Abschlussdatum",
@@ -7,15 +7,15 @@
     "coursecompletion": "Kursabschluss",
     "criteria": "Kriterien",
     "criteriagroup": "Kriteriengruppe",
-    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig",
-    "criteriarequiredany": "Eine der nachfolgenden Kriterien ist notwendig",
-    "inprogress": "In Bearbeitung",
-    "manualselfcompletion": "Manueller eigener Abschluss",
-    "notyetstarted": "Noch nicht begonnen",
-    "pending": "Unerledigt",
-    "required": "Erforderlich",
-    "requiredcriteria": "Notwendiges Kriterium",
+    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig.",
+    "criteriarequiredany": "Ein nachfolgendes Kriterium ist notwendig.",
+    "inprogress": "In Arbeit",
+    "manualselfcompletion": "Manueller Selbstabschluss",
+    "notyetstarted": "Nicht begonnen",
+    "pending": "Nicht erledigt",
+    "required": "Notwendig",
+    "requiredcriteria": "Notwendige Kriterien",
     "requirement": "Anforderung",
     "status": "Status",
-    "viewcoursereport": "Kursbericht ansehen"
+    "viewcoursereport": "Kursbericht anzeigen"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index 50f490cb6d3..555b60517bd 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -1,21 +1,21 @@
 {
     "complete": "Ολοκλήρωση",
     "completecourse": "Ολοκλήρωση μαθήματος",
-    "completed": "ολοκληρώθηκε",
+    "completed": "Ολοκληρωμένο",
     "completiondate": "Ημερομηνία ολοκλήρωσης",
     "couldnotloadreport": "Δεν ήταν δυνατή η φόρτωση της αναφοράς ολοκλήρωσης του μαθήματος, δοκιμάστε ξανά αργότερα.",
     "coursecompletion": "Ολοκλήρωση μαθήματος",
     "criteria": "Κριτήρια",
     "criteriagroup": "Ομάδα κριτηρίων",
-    "criteriarequiredall": "Όλα τα παρακάτω κριτήρια είναι απαραίτητα",
-    "criteriarequiredany": "Τα παρακάτω κριτήρια είναι απαραίτητα",
+    "criteriarequiredall": "Όλα τα παρακάτω κριτήρια είναι υποχρεωτικά",
+    "criteriarequiredany": "Οποιοδήποτε από τα παρακάτω κριτήρια είναι υποχρεωτικά",
     "inprogress": "Σε εξέλιξη",
     "manualselfcompletion": "Χειροκίνητη αυτό-ολοκλήρωση",
     "notyetstarted": "Δεν έχει ξεκινήσει ακόμα",
-    "pending": "Σε εκκρεμότητα",
+    "pending": "Εκκρεμής",
     "required": "Απαιτείται",
     "requiredcriteria": "Απαιτούμενα κριτήρια",
     "requirement": "Απαίτηση",
     "status": "Κατάσταση",
-    "viewcoursereport": "Προβολή αναφορά μαθήματος"
+    "viewcoursereport": "Δείτε την αναφορά μαθήματος"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/es-mx.json b/www/addons/coursecompletion/lang/es-mx.json
index a1801e0134e..0252ef2ea82 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Completado",
+    "complete": "Completo",
     "completecourse": "Curso completo",
     "completed": "Completado",
     "completiondate": "Fecha de terminación",
     "couldnotloadreport": "No pudo cargarse el reporte de finalización del curso; por favor inténtelo más tarde.",
     "coursecompletion": "Finalización del curso",
-    "criteria": "Criterios",
-    "criteriagroup": "Grupo de criterios",
-    "criteriarequiredall": "Son necesarios todos los criterios que aparecen más abajo",
-    "criteriarequiredany": "Es necesario cualquiera de los criterios que aparecen más abajo",
-    "inprogress": "En curso",
-    "manualselfcompletion": "Auto-finalizar manualmente",
-    "notyetstarted": "Aún no ha comenzado",
+    "criteria": "Criterio",
+    "criteriagroup": "Grupo de criterio",
+    "criteriarequiredall": "Todos los criterios debajo son necesarios",
+    "criteriarequiredany": "Cualquiera de los criterios debajo es necesarios",
+    "inprogress": "en progreso",
+    "manualselfcompletion": "Auto finalización manual",
+    "notyetstarted": "Todavía no iniciado",
     "pending": "Pendiente",
-    "required": "Obligatorio",
-    "requiredcriteria": "Criterios necesarios",
+    "required": "Requerido",
+    "requiredcriteria": "Criterio requerido",
     "requirement": "Requisito",
     "status": "Estatus",
     "viewcoursereport": "Ver reporte del curso"
diff --git a/www/addons/coursecompletion/lang/es.json b/www/addons/coursecompletion/lang/es.json
index 450fdda8b2c..89ef5e6ecd0 100644
--- a/www/addons/coursecompletion/lang/es.json
+++ b/www/addons/coursecompletion/lang/es.json
@@ -1,7 +1,7 @@
 {
     "complete": "Completado",
     "completecourse": "Curso completado",
-    "completed": "completada",
+    "completed": "Finalizado",
     "completiondate": "Fecha de finalización",
     "couldnotloadreport": "No se puede cargar el informe de finalización del curso, por favor inténtalo de nuevo más tarde.",
     "coursecompletion": "Finalización del curso",
diff --git a/www/addons/coursecompletion/lang/fa.json b/www/addons/coursecompletion/lang/fa.json
index 10688aff85a..b9ddd4aaa56 100644
--- a/www/addons/coursecompletion/lang/fa.json
+++ b/www/addons/coursecompletion/lang/fa.json
@@ -13,5 +13,5 @@
     "required": "لازم است",
     "requiredcriteria": "ضوابط مورد نیاز",
     "status": "وضعیت",
-    "viewcoursereport": "مشاهده گزارش درس"
+    "viewcoursereport": "مشاهدهٔ گزارش درس"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fr.json b/www/addons/coursecompletion/lang/fr.json
index d6edb61e9df..9b7c1642571 100644
--- a/www/addons/coursecompletion/lang/fr.json
+++ b/www/addons/coursecompletion/lang/fr.json
@@ -1,10 +1,10 @@
 {
-    "complete": "Complet",
+    "complete": "Terminer",
     "completecourse": "Terminer le cours",
     "completed": "Terminé",
     "completiondate": "Date d'achèvement",
     "couldnotloadreport": "Impossible de charger le rapport d'achèvement de cours. Veuillez essayer plus tard.",
-    "coursecompletion": "Achèvement de cours",
+    "coursecompletion": "Achèvement du cours",
     "criteria": "Critères",
     "criteriagroup": "Groupe de critères",
     "criteriarequiredall": "Tous les critères ci-dessous sont requis",
@@ -12,10 +12,10 @@
     "inprogress": "En cours",
     "manualselfcompletion": "Auto-achèvement manuel",
     "notyetstarted": "Pas encore commencé",
-    "pending": "En suspens",
+    "pending": "En attente",
     "required": "Requis",
     "requiredcriteria": "Critères requis",
     "requirement": "Condition",
     "status": "Statut",
-    "viewcoursereport": "Consulter le rapport du cours"
+    "viewcoursereport": "Afficher le rapport du cours"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/it.json b/www/addons/coursecompletion/lang/it.json
index 527fe3af5c6..6521061e031 100644
--- a/www/addons/coursecompletion/lang/it.json
+++ b/www/addons/coursecompletion/lang/it.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Completato",
     "completecourse": "Corso completato",
-    "completed": "Completata",
+    "completed": "Completato",
     "completiondate": "Data di completamento",
     "couldnotloadreport": "Non è stato possibile caricare il report di completamento del corso, per favore riporva.",
-    "coursecompletion": "Completamento corso",
+    "coursecompletion": "Completamento del corso",
     "criteria": "Criteri",
     "criteriagroup": "Gruppo di criteri",
     "criteriarequiredall": "E' richiesto il soddisfacimento di tutti i criteri elencati",
     "criteriarequiredany": "E' richiesto il soddisfacimento di almeno uno dei criteri elencati",
-    "inprogress": "In corso",
+    "inprogress": "In svolgimento",
     "manualselfcompletion": "Conferma personale di completamento",
-    "notyetstarted": "Non ancora iniziato",
+    "notyetstarted": "Non iniziato",
     "pending": "In attesa",
-    "required": "La risposta è obbligatoria",
+    "required": "Da soddisfare",
     "requiredcriteria": "Criteri da soddisfare",
     "requirement": "Requisito",
     "status": "Stato",
-    "viewcoursereport": "Visualizza il report del corso"
+    "viewcoursereport": "Visualizza report del corso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/lt.json b/www/addons/coursecompletion/lang/lt.json
index 3379372eedf..c6813474cf2 100644
--- a/www/addons/coursecompletion/lang/lt.json
+++ b/www/addons/coursecompletion/lang/lt.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Užbaigti",
+    "complete": "Visas",
     "completecourse": "Visa kursų medžiaga",
-    "completed": "Baigtas",
+    "completed": "Užbaigta",
     "completiondate": "Užbaigimo data",
     "couldnotloadreport": "Nepavyko įkelti kursų baigimo ataskaitos, prašome pabandyti vėliau.",
     "coursecompletion": "Kursų užbaigimas",
     "criteria": "Kriterijai",
     "criteriagroup": "Kriterijų grupė",
-    "criteriarequiredall": "Visi žemiau pateikti kriterijai yra būtini",
-    "criteriarequiredany": "Bet kuris žemiau pateiktas kriterijus yra būtinas",
+    "criteriarequiredall": "Visi žemiau esantys kriterijai yra privalomi",
+    "criteriarequiredany": "Kiekvienas kriterijus, esantis žemiau, yra privalomas",
     "inprogress": "Nebaigta",
-    "manualselfcompletion": "Savas užbaigimas neautomatiniu būdu",
-    "notyetstarted": "Dar nepradėta",
+    "manualselfcompletion": "Savarankiško mokymosi vadovas",
+    "notyetstarted": "Nepradėta",
     "pending": "Laukiama",
-    "required": "Būtina",
-    "requiredcriteria": "Būtini kriterijai",
+    "required": "Privaloma",
+    "requiredcriteria": "Privalomi kriterijai",
     "requirement": "Būtina sąlyga",
     "status": "Būsena",
     "viewcoursereport": "Peržiūrėti kursų ataskaitą"
diff --git a/www/addons/coursecompletion/lang/nl.json b/www/addons/coursecompletion/lang/nl.json
index c2203da1dc2..78f31da0ac9 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,19 +1,19 @@
 {
-    "complete": "Voltooid",
+    "complete": "Voltooi",
     "completecourse": "Voltooi cursus",
     "completed": "Voltooid",
     "completiondate": "Voltooiingsdatum",
     "couldnotloadreport": "Kon het voltooiingsrapport van de cursus niet laden. Probeer later opnieuw.",
-    "coursecompletion": "Cursus voltooien",
+    "coursecompletion": "Cursus voltooiing",
     "criteria": "Criteria",
     "criteriagroup": "Criteria groep",
     "criteriarequiredall": "Alle onderstaande criteria zijn vereist",
-    "criteriarequiredany": "Al onderstaande criteria zijn vereist",
+    "criteriarequiredany": "Alle onderstaande criteria zijn vereist",
     "inprogress": "Bezig",
-    "manualselfcompletion": "Manueel voltooien",
-    "notyetstarted": "Nog niet begonnen",
-    "pending": "Bezig",
-    "required": "Verplicht",
+    "manualselfcompletion": "Handmatige zelf-voltooiing",
+    "notyetstarted": "Nog niet gestart",
+    "pending": "Nog bezig",
+    "required": "Vereist",
     "requiredcriteria": "Vereiste criteria",
     "requirement": "Vereiste",
     "status": "Status",
diff --git a/www/addons/coursecompletion/lang/pt-br.json b/www/addons/coursecompletion/lang/pt-br.json
index 946450a9dcc..da82565edc9 100644
--- a/www/addons/coursecompletion/lang/pt-br.json
+++ b/www/addons/coursecompletion/lang/pt-br.json
@@ -1,21 +1,21 @@
 {
     "complete": "Concluído",
     "completecourse": "Curso concluído",
-    "completed": "terminado",
+    "completed": "Completado",
     "completiondate": "Data de conclusão",
     "couldnotloadreport": "Não foi possível carregar o relatório de conclusão do curso, por favor tente novamente mais tarde.",
-    "coursecompletion": "Andamento do curso",
+    "coursecompletion": "Conclusão do curso",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
     "criteriarequiredall": "Todos os critérios abaixo são necessários",
-    "criteriarequiredany": "Qualquer um dos critérios abaixo são necessários",
-    "inprogress": "Em andamento",
-    "manualselfcompletion": "Conclusão manual por si mesmo",
-    "notyetstarted": "Não iniciado ainda",
-    "pending": "Pendentes",
-    "required": "Necessários",
-    "requiredcriteria": "Critérios exigidos",
+    "criteriarequiredany": "Quaisquer critérios abaixo são necessários",
+    "inprogress": "Em progresso",
+    "manualselfcompletion": "Auto conclusão manual",
+    "notyetstarted": "Ainda não começou",
+    "pending": "Pendente",
+    "required": "Necessário",
+    "requiredcriteria": "Critério necessário",
     "requirement": "Exigência",
-    "status": "Status",
-    "viewcoursereport": "Ver relatório do curso"
+    "status": "Condição",
+    "viewcoursereport": "Ver relatório de curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt.json b/www/addons/coursecompletion/lang/pt.json
index 9c847ed41d6..5f2bd4dc942 100644
--- a/www/addons/coursecompletion/lang/pt.json
+++ b/www/addons/coursecompletion/lang/pt.json
@@ -1,5 +1,5 @@
 {
-    "complete": "Completo",
+    "complete": "Concluído",
     "completecourse": "Disciplina concluída",
     "completed": "Concluído",
     "completiondate": "Data de conclusão",
@@ -7,14 +7,14 @@
     "coursecompletion": "Conclusão da disciplina",
     "criteria": "Critérios",
     "criteriagroup": "Grupo de critérios",
-    "criteriarequiredall": "Todos os critérios abaixo são exigidos",
-    "criteriarequiredany": "Qualquer dos critérios abaixo é necessário",
+    "criteriarequiredall": "É exigido o cumprimento de todos os critérios abaixo",
+    "criteriarequiredany": "É exigido o cumprimento de qualquer um dos critérios abaixo",
     "inprogress": "Em progresso",
     "manualselfcompletion": "Conclusão manual pelo próprio",
-    "notyetstarted": "Ainda não iniciou",
+    "notyetstarted": "Não iniciou",
     "pending": "Pendente",
-    "required": "Resposta obrigatória",
-    "requiredcriteria": "Critério obrigatório",
+    "required": "Exigido",
+    "requiredcriteria": "Critério exigido",
     "requirement": "Requisito",
     "status": "Estado",
     "viewcoursereport": "Ver relatório da disciplina"
diff --git a/www/addons/coursecompletion/lang/ro.json b/www/addons/coursecompletion/lang/ro.json
index 39692945b36..46b9f21bb93 100644
--- a/www/addons/coursecompletion/lang/ro.json
+++ b/www/addons/coursecompletion/lang/ro.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Finalizează",
+    "complete": "Complet",
     "completecourse": "Curs complet",
-    "completed": "Finalizare",
+    "completed": "Complet",
     "completiondate": "Data limita până la completarea acțiunii",
     "couldnotloadreport": "Raportul cu privire la situația completării cursului nu se poate încărca, încercați mai târziu.",
-    "coursecompletion": "Absolvire curs",
+    "coursecompletion": "Completarea cursului",
     "criteria": "Criterii",
-    "criteriagroup": "Grup criterii",
-    "criteriarequiredall": "Toate criteriile de mai jos sunt necesare",
-    "criteriarequiredany": "Oricare dintre criteriile de mai jos sunt necesare",
-    "inprogress": "În curs",
-    "manualselfcompletion": "Auto-finalizare manuală",
-    "notyetstarted": "Nu a fost încă început",
-    "pending": "În așteptare",
+    "criteriagroup": "Criterii pentru grup",
+    "criteriarequiredall": "Indeplinirea următoarelor criterii este obligatorie",
+    "criteriarequiredany": "Oricare din urmatoarele criterii sunt obligatorii",
+    "inprogress": "În progres",
+    "manualselfcompletion": "Autocompletare",
+    "notyetstarted": "Înca nu a început",
+    "pending": "În asteptare",
     "required": "Obligatoriu",
-    "requiredcriteria": "Criteriu necesar",
+    "requiredcriteria": "Criterii obligatorii",
     "requirement": "Cerințe",
-    "status": "Status",
-    "viewcoursereport": "Vezi raportul cursului"
+    "status": "Situație",
+    "viewcoursereport": "Vizualizați raportul despre curs"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ru.json b/www/addons/coursecompletion/lang/ru.json
index 571f34f91df..dbd50c8ad09 100644
--- a/www/addons/coursecompletion/lang/ru.json
+++ b/www/addons/coursecompletion/lang/ru.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Завершено",
+    "complete": "Завершить",
     "completecourse": "Завершить курс",
-    "completed": "Выполнено",
+    "completed": "Завершен",
     "completiondate": "Дата завершения",
-    "coursecompletion": "Окончание курса",
+    "coursecompletion": "Завершение курса",
     "criteria": "Критерии",
-    "criteriagroup": "Группа критериев",
-    "criteriarequiredall": "Требуются соответствие всем указанным ниже критериям",
-    "criteriarequiredany": "Требуется соответствие любому из указанных ниже критериев",
-    "inprogress": "В процессе",
-    "manualselfcompletion": "Пользователь может сам поставить отметку о выполнении",
-    "notyetstarted": "Еще не началось",
-    "pending": "Ожидается",
-    "required": "Необходимо заполнить",
+    "criteriagroup": "Критерии группы",
+    "criteriarequiredall": "Все приведенные ниже критерии являются обязательными",
+    "criteriarequiredany": "Некоторые из нижеуказанных критериев обязательны",
+    "inprogress": "В прогрессе",
+    "manualselfcompletion": "Ручное самостоятельное завершение",
+    "notyetstarted": "Еще не начался",
+    "pending": "На рассмотрении",
+    "required": "Необходимый",
     "requiredcriteria": "Необходимые критерии",
     "requirement": "Требование",
     "status": "Статус",
-    "viewcoursereport": "Просмотреть отчет по курсу"
+    "viewcoursereport": "Посмотреть отчет курса"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index 246d9117ada..1a9665c3d8e 100644
--- a/www/addons/coursecompletion/lang/sv.json
+++ b/www/addons/coursecompletion/lang/sv.json
@@ -1,20 +1,20 @@
 {
     "complete": "Komplett",
     "completecourse": "",
-    "completed": "Ifyllt",
+    "completed": "Fullföljt",
     "completiondate": "Datum för fullföljande",
     "couldnotloadreport": "Det gick inte att läsa in rapporten för fullföljande av kursen, vänligen försök igen senare .",
     "coursecompletion": "Fullföljande av kurs",
-    "criteria": "Kriterier",
-    "criteriagroup": "Kriterier för grupp",
-    "criteriarequiredall": "Alla kriterier är obligatoriska",
-    "criteriarequiredany": "Alla kriterier nedan är obligatoriska",
-    "inprogress": "Pågår",
-    "manualselfcompletion": "Studenten markerar själv som fullföljd",
-    "notyetstarted": "Har ännu inte påbörjats",
+    "criteria": "Villkor",
+    "criteriagroup": "Villkor grupp",
+    "criteriarequiredall": "Alla villkor nedan måste vara uppfyllda",
+    "criteriarequiredany": "Något villkor nedan måste vara uppfylld",
+    "inprogress": "Pågående",
+    "manualselfcompletion": "Manuell fullföljande av deltagare",
+    "notyetstarted": "Ännu inte börjat",
     "pending": "Avvaktar",
     "required": "Obligatorisk",
-    "requiredcriteria": "Obligatoriskt kriterium",
+    "requiredcriteria": "Obligatorisk villkor",
     "requirement": "Krav",
     "status": "Status",
     "viewcoursereport": "Visa kursrapport"
diff --git a/www/addons/coursecompletion/lang/uk.json b/www/addons/coursecompletion/lang/uk.json
index aa1147d5ddb..86fa3eecf17 100644
--- a/www/addons/coursecompletion/lang/uk.json
+++ b/www/addons/coursecompletion/lang/uk.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Завершено",
+    "complete": "Завершити",
     "completecourse": "Завершити курсу",
-    "completed": "Виконано",
+    "completed": "Завершено",
     "completiondate": "Дата завершення",
     "couldnotloadreport": "Не вдалося завантажити звіт про закінчення курсу, будь ласка, спробуйте ще раз пізніше.",
-    "coursecompletion": "Курс закінчено",
-    "criteria": "Критерій",
+    "coursecompletion": "Завершення курсу",
+    "criteria": "Критерія",
     "criteriagroup": "Група критеріїв",
-    "criteriarequiredall": "Потрібна відповідність всім вказаним критеріям",
-    "criteriarequiredany": "Потрібна відповідність будь-якому критерію",
-    "inprogress": "В процесі",
-    "manualselfcompletion": "Самореєстрація завершення",
-    "notyetstarted": "Ще не почато",
-    "pending": "Очікується",
-    "required": "Необхідні",
-    "requiredcriteria": "Необхідний критерій",
+    "criteriarequiredall": "Всі критерії нижче обов'язкові",
+    "criteriarequiredany": "Будь-яка критерія нижче обов'язкова",
+    "inprogress": "В процесі...",
+    "manualselfcompletion": "Завершення самостійно",
+    "notyetstarted": "Не розпочато",
+    "pending": "В очікуванні",
+    "required": "Необхідно",
+    "requiredcriteria": "Необхідна критерія",
     "requirement": "Вимога",
     "status": "Статус",
     "viewcoursereport": "Переглянути звіт курсу"
diff --git a/www/addons/coursecompletion/lang/zh-tw.json b/www/addons/coursecompletion/lang/zh-tw.json
index 574a8cb4b64..55f600fc398 100644
--- a/www/addons/coursecompletion/lang/zh-tw.json
+++ b/www/addons/coursecompletion/lang/zh-tw.json
@@ -1,21 +1,21 @@
 {
-    "complete": "完全",
+    "complete": "完成",
     "completecourse": "完成課程",
-    "completed": "完成",
+    "completed": "已完成",
     "completiondate": "完成日期",
     "couldnotloadreport": "無法載入課程完成報表,請稍後再試.",
-    "coursecompletion": "課程進度",
-    "criteria": "規準",
-    "criteriagroup": "各種判斷條件",
-    "criteriarequiredall": "必須滿足以下所有條件",
-    "criteriarequiredany": "必須滿足以下任一條件",
+    "coursecompletion": "課程完成度",
+    "criteria": "條件",
+    "criteriagroup": "條件群組",
+    "criteriarequiredall": "以下所有的條件都為必填",
+    "criteriarequiredany": "以下任何條件都為必須",
     "inprogress": "處理中",
     "manualselfcompletion": "手動自我完成",
-    "notyetstarted": "尚未開始",
-    "pending": "等待中",
+    "notyetstarted": "還沒有開始",
+    "pending": "暫緩",
     "required": "必須的",
-    "requiredcriteria": "必要條件",
+    "requiredcriteria": "必須條件",
     "requirement": "需要",
     "status": "狀態",
-    "viewcoursereport": "查看課程報告"
+    "viewcoursereport": "檢視課程報表"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ca.json b/www/addons/files/lang/ca.json
index 90887bf7b3f..035be4b1f33 100644
--- a/www/addons/files/lang/ca.json
+++ b/www/addons/files/lang/ca.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Teniu en compte que l'administrador de Moodle ha desactivat la descàrrega d'arxius; podeu visualitzar els arxius, però no descarregar-los.",
     "clicktoupload": "Feu clic al botó del dessota per pujar arxius a l'àrea del vostres fitxers.",
     "couldnotloadfiles": "La llista d'arxius no s'ha pogut carregar.",
-    "emptyfilelist": "No hi ha fitxers per mostrar",
+    "emptyfilelist": "No hi ha fitxers per mostrar.",
     "erroruploadnotworking": "No es poden pujar fitxers al vostre lloc ara mateix.",
     "files": "Fitxers",
     "myprivatefilesdesc": "Els arxius que teniu disponibles a la vostra àrea privada en aquest lloc Moodle.",
     "privatefiles": "Fitxers privats",
     "sitefiles": "Fitxers del lloc",
     "sitefilesdesc": "Els altres arxius que es troben disponibles en aquest lloc Moodle.",
-    "uploadfiles": "Envia fitxers de retroacció"
+    "uploadfiles": "Puja fitxers"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/cs.json b/www/addons/files/lang/cs.json
index becf830a35d..2336beb6bc4 100644
--- a/www/addons/files/lang/cs.json
+++ b/www/addons/files/lang/cs.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Upozorňujeme, že správce Moodle zakázal stahování souborů, soubory si můžete prohlížet, ale ne stáhnout.",
     "clicktoupload": "Kliknutím na tlačítko níže nahrát soubory do vašich osobních souborů.",
     "couldnotloadfiles": "Seznam souborů, které nelze načíst .",
-    "emptyfilelist": "Žádný soubor k zobrazení",
+    "emptyfilelist": "Žádný soubor k zobrazení.",
     "erroruploadnotworking": "Bohužel v současné době není možné nahrávat na stránky vašeho Moodle.",
     "files": "Soubory",
     "myprivatefilesdesc": "Soubory, které jsou dostupné v soukromé oblasti na těchto stránkách Moodle.",
     "privatefiles": "Osobní soubory",
     "sitefiles": "Soubory stránek",
     "sitefilesdesc": "Další soubory, které jsou dostupné na těchto stránkách Moodle.",
-    "uploadfiles": "Poslat zpětnovazební soubory"
+    "uploadfiles": "Nahrát soubory"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/de.json b/www/addons/files/lang/de.json
index 16517d7cc60..39a046af215 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Sie können nur die Dateiliste sehen.",
     "clicktoupload": "Tippen Sie auf die Taste, um Dateien in 'Meine Dateien' hochzuladen.",
     "couldnotloadfiles": "Die Dateiliste konnte nicht geladen werden.",
-    "emptyfilelist": "Es liegen keine Dateien vor",
+    "emptyfilelist": "Keine Dateien",
     "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
     "files": "Dateien",
     "myprivatefilesdesc": "Diese Dateien liegen in Ihrem persönlichen Bereich auf dieser Website.",
     "privatefiles": "Meine Dateien",
     "sitefiles": "Dateien",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
-    "uploadfiles": "Feedbackdateien senden"
+    "uploadfiles": "Dateien hochladen"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/el.json b/www/addons/files/lang/el.json
index 105bb0c0877..8f435d24e4f 100644
--- a/www/addons/files/lang/el.json
+++ b/www/addons/files/lang/el.json
@@ -9,5 +9,5 @@
     "privatefiles": "Προσωπικά αρχεία",
     "sitefiles": "Αρχεία του ιστοχώρου",
     "sitefilesdesc": "Άλλα αρχεία που είναι στη διάθεσή σας σε αυτό το site Moodle.",
-    "uploadfiles": "Αποστολή αρχείου ανατροφοδότησης"
+    "uploadfiles": "Μεταφορτώστε αρχεία"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es-mx.json b/www/addons/files/lang/es-mx.json
index 3a779e4d667..38849f29131 100644
--- a/www/addons/files/lang/es-mx.json
+++ b/www/addons/files/lang/es-mx.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Por favor tome nota de que su administrador de Moodle deshabilitó las descargas de archivos; Usted puede ver los archivos pero no puede descargarlos.",
     "clicktoupload": "Haga click en el botón inferior para subir archivos a sus archivos privados.",
     "couldnotloadfiles": "La lista de archivos no pudo cargarse.",
-    "emptyfilelist": "No hay archivos que mostrar",
+    "emptyfilelist": "No hay archivos para mostrar.",
     "erroruploadnotworking": "Desafortunadamente ahorita no es posible subir archivos a su sitio.",
     "files": "Archivos",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
     "privatefiles": "Archivos privados",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "uploadfiles": "Mandar archivos de retroalimentación"
+    "uploadfiles": "Subir archivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/es.json b/www/addons/files/lang/es.json
index 19e67205370..d67044531b0 100644
--- a/www/addons/files/lang/es.json
+++ b/www/addons/files/lang/es.json
@@ -9,5 +9,5 @@
     "privatefiles": "Ficheros privados",
     "sitefiles": "Archivos del sitio",
     "sitefilesdesc": "Los otros archivos que están disponibles  para Usted en este sitio Moodle.",
-    "uploadfiles": "Mandar archivos de retroalimentación"
+    "uploadfiles": "Subir archivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/eu.json b/www/addons/files/lang/eu.json
index 4648a027001..30106de97bd 100644
--- a/www/addons/files/lang/eu.json
+++ b/www/addons/files/lang/eu.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Mesedez ohartu zaitez zure Moodle administratzaileak fitxategien jaitsiera ezgaitu duela, fitxategiak arakatu ditzakezu baina ezin dituzu jaitsi.",
     "clicktoupload": "Klik egin beheko botoian fitxategiak zure gune pribatura igotzeko.",
     "couldnotloadfiles": "Ezin izan da fitxategien zerrenda kargatu.",
-    "emptyfilelist": "Ez dago erakusteko fitxategirik",
+    "emptyfilelist": "Ez dago fitxategirik erakusteko.",
     "erroruploadnotworking": "Zoritxarrez une honetan ezin dira fitxategiak zure gunera igo.",
     "files": "Fitxategiak",
     "myprivatefilesdesc": "Moodle gune honetako zure gune pribatuan eskuragarri dauden fitxategiak.",
     "privatefiles": "Fitxategi pribatuak",
     "sitefiles": "Guneko fitxategiak",
     "sitefilesdesc": "Zure Moodle gunean eskuragarri dauden beste fitxategiak.",
-    "uploadfiles": "bidali feedback-fitxategiak"
+    "uploadfiles": "Igo fitxategiak"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/fr.json b/www/addons/files/lang/fr.json
index ce819c482cb..a1237a3feeb 100644
--- a/www/addons/files/lang/fr.json
+++ b/www/addons/files/lang/fr.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "L'administrateur de votre Moodle a désactivé le téléchargement des fichiers. Vous pouvez les consulter, mais pas les télécharger.",
     "clicktoupload": "Cliquer sur le bouton ci-dessous pour déposer les fichiers dans vos fichiers personnels.",
     "couldnotloadfiles": "La liste des fichiers n'a pas pu être chargée.",
-    "emptyfilelist": "Il n'y a pas de fichier à afficher",
+    "emptyfilelist": "Aucun fichier à afficher.",
     "erroruploadnotworking": "Il n'est actuellement pas possible de déposer des fichiers sur votre site.",
     "files": "Fichiers",
     "myprivatefilesdesc": "Les fichiers disponibles dans votre zone privée sur cette plateforme Moodle.",
     "privatefiles": "Fichiers personnels",
     "sitefiles": "Fichiers du site",
     "sitefilesdesc": "Les autres fichiers disponibles sur cette plateforme Moodle.",
-    "uploadfiles": "Envoyer des fichiers de feedback"
+    "uploadfiles": "Déposer des fichiers"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/it.json b/www/addons/files/lang/it.json
index d9b1f96d205..3f198893008 100644
--- a/www/addons/files/lang/it.json
+++ b/www/addons/files/lang/it.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "L'amministratore del sito Moodle ha disabilitato il download dei file. Puoi navigare tra i file ma non potrai scaricarli.",
     "clicktoupload": "Fai click sul pulsante sotto per caricare i file nei File personali",
     "couldnotloadfiles": "Non è stato possibile caricare l'elenco dei file.",
-    "emptyfilelist": "Non ci sono file da visualizzare",
+    "emptyfilelist": "Non ci sono file da visualizzare.",
     "erroruploadnotworking": "Al momento non è possibile caricare file sul sito.",
     "files": "File",
     "myprivatefilesdesc": "I file memorizzati nell'omonima area di Moodle",
     "privatefiles": "File personali",
     "sitefiles": "File del sito",
     "sitefilesdesc": "Altri file del sito Moodle ai quali puoi accedere.",
-    "uploadfiles": "Invia file di commento"
+    "uploadfiles": "Carica file"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/lt.json b/www/addons/files/lang/lt.json
index 1e5b2c5b2f2..82157441c00 100644
--- a/www/addons/files/lang/lt.json
+++ b/www/addons/files/lang/lt.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Primename, kad Moodle administratorius panaikino galimybę parsisiųsti failus, failų atsisiųsti negalima, galite tik naršyti.",
     "clicktoupload": "Paspauskite mygtuką, esantį žemiau, kad galėtumėte atsisiųsti failus į privatų aplanką.",
     "couldnotloadfiles": "Negalima užkrauti failų sąrašo.",
-    "emptyfilelist": "Nėra rodytinų failų",
+    "emptyfilelist": "Nėra ką rodyti.",
     "erroruploadnotworking": "Deja, failo į pasirinktą svetainę įkelti negalima.",
     "files": "Failai",
     "myprivatefilesdesc": "Jūsų privatūs failai Moodle svetainėje.",
     "privatefiles": "Asmeniniai failai",
     "sitefiles": "Svetainės failai",
     "sitefilesdesc": "Kiti failai Moodle svetainėje",
-    "uploadfiles": "Siųsti grįžtamojo ryšio failus"
+    "uploadfiles": "Įkelti failus"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/nl.json b/www/addons/files/lang/nl.json
index e4f5e1dc248..2b091df63b0 100644
--- a/www/addons/files/lang/nl.json
+++ b/www/addons/files/lang/nl.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Je Moodle beheerder heeft het downloaden van bestanden uitgeschakeld. Je kunt door de bestandenlijst bladeren, maar ze niet downloaden.",
     "clicktoupload": "Klik op onderstaande knop om bestanden naar je privé-bestanden te uploaden.",
     "couldnotloadfiles": "De bestandenlijst kon niet geladen worden.",
-    "emptyfilelist": "Er zijn geen bestanden om te tonen",
+    "emptyfilelist": "Er zijn geen bestanden te tonen.",
     "erroruploadnotworking": "Jammer genoeg kun je op dit ogenblik geen bestanden uploaden naar de site.",
     "files": "Bestanden",
     "myprivatefilesdesc": "Jouw bestanden op deze Moodle-site.",
     "privatefiles": "Privébestanden",
     "sitefiles": "Sitebestanden",
     "sitefilesdesc": "Andere bestanden op deze Moodle-site.",
-    "uploadfiles": "Stuur feedbackbestanden"
+    "uploadfiles": "Bestanden uploaden"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt-br.json b/www/addons/files/lang/pt-br.json
index 2c3c45d9555..fa0429bebba 100644
--- a/www/addons/files/lang/pt-br.json
+++ b/www/addons/files/lang/pt-br.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Por favor note que o administrador do Moodle desativou downloads de arquivos, você pode navegar através dos arquivos, mas não baixá-los.",
     "clicktoupload": "Clique no botão abaixo para enviar para seus arquivos privados.",
     "couldnotloadfiles": "A lista de arquivos não pode ser carregada.",
-    "emptyfilelist": "Não há arquivos para exibir",
+    "emptyfilelist": "Não há arquivos para mostrar.",
     "erroruploadnotworking": "Infelizmente é impossível enviar arquivos para o seu site.",
     "files": "Arquivos",
     "myprivatefilesdesc": "Os arquivos que estão disponíveis em sua área de arquivos privados nesse site Moodle.",
     "privatefiles": "Arquivos privados",
     "sitefiles": "Arquivos do site",
     "sitefilesdesc": "Os outros arquivos que estão disponíveis a você neste site Moodle.",
-    "uploadfiles": "Enviar arquivos de feedback"
+    "uploadfiles": "Enviar arquivos"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/pt.json b/www/addons/files/lang/pt.json
index 6c19e745305..3e1ce1acbd4 100644
--- a/www/addons/files/lang/pt.json
+++ b/www/addons/files/lang/pt.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Tenha en atenção que o administrador do Moodle desativou a opção de descarregar ficheiros. Poderá navegar nos ficheiros mas não conseguirá descarregá-los.",
     "clicktoupload": "Clique no botão abaixo para carregar ficheiros para os seus ficheiros privados.",
     "couldnotloadfiles": "Não foi possível carregar a lista de ficheiros",
-    "emptyfilelist": "Este repositório está vazio",
+    "emptyfilelist": "Não há ficheiros",
     "erroruploadnotworking": "Infelizmente não é possível carregar ficheiros para o seu site.",
     "files": "Ficheiros",
     "myprivatefilesdesc": "Ficheiros disponíveis na sua área privada neste site Moodle",
     "privatefiles": "Ficheiros privados",
     "sitefiles": "Ficheiros do site",
     "sitefilesdesc": "Os outros ficheiros que estão disponíveis para si neste site Moodle.",
-    "uploadfiles": "Enviar ficheiros de feedback"
+    "uploadfiles": "Carregar ficheiros"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/ro.json b/www/addons/files/lang/ro.json
index 269b6780a16..30500b91c47 100644
--- a/www/addons/files/lang/ro.json
+++ b/www/addons/files/lang/ro.json
@@ -2,7 +2,7 @@
     "admindisableddownload": "Atenție! Administratorul platformei a dezactivat descărcarea de fișiere; puteți accesa fișierele dar nu le puteți descărca.",
     "clicktoupload": "Apăsați butonul de mai jos pentru a încarcă fișierele în contul dumneavoastră.",
     "couldnotloadfiles": "Lista fișierelor nu a putut fi încărcată.",
-    "emptyfilelist": "Nu există fișiere",
+    "emptyfilelist": "Nu sunt fișiere disponibile.",
     "files": "Fişiere",
     "myprivatefilesdesc": "Fișierele disponibile din zona personală, pe care o dețineți pe acest site.",
     "privatefiles": "Fișiere private",
diff --git a/www/addons/files/lang/ru.json b/www/addons/files/lang/ru.json
index 10418095e77..7da775bb875 100644
--- a/www/addons/files/lang/ru.json
+++ b/www/addons/files/lang/ru.json
@@ -8,5 +8,5 @@
     "privatefiles": "Личные файлы",
     "sitefiles": "Файлы сайта",
     "sitefilesdesc": "Другие файлы, доступные на этом сайте Moodle",
-    "uploadfiles": "Отправить файлы с отзывами"
+    "uploadfiles": "Загрузка файлов"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/uk.json b/www/addons/files/lang/uk.json
index a5b2ae08185..cb8988a3eaf 100644
--- a/www/addons/files/lang/uk.json
+++ b/www/addons/files/lang/uk.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Зверніть увагу, що ваш адміністратор Moodle відключив завантаження файлів, ви можете переглядати файли, але не завантажувати їх.",
     "clicktoupload": "Натисніть на кнопку нижче, щоб завантажити ваші особисті файли.",
     "couldnotloadfiles": "Список файлів не може бути завантажений.",
-    "emptyfilelist": "Немає файлів для показу",
+    "emptyfilelist": "Немає файлів для показу.",
     "erroruploadnotworking": "На жаль, в даний час не представляється можливим завантажувати файли на ваш сайт.",
     "files": "Файли",
     "myprivatefilesdesc": "Файли, які доступні у приватній області на цьому сайті Moodle.",
     "privatefiles": "Особисті файли",
     "sitefiles": "Файли сайту",
     "sitefilesdesc": "Інші файли, які доступні для вас на цьому сайті Moodle.",
-    "uploadfiles": "Надіслати файл-відгук(и)"
+    "uploadfiles": "Завантажити файли"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/zh-tw.json b/www/addons/files/lang/zh-tw.json
index 7f0cc12450e..78c6090acee 100644
--- a/www/addons/files/lang/zh-tw.json
+++ b/www/addons/files/lang/zh-tw.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "請注意, 您的Moodle管理員禁止檔案下載, 您可以瀏覽檔案, 但不能下載它們.",
     "clicktoupload": "點選這個按鈕,將檔案上傳到你的個人檔案區",
     "couldnotloadfiles": "這些檔案是不能被載入的",
-    "emptyfilelist": "沒有可以顯示的檔案",
+    "emptyfilelist": "沒有檔案可以顯示",
     "erroruploadnotworking": "很抱歉, 目前無法將檔案上傳到您的網站.",
     "files": "檔案",
     "myprivatefilesdesc": "在此Moodle網站上, 您的私有區域中有可用的文件",
     "privatefiles": "私人檔案",
     "sitefiles": "網站檔案",
     "sitefilesdesc": "您在此Moodle網站上有可用的其他文件.",
-    "uploadfiles": "送出回饋檔案"
+    "uploadfiles": "上傳檔案"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/bg.json b/www/addons/messages/lang/bg.json
index 7ca6c96125f..857ae200454 100644
--- a/www/addons/messages/lang/bg.json
+++ b/www/addons/messages/lang/bg.json
@@ -16,7 +16,7 @@
     "messages": "Съобщения",
     "mustbeonlinetosendmessages": "Трябва да сте онлайн, за да изпращате съобщения.",
     "newmessage": "Ново съобщение ...",
-    "nomessages": "Още няма съобщения",
+    "nomessages": "Няма съобщения.",
     "nousersfound": "Не са намерени потребители",
     "removecontact": "Премахване на контакт",
     "send": "изпращане",
diff --git a/www/addons/messages/lang/ca.json b/www/addons/messages/lang/ca.json
index 4f5ba4c4f2f..f4e5e0357b7 100644
--- a/www/addons/messages/lang/ca.json
+++ b/www/addons/messages/lang/ca.json
@@ -17,9 +17,9 @@
     "messagenotsent": "El missatge no s'ha enviat. Si us plau, intenteu-ho més tard",
     "messages": "Missatges",
     "mustbeonlinetosendmessages": "Heu de tenir connexió a la xarxa per a enviar missatges",
-    "newmessage": "Missatge nou",
+    "newmessage": "Nou missatge...",
     "newmessages": "Nous missatges",
-    "nomessages": "No hi ha missatges encara",
+    "nomessages": "No hi ha missatges.",
     "nousersfound": "No s'han trobat usuaris",
     "removecontact": "Suprimeix contacte",
     "removecontactconfirm": "El contacte s'eliminarà de la vostra llista de contactes.",
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index f5b9255069c..fe2c22c0fc3 100644
--- a/www/addons/messages/lang/cs.json
+++ b/www/addons/messages/lang/cs.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Nastavení zpráv",
     "messages": "Zprávy",
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
-    "newmessage": "Nová zpráva",
+    "newmessage": "Nová zpráva...",
     "newmessages": "Nové zprávy",
-    "nomessages": "Zatím žádné zprávy",
-    "nousersfound": "Nenalezeni žádní uživatelé",
+    "nomessages": "Žádné zprávy.",
+    "nousersfound": "Nebyl nalezen žádný uživatel",
     "removecontact": "Odebrat kontakt",
     "removecontactconfirm": "Kontakt bude odstraněn ze seznamu kontaktů.",
     "send": "odeslat",
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index b77b53a24c1..1f91de7f2a3 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Mitteilungen konfigurieren",
     "messages": "Mitteilungen",
     "mustbeonlinetosendmessages": "Sie müssen online sein, um Mitteilungen zu senden",
-    "newmessage": "Neue Mitteilung",
+    "newmessage": "Neue Mitteilung ...",
     "newmessages": "Neue Mitteilungen",
     "nomessages": "Keine Mitteilungen",
-    "nousersfound": "Keine Nutzer/innen gefunden",
+    "nousersfound": "Keine Personen gefunden",
     "removecontact": "Kontakt entfernen",
     "removecontactconfirm": "Der Kontakt wird aus Ihrer Kontaktliste gelöscht.",
     "send": "Senden",
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index bc1a86b23f3..3476b0c695a 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -14,9 +14,9 @@
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "newmessage": "Νέο μήνυμα",
-    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
-    "nousersfound": "Δε βρέθηκαν χρήστες",
+    "newmessage": "Νέο μήνυμα...",
+    "nomessages": "Κανένα μήνυμα.",
+    "nousersfound": "Δεν βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "send": "Αποστολή",
     "sendmessage": "Αποστολή μηνύματος",
diff --git a/www/addons/messages/lang/es-mx.json b/www/addons/messages/lang/es-mx.json
index 6fb2e3fd56a..b7a7a579a99 100644
--- a/www/addons/messages/lang/es-mx.json
+++ b/www/addons/messages/lang/es-mx.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Preferencias de Mensaje",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Usted debe de estar en-linea para enviar mensajes",
-    "newmessage": "Nuevo mensaje",
+    "newmessage": "Nuevo mensaje...",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "Aún no hay mensajes",
-    "nousersfound": "No se encuentran usuarios",
+    "nomessages": "Sin mensajes.",
+    "nousersfound": "No se encontraron usuarios",
     "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto será quitado de su lista de contactos.",
     "send": "enviar",
diff --git a/www/addons/messages/lang/es.json b/www/addons/messages/lang/es.json
index 4305590900f..9f18c4105e8 100644
--- a/www/addons/messages/lang/es.json
+++ b/www/addons/messages/lang/es.json
@@ -16,8 +16,8 @@
     "messagepreferences": "Preferencias de mensajes",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Debe conectarse para enviar mensajes",
-    "newmessage": "Nuevo mensaje",
-    "nomessages": "Aún no hay mensajes",
+    "newmessage": "Nuevo mensaje...",
+    "nomessages": "No hay mensajes en espera",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
     "send": "enviar",
diff --git a/www/addons/messages/lang/eu.json b/www/addons/messages/lang/eu.json
index 58cbf5bd111..ed18c8f0e65 100644
--- a/www/addons/messages/lang/eu.json
+++ b/www/addons/messages/lang/eu.json
@@ -18,9 +18,9 @@
     "messagepreferences": "Mezuen hobespenak",
     "messages": "Mezuak",
     "mustbeonlinetosendmessages": "Online egon behar zara mezuak bidaltzeko.",
-    "newmessage": "Mezu berria",
+    "newmessage": "Mezu berria...",
     "newmessages": "Mezu beriak",
-    "nomessages": "Ez dago mezurik oraindik",
+    "nomessages": "Mezurik ez.",
     "nousersfound": "Ez da erabiltzailerik aurkitu",
     "removecontact": "Ezabatu kontaktua",
     "removecontactconfirm": "Kontaktua zure kontaktuen zerrendatik ezabatuko da.",
diff --git a/www/addons/messages/lang/fr.json b/www/addons/messages/lang/fr.json
index 4e23fec2fc0..159b6fe52a9 100644
--- a/www/addons/messages/lang/fr.json
+++ b/www/addons/messages/lang/fr.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Préférences des messages",
     "messages": "Messages",
     "mustbeonlinetosendmessages": "Vous devez être en ligne pour envoyer des messages",
-    "newmessage": "Nouveau message",
+    "newmessage": "Nouveau message...",
     "newmessages": "Nouveaux messages",
-    "nomessages": "Pas encore de messages",
-    "nousersfound": "Aucun utilisateur n'a été trouvé",
+    "nomessages": "Aucun message.",
+    "nousersfound": "Aucun utilisateur trouvé",
     "removecontact": "Supprimer ce contact",
     "removecontactconfirm": "Le contact sera retiré de votre liste.",
     "send": "Envoyer",
diff --git a/www/addons/messages/lang/it.json b/www/addons/messages/lang/it.json
index 50754d818b9..0762bb1d877 100644
--- a/www/addons/messages/lang/it.json
+++ b/www/addons/messages/lang/it.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Preferenze messaggi",
     "messages": "Messaggi",
     "mustbeonlinetosendmessages": "Per inviare messaggi devi essere online",
-    "newmessage": "Nuovo messaggio",
-    "nomessages": "Non ci sono ancora messaggi",
-    "nousersfound": "Non trovato alcun utente",
+    "newmessage": "Nuovo messaggio...",
+    "nomessages": "Non ci sono messaggi.",
+    "nousersfound": "Non sono stati trovati utenti",
     "removecontact": "Cancella contatti",
     "send": "invia",
     "sendmessage": "Invia messaggio",
diff --git a/www/addons/messages/lang/lt.json b/www/addons/messages/lang/lt.json
index f7896a10853..f63f91053b9 100644
--- a/www/addons/messages/lang/lt.json
+++ b/www/addons/messages/lang/lt.json
@@ -14,9 +14,9 @@
     "messagepreferences": "Žinučių nuostatos",
     "messages": "Žinutės",
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite prisijungti",
-    "newmessage": "Nauja žinutė",
-    "nomessages": "Žinučių dar nėra",
-    "nousersfound": "Nerasta naudotojų",
+    "newmessage": "Nauja žinutė...",
+    "nomessages": "Žinučių nėra.",
+    "nousersfound": "Vartotojas nerastas",
     "removecontact": "Pašalinti kontaktą",
     "send": "siųsti",
     "sendmessage": "Siųsti žinutę",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index a6059a8c50a..c0cb0d61bb3 100644
--- a/www/addons/messages/lang/nl.json
+++ b/www/addons/messages/lang/nl.json
@@ -18,9 +18,9 @@
     "messagepreferences": "Berichten voorkeuren",
     "messages": "Berichten",
     "mustbeonlinetosendmessages": "Je moet online zijn om berichten te versturen",
-    "newmessage": "Nieuw bericht",
+    "newmessage": "Nieuw bericht...",
     "newmessages": "Nieuwe berichten",
-    "nomessages": "Nog geen berichten",
+    "nomessages": "Geen berichten.",
     "nousersfound": "Geen gebruikers gevonden",
     "removecontact": "Verwijder contactpersoon",
     "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
diff --git a/www/addons/messages/lang/pt-br.json b/www/addons/messages/lang/pt-br.json
index 1f86ead74e4..b7c9da7e6a9 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -17,9 +17,9 @@
     "messagenotsent": "A mensagem não foi enviada. Por favor tente novamente mais tarde.",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Você precisa estar conectado para enviar mensagens.",
-    "newmessage": "Nova Mensagem",
+    "newmessage": "Nova mensagem...",
     "newmessages": "Novas mensagens",
-    "nomessages": "Nenhuma mensagem ainda",
+    "nomessages": "Não há mensagens.",
     "nousersfound": "Nenhum usuário encontrado",
     "removecontact": "Eliminar contato",
     "removecontactconfirm": "O contato será removido da sua lista de contatos.",
diff --git a/www/addons/messages/lang/pt.json b/www/addons/messages/lang/pt.json
index bff883b381f..b9ae68508bd 100644
--- a/www/addons/messages/lang/pt.json
+++ b/www/addons/messages/lang/pt.json
@@ -18,9 +18,9 @@
     "messagepreferences": "Preferências das mensagens",
     "messages": "Mensagens",
     "mustbeonlinetosendmessages": "Precisa de estar online para enviar mensagens",
-    "newmessage": "Nova mensagem",
+    "newmessage": "Nova mensagem...",
     "newmessages": "Novas mensagens",
-    "nomessages": "Ainda não há mensagens",
+    "nomessages": "Sem mensagens.",
     "nousersfound": "Nenhum utilizador encontrado",
     "removecontact": "Remover contacto",
     "removecontactconfirm": "O contacto será removido da sua lista de contactos.",
diff --git a/www/addons/messages/lang/ro.json b/www/addons/messages/lang/ro.json
index 9b497816099..b519bbf378f 100644
--- a/www/addons/messages/lang/ro.json
+++ b/www/addons/messages/lang/ro.json
@@ -16,8 +16,8 @@
     "messages": "Mesaje",
     "mustbeonlinetosendmessages": "Trebuie să fiți online pentru a putea trimite mesaje",
     "newmessage": "Mesaj nou!",
-    "nomessages": "Nu a fost trimis încă niciun mesaj",
-    "nousersfound": "Nu s-au găsit utilizatori",
+    "nomessages": "Nu aveți mesaje.",
+    "nousersfound": "Nu au fost găsiți utilizatori",
     "removecontact": "Şterge prieten din listă",
     "send": "Trimis",
     "sendmessage": "Trimite mesaj",
diff --git a/www/addons/messages/lang/ru.json b/www/addons/messages/lang/ru.json
index 60b687c8d20..be656eda0df 100644
--- a/www/addons/messages/lang/ru.json
+++ b/www/addons/messages/lang/ru.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Настройки сообщений",
     "messages": "Сообщения",
     "mustbeonlinetosendmessages": "Вы должны быть на сайте, чтобы отправлять сообщения",
-    "newmessage": "Новое сообщение",
+    "newmessage": "Новое сообщение...",
     "newmessages": "Новые сообщения",
-    "nomessages": "Нет ни одного сообщения",
+    "nomessages": "Нет сообщений",
     "nousersfound": "Пользователи не найдены",
     "removecontact": "Удалить собеседника из моего списка",
     "send": "Отправить",
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index 67a28f6c9e3..301b34c89a3 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -15,9 +15,9 @@
     "messagenotsent": "Meddelandet skickades inte, försök igen senare.",
     "messages": "Meddelanden",
     "mustbeonlinetosendmessages": "Du måste vara online för att skicka meddelanden",
-    "newmessage": "Nytt meddelande",
-    "nomessages": "Inga meddelanden än",
-    "nousersfound": "Det gick inte att hitta några användare",
+    "newmessage": "Ny meddelande...",
+    "nomessages": "Inga meddelanden",
+    "nousersfound": "Inga användare hittades",
     "removecontact": "Ta bort kontakt",
     "send": "skicka",
     "sendmessage": "Skicka meddelande",
diff --git a/www/addons/messages/lang/tr.json b/www/addons/messages/lang/tr.json
index eb07c45148f..72ef991ede5 100644
--- a/www/addons/messages/lang/tr.json
+++ b/www/addons/messages/lang/tr.json
@@ -9,7 +9,7 @@
     "messagepreferences": "İleti tercihleri",
     "messages": "Mesajlar",
     "newmessage": "Yeni ileti",
-    "nomessages": "Henüz mesaj yok",
+    "nomessages": "İleti yok.",
     "nousersfound": "Kullanıcı bulunamadı",
     "removecontact": "Kişiyi sil",
     "send": "Gönder",
diff --git a/www/addons/messages/lang/uk.json b/www/addons/messages/lang/uk.json
index 7ad5731c9cd..21fa4dc7976 100644
--- a/www/addons/messages/lang/uk.json
+++ b/www/addons/messages/lang/uk.json
@@ -17,7 +17,7 @@
     "mustbeonlinetosendmessages": "Ви повинні бути онлайн, щоб відправляти повідомлення",
     "newmessage": "Нове повідомлення...",
     "newmessages": "Нові повідомлення",
-    "nomessages": "Ще немає повідомлень",
+    "nomessages": "Повідомлення відсутні.",
     "nousersfound": "Користувачів не знайдено",
     "removecontact": "Видалити контакт",
     "removecontactconfirm": "Контакт буде видалено зі списку контактів.",
diff --git a/www/addons/messages/lang/zh-tw.json b/www/addons/messages/lang/zh-tw.json
index 7cdec1f8ea1..34693107bc7 100644
--- a/www/addons/messages/lang/zh-tw.json
+++ b/www/addons/messages/lang/zh-tw.json
@@ -16,9 +16,9 @@
     "messagepreferences": "簡訊偏好",
     "messages": "訊息",
     "mustbeonlinetosendmessages": "您必須上線才能發送訊息",
-    "newmessage": "新簡訊",
-    "nomessages": "尚無訊息",
-    "nousersfound": "找不到用戶",
+    "newmessage": "新訊息...",
+    "nomessages": "沒有任何訊息.",
+    "nousersfound": "沒有使用者",
     "removecontact": "刪除聯絡人",
     "send": "傳送",
     "sendmessage": "寄送訊息",
diff --git a/www/addons/mod/choice/lang/ca.json b/www/addons/mod/choice/lang/ca.json
index c0a93b72130..fc6af3e2e89 100644
--- a/www/addons/mod/choice/lang/ca.json
+++ b/www/addons/mod/choice/lang/ca.json
@@ -6,8 +6,8 @@
     "full": "(Complet)",
     "noresultsviewable": "A hores d'ara no es poden veure els resultats",
     "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
-    "numberofuser": "Nombre de respostes",
-    "numberofuserinpercentage": "Percentatge de respostes (%)",
+    "numberofuser": "Nombre de participants",
+    "numberofuserinpercentage": "Percentatge de participants",
     "previewonly": "Això és sols una vista prèvia de les opcions disponibles en aquesta activitat. No esteu habilitat per enviar consultes fins {{$a}}.",
     "removemychoice": "Suprimeix la meva resposta",
     "responses": "Respostes",
diff --git a/www/addons/mod/choice/lang/cs.json b/www/addons/mod/choice/lang/cs.json
index f9a22aaf32e..aaa5ea9560c 100644
--- a/www/addons/mod/choice/lang/cs.json
+++ b/www/addons/mod/choice/lang/cs.json
@@ -6,8 +6,8 @@
     "full": "(Obsazeno)",
     "noresultsviewable": "Výsledky nejsou momentálně k dispozici",
     "notopenyet": "Je nám líto, tato činnost není až do {{$a}} dostupná.",
-    "numberofuser": "Počet odpovědí",
-    "numberofuserinpercentage": "Počet odpovědí v procentech",
+    "numberofuser": "Počet účastníků",
+    "numberofuserinpercentage": "Procentní podíl účastníků",
     "previewonly": "Toto je náhled dostupných možností v této anketě. Hlasovat budete moci od {{$a}}.",
     "removemychoice": "Odstranit mou volbu",
     "responses": "Odpovědi",
diff --git a/www/addons/mod/choice/lang/de.json b/www/addons/mod/choice/lang/de.json
index be13d38af77..a7bea8a7061 100644
--- a/www/addons/mod/choice/lang/de.json
+++ b/www/addons/mod/choice/lang/de.json
@@ -6,8 +6,8 @@
     "full": "(Nicht verfügbar)",
     "noresultsviewable": "Ergebnisse sind aktuell nicht sichtbar.",
     "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
-    "numberofuser": "Anzahl der Antworten",
-    "numberofuserinpercentage": "Prozent der Antworten",
+    "numberofuser": "Anzahl",
+    "numberofuserinpercentage": "Prozent",
     "previewonly": "Diese Vorschau zeigt die verfügbaren Optionen für diese Aktivität. Sie können Ihre Wahl nicht vor {{$a}} einreichen.",
     "removemychoice": "Meine Auswahl löschen",
     "responses": "Stimmabgaben",
diff --git a/www/addons/mod/choice/lang/el.json b/www/addons/mod/choice/lang/el.json
index 4b17c064e80..31602f11f93 100644
--- a/www/addons/mod/choice/lang/el.json
+++ b/www/addons/mod/choice/lang/el.json
@@ -4,8 +4,8 @@
     "full": "(Πλήρες)",
     "noresultsviewable": "Τα αποτελέσματα δεν είναι ορατά προς το παρόν.",
     "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
-    "numberofuser": "Αριθμός απαντήσεων",
-    "numberofuserinpercentage": "Ποσοστό απαντήσεων",
+    "numberofuser": "Πλήθος συμμετεχόντων",
+    "numberofuserinpercentage": "Ποσοστό συμμετεχόντων",
     "removemychoice": "Διαγραφή της επιλογής μου",
     "responses": "Απαντήσεις",
     "responsesresultgraphdescription": "{{number}}% των χρηστών επέλεξε: {{text}}.",
diff --git a/www/addons/mod/choice/lang/es-mx.json b/www/addons/mod/choice/lang/es-mx.json
index ceddb82adc6..41b15bb932f 100644
--- a/www/addons/mod/choice/lang/es-mx.json
+++ b/www/addons/mod/choice/lang/es-mx.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de respuestas",
-    "numberofuserinpercentage": "Porcentaje de respuestas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentaje de participantes",
     "previewonly": "Esto es solamente una vista previa de las opciones disponibles para esta actividad. Usted no podrá enviar su elección hasta {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/es.json b/www/addons/mod/choice/lang/es.json
index 74076baa791..b14f860dda6 100644
--- a/www/addons/mod/choice/lang/es.json
+++ b/www/addons/mod/choice/lang/es.json
@@ -6,8 +6,8 @@
     "full": "(Lleno)",
     "noresultsviewable": "Los resultados no pueden verse en este momento.",
     "notopenyet": "Lo sentimos, esta actividad no estará disponible hasta {{$a}}",
-    "numberofuser": "Número de respuestas",
-    "numberofuserinpercentage": "Porcentaje de respuestas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentaje de participantes",
     "previewonly": "Esta es solamente una previsualización de las opciones disponibles para esta actividad. No podrá enviar su respuesta a la consulta hasta el {{$a}}.",
     "removemychoice": "Eliminar mi elección",
     "responses": "Respuestas",
diff --git a/www/addons/mod/choice/lang/eu.json b/www/addons/mod/choice/lang/eu.json
index 62e0810b4c4..ceb6eff44db 100644
--- a/www/addons/mod/choice/lang/eu.json
+++ b/www/addons/mod/choice/lang/eu.json
@@ -6,8 +6,8 @@
     "full": "(Beteta)",
     "noresultsviewable": "Emaitzak ezin dira orain ikusi",
     "notopenyet": "Barkatu, baina jarduera hau ez dago erabiltzeko moduan {{$a}} arte.",
-    "numberofuser": "Erantzun-kopurua",
-    "numberofuserinpercentage": "Erantzunen portzentajea",
+    "numberofuser": "Partaide-kopurua",
+    "numberofuserinpercentage": "Partaideen ehunekoa",
     "previewonly": "Hau jarduera honetan eskuragarri dauden aukeren aurrebista besterik ez da. Ezingo duzu zure erantzuna bidali {{$a}}-(e)ra arte.",
     "removemychoice": "Ezabatu nire aukera",
     "responses": "Erantzunak",
diff --git a/www/addons/mod/choice/lang/fr.json b/www/addons/mod/choice/lang/fr.json
index 9ca0f50c2ea..05e3f3b9c99 100644
--- a/www/addons/mod/choice/lang/fr.json
+++ b/www/addons/mod/choice/lang/fr.json
@@ -6,8 +6,8 @@
     "full": "(complet)",
     "noresultsviewable": "Les résultats ne sont actuellement pas visibles.",
     "notopenyet": "Désolé, cette activité ne sera disponible que le {{$a}}",
-    "numberofuser": "Nombre de réponses",
-    "numberofuserinpercentage": "Pourcentage de réponses",
+    "numberofuser": "Nombre de participants",
+    "numberofuserinpercentage": "Pourcentage de participants",
     "previewonly": "Cet affichage est une prévisualisation des options disponibles pour cette activité. Vous ne pourrez pas enregistrer votre choix avant le {{$a}}.",
     "removemychoice": "Retirer mon vote",
     "responses": "Réponses",
diff --git a/www/addons/mod/choice/lang/it.json b/www/addons/mod/choice/lang/it.json
index 01597a9058a..c44e97ee335 100644
--- a/www/addons/mod/choice/lang/it.json
+++ b/www/addons/mod/choice/lang/it.json
@@ -6,8 +6,8 @@
     "full": "(Completo)",
     "noresultsviewable": "I risultati non sono al momento visualizzabili.",
     "notopenyet": "Spiacente, questa attività  non è disponibile fino al {{$a}}",
-    "numberofuser": "Numero di risposte",
-    "numberofuserinpercentage": "Percentuale delle risposte",
+    "numberofuser": "Numero di partecipanti",
+    "numberofuserinpercentage": "Percentuale dei partecipanti",
     "previewonly": "Questa è un'anteprima delle scelte disponibili. Potrai inviare la tua scelta solo dal {{$a}}.",
     "removemychoice": "Elimina la mia scelta",
     "responses": "Scelte",
diff --git a/www/addons/mod/choice/lang/lt.json b/www/addons/mod/choice/lang/lt.json
index ee1bf2c25c3..94e682f5d51 100644
--- a/www/addons/mod/choice/lang/lt.json
+++ b/www/addons/mod/choice/lang/lt.json
@@ -6,8 +6,8 @@
     "full": "(Visas)",
     "noresultsviewable": "Rezultatai dabar nematomi.",
     "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
-    "numberofuser": "Atsakymų skaičius",
-    "numberofuserinpercentage": "Atsakymų procentas",
+    "numberofuser": "Dalyvių skaičius",
+    "numberofuserinpercentage": "Dalyvių procentas",
     "previewonly": "Tai yra tik šios veiklos galimų variantų peržiūra. Savo pasirinkimo negalėsite pateikti iki {{$a}}.",
     "removemychoice": "Pašalinti mano pasirinkimą",
     "responses": "Atsakymai",
diff --git a/www/addons/mod/choice/lang/nl.json b/www/addons/mod/choice/lang/nl.json
index d7e7f4cd7f3..b2be190c0c9 100644
--- a/www/addons/mod/choice/lang/nl.json
+++ b/www/addons/mod/choice/lang/nl.json
@@ -6,8 +6,8 @@
     "full": "(volledig)",
     "noresultsviewable": "De resultaten zijn nu niet zichtbaar.",
     "notopenyet": "Deze activiteit is niet beschikbaar tot {{$a}}",
-    "numberofuser": "Aantal antwoorden",
-    "numberofuserinpercentage": "Percentage antwoorden",
+    "numberofuser": "Aantal deelnemers",
+    "numberofuserinpercentage": "Deelnemerspercentage",
     "previewonly": "Dit is slechts een voorbeeld van de beschikbare opties voor deze activiteit. Je zult je keuze niet kunnen maken voor {{$a}}.",
     "removemychoice": "Verwijder mijn keuze",
     "responses": "Antwoorden",
diff --git a/www/addons/mod/choice/lang/pt-br.json b/www/addons/mod/choice/lang/pt-br.json
index 01fbb57c4c1..f8fbe81990b 100644
--- a/www/addons/mod/choice/lang/pt-br.json
+++ b/www/addons/mod/choice/lang/pt-br.json
@@ -6,8 +6,8 @@
     "full": "(Cheio)",
     "noresultsviewable": "Não é possível visualizar os resultados neste momento.",
     "notopenyet": "Esta atividade será acessível a partir de {{$a}}",
-    "numberofuser": "Número de usuários",
-    "numberofuserinpercentage": "Percentual de participantes",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Porcentagem de participantes",
     "previewonly": "Esta é somente uma previsualização das opções dessa atividade. Você somente poderá enviar sua escolha a partir de {{$a}}",
     "removemychoice": "Remover a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/pt.json b/www/addons/mod/choice/lang/pt.json
index 68e628591c5..a5b426bc80b 100644
--- a/www/addons/mod/choice/lang/pt.json
+++ b/www/addons/mod/choice/lang/pt.json
@@ -6,8 +6,8 @@
     "full": "Completa",
     "noresultsviewable": "Os resultados da sondagem ainda não estão disponíveis.",
     "notopenyet": "Lamentamos mas esta atividade só estará disponível em {{$a}}",
-    "numberofuser": "Número de respostas",
-    "numberofuserinpercentage": "Percentagem de respostas",
+    "numberofuser": "Número de participantes",
+    "numberofuserinpercentage": "Percentagem de participantes",
     "previewonly": "Esta é apenas uma pré-visualização das opções disponíveis para esta atividade. Não poderá submeter a sua escolha até {{$a}}.",
     "removemychoice": "Apagar a minha resposta",
     "responses": "Respostas",
diff --git a/www/addons/mod/choice/lang/ro.json b/www/addons/mod/choice/lang/ro.json
index 2133b57b951..eb9c1bc300b 100644
--- a/www/addons/mod/choice/lang/ro.json
+++ b/www/addons/mod/choice/lang/ro.json
@@ -4,8 +4,8 @@
     "full": "(plin)",
     "noresultsviewable": "În acest moment rezultatele nu pot fi vizualizate.",
     "notopenyet": "Ne pare rău, această activitate nu este disponibilă mai devreme de {{$a}}",
-    "numberofuser": "Numărul de răspunsuri",
-    "numberofuserinpercentage": "Procentajul răspunsurilor",
+    "numberofuser": "Numărul participanților",
+    "numberofuserinpercentage": "Procentul participanților",
     "previewonly": "Acesta este doar o prezentare a opțiunilor existente pentru această activitate. Nu veți putea trimite opțiunea dvs. până la {{$a}}.",
     "removemychoice": "Șterge alegerea mea",
     "responses": "Răspunsuri",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 8ef6af50622..62217bdb227 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,8 +6,8 @@
     "full": "(Full)",
     "noresultsviewable": "Det går f.n. inte att visa resultaten.",
     "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {{$a}}",
-    "numberofuser": "Antal användare",
-    "numberofuserinpercentage": "Antalet användare i procent.",
+    "numberofuser": "Antal deltagare",
+    "numberofuserinpercentage": "Procent av deltagarna",
     "previewonly": "Detta är bara en förhandsvisning av de tillgängliga alternativen för den här aktiviteten . Du kommer inte att kunna lämna in ditt val innan {{$a}}",
     "removemychoice": "Ta bort mitt val",
     "responses": "Svar",
diff --git a/www/addons/mod/choice/lang/uk.json b/www/addons/mod/choice/lang/uk.json
index dc8d2e2f936..3587cc22f86 100644
--- a/www/addons/mod/choice/lang/uk.json
+++ b/www/addons/mod/choice/lang/uk.json
@@ -6,8 +6,8 @@
     "full": "(Все)",
     "noresultsviewable": "В даний час результати не можна побачити.",
     "notopenyet": "Цей ресурс буде недоступний до {{$a}}",
-    "numberofuser": "Кількість користувачів",
-    "numberofuserinpercentage": "Кількість користувачів у відсотках",
+    "numberofuser": "Кількість учасників",
+    "numberofuserinpercentage": "Відсоток учасників",
     "previewonly": "Це лише попередній перегляд доступних варіантів для цієї діяльності. Ви не можете відправити відповідь до {{$a}}.",
     "removemychoice": "Видалити мій вибір",
     "responses": "Відповіді",
diff --git a/www/addons/mod/choice/lang/zh-tw.json b/www/addons/mod/choice/lang/zh-tw.json
index c97305fd6fa..fd45e3f3362 100644
--- a/www/addons/mod/choice/lang/zh-tw.json
+++ b/www/addons/mod/choice/lang/zh-tw.json
@@ -6,8 +6,8 @@
     "full": "(已滿)",
     "noresultsviewable": "目前無法檢視票選結果",
     "notopenyet": "抱歉，這個活動在{{$a}}之前不能使用",
-    "numberofuser": "回應的人數",
-    "numberofuserinpercentage": "回應人數的百分比",
+    "numberofuser": "參與者人數",
+    "numberofuserinpercentage": "參與者百分比",
     "previewonly": "這只是這一活動的可用選項的預覽。你要等到{{$a}}才可以進行投票。",
     "removemychoice": "移除我的選擇",
     "responses": "答覆",
diff --git a/www/addons/mod/folder/lang/ca.json b/www/addons/mod/folder/lang/ca.json
index 2208f493a4b..b2f87d440ac 100644
--- a/www/addons/mod/folder/lang/ca.json
+++ b/www/addons/mod/folder/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hi ha fitxers per mostrar",
+    "emptyfilelist": "No hi ha fitxers per mostrar.",
     "errorwhilegettingfolder": "S'ha produït un error en recuperar les dades de la carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/cs.json b/www/addons/mod/folder/lang/cs.json
index 04e2822f6a0..66b256adf4c 100644
--- a/www/addons/mod/folder/lang/cs.json
+++ b/www/addons/mod/folder/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Žádný soubor k zobrazení",
+    "emptyfilelist": "Žádný soubor k zobrazení.",
     "errorwhilegettingfolder": "Chyba při načítání dat složky."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/de.json b/www/addons/mod/folder/lang/de.json
index 00b4ea2a954..022d05baeea 100644
--- a/www/addons/mod/folder/lang/de.json
+++ b/www/addons/mod/folder/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Es liegen keine Dateien vor",
+    "emptyfilelist": "Keine Dateien",
     "errorwhilegettingfolder": "Fehler beim Laden der Verzeichnisdaten"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/es-mx.json b/www/addons/mod/folder/lang/es-mx.json
index e2f470725df..5b9563d5c0d 100644
--- a/www/addons/mod/folder/lang/es-mx.json
+++ b/www/addons/mod/folder/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "No hay archivos que mostrar",
+    "emptyfilelist": "No hay archivos para mostrar.",
     "errorwhilegettingfolder": "Error al obtener datos de carpeta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/eu.json b/www/addons/mod/folder/lang/eu.json
index 07dae0aef65..27a3ccc6636 100644
--- a/www/addons/mod/folder/lang/eu.json
+++ b/www/addons/mod/folder/lang/eu.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Ez dago erakusteko fitxategirik",
+    "emptyfilelist": "Ez dago fitxategirik erakusteko.",
     "errorwhilegettingfolder": "Errorea karpetaren datuak eskuratzean."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/fr.json b/www/addons/mod/folder/lang/fr.json
index e16e5c1aeb4..86d36f87890 100644
--- a/www/addons/mod/folder/lang/fr.json
+++ b/www/addons/mod/folder/lang/fr.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Il n'y a pas de fichier à afficher",
+    "emptyfilelist": "Aucun fichier à afficher.",
     "errorwhilegettingfolder": "Erreur lors de l'obtention des données du dossier."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/it.json b/www/addons/mod/folder/lang/it.json
index b828249f904..93e13593395 100644
--- a/www/addons/mod/folder/lang/it.json
+++ b/www/addons/mod/folder/lang/it.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Non ci sono file da visualizzare",
+    "emptyfilelist": "Non ci sono file da visualizzare.",
     "errorwhilegettingfolder": "Si è verificato un errore durante la ricezione dei dati della cartella."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/lt.json b/www/addons/mod/folder/lang/lt.json
index a80a862764e..e174a7c5a50 100644
--- a/www/addons/mod/folder/lang/lt.json
+++ b/www/addons/mod/folder/lang/lt.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Nėra rodytinų failų",
+    "emptyfilelist": "Nėra ką rodyti.",
     "errorwhilegettingfolder": "Klaida gaunant duomenis iš aplanko."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/nl.json b/www/addons/mod/folder/lang/nl.json
index 7b544820480..92b48519e9d 100644
--- a/www/addons/mod/folder/lang/nl.json
+++ b/www/addons/mod/folder/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Er zijn geen bestanden om te tonen",
+    "emptyfilelist": "Geen bestanden.",
     "errorwhilegettingfolder": "Fout bij het ophalen van de mapgegevens"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/pt-br.json b/www/addons/mod/folder/lang/pt-br.json
index 4e9c9589aa3..1588790327d 100644
--- a/www/addons/mod/folder/lang/pt-br.json
+++ b/www/addons/mod/folder/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Não há arquivos para exibir",
+    "emptyfilelist": "Não há arquivos para mostrar",
     "errorwhilegettingfolder": "Erro ao obter dados da pasta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/pt.json b/www/addons/mod/folder/lang/pt.json
index 74865d321a4..d197c86f233 100644
--- a/www/addons/mod/folder/lang/pt.json
+++ b/www/addons/mod/folder/lang/pt.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Este repositório está vazio",
+    "emptyfilelist": "Não há ficheiros para mostrar.",
     "errorwhilegettingfolder": "Erro ao obter os dados da pasta."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/ro.json b/www/addons/mod/folder/lang/ro.json
index 0277b91b35f..a66c107ebcd 100644
--- a/www/addons/mod/folder/lang/ro.json
+++ b/www/addons/mod/folder/lang/ro.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Nu există fișiere",
+    "emptyfilelist": "Nu sunt fișiere disponibile pentru vizualizare.",
     "errorwhilegettingfolder": "A apărut o eroare la obținerea dosarului cu datele cerute."
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/uk.json b/www/addons/mod/folder/lang/uk.json
index 1357444e2a4..28ec6cd8e8a 100644
--- a/www/addons/mod/folder/lang/uk.json
+++ b/www/addons/mod/folder/lang/uk.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Немає файлів для показу",
+    "emptyfilelist": "Немає файдів для показу",
     "errorwhilegettingfolder": "Помилка отримання інформації про папку"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/zh-tw.json b/www/addons/mod/folder/lang/zh-tw.json
index d7ff3cf3a76..5300a974982 100644
--- a/www/addons/mod/folder/lang/zh-tw.json
+++ b/www/addons/mod/folder/lang/zh-tw.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "沒有可以顯示的檔案",
+    "emptyfilelist": "沒有檔案可以顯示",
     "errorwhilegettingfolder": "當讀取資料夾資料時發生錯誤"
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/de.json b/www/addons/mod/forum/lang/de.json
index bee3c7cb0d4..22814dbf13e 100644
--- a/www/addons/mod/forum/lang/de.json
+++ b/www/addons/mod/forum/lang/de.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Themenabonnement",
     "edit": "Bearbeiten",
     "erroremptymessage": "Die Mitteilung darf nicht leer sein.",
-    "erroremptysubject": "Der Betreff darf nicht leer sein.",
+    "erroremptysubject": "Das Forenthema darf nicht leer sein.",
     "errorgetforum": "Fehler beim Laden der Forendaten",
     "errorgetgroups": "Fehler beim Laden der Gruppeneinstellungen",
     "forumnodiscussionsyet": "Keine Themen im Forum",
diff --git a/www/addons/mod/forum/lang/es-mx.json b/www/addons/mod/forum/lang/es-mx.json
index 48404906707..c3743416512 100644
--- a/www/addons/mod/forum/lang/es-mx.json
+++ b/www/addons/mod/forum/lang/es-mx.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Suscripción a discusión",
     "edit": "Editar",
     "erroremptymessage": "El mensaje no puede estar vacío",
-    "erroremptysubject": "El asunto del mensaje no puede estar vacío.",
+    "erroremptysubject": "El asunto de la publicación no puede estar vacío",
     "errorgetforum": "Error al obtener datos del foro.",
     "errorgetgroups": "Error al obtener configuraciones de grupo.",
     "forumnodiscussionsyet": "Todavía no hay tópicos de discusión en este foro.",
diff --git a/www/addons/mod/forum/lang/fr.json b/www/addons/mod/forum/lang/fr.json
index 566c52681f0..09bf43de5be 100644
--- a/www/addons/mod/forum/lang/fr.json
+++ b/www/addons/mod/forum/lang/fr.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Abonnement à la discussion",
     "edit": "Modifier",
     "erroremptymessage": "Un message ne peut pas être vide",
-    "erroremptysubject": "L'objet d'un message ne peut pas être vide",
+    "erroremptysubject": "L'objet du message ne peut pas être vide",
     "errorgetforum": "Erreur de récupération des données de forum.",
     "errorgetgroups": "Erreur lors de l'obtention des réglages de groupe.",
     "forumnodiscussionsyet": "Il n'y a pas encore de message dans ce forum",
diff --git a/www/addons/mod/forum/lang/it.json b/www/addons/mod/forum/lang/it.json
index c54ee597c31..ad1b8b1ed8b 100644
--- a/www/addons/mod/forum/lang/it.json
+++ b/www/addons/mod/forum/lang/it.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Sottoscrizione della discussione",
     "edit": "Modifica",
     "erroremptymessage": "Il corpo del messaggio non può essere vuoto",
-    "erroremptysubject": "L'oggetto non può essere vuoto",
+    "erroremptysubject": "L'oggetto dell'intervento non può essere vuoto",
     "errorgetforum": "Si è verificato un errore durante la ricezione dei dati del forum.",
     "errorgetgroups": "Si è verificato un errore durante la ricezione delle impostazioni gruppo.",
     "forumnodiscussionsyet": "In questo forum non sono presenti discussioni",
diff --git a/www/addons/mod/forum/lang/lt.json b/www/addons/mod/forum/lang/lt.json
index 93f37fba562..82a99a7e4f4 100644
--- a/www/addons/mod/forum/lang/lt.json
+++ b/www/addons/mod/forum/lang/lt.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Diskusijos prenumerata",
     "edit": "Redaguoti",
     "erroremptymessage": "Skelbimo žinutė negali būti tuščia",
-    "erroremptysubject": "Skelbimo tema negali būti tuščia.",
+    "erroremptysubject": "Pranešimo temos langelis negali būti tuščias",
     "errorgetforum": "Klaida gaunant forumo duomenis.",
     "errorgetgroups": "Klaida gaunant grupės nustatymus.",
     "forumnodiscussionsyet": "Pokalbio temų forume dar nėra.",
diff --git a/www/addons/mod/forum/lang/nl.json b/www/addons/mod/forum/lang/nl.json
index 8f7fe7dad45..83fddedda47 100644
--- a/www/addons/mod/forum/lang/nl.json
+++ b/www/addons/mod/forum/lang/nl.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Inschrijving discussie",
     "edit": "Wijzig",
     "erroremptymessage": "Bericht kan niet leeg zijn",
-    "erroremptysubject": "Onderwerp kan niet leeg zijn",
+    "erroremptysubject": "Onderwerp mag niet leeg zijn",
     "errorgetforum": "Fout bij het ophalen van forumgegevens",
     "errorgetgroups": "Fout bij het ophalen van groepinstellingen.",
     "forumnodiscussionsyet": "Er zijn nog geen discussies in dit forum",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index aebbce61f21..f7d9cf730e2 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Assinatura de discussão",
     "edit": "Editar",
     "erroremptymessage": "A mensagem não pode ser vazia.",
-    "erroremptysubject": "O assunto da mensagem não pode ser vazio.",
+    "erroremptysubject": "Assunto não pode estar vazio",
     "errorgetforum": "Erro ao buscar dados de fórum.",
     "errorgetgroups": "Erro ao obter configurações do grupo.",
     "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda",
diff --git a/www/addons/mod/forum/lang/ro.json b/www/addons/mod/forum/lang/ro.json
index 2dd31a2be41..99d4fc77c16 100644
--- a/www/addons/mod/forum/lang/ro.json
+++ b/www/addons/mod/forum/lang/ro.json
@@ -7,7 +7,7 @@
     "discussion": "Discuție",
     "edit": "Modifică",
     "erroremptymessage": "Mesajul nu poate fi necompletat",
-    "erroremptysubject": "Subiectul nu poate fi necompletat",
+    "erroremptysubject": "Subiectul nu poate rămâne necompletat",
     "errorgetforum": "A apărut o eroare la obținerea datelor despre forum.",
     "errorgetgroups": "Eroare la obținerea setărilor pentru grup.",
     "forumnodiscussionsyet": "Nu există subiecte deschise în acest forum.",
diff --git a/www/addons/mod/forum/lang/ru.json b/www/addons/mod/forum/lang/ru.json
index 46a510d03d2..3faffe0f076 100644
--- a/www/addons/mod/forum/lang/ru.json
+++ b/www/addons/mod/forum/lang/ru.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Подписаться на эту тему.",
     "edit": "Редактировать",
     "erroremptymessage": "Сообщение не может быть пустым",
-    "erroremptysubject": "Тема сообщения не может быть пустой",
+    "erroremptysubject": "Заголовок сообщения не может быть пустым",
     "errorgetforum": "Ошибка при получении данных форума",
     "errorgetgroups": "Ошибка получения параметров группы",
     "forumnodiscussionsyet": "В этом форуме ещё нет тем для обсуждения",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 5d9eb54b6ad..676e5ba9fa1 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -8,7 +8,7 @@
     "discussionsubscription": "Diskussions prenumeration",
     "edit": "Redigera",
     "erroremptymessage": "Meddelandet i inlägget kan inte vara tomt",
-    "erroremptysubject": "Ämnesrubriken för inlägget kan inte vara tom.",
+    "erroremptysubject": "Rubriken kan inte vara tom",
     "errorgetforum": "Fel att få forum innehåll",
     "errorgetgroups": "Fel vid hämtning av gruppinställningar",
     "forumnodiscussionsyet": "Det finns inga diskussionsämnen ännu i detta forum.",
diff --git a/www/addons/mod/forum/lang/uk.json b/www/addons/mod/forum/lang/uk.json
index bf8cfd7742c..5fec7fdc11b 100644
--- a/www/addons/mod/forum/lang/uk.json
+++ b/www/addons/mod/forum/lang/uk.json
@@ -9,7 +9,7 @@
     "discussionsubscription": "Підписатися на дискусію",
     "edit": "Редагувати",
     "erroremptymessage": "Повідомлення не може бути порожнім",
-    "erroremptysubject": "Тема повідомлення не може бути порожньою",
+    "erroremptysubject": "Заголовок не повинен бути пустим",
     "errorgetforum": "Помилка отримання даних форуму",
     "errorgetgroups": "Помилка отримання групових налаштувань.",
     "forumnodiscussionsyet": "Відсутні обговорення в даному форумі.",
diff --git a/www/addons/mod/forum/lang/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index 81db9790069..a2d74d28770 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -10,11 +10,11 @@
     "discussionsubscription": "議題訂閱",
     "edit": "編輯",
     "erroremptymessage": "貼文的訊息不能是空白",
-    "erroremptysubject": "貼文的主旨不能是空白",
+    "erroremptysubject": "貼文的標題不可以是空的",
     "errorgetforum": "讀取討論區資料發生錯誤",
     "errorgetgroups": "讀取群組設定發生錯誤",
     "forumnodiscussionsyet": "這個討論區還沒有討論主題",
-    "group": "分組",
+    "group": "群組",
     "message": "訊息",
     "modeflatnewestfirst": "以平舖方式呈現回應的貼文，最晚貼出的在前",
     "modeflatoldestfirst": "以平舖方式呈現回應的貼文，最早貼出的在前",
diff --git a/www/addons/mod/glossary/lang/ca.json b/www/addons/mod/glossary/lang/ca.json
index c9d1567bd0f..191d2db0090 100644
--- a/www/addons/mod/glossary/lang/ca.json
+++ b/www/addons/mod/glossary/lang/ca.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Adjunt",
-    "browsemode": "Mode exploració",
+    "browsemode": "Navegueu per les entrades",
     "byalphabet": "Alfabèticament",
     "byauthor": "Agrupat per autor",
     "bycategory": "Agrupa per categoria",
diff --git a/www/addons/mod/glossary/lang/cs.json b/www/addons/mod/glossary/lang/cs.json
index 9b2ab4a6330..3421f566a83 100644
--- a/www/addons/mod/glossary/lang/cs.json
+++ b/www/addons/mod/glossary/lang/cs.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Připojit odznak do zprávy",
-    "browsemode": "Režim náhledu",
+    "browsemode": "Prohlížení příspěvků",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
     "bycategory": "Skupina podle kategorie",
diff --git a/www/addons/mod/glossary/lang/de.json b/www/addons/mod/glossary/lang/de.json
index c790832ef32..6b5589a0b0c 100644
--- a/www/addons/mod/glossary/lang/de.json
+++ b/www/addons/mod/glossary/lang/de.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Auszeichnung an Mitteilung anhängen",
-    "browsemode": "Vorschaumodus",
+    "browsemode": "Einträge durchblättern",
     "byalphabet": "Alphabetisch",
     "byauthor": "Nach Autor/in",
     "bycategory": "Nach Kategorie",
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index c991cf5879a..c79bed26793 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Συνημμένα",
-    "browsemode": "Φάση Προεπισκόπισης",
+    "browsemode": "Περιήγηση στις καταχωρήσεις",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bynewestfirst": "Νεότερα πρώτα",
diff --git a/www/addons/mod/glossary/lang/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index e661f36d342..158ea571325 100644
--- a/www/addons/mod/glossary/lang/es-mx.json
+++ b/www/addons/mod/glossary/lang/es-mx.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Adjunto",
-    "browsemode": "Modo de presentación preliminar",
+    "browsemode": "Ver entradas",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoría",
diff --git a/www/addons/mod/glossary/lang/es.json b/www/addons/mod/glossary/lang/es.json
index 8a50c2d764e..02d8e633d5c 100644
--- a/www/addons/mod/glossary/lang/es.json
+++ b/www/addons/mod/glossary/lang/es.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Adjunto",
-    "browsemode": "Modo de presentación preliminar",
+    "browsemode": "Navegar por las entradas",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupado por autor",
     "bynewestfirst": "El más reciente primero",
diff --git a/www/addons/mod/glossary/lang/eu.json b/www/addons/mod/glossary/lang/eu.json
index 963a7f8ce8c..c6ab2a7e186 100644
--- a/www/addons/mod/glossary/lang/eu.json
+++ b/www/addons/mod/glossary/lang/eu.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Erantsi domina mezuari",
-    "browsemode": "Aurrebista-modua",
+    "browsemode": "Aztertu sarrerak",
     "byalphabet": "Alfabetikoki",
     "byauthor": "Taldekatu egilearen arabera",
     "bycategory": "Taldekatu kategoriaren arabera",
diff --git a/www/addons/mod/glossary/lang/fr.json b/www/addons/mod/glossary/lang/fr.json
index 4d12ffcee4d..712afea4266 100644
--- a/www/addons/mod/glossary/lang/fr.json
+++ b/www/addons/mod/glossary/lang/fr.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Joindre le badge à un courriel",
-    "browsemode": "Mode prévisualisation",
+    "browsemode": "Parcourir les articles",
     "byalphabet": "Alphabétiquement",
     "byauthor": "Grouper par auteur",
     "bycategory": "Grouper par catégorie",
diff --git a/www/addons/mod/glossary/lang/lt.json b/www/addons/mod/glossary/lang/lt.json
index bdc656dd518..18f6cc6763e 100644
--- a/www/addons/mod/glossary/lang/lt.json
+++ b/www/addons/mod/glossary/lang/lt.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Prikabinti pasiekimą prie pranešimo",
-    "browsemode": "Peržiūros režimas",
+    "browsemode": "Peržiūrėti įrašus",
     "byalphabet": "Abėcėlės tvarka",
     "byauthor": "Pagal autorių",
     "bynewestfirst": "Naujausi",
diff --git a/www/addons/mod/glossary/lang/nl.json b/www/addons/mod/glossary/lang/nl.json
index 53c36a376e0..7c06a87db9a 100644
--- a/www/addons/mod/glossary/lang/nl.json
+++ b/www/addons/mod/glossary/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Badge als bijlage bij bericht",
-    "browsemode": "Probeermodus",
+    "browsemode": "Blader door items",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
     "bycategory": "Groepeer per categorie",
diff --git a/www/addons/mod/glossary/lang/pt-br.json b/www/addons/mod/glossary/lang/pt-br.json
index 32741499a8c..7eeca932a54 100644
--- a/www/addons/mod/glossary/lang/pt-br.json
+++ b/www/addons/mod/glossary/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexar emblema à mensagem",
-    "browsemode": "Prévia",
+    "browsemode": "Navegar nas entradas",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
diff --git a/www/addons/mod/glossary/lang/pt.json b/www/addons/mod/glossary/lang/pt.json
index 8bc0fa7da3f..151febb1e95 100644
--- a/www/addons/mod/glossary/lang/pt.json
+++ b/www/addons/mod/glossary/lang/pt.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexar Medalha à mensagem",
-    "browsemode": "Modo de pré-visualização",
+    "browsemode": "Ver entradas",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
diff --git a/www/addons/mod/glossary/lang/ro.json b/www/addons/mod/glossary/lang/ro.json
index f5e76676789..1711d27b159 100644
--- a/www/addons/mod/glossary/lang/ro.json
+++ b/www/addons/mod/glossary/lang/ro.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Atașament",
-    "browsemode": "Mod Căutare",
+    "browsemode": "Căutați în datele introduse",
     "byalphabet": "Alfabetic",
     "byauthor": "Grupare după autor",
     "bynewestfirst": "Cele mai noi sunt dispuse primele",
diff --git a/www/addons/mod/glossary/lang/sv.json b/www/addons/mod/glossary/lang/sv.json
index 0c0a203775f..f9dc8d60f6a 100644
--- a/www/addons/mod/glossary/lang/sv.json
+++ b/www/addons/mod/glossary/lang/sv.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bifoga märke med meddelande",
-    "browsemode": "Läge för förhandsgranskning",
+    "browsemode": "Bläddrar bland poster",
     "byalphabet": "Alfabetiskt",
     "byauthor": "Sortera efter författare",
     "bynewestfirst": "Nyaste först",
diff --git a/www/addons/mod/glossary/lang/uk.json b/www/addons/mod/glossary/lang/uk.json
index 3842bc175c1..5452c0da423 100644
--- a/www/addons/mod/glossary/lang/uk.json
+++ b/www/addons/mod/glossary/lang/uk.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Долучення",
-    "browsemode": "Режим перегляду",
+    "browsemode": "Перегляд записів",
     "byalphabet": "По алфавіту",
     "byauthor": "Групувати за автором",
     "bycategory": "Групувати за категорією",
diff --git a/www/addons/mod/glossary/lang/zh-tw.json b/www/addons/mod/glossary/lang/zh-tw.json
index e5a5e020fdb..d89166a41e8 100644
--- a/www/addons/mod/glossary/lang/zh-tw.json
+++ b/www/addons/mod/glossary/lang/zh-tw.json
@@ -1,6 +1,6 @@
 {
     "attachment": "在訊息上附加上獎章",
-    "browsemode": "預覽模式",
+    "browsemode": "瀏覽條目",
     "byalphabet": "按字母順序排列",
     "byauthor": "以作者為分群",
     "bynewestfirst": "最新的優先",
diff --git a/www/addons/mod/label/lang/lt.json b/www/addons/mod/label/lang/lt.json
index 8aba433e8cd..f9a1ca059d8 100644
--- a/www/addons/mod/label/lang/lt.json
+++ b/www/addons/mod/label/lang/lt.json
@@ -1,3 +1,3 @@
 {
-    "label": "Žyma"
+    "label": "Etiketė"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/uk.json b/www/addons/mod/label/lang/uk.json
index dc1348438f8..f1dd990cbfb 100644
--- a/www/addons/mod/label/lang/uk.json
+++ b/www/addons/mod/label/lang/uk.json
@@ -1,3 +1,3 @@
 {
-    "label": "Напис"
+    "label": "Лейба"
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/zh-tw.json b/www/addons/mod/survey/lang/zh-tw.json
index 924e0d4c800..e6ad7be4230 100644
--- a/www/addons/mod/survey/lang/zh-tw.json
+++ b/www/addons/mod/survey/lang/zh-tw.json
@@ -4,6 +4,6 @@
     "ifoundthat": "我發現",
     "ipreferthat": "我希望的是",
     "responses": "回應",
-    "results": "票選結果",
+    "results": "結果",
     "surveycompletednograph": "你已經完成這一份問卷。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/zh-tw.json b/www/addons/mod/wiki/lang/zh-tw.json
index 30fd50ff0d8..14abc591524 100644
--- a/www/addons/mod/wiki/lang/zh-tw.json
+++ b/www/addons/mod/wiki/lang/zh-tw.json
@@ -10,7 +10,7 @@
     "newpagetitle": "新頁面標題",
     "nocontent": "在這一頁裡沒有內容",
     "notingroup": "不在群體",
-    "page": "頁",
+    "page": "分頁",
     "pageexists": "這頁面已經存在。",
     "pagename": "頁面名稱",
     "subwiki": "Subwiki",
diff --git a/www/addons/notes/lang/bg.json b/www/addons/notes/lang/bg.json
index 89cc6664d9d..606e3b6a09d 100644
--- a/www/addons/notes/lang/bg.json
+++ b/www/addons/notes/lang/bg.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Бележката създадена",
     "nonotes": "Все още няма бележки от този тип.",
     "note": "Бележка",
-    "notes": "Вашият личен анализ и бележки",
+    "notes": "Бележки",
     "personalnotes": "Лични бележки",
     "publishstate": "Контекст",
     "sitenotes": "Бележки за сайта"
diff --git a/www/addons/notes/lang/ca.json b/www/addons/notes/lang/ca.json
index 9367384a78e..1c044e61b29 100644
--- a/www/addons/notes/lang/ca.json
+++ b/www/addons/notes/lang/ca.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "S'ha creat la nota",
     "nonotes": "Encara no hi ha notes d'aquest tipus",
     "note": "Anotació",
-    "notes": "El teu anàlisi privat i les teves notes",
+    "notes": "Anotacions",
     "personalnotes": "Anotacions personals",
     "publishstate": "Context",
     "sitenotes": "Anotacions del lloc",
diff --git a/www/addons/notes/lang/cs.json b/www/addons/notes/lang/cs.json
index 984816ff5e7..fd3b1a46f42 100644
--- a/www/addons/notes/lang/cs.json
+++ b/www/addons/notes/lang/cs.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Poznámka vytvořena",
     "nonotes": "Doposud neexistují žádné poznámky tohoto typu",
     "note": "Poznámka",
-    "notes": "Vaše soukromé postřehy a poznámky",
+    "notes": "Poznámky",
     "personalnotes": "Osobní poznámky",
     "publishstate": "Kontext",
     "sitenotes": "Poznámky stránek",
diff --git a/www/addons/notes/lang/de.json b/www/addons/notes/lang/de.json
index 06d550d7211..b4ed60eb088 100644
--- a/www/addons/notes/lang/de.json
+++ b/www/addons/notes/lang/de.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anmerkung angelegt",
     "nonotes": "Keine Anmerkungen",
     "note": "Anmerkung",
-    "notes": "Ihre persönliche Analyse und Anmerkungen",
+    "notes": "Anmerkungen",
     "personalnotes": "Meine Anmerkungen",
     "publishstate": "Kontext",
     "sitenotes": "Anmerkungen zur Website",
diff --git a/www/addons/notes/lang/el.json b/www/addons/notes/lang/el.json
index 9bc5d02d49e..e796b19cabe 100644
--- a/www/addons/notes/lang/el.json
+++ b/www/addons/notes/lang/el.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Το σημείωμα δημιουργήθηκε",
     "nonotes": "Δεν υπάρχουν σημειώσεις αυτού του τύπου ακόμα",
     "note": "Σημείωση",
-    "notes": "Οι προσωπικές σας αναλύσεις και σημειώσεις",
+    "notes": "Σημειώσεις",
     "personalnotes": "Προσωπικές σημειώσεις",
     "publishstate": "Γενικό πλαίσιο",
     "sitenotes": "Σημειώσεις της ιστοσελίδας",
diff --git a/www/addons/notes/lang/es-mx.json b/www/addons/notes/lang/es-mx.json
index 1c91ea47373..aabd17d948f 100644
--- a/www/addons/notes/lang/es-mx.json
+++ b/www/addons/notes/lang/es-mx.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Nota creada",
     "nonotes": "Todavía no hay notas de este tipo todavía",
     "note": "Nota",
-    "notes": "Su análisis privado y sus notas",
+    "notes": "Notas",
     "personalnotes": "Notas personales",
     "publishstate": "Contexto",
     "sitenotes": "Notas del sitio",
diff --git a/www/addons/notes/lang/eu.json b/www/addons/notes/lang/eu.json
index 8656c9594fd..f8935fec248 100644
--- a/www/addons/notes/lang/eu.json
+++ b/www/addons/notes/lang/eu.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Oharra gehituta",
     "nonotes": "Oraindik ez dago mota honetako oharrik.",
     "note": "Oharra",
-    "notes": "Zure analisi pribatua eta oharrak",
+    "notes": "Oharrak",
     "personalnotes": "Ohar pertsonalak",
     "publishstate": "Testuingurua",
     "sitenotes": "Guneko oharrak",
diff --git a/www/addons/notes/lang/fr.json b/www/addons/notes/lang/fr.json
index 346f886976d..21d624c4af2 100644
--- a/www/addons/notes/lang/fr.json
+++ b/www/addons/notes/lang/fr.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Annotation créée",
     "nonotes": "Il n'y a pas encore d'annotation de ce type",
     "note": "Annotation",
-    "notes": "Votre analyse et vos remarques personnelles",
+    "notes": "Annotations",
     "personalnotes": "Annotations personnelles",
     "publishstate": "Contexte",
     "sitenotes": "Annotations du site",
diff --git a/www/addons/notes/lang/it.json b/www/addons/notes/lang/it.json
index 90c300a1f85..0e9b001f16c 100644
--- a/www/addons/notes/lang/it.json
+++ b/www/addons/notes/lang/it.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Creata annotazione",
     "nonotes": "Non sono presenti annotazioni di questo tipo.",
     "note": "Annotazione",
-    "notes": "Le tue note e analisi",
+    "notes": "Annotazioni",
     "personalnotes": "Annotazioni personali",
     "publishstate": "Contesto",
     "sitenotes": "Annotazioni del sito",
diff --git a/www/addons/notes/lang/lt.json b/www/addons/notes/lang/lt.json
index e9213ee0c0e..ac321d27d1b 100644
--- a/www/addons/notes/lang/lt.json
+++ b/www/addons/notes/lang/lt.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Užrašas sukurtas",
     "nonotes": "Nėra jokių šios temos užrašų",
     "note": "Užrašas",
-    "notes": "Pastabos",
+    "notes": "Užrašai",
     "personalnotes": "Asmeniniai užrašai",
     "publishstate": "Teksto ištrauka",
     "sitenotes": "Svetainės užrašai",
diff --git a/www/addons/notes/lang/nl.json b/www/addons/notes/lang/nl.json
index 64e66285bed..49a0c0209c4 100644
--- a/www/addons/notes/lang/nl.json
+++ b/www/addons/notes/lang/nl.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Notitie gemaakt",
     "nonotes": "Er zijn nog geen notities van dit type.",
     "note": "Notitie",
-    "notes": "Je persoonlijke analyse en aantekeningen",
+    "notes": "Notities",
     "personalnotes": "Persoonlijke notities",
     "publishstate": "Context",
     "sitenotes": "Site notities",
diff --git a/www/addons/notes/lang/pt-br.json b/www/addons/notes/lang/pt-br.json
index 5634bc70e89..ce6908d1d3e 100644
--- a/www/addons/notes/lang/pt-br.json
+++ b/www/addons/notes/lang/pt-br.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anotação criada",
     "nonotes": "Não há mais anotações desse típo",
     "note": "Anotação",
-    "notes": "Suas análises e anotações pessoais",
+    "notes": "Anotações",
     "personalnotes": "Anotações pessoais",
     "publishstate": "Contexto",
     "sitenotes": "Anotações do site",
diff --git a/www/addons/notes/lang/pt.json b/www/addons/notes/lang/pt.json
index 5763cbe46e1..28e62fa379b 100644
--- a/www/addons/notes/lang/pt.json
+++ b/www/addons/notes/lang/pt.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anotação criada",
     "nonotes": "Ainda não existem anotações deste tipo",
     "note": "Anotação",
-    "notes": "Análise privada e anotações",
+    "notes": "Anotações",
     "personalnotes": "Anotações pessoais",
     "publishstate": "Contexto",
     "sitenotes": "Anotações do site",
diff --git a/www/addons/notes/lang/ro.json b/www/addons/notes/lang/ro.json
index 1115becc8d5..605a02f2299 100644
--- a/www/addons/notes/lang/ro.json
+++ b/www/addons/notes/lang/ro.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "A fost creată o notă",
     "nonotes": "Momentan nu există note de acest tip",
     "note": "Notă",
-    "notes": "Analiza şi notele tale particulare",
+    "notes": "Note",
     "personalnotes": "Note personale",
     "publishstate": "Context",
     "sitenotes": "Note de site",
diff --git a/www/addons/notes/lang/ru.json b/www/addons/notes/lang/ru.json
index 5b45804576d..ce3b230d19d 100644
--- a/www/addons/notes/lang/ru.json
+++ b/www/addons/notes/lang/ru.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Заметка создана",
     "nonotes": "Тут нет заметок такого типа",
     "note": "Заметка",
-    "notes": "Ваши анализы и заметки",
+    "notes": "Заметки",
     "personalnotes": "Личные заметки",
     "publishstate": "Контекст",
     "sitenotes": "Заметки сайта",
diff --git a/www/addons/notes/lang/sv.json b/www/addons/notes/lang/sv.json
index 75049c59549..8fcd87edc6d 100644
--- a/www/addons/notes/lang/sv.json
+++ b/www/addons/notes/lang/sv.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Anteckning skapade",
     "nonotes": "Det finns inga anteckningar av denna typ ännu",
     "note": "Anteckning",
-    "notes": "Din privata analys och anteckningar",
+    "notes": "Anteckningar",
     "personalnotes": "Personliga anteckningar",
     "publishstate": "Sammanhang",
     "sitenotes": "Webbplats anteckningar",
diff --git a/www/addons/notes/lang/uk.json b/www/addons/notes/lang/uk.json
index 07ded7d1af1..8f58e17054e 100644
--- a/www/addons/notes/lang/uk.json
+++ b/www/addons/notes/lang/uk.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Записка створена",
     "nonotes": "Наразі немає записок такого типу",
     "note": "Записка",
-    "notes": "Ваш особистий аналіз і нотатки",
+    "notes": "Записки",
     "personalnotes": "Персональні записки",
     "publishstate": "Контекст",
     "sitenotes": "Записки сайту",
diff --git a/www/addons/notes/lang/zh-tw.json b/www/addons/notes/lang/zh-tw.json
index 2f1fd0f1429..6671dca17e8 100644
--- a/www/addons/notes/lang/zh-tw.json
+++ b/www/addons/notes/lang/zh-tw.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "註記已被建立",
     "nonotes": "還沒有這種類型的註記",
     "note": "註記",
-    "notes": "您個人的分析和筆記",
+    "notes": "註記",
     "personalnotes": "個人註記",
     "publishstate": "上下文",
     "sitenotes": "網站註記",
diff --git a/www/addons/notifications/lang/cs.json b/www/addons/notifications/lang/cs.json
index 7e1d1531bb2..b6fcbaa749e 100644
--- a/www/addons/notifications/lang/cs.json
+++ b/www/addons/notifications/lang/cs.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Chyba při načítání oznámení.",
     "notificationpreferences": "Nastavení oznámení",
-    "notifications": "Informace",
+    "notifications": "Oznámení",
     "playsound": "Přehrát zvuk",
     "therearentnotificationsyet": "Nejsou žádná sdělení"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/de.json b/www/addons/notifications/lang/de.json
index 5ac4171f7f2..6dc2a08c68c 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
-    "notificationpreferences": "Benachrichtigungen konfigurieren",
+    "notificationpreferences": "Systemmitteilungen",
     "notifications": "Systemmitteilungen",
     "playsound": "Audio abspielen",
     "therearentnotificationsyet": "Keine Mitteilungen"
diff --git a/www/addons/notifications/lang/es-mx.json b/www/addons/notifications/lang/es-mx.json
index 1049b40c7a5..238d8cfaa15 100644
--- a/www/addons/notifications/lang/es-mx.json
+++ b/www/addons/notifications/lang/es-mx.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
     "notificationpreferences": "Preferencias de notificación",
-    "notifications": "Avisos",
+    "notifications": "Notificaciones",
     "playsound": "Reproducir sonido",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es.json b/www/addons/notifications/lang/es.json
index 85f60ad941b..e73e272de69 100644
--- a/www/addons/notifications/lang/es.json
+++ b/www/addons/notifications/lang/es.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
-    "notificationpreferences": "Preferencias de notificación",
-    "notifications": "Avisos",
+    "notificationpreferences": "Preferencias de notificaciones",
+    "notifications": "Notificaciones",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/eu.json b/www/addons/notifications/lang/eu.json
index 2363a8e19af..256b8e1fe3e 100644
--- a/www/addons/notifications/lang/eu.json
+++ b/www/addons/notifications/lang/eu.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Errorea jakinarazpenak jasotzean",
-    "notificationpreferences": "Jakinarazpenen hobespenak",
+    "notificationpreferences": "Jakinarazpen hobespenak",
     "notifications": "Jakinarazpenak",
     "playsound": "Erreproduzitu soinua",
     "therearentnotificationsyet": "Ez dago jakinarazpenik"
diff --git a/www/addons/notifications/lang/fa.json b/www/addons/notifications/lang/fa.json
index f641bf74805..dcfecb86fba 100644
--- a/www/addons/notifications/lang/fa.json
+++ b/www/addons/notifications/lang/fa.json
@@ -1,5 +1,5 @@
 {
     "notificationpreferences": "ترجیحات اطلاعیه‌ها",
-    "notifications": "تذکرات",
+    "notifications": "هشدارها",
     "therearentnotificationsyet": "هیچ هشداری وجود ندارد"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/lt.json b/www/addons/notifications/lang/lt.json
index 9487770171a..965ea666726 100644
--- a/www/addons/notifications/lang/lt.json
+++ b/www/addons/notifications/lang/lt.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Klaida gaunant pranešimus",
-    "notificationpreferences": "Pranešimų nuostatos",
+    "notificationpreferences": "Pranešimų nustatymai",
     "notifications": "Pranešimai",
     "therearentnotificationsyet": "Nėra jokių pranešimų"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/nl.json b/www/addons/notifications/lang/nl.json
index 1f96952c939..c884b7364ea 100644
--- a/www/addons/notifications/lang/nl.json
+++ b/www/addons/notifications/lang/nl.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fout bij het ophalen van notificaties",
-    "notificationpreferences": "Meldingen  voorkeuren",
+    "notificationpreferences": "Notificatievoorkeuren",
     "notifications": "Meldingen",
     "playsound": "Speel geluid",
     "therearentnotificationsyet": "Er zijn geen meldingen"
diff --git a/www/addons/notifications/lang/pt-br.json b/www/addons/notifications/lang/pt-br.json
index 46bf5f98e68..33e2586486c 100644
--- a/www/addons/notifications/lang/pt-br.json
+++ b/www/addons/notifications/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Erro ao receber notificações",
-    "notificationpreferences": "Preferências de notificação",
-    "notifications": "Avisos",
+    "notificationpreferences": "Preferência de notificações",
+    "notifications": "Notificação",
     "therearentnotificationsyet": "Não há notificações"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sv.json b/www/addons/notifications/lang/sv.json
index 1a785f61e66..2aa4e69322a 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,5 +1,5 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
-    "notifications": "Administration",
+    "notifications": "Meddelanden",
     "therearentnotificationsyet": "Det finns inga meddelanden"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/uk.json b/www/addons/notifications/lang/uk.json
index 791d1338ac3..c3d124173af 100644
--- a/www/addons/notifications/lang/uk.json
+++ b/www/addons/notifications/lang/uk.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Помилка отримання сповіщень",
     "notificationpreferences": "Налаштування сповіщень",
-    "notifications": "Повідомлення",
+    "notifications": "Сповіщення",
     "playsound": "Грати звук",
     "therearentnotificationsyet": "Немає сповіщень"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/zh-cn.json b/www/addons/notifications/lang/zh-cn.json
index 3afb489f861..7d236d7f15d 100644
--- a/www/addons/notifications/lang/zh-cn.json
+++ b/www/addons/notifications/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
-    "notifications": "通告",
+    "notifications": "通知",
     "therearentnotificationsyet": "没有通知"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/zh-tw.json b/www/addons/notifications/lang/zh-tw.json
index 92e6514797c..f885ca29ff4 100644
--- a/www/addons/notifications/lang/zh-tw.json
+++ b/www/addons/notifications/lang/zh-tw.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "取得通知資料發生錯誤",
-    "notificationpreferences": "通知的偏好",
+    "notificationpreferences": "通知偏好設定",
     "notifications": "通知",
     "therearentnotificationsyet": "沒有通知訊息"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ca.json b/www/addons/participants/lang/ca.json
index 8fd771b0c76..3c6638a3af7 100644
--- a/www/addons/participants/lang/ca.json
+++ b/www/addons/participants/lang/ca.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No s'ha trobat cap participant en aquest curs",
+    "noparticipants": "No s'han trobat participants per aquest curs",
     "participants": "Participants"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/cs.json b/www/addons/participants/lang/cs.json
index 7e0a4430c6b..2092b03a730 100644
--- a/www/addons/participants/lang/cs.json
+++ b/www/addons/participants/lang/cs.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Pro tento kurz nenalezen žádný účastník",
+    "noparticipants": "Pro tento kurz nenalezeni účastníci",
     "participants": "Účastníci"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/de.json b/www/addons/participants/lang/de.json
index 343c2a2709e..95a259f09bd 100644
--- a/www/addons/participants/lang/de.json
+++ b/www/addons/participants/lang/de.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Keine Teilnehmer/innen für diesen Kurs gefunden",
-    "participants": "Teilnehmer/innen"
+    "noparticipants": "Keine Personen für diesen Kurs gefunden",
+    "participants": "Personen"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/el.json b/www/addons/participants/lang/el.json
index e1a786afbb1..846f209c0b0 100644
--- a/www/addons/participants/lang/el.json
+++ b/www/addons/participants/lang/el.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Δε βρέθηκαν συμμετέχονες γι' αυτό το μάθημα",
+    "noparticipants": "Δεν βρέθηκαν συμμετέχοντες σε αυτό το μάθημα",
     "participants": "Συμμετέχοντες"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es-mx.json b/www/addons/participants/lang/es-mx.json
index 62113ad2ef9..56f80358ad5 100644
--- a/www/addons/participants/lang/es-mx.json
+++ b/www/addons/participants/lang/es-mx.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se encontraron participantes en este curso",
+    "noparticipants": "No se encontraron participantes para este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/es.json b/www/addons/participants/lang/es.json
index 62113ad2ef9..c64b8bf86b4 100644
--- a/www/addons/participants/lang/es.json
+++ b/www/addons/participants/lang/es.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "No se encontraron participantes en este curso",
+    "noparticipants": "No se han encontrado participantes en este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/eu.json b/www/addons/participants/lang/eu.json
index 0a84454d0c0..b716ea85dad 100644
--- a/www/addons/participants/lang/eu.json
+++ b/www/addons/participants/lang/eu.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Ez da partaiderik aurkitu ikastaro honetarako",
+    "noparticipants": "Ez da parte-hartzailerik aurkitu ikastaro honetan",
     "participants": "Partaideak"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/lt.json b/www/addons/participants/lang/lt.json
index 714a8ffda94..b675a2848f1 100644
--- a/www/addons/participants/lang/lt.json
+++ b/www/addons/participants/lang/lt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nerasta šių kursų dalyvių",
+    "noparticipants": "Dalyvaujančių šiuose kursuose nėra",
     "participants": "Dalyviai"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/nl.json b/www/addons/participants/lang/nl.json
index 33b07998414..2beef686f18 100644
--- a/www/addons/participants/lang/nl.json
+++ b/www/addons/participants/lang/nl.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Geen gebruikers gevonden in deze cursus",
+    "noparticipants": "Geen deelnemers gevonden in deze cursus",
     "participants": "Deelnemers"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt-br.json b/www/addons/participants/lang/pt-br.json
index e54b7e5dc2c..792fea1d8fd 100644
--- a/www/addons/participants/lang/pt-br.json
+++ b/www/addons/participants/lang/pt-br.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nenhum participante encontrado para este curso",
+    "noparticipants": "Nenhum dos participantes encontrados para este curso",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt.json b/www/addons/participants/lang/pt.json
index 2f6d048e8df..e7a2e39536f 100644
--- a/www/addons/participants/lang/pt.json
+++ b/www/addons/participants/lang/pt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Não foram encontrados participantes para esta disciplina",
+    "noparticipants": "Nenhum participante encontrado nesta disciplina",
     "participants": "Participantes"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/ro.json b/www/addons/participants/lang/ro.json
index 0c2fa9e2bad..57abb945354 100644
--- a/www/addons/participants/lang/ro.json
+++ b/www/addons/participants/lang/ro.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nu există participanți la acest curs",
-    "participants": "Participanţi"
+    "noparticipants": "Nu au fost găsiți participanți la acest curs.",
+    "participants": "Participanți"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sv.json b/www/addons/participants/lang/sv.json
index 27833cf5412..ab7780c8f28 100644
--- a/www/addons/participants/lang/sv.json
+++ b/www/addons/participants/lang/sv.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Inga deltagare hittades för denna kurs",
+    "noparticipants": "Inga deltagare hittades för kursen",
     "participants": "Deltagare"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/tr.json b/www/addons/participants/lang/tr.json
index 9532bf04f39..05e3c834e4a 100644
--- a/www/addons/participants/lang/tr.json
+++ b/www/addons/participants/lang/tr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Bu ders için hiç katılımcı bulunamadı",
+    "noparticipants": "Bu derste hiç katılımcı bulunamadı",
     "participants": "Katılımcılar"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/uk.json b/www/addons/participants/lang/uk.json
index 9a3ebc4a3b3..2a8bcb3747e 100644
--- a/www/addons/participants/lang/uk.json
+++ b/www/addons/participants/lang/uk.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Не знайдені учасники для цього курсу",
+    "noparticipants": "Учасників не знайдено за цим курсом",
     "participants": "Учасники"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-cn.json b/www/addons/participants/lang/zh-cn.json
index 8c621b3fa17..f2ce4c8e36a 100644
--- a/www/addons/participants/lang/zh-cn.json
+++ b/www/addons/participants/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
     "noparticipants": "未找到此项课程的参与者",
-    "participants": "成员"
+    "participants": "课程参与者"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh-tw.json b/www/addons/participants/lang/zh-tw.json
index 69584ab153f..f2aba39a343 100644
--- a/www/addons/participants/lang/zh-tw.json
+++ b/www/addons/participants/lang/zh-tw.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "這一課程找不到參與者",
-    "participants": "成員"
+    "noparticipants": "這個課程沒有參與者",
+    "participants": "參與者"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/bg.json b/www/core/components/course/lang/bg.json
index 56a7382e3aa..370471981b9 100644
--- a/www/core/components/course/lang/bg.json
+++ b/www/core/components/course/lang/bg.json
@@ -5,5 +5,5 @@
     "couldnotloadsections": "Неуспех при зареждането на секциите, моля опитайте отново.",
     "hiddenfromstudents": "Скрит от ученици",
     "nocontentavailable": "В момента няма достъпно съдържание.",
-    "showall": "Показване на всичките {{$a}}"
+    "showall": "Показване на всичко"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ca.json b/www/core/components/course/lang/ca.json
index fb53f90a1eb..4d5f44fc1cc 100644
--- a/www/core/components/course/lang/ca.json
+++ b/www/core/components/course/lang/ca.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Ocult per a l'estudiantat",
     "nocontentavailable": "No hi ha contingut disponible en aquest moment.",
     "overriddennotice": "La vostra qualificació final en aquesta activitat s'ha modificat manualment.",
-    "showall": "Mostra'ls tots ({{$a}})",
+    "showall": "Mostra-ho tot",
     "useactivityonbrowser": "Tot i així, podeu fer-la servir al navegador del dispositiu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/cs.json b/www/core/components/course/lang/cs.json
index 6de4fc23e30..e8cac178795 100644
--- a/www/core/components/course/lang/cs.json
+++ b/www/core/components/course/lang/cs.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Skryté před studenty",
     "nocontentavailable": "V tuto chvíli není k dispozici žádný obsah.",
     "overriddennotice": "Vaše výsledná známka za tuto činnost byla ručně upravena.",
-    "showall": "Ukázat všechny {{$a}}",
+    "showall": "Zobrazit vše",
     "useactivityonbrowser": "Můžete i nadále používat jej pomocí prohlížeče zařízení."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/de.json b/www/core/components/course/lang/de.json
index ef581d50890..16ab12b9912 100644
--- a/www/core/components/course/lang/de.json
+++ b/www/core/components/course/lang/de.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Für Teilnehmer/innen verborgen",
     "nocontentavailable": "Momentan sind keine Inhalte verfügbar",
     "overriddennotice": "Die endgültige Bewertung zu dieser Aktivität wurde manuell bearbeitet.",
-    "showall": "Alle {{$a}} anzeigen",
+    "showall": "Alles anzeigen",
     "useactivityonbrowser": "Sie können dafür weiterhin den normalen Browser verwenden."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/el.json b/www/core/components/course/lang/el.json
index 7c86c671cc8..5882734e565 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -16,5 +16,5 @@
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Προβολή όλων {{$a}}"
+    "showall": "Προβολή όλων"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es-mx.json b/www/core/components/course/lang/es-mx.json
index 225893e56e3..1745ce4e20a 100644
--- a/www/core/components/course/lang/es-mx.json
+++ b/www/core/components/course/lang/es-mx.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Usted está a punto de descargar {{size}}. ¿Está Usted seguro de querer continuar?",
     "confirmdownloadunknownsize": "No pudimos calcular el tamaño de la descarga. ¿Está Usted seguro de querer descargarla?",
     "confirmpartialdownloadsize": "Usted está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está Usted seguro de querer continuar?",
-    "contents": "Contenido",
+    "contents": "Contenidos",
     "couldnotloadsectioncontent": "No pudo cargarse el contenido de la sección; por favor inténtelo nuevamente después.",
     "couldnotloadsections": "No pudieron cargarse las secciones; por favor inténtelo nuevamente después.",
     "errordownloadingsection": "Error al descargar sección",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "Sin contenido disponible al momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar {{$a}}",
+    "showall": "Mostrar todo",
     "useactivityonbrowser": "Usted todavía puede usarla si usa su navegador del dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/es.json b/www/core/components/course/lang/es.json
index c8cdf68dff8..40087d97665 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -8,7 +8,7 @@
     "confirmdownload": "Está a punto de descargar {{size}}. ¿Está seguro de que desea continuar?",
     "confirmdownloadunknownsize": "No se puede calcular el tamaño de la descarga. ¿Está seguro que quiere descargarlo?",
     "confirmpartialdownloadsize": "Está a punto de descargar <strong>al menos</strong> {{size}}. ¿Está seguro de querer continuar?",
-    "contents": "Contenido",
+    "contents": "Contenidos",
     "couldnotloadsectioncontent": "No se ha podido cargar el contenido de la sección, por favor inténtelo más tarde.",
     "couldnotloadsections": "No se ha podido cargar las secciones, por favor inténtelo más tarde.",
     "errordownloadingsection": "Error durante la descarga de la sección.",
@@ -16,6 +16,6 @@
     "hiddenfromstudents": "Oculto de estudiantes",
     "nocontentavailable": "No hay contenido disponible en este momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar {{$a}}",
+    "showall": "Mostrar todo",
     "useactivityonbrowser": "Puede acceder a esta actividad mediante el navegador de su dispositivo."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/eu.json b/www/core/components/course/lang/eu.json
index 5c01bf83579..c42572550ec 100644
--- a/www/core/components/course/lang/eu.json
+++ b/www/core/components/course/lang/eu.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Ezkutuan ikasleentzat",
     "nocontentavailable": "Ez dago edukirik eskuragarri momentu honetan.",
     "overriddennotice": "Jarduera honetako zure azken kalifikazioa eskuz egokitu da.",
-    "showall": "Erakutsi denak: {{$a}}",
+    "showall": "Erakutsi denak",
     "useactivityonbrowser": "Zure gailuko nabigatzailea erabilita erabili dezakezu."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fa.json b/www/core/components/course/lang/fa.json
index 5000e3146db..cb91088f8e6 100644
--- a/www/core/components/course/lang/fa.json
+++ b/www/core/components/course/lang/fa.json
@@ -5,10 +5,10 @@
     "confirmdownload": "شما در آستانهٔ دریافت {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmdownloadunknownsize": "ما نتوانستیم حجم دریافت را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmpartialdownloadsize": "شما در آستانهٔ دریافت <strong>حداقل</strong> {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
-    "contents": "محتویات",
+    "contents": "محتواها",
     "couldnotloadsectioncontent": "محتوای قسمت نتوانست بارگیری شود. لطفا بعدا دوباره تلاش کنید.",
     "couldnotloadsections": "قسمت‌ها نتوانستند بارگیری شوند. لطفا بعدا دوباره تلاش کنید.",
     "hiddenfromstudents": "پنهان از شاگردان",
-    "showall": "نمایش همه {{$a}}",
+    "showall": "نمایش همه",
     "useactivityonbrowser": "البته همچنان می‌توانید با استفاده از مرورگر دستگاه خود، از آن استفاده کنید."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/fr.json b/www/core/components/course/lang/fr.json
index a0ac1336588..fa5ca9f7fb7 100644
--- a/www/core/components/course/lang/fr.json
+++ b/www/core/components/course/lang/fr.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Caché pour les participants",
     "nocontentavailable": "Aucun contenu disponible actuellement.",
     "overriddennotice": "Votre note finale pour cette activité a été ajustée manuellement.",
-    "showall": "Afficher tous les {{$a}}",
+    "showall": "Tout afficher",
     "useactivityonbrowser": "Vous pouvez continuer à l'utiliser avec le navigateur de votre appareil."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/it.json b/www/core/components/course/lang/it.json
index 82112c25cdd..2f6968177c8 100644
--- a/www/core/components/course/lang/it.json
+++ b/www/core/components/course/lang/it.json
@@ -9,5 +9,5 @@
     "hiddenfromstudents": "Nascosta agli studenti",
     "nocontentavailable": "Non sono presenti contenuti.",
     "overriddennotice": "La tua valutazione finale da questa attività è stata modificata manualmente.",
-    "showall": "Visualizza tutti i {{$a}}"
+    "showall": "Visualizza tutto"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/lt.json b/www/core/components/course/lang/lt.json
index 39c1c02b24e..d348b5e7c7f 100644
--- a/www/core/components/course/lang/lt.json
+++ b/www/core/components/course/lang/lt.json
@@ -8,7 +8,7 @@
     "confirmdownload": "Norite atsisiųsti {{size}}. Ar norite tęsti?",
     "confirmdownloadunknownsize": "Negalima apskaičiuoti failo, kurį norite atsisiųsti, dydžio. Ar tikrai norite atsisiųsti?",
     "confirmpartialdownloadsize": "Norite atsisiųsti <strong>mažiausiai</strong> {{size}}. Ar tikrai norite tęsti?",
-    "contents": "Turinys",
+    "contents": "Turiniai",
     "couldnotloadsectioncontent": "Negalima užkrauti pasirinkto turinio, prašome pamėginti vėliau.",
     "couldnotloadsections": "Negalima užkrauti pasirinkto turinio, prašome pamėginti vėliau.",
     "errordownloadingsection": "Klaida atsisiunčiant.",
@@ -16,6 +16,6 @@
     "hiddenfromstudents": "Paslėpta nuo besimokančiųjų",
     "nocontentavailable": "Turinys šiuo metu nepasiekiamas.",
     "overriddennotice": "Šios veiklos galutinis įvertis buvo koreguotas rankiniu būdu.",
-    "showall": "Rodyti visus {{$a}}",
+    "showall": "Rodyti visus",
     "useactivityonbrowser": "Galite naudoti savo naršyklėje."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/nl.json b/www/core/components/course/lang/nl.json
index 3f619164387..e341c7adfe2 100644
--- a/www/core/components/course/lang/nl.json
+++ b/www/core/components/course/lang/nl.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Verborgen voor leerlingen",
     "nocontentavailable": "Geen inhoud beschikbaar.",
     "overriddennotice": "Je totaalcijfer voor deze activiteit is manueel aangepast.",
-    "showall": "Laat alle {{$a}} zien",
+    "showall": "Toon alle",
     "useactivityonbrowser": "Je kunt de activiteit nog steeds via de browser van je apparaat gebruiken"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt-br.json b/www/core/components/course/lang/pt-br.json
index 8a77246be40..e95b7c4187c 100644
--- a/www/core/components/course/lang/pt-br.json
+++ b/www/core/components/course/lang/pt-br.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Você está prestes a baixar {{size}}. Você tem certeza que quer continuar?",
     "confirmdownloadunknownsize": "Não fomos capazes de calcular o tamanho do download. Tem certeza de que deseja fazer o download?",
     "confirmpartialdownloadsize": "Você está prestes a baixar <strong>pelo menos</strong> {{size}}. Você tem certeza que quer continuar?",
-    "contents": "Conteúdo",
+    "contents": "Conteúdos",
     "couldnotloadsectioncontent": "Não foi possível carregar o conteúdo da seção, por favor tente mais tarde.",
     "couldnotloadsections": "Não foi possível carregar a seção, por favor tente mais tarde.",
     "errordownloadingsection": "Erro ao baixar seção.",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Esconder dos estudantes",
     "nocontentavailable": "Nenhum conteúdo disponível nesse momento.",
     "overriddennotice": "Sua nota final para esta atividade foi ajustada manualmente.",
-    "showall": "Mostrar todos os {{$a}}",
+    "showall": "Mostrar todos",
     "useactivityonbrowser": "Você ainda pode usar isso no navegador do seu dispositivo"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/pt.json b/www/core/components/course/lang/pt.json
index 8ba4d0a7688..7ac9f081fbd 100644
--- a/www/core/components/course/lang/pt.json
+++ b/www/core/components/course/lang/pt.json
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Oculto para os alunos",
     "nocontentavailable": "Nenhum conteúdo disponível neste momento.",
     "overriddennotice": "A sua nota final nesta atividade foi alterada manualmente na pauta.",
-    "showall": "Mostrar tudo {{$a}}",
+    "showall": "Mostrar todos",
     "useactivityonbrowser": "Ainda pode usá-lo se utilizar o navegador dos seus dispositivos."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ro.json b/www/core/components/course/lang/ro.json
index 8db8d4081f2..2069aa89421 100644
--- a/www/core/components/course/lang/ro.json
+++ b/www/core/components/course/lang/ro.json
@@ -2,7 +2,7 @@
     "allsections": "Toate secțiunile",
     "confirmdownload": "Porniți o descărcare de {{size}}. Sunteți sigur ca doriți să continuați?",
     "confirmdownloadunknownsize": "Nu putem calcula dimensiunea fișierului pe care doriți să îl descărcați. Sunteți sigur că doriți să descărcați?",
-    "contents": "Conţinut",
+    "contents": "Conținut",
     "couldnotloadsectioncontent": "Nu se poate încărca conținutul acestei secțiuni, încercați mai târziu.",
     "couldnotloadsections": "Nu se pot încărca secțiunile, încercați mai târziu.",
     "errordownloadingsection": "A apărut o eroare la descărcarea secțiunii.",
@@ -10,5 +10,5 @@
     "hiddenfromstudents": "Ascuns de cursanţi",
     "nocontentavailable": "Pentru moment nu există conținut.",
     "overriddennotice": "Nota finală obţinută de dumneavoastră pentru această activitate a fost ajustată manual.",
-    "showall": "Afişează toate {{$a}}"
+    "showall": "Arată tot"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/ru.json b/www/core/components/course/lang/ru.json
index 0d6968e390e..6a0a1c3f43a 100644
--- a/www/core/components/course/lang/ru.json
+++ b/www/core/components/course/lang/ru.json
@@ -6,5 +6,5 @@
     "hiddenfromstudents": "Скрыто от студентов",
     "nocontentavailable": "Нет контента, доступного в данный момент",
     "overriddennotice": "Ваша итоговая оценка за этот элемента курса была скорректирована вручную.",
-    "showall": "Показать все {{$a}}"
+    "showall": "Показать все"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sv.json b/www/core/components/course/lang/sv.json
index ecabe8e2fc5..0063575e970 100644
--- a/www/core/components/course/lang/sv.json
+++ b/www/core/components/course/lang/sv.json
@@ -10,5 +10,5 @@
     "hiddenfromstudents": "Dolt för studenter/deltagare/elever/lärande",
     "nocontentavailable": "Inget innehåll tillgängligt för tillfället.",
     "overriddennotice": "Ditt sammanfattningsbetyg för den här aktiviteten har justerats manuellt.",
-    "showall": "Visa alla {{$a}}"
+    "showall": "Visa alla"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/tr.json b/www/core/components/course/lang/tr.json
index f3d9b003fd5..027484a1cc3 100644
--- a/www/core/components/course/lang/tr.json
+++ b/www/core/components/course/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "allsections": "Tüm Bölümler",
-    "contents": "İçerik",
+    "contents": "İçerik(ler)",
     "hiddenfromstudents": "Öğrencilerden gizli",
     "overriddennotice": "Bu etkinlikteki final notunuz, elle ayarlandı.",
-    "showall": "Tümünü göster: {{$a}}"
+    "showall": "Tümünü göster"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/uk.json b/www/core/components/course/lang/uk.json
index 11ad1a92dc2..f1e7e1b958b 100644
--- a/www/core/components/course/lang/uk.json
+++ b/www/core/components/course/lang/uk.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Ви збираєтеся завантажити {{size}}. Ви впевнені, що хочете продовжити?",
     "confirmdownloadunknownsize": "Ми не змогли розрахувати розмір файлу. Ви впевнені, що ви хочете завантажити?",
     "confirmpartialdownloadsize": "Ви збираєтеся завантажити <strong> принаймні </strong> {{size}}. Ви впевнені, що хочете продовжити?",
-    "contents": "Зміст",
+    "contents": "Контент",
     "couldnotloadsectioncontent": "Не вдалося завантажити вміст розділу, будь ласка, спробуйте ще раз пізніше.",
     "couldnotloadsections": "Не вдалося завантажити розділи, будь ласка, спробуйте ще раз пізніше.",
     "errordownloadingsection": "Помилка в завантаженні.",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Сховане від студентів",
     "nocontentavailable": "Немає контенту, доступного в даний момент.",
     "overriddennotice": "Ваші фінальні бали з даної активності були відкореговані вручну.",
-    "showall": "Показати всі {{$a}}",
+    "showall": "Показати все",
     "useactivityonbrowser": "Ви все ще можете використовувати його за допомогою браузера пристрою."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-cn.json b/www/core/components/course/lang/zh-cn.json
index 5a50033ab9f..c60b61bdc0b 100644
--- a/www/core/components/course/lang/zh-cn.json
+++ b/www/core/components/course/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "contents": "内容",
     "hiddenfromstudents": "对学生隐藏",
     "overriddennotice": "您在该活动中的最终成绩将自动调整。",
-    "showall": "显示所有（{{$a}}）"
+    "showall": "全部显示"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/zh-tw.json b/www/core/components/course/lang/zh-tw.json
index 10ecfebf0bf..c9c97c2ef45 100644
--- a/www/core/components/course/lang/zh-tw.json
+++ b/www/core/components/course/lang/zh-tw.json
@@ -8,7 +8,7 @@
     "confirmdownload": "您即將下載{{size}}. 您確定您要繼續嗎?",
     "confirmdownloadunknownsize": "我們無法計算下載的容量. 您確定要下載嗎?",
     "confirmpartialdownloadsize": "您即將下載<strong>至少</ strong> {{size}}. 您確定您要繼續嗎?",
-    "contents": "目錄",
+    "contents": "內容",
     "couldnotloadsectioncontent": "無法載入區塊內容, 請稍後再試.",
     "couldnotloadsections": "無法載入區塊, 請稍後再試.",
     "errordownloadingsection": "載入區塊時發生錯誤",
@@ -16,6 +16,6 @@
     "hiddenfromstudents": "對學生隱藏",
     "nocontentavailable": "目前無內容可使用",
     "overriddennotice": "您在這活動的最後成績是手動調整的。",
-    "showall": "顯示全部{{$a}}",
+    "showall": "顯示全部",
     "useactivityonbrowser": "你可以以瀏覽器一直使用"
 }
\ No newline at end of file
diff --git a/www/core/components/courses/lang/ca.json b/www/core/components/courses/lang/ca.json
index bca799e7d49..dc6c6af16fd 100644
--- a/www/core/components/courses/lang/ca.json
+++ b/www/core/components/courses/lang/ca.json
@@ -13,10 +13,10 @@
     "filtermycourses": "Filtrar els meus cursos",
     "frontpage": "Pàgina principal",
     "mycourses": "Els meus cursos",
-    "nocourses": "No hi ha informació de cursos per mostrar.",
+    "nocourses": "No hi ha informació del curs per mostrar.",
     "nocoursesyet": "No hi ha cursos en aquesta categoria",
-    "nosearchresults": "La cerca no ha obtingut resultats",
-    "notenroled": "No us heu inscrit en aquest curs",
+    "nosearchresults": "No hi ha resultats per la vostra cerca",
+    "notenroled": "No esteu inscrit en aquest curs",
     "notenrollable": "No podeu autoinscriure-us en aquest curs.",
     "password": "Clau d'inscripció",
     "search": "Cerca",
diff --git a/www/core/components/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 582d3de5166..10ad53dc40c 100644
--- a/www/core/components/courses/lang/cs.json
+++ b/www/core/components/courses/lang/cs.json
@@ -5,7 +5,7 @@
     "categories": "Kategorie kurzů",
     "confirmselfenrol": "Jste si jisti, že chcete zapsat se do tohoto kurzu?",
     "courses": "Kurzy",
-    "enrolme": "Zapsat se do kurzu",
+    "enrolme": "Zapsat se",
     "errorloadcategories": "Při načítání kategorií došlo k chybě.",
     "errorloadcourses": "Při načítání kurzů došlo k chybě.",
     "errorsearching": "Při vyhledávání došlo k chybě.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
-    "nocourses": "Žádné dostupné informace o kurzech",
+    "nocourses": "O kurzu nejsou žádné informace.",
     "nocoursesyet": "Žádný kurz v této kategorii",
-    "nosearchresults": "Vaše vyhledávání nepřineslo žádný výsledek",
-    "notenroled": "Nejste zapsáni v tomto kurzu",
+    "nosearchresults": "Z vašeho hledání nebyly nalezeny žádné výsledky",
+    "notenroled": "V tomto kurzu nejste zapsán",
     "notenrollable": "Do tohoto kurzu se nemůžete sami zapsat.",
-    "password": "Sdílené heslo",
+    "password": "Klíč zápisu",
     "search": "Hledat",
     "searchcourses": "Vyhledat kurzy",
     "searchcoursesadvice": "Můžete použít tlačítko Vyhledat kurzy, pracovat jako host nebo se zapsat do kurzů, které to umožňují.",
diff --git a/www/core/components/courses/lang/de.json b/www/core/components/courses/lang/de.json
index eb00eb53792..4e3b14126e9 100644
--- a/www/core/components/courses/lang/de.json
+++ b/www/core/components/courses/lang/de.json
@@ -5,7 +5,7 @@
     "categories": "Kursbereiche",
     "confirmselfenrol": "Möchten Sie sich selbst in diesen Kurs einschreiben?",
     "courses": "Kurse",
-    "enrolme": "Einschreiben",
+    "enrolme": "Selbst einschreiben",
     "errorloadcategories": "Fehler beim Laden der Kursbereiche",
     "errorloadcourses": "Fehler beim Laden der Kurse",
     "errorsearching": "Fehler beim Suchen",
@@ -13,12 +13,12 @@
     "filtermycourses": "Meine Kurse filtern",
     "frontpage": "Startseite",
     "mycourses": "Meine Kurse",
-    "nocourses": "Keine Kursinformationen",
+    "nocourses": "Keine Kursinformation",
     "nocoursesyet": "Keine Kurse in diesem Kursbereich",
     "nosearchresults": "Keine Suchergebnisse",
-    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben",
+    "notenroled": "Sie sind nicht in diesen Kurs eingeschrieben.",
     "notenrollable": "Sie können sich nicht selbst in diesen Kurs einschreiben.",
-    "password": "Kennwort",
+    "password": "Einschreibeschlüssel",
     "search": "Suchen",
     "searchcourses": "Kurse suchen",
     "searchcoursesadvice": "Sie können Kurse suchen, um als Gast teilzunehmen oder sich selbst einzuschreiben, falls dies erlaubt ist.",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index 50e1c5138ef..def66c4256d 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Φιλτράρισμα των μαθημάτων μου",
     "frontpage": "Αρχική σελίδα",
     "mycourses": "Τα μαθήματά μου",
-    "nocourses": "Δεν υπάρχει πληροφορία του μαθήματος για προβολή.",
+    "nocourses": "Δεν υπάρχουν πληροφορίες για αυτό το μάθημα.",
     "nocoursesyet": "Δεν υπάρχουν μαθήματα σε αυτήν την κατηγορία",
-    "nosearchresults": "Δε βρέθηκαν αποτελέσματα για την αναζήτησή σας",
-    "notenroled": "Δεν είσαι εγγεγραμμένος σε αυτό το μάθημα",
+    "nosearchresults": "Δεν βρέθηκαν αποτελέσματα",
+    "notenroled": "Δεν έχετε εγγραφεί σε αυτό το μάθημα",
     "notenrollable": "Δεν μπορείτε να αυτο-εγγραφείτε σε αυτό το μάθημα.",
-    "password": "Κωδικός",
+    "password": "Κλειδί εγγραφής",
     "search": "Αναζήτηση",
     "searchcourses": "Αναζήτηση μαθημάτων",
     "searchcoursesadvice": "Μπορείτε να χρησιμοποιήσετε το κουμπί Αναζήτηση μαθημάτων για πρόσβαση ως επισκέπτης ή για να αυτο-εγγραφείτε σε μαθήματα που το επιτρέπουν.",
diff --git a/www/core/components/courses/lang/es-mx.json b/www/core/components/courses/lang/es-mx.json
index b22f87dccd0..3b5fa60c3b6 100644
--- a/www/core/components/courses/lang/es-mx.json
+++ b/www/core/components/courses/lang/es-mx.json
@@ -13,12 +13,12 @@
     "filtermycourses": "<<<filtrar mis cursos",
     "frontpage": "Portada",
     "mycourses": "Mis cursos",
-    "nocourses": "No hay información del curso para mostrar.",
+    "nocourses": "Sin información del curso para mostrar.",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "La búsqueda no produjo resultados",
+    "nosearchresults": "No hubo resultados de su búsqueda",
     "notenroled": "Usted no está inscrito en este curso",
     "notenrollable": "Usted no puede inscribirse a Usted mismo en este curso.",
-    "password": "Secreto Compartido",
+    "password": "Clave de inscripción",
     "search": "Buscar",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Usted puede usar el botón de 'buscar cursos' para acceder como invitado o para inscribirse Usted mismo en los cursos que lo permitan.",
diff --git a/www/core/components/courses/lang/es.json b/www/core/components/courses/lang/es.json
index db6bce4e3e7..c631db3a6aa 100644
--- a/www/core/components/courses/lang/es.json
+++ b/www/core/components/courses/lang/es.json
@@ -13,10 +13,10 @@
     "mycourses": "Mis cursos",
     "nocourses": "No hay información del curso para mostrar.",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "La búsqueda no produjo resultados",
-    "notenroled": "Usted no está matriculado en este curso",
+    "nosearchresults": "No hay resultados para su búsqueda",
+    "notenroled": "No está inscrito en este curso",
     "notenrollable": "No puede auto-matricularse en este curso.",
-    "password": "Clave de matriculación",
+    "password": "Clave",
     "search": "Buscar",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Puede utilizar el botón de buscar cursos para acceder como invitado o auto-matricularse en los cursos que lo permitan.",
diff --git a/www/core/components/courses/lang/eu.json b/www/core/components/courses/lang/eu.json
index 93e356a6167..9a58ba8bf36 100644
--- a/www/core/components/courses/lang/eu.json
+++ b/www/core/components/courses/lang/eu.json
@@ -5,7 +5,7 @@
     "categories": "Ikastaro-kategoriak",
     "confirmselfenrol": "Ziur zaude ikastaro honetan izena eman nahi duzula?",
     "courses": "Ikastaroak",
-    "enrolme": "Matrikula nazazu",
+    "enrolme": "Matrikulatu nazazu",
     "errorloadcategories": "Errorea gertatu da kategoriak kargatzean.",
     "errorloadcourses": "Errore bat gertatu da ikastaroak kargatzean.",
     "errorsearching": "Errorea gertatu da bilatzean.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Nire ikastaroak iragazi",
     "frontpage": "Hasiera-orria",
     "mycourses": "Nire ikastaroak",
-    "nocourses": "Ez dago ikastaroei buruzko informaziorik",
+    "nocourses": "Ez dago erakusteko ikastaro-informaziorik.",
     "nocoursesyet": "Ez dago ikastarorik kategoria honetan",
-    "nosearchresults": "Zure bilaketak du ezer topatu",
+    "nosearchresults": "Ez da emaitzik aurkitu zure bilaketarentzat",
     "notenroled": "Ez zaude matrikulatuta ikastaro honetan",
     "notenrollable": "Ezin duzu zeure burua matrikulatu ikastaro honetan.",
-    "password": "Partekatutako sekretua",
+    "password": "Matrikulazio-giltza",
     "search": "Bilatu",
     "searchcourses": "Bilatu Ikastaroak",
     "searchcoursesadvice": "Bilatu botoia erabil dezakezu ikastaroak topatu eta bisitari gisa sartu edo bertan matrikulatzeko ikastaroak baimentzen badu.",
diff --git a/www/core/components/courses/lang/fr.json b/www/core/components/courses/lang/fr.json
index cb021a2112d..1861d031977 100644
--- a/www/core/components/courses/lang/fr.json
+++ b/www/core/components/courses/lang/fr.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrer mes cours",
     "frontpage": "Page d'accueil",
     "mycourses": "Mes cours",
-    "nocourses": "Aucune information de cours à afficher.",
+    "nocourses": "Aucune information de cours à afficher",
     "nocoursesyet": "Il n'y a pas encore de cours",
-    "nosearchresults": "Cette recherche n'a fourni aucun résultat",
+    "nosearchresults": "Votre recherche n'a donné aucun résultat",
     "notenroled": "Vous n'êtes pas inscrit à ce cours",
     "notenrollable": "Vous ne pouvez pas vous inscrire vous-même à ce cours.",
-    "password": "Secret partagé",
+    "password": "Clef d'inscription",
     "search": "Rechercher",
     "searchcourses": "Rechercher des cours",
     "searchcoursesadvice": "Veuillez utiliser le bouton de recherche de cours pour accéder anonymement à des cours ou vous inscrire vous-même à des cours qui le permettent.",
diff --git a/www/core/components/courses/lang/it.json b/www/core/components/courses/lang/it.json
index 73c5debbe71..c46c10af2f5 100644
--- a/www/core/components/courses/lang/it.json
+++ b/www/core/components/courses/lang/it.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Filtra i miei corsi",
     "frontpage": "Pagina home",
     "mycourses": "I miei corsi",
-    "nocourses": "Non sono presenti informazioni sui corsi.",
+    "nocourses": "Non sono presenti informazioni sul corso.",
     "nocoursesyet": "Questa categoria non ha corsi",
-    "nosearchresults": "La tua ricerca non ha prodotto risultati",
+    "nosearchresults": "La ricerca non ha prodotto risultati",
     "notenroled": "Non sei iscritto in questo corso",
     "notenrollable": "Non puoi iscriverti al corso.",
-    "password": "Password",
+    "password": "Chiave di iscrizione",
     "search": "Cerca",
     "searchcourses": "Cerca corsi",
     "searchcoursesadvice": "Puoi utilizzare la ricerca corsi per accedere come ospite oppure iscriverti nei corsi che lo consentono.",
diff --git a/www/core/components/courses/lang/lt.json b/www/core/components/courses/lang/lt.json
index 62218f5192e..cc7eb529a53 100644
--- a/www/core/components/courses/lang/lt.json
+++ b/www/core/components/courses/lang/lt.json
@@ -4,19 +4,19 @@
     "categories": "Kursų kategorijos",
     "confirmselfenrol": "Ar Jūs tikrai norite įsirašyti į šiuos mokymo kursus?",
     "courses": "Kursai",
-    "enrolme": "Įregistruoti mane",
+    "enrolme": "Įrašyti mane",
     "errorloadcourses": "Klaida kraunant kursus.",
     "errorsearching": "Paieškos klaida.",
     "errorselfenrol": "Klaida įrašant.",
     "filtermycourses": "Filtruoti mano kursus",
     "frontpage": "Titulinis lapas",
     "mycourses": "Mano kursai",
-    "nocourses": "Nėra rodytinos kursų informacijos",
+    "nocourses": "Nėra ką rodyti",
     "nocoursesyet": "Nėra šios kategorijos kursų",
-    "nosearchresults": "Nėra jūsų paieškos rezultatų",
-    "notenroled": "Nesate įsiregistravęs kaip šių kursų besimokantysis",
+    "nosearchresults": "Paieškos rezultatų nėra",
+    "notenroled": "Nesate įrašytas į šį kursą",
     "notenrollable": "Negalite įrašyti savęs į šį kursą.",
-    "password": "Bendra paslaptis",
+    "password": "Įrašymo raktas",
     "search": "Ieškoti",
     "searchcourses": "Ieškoti kursų",
     "searchcoursesadvice": "Jūs galite naudoti kursų paieškos mygtuką ieškant kursų su svečio prieiga arba įrašyti save į kursus, kurie yra prieinami.",
diff --git a/www/core/components/courses/lang/nl.json b/www/core/components/courses/lang/nl.json
index f85d8754ed0..60fc63d43fe 100644
--- a/www/core/components/courses/lang/nl.json
+++ b/www/core/components/courses/lang/nl.json
@@ -5,7 +5,7 @@
     "categories": "Cursuscategorieën",
     "confirmselfenrol": "Weet je zeker dat je je wil aanmelden in deze cursus?",
     "courses": "Cursussen",
-    "enrolme": "Laat me in de cursus",
+    "enrolme": "Meld me aan",
     "errorloadcategories": "Er is een fout opgetreden bij het ophalen van categorieën",
     "errorloadcourses": "Er is een fout opgetreden tijdens het laden van de cursussen.",
     "errorsearching": "Er is een fout opgetreden tijdens het zoeken.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filter mijn cursussen",
     "frontpage": "Startpagina",
     "mycourses": "Mijn cursussen",
-    "nocourses": "Geen cursusinformatie",
+    "nocourses": "Geen cursusinformatie beschikbaar.",
     "nocoursesyet": "Er zijn geen cursussen in deze categorie",
     "nosearchresults": "Je zoekopdracht gaf geen resultaten",
-    "notenroled": "Je bent niet aangemeld in deze cursus",
+    "notenroled": "Je bent niet aangemeld in deze cursus.",
     "notenrollable": "Je kunt jezelf niet aanmelden in deze cursus.",
-    "password": "Gedeeld geheim",
+    "password": "Aanmeldingssleutel",
     "search": "Zoek",
     "searchcourses": "Zoek cursussen",
     "searchcoursesadvice": "Je kunt via de cursus zoekknop toegang krijgen als gast of jezelf aanmelden in cursussen die dit toestaan.",
diff --git a/www/core/components/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index 4576df30040..759c80f03a6 100644
--- a/www/core/components/courses/lang/pt-br.json
+++ b/www/core/components/courses/lang/pt-br.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrar meus cursos",
     "frontpage": "Primeira página",
     "mycourses": "Meus cursos",
-    "nocourses": "Nenhuma informação disponível sobre o curso.",
+    "nocourses": "Sem informações sobre o curso para mostrar.",
     "nocoursesyet": "Nenhum curso nesta categoria",
-    "nosearchresults": "Nenhum resultado corresponde aos termos da  busca",
-    "notenroled": "Você não está inscrito como estudante neste curso",
+    "nosearchresults": "Não foram encontrados resultados da sua pesquisa",
+    "notenroled": "Você não está registrado neste curso",
     "notenrollable": "Você não pode inscrever-se neste curso.",
-    "password": "Segredo compartilhado",
+    "password": "Chave de inscrição",
     "search": "Buscar",
     "searchcourses": "Buscar cursos",
     "searchcoursesadvice": "Você pode usar o botão de busca para acessar os cursos como convidado ou matricular-se em cursos que permitem que ele.",
diff --git a/www/core/components/courses/lang/pt.json b/www/core/components/courses/lang/pt.json
index 32dfab533ee..6cf8a068032 100644
--- a/www/core/components/courses/lang/pt.json
+++ b/www/core/components/courses/lang/pt.json
@@ -5,7 +5,7 @@
     "categories": "Categorias de disciplinas",
     "confirmselfenrol": "Tem certeza de que deseja inscrever-se nesta disciplina?",
     "courses": "Disciplinas",
-    "enrolme": "Inscrever-me",
+    "enrolme": "Inscreva-me",
     "errorloadcategories": "Ocorreu um erro ao carregar as categorias.",
     "errorloadcourses": "Ocorreu um erro ao carregar as disciplinas.",
     "errorsearching": "Ocorreu um erro durante a pesquisa.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtrar as minhas disciplinas",
     "frontpage": "Página principal do site",
     "mycourses": "As minhas disciplinas",
-    "nocourses": "Sem informação das suas disciplinas para mostrar.",
+    "nocourses": "Sem informações das disciplinas para mostrar",
     "nocoursesyet": "Nenhuma disciplina nesta categoria",
-    "nosearchresults": "Não houve resultados da sua procura",
-    "notenroled": "Não está inscrito como aluno nesta disciplina",
+    "nosearchresults": "Não foram encontrados resultados na sua pesquisa",
+    "notenroled": "Não está inscrito nesta disciplina",
     "notenrollable": "Não se pode inscrever nesta disciplina.",
-    "password": "Senha partilhada",
+    "password": "Senha de inscrição",
     "search": "Procurar",
     "searchcourses": "Procurar disciplinas",
     "searchcoursesadvice": "Pode usar o botão de pesquisa de disciplinas para aceder às mesmas como visitante ou autoinscrever-se caso o permitam.",
diff --git a/www/core/components/courses/lang/ro.json b/www/core/components/courses/lang/ro.json
index ac89eba0216..d2e6db9c9e2 100644
--- a/www/core/components/courses/lang/ro.json
+++ b/www/core/components/courses/lang/ro.json
@@ -4,19 +4,19 @@
     "categories": "Categorii de cursuri",
     "confirmselfenrol": "Sunteți sigur/ă că doriți să vă înregistrați la acest curs?",
     "courses": "Cursuri",
-    "enrolme": "Înscrie-mă",
+    "enrolme": "Înregistrează-mă",
     "errorloadcourses": "A apărut o eroare la încărcarea cursurilor.",
     "errorsearching": "A apărut o eroare în procesul de căutare.",
     "errorselfenrol": "A apărut o eroare în procesul de auto-înregistrare.",
     "filtermycourses": "Filtrează cursurile",
     "frontpage": "Prima pagină",
     "mycourses": "Cursurile mele",
-    "nocourses": "Nicio informație legată de cursuri este disponibilă",
+    "nocourses": "Nu există informații despre curs",
     "nocoursesyet": "Nu s-au găsit cursuri în această categorie",
-    "nosearchresults": "Căutarea iniţiată de dumneavoastră nu a generat niciun rezultat",
-    "notenroled": "Nu sunteți înregistrat în  acest curs",
+    "nosearchresults": "Nu există rezultate pentru căutarea dumneavoastră",
+    "notenroled": "Nu sunteți înregistrat la acest curs",
     "notenrollable": "Nu vă puteți auto-înregistra la acest curs.",
-    "password": "Cheie înscriere",
+    "password": "Parola de înregistrare",
     "search": "Caută",
     "searchcourses": "Caută cursuri",
     "searchcoursesadvice": "Puteți folosi butonul pentru căutarea cursurilor pentru a cauta și accesa ca vizitator sau pentru a vă auto-înregistra la acele cursuri care permit aceste opțiuni.",
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index 20d2ea5faf3..f7b7aea83fe 100644
--- a/www/core/components/courses/lang/sv.json
+++ b/www/core/components/courses/lang/sv.json
@@ -4,19 +4,19 @@
     "categories": "Kurskategorier",
     "confirmselfenrol": "Är du säker att du vill registrera dig i den här kursen ?",
     "courses": "Kurser",
-    "enrolme": "Koppla mig",
+    "enrolme": "Registrera mig",
     "errorloadcourses": "Ett fel uppstod vid inläsning av kursen",
     "errorsearching": "Fel uppstod vid sökning",
     "errorselfenrol": "Fel uppstod vid registrering",
     "filtermycourses": "Filtrera mina kurser",
     "frontpage": "Ingångssidan",
     "mycourses": "Mina kurser",
-    "nocourses": "Det finns ingen kursinformation att visa.",
+    "nocourses": "Ingen kursinfomration att visa",
     "nocoursesyet": "Inga kurser i denna kategori",
-    "nosearchresults": "Din sökning gav inga träffar",
-    "notenroled": "Du är inte registrerad i den här kursen",
+    "nosearchresults": "Inga sökningsresultat",
+    "notenroled": "Du är inte registrerad i kursen",
     "notenrollable": "Du kan inte självregistrera dig i kursen",
-    "password": "Lösenord",
+    "password": "Kursnyckel",
     "search": "Sök",
     "searchcourses": "Sök kurser",
     "searchcoursesadvice": "Du kan använda knappen \"Sök kurser\" för att få tillgång som gäst eller registrera dig på kurser som tillåter det .",
diff --git a/www/core/components/courses/lang/uk.json b/www/core/components/courses/lang/uk.json
index 41fd3cdbc27..2821e8d6a72 100644
--- a/www/core/components/courses/lang/uk.json
+++ b/www/core/components/courses/lang/uk.json
@@ -5,7 +5,7 @@
     "categories": "Категорії курсів",
     "confirmselfenrol": "Ви впевнені, що хочете зареєструвати себе в цьому курсі?",
     "courses": "Курси",
-    "enrolme": "Зареєструвати мене",
+    "enrolme": "Відрахувати мене",
     "errorloadcategories": "Сталася помилка під час завантаження категорій.",
     "errorloadcourses": "Сталася помилка під час завантаження курсів.",
     "errorsearching": "Під час пошуку сталася помилка.",
@@ -13,12 +13,12 @@
     "filtermycourses": "Відфільтрувати мої курси",
     "frontpage": "Титульна сторінка",
     "mycourses": "Мої курси",
-    "nocourses": "Немає інформації курсу для показу.",
+    "nocourses": "Інформація про курс відсутня.",
     "nocoursesyet": "У цій категорії немає курсів",
-    "nosearchresults": "Пошук не дав результатів",
-    "notenroled": "Ви не зареєстровані як студент цього курсу",
+    "nosearchresults": "Ніяких результатів пошуку",
+    "notenroled": "Ви не зареєстровані в цьому курсі",
     "notenrollable": "Ви не можете зареєструвати себе в цьому курсі.",
-    "password": "Відкритий ключ",
+    "password": "ключ подачі заявок",
     "search": "Знайти",
     "searchcourses": "Пошук курсів",
     "searchcoursesadvice": "Ви можете використовувати кнопку пошуку курсів, щоб отримати доступ в якості гостя або зареєструвати себе в курсах, які дозволяють їй.",
diff --git a/www/core/components/courses/lang/zh-tw.json b/www/core/components/courses/lang/zh-tw.json
index 7bf189df333..eb2fde191e0 100644
--- a/www/core/components/courses/lang/zh-tw.json
+++ b/www/core/components/courses/lang/zh-tw.json
@@ -4,19 +4,19 @@
     "categories": "課程類別",
     "confirmselfenrol": "您確定要註冊本課程嗎?",
     "courses": "課程",
-    "enrolme": "將我加入",
+    "enrolme": "註冊報名",
     "errorloadcourses": "載入課程時出錯.",
     "errorsearching": "搜索時出錯.",
     "errorselfenrol": "自行註冊時出現錯誤.",
     "filtermycourses": "過濾我的課程",
     "frontpage": "首頁",
     "mycourses": "我的課程",
-    "nocourses": "沒有課程資訊可以顯示",
+    "nocourses": "沒有課程資料可以顯示",
     "nocoursesyet": "此類別中無課程",
-    "nosearchresults": "您的搜尋沒有結果",
-    "notenroled": "您沒有加入此課程",
+    "nosearchresults": "您的搜索沒有任何結果.",
+    "notenroled": "您沒有註冊此課程",
     "notenrollable": "您無法註冊本課程.",
-    "password": "共用密碼",
+    "password": "註冊碼",
     "search": "搜尋",
     "searchcourses": "搜尋課程",
     "searchcoursesadvice": "您可以使用搜尋課程按鈕以訪客身份登入, 或在允許它的課程中註冊",
diff --git a/www/core/components/fileuploader/lang/bg.json b/www/core/components/fileuploader/lang/bg.json
index 573cef3b216..9d46df4051f 100644
--- a/www/core/components/fileuploader/lang/bg.json
+++ b/www/core/components/fileuploader/lang/bg.json
@@ -15,6 +15,6 @@
     "photoalbums": "Фотоалбуми",
     "readingfile": "Четене на файл",
     "uploadafile": "Качване на файл",
-    "uploading": "Качване...",
+    "uploading": "Качване",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ca.json b/www/core/components/fileuploader/lang/ca.json
index 260d49f2008..f5e46ff7e10 100644
--- a/www/core/components/fileuploader/lang/ca.json
+++ b/www/core/components/fileuploader/lang/ca.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "S'ha produït un error descarregant la imatge de l'àlbum.",
     "errormustbeonlinetoupload": "Heu d'estar connectat per pujar arxius.",
     "errornoapp": "No teniu instal·lada una app per realitzar aquesta acció.",
-    "errorreadingfile": "S'ha produït un error en llegir el fitxer \"{{$a}}\"",
+    "errorreadingfile": "S'ha produït un error llegint el fitxer.",
     "errorwhileuploading": "S'ha produït un error penjant el fitxer.",
-    "file": "Fitxer",
+    "file": "Arxiu",
     "fileuploaded": "S'ha penjat el fitxer",
-    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima que podeu pujar és de {{$a.size}}.",
+    "maxbytesfile": "El fitxer {{$a.file}} és massa gran. La mida màxima de càrrega és {{$a.size}}.",
     "photoalbums": "Àlbums de fotos",
     "readingfile": "S'està llegint un fitxer",
     "selectafile": "Selecciona un fitxer",
     "uploadafile": "Penja un fitxer",
-    "uploading": "S'està carregant...",
+    "uploading": "S'està penjant",
     "uploadingperc": "S'està pujant: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/cs.json b/www/core/components/fileuploader/lang/cs.json
index d8c07250a14..4c0277d01ff 100644
--- a/www/core/components/fileuploader/lang/cs.json
+++ b/www/core/components/fileuploader/lang/cs.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Chyba při načítání snímku z alba.",
     "errormustbeonlinetoupload": "Při nahrávání souboru musíte být online.",
     "errornoapp": "Pro provedení této akce nemáte nainstalovanou aplikaci .",
-    "errorreadingfile": "Chyba při čtení souboru \"{{$a}}\"",
+    "errorreadingfile": "Chyba při čtení souboru.",
     "errorwhileuploading": "Při pokusu o nahrání souboru došlo k chybě .",
     "file": "Soubor",
     "fileuploaded": "Soubor nahrán",
-    "maxbytesfile": "Soubor {{$a.file}} je příliš velký. Maximální velikost, kterou můžete nahrát, je  {{$a.size}}.",
+    "maxbytesfile": "Soubor {{$a.file}} je příliš veliký. Maximální velikost nahrávaného souboru je {{$a.size}}.",
     "photoalbums": "Fotoalba",
     "readingfile": "Čtení souboru",
     "selectafile": "Vyberte soubor",
-    "uploadafile": "Vložit soubor",
-    "uploading": "Nahrávání ...",
+    "uploadafile": "Nahrát soubor",
+    "uploading": "Nahrávání",
     "uploadingperc": "Nahrávání: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/de.json b/www/core/components/fileuploader/lang/de.json
index 82da9ba6b9f..e54ab178c4f 100644
--- a/www/core/components/fileuploader/lang/de.json
+++ b/www/core/components/fileuploader/lang/de.json
@@ -10,7 +10,7 @@
     "errorgettingimagealbum": "Fehler beim Laden aus dem Fotoalbum",
     "errormustbeonlinetoupload": "Dateien können nur online hochgeladen werden.",
     "errornoapp": "Keine App zum Ausführen dieser Aktion gefunden",
-    "errorreadingfile": "Fehler beim Lesen der Datei \"{{$a}}\"",
+    "errorreadingfile": "Fehler beim Lesen der Datei",
     "errorwhileuploading": "Fehler beim Hochladen der Datei",
     "file": "Datei",
     "fileuploaded": "Datei hochgeladen",
@@ -19,7 +19,7 @@
     "readingfile": "Datei lesen",
     "selectafile": "Wählen Sie eine Datei.",
     "uploadafile": "Datei hochladen",
-    "uploading": "Wird hochgeladen...",
+    "uploading": "Hochladen",
     "uploadingperc": "Hochladen: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/el.json b/www/core/components/fileuploader/lang/el.json
index 32ef85ac7f5..57aa3c4745c 100644
--- a/www/core/components/fileuploader/lang/el.json
+++ b/www/core/components/fileuploader/lang/el.json
@@ -10,7 +10,7 @@
     "errorgettingimagealbum": "Σφάλμα κατά τη λήψη εικόνας από το αλμπουμ.",
     "errormustbeonlinetoupload": "Πρέπει να είστε συνδεδεμένοι για να ανεβάσετε αρχεία.",
     "errornoapp": "Δεν έχετε εγκατεστημένη εφαρμογή για να εκτελέσετε αυτή την ενέργεια.",
-    "errorreadingfile": "Σφάλμα στην ανάγνωση του αρχείου \"{{$a}}\"",
+    "errorreadingfile": "Σφάλμα ανάγνωσης αρχείου.",
     "errorwhileuploading": "Παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου.",
     "file": "Αρχείο",
     "fileuploaded": "Το αρχείο ανέβηκε επιτυχώς.",
@@ -18,8 +18,8 @@
     "photoalbums": "Άλμπουμ φωτογραφιών",
     "readingfile": "Ανάγνωση αρχείου",
     "selectafile": "Επιλογή αρχείου",
-    "uploadafile": "Φόρτωση ενός αρχείου",
-    "uploading": "Ανέβασμα...",
+    "uploadafile": "Ανεβάστε ένα αρχείο",
+    "uploading": "Ανέβασμα",
     "uploadingperc": "Ανέβασμα: {{$a}}%",
     "video": "Βίντεο"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/es-mx.json b/www/core/components/fileuploader/lang/es-mx.json
index 9df3e3feee0..d299651b204 100644
--- a/www/core/components/fileuploader/lang/es-mx.json
+++ b/www/core/components/fileuploader/lang/es-mx.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Error al obtener imagen del album.",
     "errormustbeonlinetoupload": "Usted tiene que estar en-línea para subir archivos.",
     "errornoapp": "Usted no tiene una App instalada para realizar esta acción.",
-    "errorreadingfile": "Error al leer el archivo  \"{{$a}}\"",
+    "errorreadingfile": "Error al leer archivo.",
     "errorwhileuploading": "Ocurrió un error durante la subida del archivo.",
     "file": "Archivo",
     "fileuploaded": "El archivo fue subido exitosamente.",
-    "maxbytesfile": "El archivo {{$a.file}} es demasiado grande. El tamaño máximo que Usted puede subir es de {{$a.size}}.",
+    "maxbytesfile": "El archivo {{$a.file}} es demasido grande. El tamaño máximo que Usted puede subir es {{$a.size}}.",
     "photoalbums": "Foto álbumes",
     "readingfile": "Leyendo archivo",
     "selectafile": "Seleccionar un archivo",
     "uploadafile": "Subir un archivo",
-    "uploading": "Subiendo...",
+    "uploading": "Subiendo",
     "uploadingperc": "Subiendo: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/es.json b/www/core/components/fileuploader/lang/es.json
index a76008a356f..46688459cf2 100644
--- a/www/core/components/fileuploader/lang/es.json
+++ b/www/core/components/fileuploader/lang/es.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Añadir fichero",
+    "addfiletext": "añadir archivo",
     "audio": "Audio",
     "camera": "Cámara",
     "confirmuploadfile": "Usted va a subir {{size}}. ¿Desea continuar?",
@@ -19,7 +19,7 @@
     "readingfile": "Leyendo archivo",
     "selectafile": "Seleccionar un archivo",
     "uploadafile": "Subir un archivo",
-    "uploading": "Subiendo...",
+    "uploading": "Subiendo",
     "uploadingperc": "Subiendo: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/eu.json b/www/core/components/fileuploader/lang/eu.json
index 3a12490d312..8d5ff8b0cef 100644
--- a/www/core/components/fileuploader/lang/eu.json
+++ b/www/core/components/fileuploader/lang/eu.json
@@ -10,7 +10,7 @@
     "errorgettingimagealbum": "Errorea irudia bildumatik jasotzean.",
     "errormustbeonlinetoupload": "Online egon behar zara fitxategiak igotzeko.",
     "errornoapp": "Ez daukazu ekintza hau burutzeko app-ik instalatuta.",
-    "errorreadingfile": "Errorea \"{{$a}}\" fitxategia irakurtzean",
+    "errorreadingfile": "Errorea fitxategia irakurtzean.",
     "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
     "file": "Fitxategia",
     "fileuploaded": "Fitxategia ondo igo da.",
@@ -18,8 +18,8 @@
     "photoalbums": "Argazki-bildumak",
     "readingfile": "Fitxategia irakurtzen",
     "selectafile": "Aukeratu fitxategi bat",
-    "uploadafile": "Fitxategia igo",
-    "uploading": "Igotzen...",
+    "uploadafile": "Igo fitxategia",
+    "uploading": "Igotzen",
     "uploadingperc": "Igotzen: %{{$a}}",
     "video": "Bideoa"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/fr.json b/www/core/components/fileuploader/lang/fr.json
index 885ca1c15d7..68434825ec0 100644
--- a/www/core/components/fileuploader/lang/fr.json
+++ b/www/core/components/fileuploader/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Ajouter un fichier",
+    "addfiletext": "Ajouter le fichier",
     "audio": "Audio",
     "camera": "Caméra",
     "confirmuploadfile": "Vous allez déposer {{size}}. Voulez-vous vraiment continuer ?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erreur lors de la récupération de l'image de l'album.",
     "errormustbeonlinetoupload": "Vous devez être en ligne pour déposer des fichiers.",
     "errornoapp": "Vous n'avez pas d'app installée pour effectuer cette action.",
-    "errorreadingfile": "Erreur lors de la lecture du fichier « {{$a}} »",
+    "errorreadingfile": "Erreur de lecture du fichier.",
     "errorwhileuploading": "Une erreur est survenue lors du dépôt du fichier.",
     "file": "Fichier",
     "fileuploaded": "Le fichier a été déposé.",
-    "maxbytesfile": "La taille du fichier {{$a.file}} est trop grande. La taille maximale d'un fichier à déposer est de {{$a.size}}.",
+    "maxbytesfile": "Le fichier {{$a.file}} est trop gros. La taille maximale permise est de {{$a.size}}.",
     "photoalbums": "Albums de photos",
     "readingfile": "Lecture du fichier",
     "selectafile": "Choisir un fichier",
     "uploadafile": "Déposer un fichier",
-    "uploading": "En cours de dépôt...",
+    "uploading": "Envoi",
     "uploadingperc": "Dépôt en cours : {{$a}} %",
     "video": "Vidéo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/it.json b/www/core/components/fileuploader/lang/it.json
index de29e782b9a..a6eac6c923f 100644
--- a/www/core/components/fileuploader/lang/it.json
+++ b/www/core/components/fileuploader/lang/it.json
@@ -10,15 +10,15 @@
     "errorgettingimagealbum": "Si è verificato un errore durante la ricezione dell'immagine dall'album.",
     "errormustbeonlinetoupload": "Devi essere online per caricare file.",
     "errornoapp": "Non hai un'app per svolgere questa azione.",
-    "errorreadingfile": "Si è verificato un errore leggendo il file \"{{$a}}\"",
+    "errorreadingfile": "Si è verificato un errore durante la lettura del file.",
     "errorwhileuploading": "Si è verificato un errore durante il caricamento del file.",
     "file": "File",
     "fileuploaded": "File caricato correttamente",
-    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima che è possibile caricare è pari a {{$a.size}}.",
+    "maxbytesfile": "Il file {{$a.file}} è troppo grande. La dimensione massima consentita è {{$a.size}}.",
     "photoalbums": "Album fotografico",
     "readingfile": "Letture file in corso",
-    "uploadafile": "Carica un file sul server",
-    "uploading": "Caricamento in corso...",
+    "uploadafile": "Carica un file",
+    "uploading": "Caricamento in corso",
     "uploadingperc": "Caricamento: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/lt.json b/www/core/components/fileuploader/lang/lt.json
index 18054f3611c..30641efcee0 100644
--- a/www/core/components/fileuploader/lang/lt.json
+++ b/www/core/components/fileuploader/lang/lt.json
@@ -10,7 +10,7 @@
     "errorgettingimagealbum": "Klaida gaunant paveiksliuką iš albumo.",
     "errormustbeonlinetoupload": "Norint įkelti failą reikia prisijungti.",
     "errornoapp": "Jūs neturite programėlės šiam veiksmui atlikti.",
-    "errorreadingfile": "Įvyko klaida skaitant failą {{$a}}",
+    "errorreadingfile": "Klaida nuskaitant failą.",
     "errorwhileuploading": "Klaida įkeliant failą.",
     "file": "Failas",
     "fileuploaded": "Failas sėkmingai įkeltas.",
@@ -18,8 +18,8 @@
     "photoalbums": "Nuotraukų albumai",
     "readingfile": "Skaitomas failas",
     "selectafile": "Pasirinkite failą",
-    "uploadafile": "Įkelti failą",
-    "uploading": "Įkeliama...",
+    "uploadafile": "Įkelkite failą",
+    "uploading": "Įkeliama",
     "uploadingperc": "Įkeliama: {{$a}}%",
     "video": "Vaizdinė medžiaga"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/nl.json b/www/core/components/fileuploader/lang/nl.json
index 22b1139de3f..bded0b189f9 100644
--- a/www/core/components/fileuploader/lang/nl.json
+++ b/www/core/components/fileuploader/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "Bestand toevoegen",
+    "addfiletext": "Voeg bestand toe",
     "audio": "Audio",
     "camera": "Camera",
     "confirmuploadfile": "Je gaat {{size}} uploaden. Weet je zeker dat je wil verder gaan?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Fout bij het ophalen van een foto uit het album.",
     "errormustbeonlinetoupload": "Je moet online zijn om bestanden te kunnen uploaden.",
     "errornoapp": "Je hebt geen app geïnstalleerd om dit te kunnen doen.",
-    "errorreadingfile": "Fout bij het lezen van bestand \"{{$a}}\"",
+    "errorreadingfile": "Fout bij het lezen van het bestand.",
     "errorwhileuploading": "Er is een fout opgetreden tijdens het uploaden van het bestand.",
     "file": "Bestand",
     "fileuploaded": "Het uploaden van het bestand is gelukt.",
-    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale grootte die je kunt uploaden is {{$a.size}}.",
+    "maxbytesfile": "Het bestand {{$a.file}} is te groot. De maximale uploadgrootte is {{$a.size}}.",
     "photoalbums": "Foto-albums",
     "readingfile": "Bestand lezen",
     "selectafile": "Selecteer een bestand",
-    "uploadafile": "Upload een bestand",
-    "uploading": "Uploaden...",
+    "uploadafile": "Bestand uploaden",
+    "uploading": "Aan het uploaden",
     "uploadingperc": "Uploaden: {{$a}}%",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pt-br.json b/www/core/components/fileuploader/lang/pt-br.json
index 9f1d13d3546..f9a5cffca49 100644
--- a/www/core/components/fileuploader/lang/pt-br.json
+++ b/www/core/components/fileuploader/lang/pt-br.json
@@ -10,7 +10,7 @@
     "errorgettingimagealbum": "Erro ao pegar imagem a partir do álbum.",
     "errormustbeonlinetoupload": "Você precisa estar online para enviar arquivos.",
     "errornoapp": "Você não tem um aplicativo instalado para fazer essa ação.",
-    "errorreadingfile": "Erro na leitura do arquivo \"{{$a}}\"",
+    "errorreadingfile": "Erro ao ler arquivo.",
     "errorwhileuploading": "Houve um erro durante o envio do arquivo.",
     "file": "Arquivo",
     "fileuploaded": "Arquivo enviado",
@@ -18,8 +18,8 @@
     "photoalbums": "Álbuns de fotos",
     "readingfile": "Lendo arquivos",
     "selectafile": "Selecione um arquivo",
-    "uploadafile": "Enviar um arquivo",
-    "uploading": "Enviando...",
+    "uploadafile": "Enviando um arquivo",
+    "uploading": "Enviando",
     "uploadingperc": "Enviando: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/pt.json b/www/core/components/fileuploader/lang/pt.json
index a5c59630b58..69f03f7f005 100644
--- a/www/core/components/fileuploader/lang/pt.json
+++ b/www/core/components/fileuploader/lang/pt.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Erro ao obter imagem do álbum",
     "errormustbeonlinetoupload": "Necessita de estar online para enviar ficheiros",
     "errornoapp": "Não possui a aplicação móvel necessária para executar esta ação.",
-    "errorreadingfile": "Erro na leitura do ficheiro \"{{$a}}\"",
+    "errorreadingfile": "Erro ao ler o ficheiro",
     "errorwhileuploading": "Ocorreu um erro durante o carregamento do ficheiro.",
     "file": "Ficheiro",
     "fileuploaded": "Ficheiro carregado com sucesso",
-    "maxbytesfile": "O ficheiro {{$a.file}} é muito grande. Apenas pode carregar ficheiros com um tamanho máximo de {{$a.size}}.",
+    "maxbytesfile": "O ficheiro {{$a.file}} é muito grande. O tamanho máximo que pode carregar é de {{$a.size}}.",
     "photoalbums": "Álbuns de fotos",
     "readingfile": "A ler ficheiro",
     "selectafile": "Selecione um ficheiro",
-    "uploadafile": "Carregar ficheiro",
-    "uploading": "A enviar...",
+    "uploadafile": "Carregar um ficheiro",
+    "uploading": "A carregar",
     "uploadingperc": "A carrregar: {{$a}}%",
     "video": "Vídeo"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ro.json b/www/core/components/fileuploader/lang/ro.json
index 74a44c21314..934f0c9f150 100644
--- a/www/core/components/fileuploader/lang/ro.json
+++ b/www/core/components/fileuploader/lang/ro.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Eroare la obținerea imaginii din album.",
     "errormustbeonlinetoupload": "Pentru a putea încărca fișiere trebuie să fiți conectat la o rețea de date.",
     "errornoapp": "Nu aveți instalată o aplicație dedicată realizării acestei operațiuni.",
-    "errorreadingfile": "Eroare la citirea fişierului {{$a}}",
+    "errorreadingfile": "Eroare la citirea fișierului.",
     "errorwhileuploading": "A apărut o eroare în timpul încărcării fișierului.",
-    "file": "Fişier",
+    "file": "Fișier",
     "fileuploaded": "Fișierul a fost încărcat cu succes.",
     "maxbytesfile": "Fișierul {{$a.file}} este prea mare. Dimensiunea maximă pe care o puteți încărca este {{$a.size}}.",
     "photoalbums": "Albume foto",
     "readingfile": "Se citește fișierul",
-    "uploadafile": "Incarcă un fişier",
-    "uploading": "Se încarcă ...",
+    "uploadafile": "Încărcați un fișier",
+    "uploading": "Se încarcă",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ru.json b/www/core/components/fileuploader/lang/ru.json
index cc03f2bd598..50c3136d898 100644
--- a/www/core/components/fileuploader/lang/ru.json
+++ b/www/core/components/fileuploader/lang/ru.json
@@ -9,14 +9,14 @@
     "errorgettingimagealbum": "Ошибка получения изображения из альбома",
     "errormustbeonlinetoupload": "Вы должны быть на сайте, чтобы загружать файлы.",
     "errornoapp": "У Вас не установлено приложение для выполнения этого действия.",
-    "errorreadingfile": "Ошибка чтения файла «{{$a}}»",
+    "errorreadingfile": "Ошибка при чтении файла",
     "errorwhileuploading": "Произошла ошибка во время загрузки файла",
     "file": "Файл",
     "fileuploaded": "Файл загружен",
     "maxbytesfile": "Файл «{{$a.file}}» слишком большой. Максимальный размер файла, который Вы можете загрузить: {{$a.size}}.",
     "photoalbums": "Фотоальбомы",
     "readingfile": "Чтение файла",
-    "uploadafile": "Загрузить файл",
-    "uploading": "Идет загрузка файла на сервер...",
+    "uploadafile": "Загрузка файла",
+    "uploading": "Загрузка",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/sv.json b/www/core/components/fileuploader/lang/sv.json
index a5532128642..05123140c0e 100644
--- a/www/core/components/fileuploader/lang/sv.json
+++ b/www/core/components/fileuploader/lang/sv.json
@@ -8,13 +8,13 @@
     "errorgettingimagealbum": "Fel att få bild från album.",
     "errormustbeonlinetoupload": "Du måste vara online för att ladda upp filer.",
     "errornoapp": "Du behöver att ha en app installerat för att utföra den här åtgärden.",
-    "errorreadingfile": "Fel i samband med läsningen av filen  \"{{$a}}\"",
+    "errorreadingfile": "Fel vid läsning av fil.",
     "errorwhileuploading": "Ett fel uppstod under filöverföringen.",
     "file": "Fil",
     "fileuploaded": "Fil laddades upp",
     "photoalbums": "Fotoalbum",
     "readingfile": "Läsa fil",
     "uploadafile": "Ladda upp en fil",
-    "uploading": "Laddar upp...",
+    "uploading": "Laddar upp",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/tr.json b/www/core/components/fileuploader/lang/tr.json
index 021853f3c59..23b8bac2bd4 100644
--- a/www/core/components/fileuploader/lang/tr.json
+++ b/www/core/components/fileuploader/lang/tr.json
@@ -7,6 +7,6 @@
     "fileuploaded": "Dosya başarıyla yüklendi",
     "maxbytesfile": "Dosya {{$a.file}} çok büyük. Yüklediğiniz maksimum boyutu {{$a.size}} olduğunu.",
     "uploadafile": "Bir dosya yükle",
-    "uploading": "Yükleniyor...",
+    "uploading": "Yükleniyor",
     "video": "Video"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/uk.json b/www/core/components/fileuploader/lang/uk.json
index 80a1847ebb0..74292f36a85 100644
--- a/www/core/components/fileuploader/lang/uk.json
+++ b/www/core/components/fileuploader/lang/uk.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Помилка отримання зображення з альбома.",
     "errormustbeonlinetoupload": "Ви повинні бути в мережі для завантаження файлів.",
     "errornoapp": "У вас немає програми, встановленої для виконання цієї дії.",
-    "errorreadingfile": "Помилка при читанні файлу \"{{$a}}\"",
+    "errorreadingfile": "Помилка читання файлу.",
     "errorwhileuploading": "Помилка при завантаженні файлу.",
     "file": "Файл",
     "fileuploaded": "Файл був успішно завантажений.",
-    "maxbytesfile": "Файл {{$a.file}} занадто великий. Максимальний розмір, який ви можете завантажити - {{$a.size}}.",
+    "maxbytesfile": "Файл {{$a.file}} завеликий. Максимум {{$a.size}}.",
     "photoalbums": "Фото альбом.",
     "readingfile": "Читання файлу",
     "selectafile": "Виберіть файл",
     "uploadafile": "Завантажити файл",
-    "uploading": "Завантаження...",
+    "uploading": "Завантаження",
     "uploadingperc": "Завантаження: {{$a}}%",
     "video": "Відео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index b6a4a0631e0..db4fec8b382 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -9,6 +9,6 @@
     "maxbytesfile": "这个文件 {{$a.file}} 太大了。你可以上传的文件最大容量是 {{$a.size}}。",
     "readingfile": "Odczytywanie pliku",
     "uploadafile": "上传一个文件",
-    "uploading": "上传中...",
+    "uploading": "上传中",
     "video": "视频"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/zh-tw.json b/www/core/components/fileuploader/lang/zh-tw.json
index 8b8426718a0..3127c73c3a7 100644
--- a/www/core/components/fileuploader/lang/zh-tw.json
+++ b/www/core/components/fileuploader/lang/zh-tw.json
@@ -1,5 +1,5 @@
 {
-    "addfiletext": "添加檔案",
+    "addfiletext": "新增檔案",
     "audio": "聲音",
     "camera": "相機",
     "confirmuploadfile": "你已上傳 {{size}}. 你確定想繼續嗎?",
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "從相簿裡取得圖片發生錯誤.",
     "errormustbeonlinetoupload": "您必須上線才能上傳檔案.",
     "errornoapp": "您沒有安裝應用程式來執行此動作.",
-    "errorreadingfile": "讀取檔案 \"{{$a}}\" 時發生錯誤",
+    "errorreadingfile": "讀取檔案發生錯誤.",
     "errorwhileuploading": "檔案上傳時發生錯誤.",
     "file": "檔案",
     "fileuploaded": "檔案已上傳",
-    "maxbytesfile": "這檔案 {{$a.file}} 太大了。你可以上傳的檔案最大容量是 {{$a.size}}。",
+    "maxbytesfile": "這個檔案大小 {{$a.file}} 超過限制. 最大檔案大小只能上傳 {{$a.size}}.",
     "photoalbums": "相簿",
     "readingfile": "讀取檔案中",
     "selectafile": "選擇一個檔案",
     "uploadafile": "上傳一個檔案",
-    "uploading": "上傳.....",
+    "uploading": "上傳中",
     "uploadingperc": "上傳中: {{$a}}%",
     "video": "影片"
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/bg.json b/www/core/components/login/lang/bg.json
index 756d4f907f2..42351bce95a 100644
--- a/www/core/components/login/lang/bg.json
+++ b/www/core/components/login/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "authenticating": "Удостоверяване",
     "cancel": "Отказване",
-    "connect": "Свързване",
+    "connect": "Свързване!",
     "connecttomoodle": "Свързване към Moodle",
     "createaccount": "Създаване на моята регистрация",
     "createuserandpass": "Изберете Вашето име и парола",
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index 858326db16a..8b4a2c704cd 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -4,14 +4,14 @@
     "cancel": "Přerušit",
     "checksiteversion": "Zkontrolujte, zda web používá Moodle 2.4 nebo novější.",
     "confirmdeletesite": "Jste si jisti, že chcete smazat web {{sitename}}?",
-    "connect": "Spojit",
+    "connect": "Připojit!",
     "connecttomoodle": "Připojit k Moodle",
     "contactyouradministrator": "Pro další pomoc se obraťte na správce webu.",
     "contactyouradministratorissue": "Požádejte správce, prosím, aby zkontroloval následující problém: {{$a}}",
     "createaccount": "Vytvořit můj nový účet",
     "createuserandpass": "Vytvořit nové uživatelské jméno a heslo pro přihlášení",
     "credentialsdescription": "Pro přihlášení uveďte své uživatelské jméno a heslo.",
-    "emailconfirmsent": "<p>Na vaši adresu <b>{{$a}}</b> byl odeslán e-mail s jednoduchými pokyny k dokončení vaší registrace.</p><p>Narazíte-li na nějaké obtíže, spojte se se správcem těchto stránek.</p>",
+    "emailconfirmsent": "<p>E-mail by měl být zaslán na Vaši adresu na <b>{{$a}}</b></p><p>Obsahuje jednoduché instrukce pro dokončení registrace. </p><p>Pokud budou potíže pokračovat, obraťte se na správce webu. </p>",
     "emailnotmatch": "E-maily se neshodují",
     "enterthewordsabove": "Vložte výše uvedená slova",
     "erroraccesscontrolalloworigin": "Cross-Origin volání -  váš pokus o provedení byl odmítnut. Zkontrolujte prosím https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index c55337459f5..e88b1eeed67 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -11,7 +11,7 @@
     "createaccount": "Zugang anlegen (Registrierung)",
     "createuserandpass": "Wählen Sie Ihren Anmeldenamen und Ihr Kennwort",
     "credentialsdescription": "Geben Sie den Anmeldenamen und das Kennwort ein. ",
-    "emailconfirmsent": "<p>Um sicherzugehen, dass sich niemand unberechtigt über die von Ihnen angegebene E-Mail anmeldet, wird eine automatische Benachrichtigung an diese Adresse <b>{{$a}}</b> gesendet. Je nach Netzlast trifft sie sofort oder auch etwas später bei Ihnen ein.</p>\n<p>Die Benachrichtigung enthält eine Anleitung, wie Sie Ihre Registrierung bestätigen.\nDanach sind Sie auf dieser Moodle-Seite registriert und können sofort loslegen.</p>\n<p>Bei Problemen wenden Sie sich bitte an die Administrator/innen der Website.</p>",
+    "emailconfirmsent": "<p>In Kürze wird eine E-Mail an <b>{{$a}}</b> gesendet.</p><p>Sie finden eine einfache Anleitung, wie Sie die Registrierung abschließen. Bei Schwierigkeiten wenden Sie sich an den Administrator der Website.</p>",
     "emailnotmatch": "Die E-Mail-Adressen stimmen nicht überein.",
     "enterthewordsabove": "Geben Sie die gezeigten Wörter ein",
     "erroraccesscontrolalloworigin": "Der Cross-Origin Aufruf wurde zurückgewiesen. Weitere Informationen: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index eadd71ec584..cb0a2b6fbae 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -11,7 +11,7 @@
     "createaccount": "Δημιουργία του λογαριασμού μου",
     "createuserandpass": "Δημιουργία ενός νέου ονόματος χρήστη και κωδικού πρόσβασης για είσοδο στον δικτυακό τόπο",
     "credentialsdescription": "Δώστε το όνομα χρήστη και τον κωδικό πρόσβασής σας για να συνδεθείτε.",
-    "emailconfirmsent": "<p>Ένα μήνυμα ηλεκτρονικού ταχυδρομείου θα πρέπει να έχει σταλεί στη διεύθυνσή σας, <b>{{$a}}</b> </p>\n   <p>Περιέχει απλές οδηγίες για την ολοκλήρωση της εγγραφής σας. </p>\n   <p>Αν συνεχίζετε να αντιμετωπίζετε δυσκολίες, επικοινωνήστε με το διαχειριστή του δικτυακού τόπου. </p>",
+    "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
     "enterthewordsabove": "Enter the words above",
     "errordeletesite": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαγραφής του site. Δοκιμάστε ξανά αργότερα.",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index 672aaa06cb7..6bf776afc12 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Revisar que su sitio usa Moodle 2.4 o más reciente.",
     "confirmdeletesite": "¿Está Usted seguro de querer eliminar el sitio {{sitename}}?",
-    "connect": "Conectar",
+    "connect": "¡Conectar!",
     "connecttomoodle": "Conectar a Moodle",
     "contactyouradministrator": "Contacte a su administrador del sitio para más ayuda.",
     "contactyouradministratorissue": "Por favor, pídale al administrador que revise el siguiente problema: {{$a}}",
     "createaccount": "Crear mi cuenta nueva",
     "createuserandpass": "Elegir su nombre_de_usuario y contraseña",
     "credentialsdescription": "Por favor proporcione su nombre_de_usuario y contraseña para ingresar.",
-    "emailconfirmsent": "<p>Hemos enviado un correo electrónico a <b>{{$a}}</b></p>\n<p>En él encontrará instrucciones sencillas para concluir el proceso.</p>\n<p>Si tuviera alguna dificultad, contacte con el Administrador del Sistema.</p>",
+    "emailconfirmsent": "<p>Debería de haberse enviado un Email a su dirección en <b>{{$a}}</b></p><p>El Email contiene instrucciones sencillas para completar su registro.</p><p>Si continúa teniendo dificultades, contacte al administrador del sitio.</p>",
     "emailnotmatch": "No coinciden los Emails",
     "enterthewordsabove": "Escriba las palabras de arriba",
     "erroraccesscontrolalloworigin": "La llamada de Orígen Cruzado (''Cross-Origin'') que Usted está tratando de realizar ha sido rechazada. Por favor revise  https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index 742809c5a29..652d4db8fef 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -11,7 +11,7 @@
     "createaccount": "Crear cuenta",
     "createuserandpass": "Crear un nuevo usuario y contraseña para acceder al sistema",
     "credentialsdescription": "Introduzca su nombre se usuario y contraseña para entrar",
-    "emailconfirmsent": "<p>Hemos enviado un correo electrónico a <b>{{$a}}</b></p>\n<p>En él encontrará instrucciones sencillas para concluir el proceso.</p>\n<p>Si tuviera alguna dificultad, contacte con el Administrador del Sistema.</p>",
+    "emailconfirmsent": "<p>Se ha enviado un email a su dirección <b>{{$a}}</b></p><p>Contiene instrucciones para completar el proceso de registro.</p><p>Si continúa teniendo algún problema, contacte con el administrador de su sitio.</p>",
     "emailnotmatch": "Las direcciones de correo no coinciden.",
     "enterthewordsabove": "Escriba las palabras de arriba",
     "erroraccesscontrolalloworigin": "La llamada Cross-Origin que está intentando ha sido rechazada. Por favor visite https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/eu.json b/www/core/components/login/lang/eu.json
index f58e93e3469..61b1d730666 100644
--- a/www/core/components/login/lang/eu.json
+++ b/www/core/components/login/lang/eu.json
@@ -4,14 +4,14 @@
     "cancel": "Utzi",
     "checksiteversion": "Egiaztatu zure Moodle guneak 2.4 bertsioa edo aurreragokoa erabiltzen duela.",
     "confirmdeletesite": "Ziur zaude {{sitename}} gunea ezabatu nahi duzula?",
-    "connect": "Konektatu",
+    "connect": "Konektatu!",
     "connecttomoodle": "Moodle-ra konektatu",
     "contactyouradministrator": "Zure guneko kudeatzailearekin harremanetan jarri laguntza gehiagorako.",
     "contactyouradministratorissue": "Mesedez, eskatu zure kudeatzaileari hurrengo arazoa ikuskatu dezala: {{$a}}",
     "createaccount": "Nire kontu berria sortu",
     "createuserandpass": "Aukeratu zure erabiltzaile-izena eta pasahitza",
     "credentialsdescription": "Mesedez saioa hasteko zure sartu erabiltzaile eta pasahitza.",
-    "emailconfirmsent": "<p>E-posta mezu bat bidali dugu zure hurrengo helbide honetara: <b>{{$a}}</b></p>\n   <p>Izena ematen amaitzeko argibide erraz batzuk ditu.</p>\n   <p>Arazorik baduzu, jarri harremanetan kudeatzailearekin.</p>",
+    "emailconfirmsent": "<p>Zure <b>{{$a}}</b> helbidera mezu bat bidali da.</p><p>Zure erregistroa amaitzeko argibide erraz batzuk ditu.</p><p>Arazorik baduzu, jarri harremanetan kudeatzailearekin.</p>",
     "emailnotmatch": "E-posta helbideak ez datoz bat",
     "enterthewordsabove": "Idatzi goiko hitzak",
     "erroraccesscontrolalloworigin": "Saiatzen ari zaren Cross-Origin deia ez da onartu. Ikusi mesedez https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/fr.json b/www/core/components/login/lang/fr.json
index 2fed4a1d8f6..091525791f0 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -4,14 +4,14 @@
     "cancel": "Annuler",
     "checksiteversion": "Veuillez vérifier que votre site utilise Moodle 2.4 ou une version ultérieure.",
     "confirmdeletesite": "Voulez-vous vraiment supprimer la plateforme {{sitename}} ?",
-    "connect": "Connecter",
+    "connect": "Connecter !",
     "connecttomoodle": "Connexion à Moodle",
     "contactyouradministrator": "Veuillez contacter l'administrateur de la plateforme pour plus d'aide.",
     "contactyouradministratorissue": "Veuillez demander à l'administrateur de la plateforme de vérifier l'élément suivant : {{$a}}",
     "createaccount": "Créer mon compte",
     "createuserandpass": "Créer un compte",
     "credentialsdescription": "Veuillez fournir votre nom d'utilisateur et votre mot de passe pour vous connecter.",
-    "emailconfirmsent": "<p>Un message vous a été envoyé à l'adresse de courriel <strong>{{$a}}</strong>.</p><p>Il contient les instructions pour terminer votre enregistrement.</p><p>Si vous rencontrez des difficultés, veuillez contacter l'administrateur du site.</p>",
+    "emailconfirmsent": "<p>Un message vous a été envoyé par courriel à l'adresse <b>{{$a}}</b></p><p>Il contient des instructions vous permettant de terminer votre enregistrement.</p><p>En cas de difficulté, viellez contacter l'administrateur de la plateforme.</p>",
     "emailnotmatch": "Les adresses de courriel ne correspondent pas",
     "enterthewordsabove": "Tapez les mots ci-dessus",
     "erroraccesscontrolalloworigin": "La tentative d'appel « Cross-Origin » que vous avez effectuée a été rejetée. Veuillez consulter https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index 470c0717f7a..7cec597a221 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -2,7 +2,7 @@
     "authenticating": "Autenticazione in corso",
     "cancel": "Annulla",
     "confirmdeletesite": "Sei sicuro di eliminare il sito {{sitename}}?",
-    "connect": "Connetti",
+    "connect": "Collegati!",
     "connecttomoodle": "Collegati a Moodle",
     "createaccount": "Crea il mio nuovo account",
     "createuserandpass": "Scegli username e password",
diff --git a/www/core/components/login/lang/lt.json b/www/core/components/login/lang/lt.json
index a6d485ab57f..f5e96ef8b35 100644
--- a/www/core/components/login/lang/lt.json
+++ b/www/core/components/login/lang/lt.json
@@ -4,14 +4,14 @@
     "cancel": "Atšaukti",
     "checksiteversion": "Patikrintkite, ar svetainė naudoja Moodle 2.4. arba vėlesnę versiją.",
     "confirmdeletesite": "Ar tikrai norite ištrinti svetainę {{sitename}}?",
-    "connect": "Prijungti",
+    "connect": "Prisijungta!",
     "connecttomoodle": "Prisijungti prie Moodle",
     "contactyouradministrator": "Susisiekite su svetainės administratoriumi, jei reikalinga pagalba.",
     "contactyouradministratorissue": "Dėl šių klausimų prašome susisiekti su administratoriumi: {{$a}}",
     "createaccount": "Kurti naują mano paskyrą",
     "createuserandpass": "Pasirinkite savo naudotojo vardą ir slaptažodį",
     "credentialsdescription": "Prisijungti naudojant vartotojo vardą ir slaptažodį.",
-    "emailconfirmsent": "<p>El. laiškas išsiųstas jūsų adresu <b>{{$a}}</b></p>. <p>Jame pateikti paprasti nurodymai, kaip užbaigti registraciją.</p> <p>Jei iškils kokių sunkumų, kreipkitės į svetainės administratorių.</p>",
+    "emailconfirmsent": "<p>Informacija išsiųsta Jūsų nurodytu adresu <b>{{$a}}</b></p><p>Tai padės sėkmingai užbaigti registraciją.</p><p>Jeigu nepavyksta, susisiekite su svetainės administratoriumi.</p>",
     "emailnotmatch": "El. paštas nesutampa",
     "enterthewordsabove": "Įvesti aukščiau rodomus žodžius",
     "erroraccesscontrolalloworigin": "Kryžminis veiksmas buvo atmestas. Patikrinkite: https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index ea44187b169..c0cf35dece7 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -4,14 +4,14 @@
     "cancel": "Annuleer",
     "checksiteversion": "Controleer of je site minstens Moodle 2.4 of nieuwe gebruikt.",
     "confirmdeletesite": "Weet je zeker dat je de site {{sitename}} wil verwijderen?",
-    "connect": "Verbind",
+    "connect": "Verbinden!",
     "connecttomoodle": "Verbinden met Moodle",
     "contactyouradministrator": "Neem contact op met je site-beheerder voor meer hulp.",
     "contactyouradministratorissue": "Vraag aan je site-beheerder om volgend probleem te onderzoeken: {{$a}}",
     "createaccount": "Maak mijn nieuwe account aan",
     "createuserandpass": "Kies een gebruikersnaam en wachtwoord",
     "credentialsdescription": "Geef je gebruikersnaam en wachtwoord op om je aan te melden",
-    "emailconfirmsent": "<p>Als het goed is, is er een e-mail verzonden naar <b>{{$a}}</b></p>\n<p>Daarin staan eenvoudige instructies voor het voltooien van de registratie.</p>\n<p>Indien je moeilijkheden blijft ondervinden, neem dan contact op met je sitebeheerder.</p>",
+    "emailconfirmsent": "<p>Er zou een e-mail gestuurd moeten zijn naar jouw adres <b>{{$a}}</b></p><p>Het bericht bevat eenvoudige instructies om je registratie te voltooien.</p><p>Als je problemen blijft ondervinden, neem dan contact op met de sitebeheerder.</p>",
     "emailnotmatch": "E-mailadressen komen niet overeen",
     "enterthewordsabove": "Vul hier bovenstaande woorden in",
     "erroraccesscontrolalloworigin": "De Cross-Origin call die je probeerde uit te voeren,  werd geweigerd. Controleer https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index 03aec6bb0d8..e46b244e75a 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Verifique se seu site usa Moodle 2.4 ou superior.",
     "confirmdeletesite": "Você tem certeza que quer excluir o site {{sitename}}?",
-    "connect": "Conectar",
+    "connect": "Conectar!",
     "connecttomoodle": "Conectar ao moodle",
     "contactyouradministrator": "Contate o administrador do site para ter mais ajuda.",
     "contactyouradministratorissue": "Por favor, pergunte ao administrador para verificar o seguinte problema: {{$a}}",
     "createaccount": "Cadastrar este novo usuário",
     "createuserandpass": "Escolha seu usuário e senha",
     "credentialsdescription": "Por favor, informe seu nome de usuário e senha para efetuar o login",
-    "emailconfirmsent": "<p>Uma mensagem foi enviada para o seu endereço <b>{{$a}}</b></p><p>Esta mensagem contém instruções para completar a sua inscrição.</p><p>Se você encontrar dificuldades contate o administrador.</p>",
+    "emailconfirmsent": "<p>Um e-mail irá ser enviado para o seu endereço em <b>{{$a}}</b></p><p> Ele irá conter instruções fáceis para completar seu registro.</p><p>Se você continua a ter dificuldades, contate o administrador do site.</p>",
     "emailnotmatch": "Os e-mail não coincidem",
     "enterthewordsabove": "Digite as palavras acima",
     "erroraccesscontrolalloworigin": "A chamada de Cross-Origin que você está tentando executar foi rejeitada. Por favor, verifique https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index e8fd6b1e64a..80424147ec3 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -4,14 +4,14 @@
     "cancel": "Cancelar",
     "checksiteversion": "Verifique se seu site usa o Moodle 2.4 ou posterior.",
     "confirmdeletesite": "Tem a certeza que pretende remover o site {{sitename}}?",
-    "connect": "Ligar",
+    "connect": "Ligar!",
     "connecttomoodle": "Ligação ao Moodle",
     "contactyouradministrator": "Contacte o administrador do site para obter mais ajuda.",
     "contactyouradministratorissue": "Solicite ao administrador que verifique o seguinte problema: {{$a}}",
     "createaccount": "Criar a minha conta",
     "createuserandpass": "Escolha um nome de utilizador e senha",
     "credentialsdescription": "Por favor, digite o nome de utilizador e senha para entrar",
-    "emailconfirmsent": "<p>Acaba de ser enviada uma mensagem para o seu endereço <strong>{{$a}}</strong>, com instruções fáceis para completar a sua inscrição.</p><p>Se tiver alguma dificuldade em completar o registo, contacte o administrador do site.</p>",
+    "emailconfirmsent": "<P>Um e-mail deve ter sido enviado para o seu endereço <b>{{$a}}</b></p><p>. Contém instruções fáceis para concluir o seu registo. Se continuar a ter dificuldades, entre em contacto com o administrador do site.</p>",
     "emailnotmatch": "Os e-mails não coincidem",
     "enterthewordsabove": "Insira as palavras indicadas acima",
     "erroraccesscontrolalloworigin": "A acção de Cross-Origin que tentou executar foi rejeitada. Por favor, consulte mais informações em https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/ro.json b/www/core/components/login/lang/ro.json
index 950a4a91993..7eac7e64d7d 100644
--- a/www/core/components/login/lang/ro.json
+++ b/www/core/components/login/lang/ro.json
@@ -2,7 +2,7 @@
     "authenticating": "Autentificare",
     "cancel": "Anulează",
     "confirmdeletesite": "Sunteți sigur că doriți sa ștergeți siteul {{sitename}}?",
-    "connect": "Conectează",
+    "connect": "Conectare!",
     "connecttomoodle": "Conectare la Moodle",
     "createaccount": "Creează noul meu cont",
     "createuserandpass": "Alege un nume de utilizator şi o parolă",
diff --git a/www/core/components/login/lang/ru.json b/www/core/components/login/lang/ru.json
index e9f3b446b6d..cb180bd40f9 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -2,7 +2,7 @@
     "authenticating": "Аутентификация",
     "cancel": "Отмена",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
-    "connect": "Подключить",
+    "connect": "Подключено!",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index 5dddf79a343..b4041bf5a3d 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -2,7 +2,7 @@
     "authenticating": "Autentisera",
     "cancel": "Avbryt",
     "confirmdeletesite": "Är du säker på att du vill ta bort webbsidan {{sitename}}?",
-    "connect": "Anslut",
+    "connect": "Anslut!",
     "connecttomoodle": "Anslut till Moodle",
     "createaccount": "Skapa mitt nya konto",
     "createuserandpass": "Skapa ett nytt användarnamn och lösenord för att logga in med.",
diff --git a/www/core/components/login/lang/uk.json b/www/core/components/login/lang/uk.json
index a087e64b69e..eb2ed868ac3 100644
--- a/www/core/components/login/lang/uk.json
+++ b/www/core/components/login/lang/uk.json
@@ -4,14 +4,14 @@
     "cancel": "Скасувати",
     "checksiteversion": "Переконайтеся, що ваш сайт використовує Moodle 2.4 або більш пізньої версії.",
     "confirmdeletesite": "Видалити сайт {{sitename}}?",
-    "connect": "З’єднання",
+    "connect": "З'єднано!",
     "connecttomoodle": "Відключитись до Moodle",
     "contactyouradministrator": "Зверніться до адміністратора сайту для подальшої допомоги.",
     "contactyouradministratorissue": "Будь ласка, зверніться до адміністратора, щоб перевірити наступне питання: {{$a}}",
     "createaccount": "Створити запис",
     "createuserandpass": "Створити користувача для входу в систему",
     "credentialsdescription": "Будь ласка, введіть Ваше ім'я користувача та пароль, щоб увійти в систему.",
-    "emailconfirmsent": "На зазначену Вами адресу електронної пошти (<b>{{$a}}</b>) було відправлено листа з інструкціями із завершення реєстрації. Якщо у Вас з'являться проблеми з реєстрацією, зв'яжіться з адміністратором сайту.",
+    "emailconfirmsent": "<p>Лист повинен бути відправлений на Вашу електронну адресу в <b>{{$a}}</b></p><p>Він містить прості інструкції для завершення реєстрації.</p><p>Якщо ви продовжуєте зазнавати труднощів, зверніться до адміністратора сайту.</p>",
     "emailnotmatch": "Email не співпадають",
     "enterthewordsabove": "Введіть символи, які бачите вище",
     "erroraccesscontrolalloworigin": "Cross-Origin дзвінок Ви намагаєтеся виконати відхилено. Будь ласка, перевірте https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/zh-tw.json b/www/core/components/login/lang/zh-tw.json
index ec3a074bb16..bb2823d16de 100644
--- a/www/core/components/login/lang/zh-tw.json
+++ b/www/core/components/login/lang/zh-tw.json
@@ -4,14 +4,14 @@
     "cancel": "取消",
     "checksiteversion": "請檢查您的網站是否使用Moodle 2.4或更高版本.",
     "confirmdeletesite": "您確定要刪除網站{{sitename}}嗎?",
-    "connect": "連結",
+    "connect": "連線!",
     "connecttomoodle": "連上Moodle平台",
     "contactyouradministrator": "連絡你的網站管理員以取得更多的協助.",
     "contactyouradministratorissue": "請求管理員檢查以下問題: {{$ a}}",
     "createaccount": "建立我的新帳號",
     "createuserandpass": "請選擇您的帳號名稱和密碼",
     "credentialsdescription": "請提供您的帳號和密碼以便登入",
-    "emailconfirmsent": "<p>本系統已經送出電子郵件到 <b>{{$a}}</b></p>\n   <p>訊息內容包含如何完成註冊手續。</p>\n   <p>請閱覽您的私人郵件 按下確認連結後 便可登入本系統，若是有問題請和系統管理員連絡。</p>",
+    "emailconfirmsent": "<p>電子郵件應該已經寄到您的地址<b> {{$ a}} </ b> </ p> <p>它包含簡單的說明, 可以完成註冊. </ p> <p>如果, 您仍然有困難, 請與網站管理員聯繫.</ p>",
     "emailnotmatch": "電子郵件內容不符",
     "enterthewordsabove": "輸入您在上圖中看到的字元",
     "erroraccesscontrolalloworigin": "您嘗試執行的Cross-Origin呼叫已被拒絕. 請檢查https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/question/lang/ca.json b/www/core/components/question/lang/ca.json
index e1a03ea46a2..e31c6bbe967 100644
--- a/www/core/components/question/lang/ca.json
+++ b/www/core/components/question/lang/ca.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Cal puntuar",
-    "unknown": "Desconegut"
+    "unknown": "No es pot determinar l'estat"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/cs.json b/www/core/components/question/lang/cs.json
index 9ea18cca89c..bbc66f32d73 100644
--- a/www/core/components/question/lang/cs.json
+++ b/www/core/components/question/lang/cs.json
@@ -17,5 +17,5 @@
     "questionmessage": "Úloha {{$a}}: {{$b}}",
     "questionno": "Úloha {{$a}}",
     "requiresgrading": "Vyžaduje hodnocení",
-    "unknown": "Neznámý"
+    "unknown": "Stav nelze určit"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/de.json b/www/core/components/question/lang/de.json
index d9fdecb1c77..8e1a1ff2bc6 100644
--- a/www/core/components/question/lang/de.json
+++ b/www/core/components/question/lang/de.json
@@ -17,5 +17,5 @@
     "questionmessage": "Frage {{$a}}: {{$b}}",
     "questionno": "Frage {{$a}}",
     "requiresgrading": "Bewertung notwendig",
-    "unknown": "Unbekannt"
+    "unknown": "Der Status kann nicht bestimmt werden."
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/es-mx.json b/www/core/components/question/lang/es-mx.json
index b22d4a1edc0..c9008738aea 100644
--- a/www/core/components/question/lang/es-mx.json
+++ b/www/core/components/question/lang/es-mx.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere re-calificar",
-    "unknown": "Desconocido"
+    "unknown": "No se puede determinar el estatus"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/es.json b/www/core/components/question/lang/es.json
index 0449551dad0..d42f0b106e2 100644
--- a/www/core/components/question/lang/es.json
+++ b/www/core/components/question/lang/es.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pregunta {{$a}}: {{$b}}",
     "questionno": "Pregunta {{$a}}",
     "requiresgrading": "Requiere calificación",
-    "unknown": "Desconocido"
+    "unknown": "No se puede determinar el estado."
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/eu.json b/www/core/components/question/lang/eu.json
index c34ee004508..d47acec2068 100644
--- a/www/core/components/question/lang/eu.json
+++ b/www/core/components/question/lang/eu.json
@@ -17,5 +17,5 @@
     "questionmessage": "{{$a}} galdera: {{$b}}",
     "questionno": "{{$a}} galdera",
     "requiresgrading": "Kalifikazioa behar du",
-    "unknown": "Ezezaguna"
+    "unknown": "Ezin da egoera zehaztu"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/fr.json b/www/core/components/question/lang/fr.json
index 5ae8c00f527..53fa708cca6 100644
--- a/www/core/components/question/lang/fr.json
+++ b/www/core/components/question/lang/fr.json
@@ -17,5 +17,5 @@
     "questionmessage": "Question {{$a}} : {{$b}}",
     "questionno": "Question {{$a}}",
     "requiresgrading": "Nécessite évaluation",
-    "unknown": "Inconnu"
+    "unknown": "Impossible de déterminer l'état"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/it.json b/www/core/components/question/lang/it.json
index 528a77907a4..364ddbf3b09 100644
--- a/www/core/components/question/lang/it.json
+++ b/www/core/components/question/lang/it.json
@@ -13,5 +13,5 @@
     "questionmessage": "Domanda {{$a}}: {{$b}}",
     "questionno": "Domanda {{$a}}",
     "requiresgrading": "Richiede valutazione",
-    "unknown": "Sconosciuto"
+    "unknown": "Non è possibile determinare lo stato"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/lt.json b/www/core/components/question/lang/lt.json
index 0bb22bfebaf..4e598e09955 100644
--- a/www/core/components/question/lang/lt.json
+++ b/www/core/components/question/lang/lt.json
@@ -17,5 +17,5 @@
     "questionmessage": "Klausimas {{$a}}: {{$b}}",
     "questionno": "Klausimas {{$a}}",
     "requiresgrading": "Reikia vertinimo",
-    "unknown": "Nežinoma"
+    "unknown": "Negalima nustatyti statuso"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/nl.json b/www/core/components/question/lang/nl.json
index 098aa4c11ae..18382e872c6 100644
--- a/www/core/components/question/lang/nl.json
+++ b/www/core/components/question/lang/nl.json
@@ -17,5 +17,5 @@
     "questionmessage": "Vraag  {{$a}}: {{$b}}",
     "questionno": "Vraag {{$a}}",
     "requiresgrading": "Beoordelen vereist",
-    "unknown": "Onbekend"
+    "unknown": "Kan status niet bepalen"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/pt-br.json b/www/core/components/question/lang/pt-br.json
index 281e4738904..4f7986546d1 100644
--- a/www/core/components/question/lang/pt-br.json
+++ b/www/core/components/question/lang/pt-br.json
@@ -17,5 +17,5 @@
     "questionmessage": "Questão {{$a}}: {{$b}}",
     "questionno": "Questão {{$a}}",
     "requiresgrading": "Requer avaliação",
-    "unknown": "Desconhecido"
+    "unknown": "Não pôde determinar o estado"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/pt.json b/www/core/components/question/lang/pt.json
index 3b03d04306b..abe2dc4c3bd 100644
--- a/www/core/components/question/lang/pt.json
+++ b/www/core/components/question/lang/pt.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pergunta {{$a}}: {{$b}}",
     "questionno": "Pergunta {{$a}}",
     "requiresgrading": "Requer avaliação",
-    "unknown": "Desconhecido(a)"
+    "unknown": "Não é possível determinar o estado"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/uk.json b/www/core/components/question/lang/uk.json
index b15e6e8672b..3ddcb4cabc4 100644
--- a/www/core/components/question/lang/uk.json
+++ b/www/core/components/question/lang/uk.json
@@ -17,5 +17,5 @@
     "questionmessage": "Питання {{$a}}: {{$b}}",
     "questionno": "Питання {{$a}}",
     "requiresgrading": "Потрібно оцінити",
-    "unknown": "Невідоме"
+    "unknown": "Неможливо визначити статус"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/zh-tw.json b/www/core/components/question/lang/zh-tw.json
index 97eee458966..865bf62f773 100644
--- a/www/core/components/question/lang/zh-tw.json
+++ b/www/core/components/question/lang/zh-tw.json
@@ -17,5 +17,5 @@
     "questionmessage": "問題 {{$a}}: {{$b}}",
     "questionno": "試題{{$a}}",
     "requiresgrading": "需要計分",
-    "unknown": "未知的"
+    "unknown": "無法偵測到狀態"
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/ca.json b/www/core/components/sharedfiles/lang/ca.json
index af0c921ccaf..56cb9344708 100644
--- a/www/core/components/sharedfiles/lang/ca.json
+++ b/www/core/components/sharedfiles/lang/ca.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "No hi ha llocs desats. Afegiu un lloc per poder compartir fitxers amb l'aplicació.",
     "nosharedfiles": "No hi ha fitxers compartits desats en aquest lloc.",
     "nosharedfilestoupload": "No hi ha fitxers per pujar. Si voleu pujar un fitxer des d'un altra aplicació, busqueu-lo i feu clic al botó «Obre a».",
-    "rename": "Canvia el nom",
+    "rename": "Reanomena",
     "replace": "Reemplaça",
     "sharedfiles": "Fitxers compartits",
     "successstorefile": "S'ha desat el fitxer amb èxit. Podeu seleccionar-lo i pujar-lo als vostres fitxers privats o adjuntar-lo a alguna activitat."
diff --git a/www/core/components/sharedfiles/lang/cs.json b/www/core/components/sharedfiles/lang/cs.json
index 9a19d1f00b1..2cd35a9d0d4 100644
--- a/www/core/components/sharedfiles/lang/cs.json
+++ b/www/core/components/sharedfiles/lang/cs.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Na tomto webu nejsou uložené žádné sdílené soubory.",
     "nosharedfilestoupload": "Nemáte žádné nahrané soubory. Pokud chcete nahrát soubor z jiné aplikace, vyhledejte tento soubor a klikněte na tlačítko \"Otevřít v\".",
     "rename": "Přejmenovat",
-    "replace": "Přepsat",
+    "replace": "Nahradit",
     "sharedfiles": "Sdílené soubory",
     "successstorefile": "Soubor byl úspěšně uložen. Nyní můžete vybrat tento soubor a nahrát do vašich soukromých souborů nebo připojit ji do některých činností."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/de.json b/www/core/components/sharedfiles/lang/de.json
index 835afa40cf1..f682d1fb09c 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Keine freigegebenen Dateien für diese Website",
     "nosharedfilestoupload": "Sie haben noch keine Dateien zum Hochladen freigegeben. Wenn Sie eine Datei aus einer anderen App hochladen möchten, suchen Sie diese Datei und tippen Sie auf die Taste 'Öffnen in'.",
     "rename": "Umbenennen",
-    "replace": "Ersetze",
+    "replace": "Ersetzen",
     "sharedfiles": "Freigegebene Dateien",
     "successstorefile": "Die Datei wurde gespeichert. Sie können die Datei verwenden, um Sie in 'Meine Dateien' hochzuladen oder bei Aktivitäten anzuhängen."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/es-mx.json b/www/core/components/sharedfiles/lang/es-mx.json
index 6cd58565e88..d2732c41c62 100644
--- a/www/core/components/sharedfiles/lang/es-mx.json
+++ b/www/core/components/sharedfiles/lang/es-mx.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "No hay archivos compartidos en este sitio.",
     "nosharedfilestoupload": "Usted no tiene archivos para subir aquí. Si Usted desea subir un archivo desde otra App, localice ese archivo y haga click en el botón para 'Abrir en'.",
     "rename": "Renombrar",
-    "replace": "Reemplazar",
+    "replace": "Remplazar",
     "sharedfiles": "Archivos compartidos",
     "successstorefile": "Archivo almacenado exitosamente. Ahora Usted puede seleccionar a este archivo para subirlo a sus archivos privados, o anexarlo a algunas actividades."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/eu.json b/www/core/components/sharedfiles/lang/eu.json
index a56363d095e..cbbcb5eef04 100644
--- a/www/core/components/sharedfiles/lang/eu.json
+++ b/www/core/components/sharedfiles/lang/eu.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Ez dago artekatutako fitxategirik gune honetan.",
     "nosharedfilestoupload": "Ez duzu igotzeko fitxategirik hemen. Beste app baten bitartez fitxategia igo nahi baduzu, fitxategia aurkitu eta ondoren 'Ireki honekin' botoia sakatu.",
     "rename": "Berrizendatu",
-    "replace": "Ordezkatu",
+    "replace": "Ordeztu",
     "sharedfiles": "Partekatutako fitxategiak",
     "successstorefile": "Fitxategia ondo gorde da. Orain fitxategi hau aukeratu dezakezu zure gune pribatura igo edo jarduera bati eransteko."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/lt.json b/www/core/components/sharedfiles/lang/lt.json
index 2e51ae1b0ed..ef379410c73 100644
--- a/www/core/components/sharedfiles/lang/lt.json
+++ b/www/core/components/sharedfiles/lang/lt.json
@@ -4,8 +4,8 @@
     "errorreceivefilenosites": "Svetainės nėra saugomos. Prieš dalintis failu, pridėkite svetainės nuorodą.",
     "nosharedfiles": "Šioje svetainėje nepatalpinti bendro naudojimo failai.",
     "nosharedfilestoupload": "Nėra įkeltų failų. Jeigu norite juos įkelti iš kitos programėlės, pažymėkite ir paspauskite mygtuką „Atidaryti“.",
-    "rename": "Pervardyti",
-    "replace": "Keisti",
+    "rename": "Pervadinti",
+    "replace": "Pakeisti",
     "sharedfiles": "Bendro naudojimo failai",
     "successstorefile": "Failas sėkmingai patalpintas. Galite jį perkelti į savo asmeninį aplanką arba įkelti tam tikrosiose veiklose."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/pt.json b/www/core/components/sharedfiles/lang/pt.json
index 2200f805ed5..2c1daa00102 100644
--- a/www/core/components/sharedfiles/lang/pt.json
+++ b/www/core/components/sharedfiles/lang/pt.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "Não existem sites armazenados. Adicione um site antes de partilhar um ficheiro com a aplicação.",
     "nosharedfiles": "Não existem quaisquer ficheiros partilhados armazenados neste site.",
     "nosharedfilestoupload": "Não tem ficheiros para fazer o carregamento aqui. Se quiser carregar um ficheiro de outra aplicação, localize o ficheiro e clique no botão 'Abrir em'.",
-    "rename": "Renomear",
+    "rename": "Mudar nome",
     "replace": "Substituir",
     "sharedfiles": "Ficheiros partilhados",
     "successstorefile": "Ficheiro armazenado com sucesso. A partir de agora pode selecionar este ficheiro para enviá-lo para os seus ficheiros privados ou anexá-lo em algumas atividades."
diff --git a/www/core/components/sharedfiles/lang/uk.json b/www/core/components/sharedfiles/lang/uk.json
index f16da3ef448..6a2a6c61255 100644
--- a/www/core/components/sharedfiles/lang/uk.json
+++ b/www/core/components/sharedfiles/lang/uk.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Немає загальних файлів, що зберігаються на цьому сайті.",
     "nosharedfilestoupload": "У вас немає файлів для завантаження. Якщо ви хочете завантажити файл з іншої програми, знайдіть цей файл і натисніть кнопку «Відкрити\".",
     "rename": "Перейменувати",
-    "replace": "Замінити",
+    "replace": "Перемістити",
     "sharedfiles": "Розшарити файли",
     "successstorefile": "Файл успішно збережений. Тепер ви можете вибрати цей файл, щоб завантажити його на ваші особисті файли або прикріпити його в деяких видах діяльності."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/zh-tw.json b/www/core/components/sharedfiles/lang/zh-tw.json
index 29220712327..9e1a070f78b 100644
--- a/www/core/components/sharedfiles/lang/zh-tw.json
+++ b/www/core/components/sharedfiles/lang/zh-tw.json
@@ -4,8 +4,8 @@
     "errorreceivefilenosites": "沒有已存入的網站. 請在與應用程式共享文件之前新增網站.",
     "nosharedfiles": "此網站中沒有存入共享檔案.",
     "nosharedfilestoupload": "您沒有要在此處上傳的檔案. 如果您要從其他應用程式上傳檔案, 請找出該檔案, 然後按一下[開啟]按鈕.",
-    "rename": "改名",
-    "replace": "替換",
+    "rename": "重新命名",
+    "replace": "替代",
     "sharedfiles": "分享檔案",
     "successstorefile": "檔案已成功儲存.現在您可以選擇檔案進行上傳到您的個人檔案."
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/ca.json b/www/core/components/sidemenu/lang/ca.json
index d2e61d92b7b..321730fec1f 100644
--- a/www/core/components/sidemenu/lang/ca.json
+++ b/www/core/components/sidemenu/lang/ca.json
@@ -2,7 +2,7 @@
     "appsettings": "Paràmetres de l'aplicació",
     "changesite": "Canvia de lloc",
     "help": "Ajuda",
-    "logout": "Surt",
+    "logout": "Desconnecta",
     "mycourses": "Els meus cursos",
     "togglemenu": "Canvia menú",
     "website": "Lloc web"
diff --git a/www/core/components/sidemenu/lang/cs.json b/www/core/components/sidemenu/lang/cs.json
index f93a604f4a4..7de80a2bb9b 100644
--- a/www/core/components/sidemenu/lang/cs.json
+++ b/www/core/components/sidemenu/lang/cs.json
@@ -2,7 +2,7 @@
     "appsettings": "Nastavení aplikace",
     "changesite": "Změnit stránky",
     "help": "Nápověda",
-    "logout": "Odhlásit se",
+    "logout": "Odhlásit",
     "mycourses": "Moje kurzy",
     "togglemenu": "Přepnout nabídku",
     "website": "Webová stránka"
diff --git a/www/core/components/sidemenu/lang/de.json b/www/core/components/sidemenu/lang/de.json
index e700f3ddc90..0ed4e3b6221 100644
--- a/www/core/components/sidemenu/lang/de.json
+++ b/www/core/components/sidemenu/lang/de.json
@@ -2,7 +2,7 @@
     "appsettings": "Einstellungen",
     "changesite": "Website wechseln",
     "help": "Hilfe",
-    "logout": "Logout",
+    "logout": "Abmelden",
     "mycourses": "Meine Kurse",
     "togglemenu": "Menü umschalten",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/es-mx.json b/www/core/components/sidemenu/lang/es-mx.json
index fb36a0997ba..e2079172694 100644
--- a/www/core/components/sidemenu/lang/es-mx.json
+++ b/www/core/components/sidemenu/lang/es-mx.json
@@ -2,7 +2,7 @@
     "appsettings": "Configuraciones del App",
     "changesite": "Cambiar sitio",
     "help": "Ayuda",
-    "logout": "Salir",
+    "logout": "Salir del sitio",
     "mycourses": "Mis cursos",
     "togglemenu": "Alternar menú",
     "website": "Página web"
diff --git a/www/core/components/sidemenu/lang/fa.json b/www/core/components/sidemenu/lang/fa.json
index 34bdcc7018f..7d4184a0d64 100644
--- a/www/core/components/sidemenu/lang/fa.json
+++ b/www/core/components/sidemenu/lang/fa.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "تنظیمات برنامه",
     "changesite": "خروج",
-    "help": "راهنمایی",
-    "logout": "خروج از سایت",
+    "help": "راهنما",
+    "logout": "خروج",
     "mycourses": "درس‌های من",
     "website": "پایگاه اینترنتی"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/it.json b/www/core/components/sidemenu/lang/it.json
index 9e368b1ef6f..b86c1c18949 100644
--- a/www/core/components/sidemenu/lang/it.json
+++ b/www/core/components/sidemenu/lang/it.json
@@ -2,7 +2,7 @@
     "appsettings": "Impostazioni app",
     "changesite": "Cambia sito",
     "help": "Aiuto",
-    "logout": "Esci",
+    "logout": "Logout",
     "mycourses": "I miei corsi",
     "togglemenu": "Attiva/disattiva menu",
     "website": "Sito web"
diff --git a/www/core/components/sidemenu/lang/lt.json b/www/core/components/sidemenu/lang/lt.json
index 4f3f66ea9f3..0f0cb015df4 100644
--- a/www/core/components/sidemenu/lang/lt.json
+++ b/www/core/components/sidemenu/lang/lt.json
@@ -1,9 +1,9 @@
 {
     "appsettings": "Programėlės nustatymai",
     "changesite": "Pakeisti svetainę",
-    "help": "Žinynas",
-    "logout": "Atsijungti",
-    "mycourses": "Mano kursai",
+    "help": "Pagalba",
+    "logout": "Pakeisti svetainę",
+    "mycourses": "Mano mokymo programos",
     "togglemenu": "Perjungti",
     "website": "Interneto svetainė"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/nl.json b/www/core/components/sidemenu/lang/nl.json
index 8a50f17cc30..d06e70ec6d8 100644
--- a/www/core/components/sidemenu/lang/nl.json
+++ b/www/core/components/sidemenu/lang/nl.json
@@ -2,7 +2,7 @@
     "appsettings": "App instellingen",
     "changesite": "Naar andere site",
     "help": "Help",
-    "logout": "Log uit",
+    "logout": "Afmelden",
     "mycourses": "Mijn cursussen",
     "togglemenu": "Menu schakelen",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/pt.json b/www/core/components/sidemenu/lang/pt.json
index 479ba8e4f48..f972c409f74 100644
--- a/www/core/components/sidemenu/lang/pt.json
+++ b/www/core/components/sidemenu/lang/pt.json
@@ -2,7 +2,7 @@
     "appsettings": "Configurações da aplicação",
     "changesite": "Mudar de site",
     "help": "Ajuda",
-    "logout": "Sair",
+    "logout": "Terminar sessão",
     "mycourses": "As minhas disciplinas",
     "togglemenu": "Alternar menu",
     "website": "Site"
diff --git a/www/core/components/sidemenu/lang/ro.json b/www/core/components/sidemenu/lang/ro.json
index 1c5f17d9e01..ea5d1d106e0 100644
--- a/www/core/components/sidemenu/lang/ro.json
+++ b/www/core/components/sidemenu/lang/ro.json
@@ -2,7 +2,7 @@
     "appsettings": "Setările aplicației",
     "changesite": "Schimbați siteul",
     "help": "Ajutor",
-    "logout": "Ieşire",
+    "logout": "Schimbați siteul",
     "mycourses": "Cursurile mele",
     "togglemenu": "Meniul pentru comutare",
     "website": "Website"
diff --git a/www/core/components/sidemenu/lang/ru.json b/www/core/components/sidemenu/lang/ru.json
index 541a10d3285..668c559c737 100644
--- a/www/core/components/sidemenu/lang/ru.json
+++ b/www/core/components/sidemenu/lang/ru.json
@@ -1,7 +1,7 @@
 {
     "appsettings": "Настройки приложения",
     "changesite": "Выход",
-    "help": "Справка",
+    "help": "Помощь",
     "logout": "Выход",
     "mycourses": "Мои курсы",
     "website": "Сайт"
diff --git a/www/core/components/sidemenu/lang/tr.json b/www/core/components/sidemenu/lang/tr.json
index ace500a4db3..57800da7afa 100644
--- a/www/core/components/sidemenu/lang/tr.json
+++ b/www/core/components/sidemenu/lang/tr.json
@@ -1,7 +1,7 @@
 {
     "changesite": "Çıkış",
     "help": "Yardım",
-    "logout": "Çıkış yap",
+    "logout": "Çıkış",
     "mycourses": "Derslerim",
     "website": "Websitesi"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/uk.json b/www/core/components/sidemenu/lang/uk.json
index 21328fec9b5..2442161b325 100644
--- a/www/core/components/sidemenu/lang/uk.json
+++ b/www/core/components/sidemenu/lang/uk.json
@@ -2,7 +2,7 @@
     "appsettings": "Налаштування додатку",
     "changesite": "Змінити сайт",
     "help": "Допомога",
-    "logout": "Вихід",
+    "logout": "Вийти",
     "mycourses": "Мої курси",
     "togglemenu": "Перемикання меню",
     "website": "Веб-сайт"
diff --git a/www/core/components/sidemenu/lang/zh-cn.json b/www/core/components/sidemenu/lang/zh-cn.json
index 045f90c1630..ea6cd6e91e1 100644
--- a/www/core/components/sidemenu/lang/zh-cn.json
+++ b/www/core/components/sidemenu/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "changesite": "注销",
     "help": "帮助",
-    "logout": "退出",
+    "logout": "注销",
     "mycourses": "我的课程",
     "website": "网站"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/zh-tw.json b/www/core/components/sidemenu/lang/zh-tw.json
index e157aab2b0e..412f2616441 100644
--- a/www/core/components/sidemenu/lang/zh-tw.json
+++ b/www/core/components/sidemenu/lang/zh-tw.json
@@ -1,8 +1,8 @@
 {
     "appsettings": "應用程式設定",
     "changesite": "更換網站",
-    "help": "輔助說明",
-    "logout": "登出",
+    "help": "協助",
+    "logout": "更換網站",
     "mycourses": "我的課程",
     "togglemenu": "切換功能選單",
     "website": "網站"
diff --git a/www/core/components/user/lang/bg.json b/www/core/components/user/lang/bg.json
index 70d1e6ca5f5..6141ac3935c 100644
--- a/www/core/components/user/lang/bg.json
+++ b/www/core/components/user/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "address": "Адрес",
     "city": "Град/село",
-    "contact": "Контакт",
+    "contact": "Контакти",
     "country": "Държава",
     "description": "Въвеждащ текст",
     "details": "Подробности",
@@ -11,12 +11,12 @@
     "emailagain": "Имейл адрес (отново)",
     "firstname": "Име",
     "interests": "Интереси",
-    "invaliduser": "Невалиден потребител",
+    "invaliduser": "Невалиден потребител.",
     "lastname": "Фамилия",
     "manager": "Мениждър",
     "newpicture": "Нова снимка",
     "phone1": "Телефон",
-    "phone2": "Мобилен телефон",
+    "phone2": "Мобилен",
     "roles": "Роли",
     "student": "Студент",
     "teacher": "Не-редактиращ учител",
diff --git a/www/core/components/user/lang/ca.json b/www/core/components/user/lang/ca.json
index bd8812b1d47..94d4813e716 100644
--- a/www/core/components/user/lang/ca.json
+++ b/www/core/components/user/lang/ca.json
@@ -4,7 +4,7 @@
     "contact": "Contacte",
     "country": "País",
     "description": "Descripció",
-    "details": "Detalls de seguiment",
+    "details": "Detalls",
     "detailsnotavailable": "No tens accés als detalls d'aquest usuari.",
     "editingteacher": "Professor",
     "email": "Adreça electrònica",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Nova imatge",
     "phone1": "Telèfon",
-    "phone2": "Telèfon mòbil",
+    "phone2": "Mòbil",
     "roles": "Rols",
     "sendemail": "Correu-e",
     "student": "Estudiant",
diff --git a/www/core/components/user/lang/cs.json b/www/core/components/user/lang/cs.json
index 4b3ef8e2de8..c0978326868 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Země",
     "description": "Úvodní text",
-    "details": "Podrobnosti o průchodu",
+    "details": "Detaily",
     "detailsnotavailable": "Podrobnosti o tomto uživateli nejsou k dispozici.",
     "editingteacher": "Učitel",
     "email": "E-mailová adresa",
     "emailagain": "E-mail (znovu)",
     "firstname": "Křestní jméno",
     "interests": "Zájmy",
-    "invaliduser": "Neplatný uživatel",
+    "invaliduser": "Neplatný uživatel.",
     "lastname": "Příjmení",
     "manager": "Manažer",
     "newpicture": "Nový obrázek",
     "phone1": "Telefon",
-    "phone2": "Mobilní telefon",
+    "phone2": "Mobil",
     "roles": "Role",
     "sendemail": "Email",
     "student": "Student",
diff --git a/www/core/components/user/lang/de.json b/www/core/components/user/lang/de.json
index 61b5c8461a3..aaf288443b2 100644
--- a/www/core/components/user/lang/de.json
+++ b/www/core/components/user/lang/de.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Beschreibung",
-    "details": "Trackingdetails",
+    "details": "Details",
     "detailsnotavailable": "Die Nutzerdetails zu dieser Person sind für Sie nicht verfügbar.",
     "editingteacher": "Trainer/in",
     "email": "E-Mail-Adresse",
     "emailagain": "E-Mail (wiederholen)",
     "firstname": "Vorname",
     "interests": "Persönliche Interessen",
-    "invaliduser": "Ungültige Nutzer/in",
+    "invaliduser": "Nutzer/in ungültig",
     "lastname": "Nachname",
     "manager": "Manager/in",
     "newpicture": "Neues Foto",
     "phone1": "Telefon",
-    "phone2": "Mobiltelefon",
+    "phone2": "Mobil",
     "roles": "Rollen",
     "sendemail": "E-Mail",
     "student": "Teilnehmer/in",
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index fd683749142..f04ee84c54c 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -4,19 +4,19 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descripción -",
-    "details": "Detalles del seguimiento",
+    "details": "Detalles",
     "detailsnotavailable": "Los detalles de este usuario no están disponibles para Usted.",
     "editingteacher": "Profesor",
     "email": "Dirección Email",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
-    "invaliduser": "Usuario no válido",
+    "invaliduser": "Usuario inválido.",
     "lastname": "Apellido(s)",
     "manager": "Mánager",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Teléfono móvil",
+    "phone2": "Móvil",
     "roles": "Roles",
     "sendemail": "Email",
     "student": "Estudiante",
diff --git a/www/core/components/user/lang/es.json b/www/core/components/user/lang/es.json
index cad461766a5..a57e113d551 100644
--- a/www/core/components/user/lang/es.json
+++ b/www/core/components/user/lang/es.json
@@ -4,7 +4,7 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descripción",
-    "details": "Detalles del rastreo SCO",
+    "details": "Detalles",
     "detailsnotavailable": "No tiene acceso a los detalles de este usuario.",
     "editingteacher": "Profesor",
     "email": "Dirección de correo",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Teléfono móvil",
+    "phone2": "Móvil",
     "roles": "Roles",
     "student": "Estudiante",
     "teacher": "Profesor sin permiso de edición",
diff --git a/www/core/components/user/lang/eu.json b/www/core/components/user/lang/eu.json
index fdd67c44d0c..346af5911ec 100644
--- a/www/core/components/user/lang/eu.json
+++ b/www/core/components/user/lang/eu.json
@@ -4,19 +4,19 @@
     "contact": "Kontaktua",
     "country": "Herria",
     "description": "Deskribapena",
-    "details": "Pistaren zehaztasunak",
+    "details": "Xehetasunak",
     "detailsnotavailable": "Erabiltzaile honen xehetasunak ez daude zuretzat eskuragarri",
     "editingteacher": "Irakaslea",
     "email": "E-posta helbidea",
     "emailagain": "E-posta (berriro)",
     "firstname": "Izena",
     "interests": "Interesguneak",
-    "invaliduser": "Erabiltzaile baliogabea",
+    "invaliduser": "Erabiltzailea ez da zuzena.",
     "lastname": "Deitura",
     "manager": "Kudeatzailea",
     "newpicture": "Irudi berria",
     "phone1": "Telefonoa",
-    "phone2": "Telefono mugikorra",
+    "phone2": "Sakelekoa",
     "roles": "Rolak",
     "sendemail": "E-posta",
     "student": "Ikaslea",
diff --git a/www/core/components/user/lang/fa.json b/www/core/components/user/lang/fa.json
index 01b490f7522..23611349635 100644
--- a/www/core/components/user/lang/fa.json
+++ b/www/core/components/user/lang/fa.json
@@ -1,10 +1,10 @@
 {
     "address": "آدرس",
     "city": "شهر/شهرک",
-    "contact": "تماس",
+    "contact": "مخاطب",
     "country": "کشور",
     "description": "توضیح تکلیف",
-    "details": "دنبال کردن جزئیات",
+    "details": "جزئیات",
     "email": "آدرس پست الکترونیک",
     "emailagain": "پست الکترونیک (دوباره)",
     "firstname": "نام",
@@ -13,7 +13,7 @@
     "lastname": "نام خانوادگی",
     "newpicture": "عکس جدید",
     "phone1": "تلفن",
-    "phone2": "تلفن همراه",
+    "phone2": "همراه",
     "roles": "نقش‌ها",
     "student": "شاگرد",
     "viewprofile": "مشاهدهٔ صفحهٔ مشخصات فردی",
diff --git a/www/core/components/user/lang/fr.json b/www/core/components/user/lang/fr.json
index 02e9c95bc9f..75c5058d2bf 100644
--- a/www/core/components/user/lang/fr.json
+++ b/www/core/components/user/lang/fr.json
@@ -4,22 +4,22 @@
     "contact": "Contact",
     "country": "Pays",
     "description": "Description",
-    "details": "Détails du parcours",
+    "details": "Détails",
     "detailsnotavailable": "Vous n'avez pas accès aux informations de cet utilisateur.",
     "editingteacher": "Enseignant",
     "email": "Adresse de courriel",
     "emailagain": "Courriel (confirmation)",
     "firstname": "Prénom",
     "interests": "Centres d'intérêt",
-    "invaliduser": "Utilisateur non valide",
+    "invaliduser": "Utilisateur non valide.",
     "lastname": "Nom",
     "manager": "Gestionnaire",
     "newpicture": "Nouvelle image",
     "phone1": "Téléphone",
-    "phone2": "Téléphone mobile",
+    "phone2": "Mobile",
     "roles": "Rôles",
     "sendemail": "Courriel",
-    "student": "Participants",
+    "student": "Étudiant",
     "teacher": "Enseignant non-éditeur",
     "viewprofile": "Consulter le profil",
     "webpage": "Page Web"
diff --git a/www/core/components/user/lang/it.json b/www/core/components/user/lang/it.json
index d580362d257..bdbd8e8b4ec 100644
--- a/www/core/components/user/lang/it.json
+++ b/www/core/components/user/lang/it.json
@@ -4,19 +4,19 @@
     "contact": "Contatto",
     "country": "Nazione",
     "description": "Commento",
-    "details": "Dettagli tracciamento",
+    "details": "Dettagli",
     "detailsnotavailable": "Non puoi visualizzare i dettagli di questo utente.",
     "editingteacher": "Docente",
     "email": "Indirizzo email",
     "emailagain": "Indirizzo email (ripeti)",
     "firstname": "Nome",
     "interests": "Interessi",
-    "invaliduser": "Utente non valido",
+    "invaliduser": "Utente non valido.",
     "lastname": "Cognome",
     "manager": "Manager",
     "newpicture": "Nuova immagine",
     "phone1": "Telefono",
-    "phone2": "Cellulare",
+    "phone2": "Mobile",
     "roles": "Ruoli",
     "student": "Studente",
     "teacher": "Docente non editor",
diff --git a/www/core/components/user/lang/lt.json b/www/core/components/user/lang/lt.json
index 0e625c59317..794c12956b1 100644
--- a/www/core/components/user/lang/lt.json
+++ b/www/core/components/user/lang/lt.json
@@ -1,22 +1,22 @@
 {
     "address": "Adresas",
     "city": "Miestas / miestelis",
-    "contact": "Kontaktas",
+    "contact": "Kontaktai",
     "country": "Šalis",
     "description": "Aprašas",
-    "details": "Sekimo išsami informacija",
+    "details": "Detalės",
     "detailsnotavailable": "Šio vartotojo duomenys jums nepasiekiami.",
     "editingteacher": "Dėstytojas",
     "email": "El. pašto adresas",
     "emailagain": "El. paštas (dar kartą)",
     "firstname": "Vardas",
     "interests": "Pomėgiai",
-    "invaliduser": "Klaidingas naudotojas",
+    "invaliduser": "Netinkamas vartotojas.",
     "lastname": "Pavardė",
     "manager": "Valdytojas",
     "newpicture": "Naujas paveikslėlis",
     "phone1": "Telefonas",
-    "phone2": "Mobilusis telefonas",
+    "phone2": "Mobilus",
     "roles": "Vaidmenys",
     "student": "Besimokantysis",
     "teacher": "Neredaguojantis mokytojas",
diff --git a/www/core/components/user/lang/nl.json b/www/core/components/user/lang/nl.json
index 243c341d715..9e9b2898795 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -4,14 +4,14 @@
     "contact": "Contact",
     "country": "Land",
     "description": "Inleidende tekst",
-    "details": "SCO opvolgdetails",
+    "details": "Details",
     "detailsnotavailable": "Je kunt de details voor deze gebruiker niet bekijken.",
     "editingteacher": "Leraar",
     "email": "E-mailadres",
     "emailagain": "E-mail (nogmaals)",
     "firstname": "Voornaam",
     "interests": "Interesses",
-    "invaliduser": "Ongeldige gebruiker",
+    "invaliduser": "Ongeldige gebuiker",
     "lastname": "Achternaam",
     "manager": "Manager",
     "newpicture": "Nieuwe foto",
diff --git a/www/core/components/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index 60e6f639acc..7ab46d831a7 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -4,19 +4,19 @@
     "contact": "Contato",
     "country": "País",
     "description": "Texto do link",
-    "details": "Detalhes do registro",
+    "details": "Detalhes",
     "detailsnotavailable": "Os detalhes desse usuário não estão disponíveis para você.",
     "editingteacher": "Professor",
     "email": "Endereço de email",
     "emailagain": "Confirmar endereço de e-mail",
     "firstname": "Nome",
     "interests": "Interesses",
-    "invaliduser": "Usuário inválido",
+    "invaliduser": "Usuário inválido.",
     "lastname": "Sobrenome",
     "manager": "Gerente",
     "newpicture": "Nova imagem",
     "phone1": "Fone",
-    "phone2": "Telefone celular",
+    "phone2": "Celular",
     "roles": "Papéis",
     "sendemail": "Email",
     "student": "Estudante",
diff --git a/www/core/components/user/lang/pt.json b/www/core/components/user/lang/pt.json
index 15d388181e8..dd9f07a9a2c 100644
--- a/www/core/components/user/lang/pt.json
+++ b/www/core/components/user/lang/pt.json
@@ -4,7 +4,7 @@
     "contact": "Contacto",
     "country": "País",
     "description": "Descrição",
-    "details": "Detalhe do percurso",
+    "details": "Detalhes",
     "detailsnotavailable": "Não tem acesso aos detalhes deste utilizador.",
     "editingteacher": "Professor",
     "email": "Endereço de e-mail",
diff --git a/www/core/components/user/lang/ro.json b/www/core/components/user/lang/ro.json
index 540dd4306bd..5e7dcf168ec 100644
--- a/www/core/components/user/lang/ro.json
+++ b/www/core/components/user/lang/ro.json
@@ -4,21 +4,21 @@
     "contact": "Contact",
     "country": "Ţara",
     "description": "Text introductiv",
-    "details": "Detalii înregistrare activitate",
+    "details": "Detalii",
     "detailsnotavailable": "Detaliile acestui utilizator nu vă sunt disponibile.",
     "editingteacher": "Profesor",
     "email": "Adresă email",
     "emailagain": "Email (reintroduceţi)",
     "firstname": "Prenume",
     "interests": "Interese",
-    "invaliduser": "Utilizator incorect",
+    "invaliduser": "Utilizator necunoscut.",
     "lastname": "Nume",
     "manager": "Manager",
     "newpicture": "Imagine nouă",
     "phone1": "Telefon",
     "phone2": "Mobil",
     "roles": "Roluri",
-    "student": "Cursant",
+    "student": "Student",
     "teacher": "Profesor asistent",
     "viewprofile": "Vezi profilul",
     "webpage": "Pagină Web"
diff --git a/www/core/components/user/lang/ru.json b/www/core/components/user/lang/ru.json
index ad86bd38324..33bd27a775e 100644
--- a/www/core/components/user/lang/ru.json
+++ b/www/core/components/user/lang/ru.json
@@ -4,19 +4,19 @@
     "contact": "Контакты",
     "country": "Страна",
     "description": "Вступление",
-    "details": "Подробный отчет",
+    "details": "Подробнее",
     "detailsnotavailable": "Вам не доступны подробности этого пользователя",
     "editingteacher": "Учитель",
     "email": "Адрес электронной почты",
     "emailagain": "Адрес электронной почты (еще раз)",
     "firstname": "Имя",
     "interests": "Интересы",
-    "invaliduser": "Некорректный пользователь",
+    "invaliduser": "Неправильный пользователь",
     "lastname": "Фамилия",
     "manager": "Управляющий",
     "newpicture": "Новое изображение",
     "phone1": "Телефон",
-    "phone2": "Мобильный телефон",
+    "phone2": "Мобильный",
     "roles": "Роли",
     "student": "Студент",
     "teacher": "Учитель без права редактирования (ассистент)",
diff --git a/www/core/components/user/lang/sv.json b/www/core/components/user/lang/sv.json
index 466d0309625..19f29bc1d7f 100644
--- a/www/core/components/user/lang/sv.json
+++ b/www/core/components/user/lang/sv.json
@@ -4,21 +4,21 @@
     "contact": "Kontakt",
     "country": "Land",
     "description": "Introduktion",
-    "details": "Detaljerad SCO spårning",
+    "details": "Detaljer",
     "detailsnotavailable": "Detaljerna till denna användare är inte tillgängliga för dig.",
     "editingteacher": "Lärare",
     "email": "E-postadress",
     "emailagain": "E-post (igen)",
     "firstname": "Förnamn",
     "interests": "Intressen",
-    "invaliduser": "Ogiltig användare",
+    "invaliduser": "Ogiltig användare.",
     "lastname": "Efternamn",
     "manager": "Manager",
     "newpicture": "Ny bild",
     "phone1": "Telefon",
-    "phone2": "Mobiltelefon",
+    "phone2": "Mobil",
     "roles": "Roller",
-    "student": "Student/elev/deltagare/lärande",
+    "student": "Student",
     "teacher": "Icke editerande lärare",
     "viewprofile": "Visa profil",
     "webpage": "Webbsida"
diff --git a/www/core/components/user/lang/tr.json b/www/core/components/user/lang/tr.json
index 389fb99d0de..7dc39a77eef 100644
--- a/www/core/components/user/lang/tr.json
+++ b/www/core/components/user/lang/tr.json
@@ -1,21 +1,21 @@
 {
     "address": "Adres",
     "city": "Şehir",
-    "contact": "İletişim",
+    "contact": "Kişi",
     "country": "Ülke",
     "description": "Tanıtım metni",
-    "details": "İzleme ayrıntıları",
+    "details": "Detaylar",
     "editingteacher": "Öğretmen",
     "email": "E-posta adresi",
     "emailagain": "E-posta (tekrar)",
     "firstname": "Adı",
     "interests": "İlgi alanları",
-    "invaliduser": "Geçersiz kullanıcı",
+    "invaliduser": "Geçersiz kullanıcı.",
     "lastname": "Soyadı",
     "manager": "Yönetici",
     "newpicture": "Yeni resim",
     "phone1": "Telefon",
-    "phone2": "Cep telefonu",
+    "phone2": "Mobil",
     "roles": "Roller",
     "student": "Öğrenci",
     "teacher": "Düzenleme yetkisi olmayan öğretmen",
diff --git a/www/core/components/user/lang/uk.json b/www/core/components/user/lang/uk.json
index 9cfc5311ef1..4e829c3f276 100644
--- a/www/core/components/user/lang/uk.json
+++ b/www/core/components/user/lang/uk.json
@@ -4,19 +4,19 @@
     "contact": "Контакт",
     "country": "Країна",
     "description": "Текст вступу",
-    "details": "Деталі запису",
+    "details": "Деталі",
     "detailsnotavailable": "Деталі цього користувача вам не доступні",
     "editingteacher": "Вчитель",
     "email": "Електронна пошта",
     "emailagain": "Електронна пошта (повторно)",
     "firstname": "Ім'я",
     "interests": "Інтереси",
-    "invaliduser": "Неправильний користувач",
+    "invaliduser": "Невірний користувач.",
     "lastname": "Прізвище",
     "manager": "Менеджер",
     "newpicture": "Новий малюнок",
     "phone1": "Телефон",
-    "phone2": "Мобільний телефон",
+    "phone2": "Mobile",
     "roles": "Ролі",
     "sendemail": "Email",
     "student": "Студент",
diff --git a/www/core/components/user/lang/zh-cn.json b/www/core/components/user/lang/zh-cn.json
index 5e224eca7d5..a1d49df5eb3 100644
--- a/www/core/components/user/lang/zh-cn.json
+++ b/www/core/components/user/lang/zh-cn.json
@@ -1,10 +1,10 @@
 {
     "address": "地址",
     "city": "市/县",
-    "contact": "联系",
+    "contact": "联系方式",
     "country": "国家和地区",
     "description": "简要描述",
-    "details": "查看详情",
+    "details": "详情",
     "email": "Email地址",
     "emailagain": "Email (重复)",
     "firstname": "名",
diff --git a/www/core/components/user/lang/zh-tw.json b/www/core/components/user/lang/zh-tw.json
index dff84e77a2e..d54e254418d 100644
--- a/www/core/components/user/lang/zh-tw.json
+++ b/www/core/components/user/lang/zh-tw.json
@@ -1,22 +1,22 @@
 {
     "address": "地址",
     "city": "縣/市",
-    "contact": "聯絡",
+    "contact": "連絡人",
     "country": "國家",
     "description": "簡介文字",
-    "details": "SCO 追蹤細節",
+    "details": "明細",
     "detailsnotavailable": "這個使用者的詳細資料無法提供給您",
     "editingteacher": "教師",
     "email": "電子郵件信箱",
     "emailagain": "電子郵件(再次確認)",
     "firstname": "名字",
     "interests": "興趣",
-    "invaliduser": "無效的用戶",
+    "invaliduser": "無效的使用者",
     "lastname": "姓氏",
     "manager": "管理者",
     "newpicture": "新照片",
     "phone1": "電話",
-    "phone2": "手機",
+    "phone2": "行動",
     "roles": "角色",
     "student": "學生",
     "teacher": "非編輯中的教師",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 3d186eee90f..3c4bb775308 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -40,7 +40,7 @@
     "days": "dies",
     "decsep": ",",
     "delete": "Suprimeix",
-    "deleting": "S'està suprimint",
+    "deleting": "S'està eliminant",
     "description": "Descripció",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imatge",
     "imageviewer": "Visor d'imatges",
-    "info": "Info",
+    "info": "Informació",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Darrera modificació",
@@ -134,7 +134,7 @@
     "nocomments": "Sense comentaris",
     "nograde": "Sense qualificació",
     "none": "Cap",
-    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya, però no està disponible cap pàgina on pugueu canviar-la. Contacteu amb l'administració del vostre Moodle.",
+    "nopasswordchangeforced": "No podeu continuar sense canviar la contrasenya.",
     "nopermissions": "Actualment no teniu permisos per a fer això ({{$a}})",
     "noresults": "Sense resultats",
     "notapplicable": "n/a",
@@ -160,7 +160,7 @@
     "retry": "Reintenta",
     "save": "Desa",
     "search": "Cerca",
-    "searching": "Cerca a",
+    "searching": "S'està cercant",
     "searchresults": "Resultats de la cerca",
     "sec": "segon",
     "secs": "segons",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index d30a5c8340f..188f6b3b442 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -17,9 +17,9 @@
     "comments": "Váš komentář",
     "commentscount": "Komentáře ({{$a}})",
     "commentsnotworking": "Komentáře nemohou být obnoveny",
-    "completion-alt-auto-fail": "Splněno: {{$a}} (nebylo dosaženo požadované známky)",
+    "completion-alt-auto-fail": "Splněno: {{$a}} ; ale nedosáhli se potřebné známky",
     "completion-alt-auto-n": "Nesplněno: {{$a}}",
-    "completion-alt-auto-pass": "Splněno: {{$a}} (bylo dosaženo požadované známky)",
+    "completion-alt-auto-pass": "Splněno: {{$a}}; dosáhli se potřebné známky",
     "completion-alt-auto-y": "Splněno: {{$a}}",
     "completion-alt-manual-n": "Nesplněno: {{$a}}. Výběrem označíte jako splněné.",
     "completion-alt-manual-y": "Splněno: {{$a}}. Výběrem označíte jako nesplněné.",
@@ -135,7 +135,7 @@
     "nocomments": "Bez komentářů",
     "nograde": "Bez známky",
     "none": "Žádný",
-    "nopasswordchangeforced": "Nemůžete pokračovat dál bez změny hesla, ale stránka pro jeho změnu není k dispozici. Kontaktujte správce Vašeho eLearningu Moodle.",
+    "nopasswordchangeforced": "Nelze pokračovat beze změny hesla.",
     "nopermissions": "Je mi líto, ale momentálně nemáte oprávnění vykonat tuto operaci ({{$a}})",
     "noresults": "Bez výsledků",
     "notapplicable": "n/a",
@@ -143,7 +143,7 @@
     "notsent": "Neodesláno",
     "now": "nyní",
     "numwords": "{{$a}} slov",
-    "offline": "Nejsou požadovány odpovědi online",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Zde klikněte pro zobrazení obrázku v plné velikosti",
     "openinbrowser": "Otevřít v prohlížeči",
@@ -161,13 +161,13 @@
     "retry": "Opakovat",
     "save": "Uložit",
     "search": "Hledat",
-    "searching": "Hledat v",
+    "searching": "Hledání",
     "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
     "send": "odeslat",
-    "sending": "Odesílání",
+    "sending": "Odeslání",
     "serverconnection": "Chyba spojení se serverem",
     "show": "Zobrazit",
     "showmore": "Zobrazit více...",
@@ -181,7 +181,7 @@
     "sorry": "Promiňte...",
     "start": "Začátek",
     "submit": "Odeslat",
-    "success": "Úspěch",
+    "success": "Úspěch!",
     "tablet": "Tablet",
     "teachers": "Učitelé",
     "thereisdatatosync": "K dispozici jsou v  offline režimu {{$a}}, které mají být synchronizovány.",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 74997868d55..211871a577b 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -17,12 +17,12 @@
     "comments": "Ihr Feedback",
     "commentscount": "Kommentare ({{$a}})",
     "commentsnotworking": "Kommentare können nicht mehr abgerufen werden",
-    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (ohne Erfolg)",
+    "completion-alt-auto-fail": "Abgeschlossen: {{$a}} (Anforderung nicht erreicht)",
     "completion-alt-auto-n": "Nicht abgeschlossen: {{$a}}",
-    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (mit Erfolg)",
+    "completion-alt-auto-pass": "Abgeschlossen: {{$a}} (Anforderung erreicht)",
     "completion-alt-auto-y": "Abgeschlossen: {{$a}}",
-    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}} - mit Auswahl als abgeschlossen markieren",
-    "completion-alt-manual-y": "Abgeschlossen: {{$a}}  - mit Auswahl als nicht abgeschlossen markieren",
+    "completion-alt-manual-n": "Nicht abgeschlossen: {{$a}}. Auswählen, um als abgeschlossen zu markieren.",
+    "completion-alt-manual-y": "Abgeschlossen: {{$a}}. Auswählen, um als nicht abgeschlossen zu markieren.",
     "confirmcanceledit": "Möchten Sie diese Seite wirklich verlassen? Alle Änderungen gehen verloren!",
     "confirmdeletefile": "Möchten Sie diese Datei wirklich löschen?",
     "confirmloss": "Möchten Sie wirklich alle Änderungen verlieren?",
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Standard ({{$a}})",
     "delete": "Löschen",
-    "deleting": "Lösche",
+    "deleting": "Löschen ...",
     "description": "Beschreibung",
     "dfdaymonthyear": "DD.MM.YYYY",
     "dfdayweekmonth": "ddd, D. MMM",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Bild",
     "imageviewer": "Bildanzeige",
-    "info": "Informationen",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Zuletzt geändert",
@@ -135,7 +135,7 @@
     "nocomments": "Noch keine Kommentare",
     "nograde": "Keine Bewertung",
     "none": "Keine",
-    "nopasswordchangeforced": "Ohne die Änderung des Kennworts können Sie nicht weitermachen. Falls die Seite zur Änderung des Kennworts nicht verfügbar ist, wenden Sie sich an den Administrator der Website.",
+    "nopasswordchangeforced": "Sie können nicht weitermachen, ohne das Kennwort zu ändern.",
     "nopermissions": "Sie besitzen derzeit keine Rechte, dies zu tun ({{$a}}).",
     "noresults": "Keine Ergebnisse",
     "notapplicable": "n/a",
@@ -143,7 +143,7 @@
     "notsent": "Nicht gesendet",
     "now": "jetzt",
     "numwords": "{{$a}} Wörter",
-    "offline": "Keine Online-Abgabe notwendig",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Tippen Sie hier, um das Bild in voller Größe anzuzeigen",
     "openinbrowser": "Im Browser öffnen",
@@ -161,13 +161,13 @@
     "retry": "Neu versuchen",
     "save": "Speichern",
     "search": "Suchen",
-    "searching": "Suche in",
+    "searching": "Suchen",
     "searchresults": "Suchergebnisse",
     "sec": "Sekunde",
     "secs": "Sekunden",
     "seemoredetail": "Hier klicken, um weitere Details sichtbar zu machen",
     "send": "Senden",
-    "sending": "wird gesendet",
+    "sending": "Senden",
     "serverconnection": "Fehler beim Aufbau der Verbindung zum Server",
     "show": "Anzeigen",
     "showmore": "Mehr anzeigen ...",
@@ -181,7 +181,7 @@
     "sorry": "Sorry ...",
     "start": "Start",
     "submit": "Speichern",
-    "success": "erfolgreich",
+    "success": "Fertig!",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
     "thereisdatatosync": "Die Offline-Daten {{$a}} müssen synchronisiert werden.",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index ed684b755a5..01ffb362a04 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -17,12 +17,12 @@
     "comments": "Τα σχόλιά σας",
     "commentscount": "Σχόλια ({{$a}})",
     "commentsnotworking": "Τα σχόλια δεν μπορούν να ανακτηθούν",
-    "completion-alt-auto-fail": "Ολοκληρωμένο (με βαθμό κάτω της βάσης)",
-    "completion-alt-auto-n": "Μη ολοκληρωμένο",
-    "completion-alt-auto-pass": "Ολοκληρωμένο (με βαθμό άνω της βάσης)",
-    "completion-alt-auto-y": "Ολοκληρωμένο",
-    "completion-alt-manual-n": "Μη ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως ολοκληρωμένο",
-    "completion-alt-manual-y": "Ολοκληρωμένο, επιλέξτε για να το σημειώσετε ως μη ολοκληρωμένο",
+    "completion-alt-auto-fail": "Ολοκληρώθηκε: {{$a}} (δεν πετύχατε βαθμό πρόσβασης)",
+    "completion-alt-auto-n": "Δεν ολοκληρώθηκε: {{$a}}",
+    "completion-alt-auto-pass": "Ολοκληρώθηκε: {{$a}} (πετύχατε βαθμό πρόσβασης)",
+    "completion-alt-auto-y": "Ολοκληρώθηκε: {{$a}}",
+    "completion-alt-manual-n": "Δεν ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως ολοκληρωμένο.",
+    "completion-alt-manual-y": "Ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως μη ολοκληρωμένο.",
     "confirmcanceledit": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν τη σελίδα; Όλες οι αλλαγές θα χαθούν.",
     "confirmdeletefile": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmopeninbrowser": "Θέλετε να το ανοίξετε στο πρόγραμμα περιήγησης;",
@@ -38,7 +38,7 @@
     "days": "ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
-    "deleting": "Διαγραφή",
+    "deleting": "Γίνεται διαγραφή",
     "description": "Κείμενο εισαγωγής",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -127,7 +127,7 @@
     "nocomments": "Χωρίς Σχόλια",
     "nograde": "Δεν υπάρχει βαθμός",
     "none": "Κανένας",
-    "nopasswordchangeforced": "You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.",
+    "nopasswordchangeforced": "Δεν μπορείτε να προχωρήσετε χωρίς να αλλάξετε τον κωδικό πρόσβασής σας.",
     "nopermissions": "Συγνώμη, αλλά επί του τρεχόντως δεν έχετε το δικαίωμα να το κάνετε αυτό ({{$a}})",
     "noresults": "Κανένα αποτέλεσμα",
     "notapplicable": "n/a",
@@ -135,7 +135,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Δεν απαιτείται διαδικτυακή υποβολή",
+    "offline": "Εκτός σύνδεσης",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -153,13 +153,13 @@
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
     "search": "Αναζήτηση",
-    "searching": "Αναζήτηση σε",
+    "searching": "Αναζήτηση",
     "searchresults": "Αποτελέσματα αναζήτησης",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
-    "sending": "Αποστέλλεται",
+    "sending": "Αποστολή",
     "show": "Προβολή",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
@@ -172,7 +172,7 @@
     "sorry": "Λυπάμαι...",
     "start": "Αρχή",
     "submit": "Υποβολή",
-    "success": "Επιτυχία",
+    "success": "Επιτυχία!",
     "tablet": "Tablet",
     "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index 907091ece1d..0ed3bc93f3a 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -17,12 +17,12 @@
     "comments": "Sus comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
-    "completion-alt-auto-fail": "Finalizado {{$a}} (no obtuvo calificación de aprobado)",
-    "completion-alt-auto-n": "Sin finalizar: {{$a}}",
-    "completion-alt-auto-pass": "Finalizado: {{$a}} (obtuvo calificación de aprobado)",
-    "completion-alt-auto-y": "Finalizado: {{$a}}",
-    "completion-alt-manual-n": "No finalizado; {{$a}}. Seleccione para marcar como finalizado",
-    "completion-alt-manual-y": "Finalizado; {{$a}} seleccione para marcar como no finalizado",
+    "completion-alt-auto-fail": "Completado: {{$a}} (no obtuvo calificación aprobatoria)",
+    "completion-alt-auto-n": "No completado: {{$a}}",
+    "completion-alt-auto-pass": "Completado: {{$a}} (obtuvo calificación aprobatoria)",
+    "completion-alt-auto-y": "Completado: {{$a}}",
+    "completion-alt-manual-n": "No-completado: {{$a}}. Seleccionar mara marcarlo como completado.",
+    "completion-alt-manual-y": "Completado: {{$a}}. Seleccionar mara marcarlo como no completado.",
     "confirmcanceledit": "¿Está Usted seguro de que quiere abandonar esta página? Se perderán todos los cambios.",
     "confirmdeletefile": "¿Está seguro de que desea eliminar este archivo?",
     "confirmloss": "¿Está Usted seguro? Se perderán todos los cambios.",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagen",
     "imageviewer": "Visor de imágenes",
-    "info": "Info",
+    "info": "Información",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Última modificación",
@@ -135,7 +135,7 @@
     "nocomments": "No hay comentarios",
     "nograde": "No hay calificación",
     "none": "Ninguno/a",
-    "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
+    "nopasswordchangeforced": "Usted no puede proceder sin cambiar su contraseña.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
     "noresults": "No hay resultados",
     "notapplicable": "no disp.",
@@ -143,8 +143,8 @@
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "No se requieren entregas online",
-    "online": "En línea",
+    "offline": "Fuera-de-línea",
+    "online": "En-línea",
     "openfullimage": "Hacer click aquí para mostrar la imagen a tamaño completo",
     "openinbrowser": "Abrir en navegador",
     "othergroups": "Otros grupos",
@@ -161,7 +161,7 @@
     "retry": "Reintentar",
     "save": "Guardar",
     "search": "Buscar",
-    "searching": "Buscar en",
+    "searching": "Buscando",
     "searchresults": "Resultados de la búsqueda",
     "sec": "segundos",
     "secs": "segundos",
@@ -181,7 +181,7 @@
     "sorry": "Lo siento...",
     "start": "Inicio",
     "submit": "Enviar",
-    "success": "Éxito",
+    "success": "¡Éxito!",
     "tablet": "Tableta",
     "teachers": "Profesores",
     "thereisdatatosync": "Existen {{$a}} fuera-de-línea para ser sincronizados/as.",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index f42a455440f..708e85381b9 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -38,7 +38,7 @@
     "days": "días",
     "decsep": ",",
     "delete": "Eliminar",
-    "deleting": "Eliminando",
+    "deleting": "Borrando",
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -81,7 +81,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagen",
     "imageviewer": "Visor de imágenes",
-    "info": "Info",
+    "info": "Información",
     "ios": "iOs",
     "labelsep": ":",
     "lastmodified": "Última modificación",
@@ -128,7 +128,7 @@
     "nocomments": "No hay comentarios",
     "nograde": "No hay calificación",
     "none": "Ninguna",
-    "nopasswordchangeforced": "No puede seguir sin cambiar su contraseña, sin embargo no existe ninguna página disponible para cambiarla. Por favor contacte a su administrador de Moodle.",
+    "nopasswordchangeforced": "No puede continuar sin cambiar su contraseña.",
     "nopermissions": "Lo sentimos, pero por el momento no tiene permiso para hacer eso ({{$a}})",
     "noresults": "No hay resultados",
     "notapplicable": "n/a",
@@ -137,7 +137,7 @@
     "now": "ahora",
     "numwords": "{{$a}} palabras",
     "offline": "No se requieren entregas online",
-    "online": "En línea",
+    "online": "Conectado",
     "openfullimage": "Haga clic aquí para ver la imagen a tamaño completo",
     "openinbrowser": "Abrir en el navegador",
     "othergroups": "Otros grupos",
@@ -154,7 +154,7 @@
     "retry": "Reintentar",
     "save": "Guardar",
     "search": "Buscar",
-    "searching": "Buscar en",
+    "searching": "Buscando",
     "searchresults": "Resultados de la búsqueda",
     "sec": "segundos",
     "secs": "segundos",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index a3b5191472f..d7c8d3dd593 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -134,7 +134,7 @@
     "nocomments": "Iruzkinik ez",
     "nograde": "Kalifikaziorik ez",
     "none": "Bat ere ez",
-    "nopasswordchangeforced": "Ezin duzu aurrera egin pasahitza aldatu gabe, baina ez dago aldatzeko inongo orririk. Mesedez, jarri harremanetan zure Moodle Kudeatzailearekin.",
+    "nopasswordchangeforced": "Ezin duzu jarraitu zure pasahitza aldatu gabe.",
     "nopermissions": "Sentitzen dugu, baina oraingoz ez duzu hori egiteko baimenik ({{$a}})",
     "noresults": "Emaitzarik ez",
     "notapplicable": "ezin da aplikatu",
@@ -142,8 +142,8 @@
     "notsent": "Bidali gabea",
     "now": "orain",
     "numwords": "{{$a}} hitz",
-    "offline": "Ez du online bidalketarik eskatzen",
-    "online": "Online",
+    "offline": "Lineaz kanpo",
+    "online": "On-line",
     "openfullimage": "Klik egin hemen irudia jatorrizko tamainan ikusteko",
     "openinbrowser": "Ireki nabigatzailean",
     "othergroups": "Beste taldeak",
@@ -160,7 +160,7 @@
     "retry": "Berriz saiatu",
     "save": "Gorde",
     "search": "Bilatu",
-    "searching": "Bilatu hemen",
+    "searching": "Bilatzen",
     "searchresults": "Bilaketaren emaitzak",
     "sec": "seg",
     "secs": "segundu",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index 27c57b9a5af..6b59ade573d 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Défaut ({{$a}})",
     "delete": "Supprimer",
-    "deleting": "En cours de suppression",
+    "deleting": "Suppression",
     "description": "Description",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -85,7 +85,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Image",
     "imageviewer": "Lecteur d'images",
-    "info": "Information",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": "&nbsp;",
     "lastmodified": "Modifié le",
@@ -132,7 +132,7 @@
     "nocomments": "Aucun commentaire",
     "nograde": "Pas de note",
     "none": "Aucun",
-    "nopasswordchangeforced": "Vous ne pouvez pas continuer sans modifier votre mot de passe. Cependant, il n'y a aucun moyen disponible de le modifier. Veuillez contacter l'administrateur de votre Moodle.",
+    "nopasswordchangeforced": "Vous ne pouvez pas continuer ans changer votre mot de passe.",
     "nopermissions": "Désolé, vous n'avez actuellement pas les droits d'accès requis pour effectuer ceci ({{$a}})",
     "noresults": "Aucun résultat",
     "notapplicable": "n/a",
@@ -140,7 +140,7 @@
     "notsent": "Pas envoyé",
     "now": "maintenant",
     "numwords": "{{$a}} mots",
-    "offline": "Aucun travail à remettre requis",
+    "offline": "Hors ligne",
     "online": "En ligne",
     "openfullimage": "Cliquer ici pour afficher l'image en pleine grandeur",
     "openinbrowser": "Ouvrir dans le navigateur",
@@ -158,7 +158,7 @@
     "retry": "Essayer à nouveau",
     "save": "Enregistrer",
     "search": "Rechercher",
-    "searching": "Rechercher dans",
+    "searching": "Recherche",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
@@ -178,7 +178,7 @@
     "sorry": "Désolé...",
     "start": "Début",
     "submit": "Envoyer",
-    "success": "Succès",
+    "success": "Succès !",
     "tablet": "Tablette",
     "teachers": "Enseignants",
     "thereisdatatosync": "Il y a des {{$a}} locales à synchroniser",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index d117184e686..fca22023ba9 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -16,12 +16,12 @@
     "comments": "I tuoi commenti",
     "commentscount": "Commenti: ({{$a}})",
     "commentsnotworking": "Non è possibile scaricare i commenti",
-    "completion-alt-auto-fail": "Completato: {{$a}} (senza raggiungere la sufficienza)",
-    "completion-alt-auto-n": "Non completata: {{$a}}",
-    "completion-alt-auto-pass": "Completato: {{$a}} (raggiunta la sufficienza)",
-    "completion-alt-auto-y": "Completata: {{$a}}",
-    "completion-alt-manual-n": "Non completata: {{$a}}.\nSelezionarla per spuntarla come completata.",
-    "completion-alt-manual-y": "Completata: {{$a}}. Selezionarla per spuntarla come non completata.",
+    "completion-alt-auto-fail": "Completato: {{$a}} (senza la sufficienza)",
+    "completion-alt-auto-n": "Non completato: {{$a}}",
+    "completion-alt-auto-pass": "Completato: {{$a}} (con la sufficienza)",
+    "completion-alt-auto-y": "Completato: {{$a}}",
+    "completion-alt-manual-n": "Non completato: {{$a}}. Selezionare per indicare come completato.",
+    "completion-alt-manual-y": "Completato: {{$a}}. Selezionare per indicare come non completato.",
     "confirmcanceledit": "Sei sicuro di abbandonare questa pagina? Tutte le modifiche saranno perdute.",
     "confirmdeletefile": "Sei sicuro di voler eliminare questo file?",
     "confirmopeninbrowser": "Desideri aprirlo nel browser?",
@@ -35,7 +35,7 @@
     "decsep": ",",
     "defaultvalue": "Default ({{$a}})",
     "delete": "Elimina",
-    "deleting": "Eliminazione",
+    "deleting": "Eliminazione in corso",
     "description": "Commento",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -124,7 +124,7 @@
     "notice": "Nota",
     "now": "adesso",
     "numwords": "{{$a}} parole",
-    "offline": "Questo compito non richiede consegne online",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Click per visualizare l'immagine a dimensioni reali",
     "openinbrowser": "Apri nel browser",
@@ -141,13 +141,13 @@
     "retry": "Riprova",
     "save": "Salva",
     "search": "Cerca",
-    "searching": "Cerca in",
+    "searching": "Ricerca in corso",
     "searchresults": "Risultati della ricerca",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
     "send": "invia",
-    "sending": "Invio in corso",
+    "sending": "Invio in c orso",
     "serverconnection": "Si è verificato un errore durante la connessione al server",
     "show": "Visualizza",
     "site": "Sito",
@@ -158,7 +158,7 @@
     "sizetb": "TB",
     "start": "Apertura",
     "submit": "Invia",
-    "success": "Operazione eseguita con successo",
+    "success": "OK!",
     "tablet": "Tablet",
     "teachers": "Docenti",
     "time": "Data/Ora",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 515a14f6bdc..599e752d69d 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -17,12 +17,12 @@
     "comments": "Jūsų komentarai",
     "commentscount": "Komentarai ({{$a}})",
     "commentsnotworking": "Komentarų negalima ištaisyti",
-    "completion-alt-auto-fail": "Užbaigta: {{$a}} (negautas išlaikymo įvertis)",
+    "completion-alt-auto-fail": "Baigta: {{$a}} (nepasiekta)",
     "completion-alt-auto-n": "Nebaigta: {{$a}}",
-    "completion-alt-auto-pass": "Užbaigta: {{$a}} (gautas išlaikymo įvertis)",
-    "completion-alt-auto-y": "Užbaigta: {{$a}}",
-    "completion-alt-manual-n": "Dar neužbaigta: {{$a}}. Pasirinkti pažymėti kaip užbaigtą",
-    "completion-alt-manual-y": "Užbaigta: {{$a}}. Pasirinkti pažymėti kaip nebaigtą",
+    "completion-alt-auto-pass": "Baigta: {{$a}} (pasiekta)",
+    "completion-alt-auto-y": "Baigta: {{$a}}",
+    "completion-alt-manual-n": "Nebaigta: {{$a}}. Pažymėti, kaip baigtą",
+    "completion-alt-manual-y": "Baigta: {{$a}}. Pažymėti, kaip nebaigtą.",
     "confirmcanceledit": "Ar tikrai norite išeiti iš šio puslapio? Visi pakeitimai bus prarasti.",
     "confirmdeletefile": "Ar tikrai norite naikinti šį failą?",
     "confirmopeninbrowser": "Ar norite tai atidaryti naršyklėje?",
@@ -38,7 +38,7 @@
     "days": "dienos",
     "decsep": ".",
     "delete": "Naikinti",
-    "deleting": "Naikinama",
+    "deleting": "Trinama",
     "description": "Aprašas",
     "dfdaymonthyear": "MM-DD-MMMM",
     "dfdayweekmonth": "ddd, D MMM",
@@ -128,7 +128,7 @@
     "nocomments": "Jokių komentarų",
     "nograde": "Nėra įverčio",
     "none": "Nei vienas",
-    "nopasswordchangeforced": "Negalite tęsti nepakeitę slaptažodžio, tačiau nėra slaptažodžio keitimo puslapio. Susisiekite su „Moodle“ administratoriumi.",
+    "nopasswordchangeforced": "Nepakeitus slaptažodžio, negalima tęsti.",
     "nopermissions": "Atsiprašome, tačiau šiuo metu jūs neturite teisės atlikti šio veiksmo",
     "noresults": "Nėra rezultatų",
     "notapplicable": "netaikoma",
@@ -136,7 +136,7 @@
     "notsent": "Neišsiųsta",
     "now": "dabar",
     "numwords": "Žodžių: {{$a}}",
-    "offline": "Nereikia įkelti darbų į svetainę",
+    "offline": "Neprisijungęs",
     "online": "Prisijungęs",
     "openfullimage": "Paspauskite, norėdami matyti visą vaizdą",
     "openinbrowser": "Atidaryti naršyklėje",
@@ -154,7 +154,7 @@
     "retry": "Bandykite dar kartą",
     "save": "Įrašyti",
     "search": "Ieškoti",
-    "searching": "Ieškoti",
+    "searching": "Ieškoma",
     "searchresults": "Ieškos rezultatai",
     "sec": "sek.",
     "secs": "sek.",
@@ -174,7 +174,7 @@
     "sorry": "Atsiprašome...",
     "start": "Pradėti",
     "submit": "Pateikti",
-    "success": "Sėkmingai",
+    "success": "Sėkmė!",
     "tablet": "Planšetė",
     "teachers": "Dėstytojai",
     "thereisdatatosync": "Neprijungtas {{$a}}, kad sinchronizuotų.",
@@ -185,7 +185,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Klaida. Uždarykite programėlę ir bandykite atidaryti dar kartą",
-    "unknown": "Nežinoma",
+    "unknown": "Nežinomas",
     "unlimited": "Neribota",
     "unzipping": "Išskleidžiama",
     "upgraderunning": "Naujinama svetainės versija, bandykite vėliau.",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index 961e7632554..59efdc360b6 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -17,12 +17,12 @@
     "comments": "Notities",
     "commentscount": "Opmerkingen ({{$a}})",
     "commentsnotworking": "Opmerkingen konden niet opgehaald worden",
-    "completion-alt-auto-fail": "Voltooid:  {{$a}}  (bereikte het cijfer voor geslaagd niet)",
+    "completion-alt-auto-fail": "Voltooid: {{$a}} (slaagcijfer niet behaald)",
     "completion-alt-auto-n": "Niet voltooid: {{$a}}",
-    "completion-alt-auto-pass": "Voltooid:  {{$a}} (slaagcijfer bereikt)",
+    "completion-alt-auto-pass": "Voltooid: {{$a}} (slaagcijfer behaald)",
     "completion-alt-auto-y": "Voltooid: {{$a}}",
-    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om te markeren als voltooid",
-    "completion-alt-manual-y": "voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
+    "completion-alt-manual-n": "Niet voltooid: {{$a}}. Selecteer om als voltooid te markeren.",
+    "completion-alt-manual-y": "Voltooid: {{$a}}. Selecteer om als niet voltooid te markeren.",
     "confirmcanceledit": "Weet je zeker dat je deze pagina wil verlaten? Alle wijzigingen zullen verloren gaan.",
     "confirmdeletefile": "Wil je dit bestand echt verwijderen?",
     "confirmloss": "Ben je zeker? Alle wijzigingen zullen verloren gaan.",
@@ -41,7 +41,7 @@
     "decsep": ",",
     "defaultvalue": "Standaard ({{$a}})",
     "delete": "Verwijder",
-    "deleting": "Verwijderen",
+    "deleting": "Verwijderen.",
     "description": "Inleidende tekst",
     "dfdaymonthyear": "MM-DD-JJJJ",
     "dfdayweekmonth": "ddd, D, MMM",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Afbeelding",
     "imageviewer": "Afbeeldingsviewer",
-    "info": "Informatie",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Laatste wijziging",
@@ -135,7 +135,7 @@
     "nocomments": "Geen commentaren",
     "nograde": "Nog geen cijfer",
     "none": "Geen",
-    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te wijzigen, hoewel er geen pagina voorzien is om dat te doen. Neem contact op met je Moodlebeheerder",
+    "nopasswordchangeforced": "Je kunt niet verdergaan zonder je wachtwoord te veranderen.",
     "nopermissions": "Sorry, maar je hebt nu niet het recht om dat te doen ({{$a}}).",
     "noresults": "Geen resultaten",
     "notapplicable": "n/a",
@@ -143,7 +143,7 @@
     "notsent": "Niet verstuurd",
     "now": "Nu",
     "numwords": "{{$a}} woorden",
-    "offline": "Je hoeft niets online in te sturen",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Klik hier om de afbeelding op volledige grootte weer te geven",
     "openinbrowser": "Open in browser",
@@ -161,13 +161,13 @@
     "retry": "Probeer opnieuw",
     "save": "Bewaar",
     "search": "Zoek",
-    "searching": "Zoek in",
+    "searching": "Zoeken",
     "searchresults": "Zoekresultaten",
     "sec": "seconde",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
     "send": "Stuur",
-    "sending": "Versturen",
+    "sending": "Sturen",
     "serverconnection": "Fout bij het verbinden met de server",
     "show": "Toon",
     "showmore": "Toon meer...",
@@ -181,7 +181,7 @@
     "sorry": "Sorry...",
     "start": "Start",
     "submit": "Insturen",
-    "success": "Succes",
+    "success": "Gelukt!",
     "tablet": "Tablet",
     "teachers": "leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index a3e76230e41..a461e54702c 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -17,12 +17,12 @@
     "comments": "Seus comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Os comentários não podem ser recuperados",
-    "completion-alt-auto-fail": "Concluído: {{$a}} (não obteve nota para aprovação)",
-    "completion-alt-auto-n": "Não concluído(s): {{$a}}",
-    "completion-alt-auto-pass": "Concluído: {{$a}} (foi atingida a nota de aprovação)",
+    "completion-alt-auto-fail": "Concluído: {{$a}} (não alcançou a nota para passar)",
+    "completion-alt-auto-n": "Não concluído: {{$a}}",
+    "completion-alt-auto-pass": "Concluído: {{$a}} (nota para passar foi alcançada)",
     "completion-alt-auto-y": "Concluído: {{$a}}",
-    "completion-alt-manual-n": "Não concluído(s): {{$a}}. Selecione para marcar como concluído.",
-    "completion-alt-manual-y": "Concluído(s): {{$a}}. Selecione para marcar como não concluído.",
+    "completion-alt-manual-n": "Não concluído: {{$a}}. Selecione para marcar como concluída.",
+    "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
     "confirmcanceledit": "Você tem certeza que quer sair dessa página? Todas as mudanças serão perdidas.",
     "confirmdeletefile": "Você tem certeza que quer excluir este arquivo?",
     "confirmloss": "Você tem certeza? Todas as alterações serão perdidas.",
@@ -84,7 +84,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagem",
     "imageviewer": "Visualizador de imagens",
-    "info": "Informação",
+    "info": "Informações",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
     "lastmodified": "Última atualização",
@@ -131,7 +131,7 @@
     "nocomments": "Nenhum comentário",
     "nograde": "Nenhuma nota",
     "none": "Nenhum",
-    "nopasswordchangeforced": "Você não pode continuar sem mudar sua senha. Mas infelizmente não existe uma página para esse propósito.\nPor favor contate o Administrador Moodle.",
+    "nopasswordchangeforced": "Você não pode proceder sem mudar sua senha.",
     "nopermissions": "Você não tem permissão para {{$a}}",
     "noresults": "Nenhum resultado",
     "notapplicable": "n/a",
@@ -139,8 +139,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavras",
-    "offline": "Não há envios online solicitados",
-    "online": "Conectado",
+    "offline": "Offline",
+    "online": "Online",
     "openfullimage": "Clique aqui para exibir a imagem no tamanho completo",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -157,7 +157,7 @@
     "retry": "Tentar novamente",
     "save": "Gravar",
     "search": "Buscar",
-    "searching": "Buscar em",
+    "searching": "Procurando",
     "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",
@@ -177,7 +177,7 @@
     "sorry": "Desculpe...",
     "start": "Início",
     "submit": "Enviar",
-    "success": "Sucesso",
+    "success": "Sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index eeeab5b3b52..8914e8b66a2 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -17,12 +17,12 @@
     "comments": "Os seus comentários",
     "commentscount": "Comentários ({{$a}})",
     "commentsnotworking": "Não foi possível recuperar os comentários",
-    "completion-alt-auto-fail": "Concluída (não atingiu nota de aprovação)",
-    "completion-alt-auto-n": "Não concluída",
-    "completion-alt-auto-pass": "Concluída (atingiu nota de aprovação)",
-    "completion-alt-auto-y": "Concluída",
-    "completion-alt-manual-n": "Não concluída. Selecione para assinalar como concluída",
-    "completion-alt-manual-y": "Concluída: {{$a}}. Selecione para dar como não concluída",
+    "completion-alt-auto-fail": "Concluído: {{$a}} (não alcançou a nota mínima para passar)",
+    "completion-alt-auto-n": "Não concluído: {{$a}}",
+    "completion-alt-auto-pass": "Concluído: {{$a}} (alcançou a nota mínima para passar)",
+    "completion-alt-auto-y": "Concluído: {{$a}}",
+    "completion-alt-manual-n": "Não concluído: {{$a}}. Selecione para marcar como concluída.",
+    "completion-alt-manual-y": "Concluído: {{$a}}. Selecione para marcar como não concluída.",
     "confirmcanceledit": "Tem a certeza de que pretende sair desta página? Todas as alterações serão perdidas.",
     "confirmdeletefile": "Tem a certeza de que pretende apagar este ficheiro?",
     "confirmloss": "Tem a certeza absoluta? Todas as alterações serão perdidas.",
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagem",
     "imageviewer": "Visualizador de imagens",
-    "info": "Informação de sistema",
+    "info": "Informações",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
     "lastmodified": "Última alteração",
@@ -134,7 +134,7 @@
     "nocomments": "Sem comentários",
     "nograde": "Nenhuma nota",
     "none": "Nenhum",
-    "nopasswordchangeforced": "Não consegue prosseguir sem modificar a senha, entretanto não existe nenhuma página disponível para a mudar. Por favor contate o Administrador do site Moodle.",
+    "nopasswordchangeforced": "Não pode prosseguir sem alterar sua senha.",
     "nopermissions": "Atualmente, não tem permissões para realizar a operação <b>{{$a}}</b>",
     "noresults": "Sem resultados",
     "notapplicable": "n/a",
@@ -142,8 +142,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavra(s)",
-    "offline": "Não é necessário submeter nada online",
-    "online": "Inativo",
+    "offline": "Offline",
+    "online": "Online",
     "openfullimage": "Clique aqui para exibir a imagem em tamanho real",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -160,7 +160,7 @@
     "retry": "Tentar novamente",
     "save": "Gravar",
     "search": "Procurar",
-    "searching": "Pesquisar em",
+    "searching": "A procurar",
     "searchresults": "Procurar resultados",
     "sec": "segundo",
     "secs": "segundos",
@@ -180,7 +180,7 @@
     "sorry": "Desculpe...",
     "start": "Iniciar",
     "submit": "Enviar",
-    "success": "Operação realizada com sucesso!",
+    "success": "Sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline que têm de ser sincronizados.",
@@ -193,7 +193,7 @@
     "unexpectederror": "Erro inesperado. Por favor, feche e abra novamente a aplicação para tentar de novo",
     "unicodenotsupported": "Alguns emojis não são suportados neste site. Estes caracteres serão removidos quando a mensagem for enviada.",
     "unicodenotsupportedcleanerror": "Foi encontrado texto vazio ao limpar caracteres Unicode.",
-    "unknown": "Desconhecido(a)",
+    "unknown": "Desconhecido",
     "unlimited": "Ilimitado(a)",
     "unzipping": "A descomprimir",
     "upgraderunning": "O site está em processo de atualização, por favor, tente novamente mais tarde.",
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index 9672eebabe7..68b050e23b9 100644
--- a/www/core/lang/ro.json
+++ b/www/core/lang/ro.json
@@ -15,12 +15,12 @@
     "close": "Închide",
     "comments": "Comentariile dumneavoastră",
     "commentscount": "Comentarii ({{$a}})",
-    "completion-alt-auto-fail": "Finalizat: {{$a}} (nu a obținut notă de trecere)",
-    "completion-alt-auto-n": "Nu s-a finalizat: {{$a}}",
-    "completion-alt-auto-pass": "Finalizat: {{$a}} (s-a obținut notă de trecere)",
-    "completion-alt-auto-y": "Finalizat: {{$a}}",
-    "completion-alt-manual-n": "Necompletat: {{$a}}. Selectați pentru a-l seta ca fiind completat.",
-    "completion-alt-manual-y": "Completat: {{$a}}. Selectați pentru a-l seta ca fiind necompletat.",
+    "completion-alt-auto-fail": "Realizat: {{$a}} (nu este suficient pentru promovare)",
+    "completion-alt-auto-n": "Nerealizat: {{$a}}",
+    "completion-alt-auto-pass": "Realizat: {{$a}} (este obținută nota pentru promovare)",
+    "completion-alt-auto-y": "Realizat: {{$a}}",
+    "completion-alt-manual-n": "Nerealizat: {{$a}}. Selectați pentru a fi marcat ca realizat.",
+    "completion-alt-manual-y": "Realizat: {{$a}}. Selectați pentru a fi marcat ca nerealizat.",
     "confirmdeletefile": "Sunteți sigur că doriți să ștergeți acest fișier?",
     "confirmopeninbrowser": "Doriți să deschideți într-un browser?",
     "content": "Conţinut",
@@ -32,7 +32,7 @@
     "days": "zile",
     "decsep": ",",
     "delete": "Şterge",
-    "deleting": "În curs de ştergere",
+    "deleting": "Se șterge",
     "description": "Text introductiv",
     "dfdayweekmonth": "zzz, Z LLL",
     "dflastweekdate": "zzz",
@@ -63,7 +63,7 @@
     "humanreadablesize": "{{mărime}} {{unitate}}",
     "image": "Imagine",
     "imageviewer": "Vizualizator pentru imagini",
-    "info": "Informaţii",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Ultima modificare",
@@ -116,7 +116,7 @@
     "notice": "Notificare",
     "now": "acum",
     "numwords": "{{$a}} cuvinte",
-    "offline": "Nu se solicită răspunsuri online",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Apăsați aici pentru a vizualiza imaginea la dimensiunea întreagă",
     "openinbrowser": "Deschideți în browser",
@@ -131,7 +131,7 @@
     "requireduserdatamissing": "Acest utilizator are unele date de profil obligatorii necompletate. Completați aceste date în contul din Moodle și încercați din nou.<br>{{$a}}",
     "save": "Salvare",
     "search": "Caută",
-    "searching": "Căutare în",
+    "searching": "Căutare",
     "searchresults": "Rezultate căutare",
     "sec": "sec",
     "secs": "secs",
@@ -148,7 +148,7 @@
     "sizetb": "TB",
     "start": "Start",
     "submit": "Trimite",
-    "success": "Succes",
+    "success": "Succes!",
     "tablet": "Tabletă",
     "teachers": "Profesori",
     "time": "Ora",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index c6935da60d3..cfb7c45efd3 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -15,12 +15,12 @@
     "close": "Stäng",
     "comments": "Dina kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Fullföljd (uppnådde inte godkänt resultat)",
+    "completion-alt-auto-fail": "Avslutad: {{$a}} (uppnådde inte gräns för godkänd)",
     "completion-alt-auto-n": "Inte avslutad: {{$a}}",
-    "completion-alt-auto-pass": "Fullföljd (godkänt resultat)",
-    "completion-alt-auto-y": "Fullföljd",
-    "completion-alt-manual-n": "Ej fullföljd; välj för att markera som fullföljd",
-    "completion-alt-manual-y": "Fullföljd; välj för att markera som ej fullföljd",
+    "completion-alt-auto-pass": "Avslutad: {{$a}} (uppnådde gräns för godkänd)",
+    "completion-alt-auto-y": "Avslutad: {{$a}}",
+    "completion-alt-manual-n": "Inte avslutad: {{$a}}. Välj att markera som avslutad",
+    "completion-alt-manual-y": "Avslutad: {{$a}}. Välj att markera som INTE avslutad",
     "confirmdeletefile": "Är Du säker på att Du vill ta bort den här filen?",
     "confirmopeninbrowser": "Vill du öppna den i webbläsaren ?",
     "content": "Innehåll",
@@ -32,7 +32,7 @@
     "days": "dagar",
     "decsep": ",",
     "delete": "Ta bort",
-    "deleting": "Tar bort",
+    "deleting": "ta bort",
     "description": "Introduktion",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -63,7 +63,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Bild",
     "imageviewer": "Bildvisare",
-    "info": "Information",
+    "info": "Info",
     "ios": "IOS",
     "labelsep": ":",
     "lastmodified": "Senast modifierad",
@@ -117,8 +117,8 @@
     "notice": "Meddelande",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Ingen inlämning online krävs",
-    "online": "Uppkopplad",
+    "offline": "Offline",
+    "online": "Online",
     "openfullimage": "Klick här för att visa bilden i full storlek",
     "openinbrowser": "Öppna i webbläsare",
     "othergroups": "Andra grupper",
@@ -133,7 +133,7 @@
     "requireduserdatamissing": "Den här användaren saknar vissa nödvändiga profildata. Vänligen fyll i uppgifterna i din Moodle och försök igen. <br>{{$a}}",
     "save": "Spara",
     "search": "Sök",
-    "searching": "Sök i ",
+    "searching": "Söker",
     "searchresults": "Sökresultat",
     "sec": "Sekund",
     "secs": "Sekunder",
@@ -150,7 +150,7 @@
     "sizetb": "Tb",
     "start": "Starta",
     "submit": "Skicka in",
-    "success": "Framgång",
+    "success": "Succé!",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
     "time": "Tid",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index ebf7b52804f..295d277a503 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -102,7 +102,7 @@
     "notice": "Uyarı",
     "now": "şimdi",
     "numwords": "{{$a}} kelime",
-    "offline": "Online gönderim gerekli değil",
+    "offline": "Çevrimdışı",
     "online": "Çevrimiçi",
     "openinbrowser": "Tarayıcıda aç",
     "othergroups": "Diğer gruplar",
@@ -114,7 +114,7 @@
     "required": "Gerekli",
     "save": "Kaydet",
     "search": "Ara",
-    "searching": "Aranan",
+    "searching": "Aranıyor",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
diff --git a/www/core/lang/uk.json b/www/core/lang/uk.json
index 1722b8778a6..2586c68adc3 100644
--- a/www/core/lang/uk.json
+++ b/www/core/lang/uk.json
@@ -17,12 +17,12 @@
     "comments": "Ваші коментарі",
     "commentscount": "Коментарі ({{$a}})",
     "commentsnotworking": "Коментар не може бути відновлений",
-    "completion-alt-auto-fail": "Виконано: {{$a}}  (не вдалося досягти прохідного балу)",
-    "completion-alt-auto-n": "Не виконано: {{$a}}",
-    "completion-alt-auto-pass": "Виконано: {{$a}} (перевищено прохідний бал)",
-    "completion-alt-auto-y": "Виконано: {{$a}}",
-    "completion-alt-manual-n": "Не виконано: {{$a}}. Виберіть для позначення виконання",
-    "completion-alt-manual-y": "Виконано: {{$a}}. Виберіть для позначення не виконання",
+    "completion-alt-auto-fail": "Виконано: {{$a}} (не досягли до рівня зараховання)",
+    "completion-alt-auto-n": "Не завершено: {{$a}}",
+    "completion-alt-auto-pass": "Виконано:  {{$a}} (досягагли до рівня зараховано)",
+    "completion-alt-auto-y": "Завершено: {{$a}}",
+    "completion-alt-manual-n": "Не завершено {{$a}}. Виберіть для відмічення як завершене.",
+    "completion-alt-manual-y": "Завершено {{$a}}. Виберіть для відмічення як не завершене.",
     "confirmcanceledit": "Ви впевнені, що хочете залишити цю сторінку? Всі зміни будуть втрачені.",
     "confirmdeletefile": "Ви впевнені, що хочете видалити цей файл?",
     "confirmloss": "Ви впевнені? Всі зміни будуть втрачені.",
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Зображення",
     "imageviewer": "Переглядач зображень",
-    "info": "Інформація",
+    "info": "Інфо",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Остання зміна",
@@ -120,7 +120,7 @@
     "nocomments": "Немає коментарів",
     "nograde": "Без оцінки",
     "none": "Не вибрано",
-    "nopasswordchangeforced": "Ви не можете перейти не змінивши ваш пароль, але не вказано ніякої сторінки для цього процесу. Будь ласка, зверніться до вашого Адміністратора.",
+    "nopasswordchangeforced": "Ви не можете продовжити без зміни пароля.",
     "nopermissions": "Вибачте, але ваші поточні права не дозволяють вам цього робити ({{$a}})",
     "noresults": "Без результатів",
     "notapplicable": "n/a",
@@ -128,8 +128,8 @@
     "notsent": "Не відправлено",
     "now": "зараз",
     "numwords": "{{$a}} слів",
-    "offline": "Не потрібно здавати в онлайні",
-    "online": "В мережі",
+    "offline": "Offline",
+    "online": "Online",
     "openfullimage": "Натисніть тут, щоб побачити зображення в повному розмірі",
     "openinbrowser": "Відкрити у браузері",
     "othergroups": "Інші групи",
@@ -146,13 +146,13 @@
     "retry": "Повторити",
     "save": "Зберегти",
     "search": "Знайти",
-    "searching": "Шукати в",
+    "searching": "Пошук",
     "searchresults": "Результати пошуку",
     "sec": "сек",
     "secs": "сек",
     "seemoredetail": "Деталі...",
     "send": "Відіслати",
-    "sending": "Відсилання",
+    "sending": "Відправка",
     "serverconnection": "Помилка з’єднання з сервером",
     "show": "Показати",
     "showmore": "Показати більше",
@@ -166,7 +166,7 @@
     "sorry": "Вибачте...",
     "start": "Початок",
     "submit": "Прийняти",
-    "success": "Успішно",
+    "success": "Успіх!",
     "tablet": "пЛАНШЕТ",
     "teachers": "Викладачі",
     "thereisdatatosync": "Офлайн {{$a}} повинні бути синхронізовані.",
@@ -179,7 +179,7 @@
     "unexpectederror": "Неочікувана помилка. Будь ласка, закрийте і знову відкрийте додаток, щоб спробувати ще раз",
     "unicodenotsupported": "Деякі Emojis не підтримуються на цьому сайті. Такі символи будуть видалені, коли повідомлення було відправлено.",
     "unicodenotsupportedcleanerror": "Порожній текст був знайдений при чищенні Unicode символів.",
-    "unknown": "Невідоме",
+    "unknown": "Невідомо",
     "unlimited": "Не обмежено",
     "unzipping": "Розпакування",
     "upgraderunning": "Сайт оновлюється, повторіть спробу пізніше.",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index 48a87bc3a31..d0608dfbea4 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -17,12 +17,12 @@
     "comments": "評論",
     "commentscount": "評論數({{$a}})",
     "commentsnotworking": "無法取得評論資料",
-    "completion-alt-auto-fail": "已完成：{{$a}} (不及格)",
-    "completion-alt-auto-n": "尚未完成：{{$a}}",
-    "completion-alt-auto-pass": "已經完成：{{$a}} (及格)",
-    "completion-alt-auto-y": "已經完成：{{$a}}",
-    "completion-alt-manual-n": "未完成：{{$a}} 。點選標記為完成。",
-    "completion-alt-manual-y": "已完成：{{$a}} 。點選標記為未完成。",
+    "completion-alt-auto-fail": "已完成: {{$a}} (did not achieve pass grade)",
+    "completion-alt-auto-n": "未完成: {{$a}}",
+    "completion-alt-auto-pass": "已完成: {{$a}} (achieved pass grade)",
+    "completion-alt-auto-y": "已完成: {{$a}}",
+    "completion-alt-manual-n": "未完成: {{$ a}}.  選擇標記為完成.",
+    "completion-alt-manual-y": "已完成: {{$ a}}. 選擇標記為未完成.",
     "confirmcanceledit": "您確定要離開此頁面嗎? 所有的修改將會遺失.",
     "confirmdeletefile": "你確定要刪除這一檔案？",
     "confirmopeninbrowser": "你想要在瀏覽器內開啟嗎?",
@@ -82,7 +82,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "圖片",
     "imageviewer": "影像檢視器",
-    "info": "資訊",
+    "info": "資料",
     "ios": "iOS",
     "labelsep": "：",
     "lastmodified": "最後修改",
@@ -129,7 +129,7 @@
     "nocomments": "沒有評論",
     "nograde": "沒有成績",
     "none": "無",
-    "nopasswordchangeforced": "沒有修改密碼前您無法處理，這裡沒有提供可以變更的頁面，請聯絡您的Moodle管理員。",
+    "nopasswordchangeforced": "你若沒有更新密碼無法進行此處理",
     "nopermissions": "抱歉，但是您目前沒有權限執行({{$a}})",
     "noresults": "沒有結果",
     "notapplicable": "n/a",
@@ -137,8 +137,8 @@
     "notsent": "沒有傳送",
     "now": "現在",
     "numwords": "{{$a}}字數",
-    "offline": "不需要線上繳交",
-    "online": "在線上",
+    "offline": "離線",
+    "online": "上線",
     "openfullimage": "點擊這裡以圖像原尺寸顯示",
     "openinbrowser": "以瀏覽器開啟",
     "othergroups": "其他群組",
@@ -155,13 +155,13 @@
     "retry": "重試",
     "save": "儲存",
     "search": "搜尋",
-    "searching": "搜尋",
+    "searching": "搜尋中",
     "searchresults": "搜尋結果",
     "sec": "秒",
     "secs": "秒",
     "seemoredetail": "按此以觀看更多細節",
     "send": "傳送",
-    "sending": "正在傳送",
+    "sending": "傳送中",
     "serverconnection": "連結到伺服器時發生錯誤",
     "show": "顯示",
     "showmore": "顯示更多...",
@@ -175,7 +175,7 @@
     "sorry": "抱歉...",
     "start": "開始",
     "submit": "提交",
-    "success": "成功",
+    "success": "成功!",
     "tablet": "平板",
     "teachers": "教師",
     "thereisdatatosync": "有離線的{{$ a}}要同步",
@@ -186,7 +186,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "噢哦!",
     "unexpectederror": "無法預期的錯誤. 請關閉並重新開啟應用程式, 再試一次.",
-    "unknown": "未知的",
+    "unknown": "未知",
     "unlimited": "無限制",
     "unzipping": "解壓縮中",
     "upgraderunning": "網站正在升級中，請稍後再試。",

From 5c5e94de4d9b60b8959f4adc757d0ffda2fc26af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 26 May 2017 11:51:16 +0200
Subject: [PATCH 217/218] MOBILE-2103 course: Animate spinner transition

---
 www/core/components/course/templates/module.html              | 4 ++--
 www/core/components/courses/templates/courselistprogress.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/core/components/course/templates/module.html b/www/core/components/course/templates/module.html
index 72beee6afcd..7c6a431e4d3 100644
--- a/www/core/components/course/templates/module.html
+++ b/www/core/components/course/templates/module.html
@@ -5,11 +5,11 @@
     <div class="buttons mm-module-buttons" ng-class="{'mm-button-completion': module.completionstatus}" ng-if="module.uservisible !== false && ((buttons && buttons.length > 0) || spinner || module.completionstatus)">
         <mm-completion ng-if="module.completionstatus" completion="module.completionstatus" module-name="module.name" after-change="completionChanged"></mm-completion>
 
-        <button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon" aria-label="{{ button.label | translate }}">
+        <button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon mm-animate-show-hide" aria-label="{{ button.label | translate }}">
             <i class="icon positive" ng-class="{'{{button.icon}}': button.icon}"></i>
         </button>
 
-        <ion-spinner ng-if="spinner"></ion-spinner>
+        <ion-spinner ng-if="spinner" class="mm-animate-show-hide"></ion-spinner>
     </div>
 
     <mm-format-text watch="true">{{ title }}</mm-format-text>
diff --git a/www/core/components/courses/templates/courselistprogress.html b/www/core/components/courses/templates/courselistprogress.html
index d24594c6712..f6924d020af 100644
--- a/www/core/components/courses/templates/courselistprogress.html
+++ b/www/core/components/courses/templates/courselistprogress.html
@@ -18,8 +18,8 @@
         </div>
         <h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
         <mm-progress-bar ng-if="!roundProgress && course.progress !== false" progress="course.progress"></mm-progress-bar>
-        <i ng-if="showActions && loaded" class="icon ion-android-more-vertical" ng-click="showCourseActions($event)"></i>
-        <ion-spinner ng-if="!loaded"></ion-spinner>
+        <i ng-if="showActions && loaded" class="icon ion-android-more-vertical mm-animate-show-hide" ng-click="showCourseActions($event)"></i>
+        <ion-spinner ng-if="!loaded" class="mm-animate-show-hide"></ion-spinner>
     </a>
     <div class="item item-text-wrap item-borderless" ng-show="course.summary" ng-if="showSummary">
         <p>

From ff4404ef023b4a9f4b67027b706a748e4fdbdc78 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 26 May 2017 12:18:47 +0200
Subject: [PATCH 218/218] MOBILE-2103 lesson: Show attempt number when starting

---
 www/addons/mod/lesson/controllers/player.js | 11 ++++++++++-
 www/addons/mod/lesson/lang/en.json          |  1 +
 www/addons/mod/lesson/templates/player.html |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 24932b52fe2..7c2e5f840d5 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -34,7 +34,8 @@ angular.module('mm.addons.mod_lesson')
         scrollView,
         originalData,
         blockData,
-        jumps;
+        jumps,
+        firstPageLoaded = false;
 
     // Block the lesson so it cannot be synced.
     $mmSyncBlock.blockOperation(mmaModLessonComponent, lessonId);
@@ -73,6 +74,8 @@ angular.module('mm.addons.mod_lesson')
 
             accessInfo = info;
             $scope.canManage = info.canmanage;
+            $scope.retake = accessInfo.attemptscount;
+            $scope.showRetake = !$scope.currentPage && $scope.retake > 0;
 
             if (info.preventaccessreasons && info.preventaccessreasons.length) {
                 // If it's a password protected lesson and we have the password, allow playing it.
@@ -210,6 +213,12 @@ angular.module('mm.addons.mod_lesson')
                 loadMenu();
             }
             $scope.displayMenu = !!data.displaymenu;
+
+            if (!firstPageLoaded) {
+                firstPageLoaded = true;
+            } else {
+                $scope.showRetake = false;
+            }
         });
     }
 
diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index a85e9edbe81..92a9bb049b6 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -1,5 +1,6 @@
 {
     "answer": "Answer",
+    "attempt": "Attempt: {{$a}}",
     "attemptheader": "Attempt",
     "attemptsremaining": "You have {{$a}} attempt(s) remaining",
     "averagescore": "Average score",
diff --git a/www/addons/mod/lesson/templates/player.html b/www/addons/mod/lesson/templates/player.html
index 71688f8561c..be2e0f0a498 100644
--- a/www/addons/mod/lesson/templates/player.html
+++ b/www/addons/mod/lesson/templates/player.html
@@ -15,6 +15,7 @@
                 <mm-timer ng-if="endTime" end-time="endTime" finished="timeUp()" timer-text="{{ 'mma.mod_lesson.timeremaining' | translate }}"></mm-timer>
 
                 <!-- Page content, including questions and buttons. -->
+                <p ng-if="showRetake && !eolData && !processData" class="item item-text-wrap">{{ 'mma.mod_lesson.attempt' | translate:{$a: retake} }}</p>
                 <mm-format-text ng-if="pageData.ongoingscore && !eolData && !processData" class="item item-text-wrap mma-mod-lesson-ongoingscore" watch="true">{{pageData.ongoingscore}}</mm-format-text>
                 <form ng-if="!eolData && !processData" name="mma-mod_lesson-player-form" class="card">
                     <p class="item item-text-wrap" ng-class="{'item-divider': question}"><mm-format-text watch="true" component="{{component}}" component-id="{{lesson.coursemodule}}">{{pageContent}}</mm-format-text></p>